diff --git a/FeatureStatisticsService.cs b/FeatureStatisticsService.cs index 331ee47..b127fe3 100644 --- a/FeatureStatisticsService.cs +++ b/FeatureStatisticsService.cs @@ -190,7 +190,7 @@ List result = new List(); //layer.Name是表名 - string[] accessStrs = Utility.getAccStrsByLayer(layer.Name); + string[] accessStrs = FeatureTools.GetAccStrsByLayer(layer.Name); foreach (string accssname in accessStrs) { diff --git a/FeatureStatisticsService.cs b/FeatureStatisticsService.cs index 331ee47..b127fe3 100644 --- a/FeatureStatisticsService.cs +++ b/FeatureStatisticsService.cs @@ -190,7 +190,7 @@ List result = new List(); //layer.Name是表名 - string[] accessStrs = Utility.getAccStrsByLayer(layer.Name); + string[] accessStrs = FeatureTools.GetAccStrsByLayer(layer.Name); foreach (string accssname in accessStrs) { diff --git a/FeatureTools.cs b/FeatureTools.cs index be4b469..3c08f34 100644 --- a/FeatureTools.cs +++ b/FeatureTools.cs @@ -1,5 +1,6 @@ using System; using System.Collections.Generic; +using System.Data; using System.Linq; using System.Text; using System.Windows.Forms; @@ -43,7 +44,7 @@ } feature.Delete();//地球上删除该feature string sql = "delete from " + layerName + " where LSSYS_ID =" + feature.ID + " and (编号 is null or substr(编号,length(编号)-2)='TMP')"; - OledbHelper.sqlExecuteNonQuery(sql);//目前无法取到LSSYS_ID，所以这个判断条件不太合适，会导致把该类所有新建的都删除了 + OledbHelper.sqlExecuteNonQuery(sql); } catch (Exception) { @@ -106,5 +107,46 @@ } return value; } + + /// + /// 根据附属物图层名字得到里面含有的附属物 + /// + /// + /// + public static string[] GetAccStrsByLayer(string layername) + { + string[] accStrs = null; + string sql = "select 附属物名称 from " + layername + " group by 附属物名称"; + DataSet dataset = OledbHelper.getDataSet(sql, layername); + if (dataset == null) return null; + accStrs = new string[dataset.Tables[0].Rows.Count]; + for (int i = 0; i < dataset.Tables[0].Rows.Count; i++) + { + accStrs[i] = dataset.Tables[0].Rows[i][0].ToString(); + } + return accStrs; + } + + /// + /// 删除内存图层中指定名称的feature + /// + /// + /// + public static void RemoveFeatureFromName(GSOGlobeControl globeControl1, string featureName) + { + GSOFeatures features = globeControl1.Globe.MemoryLayer.GetFeatureByName(featureName, true); + if (features != null) + { + for (int i = features.Length - 1; i >= 0; i--) + { + GSOFeature feature = features[i]; + if (feature != null) + { + globeControl1.Globe.MemoryLayer.RemoveFeatureByID(feature.ID); + } + } + } + globeControl1.Refresh(); + } } } diff --git a/FeatureStatisticsService.cs b/FeatureStatisticsService.cs index 331ee47..b127fe3 100644 --- a/FeatureStatisticsService.cs +++ b/FeatureStatisticsService.cs @@ -190,7 +190,7 @@ List result = new List(); //layer.Name是表名 - string[] accessStrs = Utility.getAccStrsByLayer(layer.Name); + string[] accessStrs = FeatureTools.GetAccStrsByLayer(layer.Name); foreach (string accssname in accessStrs) { diff --git a/FeatureTools.cs b/FeatureTools.cs index be4b469..3c08f34 100644 --- a/FeatureTools.cs +++ b/FeatureTools.cs @@ -1,5 +1,6 @@ using System; using System.Collections.Generic; +using System.Data; using System.Linq; using System.Text; using System.Windows.Forms; @@ -43,7 +44,7 @@ } feature.Delete();//地球上删除该feature string sql = "delete from " + layerName + " where LSSYS_ID =" + feature.ID + " and (编号 is null or substr(编号,length(编号)-2)='TMP')"; - OledbHelper.sqlExecuteNonQuery(sql);//目前无法取到LSSYS_ID，所以这个判断条件不太合适，会导致把该类所有新建的都删除了 + OledbHelper.sqlExecuteNonQuery(sql); } catch (Exception) { @@ -106,5 +107,46 @@ } return value; } + + /// + /// 根据附属物图层名字得到里面含有的附属物 + /// + /// + /// + public static string[] GetAccStrsByLayer(string layername) + { + string[] accStrs = null; + string sql = "select 附属物名称 from " + layername + " group by 附属物名称"; + DataSet dataset = OledbHelper.getDataSet(sql, layername); + if (dataset == null) return null; + accStrs = new string[dataset.Tables[0].Rows.Count]; + for (int i = 0; i < dataset.Tables[0].Rows.Count; i++) + { + accStrs[i] = dataset.Tables[0].Rows[i][0].ToString(); + } + return accStrs; + } + + /// + /// 删除内存图层中指定名称的feature + /// + /// + /// + public static void RemoveFeatureFromName(GSOGlobeControl globeControl1, string featureName) + { + GSOFeatures features = globeControl1.Globe.MemoryLayer.GetFeatureByName(featureName, true); + if (features != null) + { + for (int i = features.Length - 1; i >= 0; i--) + { + GSOFeature feature = features[i]; + if (feature != null) + { + globeControl1.Globe.MemoryLayer.RemoveFeatureByID(feature.ID); + } + } + } + globeControl1.Refresh(); + } } } diff --git a/Forms/FrmPipelineModelDataBase.cs b/Forms/FrmPipelineModelDataBase.cs index b577fd8..bc1e479 100644 --- a/Forms/FrmPipelineModelDataBase.cs +++ b/Forms/FrmPipelineModelDataBase.cs @@ -149,7 +149,7 @@ catch (Exception ex) { LogError.PublishError(ex); - LogHelper.WriteLog(typeof(FrmPipelineModelDB), ex.Message); + LogHelper.Error(ex.Message); } } diff --git a/FeatureStatisticsService.cs b/FeatureStatisticsService.cs index 331ee47..b127fe3 100644 --- a/FeatureStatisticsService.cs +++ b/FeatureStatisticsService.cs @@ -190,7 +190,7 @@ List result = new List(); //layer.Name是表名 - string[] accessStrs = Utility.getAccStrsByLayer(layer.Name); + string[] accessStrs = FeatureTools.GetAccStrsByLayer(layer.Name); foreach (string accssname in accessStrs) { diff --git a/FeatureTools.cs b/FeatureTools.cs index be4b469..3c08f34 100644 --- a/FeatureTools.cs +++ b/FeatureTools.cs @@ -1,5 +1,6 @@ using System; using System.Collections.Generic; +using System.Data; using System.Linq; using System.Text; using System.Windows.Forms; @@ -43,7 +44,7 @@ } feature.Delete();//地球上删除该feature string sql = "delete from " + layerName + " where LSSYS_ID =" + feature.ID + " and (编号 is null or substr(编号,length(编号)-2)='TMP')"; - OledbHelper.sqlExecuteNonQuery(sql);//目前无法取到LSSYS_ID，所以这个判断条件不太合适，会导致把该类所有新建的都删除了 + OledbHelper.sqlExecuteNonQuery(sql); } catch (Exception) { @@ -106,5 +107,46 @@ } return value; } + + /// + /// 根据附属物图层名字得到里面含有的附属物 + /// + /// + /// + public static string[] GetAccStrsByLayer(string layername) + { + string[] accStrs = null; + string sql = "select 附属物名称 from " + layername + " group by 附属物名称"; + DataSet dataset = OledbHelper.getDataSet(sql, layername); + if (dataset == null) return null; + accStrs = new string[dataset.Tables[0].Rows.Count]; + for (int i = 0; i < dataset.Tables[0].Rows.Count; i++) + { + accStrs[i] = dataset.Tables[0].Rows[i][0].ToString(); + } + return accStrs; + } + + /// + /// 删除内存图层中指定名称的feature + /// + /// + /// + public static void RemoveFeatureFromName(GSOGlobeControl globeControl1, string featureName) + { + GSOFeatures features = globeControl1.Globe.MemoryLayer.GetFeatureByName(featureName, true); + if (features != null) + { + for (int i = features.Length - 1; i >= 0; i--) + { + GSOFeature feature = features[i]; + if (feature != null) + { + globeControl1.Globe.MemoryLayer.RemoveFeatureByID(feature.ID); + } + } + } + globeControl1.Refresh(); + } } } diff --git a/Forms/FrmPipelineModelDataBase.cs b/Forms/FrmPipelineModelDataBase.cs index b577fd8..bc1e479 100644 --- a/Forms/FrmPipelineModelDataBase.cs +++ b/Forms/FrmPipelineModelDataBase.cs @@ -149,7 +149,7 @@ catch (Exception ex) { LogError.PublishError(ex); - LogHelper.WriteLog(typeof(FrmPipelineModelDB), ex.Message); + LogHelper.Error(ex.Message); } } diff --git a/FrmAccessoriesSensor.cs b/FrmAccessoriesSensor.cs index 98aa1cf..542f19a 100644 --- a/FrmAccessoriesSensor.cs +++ b/FrmAccessoriesSensor.cs @@ -240,7 +240,7 @@ { if (clbPipeLine.CheckedItems.Count > 0) { - Utility.RemoveFeatureFromName(globeControl1, "trackPolygon"); + FeatureTools.RemoveFeatureFromName(globeControl1, "trackPolygon"); globeControl1.Globe.Action = EnumAction3D.TrackPolygon; globeControl1.TrackPolygonEndEvent += globeControl1_TrackPolygonEndEvent; } @@ -259,7 +259,7 @@ private void FrmAccessoriesgather_FormClosing(object sender, FormClosingEventArgs e) { frm = null; - Utility.RemoveFeatureFromName(globeControl1, "trackPolygon"); + FeatureTools.RemoveFeatureFromName(globeControl1, "trackPolygon"); globeControl1.Globe.Action = EnumAction3D.ActionNull; globeControl1.TrackPolygonEndEvent -= globeControl1_TrackPolygonEndEvent; } diff --git a/FeatureStatisticsService.cs b/FeatureStatisticsService.cs index 331ee47..b127fe3 100644 --- a/FeatureStatisticsService.cs +++ b/FeatureStatisticsService.cs @@ -190,7 +190,7 @@ List result = new List(); //layer.Name是表名 - string[] accessStrs = Utility.getAccStrsByLayer(layer.Name); + string[] accessStrs = FeatureTools.GetAccStrsByLayer(layer.Name); foreach (string accssname in accessStrs) { diff --git a/FeatureTools.cs b/FeatureTools.cs index be4b469..3c08f34 100644 --- a/FeatureTools.cs +++ b/FeatureTools.cs @@ -1,5 +1,6 @@ using System; using System.Collections.Generic; +using System.Data; using System.Linq; using System.Text; using System.Windows.Forms; @@ -43,7 +44,7 @@ } feature.Delete();//地球上删除该feature string sql = "delete from " + layerName + " where LSSYS_ID =" + feature.ID + " and (编号 is null or substr(编号,length(编号)-2)='TMP')"; - OledbHelper.sqlExecuteNonQuery(sql);//目前无法取到LSSYS_ID，所以这个判断条件不太合适，会导致把该类所有新建的都删除了 + OledbHelper.sqlExecuteNonQuery(sql); } catch (Exception) { @@ -106,5 +107,46 @@ } return value; } + + /// + /// 根据附属物图层名字得到里面含有的附属物 + /// + /// + /// + public static string[] GetAccStrsByLayer(string layername) + { + string[] accStrs = null; + string sql = "select 附属物名称 from " + layername + " group by 附属物名称"; + DataSet dataset = OledbHelper.getDataSet(sql, layername); + if (dataset == null) return null; + accStrs = new string[dataset.Tables[0].Rows.Count]; + for (int i = 0; i < dataset.Tables[0].Rows.Count; i++) + { + accStrs[i] = dataset.Tables[0].Rows[i][0].ToString(); + } + return accStrs; + } + + /// + /// 删除内存图层中指定名称的feature + /// + /// + /// + public static void RemoveFeatureFromName(GSOGlobeControl globeControl1, string featureName) + { + GSOFeatures features = globeControl1.Globe.MemoryLayer.GetFeatureByName(featureName, true); + if (features != null) + { + for (int i = features.Length - 1; i >= 0; i--) + { + GSOFeature feature = features[i]; + if (feature != null) + { + globeControl1.Globe.MemoryLayer.RemoveFeatureByID(feature.ID); + } + } + } + globeControl1.Refresh(); + } } } diff --git a/Forms/FrmPipelineModelDataBase.cs b/Forms/FrmPipelineModelDataBase.cs index b577fd8..bc1e479 100644 --- a/Forms/FrmPipelineModelDataBase.cs +++ b/Forms/FrmPipelineModelDataBase.cs @@ -149,7 +149,7 @@ catch (Exception ex) { LogError.PublishError(ex); - LogHelper.WriteLog(typeof(FrmPipelineModelDB), ex.Message); + LogHelper.Error(ex.Message); } } diff --git a/FrmAccessoriesSensor.cs b/FrmAccessoriesSensor.cs index 98aa1cf..542f19a 100644 --- a/FrmAccessoriesSensor.cs +++ b/FrmAccessoriesSensor.cs @@ -240,7 +240,7 @@ { if (clbPipeLine.CheckedItems.Count > 0) { - Utility.RemoveFeatureFromName(globeControl1, "trackPolygon"); + FeatureTools.RemoveFeatureFromName(globeControl1, "trackPolygon"); globeControl1.Globe.Action = EnumAction3D.TrackPolygon; globeControl1.TrackPolygonEndEvent += globeControl1_TrackPolygonEndEvent; } @@ -259,7 +259,7 @@ private void FrmAccessoriesgather_FormClosing(object sender, FormClosingEventArgs e) { frm = null; - Utility.RemoveFeatureFromName(globeControl1, "trackPolygon"); + FeatureTools.RemoveFeatureFromName(globeControl1, "trackPolygon"); globeControl1.Globe.Action = EnumAction3D.ActionNull; globeControl1.TrackPolygonEndEvent -= globeControl1_TrackPolygonEndEvent; } diff --git a/FrmAccessoriesgather.cs b/FrmAccessoriesgather.cs index e1d176e..c36273b 100644 --- a/FrmAccessoriesgather.cs +++ b/FrmAccessoriesgather.cs @@ -118,7 +118,7 @@ { if (clbPipeLine2.Text!="") { - Utility.RemoveFeatureFromName(globeControl1, "trackPolygon"); + FeatureTools.RemoveFeatureFromName(globeControl1, "trackPolygon"); globeControl1.Globe.Action = EnumAction3D.TrackPolygon; globeControl1.Globe.TrackPolygonTool.TrackMode = EnumTrackMode.SpaceTrack; globeControl1.TrackPolygonEndEvent += globeControl1_TrackPolygonEndEvent; @@ -295,7 +295,7 @@ private void FrmAccessoriesgather_FormClosing(object sender, FormClosingEventArgs e) { frm = null; - Utility.RemoveFeatureFromName(globeControl1, "trackPolygon"); + FeatureTools.RemoveFeatureFromName(globeControl1, "trackPolygon"); globeControl1.TrackPolygonEndEvent -= globeControl1_TrackPolygonEndEvent; globeControl1.Globe.Action = EnumAction3D.ActionNull; diff --git a/FeatureStatisticsService.cs b/FeatureStatisticsService.cs index 331ee47..b127fe3 100644 --- a/FeatureStatisticsService.cs +++ b/FeatureStatisticsService.cs @@ -190,7 +190,7 @@ List result = new List(); //layer.Name是表名 - string[] accessStrs = Utility.getAccStrsByLayer(layer.Name); + string[] accessStrs = FeatureTools.GetAccStrsByLayer(layer.Name); foreach (string accssname in accessStrs) { diff --git a/FeatureTools.cs b/FeatureTools.cs index be4b469..3c08f34 100644 --- a/FeatureTools.cs +++ b/FeatureTools.cs @@ -1,5 +1,6 @@ using System; using System.Collections.Generic; +using System.Data; using System.Linq; using System.Text; using System.Windows.Forms; @@ -43,7 +44,7 @@ } feature.Delete();//地球上删除该feature string sql = "delete from " + layerName + " where LSSYS_ID =" + feature.ID + " and (编号 is null or substr(编号,length(编号)-2)='TMP')"; - OledbHelper.sqlExecuteNonQuery(sql);//目前无法取到LSSYS_ID，所以这个判断条件不太合适，会导致把该类所有新建的都删除了 + OledbHelper.sqlExecuteNonQuery(sql); } catch (Exception) { @@ -106,5 +107,46 @@ } return value; } + + /// + /// 根据附属物图层名字得到里面含有的附属物 + /// + /// + /// + public static string[] GetAccStrsByLayer(string layername) + { + string[] accStrs = null; + string sql = "select 附属物名称 from " + layername + " group by 附属物名称"; + DataSet dataset = OledbHelper.getDataSet(sql, layername); + if (dataset == null) return null; + accStrs = new string[dataset.Tables[0].Rows.Count]; + for (int i = 0; i < dataset.Tables[0].Rows.Count; i++) + { + accStrs[i] = dataset.Tables[0].Rows[i][0].ToString(); + } + return accStrs; + } + + /// + /// 删除内存图层中指定名称的feature + /// + /// + /// + public static void RemoveFeatureFromName(GSOGlobeControl globeControl1, string featureName) + { + GSOFeatures features = globeControl1.Globe.MemoryLayer.GetFeatureByName(featureName, true); + if (features != null) + { + for (int i = features.Length - 1; i >= 0; i--) + { + GSOFeature feature = features[i]; + if (feature != null) + { + globeControl1.Globe.MemoryLayer.RemoveFeatureByID(feature.ID); + } + } + } + globeControl1.Refresh(); + } } } diff --git a/Forms/FrmPipelineModelDataBase.cs b/Forms/FrmPipelineModelDataBase.cs index b577fd8..bc1e479 100644 --- a/Forms/FrmPipelineModelDataBase.cs +++ b/Forms/FrmPipelineModelDataBase.cs @@ -149,7 +149,7 @@ catch (Exception ex) { LogError.PublishError(ex); - LogHelper.WriteLog(typeof(FrmPipelineModelDB), ex.Message); + LogHelper.Error(ex.Message); } } diff --git a/FrmAccessoriesSensor.cs b/FrmAccessoriesSensor.cs index 98aa1cf..542f19a 100644 --- a/FrmAccessoriesSensor.cs +++ b/FrmAccessoriesSensor.cs @@ -240,7 +240,7 @@ { if (clbPipeLine.CheckedItems.Count > 0) { - Utility.RemoveFeatureFromName(globeControl1, "trackPolygon"); + FeatureTools.RemoveFeatureFromName(globeControl1, "trackPolygon"); globeControl1.Globe.Action = EnumAction3D.TrackPolygon; globeControl1.TrackPolygonEndEvent += globeControl1_TrackPolygonEndEvent; } @@ -259,7 +259,7 @@ private void FrmAccessoriesgather_FormClosing(object sender, FormClosingEventArgs e) { frm = null; - Utility.RemoveFeatureFromName(globeControl1, "trackPolygon"); + FeatureTools.RemoveFeatureFromName(globeControl1, "trackPolygon"); globeControl1.Globe.Action = EnumAction3D.ActionNull; globeControl1.TrackPolygonEndEvent -= globeControl1_TrackPolygonEndEvent; } diff --git a/FrmAccessoriesgather.cs b/FrmAccessoriesgather.cs index e1d176e..c36273b 100644 --- a/FrmAccessoriesgather.cs +++ b/FrmAccessoriesgather.cs @@ -118,7 +118,7 @@ { if (clbPipeLine2.Text!="") { - Utility.RemoveFeatureFromName(globeControl1, "trackPolygon"); + FeatureTools.RemoveFeatureFromName(globeControl1, "trackPolygon"); globeControl1.Globe.Action = EnumAction3D.TrackPolygon; globeControl1.Globe.TrackPolygonTool.TrackMode = EnumTrackMode.SpaceTrack; globeControl1.TrackPolygonEndEvent += globeControl1_TrackPolygonEndEvent; @@ -295,7 +295,7 @@ private void FrmAccessoriesgather_FormClosing(object sender, FormClosingEventArgs e) { frm = null; - Utility.RemoveFeatureFromName(globeControl1, "trackPolygon"); + FeatureTools.RemoveFeatureFromName(globeControl1, "trackPolygon"); globeControl1.TrackPolygonEndEvent -= globeControl1_TrackPolygonEndEvent; globeControl1.Globe.Action = EnumAction3D.ActionNull; diff --git a/FrmAddWellShp.cs b/FrmAddWellShp.cs index 7983349..78d8946 100644 --- a/FrmAddWellShp.cs +++ b/FrmAddWellShp.cs @@ -100,7 +100,7 @@ catch (Exception ex) { LogError.PublishError(ex); - LogHelper.WriteLog(typeof(FrmAddWellShp), ex.Message); + LogHelper.Error(ex.Message); } } diff --git a/FeatureStatisticsService.cs b/FeatureStatisticsService.cs index 331ee47..b127fe3 100644 --- a/FeatureStatisticsService.cs +++ b/FeatureStatisticsService.cs @@ -190,7 +190,7 @@ List result = new List(); //layer.Name是表名 - string[] accessStrs = Utility.getAccStrsByLayer(layer.Name); + string[] accessStrs = FeatureTools.GetAccStrsByLayer(layer.Name); foreach (string accssname in accessStrs) { diff --git a/FeatureTools.cs b/FeatureTools.cs index be4b469..3c08f34 100644 --- a/FeatureTools.cs +++ b/FeatureTools.cs @@ -1,5 +1,6 @@ using System; using System.Collections.Generic; +using System.Data; using System.Linq; using System.Text; using System.Windows.Forms; @@ -43,7 +44,7 @@ } feature.Delete();//地球上删除该feature string sql = "delete from " + layerName + " where LSSYS_ID =" + feature.ID + " and (编号 is null or substr(编号,length(编号)-2)='TMP')"; - OledbHelper.sqlExecuteNonQuery(sql);//目前无法取到LSSYS_ID，所以这个判断条件不太合适，会导致把该类所有新建的都删除了 + OledbHelper.sqlExecuteNonQuery(sql); } catch (Exception) { @@ -106,5 +107,46 @@ } return value; } + + /// + /// 根据附属物图层名字得到里面含有的附属物 + /// + /// + /// + public static string[] GetAccStrsByLayer(string layername) + { + string[] accStrs = null; + string sql = "select 附属物名称 from " + layername + " group by 附属物名称"; + DataSet dataset = OledbHelper.getDataSet(sql, layername); + if (dataset == null) return null; + accStrs = new string[dataset.Tables[0].Rows.Count]; + for (int i = 0; i < dataset.Tables[0].Rows.Count; i++) + { + accStrs[i] = dataset.Tables[0].Rows[i][0].ToString(); + } + return accStrs; + } + + /// + /// 删除内存图层中指定名称的feature + /// + /// + /// + public static void RemoveFeatureFromName(GSOGlobeControl globeControl1, string featureName) + { + GSOFeatures features = globeControl1.Globe.MemoryLayer.GetFeatureByName(featureName, true); + if (features != null) + { + for (int i = features.Length - 1; i >= 0; i--) + { + GSOFeature feature = features[i]; + if (feature != null) + { + globeControl1.Globe.MemoryLayer.RemoveFeatureByID(feature.ID); + } + } + } + globeControl1.Refresh(); + } } } diff --git a/Forms/FrmPipelineModelDataBase.cs b/Forms/FrmPipelineModelDataBase.cs index b577fd8..bc1e479 100644 --- a/Forms/FrmPipelineModelDataBase.cs +++ b/Forms/FrmPipelineModelDataBase.cs @@ -149,7 +149,7 @@ catch (Exception ex) { LogError.PublishError(ex); - LogHelper.WriteLog(typeof(FrmPipelineModelDB), ex.Message); + LogHelper.Error(ex.Message); } } diff --git a/FrmAccessoriesSensor.cs b/FrmAccessoriesSensor.cs index 98aa1cf..542f19a 100644 --- a/FrmAccessoriesSensor.cs +++ b/FrmAccessoriesSensor.cs @@ -240,7 +240,7 @@ { if (clbPipeLine.CheckedItems.Count > 0) { - Utility.RemoveFeatureFromName(globeControl1, "trackPolygon"); + FeatureTools.RemoveFeatureFromName(globeControl1, "trackPolygon"); globeControl1.Globe.Action = EnumAction3D.TrackPolygon; globeControl1.TrackPolygonEndEvent += globeControl1_TrackPolygonEndEvent; } @@ -259,7 +259,7 @@ private void FrmAccessoriesgather_FormClosing(object sender, FormClosingEventArgs e) { frm = null; - Utility.RemoveFeatureFromName(globeControl1, "trackPolygon"); + FeatureTools.RemoveFeatureFromName(globeControl1, "trackPolygon"); globeControl1.Globe.Action = EnumAction3D.ActionNull; globeControl1.TrackPolygonEndEvent -= globeControl1_TrackPolygonEndEvent; } diff --git a/FrmAccessoriesgather.cs b/FrmAccessoriesgather.cs index e1d176e..c36273b 100644 --- a/FrmAccessoriesgather.cs +++ b/FrmAccessoriesgather.cs @@ -118,7 +118,7 @@ { if (clbPipeLine2.Text!="") { - Utility.RemoveFeatureFromName(globeControl1, "trackPolygon"); + FeatureTools.RemoveFeatureFromName(globeControl1, "trackPolygon"); globeControl1.Globe.Action = EnumAction3D.TrackPolygon; globeControl1.Globe.TrackPolygonTool.TrackMode = EnumTrackMode.SpaceTrack; globeControl1.TrackPolygonEndEvent += globeControl1_TrackPolygonEndEvent; @@ -295,7 +295,7 @@ private void FrmAccessoriesgather_FormClosing(object sender, FormClosingEventArgs e) { frm = null; - Utility.RemoveFeatureFromName(globeControl1, "trackPolygon"); + FeatureTools.RemoveFeatureFromName(globeControl1, "trackPolygon"); globeControl1.TrackPolygonEndEvent -= globeControl1_TrackPolygonEndEvent; globeControl1.Globe.Action = EnumAction3D.ActionNull; diff --git a/FrmAddWellShp.cs b/FrmAddWellShp.cs index 7983349..78d8946 100644 --- a/FrmAddWellShp.cs +++ b/FrmAddWellShp.cs @@ -100,7 +100,7 @@ catch (Exception ex) { LogError.PublishError(ex); - LogHelper.WriteLog(typeof(FrmAddWellShp), ex.Message); + LogHelper.Error(ex.Message); } } diff --git a/FrmBSQStatis.cs b/FrmBSQStatis.cs index 5b05926..b5e581d 100644 --- a/FrmBSQStatis.cs +++ b/FrmBSQStatis.cs @@ -97,7 +97,7 @@ } catch (Exception ex) { - LogHelper.WriteLog(typeof(FrmBSQStatis),ex.Message); + LogHelper.Error(ex.Message); } return typeAndCount; } @@ -108,7 +108,7 @@ GSOLayer layer = globeControl1.Globe.Layers.GetLayerByCaption("标识器"); GSOFeatures bsqFs = FeatureStatisticsService.GetLayerFeatures(polygon, layer); if (bsqFs == null || bsqFs.Length <= 0) { - LogHelper.WriteLog(typeof(FrmBSQStatis),"标识器图层下的Feature为空"); + LogHelper.Error("标识器图层下的Feature为空!"); return null; } diff --git a/FeatureStatisticsService.cs b/FeatureStatisticsService.cs index 331ee47..b127fe3 100644 --- a/FeatureStatisticsService.cs +++ b/FeatureStatisticsService.cs @@ -190,7 +190,7 @@ List result = new List(); //layer.Name是表名 - string[] accessStrs = Utility.getAccStrsByLayer(layer.Name); + string[] accessStrs = FeatureTools.GetAccStrsByLayer(layer.Name); foreach (string accssname in accessStrs) { diff --git a/FeatureTools.cs b/FeatureTools.cs index be4b469..3c08f34 100644 --- a/FeatureTools.cs +++ b/FeatureTools.cs @@ -1,5 +1,6 @@ using System; using System.Collections.Generic; +using System.Data; using System.Linq; using System.Text; using System.Windows.Forms; @@ -43,7 +44,7 @@ } feature.Delete();//地球上删除该feature string sql = "delete from " + layerName + " where LSSYS_ID =" + feature.ID + " and (编号 is null or substr(编号,length(编号)-2)='TMP')"; - OledbHelper.sqlExecuteNonQuery(sql);//目前无法取到LSSYS_ID，所以这个判断条件不太合适，会导致把该类所有新建的都删除了 + OledbHelper.sqlExecuteNonQuery(sql); } catch (Exception) { @@ -106,5 +107,46 @@ } return value; } + + /// + /// 根据附属物图层名字得到里面含有的附属物 + /// + /// + /// + public static string[] GetAccStrsByLayer(string layername) + { + string[] accStrs = null; + string sql = "select 附属物名称 from " + layername + " group by 附属物名称"; + DataSet dataset = OledbHelper.getDataSet(sql, layername); + if (dataset == null) return null; + accStrs = new string[dataset.Tables[0].Rows.Count]; + for (int i = 0; i < dataset.Tables[0].Rows.Count; i++) + { + accStrs[i] = dataset.Tables[0].Rows[i][0].ToString(); + } + return accStrs; + } + + /// + /// 删除内存图层中指定名称的feature + /// + /// + /// + public static void RemoveFeatureFromName(GSOGlobeControl globeControl1, string featureName) + { + GSOFeatures features = globeControl1.Globe.MemoryLayer.GetFeatureByName(featureName, true); + if (features != null) + { + for (int i = features.Length - 1; i >= 0; i--) + { + GSOFeature feature = features[i]; + if (feature != null) + { + globeControl1.Globe.MemoryLayer.RemoveFeatureByID(feature.ID); + } + } + } + globeControl1.Refresh(); + } } } diff --git a/Forms/FrmPipelineModelDataBase.cs b/Forms/FrmPipelineModelDataBase.cs index b577fd8..bc1e479 100644 --- a/Forms/FrmPipelineModelDataBase.cs +++ b/Forms/FrmPipelineModelDataBase.cs @@ -149,7 +149,7 @@ catch (Exception ex) { LogError.PublishError(ex); - LogHelper.WriteLog(typeof(FrmPipelineModelDB), ex.Message); + LogHelper.Error(ex.Message); } } diff --git a/FrmAccessoriesSensor.cs b/FrmAccessoriesSensor.cs index 98aa1cf..542f19a 100644 --- a/FrmAccessoriesSensor.cs +++ b/FrmAccessoriesSensor.cs @@ -240,7 +240,7 @@ { if (clbPipeLine.CheckedItems.Count > 0) { - Utility.RemoveFeatureFromName(globeControl1, "trackPolygon"); + FeatureTools.RemoveFeatureFromName(globeControl1, "trackPolygon"); globeControl1.Globe.Action = EnumAction3D.TrackPolygon; globeControl1.TrackPolygonEndEvent += globeControl1_TrackPolygonEndEvent; } @@ -259,7 +259,7 @@ private void FrmAccessoriesgather_FormClosing(object sender, FormClosingEventArgs e) { frm = null; - Utility.RemoveFeatureFromName(globeControl1, "trackPolygon"); + FeatureTools.RemoveFeatureFromName(globeControl1, "trackPolygon"); globeControl1.Globe.Action = EnumAction3D.ActionNull; globeControl1.TrackPolygonEndEvent -= globeControl1_TrackPolygonEndEvent; } diff --git a/FrmAccessoriesgather.cs b/FrmAccessoriesgather.cs index e1d176e..c36273b 100644 --- a/FrmAccessoriesgather.cs +++ b/FrmAccessoriesgather.cs @@ -118,7 +118,7 @@ { if (clbPipeLine2.Text!="") { - Utility.RemoveFeatureFromName(globeControl1, "trackPolygon"); + FeatureTools.RemoveFeatureFromName(globeControl1, "trackPolygon"); globeControl1.Globe.Action = EnumAction3D.TrackPolygon; globeControl1.Globe.TrackPolygonTool.TrackMode = EnumTrackMode.SpaceTrack; globeControl1.TrackPolygonEndEvent += globeControl1_TrackPolygonEndEvent; @@ -295,7 +295,7 @@ private void FrmAccessoriesgather_FormClosing(object sender, FormClosingEventArgs e) { frm = null; - Utility.RemoveFeatureFromName(globeControl1, "trackPolygon"); + FeatureTools.RemoveFeatureFromName(globeControl1, "trackPolygon"); globeControl1.TrackPolygonEndEvent -= globeControl1_TrackPolygonEndEvent; globeControl1.Globe.Action = EnumAction3D.ActionNull; diff --git a/FrmAddWellShp.cs b/FrmAddWellShp.cs index 7983349..78d8946 100644 --- a/FrmAddWellShp.cs +++ b/FrmAddWellShp.cs @@ -100,7 +100,7 @@ catch (Exception ex) { LogError.PublishError(ex); - LogHelper.WriteLog(typeof(FrmAddWellShp), ex.Message); + LogHelper.Error(ex.Message); } } diff --git a/FrmBSQStatis.cs b/FrmBSQStatis.cs index 5b05926..b5e581d 100644 --- a/FrmBSQStatis.cs +++ b/FrmBSQStatis.cs @@ -97,7 +97,7 @@ } catch (Exception ex) { - LogHelper.WriteLog(typeof(FrmBSQStatis),ex.Message); + LogHelper.Error(ex.Message); } return typeAndCount; } @@ -108,7 +108,7 @@ GSOLayer layer = globeControl1.Globe.Layers.GetLayerByCaption("标识器"); GSOFeatures bsqFs = FeatureStatisticsService.GetLayerFeatures(polygon, layer); if (bsqFs == null || bsqFs.Length <= 0) { - LogHelper.WriteLog(typeof(FrmBSQStatis),"标识器图层下的Feature为空"); + LogHelper.Error("标识器图层下的Feature为空!"); return null; } diff --git a/FrmBasicQuery.cs b/FrmBasicQuery.cs index baeeade..cc8d3ff 100644 --- a/FrmBasicQuery.cs +++ b/FrmBasicQuery.cs @@ -224,7 +224,7 @@ } catch(Exception ex) { - LogHelper.WriteLog(typeof(FrmBasicQuery), ex.Message); + LogHelper.Error(ex.Message); } } else diff --git a/FeatureStatisticsService.cs b/FeatureStatisticsService.cs index 331ee47..b127fe3 100644 --- a/FeatureStatisticsService.cs +++ b/FeatureStatisticsService.cs @@ -190,7 +190,7 @@ List result = new List(); //layer.Name是表名 - string[] accessStrs = Utility.getAccStrsByLayer(layer.Name); + string[] accessStrs = FeatureTools.GetAccStrsByLayer(layer.Name); foreach (string accssname in accessStrs) { diff --git a/FeatureTools.cs b/FeatureTools.cs index be4b469..3c08f34 100644 --- a/FeatureTools.cs +++ b/FeatureTools.cs @@ -1,5 +1,6 @@ using System; using System.Collections.Generic; +using System.Data; using System.Linq; using System.Text; using System.Windows.Forms; @@ -43,7 +44,7 @@ } feature.Delete();//地球上删除该feature string sql = "delete from " + layerName + " where LSSYS_ID =" + feature.ID + " and (编号 is null or substr(编号,length(编号)-2)='TMP')"; - OledbHelper.sqlExecuteNonQuery(sql);//目前无法取到LSSYS_ID，所以这个判断条件不太合适，会导致把该类所有新建的都删除了 + OledbHelper.sqlExecuteNonQuery(sql); } catch (Exception) { @@ -106,5 +107,46 @@ } return value; } + + /// + /// 根据附属物图层名字得到里面含有的附属物 + /// + /// + /// + public static string[] GetAccStrsByLayer(string layername) + { + string[] accStrs = null; + string sql = "select 附属物名称 from " + layername + " group by 附属物名称"; + DataSet dataset = OledbHelper.getDataSet(sql, layername); + if (dataset == null) return null; + accStrs = new string[dataset.Tables[0].Rows.Count]; + for (int i = 0; i < dataset.Tables[0].Rows.Count; i++) + { + accStrs[i] = dataset.Tables[0].Rows[i][0].ToString(); + } + return accStrs; + } + + /// + /// 删除内存图层中指定名称的feature + /// + /// + /// + public static void RemoveFeatureFromName(GSOGlobeControl globeControl1, string featureName) + { + GSOFeatures features = globeControl1.Globe.MemoryLayer.GetFeatureByName(featureName, true); + if (features != null) + { + for (int i = features.Length - 1; i >= 0; i--) + { + GSOFeature feature = features[i]; + if (feature != null) + { + globeControl1.Globe.MemoryLayer.RemoveFeatureByID(feature.ID); + } + } + } + globeControl1.Refresh(); + } } } diff --git a/Forms/FrmPipelineModelDataBase.cs b/Forms/FrmPipelineModelDataBase.cs index b577fd8..bc1e479 100644 --- a/Forms/FrmPipelineModelDataBase.cs +++ b/Forms/FrmPipelineModelDataBase.cs @@ -149,7 +149,7 @@ catch (Exception ex) { LogError.PublishError(ex); - LogHelper.WriteLog(typeof(FrmPipelineModelDB), ex.Message); + LogHelper.Error(ex.Message); } } diff --git a/FrmAccessoriesSensor.cs b/FrmAccessoriesSensor.cs index 98aa1cf..542f19a 100644 --- a/FrmAccessoriesSensor.cs +++ b/FrmAccessoriesSensor.cs @@ -240,7 +240,7 @@ { if (clbPipeLine.CheckedItems.Count > 0) { - Utility.RemoveFeatureFromName(globeControl1, "trackPolygon"); + FeatureTools.RemoveFeatureFromName(globeControl1, "trackPolygon"); globeControl1.Globe.Action = EnumAction3D.TrackPolygon; globeControl1.TrackPolygonEndEvent += globeControl1_TrackPolygonEndEvent; } @@ -259,7 +259,7 @@ private void FrmAccessoriesgather_FormClosing(object sender, FormClosingEventArgs e) { frm = null; - Utility.RemoveFeatureFromName(globeControl1, "trackPolygon"); + FeatureTools.RemoveFeatureFromName(globeControl1, "trackPolygon"); globeControl1.Globe.Action = EnumAction3D.ActionNull; globeControl1.TrackPolygonEndEvent -= globeControl1_TrackPolygonEndEvent; } diff --git a/FrmAccessoriesgather.cs b/FrmAccessoriesgather.cs index e1d176e..c36273b 100644 --- a/FrmAccessoriesgather.cs +++ b/FrmAccessoriesgather.cs @@ -118,7 +118,7 @@ { if (clbPipeLine2.Text!="") { - Utility.RemoveFeatureFromName(globeControl1, "trackPolygon"); + FeatureTools.RemoveFeatureFromName(globeControl1, "trackPolygon"); globeControl1.Globe.Action = EnumAction3D.TrackPolygon; globeControl1.Globe.TrackPolygonTool.TrackMode = EnumTrackMode.SpaceTrack; globeControl1.TrackPolygonEndEvent += globeControl1_TrackPolygonEndEvent; @@ -295,7 +295,7 @@ private void FrmAccessoriesgather_FormClosing(object sender, FormClosingEventArgs e) { frm = null; - Utility.RemoveFeatureFromName(globeControl1, "trackPolygon"); + FeatureTools.RemoveFeatureFromName(globeControl1, "trackPolygon"); globeControl1.TrackPolygonEndEvent -= globeControl1_TrackPolygonEndEvent; globeControl1.Globe.Action = EnumAction3D.ActionNull; diff --git a/FrmAddWellShp.cs b/FrmAddWellShp.cs index 7983349..78d8946 100644 --- a/FrmAddWellShp.cs +++ b/FrmAddWellShp.cs @@ -100,7 +100,7 @@ catch (Exception ex) { LogError.PublishError(ex); - LogHelper.WriteLog(typeof(FrmAddWellShp), ex.Message); + LogHelper.Error(ex.Message); } } diff --git a/FrmBSQStatis.cs b/FrmBSQStatis.cs index 5b05926..b5e581d 100644 --- a/FrmBSQStatis.cs +++ b/FrmBSQStatis.cs @@ -97,7 +97,7 @@ } catch (Exception ex) { - LogHelper.WriteLog(typeof(FrmBSQStatis),ex.Message); + LogHelper.Error(ex.Message); } return typeAndCount; } @@ -108,7 +108,7 @@ GSOLayer layer = globeControl1.Globe.Layers.GetLayerByCaption("标识器"); GSOFeatures bsqFs = FeatureStatisticsService.GetLayerFeatures(polygon, layer); if (bsqFs == null || bsqFs.Length <= 0) { - LogHelper.WriteLog(typeof(FrmBSQStatis),"标识器图层下的Feature为空"); + LogHelper.Error("标识器图层下的Feature为空!"); return null; } diff --git a/FrmBasicQuery.cs b/FrmBasicQuery.cs index baeeade..cc8d3ff 100644 --- a/FrmBasicQuery.cs +++ b/FrmBasicQuery.cs @@ -224,7 +224,7 @@ } catch(Exception ex) { - LogHelper.WriteLog(typeof(FrmBasicQuery), ex.Message); + LogHelper.Error(ex.Message); } } else diff --git a/FrmCodingQuery.cs b/FrmCodingQuery.cs index f1ac322..d4ec095 100644 --- a/FrmCodingQuery.cs +++ b/FrmCodingQuery.cs @@ -82,7 +82,7 @@ } catch (Exception ex) { - LogHelper.WriteLog(typeof(FrmCodingQuery), ex.Message); ; + LogHelper.Error(ex.Message); } } diff --git a/FeatureStatisticsService.cs b/FeatureStatisticsService.cs index 331ee47..b127fe3 100644 --- a/FeatureStatisticsService.cs +++ b/FeatureStatisticsService.cs @@ -190,7 +190,7 @@ List result = new List(); //layer.Name是表名 - string[] accessStrs = Utility.getAccStrsByLayer(layer.Name); + string[] accessStrs = FeatureTools.GetAccStrsByLayer(layer.Name); foreach (string accssname in accessStrs) { diff --git a/FeatureTools.cs b/FeatureTools.cs index be4b469..3c08f34 100644 --- a/FeatureTools.cs +++ b/FeatureTools.cs @@ -1,5 +1,6 @@ using System; using System.Collections.Generic; +using System.Data; using System.Linq; using System.Text; using System.Windows.Forms; @@ -43,7 +44,7 @@ } feature.Delete();//地球上删除该feature string sql = "delete from " + layerName + " where LSSYS_ID =" + feature.ID + " and (编号 is null or substr(编号,length(编号)-2)='TMP')"; - OledbHelper.sqlExecuteNonQuery(sql);//目前无法取到LSSYS_ID，所以这个判断条件不太合适，会导致把该类所有新建的都删除了 + OledbHelper.sqlExecuteNonQuery(sql); } catch (Exception) { @@ -106,5 +107,46 @@ } return value; } + + /// + /// 根据附属物图层名字得到里面含有的附属物 + /// + /// + /// + public static string[] GetAccStrsByLayer(string layername) + { + string[] accStrs = null; + string sql = "select 附属物名称 from " + layername + " group by 附属物名称"; + DataSet dataset = OledbHelper.getDataSet(sql, layername); + if (dataset == null) return null; + accStrs = new string[dataset.Tables[0].Rows.Count]; + for (int i = 0; i < dataset.Tables[0].Rows.Count; i++) + { + accStrs[i] = dataset.Tables[0].Rows[i][0].ToString(); + } + return accStrs; + } + + /// + /// 删除内存图层中指定名称的feature + /// + /// + /// + public static void RemoveFeatureFromName(GSOGlobeControl globeControl1, string featureName) + { + GSOFeatures features = globeControl1.Globe.MemoryLayer.GetFeatureByName(featureName, true); + if (features != null) + { + for (int i = features.Length - 1; i >= 0; i--) + { + GSOFeature feature = features[i]; + if (feature != null) + { + globeControl1.Globe.MemoryLayer.RemoveFeatureByID(feature.ID); + } + } + } + globeControl1.Refresh(); + } } } diff --git a/Forms/FrmPipelineModelDataBase.cs b/Forms/FrmPipelineModelDataBase.cs index b577fd8..bc1e479 100644 --- a/Forms/FrmPipelineModelDataBase.cs +++ b/Forms/FrmPipelineModelDataBase.cs @@ -149,7 +149,7 @@ catch (Exception ex) { LogError.PublishError(ex); - LogHelper.WriteLog(typeof(FrmPipelineModelDB), ex.Message); + LogHelper.Error(ex.Message); } } diff --git a/FrmAccessoriesSensor.cs b/FrmAccessoriesSensor.cs index 98aa1cf..542f19a 100644 --- a/FrmAccessoriesSensor.cs +++ b/FrmAccessoriesSensor.cs @@ -240,7 +240,7 @@ { if (clbPipeLine.CheckedItems.Count > 0) { - Utility.RemoveFeatureFromName(globeControl1, "trackPolygon"); + FeatureTools.RemoveFeatureFromName(globeControl1, "trackPolygon"); globeControl1.Globe.Action = EnumAction3D.TrackPolygon; globeControl1.TrackPolygonEndEvent += globeControl1_TrackPolygonEndEvent; } @@ -259,7 +259,7 @@ private void FrmAccessoriesgather_FormClosing(object sender, FormClosingEventArgs e) { frm = null; - Utility.RemoveFeatureFromName(globeControl1, "trackPolygon"); + FeatureTools.RemoveFeatureFromName(globeControl1, "trackPolygon"); globeControl1.Globe.Action = EnumAction3D.ActionNull; globeControl1.TrackPolygonEndEvent -= globeControl1_TrackPolygonEndEvent; } diff --git a/FrmAccessoriesgather.cs b/FrmAccessoriesgather.cs index e1d176e..c36273b 100644 --- a/FrmAccessoriesgather.cs +++ b/FrmAccessoriesgather.cs @@ -118,7 +118,7 @@ { if (clbPipeLine2.Text!="") { - Utility.RemoveFeatureFromName(globeControl1, "trackPolygon"); + FeatureTools.RemoveFeatureFromName(globeControl1, "trackPolygon"); globeControl1.Globe.Action = EnumAction3D.TrackPolygon; globeControl1.Globe.TrackPolygonTool.TrackMode = EnumTrackMode.SpaceTrack; globeControl1.TrackPolygonEndEvent += globeControl1_TrackPolygonEndEvent; @@ -295,7 +295,7 @@ private void FrmAccessoriesgather_FormClosing(object sender, FormClosingEventArgs e) { frm = null; - Utility.RemoveFeatureFromName(globeControl1, "trackPolygon"); + FeatureTools.RemoveFeatureFromName(globeControl1, "trackPolygon"); globeControl1.TrackPolygonEndEvent -= globeControl1_TrackPolygonEndEvent; globeControl1.Globe.Action = EnumAction3D.ActionNull; diff --git a/FrmAddWellShp.cs b/FrmAddWellShp.cs index 7983349..78d8946 100644 --- a/FrmAddWellShp.cs +++ b/FrmAddWellShp.cs @@ -100,7 +100,7 @@ catch (Exception ex) { LogError.PublishError(ex); - LogHelper.WriteLog(typeof(FrmAddWellShp), ex.Message); + LogHelper.Error(ex.Message); } } diff --git a/FrmBSQStatis.cs b/FrmBSQStatis.cs index 5b05926..b5e581d 100644 --- a/FrmBSQStatis.cs +++ b/FrmBSQStatis.cs @@ -97,7 +97,7 @@ } catch (Exception ex) { - LogHelper.WriteLog(typeof(FrmBSQStatis),ex.Message); + LogHelper.Error(ex.Message); } return typeAndCount; } @@ -108,7 +108,7 @@ GSOLayer layer = globeControl1.Globe.Layers.GetLayerByCaption("标识器"); GSOFeatures bsqFs = FeatureStatisticsService.GetLayerFeatures(polygon, layer); if (bsqFs == null || bsqFs.Length <= 0) { - LogHelper.WriteLog(typeof(FrmBSQStatis),"标识器图层下的Feature为空"); + LogHelper.Error("标识器图层下的Feature为空!"); return null; } diff --git a/FrmBasicQuery.cs b/FrmBasicQuery.cs index baeeade..cc8d3ff 100644 --- a/FrmBasicQuery.cs +++ b/FrmBasicQuery.cs @@ -224,7 +224,7 @@ } catch(Exception ex) { - LogHelper.WriteLog(typeof(FrmBasicQuery), ex.Message); + LogHelper.Error(ex.Message); } } else diff --git a/FrmCodingQuery.cs b/FrmCodingQuery.cs index f1ac322..d4ec095 100644 --- a/FrmCodingQuery.cs +++ b/FrmCodingQuery.cs @@ -82,7 +82,7 @@ } catch (Exception ex) { - LogHelper.WriteLog(typeof(FrmCodingQuery), ex.Message); ; + LogHelper.Error(ex.Message); } } diff --git a/FrmDiameterQuery.cs b/FrmDiameterQuery.cs index e7b3657..75d7949 100644 --- a/FrmDiameterQuery.cs +++ b/FrmDiameterQuery.cs @@ -150,7 +150,7 @@ catch (Exception ex) { //LogError.PublishError(ex); - LogHelper.WriteLog(typeof(FrmDiameterQuery), ex.Message); + LogHelper.Error(ex.Message); MessageBox.Show("请输入正确的管径范围！"); return; } diff --git a/FeatureStatisticsService.cs b/FeatureStatisticsService.cs index 331ee47..b127fe3 100644 --- a/FeatureStatisticsService.cs +++ b/FeatureStatisticsService.cs @@ -190,7 +190,7 @@ List result = new List(); //layer.Name是表名 - string[] accessStrs = Utility.getAccStrsByLayer(layer.Name); + string[] accessStrs = FeatureTools.GetAccStrsByLayer(layer.Name); foreach (string accssname in accessStrs) { diff --git a/FeatureTools.cs b/FeatureTools.cs index be4b469..3c08f34 100644 --- a/FeatureTools.cs +++ b/FeatureTools.cs @@ -1,5 +1,6 @@ using System; using System.Collections.Generic; +using System.Data; using System.Linq; using System.Text; using System.Windows.Forms; @@ -43,7 +44,7 @@ } feature.Delete();//地球上删除该feature string sql = "delete from " + layerName + " where LSSYS_ID =" + feature.ID + " and (编号 is null or substr(编号,length(编号)-2)='TMP')"; - OledbHelper.sqlExecuteNonQuery(sql);//目前无法取到LSSYS_ID，所以这个判断条件不太合适，会导致把该类所有新建的都删除了 + OledbHelper.sqlExecuteNonQuery(sql); } catch (Exception) { @@ -106,5 +107,46 @@ } return value; } + + /// + /// 根据附属物图层名字得到里面含有的附属物 + /// + /// + /// + public static string[] GetAccStrsByLayer(string layername) + { + string[] accStrs = null; + string sql = "select 附属物名称 from " + layername + " group by 附属物名称"; + DataSet dataset = OledbHelper.getDataSet(sql, layername); + if (dataset == null) return null; + accStrs = new string[dataset.Tables[0].Rows.Count]; + for (int i = 0; i < dataset.Tables[0].Rows.Count; i++) + { + accStrs[i] = dataset.Tables[0].Rows[i][0].ToString(); + } + return accStrs; + } + + /// + /// 删除内存图层中指定名称的feature + /// + /// + /// + public static void RemoveFeatureFromName(GSOGlobeControl globeControl1, string featureName) + { + GSOFeatures features = globeControl1.Globe.MemoryLayer.GetFeatureByName(featureName, true); + if (features != null) + { + for (int i = features.Length - 1; i >= 0; i--) + { + GSOFeature feature = features[i]; + if (feature != null) + { + globeControl1.Globe.MemoryLayer.RemoveFeatureByID(feature.ID); + } + } + } + globeControl1.Refresh(); + } } } diff --git a/Forms/FrmPipelineModelDataBase.cs b/Forms/FrmPipelineModelDataBase.cs index b577fd8..bc1e479 100644 --- a/Forms/FrmPipelineModelDataBase.cs +++ b/Forms/FrmPipelineModelDataBase.cs @@ -149,7 +149,7 @@ catch (Exception ex) { LogError.PublishError(ex); - LogHelper.WriteLog(typeof(FrmPipelineModelDB), ex.Message); + LogHelper.Error(ex.Message); } } diff --git a/FrmAccessoriesSensor.cs b/FrmAccessoriesSensor.cs index 98aa1cf..542f19a 100644 --- a/FrmAccessoriesSensor.cs +++ b/FrmAccessoriesSensor.cs @@ -240,7 +240,7 @@ { if (clbPipeLine.CheckedItems.Count > 0) { - Utility.RemoveFeatureFromName(globeControl1, "trackPolygon"); + FeatureTools.RemoveFeatureFromName(globeControl1, "trackPolygon"); globeControl1.Globe.Action = EnumAction3D.TrackPolygon; globeControl1.TrackPolygonEndEvent += globeControl1_TrackPolygonEndEvent; } @@ -259,7 +259,7 @@ private void FrmAccessoriesgather_FormClosing(object sender, FormClosingEventArgs e) { frm = null; - Utility.RemoveFeatureFromName(globeControl1, "trackPolygon"); + FeatureTools.RemoveFeatureFromName(globeControl1, "trackPolygon"); globeControl1.Globe.Action = EnumAction3D.ActionNull; globeControl1.TrackPolygonEndEvent -= globeControl1_TrackPolygonEndEvent; } diff --git a/FrmAccessoriesgather.cs b/FrmAccessoriesgather.cs index e1d176e..c36273b 100644 --- a/FrmAccessoriesgather.cs +++ b/FrmAccessoriesgather.cs @@ -118,7 +118,7 @@ { if (clbPipeLine2.Text!="") { - Utility.RemoveFeatureFromName(globeControl1, "trackPolygon"); + FeatureTools.RemoveFeatureFromName(globeControl1, "trackPolygon"); globeControl1.Globe.Action = EnumAction3D.TrackPolygon; globeControl1.Globe.TrackPolygonTool.TrackMode = EnumTrackMode.SpaceTrack; globeControl1.TrackPolygonEndEvent += globeControl1_TrackPolygonEndEvent; @@ -295,7 +295,7 @@ private void FrmAccessoriesgather_FormClosing(object sender, FormClosingEventArgs e) { frm = null; - Utility.RemoveFeatureFromName(globeControl1, "trackPolygon"); + FeatureTools.RemoveFeatureFromName(globeControl1, "trackPolygon"); globeControl1.TrackPolygonEndEvent -= globeControl1_TrackPolygonEndEvent; globeControl1.Globe.Action = EnumAction3D.ActionNull; diff --git a/FrmAddWellShp.cs b/FrmAddWellShp.cs index 7983349..78d8946 100644 --- a/FrmAddWellShp.cs +++ b/FrmAddWellShp.cs @@ -100,7 +100,7 @@ catch (Exception ex) { LogError.PublishError(ex); - LogHelper.WriteLog(typeof(FrmAddWellShp), ex.Message); + LogHelper.Error(ex.Message); } } diff --git a/FrmBSQStatis.cs b/FrmBSQStatis.cs index 5b05926..b5e581d 100644 --- a/FrmBSQStatis.cs +++ b/FrmBSQStatis.cs @@ -97,7 +97,7 @@ } catch (Exception ex) { - LogHelper.WriteLog(typeof(FrmBSQStatis),ex.Message); + LogHelper.Error(ex.Message); } return typeAndCount; } @@ -108,7 +108,7 @@ GSOLayer layer = globeControl1.Globe.Layers.GetLayerByCaption("标识器"); GSOFeatures bsqFs = FeatureStatisticsService.GetLayerFeatures(polygon, layer); if (bsqFs == null || bsqFs.Length <= 0) { - LogHelper.WriteLog(typeof(FrmBSQStatis),"标识器图层下的Feature为空"); + LogHelper.Error("标识器图层下的Feature为空!"); return null; } diff --git a/FrmBasicQuery.cs b/FrmBasicQuery.cs index baeeade..cc8d3ff 100644 --- a/FrmBasicQuery.cs +++ b/FrmBasicQuery.cs @@ -224,7 +224,7 @@ } catch(Exception ex) { - LogHelper.WriteLog(typeof(FrmBasicQuery), ex.Message); + LogHelper.Error(ex.Message); } } else diff --git a/FrmCodingQuery.cs b/FrmCodingQuery.cs index f1ac322..d4ec095 100644 --- a/FrmCodingQuery.cs +++ b/FrmCodingQuery.cs @@ -82,7 +82,7 @@ } catch (Exception ex) { - LogHelper.WriteLog(typeof(FrmCodingQuery), ex.Message); ; + LogHelper.Error(ex.Message); } } diff --git a/FrmDiameterQuery.cs b/FrmDiameterQuery.cs index e7b3657..75d7949 100644 --- a/FrmDiameterQuery.cs +++ b/FrmDiameterQuery.cs @@ -150,7 +150,7 @@ catch (Exception ex) { //LogError.PublishError(ex); - LogHelper.WriteLog(typeof(FrmDiameterQuery), ex.Message); + LogHelper.Error(ex.Message); MessageBox.Show("请输入正确的管径范围！"); return; } diff --git a/FrmFittingQuery.cs b/FrmFittingQuery.cs index 12f6007..8645011 100644 --- a/FrmFittingQuery.cs +++ b/FrmFittingQuery.cs @@ -69,7 +69,7 @@ } catch (Exception ex) { - LogHelper.WriteLog(typeof(FrmFittingQuery), ex.Message); + LogHelper.Error(ex.Message); } } /// diff --git a/FeatureStatisticsService.cs b/FeatureStatisticsService.cs index 331ee47..b127fe3 100644 --- a/FeatureStatisticsService.cs +++ b/FeatureStatisticsService.cs @@ -190,7 +190,7 @@ List result = new List(); //layer.Name是表名 - string[] accessStrs = Utility.getAccStrsByLayer(layer.Name); + string[] accessStrs = FeatureTools.GetAccStrsByLayer(layer.Name); foreach (string accssname in accessStrs) { diff --git a/FeatureTools.cs b/FeatureTools.cs index be4b469..3c08f34 100644 --- a/FeatureTools.cs +++ b/FeatureTools.cs @@ -1,5 +1,6 @@ using System; using System.Collections.Generic; +using System.Data; using System.Linq; using System.Text; using System.Windows.Forms; @@ -43,7 +44,7 @@ } feature.Delete();//地球上删除该feature string sql = "delete from " + layerName + " where LSSYS_ID =" + feature.ID + " and (编号 is null or substr(编号,length(编号)-2)='TMP')"; - OledbHelper.sqlExecuteNonQuery(sql);//目前无法取到LSSYS_ID，所以这个判断条件不太合适，会导致把该类所有新建的都删除了 + OledbHelper.sqlExecuteNonQuery(sql); } catch (Exception) { @@ -106,5 +107,46 @@ } return value; } + + /// + /// 根据附属物图层名字得到里面含有的附属物 + /// + /// + /// + public static string[] GetAccStrsByLayer(string layername) + { + string[] accStrs = null; + string sql = "select 附属物名称 from " + layername + " group by 附属物名称"; + DataSet dataset = OledbHelper.getDataSet(sql, layername); + if (dataset == null) return null; + accStrs = new string[dataset.Tables[0].Rows.Count]; + for (int i = 0; i < dataset.Tables[0].Rows.Count; i++) + { + accStrs[i] = dataset.Tables[0].Rows[i][0].ToString(); + } + return accStrs; + } + + /// + /// 删除内存图层中指定名称的feature + /// + /// + /// + public static void RemoveFeatureFromName(GSOGlobeControl globeControl1, string featureName) + { + GSOFeatures features = globeControl1.Globe.MemoryLayer.GetFeatureByName(featureName, true); + if (features != null) + { + for (int i = features.Length - 1; i >= 0; i--) + { + GSOFeature feature = features[i]; + if (feature != null) + { + globeControl1.Globe.MemoryLayer.RemoveFeatureByID(feature.ID); + } + } + } + globeControl1.Refresh(); + } } } diff --git a/Forms/FrmPipelineModelDataBase.cs b/Forms/FrmPipelineModelDataBase.cs index b577fd8..bc1e479 100644 --- a/Forms/FrmPipelineModelDataBase.cs +++ b/Forms/FrmPipelineModelDataBase.cs @@ -149,7 +149,7 @@ catch (Exception ex) { LogError.PublishError(ex); - LogHelper.WriteLog(typeof(FrmPipelineModelDB), ex.Message); + LogHelper.Error(ex.Message); } } diff --git a/FrmAccessoriesSensor.cs b/FrmAccessoriesSensor.cs index 98aa1cf..542f19a 100644 --- a/FrmAccessoriesSensor.cs +++ b/FrmAccessoriesSensor.cs @@ -240,7 +240,7 @@ { if (clbPipeLine.CheckedItems.Count > 0) { - Utility.RemoveFeatureFromName(globeControl1, "trackPolygon"); + FeatureTools.RemoveFeatureFromName(globeControl1, "trackPolygon"); globeControl1.Globe.Action = EnumAction3D.TrackPolygon; globeControl1.TrackPolygonEndEvent += globeControl1_TrackPolygonEndEvent; } @@ -259,7 +259,7 @@ private void FrmAccessoriesgather_FormClosing(object sender, FormClosingEventArgs e) { frm = null; - Utility.RemoveFeatureFromName(globeControl1, "trackPolygon"); + FeatureTools.RemoveFeatureFromName(globeControl1, "trackPolygon"); globeControl1.Globe.Action = EnumAction3D.ActionNull; globeControl1.TrackPolygonEndEvent -= globeControl1_TrackPolygonEndEvent; } diff --git a/FrmAccessoriesgather.cs b/FrmAccessoriesgather.cs index e1d176e..c36273b 100644 --- a/FrmAccessoriesgather.cs +++ b/FrmAccessoriesgather.cs @@ -118,7 +118,7 @@ { if (clbPipeLine2.Text!="") { - Utility.RemoveFeatureFromName(globeControl1, "trackPolygon"); + FeatureTools.RemoveFeatureFromName(globeControl1, "trackPolygon"); globeControl1.Globe.Action = EnumAction3D.TrackPolygon; globeControl1.Globe.TrackPolygonTool.TrackMode = EnumTrackMode.SpaceTrack; globeControl1.TrackPolygonEndEvent += globeControl1_TrackPolygonEndEvent; @@ -295,7 +295,7 @@ private void FrmAccessoriesgather_FormClosing(object sender, FormClosingEventArgs e) { frm = null; - Utility.RemoveFeatureFromName(globeControl1, "trackPolygon"); + FeatureTools.RemoveFeatureFromName(globeControl1, "trackPolygon"); globeControl1.TrackPolygonEndEvent -= globeControl1_TrackPolygonEndEvent; globeControl1.Globe.Action = EnumAction3D.ActionNull; diff --git a/FrmAddWellShp.cs b/FrmAddWellShp.cs index 7983349..78d8946 100644 --- a/FrmAddWellShp.cs +++ b/FrmAddWellShp.cs @@ -100,7 +100,7 @@ catch (Exception ex) { LogError.PublishError(ex); - LogHelper.WriteLog(typeof(FrmAddWellShp), ex.Message); + LogHelper.Error(ex.Message); } } diff --git a/FrmBSQStatis.cs b/FrmBSQStatis.cs index 5b05926..b5e581d 100644 --- a/FrmBSQStatis.cs +++ b/FrmBSQStatis.cs @@ -97,7 +97,7 @@ } catch (Exception ex) { - LogHelper.WriteLog(typeof(FrmBSQStatis),ex.Message); + LogHelper.Error(ex.Message); } return typeAndCount; } @@ -108,7 +108,7 @@ GSOLayer layer = globeControl1.Globe.Layers.GetLayerByCaption("标识器"); GSOFeatures bsqFs = FeatureStatisticsService.GetLayerFeatures(polygon, layer); if (bsqFs == null || bsqFs.Length <= 0) { - LogHelper.WriteLog(typeof(FrmBSQStatis),"标识器图层下的Feature为空"); + LogHelper.Error("标识器图层下的Feature为空!"); return null; } diff --git a/FrmBasicQuery.cs b/FrmBasicQuery.cs index baeeade..cc8d3ff 100644 --- a/FrmBasicQuery.cs +++ b/FrmBasicQuery.cs @@ -224,7 +224,7 @@ } catch(Exception ex) { - LogHelper.WriteLog(typeof(FrmBasicQuery), ex.Message); + LogHelper.Error(ex.Message); } } else diff --git a/FrmCodingQuery.cs b/FrmCodingQuery.cs index f1ac322..d4ec095 100644 --- a/FrmCodingQuery.cs +++ b/FrmCodingQuery.cs @@ -82,7 +82,7 @@ } catch (Exception ex) { - LogHelper.WriteLog(typeof(FrmCodingQuery), ex.Message); ; + LogHelper.Error(ex.Message); } } diff --git a/FrmDiameterQuery.cs b/FrmDiameterQuery.cs index e7b3657..75d7949 100644 --- a/FrmDiameterQuery.cs +++ b/FrmDiameterQuery.cs @@ -150,7 +150,7 @@ catch (Exception ex) { //LogError.PublishError(ex); - LogHelper.WriteLog(typeof(FrmDiameterQuery), ex.Message); + LogHelper.Error(ex.Message); MessageBox.Show("请输入正确的管径范围！"); return; } diff --git a/FrmFittingQuery.cs b/FrmFittingQuery.cs index 12f6007..8645011 100644 --- a/FrmFittingQuery.cs +++ b/FrmFittingQuery.cs @@ -69,7 +69,7 @@ } catch (Exception ex) { - LogHelper.WriteLog(typeof(FrmFittingQuery), ex.Message); + LogHelper.Error(ex.Message); } } /// diff --git a/FrmKeywordQuery.cs b/FrmKeywordQuery.cs index 405524f..ede0a93 100644 --- a/FrmKeywordQuery.cs +++ b/FrmKeywordQuery.cs @@ -87,7 +87,7 @@ } catch (Exception ex) { - LogHelper.WriteLog(typeof(FrmKeywordQuery), ex.Message); + LogHelper.Error(ex.Message); } } diff --git a/FeatureStatisticsService.cs b/FeatureStatisticsService.cs index 331ee47..b127fe3 100644 --- a/FeatureStatisticsService.cs +++ b/FeatureStatisticsService.cs @@ -190,7 +190,7 @@ List result = new List(); //layer.Name是表名 - string[] accessStrs = Utility.getAccStrsByLayer(layer.Name); + string[] accessStrs = FeatureTools.GetAccStrsByLayer(layer.Name); foreach (string accssname in accessStrs) { diff --git a/FeatureTools.cs b/FeatureTools.cs index be4b469..3c08f34 100644 --- a/FeatureTools.cs +++ b/FeatureTools.cs @@ -1,5 +1,6 @@ using System; using System.Collections.Generic; +using System.Data; using System.Linq; using System.Text; using System.Windows.Forms; @@ -43,7 +44,7 @@ } feature.Delete();//地球上删除该feature string sql = "delete from " + layerName + " where LSSYS_ID =" + feature.ID + " and (编号 is null or substr(编号,length(编号)-2)='TMP')"; - OledbHelper.sqlExecuteNonQuery(sql);//目前无法取到LSSYS_ID，所以这个判断条件不太合适，会导致把该类所有新建的都删除了 + OledbHelper.sqlExecuteNonQuery(sql); } catch (Exception) { @@ -106,5 +107,46 @@ } return value; } + + /// + /// 根据附属物图层名字得到里面含有的附属物 + /// + /// + /// + public static string[] GetAccStrsByLayer(string layername) + { + string[] accStrs = null; + string sql = "select 附属物名称 from " + layername + " group by 附属物名称"; + DataSet dataset = OledbHelper.getDataSet(sql, layername); + if (dataset == null) return null; + accStrs = new string[dataset.Tables[0].Rows.Count]; + for (int i = 0; i < dataset.Tables[0].Rows.Count; i++) + { + accStrs[i] = dataset.Tables[0].Rows[i][0].ToString(); + } + return accStrs; + } + + /// + /// 删除内存图层中指定名称的feature + /// + /// + /// + public static void RemoveFeatureFromName(GSOGlobeControl globeControl1, string featureName) + { + GSOFeatures features = globeControl1.Globe.MemoryLayer.GetFeatureByName(featureName, true); + if (features != null) + { + for (int i = features.Length - 1; i >= 0; i--) + { + GSOFeature feature = features[i]; + if (feature != null) + { + globeControl1.Globe.MemoryLayer.RemoveFeatureByID(feature.ID); + } + } + } + globeControl1.Refresh(); + } } } diff --git a/Forms/FrmPipelineModelDataBase.cs b/Forms/FrmPipelineModelDataBase.cs index b577fd8..bc1e479 100644 --- a/Forms/FrmPipelineModelDataBase.cs +++ b/Forms/FrmPipelineModelDataBase.cs @@ -149,7 +149,7 @@ catch (Exception ex) { LogError.PublishError(ex); - LogHelper.WriteLog(typeof(FrmPipelineModelDB), ex.Message); + LogHelper.Error(ex.Message); } } diff --git a/FrmAccessoriesSensor.cs b/FrmAccessoriesSensor.cs index 98aa1cf..542f19a 100644 --- a/FrmAccessoriesSensor.cs +++ b/FrmAccessoriesSensor.cs @@ -240,7 +240,7 @@ { if (clbPipeLine.CheckedItems.Count > 0) { - Utility.RemoveFeatureFromName(globeControl1, "trackPolygon"); + FeatureTools.RemoveFeatureFromName(globeControl1, "trackPolygon"); globeControl1.Globe.Action = EnumAction3D.TrackPolygon; globeControl1.TrackPolygonEndEvent += globeControl1_TrackPolygonEndEvent; } @@ -259,7 +259,7 @@ private void FrmAccessoriesgather_FormClosing(object sender, FormClosingEventArgs e) { frm = null; - Utility.RemoveFeatureFromName(globeControl1, "trackPolygon"); + FeatureTools.RemoveFeatureFromName(globeControl1, "trackPolygon"); globeControl1.Globe.Action = EnumAction3D.ActionNull; globeControl1.TrackPolygonEndEvent -= globeControl1_TrackPolygonEndEvent; } diff --git a/FrmAccessoriesgather.cs b/FrmAccessoriesgather.cs index e1d176e..c36273b 100644 --- a/FrmAccessoriesgather.cs +++ b/FrmAccessoriesgather.cs @@ -118,7 +118,7 @@ { if (clbPipeLine2.Text!="") { - Utility.RemoveFeatureFromName(globeControl1, "trackPolygon"); + FeatureTools.RemoveFeatureFromName(globeControl1, "trackPolygon"); globeControl1.Globe.Action = EnumAction3D.TrackPolygon; globeControl1.Globe.TrackPolygonTool.TrackMode = EnumTrackMode.SpaceTrack; globeControl1.TrackPolygonEndEvent += globeControl1_TrackPolygonEndEvent; @@ -295,7 +295,7 @@ private void FrmAccessoriesgather_FormClosing(object sender, FormClosingEventArgs e) { frm = null; - Utility.RemoveFeatureFromName(globeControl1, "trackPolygon"); + FeatureTools.RemoveFeatureFromName(globeControl1, "trackPolygon"); globeControl1.TrackPolygonEndEvent -= globeControl1_TrackPolygonEndEvent; globeControl1.Globe.Action = EnumAction3D.ActionNull; diff --git a/FrmAddWellShp.cs b/FrmAddWellShp.cs index 7983349..78d8946 100644 --- a/FrmAddWellShp.cs +++ b/FrmAddWellShp.cs @@ -100,7 +100,7 @@ catch (Exception ex) { LogError.PublishError(ex); - LogHelper.WriteLog(typeof(FrmAddWellShp), ex.Message); + LogHelper.Error(ex.Message); } } diff --git a/FrmBSQStatis.cs b/FrmBSQStatis.cs index 5b05926..b5e581d 100644 --- a/FrmBSQStatis.cs +++ b/FrmBSQStatis.cs @@ -97,7 +97,7 @@ } catch (Exception ex) { - LogHelper.WriteLog(typeof(FrmBSQStatis),ex.Message); + LogHelper.Error(ex.Message); } return typeAndCount; } @@ -108,7 +108,7 @@ GSOLayer layer = globeControl1.Globe.Layers.GetLayerByCaption("标识器"); GSOFeatures bsqFs = FeatureStatisticsService.GetLayerFeatures(polygon, layer); if (bsqFs == null || bsqFs.Length <= 0) { - LogHelper.WriteLog(typeof(FrmBSQStatis),"标识器图层下的Feature为空"); + LogHelper.Error("标识器图层下的Feature为空!"); return null; } diff --git a/FrmBasicQuery.cs b/FrmBasicQuery.cs index baeeade..cc8d3ff 100644 --- a/FrmBasicQuery.cs +++ b/FrmBasicQuery.cs @@ -224,7 +224,7 @@ } catch(Exception ex) { - LogHelper.WriteLog(typeof(FrmBasicQuery), ex.Message); + LogHelper.Error(ex.Message); } } else diff --git a/FrmCodingQuery.cs b/FrmCodingQuery.cs index f1ac322..d4ec095 100644 --- a/FrmCodingQuery.cs +++ b/FrmCodingQuery.cs @@ -82,7 +82,7 @@ } catch (Exception ex) { - LogHelper.WriteLog(typeof(FrmCodingQuery), ex.Message); ; + LogHelper.Error(ex.Message); } } diff --git a/FrmDiameterQuery.cs b/FrmDiameterQuery.cs index e7b3657..75d7949 100644 --- a/FrmDiameterQuery.cs +++ b/FrmDiameterQuery.cs @@ -150,7 +150,7 @@ catch (Exception ex) { //LogError.PublishError(ex); - LogHelper.WriteLog(typeof(FrmDiameterQuery), ex.Message); + LogHelper.Error(ex.Message); MessageBox.Show("请输入正确的管径范围！"); return; } diff --git a/FrmFittingQuery.cs b/FrmFittingQuery.cs index 12f6007..8645011 100644 --- a/FrmFittingQuery.cs +++ b/FrmFittingQuery.cs @@ -69,7 +69,7 @@ } catch (Exception ex) { - LogHelper.WriteLog(typeof(FrmFittingQuery), ex.Message); + LogHelper.Error(ex.Message); } } /// diff --git a/FrmKeywordQuery.cs b/FrmKeywordQuery.cs index 405524f..ede0a93 100644 --- a/FrmKeywordQuery.cs +++ b/FrmKeywordQuery.cs @@ -87,7 +87,7 @@ } catch (Exception ex) { - LogHelper.WriteLog(typeof(FrmKeywordQuery), ex.Message); + LogHelper.Error(ex.Message); } } diff --git a/FrmLogin.cs b/FrmLogin.cs index 1172c23..6fbaed9 100644 --- a/FrmLogin.cs +++ b/FrmLogin.cs @@ -2,6 +2,8 @@ using System.Data; using System.Data.OracleClient; using System.IO; +using System.Net; +using System.Text; using System.Windows.Forms; using System.Xml; using DevComponents.DotNetBar; @@ -10,16 +12,15 @@ { public partial class FrmLogin : Office2007Form { + + //登录界面 -- 配置文件的路径 + public static string filename = Application.StartupPath + "\\login.xml"; + + public FrmLogin() { InitializeComponent(); } - public string rolename = "浏览"; - public string username = ""; - public string department = ""; - - //登录界面 -- 配置文件的路径 - public static string filename = Application.StartupPath + "\\login.xml"; /// /// 登录按钮事件处理 /// @@ -28,9 +29,10 @@ private void button1_Click(object sender, EventArgs e) { bool result = ValidateUser(); +// bool result =ValidateFromUrl();//从平台获取用户角色信息，判断是否能登陆成功 if (result) { - username = txtUser.Text.Trim(); + WriteXml(); Utility.userName = txtUser.Text.Trim(); DialogResult = DialogResult.OK; Close(); @@ -43,80 +45,6 @@ } } /// - /// 关闭按钮事件处理 - /// - /// - /// - private void button2_Click(object sender, EventArgs e) - { - Close(); - } - /// - /// 验证端口号 - /// - /// - //private bool ValiPort() - //{ - // Ping p = new Ping();//创建Ping对象p - // PingReply pr = p.Send(Utility.localicenseserverip);//向指定IP或者主机名的计算机发送ICMP协议的ping数据包 - // if (pr.Status == IPStatus.Success)//如果ping成功 - // { - // try - // { - // TcpClient tcpc = new TcpClient(Utility.localicenseserverip, Utility.localicenseserverport);//对IP地址为"192.168.0.105"的计算机的1500端口提出连接申请 - // tcpc.Close(); - // return true; - // } - // catch (Exception ex) - // { - // LogError.PublishError(ex); - // MessageBox.Show("端口连接错误！" + ex.Message); - // return false; - // } - // } - // else - // { - // int times = 0;//重新连接次数; - // int count = 2;//设置尝试次数 - // while (times < count) - // { - // //Thread.Sleep(1000);//等待时间(方便测试的话，你可以改为1000) - // pr = p.Send(Utility.localicenseserverip); - - // if (pr.Status == IPStatus.Success) - // { - // try - // { - // TcpClient tcpc = new TcpClient(Utility.localicenseserverip, Utility.localicenseserverport);//对IP地址为"192.168.0.105"的计算机的1500端口提出连接申请 - // tcpc.Close(); - // return true; - // } - // catch (Exception ex) - // { - // LogError.PublishError(ex); - // MessageBox.Show("端口连接错误！" + ex.Message); - // return false; - // } - // } - // else - // { - // times++; - // if (times < count) - // { - // continue; - // } - // else - // { - // MessageBox.Show("重新尝试连接失败"); - // return false; - // } - // } - - // } - // return false; - // } - //} - /// /// 验证用户名、密码 /// /// @@ -126,24 +54,64 @@ string sql = "select * from casic_userinfotest where USERNAME='" + txtUser.Text.Trim() + "' and PASSWORD='" + passWord + "' and sysname='GHFX' "; DataTable dt = OledbHelper.QueryTable(sql); - if (dt != null && dt.Rows.Count > 0) + if (dt == null || dt.Rows.Count <= 0) return false; + if (String.IsNullOrEmpty(dt.Rows[0]["rid"].ToString())) return true; + sql = "select gid from casic_userroletest where id=" + dt.Rows[0]["rid"] + " and sysname='GHFX' "; + using (OracleDataReader reader = OracleUtils.ExecuteReader(OracleUtils.ConnectionString, CommandType.Text, sql)) { - WriteXML(); - if (!String.IsNullOrEmpty(dt.Rows[0]["rid"].ToString())) + while (reader.Read()) { - sql = "select gid from casic_userroletest where id=" + dt.Rows[0]["rid"] + " and sysname='GHFX' "; - using (OracleDataReader reader = OracleUtils.ExecuteReader(OracleUtils.ConnectionString, CommandType.Text, sql)) - { - while (reader.Read()) - { - Utility.userRole = reader[0].ToString(); - break; - } - } + Utility.userRole = reader[0].ToString(); + LogHelper.Debug("测试一下"); + break; } - return true; } - return false; + return true; + } + + + + private bool ValidateFromUrl() + { + string user = txtUser.Text.Trim(); + string pwd = textBoxPassWord.Text.Trim(); + //做成配置的 + string roleserver = Utility.RoleServer; + if (roleserver == null || roleserver.Trim().Equals("")) + { + MessageBox.Show("请在Config.xml中配置roleurl！"); + return false; + } + HttpWebRequest request = + WebRequest.Create(roleserver+"/rs/authority/user?username=" + user + "&password=" + pwd + "&appId=21") as HttpWebRequest; + if (request == null) return false; + using (HttpWebResponse response = request.GetResponse() as HttpWebResponse) + { + try + { + if (response == null || response.GetResponseStream() == null) return false; + StreamReader reader = new StreamReader(response.GetResponseStream()); + string[] result = reader.ReadToEnd().Split(','); + //解析result + if (result.Length < 5) return false; + StringBuilder userRole = new StringBuilder(""); + for (int i = 4; i < result.Length; i++) + { + string[] tmpStrings = result[i].Split('_'); + if (tmpStrings.Length < 2) continue; + userRole.Append(tmpStrings[1].Trim() + ","); + } + if (userRole.Length < 3) return false; + userRole.Remove(userRole.Length - 3, 3); + // MessageBox.Show(userRole.ToString()); + Utility.userRole = userRole.ToString(); + return Utility.userRole != null && !Utility.userRole.Equals("null"); + } + catch (Exception e) + { + return false; + } + } } private void FrmLogin_Load(object sender, EventArgs e) @@ -153,74 +121,56 @@ StartPosition = FormStartPosition.CenterScreen; - ReadXML(); + ReadXml(); } /// /// 读取上一次登录的用户名和密码 /// - private void ReadXML() + private void ReadXml() { - if (File.Exists(filename)) + if (!File.Exists(filename)) return; + //初始化XML文档操作类 + XmlDocument myDoc = new XmlDocument(); { - if (!File.Exists(filename)) + //加载XML文件 + try { + myDoc.Load(filename); + } + catch (Exception e) + { + LogError.PublishError(e); return; } - - //初始化XML文档操作类 - XmlDocument myDoc = new XmlDocument(); + //搜索指定的节点 + XmlNode serverRootNode = myDoc.SelectSingleNode("Params"); + XmlNodeList nodes = null; + if (serverRootNode != null) { - //加载XML文件 - try + nodes = serverRootNode.ChildNodes; + } + if (nodes == null) return; + foreach (XmlNode xn in nodes) + { + if (xn.Name.Equals("username")) { - myDoc.Load(filename); + txtUser.Text = xn.InnerText.Trim(); } - catch (Exception e) + else if (xn.Name.Equals("password")) { - LogError.PublishError(e); - return; + textBoxPassWord.Text = xn.InnerText.Trim(); } - //搜索指定的节点 - XmlNode serverRootNode = myDoc.SelectSingleNode("Params"); - XmlNodeList nodes = null; - if (serverRootNode != null) + else if (xn.Name.Equals("isremember")) { - nodes = serverRootNode.ChildNodes; - } - if (nodes != null) - { - foreach (XmlNode xn in nodes) - { - if (xn.Name == "username") - { - txtUser.Text = xn.InnerText.Trim(); - } - else if (xn.Name == "password") - { - textBoxPassWord.Text = xn.InnerText.Trim(); - } - else if (xn.Name == "isremember") - { - if (xn.InnerText.Trim() == "true") - { - checkBoxXRememberPassword.Checked = true; - } - else if (xn.InnerText.Trim() == "false") - { - checkBoxXRememberPassword.Checked = false; - } - } - } - + checkBoxXRememberPassword.Checked = xn.InnerText.Trim().Equals("true"); } } } - } /// /// 记录登录的用户名和密码 /// - private void WriteXML() + private void WriteXml() { if (!File.Exists(filename)) { @@ -252,31 +202,17 @@ foreach (XmlNode xn in nodes) { XmlElement xe = (XmlElement)xn; - if (xe.Name == "username") + if (xe.Name.Equals("username")) { xe.InnerText = txtUser.Text.Trim(); } - else if (xe.Name == "password") + else if (xe.Name.Equals("password")) { - if (checkBoxXRememberPassword.Checked) - { - xe.InnerText = textBoxPassWord.Text.Trim(); - } - else - { - xe.InnerText = ""; - } + xe.InnerText = checkBoxXRememberPassword.Checked ? textBoxPassWord.Text.Trim() : ""; } - else if (xe.Name == "isremember") + else if (xe.Name.Equals("isremember")) { - if (checkBoxXRememberPassword.Checked) - { - xe.InnerText = "true"; - } - else - { - xe.InnerText = "false"; - } + xe.InnerText = checkBoxXRememberPassword.Checked ? "true" : "false"; } } } diff --git a/FeatureStatisticsService.cs b/FeatureStatisticsService.cs index 331ee47..b127fe3 100644 --- a/FeatureStatisticsService.cs +++ b/FeatureStatisticsService.cs @@ -190,7 +190,7 @@ List result = new List(); //layer.Name是表名 - string[] accessStrs = Utility.getAccStrsByLayer(layer.Name); + string[] accessStrs = FeatureTools.GetAccStrsByLayer(layer.Name); foreach (string accssname in accessStrs) { diff --git a/FeatureTools.cs b/FeatureTools.cs index be4b469..3c08f34 100644 --- a/FeatureTools.cs +++ b/FeatureTools.cs @@ -1,5 +1,6 @@ using System; using System.Collections.Generic; +using System.Data; using System.Linq; using System.Text; using System.Windows.Forms; @@ -43,7 +44,7 @@ } feature.Delete();//地球上删除该feature string sql = "delete from " + layerName + " where LSSYS_ID =" + feature.ID + " and (编号 is null or substr(编号,length(编号)-2)='TMP')"; - OledbHelper.sqlExecuteNonQuery(sql);//目前无法取到LSSYS_ID，所以这个判断条件不太合适，会导致把该类所有新建的都删除了 + OledbHelper.sqlExecuteNonQuery(sql); } catch (Exception) { @@ -106,5 +107,46 @@ } return value; } + + /// + /// 根据附属物图层名字得到里面含有的附属物 + /// + /// + /// + public static string[] GetAccStrsByLayer(string layername) + { + string[] accStrs = null; + string sql = "select 附属物名称 from " + layername + " group by 附属物名称"; + DataSet dataset = OledbHelper.getDataSet(sql, layername); + if (dataset == null) return null; + accStrs = new string[dataset.Tables[0].Rows.Count]; + for (int i = 0; i < dataset.Tables[0].Rows.Count; i++) + { + accStrs[i] = dataset.Tables[0].Rows[i][0].ToString(); + } + return accStrs; + } + + /// + /// 删除内存图层中指定名称的feature + /// + /// + /// + public static void RemoveFeatureFromName(GSOGlobeControl globeControl1, string featureName) + { + GSOFeatures features = globeControl1.Globe.MemoryLayer.GetFeatureByName(featureName, true); + if (features != null) + { + for (int i = features.Length - 1; i >= 0; i--) + { + GSOFeature feature = features[i]; + if (feature != null) + { + globeControl1.Globe.MemoryLayer.RemoveFeatureByID(feature.ID); + } + } + } + globeControl1.Refresh(); + } } } diff --git a/Forms/FrmPipelineModelDataBase.cs b/Forms/FrmPipelineModelDataBase.cs index b577fd8..bc1e479 100644 --- a/Forms/FrmPipelineModelDataBase.cs +++ b/Forms/FrmPipelineModelDataBase.cs @@ -149,7 +149,7 @@ catch (Exception ex) { LogError.PublishError(ex); - LogHelper.WriteLog(typeof(FrmPipelineModelDB), ex.Message); + LogHelper.Error(ex.Message); } } diff --git a/FrmAccessoriesSensor.cs b/FrmAccessoriesSensor.cs index 98aa1cf..542f19a 100644 --- a/FrmAccessoriesSensor.cs +++ b/FrmAccessoriesSensor.cs @@ -240,7 +240,7 @@ { if (clbPipeLine.CheckedItems.Count > 0) { - Utility.RemoveFeatureFromName(globeControl1, "trackPolygon"); + FeatureTools.RemoveFeatureFromName(globeControl1, "trackPolygon"); globeControl1.Globe.Action = EnumAction3D.TrackPolygon; globeControl1.TrackPolygonEndEvent += globeControl1_TrackPolygonEndEvent; } @@ -259,7 +259,7 @@ private void FrmAccessoriesgather_FormClosing(object sender, FormClosingEventArgs e) { frm = null; - Utility.RemoveFeatureFromName(globeControl1, "trackPolygon"); + FeatureTools.RemoveFeatureFromName(globeControl1, "trackPolygon"); globeControl1.Globe.Action = EnumAction3D.ActionNull; globeControl1.TrackPolygonEndEvent -= globeControl1_TrackPolygonEndEvent; } diff --git a/FrmAccessoriesgather.cs b/FrmAccessoriesgather.cs index e1d176e..c36273b 100644 --- a/FrmAccessoriesgather.cs +++ b/FrmAccessoriesgather.cs @@ -118,7 +118,7 @@ { if (clbPipeLine2.Text!="") { - Utility.RemoveFeatureFromName(globeControl1, "trackPolygon"); + FeatureTools.RemoveFeatureFromName(globeControl1, "trackPolygon"); globeControl1.Globe.Action = EnumAction3D.TrackPolygon; globeControl1.Globe.TrackPolygonTool.TrackMode = EnumTrackMode.SpaceTrack; globeControl1.TrackPolygonEndEvent += globeControl1_TrackPolygonEndEvent; @@ -295,7 +295,7 @@ private void FrmAccessoriesgather_FormClosing(object sender, FormClosingEventArgs e) { frm = null; - Utility.RemoveFeatureFromName(globeControl1, "trackPolygon"); + FeatureTools.RemoveFeatureFromName(globeControl1, "trackPolygon"); globeControl1.TrackPolygonEndEvent -= globeControl1_TrackPolygonEndEvent; globeControl1.Globe.Action = EnumAction3D.ActionNull; diff --git a/FrmAddWellShp.cs b/FrmAddWellShp.cs index 7983349..78d8946 100644 --- a/FrmAddWellShp.cs +++ b/FrmAddWellShp.cs @@ -100,7 +100,7 @@ catch (Exception ex) { LogError.PublishError(ex); - LogHelper.WriteLog(typeof(FrmAddWellShp), ex.Message); + LogHelper.Error(ex.Message); } } diff --git a/FrmBSQStatis.cs b/FrmBSQStatis.cs index 5b05926..b5e581d 100644 --- a/FrmBSQStatis.cs +++ b/FrmBSQStatis.cs @@ -97,7 +97,7 @@ } catch (Exception ex) { - LogHelper.WriteLog(typeof(FrmBSQStatis),ex.Message); + LogHelper.Error(ex.Message); } return typeAndCount; } @@ -108,7 +108,7 @@ GSOLayer layer = globeControl1.Globe.Layers.GetLayerByCaption("标识器"); GSOFeatures bsqFs = FeatureStatisticsService.GetLayerFeatures(polygon, layer); if (bsqFs == null || bsqFs.Length <= 0) { - LogHelper.WriteLog(typeof(FrmBSQStatis),"标识器图层下的Feature为空"); + LogHelper.Error("标识器图层下的Feature为空!"); return null; } diff --git a/FrmBasicQuery.cs b/FrmBasicQuery.cs index baeeade..cc8d3ff 100644 --- a/FrmBasicQuery.cs +++ b/FrmBasicQuery.cs @@ -224,7 +224,7 @@ } catch(Exception ex) { - LogHelper.WriteLog(typeof(FrmBasicQuery), ex.Message); + LogHelper.Error(ex.Message); } } else diff --git a/FrmCodingQuery.cs b/FrmCodingQuery.cs index f1ac322..d4ec095 100644 --- a/FrmCodingQuery.cs +++ b/FrmCodingQuery.cs @@ -82,7 +82,7 @@ } catch (Exception ex) { - LogHelper.WriteLog(typeof(FrmCodingQuery), ex.Message); ; + LogHelper.Error(ex.Message); } } diff --git a/FrmDiameterQuery.cs b/FrmDiameterQuery.cs index e7b3657..75d7949 100644 --- a/FrmDiameterQuery.cs +++ b/FrmDiameterQuery.cs @@ -150,7 +150,7 @@ catch (Exception ex) { //LogError.PublishError(ex); - LogHelper.WriteLog(typeof(FrmDiameterQuery), ex.Message); + LogHelper.Error(ex.Message); MessageBox.Show("请输入正确的管径范围！"); return; } diff --git a/FrmFittingQuery.cs b/FrmFittingQuery.cs index 12f6007..8645011 100644 --- a/FrmFittingQuery.cs +++ b/FrmFittingQuery.cs @@ -69,7 +69,7 @@ } catch (Exception ex) { - LogHelper.WriteLog(typeof(FrmFittingQuery), ex.Message); + LogHelper.Error(ex.Message); } } /// diff --git a/FrmKeywordQuery.cs b/FrmKeywordQuery.cs index 405524f..ede0a93 100644 --- a/FrmKeywordQuery.cs +++ b/FrmKeywordQuery.cs @@ -87,7 +87,7 @@ } catch (Exception ex) { - LogHelper.WriteLog(typeof(FrmKeywordQuery), ex.Message); + LogHelper.Error(ex.Message); } } diff --git a/FrmLogin.cs b/FrmLogin.cs index 1172c23..6fbaed9 100644 --- a/FrmLogin.cs +++ b/FrmLogin.cs @@ -2,6 +2,8 @@ using System.Data; using System.Data.OracleClient; using System.IO; +using System.Net; +using System.Text; using System.Windows.Forms; using System.Xml; using DevComponents.DotNetBar; @@ -10,16 +12,15 @@ { public partial class FrmLogin : Office2007Form { + + //登录界面 -- 配置文件的路径 + public static string filename = Application.StartupPath + "\\login.xml"; + + public FrmLogin() { InitializeComponent(); } - public string rolename = "浏览"; - public string username = ""; - public string department = ""; - - //登录界面 -- 配置文件的路径 - public static string filename = Application.StartupPath + "\\login.xml"; /// /// 登录按钮事件处理 /// @@ -28,9 +29,10 @@ private void button1_Click(object sender, EventArgs e) { bool result = ValidateUser(); +// bool result =ValidateFromUrl();//从平台获取用户角色信息，判断是否能登陆成功 if (result) { - username = txtUser.Text.Trim(); + WriteXml(); Utility.userName = txtUser.Text.Trim(); DialogResult = DialogResult.OK; Close(); @@ -43,80 +45,6 @@ } } /// - /// 关闭按钮事件处理 - /// - /// - /// - private void button2_Click(object sender, EventArgs e) - { - Close(); - } - /// - /// 验证端口号 - /// - /// - //private bool ValiPort() - //{ - // Ping p = new Ping();//创建Ping对象p - // PingReply pr = p.Send(Utility.localicenseserverip);//向指定IP或者主机名的计算机发送ICMP协议的ping数据包 - // if (pr.Status == IPStatus.Success)//如果ping成功 - // { - // try - // { - // TcpClient tcpc = new TcpClient(Utility.localicenseserverip, Utility.localicenseserverport);//对IP地址为"192.168.0.105"的计算机的1500端口提出连接申请 - // tcpc.Close(); - // return true; - // } - // catch (Exception ex) - // { - // LogError.PublishError(ex); - // MessageBox.Show("端口连接错误！" + ex.Message); - // return false; - // } - // } - // else - // { - // int times = 0;//重新连接次数; - // int count = 2;//设置尝试次数 - // while (times < count) - // { - // //Thread.Sleep(1000);//等待时间(方便测试的话，你可以改为1000) - // pr = p.Send(Utility.localicenseserverip); - - // if (pr.Status == IPStatus.Success) - // { - // try - // { - // TcpClient tcpc = new TcpClient(Utility.localicenseserverip, Utility.localicenseserverport);//对IP地址为"192.168.0.105"的计算机的1500端口提出连接申请 - // tcpc.Close(); - // return true; - // } - // catch (Exception ex) - // { - // LogError.PublishError(ex); - // MessageBox.Show("端口连接错误！" + ex.Message); - // return false; - // } - // } - // else - // { - // times++; - // if (times < count) - // { - // continue; - // } - // else - // { - // MessageBox.Show("重新尝试连接失败"); - // return false; - // } - // } - - // } - // return false; - // } - //} - /// /// 验证用户名、密码 /// /// @@ -126,24 +54,64 @@ string sql = "select * from casic_userinfotest where USERNAME='" + txtUser.Text.Trim() + "' and PASSWORD='" + passWord + "' and sysname='GHFX' "; DataTable dt = OledbHelper.QueryTable(sql); - if (dt != null && dt.Rows.Count > 0) + if (dt == null || dt.Rows.Count <= 0) return false; + if (String.IsNullOrEmpty(dt.Rows[0]["rid"].ToString())) return true; + sql = "select gid from casic_userroletest where id=" + dt.Rows[0]["rid"] + " and sysname='GHFX' "; + using (OracleDataReader reader = OracleUtils.ExecuteReader(OracleUtils.ConnectionString, CommandType.Text, sql)) { - WriteXML(); - if (!String.IsNullOrEmpty(dt.Rows[0]["rid"].ToString())) + while (reader.Read()) { - sql = "select gid from casic_userroletest where id=" + dt.Rows[0]["rid"] + " and sysname='GHFX' "; - using (OracleDataReader reader = OracleUtils.ExecuteReader(OracleUtils.ConnectionString, CommandType.Text, sql)) - { - while (reader.Read()) - { - Utility.userRole = reader[0].ToString(); - break; - } - } + Utility.userRole = reader[0].ToString(); + LogHelper.Debug("测试一下"); + break; } - return true; } - return false; + return true; + } + + + + private bool ValidateFromUrl() + { + string user = txtUser.Text.Trim(); + string pwd = textBoxPassWord.Text.Trim(); + //做成配置的 + string roleserver = Utility.RoleServer; + if (roleserver == null || roleserver.Trim().Equals("")) + { + MessageBox.Show("请在Config.xml中配置roleurl！"); + return false; + } + HttpWebRequest request = + WebRequest.Create(roleserver+"/rs/authority/user?username=" + user + "&password=" + pwd + "&appId=21") as HttpWebRequest; + if (request == null) return false; + using (HttpWebResponse response = request.GetResponse() as HttpWebResponse) + { + try + { + if (response == null || response.GetResponseStream() == null) return false; + StreamReader reader = new StreamReader(response.GetResponseStream()); + string[] result = reader.ReadToEnd().Split(','); + //解析result + if (result.Length < 5) return false; + StringBuilder userRole = new StringBuilder(""); + for (int i = 4; i < result.Length; i++) + { + string[] tmpStrings = result[i].Split('_'); + if (tmpStrings.Length < 2) continue; + userRole.Append(tmpStrings[1].Trim() + ","); + } + if (userRole.Length < 3) return false; + userRole.Remove(userRole.Length - 3, 3); + // MessageBox.Show(userRole.ToString()); + Utility.userRole = userRole.ToString(); + return Utility.userRole != null && !Utility.userRole.Equals("null"); + } + catch (Exception e) + { + return false; + } + } } private void FrmLogin_Load(object sender, EventArgs e) @@ -153,74 +121,56 @@ StartPosition = FormStartPosition.CenterScreen; - ReadXML(); + ReadXml(); } /// /// 读取上一次登录的用户名和密码 /// - private void ReadXML() + private void ReadXml() { - if (File.Exists(filename)) + if (!File.Exists(filename)) return; + //初始化XML文档操作类 + XmlDocument myDoc = new XmlDocument(); { - if (!File.Exists(filename)) + //加载XML文件 + try { + myDoc.Load(filename); + } + catch (Exception e) + { + LogError.PublishError(e); return; } - - //初始化XML文档操作类 - XmlDocument myDoc = new XmlDocument(); + //搜索指定的节点 + XmlNode serverRootNode = myDoc.SelectSingleNode("Params"); + XmlNodeList nodes = null; + if (serverRootNode != null) { - //加载XML文件 - try + nodes = serverRootNode.ChildNodes; + } + if (nodes == null) return; + foreach (XmlNode xn in nodes) + { + if (xn.Name.Equals("username")) { - myDoc.Load(filename); + txtUser.Text = xn.InnerText.Trim(); } - catch (Exception e) + else if (xn.Name.Equals("password")) { - LogError.PublishError(e); - return; + textBoxPassWord.Text = xn.InnerText.Trim(); } - //搜索指定的节点 - XmlNode serverRootNode = myDoc.SelectSingleNode("Params"); - XmlNodeList nodes = null; - if (serverRootNode != null) + else if (xn.Name.Equals("isremember")) { - nodes = serverRootNode.ChildNodes; - } - if (nodes != null) - { - foreach (XmlNode xn in nodes) - { - if (xn.Name == "username") - { - txtUser.Text = xn.InnerText.Trim(); - } - else if (xn.Name == "password") - { - textBoxPassWord.Text = xn.InnerText.Trim(); - } - else if (xn.Name == "isremember") - { - if (xn.InnerText.Trim() == "true") - { - checkBoxXRememberPassword.Checked = true; - } - else if (xn.InnerText.Trim() == "false") - { - checkBoxXRememberPassword.Checked = false; - } - } - } - + checkBoxXRememberPassword.Checked = xn.InnerText.Trim().Equals("true"); } } } - } /// /// 记录登录的用户名和密码 /// - private void WriteXML() + private void WriteXml() { if (!File.Exists(filename)) { @@ -252,31 +202,17 @@ foreach (XmlNode xn in nodes) { XmlElement xe = (XmlElement)xn; - if (xe.Name == "username") + if (xe.Name.Equals("username")) { xe.InnerText = txtUser.Text.Trim(); } - else if (xe.Name == "password") + else if (xe.Name.Equals("password")) { - if (checkBoxXRememberPassword.Checked) - { - xe.InnerText = textBoxPassWord.Text.Trim(); - } - else - { - xe.InnerText = ""; - } + xe.InnerText = checkBoxXRememberPassword.Checked ? textBoxPassWord.Text.Trim() : ""; } - else if (xe.Name == "isremember") + else if (xe.Name.Equals("isremember")) { - if (checkBoxXRememberPassword.Checked) - { - xe.InnerText = "true"; - } - else - { - xe.InnerText = "false"; - } + xe.InnerText = checkBoxXRememberPassword.Checked ? "true" : "false"; } } } diff --git a/FrmMaterialSel.cs b/FrmMaterialSel.cs index 8645ab3..d23f385 100644 --- a/FrmMaterialSel.cs +++ b/FrmMaterialSel.cs @@ -157,7 +157,7 @@ } catch (Exception ex) { - LogHelper.WriteLog(typeof(FrmMaterialSel), ex.Message); + LogHelper.Error(ex.Message); } } diff --git a/FeatureStatisticsService.cs b/FeatureStatisticsService.cs index 331ee47..b127fe3 100644 --- a/FeatureStatisticsService.cs +++ b/FeatureStatisticsService.cs @@ -190,7 +190,7 @@ List result = new List(); //layer.Name是表名 - string[] accessStrs = Utility.getAccStrsByLayer(layer.Name); + string[] accessStrs = FeatureTools.GetAccStrsByLayer(layer.Name); foreach (string accssname in accessStrs) { diff --git a/FeatureTools.cs b/FeatureTools.cs index be4b469..3c08f34 100644 --- a/FeatureTools.cs +++ b/FeatureTools.cs @@ -1,5 +1,6 @@ using System; using System.Collections.Generic; +using System.Data; using System.Linq; using System.Text; using System.Windows.Forms; @@ -43,7 +44,7 @@ } feature.Delete();//地球上删除该feature string sql = "delete from " + layerName + " where LSSYS_ID =" + feature.ID + " and (编号 is null or substr(编号,length(编号)-2)='TMP')"; - OledbHelper.sqlExecuteNonQuery(sql);//目前无法取到LSSYS_ID，所以这个判断条件不太合适，会导致把该类所有新建的都删除了 + OledbHelper.sqlExecuteNonQuery(sql); } catch (Exception) { @@ -106,5 +107,46 @@ } return value; } + + /// + /// 根据附属物图层名字得到里面含有的附属物 + /// + /// + /// + public static string[] GetAccStrsByLayer(string layername) + { + string[] accStrs = null; + string sql = "select 附属物名称 from " + layername + " group by 附属物名称"; + DataSet dataset = OledbHelper.getDataSet(sql, layername); + if (dataset == null) return null; + accStrs = new string[dataset.Tables[0].Rows.Count]; + for (int i = 0; i < dataset.Tables[0].Rows.Count; i++) + { + accStrs[i] = dataset.Tables[0].Rows[i][0].ToString(); + } + return accStrs; + } + + /// + /// 删除内存图层中指定名称的feature + /// + /// + /// + public static void RemoveFeatureFromName(GSOGlobeControl globeControl1, string featureName) + { + GSOFeatures features = globeControl1.Globe.MemoryLayer.GetFeatureByName(featureName, true); + if (features != null) + { + for (int i = features.Length - 1; i >= 0; i--) + { + GSOFeature feature = features[i]; + if (feature != null) + { + globeControl1.Globe.MemoryLayer.RemoveFeatureByID(feature.ID); + } + } + } + globeControl1.Refresh(); + } } } diff --git a/Forms/FrmPipelineModelDataBase.cs b/Forms/FrmPipelineModelDataBase.cs index b577fd8..bc1e479 100644 --- a/Forms/FrmPipelineModelDataBase.cs +++ b/Forms/FrmPipelineModelDataBase.cs @@ -149,7 +149,7 @@ catch (Exception ex) { LogError.PublishError(ex); - LogHelper.WriteLog(typeof(FrmPipelineModelDB), ex.Message); + LogHelper.Error(ex.Message); } } diff --git a/FrmAccessoriesSensor.cs b/FrmAccessoriesSensor.cs index 98aa1cf..542f19a 100644 --- a/FrmAccessoriesSensor.cs +++ b/FrmAccessoriesSensor.cs @@ -240,7 +240,7 @@ { if (clbPipeLine.CheckedItems.Count > 0) { - Utility.RemoveFeatureFromName(globeControl1, "trackPolygon"); + FeatureTools.RemoveFeatureFromName(globeControl1, "trackPolygon"); globeControl1.Globe.Action = EnumAction3D.TrackPolygon; globeControl1.TrackPolygonEndEvent += globeControl1_TrackPolygonEndEvent; } @@ -259,7 +259,7 @@ private void FrmAccessoriesgather_FormClosing(object sender, FormClosingEventArgs e) { frm = null; - Utility.RemoveFeatureFromName(globeControl1, "trackPolygon"); + FeatureTools.RemoveFeatureFromName(globeControl1, "trackPolygon"); globeControl1.Globe.Action = EnumAction3D.ActionNull; globeControl1.TrackPolygonEndEvent -= globeControl1_TrackPolygonEndEvent; } diff --git a/FrmAccessoriesgather.cs b/FrmAccessoriesgather.cs index e1d176e..c36273b 100644 --- a/FrmAccessoriesgather.cs +++ b/FrmAccessoriesgather.cs @@ -118,7 +118,7 @@ { if (clbPipeLine2.Text!="") { - Utility.RemoveFeatureFromName(globeControl1, "trackPolygon"); + FeatureTools.RemoveFeatureFromName(globeControl1, "trackPolygon"); globeControl1.Globe.Action = EnumAction3D.TrackPolygon; globeControl1.Globe.TrackPolygonTool.TrackMode = EnumTrackMode.SpaceTrack; globeControl1.TrackPolygonEndEvent += globeControl1_TrackPolygonEndEvent; @@ -295,7 +295,7 @@ private void FrmAccessoriesgather_FormClosing(object sender, FormClosingEventArgs e) { frm = null; - Utility.RemoveFeatureFromName(globeControl1, "trackPolygon"); + FeatureTools.RemoveFeatureFromName(globeControl1, "trackPolygon"); globeControl1.TrackPolygonEndEvent -= globeControl1_TrackPolygonEndEvent; globeControl1.Globe.Action = EnumAction3D.ActionNull; diff --git a/FrmAddWellShp.cs b/FrmAddWellShp.cs index 7983349..78d8946 100644 --- a/FrmAddWellShp.cs +++ b/FrmAddWellShp.cs @@ -100,7 +100,7 @@ catch (Exception ex) { LogError.PublishError(ex); - LogHelper.WriteLog(typeof(FrmAddWellShp), ex.Message); + LogHelper.Error(ex.Message); } } diff --git a/FrmBSQStatis.cs b/FrmBSQStatis.cs index 5b05926..b5e581d 100644 --- a/FrmBSQStatis.cs +++ b/FrmBSQStatis.cs @@ -97,7 +97,7 @@ } catch (Exception ex) { - LogHelper.WriteLog(typeof(FrmBSQStatis),ex.Message); + LogHelper.Error(ex.Message); } return typeAndCount; } @@ -108,7 +108,7 @@ GSOLayer layer = globeControl1.Globe.Layers.GetLayerByCaption("标识器"); GSOFeatures bsqFs = FeatureStatisticsService.GetLayerFeatures(polygon, layer); if (bsqFs == null || bsqFs.Length <= 0) { - LogHelper.WriteLog(typeof(FrmBSQStatis),"标识器图层下的Feature为空"); + LogHelper.Error("标识器图层下的Feature为空!"); return null; } diff --git a/FrmBasicQuery.cs b/FrmBasicQuery.cs index baeeade..cc8d3ff 100644 --- a/FrmBasicQuery.cs +++ b/FrmBasicQuery.cs @@ -224,7 +224,7 @@ } catch(Exception ex) { - LogHelper.WriteLog(typeof(FrmBasicQuery), ex.Message); + LogHelper.Error(ex.Message); } } else diff --git a/FrmCodingQuery.cs b/FrmCodingQuery.cs index f1ac322..d4ec095 100644 --- a/FrmCodingQuery.cs +++ b/FrmCodingQuery.cs @@ -82,7 +82,7 @@ } catch (Exception ex) { - LogHelper.WriteLog(typeof(FrmCodingQuery), ex.Message); ; + LogHelper.Error(ex.Message); } } diff --git a/FrmDiameterQuery.cs b/FrmDiameterQuery.cs index e7b3657..75d7949 100644 --- a/FrmDiameterQuery.cs +++ b/FrmDiameterQuery.cs @@ -150,7 +150,7 @@ catch (Exception ex) { //LogError.PublishError(ex); - LogHelper.WriteLog(typeof(FrmDiameterQuery), ex.Message); + LogHelper.Error(ex.Message); MessageBox.Show("请输入正确的管径范围！"); return; } diff --git a/FrmFittingQuery.cs b/FrmFittingQuery.cs index 12f6007..8645011 100644 --- a/FrmFittingQuery.cs +++ b/FrmFittingQuery.cs @@ -69,7 +69,7 @@ } catch (Exception ex) { - LogHelper.WriteLog(typeof(FrmFittingQuery), ex.Message); + LogHelper.Error(ex.Message); } } /// diff --git a/FrmKeywordQuery.cs b/FrmKeywordQuery.cs index 405524f..ede0a93 100644 --- a/FrmKeywordQuery.cs +++ b/FrmKeywordQuery.cs @@ -87,7 +87,7 @@ } catch (Exception ex) { - LogHelper.WriteLog(typeof(FrmKeywordQuery), ex.Message); + LogHelper.Error(ex.Message); } } diff --git a/FrmLogin.cs b/FrmLogin.cs index 1172c23..6fbaed9 100644 --- a/FrmLogin.cs +++ b/FrmLogin.cs @@ -2,6 +2,8 @@ using System.Data; using System.Data.OracleClient; using System.IO; +using System.Net; +using System.Text; using System.Windows.Forms; using System.Xml; using DevComponents.DotNetBar; @@ -10,16 +12,15 @@ { public partial class FrmLogin : Office2007Form { + + //登录界面 -- 配置文件的路径 + public static string filename = Application.StartupPath + "\\login.xml"; + + public FrmLogin() { InitializeComponent(); } - public string rolename = "浏览"; - public string username = ""; - public string department = ""; - - //登录界面 -- 配置文件的路径 - public static string filename = Application.StartupPath + "\\login.xml"; /// /// 登录按钮事件处理 /// @@ -28,9 +29,10 @@ private void button1_Click(object sender, EventArgs e) { bool result = ValidateUser(); +// bool result =ValidateFromUrl();//从平台获取用户角色信息，判断是否能登陆成功 if (result) { - username = txtUser.Text.Trim(); + WriteXml(); Utility.userName = txtUser.Text.Trim(); DialogResult = DialogResult.OK; Close(); @@ -43,80 +45,6 @@ } } /// - /// 关闭按钮事件处理 - /// - /// - /// - private void button2_Click(object sender, EventArgs e) - { - Close(); - } - /// - /// 验证端口号 - /// - /// - //private bool ValiPort() - //{ - // Ping p = new Ping();//创建Ping对象p - // PingReply pr = p.Send(Utility.localicenseserverip);//向指定IP或者主机名的计算机发送ICMP协议的ping数据包 - // if (pr.Status == IPStatus.Success)//如果ping成功 - // { - // try - // { - // TcpClient tcpc = new TcpClient(Utility.localicenseserverip, Utility.localicenseserverport);//对IP地址为"192.168.0.105"的计算机的1500端口提出连接申请 - // tcpc.Close(); - // return true; - // } - // catch (Exception ex) - // { - // LogError.PublishError(ex); - // MessageBox.Show("端口连接错误！" + ex.Message); - // return false; - // } - // } - // else - // { - // int times = 0;//重新连接次数; - // int count = 2;//设置尝试次数 - // while (times < count) - // { - // //Thread.Sleep(1000);//等待时间(方便测试的话，你可以改为1000) - // pr = p.Send(Utility.localicenseserverip); - - // if (pr.Status == IPStatus.Success) - // { - // try - // { - // TcpClient tcpc = new TcpClient(Utility.localicenseserverip, Utility.localicenseserverport);//对IP地址为"192.168.0.105"的计算机的1500端口提出连接申请 - // tcpc.Close(); - // return true; - // } - // catch (Exception ex) - // { - // LogError.PublishError(ex); - // MessageBox.Show("端口连接错误！" + ex.Message); - // return false; - // } - // } - // else - // { - // times++; - // if (times < count) - // { - // continue; - // } - // else - // { - // MessageBox.Show("重新尝试连接失败"); - // return false; - // } - // } - - // } - // return false; - // } - //} - /// /// 验证用户名、密码 /// /// @@ -126,24 +54,64 @@ string sql = "select * from casic_userinfotest where USERNAME='" + txtUser.Text.Trim() + "' and PASSWORD='" + passWord + "' and sysname='GHFX' "; DataTable dt = OledbHelper.QueryTable(sql); - if (dt != null && dt.Rows.Count > 0) + if (dt == null || dt.Rows.Count <= 0) return false; + if (String.IsNullOrEmpty(dt.Rows[0]["rid"].ToString())) return true; + sql = "select gid from casic_userroletest where id=" + dt.Rows[0]["rid"] + " and sysname='GHFX' "; + using (OracleDataReader reader = OracleUtils.ExecuteReader(OracleUtils.ConnectionString, CommandType.Text, sql)) { - WriteXML(); - if (!String.IsNullOrEmpty(dt.Rows[0]["rid"].ToString())) + while (reader.Read()) { - sql = "select gid from casic_userroletest where id=" + dt.Rows[0]["rid"] + " and sysname='GHFX' "; - using (OracleDataReader reader = OracleUtils.ExecuteReader(OracleUtils.ConnectionString, CommandType.Text, sql)) - { - while (reader.Read()) - { - Utility.userRole = reader[0].ToString(); - break; - } - } + Utility.userRole = reader[0].ToString(); + LogHelper.Debug("测试一下"); + break; } - return true; } - return false; + return true; + } + + + + private bool ValidateFromUrl() + { + string user = txtUser.Text.Trim(); + string pwd = textBoxPassWord.Text.Trim(); + //做成配置的 + string roleserver = Utility.RoleServer; + if (roleserver == null || roleserver.Trim().Equals("")) + { + MessageBox.Show("请在Config.xml中配置roleurl！"); + return false; + } + HttpWebRequest request = + WebRequest.Create(roleserver+"/rs/authority/user?username=" + user + "&password=" + pwd + "&appId=21") as HttpWebRequest; + if (request == null) return false; + using (HttpWebResponse response = request.GetResponse() as HttpWebResponse) + { + try + { + if (response == null || response.GetResponseStream() == null) return false; + StreamReader reader = new StreamReader(response.GetResponseStream()); + string[] result = reader.ReadToEnd().Split(','); + //解析result + if (result.Length < 5) return false; + StringBuilder userRole = new StringBuilder(""); + for (int i = 4; i < result.Length; i++) + { + string[] tmpStrings = result[i].Split('_'); + if (tmpStrings.Length < 2) continue; + userRole.Append(tmpStrings[1].Trim() + ","); + } + if (userRole.Length < 3) return false; + userRole.Remove(userRole.Length - 3, 3); + // MessageBox.Show(userRole.ToString()); + Utility.userRole = userRole.ToString(); + return Utility.userRole != null && !Utility.userRole.Equals("null"); + } + catch (Exception e) + { + return false; + } + } } private void FrmLogin_Load(object sender, EventArgs e) @@ -153,74 +121,56 @@ StartPosition = FormStartPosition.CenterScreen; - ReadXML(); + ReadXml(); } /// /// 读取上一次登录的用户名和密码 /// - private void ReadXML() + private void ReadXml() { - if (File.Exists(filename)) + if (!File.Exists(filename)) return; + //初始化XML文档操作类 + XmlDocument myDoc = new XmlDocument(); { - if (!File.Exists(filename)) + //加载XML文件 + try { + myDoc.Load(filename); + } + catch (Exception e) + { + LogError.PublishError(e); return; } - - //初始化XML文档操作类 - XmlDocument myDoc = new XmlDocument(); + //搜索指定的节点 + XmlNode serverRootNode = myDoc.SelectSingleNode("Params"); + XmlNodeList nodes = null; + if (serverRootNode != null) { - //加载XML文件 - try + nodes = serverRootNode.ChildNodes; + } + if (nodes == null) return; + foreach (XmlNode xn in nodes) + { + if (xn.Name.Equals("username")) { - myDoc.Load(filename); + txtUser.Text = xn.InnerText.Trim(); } - catch (Exception e) + else if (xn.Name.Equals("password")) { - LogError.PublishError(e); - return; + textBoxPassWord.Text = xn.InnerText.Trim(); } - //搜索指定的节点 - XmlNode serverRootNode = myDoc.SelectSingleNode("Params"); - XmlNodeList nodes = null; - if (serverRootNode != null) + else if (xn.Name.Equals("isremember")) { - nodes = serverRootNode.ChildNodes; - } - if (nodes != null) - { - foreach (XmlNode xn in nodes) - { - if (xn.Name == "username") - { - txtUser.Text = xn.InnerText.Trim(); - } - else if (xn.Name == "password") - { - textBoxPassWord.Text = xn.InnerText.Trim(); - } - else if (xn.Name == "isremember") - { - if (xn.InnerText.Trim() == "true") - { - checkBoxXRememberPassword.Checked = true; - } - else if (xn.InnerText.Trim() == "false") - { - checkBoxXRememberPassword.Checked = false; - } - } - } - + checkBoxXRememberPassword.Checked = xn.InnerText.Trim().Equals("true"); } } } - } /// /// 记录登录的用户名和密码 /// - private void WriteXML() + private void WriteXml() { if (!File.Exists(filename)) { @@ -252,31 +202,17 @@ foreach (XmlNode xn in nodes) { XmlElement xe = (XmlElement)xn; - if (xe.Name == "username") + if (xe.Name.Equals("username")) { xe.InnerText = txtUser.Text.Trim(); } - else if (xe.Name == "password") + else if (xe.Name.Equals("password")) { - if (checkBoxXRememberPassword.Checked) - { - xe.InnerText = textBoxPassWord.Text.Trim(); - } - else - { - xe.InnerText = ""; - } + xe.InnerText = checkBoxXRememberPassword.Checked ? textBoxPassWord.Text.Trim() : ""; } - else if (xe.Name == "isremember") + else if (xe.Name.Equals("isremember")) { - if (checkBoxXRememberPassword.Checked) - { - xe.InnerText = "true"; - } - else - { - xe.InnerText = "false"; - } + xe.InnerText = checkBoxXRememberPassword.Checked ? "true" : "false"; } } } diff --git a/FrmMaterialSel.cs b/FrmMaterialSel.cs index 8645ab3..d23f385 100644 --- a/FrmMaterialSel.cs +++ b/FrmMaterialSel.cs @@ -157,7 +157,7 @@ } catch (Exception ex) { - LogHelper.WriteLog(typeof(FrmMaterialSel), ex.Message); + LogHelper.Error(ex.Message); } } diff --git a/FrmMetadataStat.cs b/FrmMetadataStat.cs index c3c1359..96029a6 100644 --- a/FrmMetadataStat.cs +++ b/FrmMetadataStat.cs @@ -96,7 +96,7 @@ //统计有多少个图层 private int statistLayer() { - List datasrcs = Utility.layerConfig.datasrcs; + List datasrcs = Utility.LayerConfig.datasrcs; return datasrcs.SelectMany(datasrc => datasrc.layertypes).Sum(layerType => layerType.layers.Count); } diff --git a/FeatureStatisticsService.cs b/FeatureStatisticsService.cs index 331ee47..b127fe3 100644 --- a/FeatureStatisticsService.cs +++ b/FeatureStatisticsService.cs @@ -190,7 +190,7 @@ List result = new List(); //layer.Name是表名 - string[] accessStrs = Utility.getAccStrsByLayer(layer.Name); + string[] accessStrs = FeatureTools.GetAccStrsByLayer(layer.Name); foreach (string accssname in accessStrs) { diff --git a/FeatureTools.cs b/FeatureTools.cs index be4b469..3c08f34 100644 --- a/FeatureTools.cs +++ b/FeatureTools.cs @@ -1,5 +1,6 @@ using System; using System.Collections.Generic; +using System.Data; using System.Linq; using System.Text; using System.Windows.Forms; @@ -43,7 +44,7 @@ } feature.Delete();//地球上删除该feature string sql = "delete from " + layerName + " where LSSYS_ID =" + feature.ID + " and (编号 is null or substr(编号,length(编号)-2)='TMP')"; - OledbHelper.sqlExecuteNonQuery(sql);//目前无法取到LSSYS_ID，所以这个判断条件不太合适，会导致把该类所有新建的都删除了 + OledbHelper.sqlExecuteNonQuery(sql); } catch (Exception) { @@ -106,5 +107,46 @@ } return value; } + + /// + /// 根据附属物图层名字得到里面含有的附属物 + /// + /// + /// + public static string[] GetAccStrsByLayer(string layername) + { + string[] accStrs = null; + string sql = "select 附属物名称 from " + layername + " group by 附属物名称"; + DataSet dataset = OledbHelper.getDataSet(sql, layername); + if (dataset == null) return null; + accStrs = new string[dataset.Tables[0].Rows.Count]; + for (int i = 0; i < dataset.Tables[0].Rows.Count; i++) + { + accStrs[i] = dataset.Tables[0].Rows[i][0].ToString(); + } + return accStrs; + } + + /// + /// 删除内存图层中指定名称的feature + /// + /// + /// + public static void RemoveFeatureFromName(GSOGlobeControl globeControl1, string featureName) + { + GSOFeatures features = globeControl1.Globe.MemoryLayer.GetFeatureByName(featureName, true); + if (features != null) + { + for (int i = features.Length - 1; i >= 0; i--) + { + GSOFeature feature = features[i]; + if (feature != null) + { + globeControl1.Globe.MemoryLayer.RemoveFeatureByID(feature.ID); + } + } + } + globeControl1.Refresh(); + } } } diff --git a/Forms/FrmPipelineModelDataBase.cs b/Forms/FrmPipelineModelDataBase.cs index b577fd8..bc1e479 100644 --- a/Forms/FrmPipelineModelDataBase.cs +++ b/Forms/FrmPipelineModelDataBase.cs @@ -149,7 +149,7 @@ catch (Exception ex) { LogError.PublishError(ex); - LogHelper.WriteLog(typeof(FrmPipelineModelDB), ex.Message); + LogHelper.Error(ex.Message); } } diff --git a/FrmAccessoriesSensor.cs b/FrmAccessoriesSensor.cs index 98aa1cf..542f19a 100644 --- a/FrmAccessoriesSensor.cs +++ b/FrmAccessoriesSensor.cs @@ -240,7 +240,7 @@ { if (clbPipeLine.CheckedItems.Count > 0) { - Utility.RemoveFeatureFromName(globeControl1, "trackPolygon"); + FeatureTools.RemoveFeatureFromName(globeControl1, "trackPolygon"); globeControl1.Globe.Action = EnumAction3D.TrackPolygon; globeControl1.TrackPolygonEndEvent += globeControl1_TrackPolygonEndEvent; } @@ -259,7 +259,7 @@ private void FrmAccessoriesgather_FormClosing(object sender, FormClosingEventArgs e) { frm = null; - Utility.RemoveFeatureFromName(globeControl1, "trackPolygon"); + FeatureTools.RemoveFeatureFromName(globeControl1, "trackPolygon"); globeControl1.Globe.Action = EnumAction3D.ActionNull; globeControl1.TrackPolygonEndEvent -= globeControl1_TrackPolygonEndEvent; } diff --git a/FrmAccessoriesgather.cs b/FrmAccessoriesgather.cs index e1d176e..c36273b 100644 --- a/FrmAccessoriesgather.cs +++ b/FrmAccessoriesgather.cs @@ -118,7 +118,7 @@ { if (clbPipeLine2.Text!="") { - Utility.RemoveFeatureFromName(globeControl1, "trackPolygon"); + FeatureTools.RemoveFeatureFromName(globeControl1, "trackPolygon"); globeControl1.Globe.Action = EnumAction3D.TrackPolygon; globeControl1.Globe.TrackPolygonTool.TrackMode = EnumTrackMode.SpaceTrack; globeControl1.TrackPolygonEndEvent += globeControl1_TrackPolygonEndEvent; @@ -295,7 +295,7 @@ private void FrmAccessoriesgather_FormClosing(object sender, FormClosingEventArgs e) { frm = null; - Utility.RemoveFeatureFromName(globeControl1, "trackPolygon"); + FeatureTools.RemoveFeatureFromName(globeControl1, "trackPolygon"); globeControl1.TrackPolygonEndEvent -= globeControl1_TrackPolygonEndEvent; globeControl1.Globe.Action = EnumAction3D.ActionNull; diff --git a/FrmAddWellShp.cs b/FrmAddWellShp.cs index 7983349..78d8946 100644 --- a/FrmAddWellShp.cs +++ b/FrmAddWellShp.cs @@ -100,7 +100,7 @@ catch (Exception ex) { LogError.PublishError(ex); - LogHelper.WriteLog(typeof(FrmAddWellShp), ex.Message); + LogHelper.Error(ex.Message); } } diff --git a/FrmBSQStatis.cs b/FrmBSQStatis.cs index 5b05926..b5e581d 100644 --- a/FrmBSQStatis.cs +++ b/FrmBSQStatis.cs @@ -97,7 +97,7 @@ } catch (Exception ex) { - LogHelper.WriteLog(typeof(FrmBSQStatis),ex.Message); + LogHelper.Error(ex.Message); } return typeAndCount; } @@ -108,7 +108,7 @@ GSOLayer layer = globeControl1.Globe.Layers.GetLayerByCaption("标识器"); GSOFeatures bsqFs = FeatureStatisticsService.GetLayerFeatures(polygon, layer); if (bsqFs == null || bsqFs.Length <= 0) { - LogHelper.WriteLog(typeof(FrmBSQStatis),"标识器图层下的Feature为空"); + LogHelper.Error("标识器图层下的Feature为空!"); return null; } diff --git a/FrmBasicQuery.cs b/FrmBasicQuery.cs index baeeade..cc8d3ff 100644 --- a/FrmBasicQuery.cs +++ b/FrmBasicQuery.cs @@ -224,7 +224,7 @@ } catch(Exception ex) { - LogHelper.WriteLog(typeof(FrmBasicQuery), ex.Message); + LogHelper.Error(ex.Message); } } else diff --git a/FrmCodingQuery.cs b/FrmCodingQuery.cs index f1ac322..d4ec095 100644 --- a/FrmCodingQuery.cs +++ b/FrmCodingQuery.cs @@ -82,7 +82,7 @@ } catch (Exception ex) { - LogHelper.WriteLog(typeof(FrmCodingQuery), ex.Message); ; + LogHelper.Error(ex.Message); } } diff --git a/FrmDiameterQuery.cs b/FrmDiameterQuery.cs index e7b3657..75d7949 100644 --- a/FrmDiameterQuery.cs +++ b/FrmDiameterQuery.cs @@ -150,7 +150,7 @@ catch (Exception ex) { //LogError.PublishError(ex); - LogHelper.WriteLog(typeof(FrmDiameterQuery), ex.Message); + LogHelper.Error(ex.Message); MessageBox.Show("请输入正确的管径范围！"); return; } diff --git a/FrmFittingQuery.cs b/FrmFittingQuery.cs index 12f6007..8645011 100644 --- a/FrmFittingQuery.cs +++ b/FrmFittingQuery.cs @@ -69,7 +69,7 @@ } catch (Exception ex) { - LogHelper.WriteLog(typeof(FrmFittingQuery), ex.Message); + LogHelper.Error(ex.Message); } } /// diff --git a/FrmKeywordQuery.cs b/FrmKeywordQuery.cs index 405524f..ede0a93 100644 --- a/FrmKeywordQuery.cs +++ b/FrmKeywordQuery.cs @@ -87,7 +87,7 @@ } catch (Exception ex) { - LogHelper.WriteLog(typeof(FrmKeywordQuery), ex.Message); + LogHelper.Error(ex.Message); } } diff --git a/FrmLogin.cs b/FrmLogin.cs index 1172c23..6fbaed9 100644 --- a/FrmLogin.cs +++ b/FrmLogin.cs @@ -2,6 +2,8 @@ using System.Data; using System.Data.OracleClient; using System.IO; +using System.Net; +using System.Text; using System.Windows.Forms; using System.Xml; using DevComponents.DotNetBar; @@ -10,16 +12,15 @@ { public partial class FrmLogin : Office2007Form { + + //登录界面 -- 配置文件的路径 + public static string filename = Application.StartupPath + "\\login.xml"; + + public FrmLogin() { InitializeComponent(); } - public string rolename = "浏览"; - public string username = ""; - public string department = ""; - - //登录界面 -- 配置文件的路径 - public static string filename = Application.StartupPath + "\\login.xml"; /// /// 登录按钮事件处理 /// @@ -28,9 +29,10 @@ private void button1_Click(object sender, EventArgs e) { bool result = ValidateUser(); +// bool result =ValidateFromUrl();//从平台获取用户角色信息，判断是否能登陆成功 if (result) { - username = txtUser.Text.Trim(); + WriteXml(); Utility.userName = txtUser.Text.Trim(); DialogResult = DialogResult.OK; Close(); @@ -43,80 +45,6 @@ } } /// - /// 关闭按钮事件处理 - /// - /// - /// - private void button2_Click(object sender, EventArgs e) - { - Close(); - } - /// - /// 验证端口号 - /// - /// - //private bool ValiPort() - //{ - // Ping p = new Ping();//创建Ping对象p - // PingReply pr = p.Send(Utility.localicenseserverip);//向指定IP或者主机名的计算机发送ICMP协议的ping数据包 - // if (pr.Status == IPStatus.Success)//如果ping成功 - // { - // try - // { - // TcpClient tcpc = new TcpClient(Utility.localicenseserverip, Utility.localicenseserverport);//对IP地址为"192.168.0.105"的计算机的1500端口提出连接申请 - // tcpc.Close(); - // return true; - // } - // catch (Exception ex) - // { - // LogError.PublishError(ex); - // MessageBox.Show("端口连接错误！" + ex.Message); - // return false; - // } - // } - // else - // { - // int times = 0;//重新连接次数; - // int count = 2;//设置尝试次数 - // while (times < count) - // { - // //Thread.Sleep(1000);//等待时间(方便测试的话，你可以改为1000) - // pr = p.Send(Utility.localicenseserverip); - - // if (pr.Status == IPStatus.Success) - // { - // try - // { - // TcpClient tcpc = new TcpClient(Utility.localicenseserverip, Utility.localicenseserverport);//对IP地址为"192.168.0.105"的计算机的1500端口提出连接申请 - // tcpc.Close(); - // return true; - // } - // catch (Exception ex) - // { - // LogError.PublishError(ex); - // MessageBox.Show("端口连接错误！" + ex.Message); - // return false; - // } - // } - // else - // { - // times++; - // if (times < count) - // { - // continue; - // } - // else - // { - // MessageBox.Show("重新尝试连接失败"); - // return false; - // } - // } - - // } - // return false; - // } - //} - /// /// 验证用户名、密码 /// /// @@ -126,24 +54,64 @@ string sql = "select * from casic_userinfotest where USERNAME='" + txtUser.Text.Trim() + "' and PASSWORD='" + passWord + "' and sysname='GHFX' "; DataTable dt = OledbHelper.QueryTable(sql); - if (dt != null && dt.Rows.Count > 0) + if (dt == null || dt.Rows.Count <= 0) return false; + if (String.IsNullOrEmpty(dt.Rows[0]["rid"].ToString())) return true; + sql = "select gid from casic_userroletest where id=" + dt.Rows[0]["rid"] + " and sysname='GHFX' "; + using (OracleDataReader reader = OracleUtils.ExecuteReader(OracleUtils.ConnectionString, CommandType.Text, sql)) { - WriteXML(); - if (!String.IsNullOrEmpty(dt.Rows[0]["rid"].ToString())) + while (reader.Read()) { - sql = "select gid from casic_userroletest where id=" + dt.Rows[0]["rid"] + " and sysname='GHFX' "; - using (OracleDataReader reader = OracleUtils.ExecuteReader(OracleUtils.ConnectionString, CommandType.Text, sql)) - { - while (reader.Read()) - { - Utility.userRole = reader[0].ToString(); - break; - } - } + Utility.userRole = reader[0].ToString(); + LogHelper.Debug("测试一下"); + break; } - return true; } - return false; + return true; + } + + + + private bool ValidateFromUrl() + { + string user = txtUser.Text.Trim(); + string pwd = textBoxPassWord.Text.Trim(); + //做成配置的 + string roleserver = Utility.RoleServer; + if (roleserver == null || roleserver.Trim().Equals("")) + { + MessageBox.Show("请在Config.xml中配置roleurl！"); + return false; + } + HttpWebRequest request = + WebRequest.Create(roleserver+"/rs/authority/user?username=" + user + "&password=" + pwd + "&appId=21") as HttpWebRequest; + if (request == null) return false; + using (HttpWebResponse response = request.GetResponse() as HttpWebResponse) + { + try + { + if (response == null || response.GetResponseStream() == null) return false; + StreamReader reader = new StreamReader(response.GetResponseStream()); + string[] result = reader.ReadToEnd().Split(','); + //解析result + if (result.Length < 5) return false; + StringBuilder userRole = new StringBuilder(""); + for (int i = 4; i < result.Length; i++) + { + string[] tmpStrings = result[i].Split('_'); + if (tmpStrings.Length < 2) continue; + userRole.Append(tmpStrings[1].Trim() + ","); + } + if (userRole.Length < 3) return false; + userRole.Remove(userRole.Length - 3, 3); + // MessageBox.Show(userRole.ToString()); + Utility.userRole = userRole.ToString(); + return Utility.userRole != null && !Utility.userRole.Equals("null"); + } + catch (Exception e) + { + return false; + } + } } private void FrmLogin_Load(object sender, EventArgs e) @@ -153,74 +121,56 @@ StartPosition = FormStartPosition.CenterScreen; - ReadXML(); + ReadXml(); } /// /// 读取上一次登录的用户名和密码 /// - private void ReadXML() + private void ReadXml() { - if (File.Exists(filename)) + if (!File.Exists(filename)) return; + //初始化XML文档操作类 + XmlDocument myDoc = new XmlDocument(); { - if (!File.Exists(filename)) + //加载XML文件 + try { + myDoc.Load(filename); + } + catch (Exception e) + { + LogError.PublishError(e); return; } - - //初始化XML文档操作类 - XmlDocument myDoc = new XmlDocument(); + //搜索指定的节点 + XmlNode serverRootNode = myDoc.SelectSingleNode("Params"); + XmlNodeList nodes = null; + if (serverRootNode != null) { - //加载XML文件 - try + nodes = serverRootNode.ChildNodes; + } + if (nodes == null) return; + foreach (XmlNode xn in nodes) + { + if (xn.Name.Equals("username")) { - myDoc.Load(filename); + txtUser.Text = xn.InnerText.Trim(); } - catch (Exception e) + else if (xn.Name.Equals("password")) { - LogError.PublishError(e); - return; + textBoxPassWord.Text = xn.InnerText.Trim(); } - //搜索指定的节点 - XmlNode serverRootNode = myDoc.SelectSingleNode("Params"); - XmlNodeList nodes = null; - if (serverRootNode != null) + else if (xn.Name.Equals("isremember")) { - nodes = serverRootNode.ChildNodes; - } - if (nodes != null) - { - foreach (XmlNode xn in nodes) - { - if (xn.Name == "username") - { - txtUser.Text = xn.InnerText.Trim(); - } - else if (xn.Name == "password") - { - textBoxPassWord.Text = xn.InnerText.Trim(); - } - else if (xn.Name == "isremember") - { - if (xn.InnerText.Trim() == "true") - { - checkBoxXRememberPassword.Checked = true; - } - else if (xn.InnerText.Trim() == "false") - { - checkBoxXRememberPassword.Checked = false; - } - } - } - + checkBoxXRememberPassword.Checked = xn.InnerText.Trim().Equals("true"); } } } - } /// /// 记录登录的用户名和密码 /// - private void WriteXML() + private void WriteXml() { if (!File.Exists(filename)) { @@ -252,31 +202,17 @@ foreach (XmlNode xn in nodes) { XmlElement xe = (XmlElement)xn; - if (xe.Name == "username") + if (xe.Name.Equals("username")) { xe.InnerText = txtUser.Text.Trim(); } - else if (xe.Name == "password") + else if (xe.Name.Equals("password")) { - if (checkBoxXRememberPassword.Checked) - { - xe.InnerText = textBoxPassWord.Text.Trim(); - } - else - { - xe.InnerText = ""; - } + xe.InnerText = checkBoxXRememberPassword.Checked ? textBoxPassWord.Text.Trim() : ""; } - else if (xe.Name == "isremember") + else if (xe.Name.Equals("isremember")) { - if (checkBoxXRememberPassword.Checked) - { - xe.InnerText = "true"; - } - else - { - xe.InnerText = "false"; - } + xe.InnerText = checkBoxXRememberPassword.Checked ? "true" : "false"; } } } diff --git a/FrmMaterialSel.cs b/FrmMaterialSel.cs index 8645ab3..d23f385 100644 --- a/FrmMaterialSel.cs +++ b/FrmMaterialSel.cs @@ -157,7 +157,7 @@ } catch (Exception ex) { - LogHelper.WriteLog(typeof(FrmMaterialSel), ex.Message); + LogHelper.Error(ex.Message); } } diff --git a/FrmMetadataStat.cs b/FrmMetadataStat.cs index c3c1359..96029a6 100644 --- a/FrmMetadataStat.cs +++ b/FrmMetadataStat.cs @@ -96,7 +96,7 @@ //统计有多少个图层 private int statistLayer() { - List datasrcs = Utility.layerConfig.datasrcs; + List datasrcs = Utility.LayerConfig.datasrcs; return datasrcs.SelectMany(datasrc => datasrc.layertypes).Sum(layerType => layerType.layers.Count); } diff --git a/FrmpipeDeepstatis.cs b/FrmpipeDeepstatis.cs index 6a5c895..8d915a9 100644 --- a/FrmpipeDeepstatis.cs +++ b/FrmpipeDeepstatis.cs @@ -2,6 +2,7 @@ using System.Collections.Generic; using System.Diagnostics; using System.IO; +using System.Reflection; using System.Text; using System.Windows.Forms; using System.Windows.Forms.DataVisualization.Charting; @@ -320,7 +321,7 @@ MessageBox.Show("请添加分段"); return; } - Utility.RemoveFeatureFromName(globeControl1, "trackPolygon"); + FeatureTools.RemoveFeatureFromName(globeControl1, "trackPolygon"); globeControl1.Globe.Action = EnumAction3D.TrackPolygon; globeControl1.Globe.TrackPolygonTool.TrackMode = EnumTrackMode.SpaceTrack; globeControl1.TrackPolygonEndEvent += globeControl1_TrackPolygonEndEvent; @@ -408,12 +409,11 @@ TextBox control; private void dataGridViewX2_EditingControlShowing(object sender, DataGridViewEditingControlShowingEventArgs e) { - if (e.Control.GetType().BaseType.Name == "TextBox") - { - control = new TextBox(); - control = (TextBox)e.Control; - control.KeyPress += control_KeyPress; - } + MemberInfo memberInfo = e.Control.GetType().BaseType; + if (memberInfo != null && !memberInfo.Name.Equals("TextBox")) return; + control = new TextBox(); + control = (TextBox)e.Control; + control.KeyPress += control_KeyPress; } /// /// 键盘按键按下事件处理 @@ -423,28 +423,24 @@ void control_KeyPress(object sender, KeyPressEventArgs e) { TextBox text = sender as TextBox; + if (text == null) return; if ((e.KeyChar < 48 || e.KeyChar > 57) && (e.KeyChar != 8) && e.KeyChar != 46) { e.Handled = true; } - if (e.KeyChar == 46) //小数点 + if (e.KeyChar != 46) return; + if (text.Text.Length <= 0) + e.Handled = true; //小数点不能在第一位 + else //处理不规则的小数点 { - if (text.Text.Length <= 0) - e.Handled = true; //小数点不能在第一位 - else //处理不规则的小数点 + float f; + float oldf; + bool b1 = false, b2 = false; + b1 = float.TryParse(text.Text, out oldf); + b2 = float.TryParse(text.Text + e.KeyChar, out f); + if (!b2) { - float f; - float oldf; - bool b1 = false, b2 = false; - b1 = float.TryParse(text.Text, out oldf); - b2 = float.TryParse(text.Text + e.KeyChar, out f); - if (b2 == false) - { - if (b1) - e.Handled = true; - else - e.Handled = false; - } + e.Handled = b1; } } } @@ -457,7 +453,7 @@ { frm = null; - Utility.RemoveFeatureFromName(globeControl1, "trackPolygon"); + FeatureTools.RemoveFeatureFromName(globeControl1, "trackPolygon"); globeControl1.TrackPolygonEndEvent -= globeControl1_TrackPolygonEndEvent; globeControl1.Globe.Action = EnumAction3D.ActionNull; diff --git a/FeatureStatisticsService.cs b/FeatureStatisticsService.cs index 331ee47..b127fe3 100644 --- a/FeatureStatisticsService.cs +++ b/FeatureStatisticsService.cs @@ -190,7 +190,7 @@ List result = new List(); //layer.Name是表名 - string[] accessStrs = Utility.getAccStrsByLayer(layer.Name); + string[] accessStrs = FeatureTools.GetAccStrsByLayer(layer.Name); foreach (string accssname in accessStrs) { diff --git a/FeatureTools.cs b/FeatureTools.cs index be4b469..3c08f34 100644 --- a/FeatureTools.cs +++ b/FeatureTools.cs @@ -1,5 +1,6 @@ using System; using System.Collections.Generic; +using System.Data; using System.Linq; using System.Text; using System.Windows.Forms; @@ -43,7 +44,7 @@ } feature.Delete();//地球上删除该feature string sql = "delete from " + layerName + " where LSSYS_ID =" + feature.ID + " and (编号 is null or substr(编号,length(编号)-2)='TMP')"; - OledbHelper.sqlExecuteNonQuery(sql);//目前无法取到LSSYS_ID，所以这个判断条件不太合适，会导致把该类所有新建的都删除了 + OledbHelper.sqlExecuteNonQuery(sql); } catch (Exception) { @@ -106,5 +107,46 @@ } return value; } + + /// + /// 根据附属物图层名字得到里面含有的附属物 + /// + /// + /// + public static string[] GetAccStrsByLayer(string layername) + { + string[] accStrs = null; + string sql = "select 附属物名称 from " + layername + " group by 附属物名称"; + DataSet dataset = OledbHelper.getDataSet(sql, layername); + if (dataset == null) return null; + accStrs = new string[dataset.Tables[0].Rows.Count]; + for (int i = 0; i < dataset.Tables[0].Rows.Count; i++) + { + accStrs[i] = dataset.Tables[0].Rows[i][0].ToString(); + } + return accStrs; + } + + /// + /// 删除内存图层中指定名称的feature + /// + /// + /// + public static void RemoveFeatureFromName(GSOGlobeControl globeControl1, string featureName) + { + GSOFeatures features = globeControl1.Globe.MemoryLayer.GetFeatureByName(featureName, true); + if (features != null) + { + for (int i = features.Length - 1; i >= 0; i--) + { + GSOFeature feature = features[i]; + if (feature != null) + { + globeControl1.Globe.MemoryLayer.RemoveFeatureByID(feature.ID); + } + } + } + globeControl1.Refresh(); + } } } diff --git a/Forms/FrmPipelineModelDataBase.cs b/Forms/FrmPipelineModelDataBase.cs index b577fd8..bc1e479 100644 --- a/Forms/FrmPipelineModelDataBase.cs +++ b/Forms/FrmPipelineModelDataBase.cs @@ -149,7 +149,7 @@ catch (Exception ex) { LogError.PublishError(ex); - LogHelper.WriteLog(typeof(FrmPipelineModelDB), ex.Message); + LogHelper.Error(ex.Message); } } diff --git a/FrmAccessoriesSensor.cs b/FrmAccessoriesSensor.cs index 98aa1cf..542f19a 100644 --- a/FrmAccessoriesSensor.cs +++ b/FrmAccessoriesSensor.cs @@ -240,7 +240,7 @@ { if (clbPipeLine.CheckedItems.Count > 0) { - Utility.RemoveFeatureFromName(globeControl1, "trackPolygon"); + FeatureTools.RemoveFeatureFromName(globeControl1, "trackPolygon"); globeControl1.Globe.Action = EnumAction3D.TrackPolygon; globeControl1.TrackPolygonEndEvent += globeControl1_TrackPolygonEndEvent; } @@ -259,7 +259,7 @@ private void FrmAccessoriesgather_FormClosing(object sender, FormClosingEventArgs e) { frm = null; - Utility.RemoveFeatureFromName(globeControl1, "trackPolygon"); + FeatureTools.RemoveFeatureFromName(globeControl1, "trackPolygon"); globeControl1.Globe.Action = EnumAction3D.ActionNull; globeControl1.TrackPolygonEndEvent -= globeControl1_TrackPolygonEndEvent; } diff --git a/FrmAccessoriesgather.cs b/FrmAccessoriesgather.cs index e1d176e..c36273b 100644 --- a/FrmAccessoriesgather.cs +++ b/FrmAccessoriesgather.cs @@ -118,7 +118,7 @@ { if (clbPipeLine2.Text!="") { - Utility.RemoveFeatureFromName(globeControl1, "trackPolygon"); + FeatureTools.RemoveFeatureFromName(globeControl1, "trackPolygon"); globeControl1.Globe.Action = EnumAction3D.TrackPolygon; globeControl1.Globe.TrackPolygonTool.TrackMode = EnumTrackMode.SpaceTrack; globeControl1.TrackPolygonEndEvent += globeControl1_TrackPolygonEndEvent; @@ -295,7 +295,7 @@ private void FrmAccessoriesgather_FormClosing(object sender, FormClosingEventArgs e) { frm = null; - Utility.RemoveFeatureFromName(globeControl1, "trackPolygon"); + FeatureTools.RemoveFeatureFromName(globeControl1, "trackPolygon"); globeControl1.TrackPolygonEndEvent -= globeControl1_TrackPolygonEndEvent; globeControl1.Globe.Action = EnumAction3D.ActionNull; diff --git a/FrmAddWellShp.cs b/FrmAddWellShp.cs index 7983349..78d8946 100644 --- a/FrmAddWellShp.cs +++ b/FrmAddWellShp.cs @@ -100,7 +100,7 @@ catch (Exception ex) { LogError.PublishError(ex); - LogHelper.WriteLog(typeof(FrmAddWellShp), ex.Message); + LogHelper.Error(ex.Message); } } diff --git a/FrmBSQStatis.cs b/FrmBSQStatis.cs index 5b05926..b5e581d 100644 --- a/FrmBSQStatis.cs +++ b/FrmBSQStatis.cs @@ -97,7 +97,7 @@ } catch (Exception ex) { - LogHelper.WriteLog(typeof(FrmBSQStatis),ex.Message); + LogHelper.Error(ex.Message); } return typeAndCount; } @@ -108,7 +108,7 @@ GSOLayer layer = globeControl1.Globe.Layers.GetLayerByCaption("标识器"); GSOFeatures bsqFs = FeatureStatisticsService.GetLayerFeatures(polygon, layer); if (bsqFs == null || bsqFs.Length <= 0) { - LogHelper.WriteLog(typeof(FrmBSQStatis),"标识器图层下的Feature为空"); + LogHelper.Error("标识器图层下的Feature为空!"); return null; } diff --git a/FrmBasicQuery.cs b/FrmBasicQuery.cs index baeeade..cc8d3ff 100644 --- a/FrmBasicQuery.cs +++ b/FrmBasicQuery.cs @@ -224,7 +224,7 @@ } catch(Exception ex) { - LogHelper.WriteLog(typeof(FrmBasicQuery), ex.Message); + LogHelper.Error(ex.Message); } } else diff --git a/FrmCodingQuery.cs b/FrmCodingQuery.cs index f1ac322..d4ec095 100644 --- a/FrmCodingQuery.cs +++ b/FrmCodingQuery.cs @@ -82,7 +82,7 @@ } catch (Exception ex) { - LogHelper.WriteLog(typeof(FrmCodingQuery), ex.Message); ; + LogHelper.Error(ex.Message); } } diff --git a/FrmDiameterQuery.cs b/FrmDiameterQuery.cs index e7b3657..75d7949 100644 --- a/FrmDiameterQuery.cs +++ b/FrmDiameterQuery.cs @@ -150,7 +150,7 @@ catch (Exception ex) { //LogError.PublishError(ex); - LogHelper.WriteLog(typeof(FrmDiameterQuery), ex.Message); + LogHelper.Error(ex.Message); MessageBox.Show("请输入正确的管径范围！"); return; } diff --git a/FrmFittingQuery.cs b/FrmFittingQuery.cs index 12f6007..8645011 100644 --- a/FrmFittingQuery.cs +++ b/FrmFittingQuery.cs @@ -69,7 +69,7 @@ } catch (Exception ex) { - LogHelper.WriteLog(typeof(FrmFittingQuery), ex.Message); + LogHelper.Error(ex.Message); } } /// diff --git a/FrmKeywordQuery.cs b/FrmKeywordQuery.cs index 405524f..ede0a93 100644 --- a/FrmKeywordQuery.cs +++ b/FrmKeywordQuery.cs @@ -87,7 +87,7 @@ } catch (Exception ex) { - LogHelper.WriteLog(typeof(FrmKeywordQuery), ex.Message); + LogHelper.Error(ex.Message); } } diff --git a/FrmLogin.cs b/FrmLogin.cs index 1172c23..6fbaed9 100644 --- a/FrmLogin.cs +++ b/FrmLogin.cs @@ -2,6 +2,8 @@ using System.Data; using System.Data.OracleClient; using System.IO; +using System.Net; +using System.Text; using System.Windows.Forms; using System.Xml; using DevComponents.DotNetBar; @@ -10,16 +12,15 @@ { public partial class FrmLogin : Office2007Form { + + //登录界面 -- 配置文件的路径 + public static string filename = Application.StartupPath + "\\login.xml"; + + public FrmLogin() { InitializeComponent(); } - public string rolename = "浏览"; - public string username = ""; - public string department = ""; - - //登录界面 -- 配置文件的路径 - public static string filename = Application.StartupPath + "\\login.xml"; /// /// 登录按钮事件处理 /// @@ -28,9 +29,10 @@ private void button1_Click(object sender, EventArgs e) { bool result = ValidateUser(); +// bool result =ValidateFromUrl();//从平台获取用户角色信息，判断是否能登陆成功 if (result) { - username = txtUser.Text.Trim(); + WriteXml(); Utility.userName = txtUser.Text.Trim(); DialogResult = DialogResult.OK; Close(); @@ -43,80 +45,6 @@ } } /// - /// 关闭按钮事件处理 - /// - /// - /// - private void button2_Click(object sender, EventArgs e) - { - Close(); - } - /// - /// 验证端口号 - /// - /// - //private bool ValiPort() - //{ - // Ping p = new Ping();//创建Ping对象p - // PingReply pr = p.Send(Utility.localicenseserverip);//向指定IP或者主机名的计算机发送ICMP协议的ping数据包 - // if (pr.Status == IPStatus.Success)//如果ping成功 - // { - // try - // { - // TcpClient tcpc = new TcpClient(Utility.localicenseserverip, Utility.localicenseserverport);//对IP地址为"192.168.0.105"的计算机的1500端口提出连接申请 - // tcpc.Close(); - // return true; - // } - // catch (Exception ex) - // { - // LogError.PublishError(ex); - // MessageBox.Show("端口连接错误！" + ex.Message); - // return false; - // } - // } - // else - // { - // int times = 0;//重新连接次数; - // int count = 2;//设置尝试次数 - // while (times < count) - // { - // //Thread.Sleep(1000);//等待时间(方便测试的话，你可以改为1000) - // pr = p.Send(Utility.localicenseserverip); - - // if (pr.Status == IPStatus.Success) - // { - // try - // { - // TcpClient tcpc = new TcpClient(Utility.localicenseserverip, Utility.localicenseserverport);//对IP地址为"192.168.0.105"的计算机的1500端口提出连接申请 - // tcpc.Close(); - // return true; - // } - // catch (Exception ex) - // { - // LogError.PublishError(ex); - // MessageBox.Show("端口连接错误！" + ex.Message); - // return false; - // } - // } - // else - // { - // times++; - // if (times < count) - // { - // continue; - // } - // else - // { - // MessageBox.Show("重新尝试连接失败"); - // return false; - // } - // } - - // } - // return false; - // } - //} - /// /// 验证用户名、密码 /// /// @@ -126,24 +54,64 @@ string sql = "select * from casic_userinfotest where USERNAME='" + txtUser.Text.Trim() + "' and PASSWORD='" + passWord + "' and sysname='GHFX' "; DataTable dt = OledbHelper.QueryTable(sql); - if (dt != null && dt.Rows.Count > 0) + if (dt == null || dt.Rows.Count <= 0) return false; + if (String.IsNullOrEmpty(dt.Rows[0]["rid"].ToString())) return true; + sql = "select gid from casic_userroletest where id=" + dt.Rows[0]["rid"] + " and sysname='GHFX' "; + using (OracleDataReader reader = OracleUtils.ExecuteReader(OracleUtils.ConnectionString, CommandType.Text, sql)) { - WriteXML(); - if (!String.IsNullOrEmpty(dt.Rows[0]["rid"].ToString())) + while (reader.Read()) { - sql = "select gid from casic_userroletest where id=" + dt.Rows[0]["rid"] + " and sysname='GHFX' "; - using (OracleDataReader reader = OracleUtils.ExecuteReader(OracleUtils.ConnectionString, CommandType.Text, sql)) - { - while (reader.Read()) - { - Utility.userRole = reader[0].ToString(); - break; - } - } + Utility.userRole = reader[0].ToString(); + LogHelper.Debug("测试一下"); + break; } - return true; } - return false; + return true; + } + + + + private bool ValidateFromUrl() + { + string user = txtUser.Text.Trim(); + string pwd = textBoxPassWord.Text.Trim(); + //做成配置的 + string roleserver = Utility.RoleServer; + if (roleserver == null || roleserver.Trim().Equals("")) + { + MessageBox.Show("请在Config.xml中配置roleurl！"); + return false; + } + HttpWebRequest request = + WebRequest.Create(roleserver+"/rs/authority/user?username=" + user + "&password=" + pwd + "&appId=21") as HttpWebRequest; + if (request == null) return false; + using (HttpWebResponse response = request.GetResponse() as HttpWebResponse) + { + try + { + if (response == null || response.GetResponseStream() == null) return false; + StreamReader reader = new StreamReader(response.GetResponseStream()); + string[] result = reader.ReadToEnd().Split(','); + //解析result + if (result.Length < 5) return false; + StringBuilder userRole = new StringBuilder(""); + for (int i = 4; i < result.Length; i++) + { + string[] tmpStrings = result[i].Split('_'); + if (tmpStrings.Length < 2) continue; + userRole.Append(tmpStrings[1].Trim() + ","); + } + if (userRole.Length < 3) return false; + userRole.Remove(userRole.Length - 3, 3); + // MessageBox.Show(userRole.ToString()); + Utility.userRole = userRole.ToString(); + return Utility.userRole != null && !Utility.userRole.Equals("null"); + } + catch (Exception e) + { + return false; + } + } } private void FrmLogin_Load(object sender, EventArgs e) @@ -153,74 +121,56 @@ StartPosition = FormStartPosition.CenterScreen; - ReadXML(); + ReadXml(); } /// /// 读取上一次登录的用户名和密码 /// - private void ReadXML() + private void ReadXml() { - if (File.Exists(filename)) + if (!File.Exists(filename)) return; + //初始化XML文档操作类 + XmlDocument myDoc = new XmlDocument(); { - if (!File.Exists(filename)) + //加载XML文件 + try { + myDoc.Load(filename); + } + catch (Exception e) + { + LogError.PublishError(e); return; } - - //初始化XML文档操作类 - XmlDocument myDoc = new XmlDocument(); + //搜索指定的节点 + XmlNode serverRootNode = myDoc.SelectSingleNode("Params"); + XmlNodeList nodes = null; + if (serverRootNode != null) { - //加载XML文件 - try + nodes = serverRootNode.ChildNodes; + } + if (nodes == null) return; + foreach (XmlNode xn in nodes) + { + if (xn.Name.Equals("username")) { - myDoc.Load(filename); + txtUser.Text = xn.InnerText.Trim(); } - catch (Exception e) + else if (xn.Name.Equals("password")) { - LogError.PublishError(e); - return; + textBoxPassWord.Text = xn.InnerText.Trim(); } - //搜索指定的节点 - XmlNode serverRootNode = myDoc.SelectSingleNode("Params"); - XmlNodeList nodes = null; - if (serverRootNode != null) + else if (xn.Name.Equals("isremember")) { - nodes = serverRootNode.ChildNodes; - } - if (nodes != null) - { - foreach (XmlNode xn in nodes) - { - if (xn.Name == "username") - { - txtUser.Text = xn.InnerText.Trim(); - } - else if (xn.Name == "password") - { - textBoxPassWord.Text = xn.InnerText.Trim(); - } - else if (xn.Name == "isremember") - { - if (xn.InnerText.Trim() == "true") - { - checkBoxXRememberPassword.Checked = true; - } - else if (xn.InnerText.Trim() == "false") - { - checkBoxXRememberPassword.Checked = false; - } - } - } - + checkBoxXRememberPassword.Checked = xn.InnerText.Trim().Equals("true"); } } } - } /// /// 记录登录的用户名和密码 /// - private void WriteXML() + private void WriteXml() { if (!File.Exists(filename)) { @@ -252,31 +202,17 @@ foreach (XmlNode xn in nodes) { XmlElement xe = (XmlElement)xn; - if (xe.Name == "username") + if (xe.Name.Equals("username")) { xe.InnerText = txtUser.Text.Trim(); } - else if (xe.Name == "password") + else if (xe.Name.Equals("password")) { - if (checkBoxXRememberPassword.Checked) - { - xe.InnerText = textBoxPassWord.Text.Trim(); - } - else - { - xe.InnerText = ""; - } + xe.InnerText = checkBoxXRememberPassword.Checked ? textBoxPassWord.Text.Trim() : ""; } - else if (xe.Name == "isremember") + else if (xe.Name.Equals("isremember")) { - if (checkBoxXRememberPassword.Checked) - { - xe.InnerText = "true"; - } - else - { - xe.InnerText = "false"; - } + xe.InnerText = checkBoxXRememberPassword.Checked ? "true" : "false"; } } } diff --git a/FrmMaterialSel.cs b/FrmMaterialSel.cs index 8645ab3..d23f385 100644 --- a/FrmMaterialSel.cs +++ b/FrmMaterialSel.cs @@ -157,7 +157,7 @@ } catch (Exception ex) { - LogHelper.WriteLog(typeof(FrmMaterialSel), ex.Message); + LogHelper.Error(ex.Message); } } diff --git a/FrmMetadataStat.cs b/FrmMetadataStat.cs index c3c1359..96029a6 100644 --- a/FrmMetadataStat.cs +++ b/FrmMetadataStat.cs @@ -96,7 +96,7 @@ //统计有多少个图层 private int statistLayer() { - List datasrcs = Utility.layerConfig.datasrcs; + List datasrcs = Utility.LayerConfig.datasrcs; return datasrcs.SelectMany(datasrc => datasrc.layertypes).Sum(layerType => layerType.layers.Count); } diff --git a/FrmpipeDeepstatis.cs b/FrmpipeDeepstatis.cs index 6a5c895..8d915a9 100644 --- a/FrmpipeDeepstatis.cs +++ b/FrmpipeDeepstatis.cs @@ -2,6 +2,7 @@ using System.Collections.Generic; using System.Diagnostics; using System.IO; +using System.Reflection; using System.Text; using System.Windows.Forms; using System.Windows.Forms.DataVisualization.Charting; @@ -320,7 +321,7 @@ MessageBox.Show("请添加分段"); return; } - Utility.RemoveFeatureFromName(globeControl1, "trackPolygon"); + FeatureTools.RemoveFeatureFromName(globeControl1, "trackPolygon"); globeControl1.Globe.Action = EnumAction3D.TrackPolygon; globeControl1.Globe.TrackPolygonTool.TrackMode = EnumTrackMode.SpaceTrack; globeControl1.TrackPolygonEndEvent += globeControl1_TrackPolygonEndEvent; @@ -408,12 +409,11 @@ TextBox control; private void dataGridViewX2_EditingControlShowing(object sender, DataGridViewEditingControlShowingEventArgs e) { - if (e.Control.GetType().BaseType.Name == "TextBox") - { - control = new TextBox(); - control = (TextBox)e.Control; - control.KeyPress += control_KeyPress; - } + MemberInfo memberInfo = e.Control.GetType().BaseType; + if (memberInfo != null && !memberInfo.Name.Equals("TextBox")) return; + control = new TextBox(); + control = (TextBox)e.Control; + control.KeyPress += control_KeyPress; } /// /// 键盘按键按下事件处理 @@ -423,28 +423,24 @@ void control_KeyPress(object sender, KeyPressEventArgs e) { TextBox text = sender as TextBox; + if (text == null) return; if ((e.KeyChar < 48 || e.KeyChar > 57) && (e.KeyChar != 8) && e.KeyChar != 46) { e.Handled = true; } - if (e.KeyChar == 46) //小数点 + if (e.KeyChar != 46) return; + if (text.Text.Length <= 0) + e.Handled = true; //小数点不能在第一位 + else //处理不规则的小数点 { - if (text.Text.Length <= 0) - e.Handled = true; //小数点不能在第一位 - else //处理不规则的小数点 + float f; + float oldf; + bool b1 = false, b2 = false; + b1 = float.TryParse(text.Text, out oldf); + b2 = float.TryParse(text.Text + e.KeyChar, out f); + if (!b2) { - float f; - float oldf; - bool b1 = false, b2 = false; - b1 = float.TryParse(text.Text, out oldf); - b2 = float.TryParse(text.Text + e.KeyChar, out f); - if (b2 == false) - { - if (b1) - e.Handled = true; - else - e.Handled = false; - } + e.Handled = b1; } } } @@ -457,7 +453,7 @@ { frm = null; - Utility.RemoveFeatureFromName(globeControl1, "trackPolygon"); + FeatureTools.RemoveFeatureFromName(globeControl1, "trackPolygon"); globeControl1.TrackPolygonEndEvent -= globeControl1_TrackPolygonEndEvent; globeControl1.Globe.Action = EnumAction3D.ActionNull; diff --git a/FrmpipeDiametergather.cs b/FrmpipeDiametergather.cs index a9d96fa..c09aaf1 100644 --- a/FrmpipeDiametergather.cs +++ b/FrmpipeDiametergather.cs @@ -154,7 +154,7 @@ MessageBox.Show("请选择图层！"); return; } - Utility.RemoveFeatureFromName(globeControl1, "trackPolygon"); + FeatureTools.RemoveFeatureFromName(globeControl1, "trackPolygon"); globeControl1.Globe.Action = EnumAction3D.TrackPolygon; globeControl1.Globe.TrackPolygonTool.TrackMode = EnumTrackMode.SpaceTrack; globeControl1.TrackPolygonEndEvent += globeControl1_TrackPolygonEndEvent; @@ -392,7 +392,7 @@ private void FrmpipeDiametergather_FormClosing(object sender, FormClosingEventArgs e) { frm = null; - Utility.RemoveFeatureFromName(globeControl1, "trackPolygon"); + FeatureTools.RemoveFeatureFromName(globeControl1, "trackPolygon"); globeControl1.TrackPolygonEndEvent -= globeControl1_TrackPolygonEndEvent; globeControl1.Globe.Action = EnumAction3D.ActionNull; diff --git a/FeatureStatisticsService.cs b/FeatureStatisticsService.cs index 331ee47..b127fe3 100644 --- a/FeatureStatisticsService.cs +++ b/FeatureStatisticsService.cs @@ -190,7 +190,7 @@ List result = new List(); //layer.Name是表名 - string[] accessStrs = Utility.getAccStrsByLayer(layer.Name); + string[] accessStrs = FeatureTools.GetAccStrsByLayer(layer.Name); foreach (string accssname in accessStrs) { diff --git a/FeatureTools.cs b/FeatureTools.cs index be4b469..3c08f34 100644 --- a/FeatureTools.cs +++ b/FeatureTools.cs @@ -1,5 +1,6 @@ using System; using System.Collections.Generic; +using System.Data; using System.Linq; using System.Text; using System.Windows.Forms; @@ -43,7 +44,7 @@ } feature.Delete();//地球上删除该feature string sql = "delete from " + layerName + " where LSSYS_ID =" + feature.ID + " and (编号 is null or substr(编号,length(编号)-2)='TMP')"; - OledbHelper.sqlExecuteNonQuery(sql);//目前无法取到LSSYS_ID，所以这个判断条件不太合适，会导致把该类所有新建的都删除了 + OledbHelper.sqlExecuteNonQuery(sql); } catch (Exception) { @@ -106,5 +107,46 @@ } return value; } + + /// + /// 根据附属物图层名字得到里面含有的附属物 + /// + /// + /// + public static string[] GetAccStrsByLayer(string layername) + { + string[] accStrs = null; + string sql = "select 附属物名称 from " + layername + " group by 附属物名称"; + DataSet dataset = OledbHelper.getDataSet(sql, layername); + if (dataset == null) return null; + accStrs = new string[dataset.Tables[0].Rows.Count]; + for (int i = 0; i < dataset.Tables[0].Rows.Count; i++) + { + accStrs[i] = dataset.Tables[0].Rows[i][0].ToString(); + } + return accStrs; + } + + /// + /// 删除内存图层中指定名称的feature + /// + /// + /// + public static void RemoveFeatureFromName(GSOGlobeControl globeControl1, string featureName) + { + GSOFeatures features = globeControl1.Globe.MemoryLayer.GetFeatureByName(featureName, true); + if (features != null) + { + for (int i = features.Length - 1; i >= 0; i--) + { + GSOFeature feature = features[i]; + if (feature != null) + { + globeControl1.Globe.MemoryLayer.RemoveFeatureByID(feature.ID); + } + } + } + globeControl1.Refresh(); + } } } diff --git a/Forms/FrmPipelineModelDataBase.cs b/Forms/FrmPipelineModelDataBase.cs index b577fd8..bc1e479 100644 --- a/Forms/FrmPipelineModelDataBase.cs +++ b/Forms/FrmPipelineModelDataBase.cs @@ -149,7 +149,7 @@ catch (Exception ex) { LogError.PublishError(ex); - LogHelper.WriteLog(typeof(FrmPipelineModelDB), ex.Message); + LogHelper.Error(ex.Message); } } diff --git a/FrmAccessoriesSensor.cs b/FrmAccessoriesSensor.cs index 98aa1cf..542f19a 100644 --- a/FrmAccessoriesSensor.cs +++ b/FrmAccessoriesSensor.cs @@ -240,7 +240,7 @@ { if (clbPipeLine.CheckedItems.Count > 0) { - Utility.RemoveFeatureFromName(globeControl1, "trackPolygon"); + FeatureTools.RemoveFeatureFromName(globeControl1, "trackPolygon"); globeControl1.Globe.Action = EnumAction3D.TrackPolygon; globeControl1.TrackPolygonEndEvent += globeControl1_TrackPolygonEndEvent; } @@ -259,7 +259,7 @@ private void FrmAccessoriesgather_FormClosing(object sender, FormClosingEventArgs e) { frm = null; - Utility.RemoveFeatureFromName(globeControl1, "trackPolygon"); + FeatureTools.RemoveFeatureFromName(globeControl1, "trackPolygon"); globeControl1.Globe.Action = EnumAction3D.ActionNull; globeControl1.TrackPolygonEndEvent -= globeControl1_TrackPolygonEndEvent; } diff --git a/FrmAccessoriesgather.cs b/FrmAccessoriesgather.cs index e1d176e..c36273b 100644 --- a/FrmAccessoriesgather.cs +++ b/FrmAccessoriesgather.cs @@ -118,7 +118,7 @@ { if (clbPipeLine2.Text!="") { - Utility.RemoveFeatureFromName(globeControl1, "trackPolygon"); + FeatureTools.RemoveFeatureFromName(globeControl1, "trackPolygon"); globeControl1.Globe.Action = EnumAction3D.TrackPolygon; globeControl1.Globe.TrackPolygonTool.TrackMode = EnumTrackMode.SpaceTrack; globeControl1.TrackPolygonEndEvent += globeControl1_TrackPolygonEndEvent; @@ -295,7 +295,7 @@ private void FrmAccessoriesgather_FormClosing(object sender, FormClosingEventArgs e) { frm = null; - Utility.RemoveFeatureFromName(globeControl1, "trackPolygon"); + FeatureTools.RemoveFeatureFromName(globeControl1, "trackPolygon"); globeControl1.TrackPolygonEndEvent -= globeControl1_TrackPolygonEndEvent; globeControl1.Globe.Action = EnumAction3D.ActionNull; diff --git a/FrmAddWellShp.cs b/FrmAddWellShp.cs index 7983349..78d8946 100644 --- a/FrmAddWellShp.cs +++ b/FrmAddWellShp.cs @@ -100,7 +100,7 @@ catch (Exception ex) { LogError.PublishError(ex); - LogHelper.WriteLog(typeof(FrmAddWellShp), ex.Message); + LogHelper.Error(ex.Message); } } diff --git a/FrmBSQStatis.cs b/FrmBSQStatis.cs index 5b05926..b5e581d 100644 --- a/FrmBSQStatis.cs +++ b/FrmBSQStatis.cs @@ -97,7 +97,7 @@ } catch (Exception ex) { - LogHelper.WriteLog(typeof(FrmBSQStatis),ex.Message); + LogHelper.Error(ex.Message); } return typeAndCount; } @@ -108,7 +108,7 @@ GSOLayer layer = globeControl1.Globe.Layers.GetLayerByCaption("标识器"); GSOFeatures bsqFs = FeatureStatisticsService.GetLayerFeatures(polygon, layer); if (bsqFs == null || bsqFs.Length <= 0) { - LogHelper.WriteLog(typeof(FrmBSQStatis),"标识器图层下的Feature为空"); + LogHelper.Error("标识器图层下的Feature为空!"); return null; } diff --git a/FrmBasicQuery.cs b/FrmBasicQuery.cs index baeeade..cc8d3ff 100644 --- a/FrmBasicQuery.cs +++ b/FrmBasicQuery.cs @@ -224,7 +224,7 @@ } catch(Exception ex) { - LogHelper.WriteLog(typeof(FrmBasicQuery), ex.Message); + LogHelper.Error(ex.Message); } } else diff --git a/FrmCodingQuery.cs b/FrmCodingQuery.cs index f1ac322..d4ec095 100644 --- a/FrmCodingQuery.cs +++ b/FrmCodingQuery.cs @@ -82,7 +82,7 @@ } catch (Exception ex) { - LogHelper.WriteLog(typeof(FrmCodingQuery), ex.Message); ; + LogHelper.Error(ex.Message); } } diff --git a/FrmDiameterQuery.cs b/FrmDiameterQuery.cs index e7b3657..75d7949 100644 --- a/FrmDiameterQuery.cs +++ b/FrmDiameterQuery.cs @@ -150,7 +150,7 @@ catch (Exception ex) { //LogError.PublishError(ex); - LogHelper.WriteLog(typeof(FrmDiameterQuery), ex.Message); + LogHelper.Error(ex.Message); MessageBox.Show("请输入正确的管径范围！"); return; } diff --git a/FrmFittingQuery.cs b/FrmFittingQuery.cs index 12f6007..8645011 100644 --- a/FrmFittingQuery.cs +++ b/FrmFittingQuery.cs @@ -69,7 +69,7 @@ } catch (Exception ex) { - LogHelper.WriteLog(typeof(FrmFittingQuery), ex.Message); + LogHelper.Error(ex.Message); } } /// diff --git a/FrmKeywordQuery.cs b/FrmKeywordQuery.cs index 405524f..ede0a93 100644 --- a/FrmKeywordQuery.cs +++ b/FrmKeywordQuery.cs @@ -87,7 +87,7 @@ } catch (Exception ex) { - LogHelper.WriteLog(typeof(FrmKeywordQuery), ex.Message); + LogHelper.Error(ex.Message); } } diff --git a/FrmLogin.cs b/FrmLogin.cs index 1172c23..6fbaed9 100644 --- a/FrmLogin.cs +++ b/FrmLogin.cs @@ -2,6 +2,8 @@ using System.Data; using System.Data.OracleClient; using System.IO; +using System.Net; +using System.Text; using System.Windows.Forms; using System.Xml; using DevComponents.DotNetBar; @@ -10,16 +12,15 @@ { public partial class FrmLogin : Office2007Form { + + //登录界面 -- 配置文件的路径 + public static string filename = Application.StartupPath + "\\login.xml"; + + public FrmLogin() { InitializeComponent(); } - public string rolename = "浏览"; - public string username = ""; - public string department = ""; - - //登录界面 -- 配置文件的路径 - public static string filename = Application.StartupPath + "\\login.xml"; /// /// 登录按钮事件处理 /// @@ -28,9 +29,10 @@ private void button1_Click(object sender, EventArgs e) { bool result = ValidateUser(); +// bool result =ValidateFromUrl();//从平台获取用户角色信息，判断是否能登陆成功 if (result) { - username = txtUser.Text.Trim(); + WriteXml(); Utility.userName = txtUser.Text.Trim(); DialogResult = DialogResult.OK; Close(); @@ -43,80 +45,6 @@ } } /// - /// 关闭按钮事件处理 - /// - /// - /// - private void button2_Click(object sender, EventArgs e) - { - Close(); - } - /// - /// 验证端口号 - /// - /// - //private bool ValiPort() - //{ - // Ping p = new Ping();//创建Ping对象p - // PingReply pr = p.Send(Utility.localicenseserverip);//向指定IP或者主机名的计算机发送ICMP协议的ping数据包 - // if (pr.Status == IPStatus.Success)//如果ping成功 - // { - // try - // { - // TcpClient tcpc = new TcpClient(Utility.localicenseserverip, Utility.localicenseserverport);//对IP地址为"192.168.0.105"的计算机的1500端口提出连接申请 - // tcpc.Close(); - // return true; - // } - // catch (Exception ex) - // { - // LogError.PublishError(ex); - // MessageBox.Show("端口连接错误！" + ex.Message); - // return false; - // } - // } - // else - // { - // int times = 0;//重新连接次数; - // int count = 2;//设置尝试次数 - // while (times < count) - // { - // //Thread.Sleep(1000);//等待时间(方便测试的话，你可以改为1000) - // pr = p.Send(Utility.localicenseserverip); - - // if (pr.Status == IPStatus.Success) - // { - // try - // { - // TcpClient tcpc = new TcpClient(Utility.localicenseserverip, Utility.localicenseserverport);//对IP地址为"192.168.0.105"的计算机的1500端口提出连接申请 - // tcpc.Close(); - // return true; - // } - // catch (Exception ex) - // { - // LogError.PublishError(ex); - // MessageBox.Show("端口连接错误！" + ex.Message); - // return false; - // } - // } - // else - // { - // times++; - // if (times < count) - // { - // continue; - // } - // else - // { - // MessageBox.Show("重新尝试连接失败"); - // return false; - // } - // } - - // } - // return false; - // } - //} - /// /// 验证用户名、密码 /// /// @@ -126,24 +54,64 @@ string sql = "select * from casic_userinfotest where USERNAME='" + txtUser.Text.Trim() + "' and PASSWORD='" + passWord + "' and sysname='GHFX' "; DataTable dt = OledbHelper.QueryTable(sql); - if (dt != null && dt.Rows.Count > 0) + if (dt == null || dt.Rows.Count <= 0) return false; + if (String.IsNullOrEmpty(dt.Rows[0]["rid"].ToString())) return true; + sql = "select gid from casic_userroletest where id=" + dt.Rows[0]["rid"] + " and sysname='GHFX' "; + using (OracleDataReader reader = OracleUtils.ExecuteReader(OracleUtils.ConnectionString, CommandType.Text, sql)) { - WriteXML(); - if (!String.IsNullOrEmpty(dt.Rows[0]["rid"].ToString())) + while (reader.Read()) { - sql = "select gid from casic_userroletest where id=" + dt.Rows[0]["rid"] + " and sysname='GHFX' "; - using (OracleDataReader reader = OracleUtils.ExecuteReader(OracleUtils.ConnectionString, CommandType.Text, sql)) - { - while (reader.Read()) - { - Utility.userRole = reader[0].ToString(); - break; - } - } + Utility.userRole = reader[0].ToString(); + LogHelper.Debug("测试一下"); + break; } - return true; } - return false; + return true; + } + + + + private bool ValidateFromUrl() + { + string user = txtUser.Text.Trim(); + string pwd = textBoxPassWord.Text.Trim(); + //做成配置的 + string roleserver = Utility.RoleServer; + if (roleserver == null || roleserver.Trim().Equals("")) + { + MessageBox.Show("请在Config.xml中配置roleurl！"); + return false; + } + HttpWebRequest request = + WebRequest.Create(roleserver+"/rs/authority/user?username=" + user + "&password=" + pwd + "&appId=21") as HttpWebRequest; + if (request == null) return false; + using (HttpWebResponse response = request.GetResponse() as HttpWebResponse) + { + try + { + if (response == null || response.GetResponseStream() == null) return false; + StreamReader reader = new StreamReader(response.GetResponseStream()); + string[] result = reader.ReadToEnd().Split(','); + //解析result + if (result.Length < 5) return false; + StringBuilder userRole = new StringBuilder(""); + for (int i = 4; i < result.Length; i++) + { + string[] tmpStrings = result[i].Split('_'); + if (tmpStrings.Length < 2) continue; + userRole.Append(tmpStrings[1].Trim() + ","); + } + if (userRole.Length < 3) return false; + userRole.Remove(userRole.Length - 3, 3); + // MessageBox.Show(userRole.ToString()); + Utility.userRole = userRole.ToString(); + return Utility.userRole != null && !Utility.userRole.Equals("null"); + } + catch (Exception e) + { + return false; + } + } } private void FrmLogin_Load(object sender, EventArgs e) @@ -153,74 +121,56 @@ StartPosition = FormStartPosition.CenterScreen; - ReadXML(); + ReadXml(); } /// /// 读取上一次登录的用户名和密码 /// - private void ReadXML() + private void ReadXml() { - if (File.Exists(filename)) + if (!File.Exists(filename)) return; + //初始化XML文档操作类 + XmlDocument myDoc = new XmlDocument(); { - if (!File.Exists(filename)) + //加载XML文件 + try { + myDoc.Load(filename); + } + catch (Exception e) + { + LogError.PublishError(e); return; } - - //初始化XML文档操作类 - XmlDocument myDoc = new XmlDocument(); + //搜索指定的节点 + XmlNode serverRootNode = myDoc.SelectSingleNode("Params"); + XmlNodeList nodes = null; + if (serverRootNode != null) { - //加载XML文件 - try + nodes = serverRootNode.ChildNodes; + } + if (nodes == null) return; + foreach (XmlNode xn in nodes) + { + if (xn.Name.Equals("username")) { - myDoc.Load(filename); + txtUser.Text = xn.InnerText.Trim(); } - catch (Exception e) + else if (xn.Name.Equals("password")) { - LogError.PublishError(e); - return; + textBoxPassWord.Text = xn.InnerText.Trim(); } - //搜索指定的节点 - XmlNode serverRootNode = myDoc.SelectSingleNode("Params"); - XmlNodeList nodes = null; - if (serverRootNode != null) + else if (xn.Name.Equals("isremember")) { - nodes = serverRootNode.ChildNodes; - } - if (nodes != null) - { - foreach (XmlNode xn in nodes) - { - if (xn.Name == "username") - { - txtUser.Text = xn.InnerText.Trim(); - } - else if (xn.Name == "password") - { - textBoxPassWord.Text = xn.InnerText.Trim(); - } - else if (xn.Name == "isremember") - { - if (xn.InnerText.Trim() == "true") - { - checkBoxXRememberPassword.Checked = true; - } - else if (xn.InnerText.Trim() == "false") - { - checkBoxXRememberPassword.Checked = false; - } - } - } - + checkBoxXRememberPassword.Checked = xn.InnerText.Trim().Equals("true"); } } } - } /// /// 记录登录的用户名和密码 /// - private void WriteXML() + private void WriteXml() { if (!File.Exists(filename)) { @@ -252,31 +202,17 @@ foreach (XmlNode xn in nodes) { XmlElement xe = (XmlElement)xn; - if (xe.Name == "username") + if (xe.Name.Equals("username")) { xe.InnerText = txtUser.Text.Trim(); } - else if (xe.Name == "password") + else if (xe.Name.Equals("password")) { - if (checkBoxXRememberPassword.Checked) - { - xe.InnerText = textBoxPassWord.Text.Trim(); - } - else - { - xe.InnerText = ""; - } + xe.InnerText = checkBoxXRememberPassword.Checked ? textBoxPassWord.Text.Trim() : ""; } - else if (xe.Name == "isremember") + else if (xe.Name.Equals("isremember")) { - if (checkBoxXRememberPassword.Checked) - { - xe.InnerText = "true"; - } - else - { - xe.InnerText = "false"; - } + xe.InnerText = checkBoxXRememberPassword.Checked ? "true" : "false"; } } } diff --git a/FrmMaterialSel.cs b/FrmMaterialSel.cs index 8645ab3..d23f385 100644 --- a/FrmMaterialSel.cs +++ b/FrmMaterialSel.cs @@ -157,7 +157,7 @@ } catch (Exception ex) { - LogHelper.WriteLog(typeof(FrmMaterialSel), ex.Message); + LogHelper.Error(ex.Message); } } diff --git a/FrmMetadataStat.cs b/FrmMetadataStat.cs index c3c1359..96029a6 100644 --- a/FrmMetadataStat.cs +++ b/FrmMetadataStat.cs @@ -96,7 +96,7 @@ //统计有多少个图层 private int statistLayer() { - List datasrcs = Utility.layerConfig.datasrcs; + List datasrcs = Utility.LayerConfig.datasrcs; return datasrcs.SelectMany(datasrc => datasrc.layertypes).Sum(layerType => layerType.layers.Count); } diff --git a/FrmpipeDeepstatis.cs b/FrmpipeDeepstatis.cs index 6a5c895..8d915a9 100644 --- a/FrmpipeDeepstatis.cs +++ b/FrmpipeDeepstatis.cs @@ -2,6 +2,7 @@ using System.Collections.Generic; using System.Diagnostics; using System.IO; +using System.Reflection; using System.Text; using System.Windows.Forms; using System.Windows.Forms.DataVisualization.Charting; @@ -320,7 +321,7 @@ MessageBox.Show("请添加分段"); return; } - Utility.RemoveFeatureFromName(globeControl1, "trackPolygon"); + FeatureTools.RemoveFeatureFromName(globeControl1, "trackPolygon"); globeControl1.Globe.Action = EnumAction3D.TrackPolygon; globeControl1.Globe.TrackPolygonTool.TrackMode = EnumTrackMode.SpaceTrack; globeControl1.TrackPolygonEndEvent += globeControl1_TrackPolygonEndEvent; @@ -408,12 +409,11 @@ TextBox control; private void dataGridViewX2_EditingControlShowing(object sender, DataGridViewEditingControlShowingEventArgs e) { - if (e.Control.GetType().BaseType.Name == "TextBox") - { - control = new TextBox(); - control = (TextBox)e.Control; - control.KeyPress += control_KeyPress; - } + MemberInfo memberInfo = e.Control.GetType().BaseType; + if (memberInfo != null && !memberInfo.Name.Equals("TextBox")) return; + control = new TextBox(); + control = (TextBox)e.Control; + control.KeyPress += control_KeyPress; } /// /// 键盘按键按下事件处理 @@ -423,28 +423,24 @@ void control_KeyPress(object sender, KeyPressEventArgs e) { TextBox text = sender as TextBox; + if (text == null) return; if ((e.KeyChar < 48 || e.KeyChar > 57) && (e.KeyChar != 8) && e.KeyChar != 46) { e.Handled = true; } - if (e.KeyChar == 46) //小数点 + if (e.KeyChar != 46) return; + if (text.Text.Length <= 0) + e.Handled = true; //小数点不能在第一位 + else //处理不规则的小数点 { - if (text.Text.Length <= 0) - e.Handled = true; //小数点不能在第一位 - else //处理不规则的小数点 + float f; + float oldf; + bool b1 = false, b2 = false; + b1 = float.TryParse(text.Text, out oldf); + b2 = float.TryParse(text.Text + e.KeyChar, out f); + if (!b2) { - float f; - float oldf; - bool b1 = false, b2 = false; - b1 = float.TryParse(text.Text, out oldf); - b2 = float.TryParse(text.Text + e.KeyChar, out f); - if (b2 == false) - { - if (b1) - e.Handled = true; - else - e.Handled = false; - } + e.Handled = b1; } } } @@ -457,7 +453,7 @@ { frm = null; - Utility.RemoveFeatureFromName(globeControl1, "trackPolygon"); + FeatureTools.RemoveFeatureFromName(globeControl1, "trackPolygon"); globeControl1.TrackPolygonEndEvent -= globeControl1_TrackPolygonEndEvent; globeControl1.Globe.Action = EnumAction3D.ActionNull; diff --git a/FrmpipeDiametergather.cs b/FrmpipeDiametergather.cs index a9d96fa..c09aaf1 100644 --- a/FrmpipeDiametergather.cs +++ b/FrmpipeDiametergather.cs @@ -154,7 +154,7 @@ MessageBox.Show("请选择图层！"); return; } - Utility.RemoveFeatureFromName(globeControl1, "trackPolygon"); + FeatureTools.RemoveFeatureFromName(globeControl1, "trackPolygon"); globeControl1.Globe.Action = EnumAction3D.TrackPolygon; globeControl1.Globe.TrackPolygonTool.TrackMode = EnumTrackMode.SpaceTrack; globeControl1.TrackPolygonEndEvent += globeControl1_TrackPolygonEndEvent; @@ -392,7 +392,7 @@ private void FrmpipeDiametergather_FormClosing(object sender, FormClosingEventArgs e) { frm = null; - Utility.RemoveFeatureFromName(globeControl1, "trackPolygon"); + FeatureTools.RemoveFeatureFromName(globeControl1, "trackPolygon"); globeControl1.TrackPolygonEndEvent -= globeControl1_TrackPolygonEndEvent; globeControl1.Globe.Action = EnumAction3D.ActionNull; diff --git a/FrmpipeMaterialGather.cs b/FrmpipeMaterialGather.cs index 44e7f24..5ca8144 100644 --- a/FrmpipeMaterialGather.cs +++ b/FrmpipeMaterialGather.cs @@ -58,10 +58,9 @@ for (int i = 0; i < pipeLayerNames.Count; i++) { clbPipeLine.Items.Add(pipeLayerNames[i]); - GSOLayer layer = globeControl1.Globe.Layers.GetLayerByCaption(pipeLayerNames[i]); - if (layer.Dataset == null || !layer.Dataset.IsFeatureDataset || layer.Type != EnumLayerType.FeatureLayer) continue; + GSOLayer layer = globeControl1.Globe.Layers.GetLayerByCaption(pipeLayerNames[i]); + if (layer == null || layer.Dataset == null || !layer.Dataset.IsFeatureDataset || layer.Type != EnumLayerType.FeatureLayer) continue; - string name = layer.Name; GSOFeatureLayer flayer = layer as GSOFeatureLayer; GSOFeatures feats = flayer.GetAllFeatures(); @@ -205,7 +204,7 @@ { chart1.Series.Add(clbPipeLine.CheckedItems[i].ToString()); GSOLayer layer = globeControl1.Globe.Layers.GetLayerByCaption(clbPipeLine.CheckedItems[i].ToString()); - if (layer != null && layer is GSOFeatureLayer) + if (layer is GSOFeatureLayer) { GSOFeatureLayer flayer = layer as GSOFeatureLayer; GSOFeatures features = flayer.GetAllFeatures(); @@ -240,10 +239,9 @@ labeStyleAxisX.Enabled = true; chart1.ChartAreas["ChartArea1"].AxisX.LabelStyle = labeStyleAxisX; - Dictionary dic1 = new Dictionary(); for (int j = 0; j < chart1.Series.Count; j++) { - dic1 = new Dictionary(); + Dictionary dic1 = new Dictionary(); foreach (string key in dic.Keys) { if (key.Contains(chart1.Series[j].Name)) @@ -304,7 +302,7 @@ MessageBox.Show("请选择材质类型！"); return; } - Utility.RemoveFeatureFromName(globeControl1, "trackPolygon"); + FeatureTools.RemoveFeatureFromName(globeControl1, "trackPolygon"); globeControl1.Globe.Action = EnumAction3D.TrackPolygon; globeControl1.Globe.TrackPolygonTool.TrackMode = EnumTrackMode.SpaceTrack; globeControl1.TrackPolygonEndEvent += globeControl1_TrackPolygonEndEvent; @@ -318,7 +316,7 @@ private void FrmpipeMaterialGather_FormClosing(object sender, FormClosingEventArgs e) { frm = null; - Utility.RemoveFeatureFromName(globeControl1, "trackPolygon"); + FeatureTools.RemoveFeatureFromName(globeControl1, "trackPolygon"); globeControl1.TrackPolygonEndEvent -= globeControl1_TrackPolygonEndEvent; globeControl1.Globe.Action = EnumAction3D.ActionNull; diff --git a/FeatureStatisticsService.cs b/FeatureStatisticsService.cs index 331ee47..b127fe3 100644 --- a/FeatureStatisticsService.cs +++ b/FeatureStatisticsService.cs @@ -190,7 +190,7 @@ List result = new List(); //layer.Name是表名 - string[] accessStrs = Utility.getAccStrsByLayer(layer.Name); + string[] accessStrs = FeatureTools.GetAccStrsByLayer(layer.Name); foreach (string accssname in accessStrs) { diff --git a/FeatureTools.cs b/FeatureTools.cs index be4b469..3c08f34 100644 --- a/FeatureTools.cs +++ b/FeatureTools.cs @@ -1,5 +1,6 @@ using System; using System.Collections.Generic; +using System.Data; using System.Linq; using System.Text; using System.Windows.Forms; @@ -43,7 +44,7 @@ } feature.Delete();//地球上删除该feature string sql = "delete from " + layerName + " where LSSYS_ID =" + feature.ID + " and (编号 is null or substr(编号,length(编号)-2)='TMP')"; - OledbHelper.sqlExecuteNonQuery(sql);//目前无法取到LSSYS_ID，所以这个判断条件不太合适，会导致把该类所有新建的都删除了 + OledbHelper.sqlExecuteNonQuery(sql); } catch (Exception) { @@ -106,5 +107,46 @@ } return value; } + + /// + /// 根据附属物图层名字得到里面含有的附属物 + /// + /// + /// + public static string[] GetAccStrsByLayer(string layername) + { + string[] accStrs = null; + string sql = "select 附属物名称 from " + layername + " group by 附属物名称"; + DataSet dataset = OledbHelper.getDataSet(sql, layername); + if (dataset == null) return null; + accStrs = new string[dataset.Tables[0].Rows.Count]; + for (int i = 0; i < dataset.Tables[0].Rows.Count; i++) + { + accStrs[i] = dataset.Tables[0].Rows[i][0].ToString(); + } + return accStrs; + } + + /// + /// 删除内存图层中指定名称的feature + /// + /// + /// + public static void RemoveFeatureFromName(GSOGlobeControl globeControl1, string featureName) + { + GSOFeatures features = globeControl1.Globe.MemoryLayer.GetFeatureByName(featureName, true); + if (features != null) + { + for (int i = features.Length - 1; i >= 0; i--) + { + GSOFeature feature = features[i]; + if (feature != null) + { + globeControl1.Globe.MemoryLayer.RemoveFeatureByID(feature.ID); + } + } + } + globeControl1.Refresh(); + } } } diff --git a/Forms/FrmPipelineModelDataBase.cs b/Forms/FrmPipelineModelDataBase.cs index b577fd8..bc1e479 100644 --- a/Forms/FrmPipelineModelDataBase.cs +++ b/Forms/FrmPipelineModelDataBase.cs @@ -149,7 +149,7 @@ catch (Exception ex) { LogError.PublishError(ex); - LogHelper.WriteLog(typeof(FrmPipelineModelDB), ex.Message); + LogHelper.Error(ex.Message); } } diff --git a/FrmAccessoriesSensor.cs b/FrmAccessoriesSensor.cs index 98aa1cf..542f19a 100644 --- a/FrmAccessoriesSensor.cs +++ b/FrmAccessoriesSensor.cs @@ -240,7 +240,7 @@ { if (clbPipeLine.CheckedItems.Count > 0) { - Utility.RemoveFeatureFromName(globeControl1, "trackPolygon"); + FeatureTools.RemoveFeatureFromName(globeControl1, "trackPolygon"); globeControl1.Globe.Action = EnumAction3D.TrackPolygon; globeControl1.TrackPolygonEndEvent += globeControl1_TrackPolygonEndEvent; } @@ -259,7 +259,7 @@ private void FrmAccessoriesgather_FormClosing(object sender, FormClosingEventArgs e) { frm = null; - Utility.RemoveFeatureFromName(globeControl1, "trackPolygon"); + FeatureTools.RemoveFeatureFromName(globeControl1, "trackPolygon"); globeControl1.Globe.Action = EnumAction3D.ActionNull; globeControl1.TrackPolygonEndEvent -= globeControl1_TrackPolygonEndEvent; } diff --git a/FrmAccessoriesgather.cs b/FrmAccessoriesgather.cs index e1d176e..c36273b 100644 --- a/FrmAccessoriesgather.cs +++ b/FrmAccessoriesgather.cs @@ -118,7 +118,7 @@ { if (clbPipeLine2.Text!="") { - Utility.RemoveFeatureFromName(globeControl1, "trackPolygon"); + FeatureTools.RemoveFeatureFromName(globeControl1, "trackPolygon"); globeControl1.Globe.Action = EnumAction3D.TrackPolygon; globeControl1.Globe.TrackPolygonTool.TrackMode = EnumTrackMode.SpaceTrack; globeControl1.TrackPolygonEndEvent += globeControl1_TrackPolygonEndEvent; @@ -295,7 +295,7 @@ private void FrmAccessoriesgather_FormClosing(object sender, FormClosingEventArgs e) { frm = null; - Utility.RemoveFeatureFromName(globeControl1, "trackPolygon"); + FeatureTools.RemoveFeatureFromName(globeControl1, "trackPolygon"); globeControl1.TrackPolygonEndEvent -= globeControl1_TrackPolygonEndEvent; globeControl1.Globe.Action = EnumAction3D.ActionNull; diff --git a/FrmAddWellShp.cs b/FrmAddWellShp.cs index 7983349..78d8946 100644 --- a/FrmAddWellShp.cs +++ b/FrmAddWellShp.cs @@ -100,7 +100,7 @@ catch (Exception ex) { LogError.PublishError(ex); - LogHelper.WriteLog(typeof(FrmAddWellShp), ex.Message); + LogHelper.Error(ex.Message); } } diff --git a/FrmBSQStatis.cs b/FrmBSQStatis.cs index 5b05926..b5e581d 100644 --- a/FrmBSQStatis.cs +++ b/FrmBSQStatis.cs @@ -97,7 +97,7 @@ } catch (Exception ex) { - LogHelper.WriteLog(typeof(FrmBSQStatis),ex.Message); + LogHelper.Error(ex.Message); } return typeAndCount; } @@ -108,7 +108,7 @@ GSOLayer layer = globeControl1.Globe.Layers.GetLayerByCaption("标识器"); GSOFeatures bsqFs = FeatureStatisticsService.GetLayerFeatures(polygon, layer); if (bsqFs == null || bsqFs.Length <= 0) { - LogHelper.WriteLog(typeof(FrmBSQStatis),"标识器图层下的Feature为空"); + LogHelper.Error("标识器图层下的Feature为空!"); return null; } diff --git a/FrmBasicQuery.cs b/FrmBasicQuery.cs index baeeade..cc8d3ff 100644 --- a/FrmBasicQuery.cs +++ b/FrmBasicQuery.cs @@ -224,7 +224,7 @@ } catch(Exception ex) { - LogHelper.WriteLog(typeof(FrmBasicQuery), ex.Message); + LogHelper.Error(ex.Message); } } else diff --git a/FrmCodingQuery.cs b/FrmCodingQuery.cs index f1ac322..d4ec095 100644 --- a/FrmCodingQuery.cs +++ b/FrmCodingQuery.cs @@ -82,7 +82,7 @@ } catch (Exception ex) { - LogHelper.WriteLog(typeof(FrmCodingQuery), ex.Message); ; + LogHelper.Error(ex.Message); } } diff --git a/FrmDiameterQuery.cs b/FrmDiameterQuery.cs index e7b3657..75d7949 100644 --- a/FrmDiameterQuery.cs +++ b/FrmDiameterQuery.cs @@ -150,7 +150,7 @@ catch (Exception ex) { //LogError.PublishError(ex); - LogHelper.WriteLog(typeof(FrmDiameterQuery), ex.Message); + LogHelper.Error(ex.Message); MessageBox.Show("请输入正确的管径范围！"); return; } diff --git a/FrmFittingQuery.cs b/FrmFittingQuery.cs index 12f6007..8645011 100644 --- a/FrmFittingQuery.cs +++ b/FrmFittingQuery.cs @@ -69,7 +69,7 @@ } catch (Exception ex) { - LogHelper.WriteLog(typeof(FrmFittingQuery), ex.Message); + LogHelper.Error(ex.Message); } } /// diff --git a/FrmKeywordQuery.cs b/FrmKeywordQuery.cs index 405524f..ede0a93 100644 --- a/FrmKeywordQuery.cs +++ b/FrmKeywordQuery.cs @@ -87,7 +87,7 @@ } catch (Exception ex) { - LogHelper.WriteLog(typeof(FrmKeywordQuery), ex.Message); + LogHelper.Error(ex.Message); } } diff --git a/FrmLogin.cs b/FrmLogin.cs index 1172c23..6fbaed9 100644 --- a/FrmLogin.cs +++ b/FrmLogin.cs @@ -2,6 +2,8 @@ using System.Data; using System.Data.OracleClient; using System.IO; +using System.Net; +using System.Text; using System.Windows.Forms; using System.Xml; using DevComponents.DotNetBar; @@ -10,16 +12,15 @@ { public partial class FrmLogin : Office2007Form { + + //登录界面 -- 配置文件的路径 + public static string filename = Application.StartupPath + "\\login.xml"; + + public FrmLogin() { InitializeComponent(); } - public string rolename = "浏览"; - public string username = ""; - public string department = ""; - - //登录界面 -- 配置文件的路径 - public static string filename = Application.StartupPath + "\\login.xml"; /// /// 登录按钮事件处理 /// @@ -28,9 +29,10 @@ private void button1_Click(object sender, EventArgs e) { bool result = ValidateUser(); +// bool result =ValidateFromUrl();//从平台获取用户角色信息，判断是否能登陆成功 if (result) { - username = txtUser.Text.Trim(); + WriteXml(); Utility.userName = txtUser.Text.Trim(); DialogResult = DialogResult.OK; Close(); @@ -43,80 +45,6 @@ } } /// - /// 关闭按钮事件处理 - /// - /// - /// - private void button2_Click(object sender, EventArgs e) - { - Close(); - } - /// - /// 验证端口号 - /// - /// - //private bool ValiPort() - //{ - // Ping p = new Ping();//创建Ping对象p - // PingReply pr = p.Send(Utility.localicenseserverip);//向指定IP或者主机名的计算机发送ICMP协议的ping数据包 - // if (pr.Status == IPStatus.Success)//如果ping成功 - // { - // try - // { - // TcpClient tcpc = new TcpClient(Utility.localicenseserverip, Utility.localicenseserverport);//对IP地址为"192.168.0.105"的计算机的1500端口提出连接申请 - // tcpc.Close(); - // return true; - // } - // catch (Exception ex) - // { - // LogError.PublishError(ex); - // MessageBox.Show("端口连接错误！" + ex.Message); - // return false; - // } - // } - // else - // { - // int times = 0;//重新连接次数; - // int count = 2;//设置尝试次数 - // while (times < count) - // { - // //Thread.Sleep(1000);//等待时间(方便测试的话，你可以改为1000) - // pr = p.Send(Utility.localicenseserverip); - - // if (pr.Status == IPStatus.Success) - // { - // try - // { - // TcpClient tcpc = new TcpClient(Utility.localicenseserverip, Utility.localicenseserverport);//对IP地址为"192.168.0.105"的计算机的1500端口提出连接申请 - // tcpc.Close(); - // return true; - // } - // catch (Exception ex) - // { - // LogError.PublishError(ex); - // MessageBox.Show("端口连接错误！" + ex.Message); - // return false; - // } - // } - // else - // { - // times++; - // if (times < count) - // { - // continue; - // } - // else - // { - // MessageBox.Show("重新尝试连接失败"); - // return false; - // } - // } - - // } - // return false; - // } - //} - /// /// 验证用户名、密码 /// /// @@ -126,24 +54,64 @@ string sql = "select * from casic_userinfotest where USERNAME='" + txtUser.Text.Trim() + "' and PASSWORD='" + passWord + "' and sysname='GHFX' "; DataTable dt = OledbHelper.QueryTable(sql); - if (dt != null && dt.Rows.Count > 0) + if (dt == null || dt.Rows.Count <= 0) return false; + if (String.IsNullOrEmpty(dt.Rows[0]["rid"].ToString())) return true; + sql = "select gid from casic_userroletest where id=" + dt.Rows[0]["rid"] + " and sysname='GHFX' "; + using (OracleDataReader reader = OracleUtils.ExecuteReader(OracleUtils.ConnectionString, CommandType.Text, sql)) { - WriteXML(); - if (!String.IsNullOrEmpty(dt.Rows[0]["rid"].ToString())) + while (reader.Read()) { - sql = "select gid from casic_userroletest where id=" + dt.Rows[0]["rid"] + " and sysname='GHFX' "; - using (OracleDataReader reader = OracleUtils.ExecuteReader(OracleUtils.ConnectionString, CommandType.Text, sql)) - { - while (reader.Read()) - { - Utility.userRole = reader[0].ToString(); - break; - } - } + Utility.userRole = reader[0].ToString(); + LogHelper.Debug("测试一下"); + break; } - return true; } - return false; + return true; + } + + + + private bool ValidateFromUrl() + { + string user = txtUser.Text.Trim(); + string pwd = textBoxPassWord.Text.Trim(); + //做成配置的 + string roleserver = Utility.RoleServer; + if (roleserver == null || roleserver.Trim().Equals("")) + { + MessageBox.Show("请在Config.xml中配置roleurl！"); + return false; + } + HttpWebRequest request = + WebRequest.Create(roleserver+"/rs/authority/user?username=" + user + "&password=" + pwd + "&appId=21") as HttpWebRequest; + if (request == null) return false; + using (HttpWebResponse response = request.GetResponse() as HttpWebResponse) + { + try + { + if (response == null || response.GetResponseStream() == null) return false; + StreamReader reader = new StreamReader(response.GetResponseStream()); + string[] result = reader.ReadToEnd().Split(','); + //解析result + if (result.Length < 5) return false; + StringBuilder userRole = new StringBuilder(""); + for (int i = 4; i < result.Length; i++) + { + string[] tmpStrings = result[i].Split('_'); + if (tmpStrings.Length < 2) continue; + userRole.Append(tmpStrings[1].Trim() + ","); + } + if (userRole.Length < 3) return false; + userRole.Remove(userRole.Length - 3, 3); + // MessageBox.Show(userRole.ToString()); + Utility.userRole = userRole.ToString(); + return Utility.userRole != null && !Utility.userRole.Equals("null"); + } + catch (Exception e) + { + return false; + } + } } private void FrmLogin_Load(object sender, EventArgs e) @@ -153,74 +121,56 @@ StartPosition = FormStartPosition.CenterScreen; - ReadXML(); + ReadXml(); } /// /// 读取上一次登录的用户名和密码 /// - private void ReadXML() + private void ReadXml() { - if (File.Exists(filename)) + if (!File.Exists(filename)) return; + //初始化XML文档操作类 + XmlDocument myDoc = new XmlDocument(); { - if (!File.Exists(filename)) + //加载XML文件 + try { + myDoc.Load(filename); + } + catch (Exception e) + { + LogError.PublishError(e); return; } - - //初始化XML文档操作类 - XmlDocument myDoc = new XmlDocument(); + //搜索指定的节点 + XmlNode serverRootNode = myDoc.SelectSingleNode("Params"); + XmlNodeList nodes = null; + if (serverRootNode != null) { - //加载XML文件 - try + nodes = serverRootNode.ChildNodes; + } + if (nodes == null) return; + foreach (XmlNode xn in nodes) + { + if (xn.Name.Equals("username")) { - myDoc.Load(filename); + txtUser.Text = xn.InnerText.Trim(); } - catch (Exception e) + else if (xn.Name.Equals("password")) { - LogError.PublishError(e); - return; + textBoxPassWord.Text = xn.InnerText.Trim(); } - //搜索指定的节点 - XmlNode serverRootNode = myDoc.SelectSingleNode("Params"); - XmlNodeList nodes = null; - if (serverRootNode != null) + else if (xn.Name.Equals("isremember")) { - nodes = serverRootNode.ChildNodes; - } - if (nodes != null) - { - foreach (XmlNode xn in nodes) - { - if (xn.Name == "username") - { - txtUser.Text = xn.InnerText.Trim(); - } - else if (xn.Name == "password") - { - textBoxPassWord.Text = xn.InnerText.Trim(); - } - else if (xn.Name == "isremember") - { - if (xn.InnerText.Trim() == "true") - { - checkBoxXRememberPassword.Checked = true; - } - else if (xn.InnerText.Trim() == "false") - { - checkBoxXRememberPassword.Checked = false; - } - } - } - + checkBoxXRememberPassword.Checked = xn.InnerText.Trim().Equals("true"); } } } - } /// /// 记录登录的用户名和密码 /// - private void WriteXML() + private void WriteXml() { if (!File.Exists(filename)) { @@ -252,31 +202,17 @@ foreach (XmlNode xn in nodes) { XmlElement xe = (XmlElement)xn; - if (xe.Name == "username") + if (xe.Name.Equals("username")) { xe.InnerText = txtUser.Text.Trim(); } - else if (xe.Name == "password") + else if (xe.Name.Equals("password")) { - if (checkBoxXRememberPassword.Checked) - { - xe.InnerText = textBoxPassWord.Text.Trim(); - } - else - { - xe.InnerText = ""; - } + xe.InnerText = checkBoxXRememberPassword.Checked ? textBoxPassWord.Text.Trim() : ""; } - else if (xe.Name == "isremember") + else if (xe.Name.Equals("isremember")) { - if (checkBoxXRememberPassword.Checked) - { - xe.InnerText = "true"; - } - else - { - xe.InnerText = "false"; - } + xe.InnerText = checkBoxXRememberPassword.Checked ? "true" : "false"; } } } diff --git a/FrmMaterialSel.cs b/FrmMaterialSel.cs index 8645ab3..d23f385 100644 --- a/FrmMaterialSel.cs +++ b/FrmMaterialSel.cs @@ -157,7 +157,7 @@ } catch (Exception ex) { - LogHelper.WriteLog(typeof(FrmMaterialSel), ex.Message); + LogHelper.Error(ex.Message); } } diff --git a/FrmMetadataStat.cs b/FrmMetadataStat.cs index c3c1359..96029a6 100644 --- a/FrmMetadataStat.cs +++ b/FrmMetadataStat.cs @@ -96,7 +96,7 @@ //统计有多少个图层 private int statistLayer() { - List datasrcs = Utility.layerConfig.datasrcs; + List datasrcs = Utility.LayerConfig.datasrcs; return datasrcs.SelectMany(datasrc => datasrc.layertypes).Sum(layerType => layerType.layers.Count); } diff --git a/FrmpipeDeepstatis.cs b/FrmpipeDeepstatis.cs index 6a5c895..8d915a9 100644 --- a/FrmpipeDeepstatis.cs +++ b/FrmpipeDeepstatis.cs @@ -2,6 +2,7 @@ using System.Collections.Generic; using System.Diagnostics; using System.IO; +using System.Reflection; using System.Text; using System.Windows.Forms; using System.Windows.Forms.DataVisualization.Charting; @@ -320,7 +321,7 @@ MessageBox.Show("请添加分段"); return; } - Utility.RemoveFeatureFromName(globeControl1, "trackPolygon"); + FeatureTools.RemoveFeatureFromName(globeControl1, "trackPolygon"); globeControl1.Globe.Action = EnumAction3D.TrackPolygon; globeControl1.Globe.TrackPolygonTool.TrackMode = EnumTrackMode.SpaceTrack; globeControl1.TrackPolygonEndEvent += globeControl1_TrackPolygonEndEvent; @@ -408,12 +409,11 @@ TextBox control; private void dataGridViewX2_EditingControlShowing(object sender, DataGridViewEditingControlShowingEventArgs e) { - if (e.Control.GetType().BaseType.Name == "TextBox") - { - control = new TextBox(); - control = (TextBox)e.Control; - control.KeyPress += control_KeyPress; - } + MemberInfo memberInfo = e.Control.GetType().BaseType; + if (memberInfo != null && !memberInfo.Name.Equals("TextBox")) return; + control = new TextBox(); + control = (TextBox)e.Control; + control.KeyPress += control_KeyPress; } /// /// 键盘按键按下事件处理 @@ -423,28 +423,24 @@ void control_KeyPress(object sender, KeyPressEventArgs e) { TextBox text = sender as TextBox; + if (text == null) return; if ((e.KeyChar < 48 || e.KeyChar > 57) && (e.KeyChar != 8) && e.KeyChar != 46) { e.Handled = true; } - if (e.KeyChar == 46) //小数点 + if (e.KeyChar != 46) return; + if (text.Text.Length <= 0) + e.Handled = true; //小数点不能在第一位 + else //处理不规则的小数点 { - if (text.Text.Length <= 0) - e.Handled = true; //小数点不能在第一位 - else //处理不规则的小数点 + float f; + float oldf; + bool b1 = false, b2 = false; + b1 = float.TryParse(text.Text, out oldf); + b2 = float.TryParse(text.Text + e.KeyChar, out f); + if (!b2) { - float f; - float oldf; - bool b1 = false, b2 = false; - b1 = float.TryParse(text.Text, out oldf); - b2 = float.TryParse(text.Text + e.KeyChar, out f); - if (b2 == false) - { - if (b1) - e.Handled = true; - else - e.Handled = false; - } + e.Handled = b1; } } } @@ -457,7 +453,7 @@ { frm = null; - Utility.RemoveFeatureFromName(globeControl1, "trackPolygon"); + FeatureTools.RemoveFeatureFromName(globeControl1, "trackPolygon"); globeControl1.TrackPolygonEndEvent -= globeControl1_TrackPolygonEndEvent; globeControl1.Globe.Action = EnumAction3D.ActionNull; diff --git a/FrmpipeDiametergather.cs b/FrmpipeDiametergather.cs index a9d96fa..c09aaf1 100644 --- a/FrmpipeDiametergather.cs +++ b/FrmpipeDiametergather.cs @@ -154,7 +154,7 @@ MessageBox.Show("请选择图层！"); return; } - Utility.RemoveFeatureFromName(globeControl1, "trackPolygon"); + FeatureTools.RemoveFeatureFromName(globeControl1, "trackPolygon"); globeControl1.Globe.Action = EnumAction3D.TrackPolygon; globeControl1.Globe.TrackPolygonTool.TrackMode = EnumTrackMode.SpaceTrack; globeControl1.TrackPolygonEndEvent += globeControl1_TrackPolygonEndEvent; @@ -392,7 +392,7 @@ private void FrmpipeDiametergather_FormClosing(object sender, FormClosingEventArgs e) { frm = null; - Utility.RemoveFeatureFromName(globeControl1, "trackPolygon"); + FeatureTools.RemoveFeatureFromName(globeControl1, "trackPolygon"); globeControl1.TrackPolygonEndEvent -= globeControl1_TrackPolygonEndEvent; globeControl1.Globe.Action = EnumAction3D.ActionNull; diff --git a/FrmpipeMaterialGather.cs b/FrmpipeMaterialGather.cs index 44e7f24..5ca8144 100644 --- a/FrmpipeMaterialGather.cs +++ b/FrmpipeMaterialGather.cs @@ -58,10 +58,9 @@ for (int i = 0; i < pipeLayerNames.Count; i++) { clbPipeLine.Items.Add(pipeLayerNames[i]); - GSOLayer layer = globeControl1.Globe.Layers.GetLayerByCaption(pipeLayerNames[i]); - if (layer.Dataset == null || !layer.Dataset.IsFeatureDataset || layer.Type != EnumLayerType.FeatureLayer) continue; + GSOLayer layer = globeControl1.Globe.Layers.GetLayerByCaption(pipeLayerNames[i]); + if (layer == null || layer.Dataset == null || !layer.Dataset.IsFeatureDataset || layer.Type != EnumLayerType.FeatureLayer) continue; - string name = layer.Name; GSOFeatureLayer flayer = layer as GSOFeatureLayer; GSOFeatures feats = flayer.GetAllFeatures(); @@ -205,7 +204,7 @@ { chart1.Series.Add(clbPipeLine.CheckedItems[i].ToString()); GSOLayer layer = globeControl1.Globe.Layers.GetLayerByCaption(clbPipeLine.CheckedItems[i].ToString()); - if (layer != null && layer is GSOFeatureLayer) + if (layer is GSOFeatureLayer) { GSOFeatureLayer flayer = layer as GSOFeatureLayer; GSOFeatures features = flayer.GetAllFeatures(); @@ -240,10 +239,9 @@ labeStyleAxisX.Enabled = true; chart1.ChartAreas["ChartArea1"].AxisX.LabelStyle = labeStyleAxisX; - Dictionary dic1 = new Dictionary(); for (int j = 0; j < chart1.Series.Count; j++) { - dic1 = new Dictionary(); + Dictionary dic1 = new Dictionary(); foreach (string key in dic.Keys) { if (key.Contains(chart1.Series[j].Name)) @@ -304,7 +302,7 @@ MessageBox.Show("请选择材质类型！"); return; } - Utility.RemoveFeatureFromName(globeControl1, "trackPolygon"); + FeatureTools.RemoveFeatureFromName(globeControl1, "trackPolygon"); globeControl1.Globe.Action = EnumAction3D.TrackPolygon; globeControl1.Globe.TrackPolygonTool.TrackMode = EnumTrackMode.SpaceTrack; globeControl1.TrackPolygonEndEvent += globeControl1_TrackPolygonEndEvent; @@ -318,7 +316,7 @@ private void FrmpipeMaterialGather_FormClosing(object sender, FormClosingEventArgs e) { frm = null; - Utility.RemoveFeatureFromName(globeControl1, "trackPolygon"); + FeatureTools.RemoveFeatureFromName(globeControl1, "trackPolygon"); globeControl1.TrackPolygonEndEvent -= globeControl1_TrackPolygonEndEvent; globeControl1.Globe.Action = EnumAction3D.ActionNull; diff --git a/Frmpipediameterstatis.cs b/Frmpipediameterstatis.cs index 4fb25a8..631a996 100644 --- a/Frmpipediameterstatis.cs +++ b/Frmpipediameterstatis.cs @@ -202,8 +202,8 @@ } catch (Exception ex) { - LogHelper.WriteLog(typeof(Frmpipediameterstatis), ex.Message); //MessageBox.Show(ex.Message); + LogHelper.Error(ex.Message); LogError.PublishError(ex); } } @@ -372,7 +372,7 @@ MessageBox.Show("请添加分段！"); return; } - Utility.RemoveFeatureFromName(globeControl1, "trackPolygon"); + FeatureTools.RemoveFeatureFromName(globeControl1, "trackPolygon"); globeControl1.Globe.Action = EnumAction3D.TrackPolygon; globeControl1.Globe.TrackPolygonTool.TrackMode = EnumTrackMode.SpaceTrack; globeControl1.TrackPolygonEndEvent += globeControl1_TrackPolygonEndEvent; @@ -422,7 +422,7 @@ globeControl1.Globe.Action = EnumAction3D.ActionNull; globeControl1.TrackPolygonEndEvent -= globeControl1_TrackPolygonEndEvent; - Utility.RemoveFeatureFromName(globeControl1, "trackPolygon"); + FeatureTools.RemoveFeatureFromName(globeControl1, "trackPolygon"); globeControl1.Globe.MemoryLayer.RemoveAllFeature(); } diff --git a/FeatureStatisticsService.cs b/FeatureStatisticsService.cs index 331ee47..b127fe3 100644 --- a/FeatureStatisticsService.cs +++ b/FeatureStatisticsService.cs @@ -190,7 +190,7 @@ List result = new List(); //layer.Name是表名 - string[] accessStrs = Utility.getAccStrsByLayer(layer.Name); + string[] accessStrs = FeatureTools.GetAccStrsByLayer(layer.Name); foreach (string accssname in accessStrs) { diff --git a/FeatureTools.cs b/FeatureTools.cs index be4b469..3c08f34 100644 --- a/FeatureTools.cs +++ b/FeatureTools.cs @@ -1,5 +1,6 @@ using System; using System.Collections.Generic; +using System.Data; using System.Linq; using System.Text; using System.Windows.Forms; @@ -43,7 +44,7 @@ } feature.Delete();//地球上删除该feature string sql = "delete from " + layerName + " where LSSYS_ID =" + feature.ID + " and (编号 is null or substr(编号,length(编号)-2)='TMP')"; - OledbHelper.sqlExecuteNonQuery(sql);//目前无法取到LSSYS_ID，所以这个判断条件不太合适，会导致把该类所有新建的都删除了 + OledbHelper.sqlExecuteNonQuery(sql); } catch (Exception) { @@ -106,5 +107,46 @@ } return value; } + + /// + /// 根据附属物图层名字得到里面含有的附属物 + /// + /// + /// + public static string[] GetAccStrsByLayer(string layername) + { + string[] accStrs = null; + string sql = "select 附属物名称 from " + layername + " group by 附属物名称"; + DataSet dataset = OledbHelper.getDataSet(sql, layername); + if (dataset == null) return null; + accStrs = new string[dataset.Tables[0].Rows.Count]; + for (int i = 0; i < dataset.Tables[0].Rows.Count; i++) + { + accStrs[i] = dataset.Tables[0].Rows[i][0].ToString(); + } + return accStrs; + } + + /// + /// 删除内存图层中指定名称的feature + /// + /// + /// + public static void RemoveFeatureFromName(GSOGlobeControl globeControl1, string featureName) + { + GSOFeatures features = globeControl1.Globe.MemoryLayer.GetFeatureByName(featureName, true); + if (features != null) + { + for (int i = features.Length - 1; i >= 0; i--) + { + GSOFeature feature = features[i]; + if (feature != null) + { + globeControl1.Globe.MemoryLayer.RemoveFeatureByID(feature.ID); + } + } + } + globeControl1.Refresh(); + } } } diff --git a/Forms/FrmPipelineModelDataBase.cs b/Forms/FrmPipelineModelDataBase.cs index b577fd8..bc1e479 100644 --- a/Forms/FrmPipelineModelDataBase.cs +++ b/Forms/FrmPipelineModelDataBase.cs @@ -149,7 +149,7 @@ catch (Exception ex) { LogError.PublishError(ex); - LogHelper.WriteLog(typeof(FrmPipelineModelDB), ex.Message); + LogHelper.Error(ex.Message); } } diff --git a/FrmAccessoriesSensor.cs b/FrmAccessoriesSensor.cs index 98aa1cf..542f19a 100644 --- a/FrmAccessoriesSensor.cs +++ b/FrmAccessoriesSensor.cs @@ -240,7 +240,7 @@ { if (clbPipeLine.CheckedItems.Count > 0) { - Utility.RemoveFeatureFromName(globeControl1, "trackPolygon"); + FeatureTools.RemoveFeatureFromName(globeControl1, "trackPolygon"); globeControl1.Globe.Action = EnumAction3D.TrackPolygon; globeControl1.TrackPolygonEndEvent += globeControl1_TrackPolygonEndEvent; } @@ -259,7 +259,7 @@ private void FrmAccessoriesgather_FormClosing(object sender, FormClosingEventArgs e) { frm = null; - Utility.RemoveFeatureFromName(globeControl1, "trackPolygon"); + FeatureTools.RemoveFeatureFromName(globeControl1, "trackPolygon"); globeControl1.Globe.Action = EnumAction3D.ActionNull; globeControl1.TrackPolygonEndEvent -= globeControl1_TrackPolygonEndEvent; } diff --git a/FrmAccessoriesgather.cs b/FrmAccessoriesgather.cs index e1d176e..c36273b 100644 --- a/FrmAccessoriesgather.cs +++ b/FrmAccessoriesgather.cs @@ -118,7 +118,7 @@ { if (clbPipeLine2.Text!="") { - Utility.RemoveFeatureFromName(globeControl1, "trackPolygon"); + FeatureTools.RemoveFeatureFromName(globeControl1, "trackPolygon"); globeControl1.Globe.Action = EnumAction3D.TrackPolygon; globeControl1.Globe.TrackPolygonTool.TrackMode = EnumTrackMode.SpaceTrack; globeControl1.TrackPolygonEndEvent += globeControl1_TrackPolygonEndEvent; @@ -295,7 +295,7 @@ private void FrmAccessoriesgather_FormClosing(object sender, FormClosingEventArgs e) { frm = null; - Utility.RemoveFeatureFromName(globeControl1, "trackPolygon"); + FeatureTools.RemoveFeatureFromName(globeControl1, "trackPolygon"); globeControl1.TrackPolygonEndEvent -= globeControl1_TrackPolygonEndEvent; globeControl1.Globe.Action = EnumAction3D.ActionNull; diff --git a/FrmAddWellShp.cs b/FrmAddWellShp.cs index 7983349..78d8946 100644 --- a/FrmAddWellShp.cs +++ b/FrmAddWellShp.cs @@ -100,7 +100,7 @@ catch (Exception ex) { LogError.PublishError(ex); - LogHelper.WriteLog(typeof(FrmAddWellShp), ex.Message); + LogHelper.Error(ex.Message); } } diff --git a/FrmBSQStatis.cs b/FrmBSQStatis.cs index 5b05926..b5e581d 100644 --- a/FrmBSQStatis.cs +++ b/FrmBSQStatis.cs @@ -97,7 +97,7 @@ } catch (Exception ex) { - LogHelper.WriteLog(typeof(FrmBSQStatis),ex.Message); + LogHelper.Error(ex.Message); } return typeAndCount; } @@ -108,7 +108,7 @@ GSOLayer layer = globeControl1.Globe.Layers.GetLayerByCaption("标识器"); GSOFeatures bsqFs = FeatureStatisticsService.GetLayerFeatures(polygon, layer); if (bsqFs == null || bsqFs.Length <= 0) { - LogHelper.WriteLog(typeof(FrmBSQStatis),"标识器图层下的Feature为空"); + LogHelper.Error("标识器图层下的Feature为空!"); return null; } diff --git a/FrmBasicQuery.cs b/FrmBasicQuery.cs index baeeade..cc8d3ff 100644 --- a/FrmBasicQuery.cs +++ b/FrmBasicQuery.cs @@ -224,7 +224,7 @@ } catch(Exception ex) { - LogHelper.WriteLog(typeof(FrmBasicQuery), ex.Message); + LogHelper.Error(ex.Message); } } else diff --git a/FrmCodingQuery.cs b/FrmCodingQuery.cs index f1ac322..d4ec095 100644 --- a/FrmCodingQuery.cs +++ b/FrmCodingQuery.cs @@ -82,7 +82,7 @@ } catch (Exception ex) { - LogHelper.WriteLog(typeof(FrmCodingQuery), ex.Message); ; + LogHelper.Error(ex.Message); } } diff --git a/FrmDiameterQuery.cs b/FrmDiameterQuery.cs index e7b3657..75d7949 100644 --- a/FrmDiameterQuery.cs +++ b/FrmDiameterQuery.cs @@ -150,7 +150,7 @@ catch (Exception ex) { //LogError.PublishError(ex); - LogHelper.WriteLog(typeof(FrmDiameterQuery), ex.Message); + LogHelper.Error(ex.Message); MessageBox.Show("请输入正确的管径范围！"); return; } diff --git a/FrmFittingQuery.cs b/FrmFittingQuery.cs index 12f6007..8645011 100644 --- a/FrmFittingQuery.cs +++ b/FrmFittingQuery.cs @@ -69,7 +69,7 @@ } catch (Exception ex) { - LogHelper.WriteLog(typeof(FrmFittingQuery), ex.Message); + LogHelper.Error(ex.Message); } } /// diff --git a/FrmKeywordQuery.cs b/FrmKeywordQuery.cs index 405524f..ede0a93 100644 --- a/FrmKeywordQuery.cs +++ b/FrmKeywordQuery.cs @@ -87,7 +87,7 @@ } catch (Exception ex) { - LogHelper.WriteLog(typeof(FrmKeywordQuery), ex.Message); + LogHelper.Error(ex.Message); } } diff --git a/FrmLogin.cs b/FrmLogin.cs index 1172c23..6fbaed9 100644 --- a/FrmLogin.cs +++ b/FrmLogin.cs @@ -2,6 +2,8 @@ using System.Data; using System.Data.OracleClient; using System.IO; +using System.Net; +using System.Text; using System.Windows.Forms; using System.Xml; using DevComponents.DotNetBar; @@ -10,16 +12,15 @@ { public partial class FrmLogin : Office2007Form { + + //登录界面 -- 配置文件的路径 + public static string filename = Application.StartupPath + "\\login.xml"; + + public FrmLogin() { InitializeComponent(); } - public string rolename = "浏览"; - public string username = ""; - public string department = ""; - - //登录界面 -- 配置文件的路径 - public static string filename = Application.StartupPath + "\\login.xml"; /// /// 登录按钮事件处理 /// @@ -28,9 +29,10 @@ private void button1_Click(object sender, EventArgs e) { bool result = ValidateUser(); +// bool result =ValidateFromUrl();//从平台获取用户角色信息，判断是否能登陆成功 if (result) { - username = txtUser.Text.Trim(); + WriteXml(); Utility.userName = txtUser.Text.Trim(); DialogResult = DialogResult.OK; Close(); @@ -43,80 +45,6 @@ } } /// - /// 关闭按钮事件处理 - /// - /// - /// - private void button2_Click(object sender, EventArgs e) - { - Close(); - } - /// - /// 验证端口号 - /// - /// - //private bool ValiPort() - //{ - // Ping p = new Ping();//创建Ping对象p - // PingReply pr = p.Send(Utility.localicenseserverip);//向指定IP或者主机名的计算机发送ICMP协议的ping数据包 - // if (pr.Status == IPStatus.Success)//如果ping成功 - // { - // try - // { - // TcpClient tcpc = new TcpClient(Utility.localicenseserverip, Utility.localicenseserverport);//对IP地址为"192.168.0.105"的计算机的1500端口提出连接申请 - // tcpc.Close(); - // return true; - // } - // catch (Exception ex) - // { - // LogError.PublishError(ex); - // MessageBox.Show("端口连接错误！" + ex.Message); - // return false; - // } - // } - // else - // { - // int times = 0;//重新连接次数; - // int count = 2;//设置尝试次数 - // while (times < count) - // { - // //Thread.Sleep(1000);//等待时间(方便测试的话，你可以改为1000) - // pr = p.Send(Utility.localicenseserverip); - - // if (pr.Status == IPStatus.Success) - // { - // try - // { - // TcpClient tcpc = new TcpClient(Utility.localicenseserverip, Utility.localicenseserverport);//对IP地址为"192.168.0.105"的计算机的1500端口提出连接申请 - // tcpc.Close(); - // return true; - // } - // catch (Exception ex) - // { - // LogError.PublishError(ex); - // MessageBox.Show("端口连接错误！" + ex.Message); - // return false; - // } - // } - // else - // { - // times++; - // if (times < count) - // { - // continue; - // } - // else - // { - // MessageBox.Show("重新尝试连接失败"); - // return false; - // } - // } - - // } - // return false; - // } - //} - /// /// 验证用户名、密码 /// /// @@ -126,24 +54,64 @@ string sql = "select * from casic_userinfotest where USERNAME='" + txtUser.Text.Trim() + "' and PASSWORD='" + passWord + "' and sysname='GHFX' "; DataTable dt = OledbHelper.QueryTable(sql); - if (dt != null && dt.Rows.Count > 0) + if (dt == null || dt.Rows.Count <= 0) return false; + if (String.IsNullOrEmpty(dt.Rows[0]["rid"].ToString())) return true; + sql = "select gid from casic_userroletest where id=" + dt.Rows[0]["rid"] + " and sysname='GHFX' "; + using (OracleDataReader reader = OracleUtils.ExecuteReader(OracleUtils.ConnectionString, CommandType.Text, sql)) { - WriteXML(); - if (!String.IsNullOrEmpty(dt.Rows[0]["rid"].ToString())) + while (reader.Read()) { - sql = "select gid from casic_userroletest where id=" + dt.Rows[0]["rid"] + " and sysname='GHFX' "; - using (OracleDataReader reader = OracleUtils.ExecuteReader(OracleUtils.ConnectionString, CommandType.Text, sql)) - { - while (reader.Read()) - { - Utility.userRole = reader[0].ToString(); - break; - } - } + Utility.userRole = reader[0].ToString(); + LogHelper.Debug("测试一下"); + break; } - return true; } - return false; + return true; + } + + + + private bool ValidateFromUrl() + { + string user = txtUser.Text.Trim(); + string pwd = textBoxPassWord.Text.Trim(); + //做成配置的 + string roleserver = Utility.RoleServer; + if (roleserver == null || roleserver.Trim().Equals("")) + { + MessageBox.Show("请在Config.xml中配置roleurl！"); + return false; + } + HttpWebRequest request = + WebRequest.Create(roleserver+"/rs/authority/user?username=" + user + "&password=" + pwd + "&appId=21") as HttpWebRequest; + if (request == null) return false; + using (HttpWebResponse response = request.GetResponse() as HttpWebResponse) + { + try + { + if (response == null || response.GetResponseStream() == null) return false; + StreamReader reader = new StreamReader(response.GetResponseStream()); + string[] result = reader.ReadToEnd().Split(','); + //解析result + if (result.Length < 5) return false; + StringBuilder userRole = new StringBuilder(""); + for (int i = 4; i < result.Length; i++) + { + string[] tmpStrings = result[i].Split('_'); + if (tmpStrings.Length < 2) continue; + userRole.Append(tmpStrings[1].Trim() + ","); + } + if (userRole.Length < 3) return false; + userRole.Remove(userRole.Length - 3, 3); + // MessageBox.Show(userRole.ToString()); + Utility.userRole = userRole.ToString(); + return Utility.userRole != null && !Utility.userRole.Equals("null"); + } + catch (Exception e) + { + return false; + } + } } private void FrmLogin_Load(object sender, EventArgs e) @@ -153,74 +121,56 @@ StartPosition = FormStartPosition.CenterScreen; - ReadXML(); + ReadXml(); } /// /// 读取上一次登录的用户名和密码 /// - private void ReadXML() + private void ReadXml() { - if (File.Exists(filename)) + if (!File.Exists(filename)) return; + //初始化XML文档操作类 + XmlDocument myDoc = new XmlDocument(); { - if (!File.Exists(filename)) + //加载XML文件 + try { + myDoc.Load(filename); + } + catch (Exception e) + { + LogError.PublishError(e); return; } - - //初始化XML文档操作类 - XmlDocument myDoc = new XmlDocument(); + //搜索指定的节点 + XmlNode serverRootNode = myDoc.SelectSingleNode("Params"); + XmlNodeList nodes = null; + if (serverRootNode != null) { - //加载XML文件 - try + nodes = serverRootNode.ChildNodes; + } + if (nodes == null) return; + foreach (XmlNode xn in nodes) + { + if (xn.Name.Equals("username")) { - myDoc.Load(filename); + txtUser.Text = xn.InnerText.Trim(); } - catch (Exception e) + else if (xn.Name.Equals("password")) { - LogError.PublishError(e); - return; + textBoxPassWord.Text = xn.InnerText.Trim(); } - //搜索指定的节点 - XmlNode serverRootNode = myDoc.SelectSingleNode("Params"); - XmlNodeList nodes = null; - if (serverRootNode != null) + else if (xn.Name.Equals("isremember")) { - nodes = serverRootNode.ChildNodes; - } - if (nodes != null) - { - foreach (XmlNode xn in nodes) - { - if (xn.Name == "username") - { - txtUser.Text = xn.InnerText.Trim(); - } - else if (xn.Name == "password") - { - textBoxPassWord.Text = xn.InnerText.Trim(); - } - else if (xn.Name == "isremember") - { - if (xn.InnerText.Trim() == "true") - { - checkBoxXRememberPassword.Checked = true; - } - else if (xn.InnerText.Trim() == "false") - { - checkBoxXRememberPassword.Checked = false; - } - } - } - + checkBoxXRememberPassword.Checked = xn.InnerText.Trim().Equals("true"); } } } - } /// /// 记录登录的用户名和密码 /// - private void WriteXML() + private void WriteXml() { if (!File.Exists(filename)) { @@ -252,31 +202,17 @@ foreach (XmlNode xn in nodes) { XmlElement xe = (XmlElement)xn; - if (xe.Name == "username") + if (xe.Name.Equals("username")) { xe.InnerText = txtUser.Text.Trim(); } - else if (xe.Name == "password") + else if (xe.Name.Equals("password")) { - if (checkBoxXRememberPassword.Checked) - { - xe.InnerText = textBoxPassWord.Text.Trim(); - } - else - { - xe.InnerText = ""; - } + xe.InnerText = checkBoxXRememberPassword.Checked ? textBoxPassWord.Text.Trim() : ""; } - else if (xe.Name == "isremember") + else if (xe.Name.Equals("isremember")) { - if (checkBoxXRememberPassword.Checked) - { - xe.InnerText = "true"; - } - else - { - xe.InnerText = "false"; - } + xe.InnerText = checkBoxXRememberPassword.Checked ? "true" : "false"; } } } diff --git a/FrmMaterialSel.cs b/FrmMaterialSel.cs index 8645ab3..d23f385 100644 --- a/FrmMaterialSel.cs +++ b/FrmMaterialSel.cs @@ -157,7 +157,7 @@ } catch (Exception ex) { - LogHelper.WriteLog(typeof(FrmMaterialSel), ex.Message); + LogHelper.Error(ex.Message); } } diff --git a/FrmMetadataStat.cs b/FrmMetadataStat.cs index c3c1359..96029a6 100644 --- a/FrmMetadataStat.cs +++ b/FrmMetadataStat.cs @@ -96,7 +96,7 @@ //统计有多少个图层 private int statistLayer() { - List datasrcs = Utility.layerConfig.datasrcs; + List datasrcs = Utility.LayerConfig.datasrcs; return datasrcs.SelectMany(datasrc => datasrc.layertypes).Sum(layerType => layerType.layers.Count); } diff --git a/FrmpipeDeepstatis.cs b/FrmpipeDeepstatis.cs index 6a5c895..8d915a9 100644 --- a/FrmpipeDeepstatis.cs +++ b/FrmpipeDeepstatis.cs @@ -2,6 +2,7 @@ using System.Collections.Generic; using System.Diagnostics; using System.IO; +using System.Reflection; using System.Text; using System.Windows.Forms; using System.Windows.Forms.DataVisualization.Charting; @@ -320,7 +321,7 @@ MessageBox.Show("请添加分段"); return; } - Utility.RemoveFeatureFromName(globeControl1, "trackPolygon"); + FeatureTools.RemoveFeatureFromName(globeControl1, "trackPolygon"); globeControl1.Globe.Action = EnumAction3D.TrackPolygon; globeControl1.Globe.TrackPolygonTool.TrackMode = EnumTrackMode.SpaceTrack; globeControl1.TrackPolygonEndEvent += globeControl1_TrackPolygonEndEvent; @@ -408,12 +409,11 @@ TextBox control; private void dataGridViewX2_EditingControlShowing(object sender, DataGridViewEditingControlShowingEventArgs e) { - if (e.Control.GetType().BaseType.Name == "TextBox") - { - control = new TextBox(); - control = (TextBox)e.Control; - control.KeyPress += control_KeyPress; - } + MemberInfo memberInfo = e.Control.GetType().BaseType; + if (memberInfo != null && !memberInfo.Name.Equals("TextBox")) return; + control = new TextBox(); + control = (TextBox)e.Control; + control.KeyPress += control_KeyPress; } /// /// 键盘按键按下事件处理 @@ -423,28 +423,24 @@ void control_KeyPress(object sender, KeyPressEventArgs e) { TextBox text = sender as TextBox; + if (text == null) return; if ((e.KeyChar < 48 || e.KeyChar > 57) && (e.KeyChar != 8) && e.KeyChar != 46) { e.Handled = true; } - if (e.KeyChar == 46) //小数点 + if (e.KeyChar != 46) return; + if (text.Text.Length <= 0) + e.Handled = true; //小数点不能在第一位 + else //处理不规则的小数点 { - if (text.Text.Length <= 0) - e.Handled = true; //小数点不能在第一位 - else //处理不规则的小数点 + float f; + float oldf; + bool b1 = false, b2 = false; + b1 = float.TryParse(text.Text, out oldf); + b2 = float.TryParse(text.Text + e.KeyChar, out f); + if (!b2) { - float f; - float oldf; - bool b1 = false, b2 = false; - b1 = float.TryParse(text.Text, out oldf); - b2 = float.TryParse(text.Text + e.KeyChar, out f); - if (b2 == false) - { - if (b1) - e.Handled = true; - else - e.Handled = false; - } + e.Handled = b1; } } } @@ -457,7 +453,7 @@ { frm = null; - Utility.RemoveFeatureFromName(globeControl1, "trackPolygon"); + FeatureTools.RemoveFeatureFromName(globeControl1, "trackPolygon"); globeControl1.TrackPolygonEndEvent -= globeControl1_TrackPolygonEndEvent; globeControl1.Globe.Action = EnumAction3D.ActionNull; diff --git a/FrmpipeDiametergather.cs b/FrmpipeDiametergather.cs index a9d96fa..c09aaf1 100644 --- a/FrmpipeDiametergather.cs +++ b/FrmpipeDiametergather.cs @@ -154,7 +154,7 @@ MessageBox.Show("请选择图层！"); return; } - Utility.RemoveFeatureFromName(globeControl1, "trackPolygon"); + FeatureTools.RemoveFeatureFromName(globeControl1, "trackPolygon"); globeControl1.Globe.Action = EnumAction3D.TrackPolygon; globeControl1.Globe.TrackPolygonTool.TrackMode = EnumTrackMode.SpaceTrack; globeControl1.TrackPolygonEndEvent += globeControl1_TrackPolygonEndEvent; @@ -392,7 +392,7 @@ private void FrmpipeDiametergather_FormClosing(object sender, FormClosingEventArgs e) { frm = null; - Utility.RemoveFeatureFromName(globeControl1, "trackPolygon"); + FeatureTools.RemoveFeatureFromName(globeControl1, "trackPolygon"); globeControl1.TrackPolygonEndEvent -= globeControl1_TrackPolygonEndEvent; globeControl1.Globe.Action = EnumAction3D.ActionNull; diff --git a/FrmpipeMaterialGather.cs b/FrmpipeMaterialGather.cs index 44e7f24..5ca8144 100644 --- a/FrmpipeMaterialGather.cs +++ b/FrmpipeMaterialGather.cs @@ -58,10 +58,9 @@ for (int i = 0; i < pipeLayerNames.Count; i++) { clbPipeLine.Items.Add(pipeLayerNames[i]); - GSOLayer layer = globeControl1.Globe.Layers.GetLayerByCaption(pipeLayerNames[i]); - if (layer.Dataset == null || !layer.Dataset.IsFeatureDataset || layer.Type != EnumLayerType.FeatureLayer) continue; + GSOLayer layer = globeControl1.Globe.Layers.GetLayerByCaption(pipeLayerNames[i]); + if (layer == null || layer.Dataset == null || !layer.Dataset.IsFeatureDataset || layer.Type != EnumLayerType.FeatureLayer) continue; - string name = layer.Name; GSOFeatureLayer flayer = layer as GSOFeatureLayer; GSOFeatures feats = flayer.GetAllFeatures(); @@ -205,7 +204,7 @@ { chart1.Series.Add(clbPipeLine.CheckedItems[i].ToString()); GSOLayer layer = globeControl1.Globe.Layers.GetLayerByCaption(clbPipeLine.CheckedItems[i].ToString()); - if (layer != null && layer is GSOFeatureLayer) + if (layer is GSOFeatureLayer) { GSOFeatureLayer flayer = layer as GSOFeatureLayer; GSOFeatures features = flayer.GetAllFeatures(); @@ -240,10 +239,9 @@ labeStyleAxisX.Enabled = true; chart1.ChartAreas["ChartArea1"].AxisX.LabelStyle = labeStyleAxisX; - Dictionary dic1 = new Dictionary(); for (int j = 0; j < chart1.Series.Count; j++) { - dic1 = new Dictionary(); + Dictionary dic1 = new Dictionary(); foreach (string key in dic.Keys) { if (key.Contains(chart1.Series[j].Name)) @@ -304,7 +302,7 @@ MessageBox.Show("请选择材质类型！"); return; } - Utility.RemoveFeatureFromName(globeControl1, "trackPolygon"); + FeatureTools.RemoveFeatureFromName(globeControl1, "trackPolygon"); globeControl1.Globe.Action = EnumAction3D.TrackPolygon; globeControl1.Globe.TrackPolygonTool.TrackMode = EnumTrackMode.SpaceTrack; globeControl1.TrackPolygonEndEvent += globeControl1_TrackPolygonEndEvent; @@ -318,7 +316,7 @@ private void FrmpipeMaterialGather_FormClosing(object sender, FormClosingEventArgs e) { frm = null; - Utility.RemoveFeatureFromName(globeControl1, "trackPolygon"); + FeatureTools.RemoveFeatureFromName(globeControl1, "trackPolygon"); globeControl1.TrackPolygonEndEvent -= globeControl1_TrackPolygonEndEvent; globeControl1.Globe.Action = EnumAction3D.ActionNull; diff --git a/Frmpipediameterstatis.cs b/Frmpipediameterstatis.cs index 4fb25a8..631a996 100644 --- a/Frmpipediameterstatis.cs +++ b/Frmpipediameterstatis.cs @@ -202,8 +202,8 @@ } catch (Exception ex) { - LogHelper.WriteLog(typeof(Frmpipediameterstatis), ex.Message); //MessageBox.Show(ex.Message); + LogHelper.Error(ex.Message); LogError.PublishError(ex); } } @@ -372,7 +372,7 @@ MessageBox.Show("请添加分段！"); return; } - Utility.RemoveFeatureFromName(globeControl1, "trackPolygon"); + FeatureTools.RemoveFeatureFromName(globeControl1, "trackPolygon"); globeControl1.Globe.Action = EnumAction3D.TrackPolygon; globeControl1.Globe.TrackPolygonTool.TrackMode = EnumTrackMode.SpaceTrack; globeControl1.TrackPolygonEndEvent += globeControl1_TrackPolygonEndEvent; @@ -422,7 +422,7 @@ globeControl1.Globe.Action = EnumAction3D.ActionNull; globeControl1.TrackPolygonEndEvent -= globeControl1_TrackPolygonEndEvent; - Utility.RemoveFeatureFromName(globeControl1, "trackPolygon"); + FeatureTools.RemoveFeatureFromName(globeControl1, "trackPolygon"); globeControl1.Globe.MemoryLayer.RemoveAllFeature(); } diff --git a/LineBuilder.cs b/LineBuilder.cs index 33a216c..b6a8516 100644 --- a/LineBuilder.cs +++ b/LineBuilder.cs @@ -43,8 +43,8 @@ GSOGeoPolyline3D lineeee = f.Geometry as GSOGeoPolyline3D; if (lineeee == null || lineeee.GetSpaceLength(true, 6378137) == 0) { - LogHelper.WriteLog(typeof(LineBuilder), "出现数据无法入库:"+f.ID); - continue; //TODO LIST:判断是否会出现部署数据无法入库情况,Log2Net + LogHelper.Error("出现数据无法入库:" + f.ID); + continue; } GSOFeature newFeature = newFeatureSet.CreateFeature(); diff --git a/FeatureStatisticsService.cs b/FeatureStatisticsService.cs index 331ee47..b127fe3 100644 --- a/FeatureStatisticsService.cs +++ b/FeatureStatisticsService.cs @@ -190,7 +190,7 @@ List result = new List(); //layer.Name是表名 - string[] accessStrs = Utility.getAccStrsByLayer(layer.Name); + string[] accessStrs = FeatureTools.GetAccStrsByLayer(layer.Name); foreach (string accssname in accessStrs) { diff --git a/FeatureTools.cs b/FeatureTools.cs index be4b469..3c08f34 100644 --- a/FeatureTools.cs +++ b/FeatureTools.cs @@ -1,5 +1,6 @@ using System; using System.Collections.Generic; +using System.Data; using System.Linq; using System.Text; using System.Windows.Forms; @@ -43,7 +44,7 @@ } feature.Delete();//地球上删除该feature string sql = "delete from " + layerName + " where LSSYS_ID =" + feature.ID + " and (编号 is null or substr(编号,length(编号)-2)='TMP')"; - OledbHelper.sqlExecuteNonQuery(sql);//目前无法取到LSSYS_ID，所以这个判断条件不太合适，会导致把该类所有新建的都删除了 + OledbHelper.sqlExecuteNonQuery(sql); } catch (Exception) { @@ -106,5 +107,46 @@ } return value; } + + /// + /// 根据附属物图层名字得到里面含有的附属物 + /// + /// + /// + public static string[] GetAccStrsByLayer(string layername) + { + string[] accStrs = null; + string sql = "select 附属物名称 from " + layername + " group by 附属物名称"; + DataSet dataset = OledbHelper.getDataSet(sql, layername); + if (dataset == null) return null; + accStrs = new string[dataset.Tables[0].Rows.Count]; + for (int i = 0; i < dataset.Tables[0].Rows.Count; i++) + { + accStrs[i] = dataset.Tables[0].Rows[i][0].ToString(); + } + return accStrs; + } + + /// + /// 删除内存图层中指定名称的feature + /// + /// + /// + public static void RemoveFeatureFromName(GSOGlobeControl globeControl1, string featureName) + { + GSOFeatures features = globeControl1.Globe.MemoryLayer.GetFeatureByName(featureName, true); + if (features != null) + { + for (int i = features.Length - 1; i >= 0; i--) + { + GSOFeature feature = features[i]; + if (feature != null) + { + globeControl1.Globe.MemoryLayer.RemoveFeatureByID(feature.ID); + } + } + } + globeControl1.Refresh(); + } } } diff --git a/Forms/FrmPipelineModelDataBase.cs b/Forms/FrmPipelineModelDataBase.cs index b577fd8..bc1e479 100644 --- a/Forms/FrmPipelineModelDataBase.cs +++ b/Forms/FrmPipelineModelDataBase.cs @@ -149,7 +149,7 @@ catch (Exception ex) { LogError.PublishError(ex); - LogHelper.WriteLog(typeof(FrmPipelineModelDB), ex.Message); + LogHelper.Error(ex.Message); } } diff --git a/FrmAccessoriesSensor.cs b/FrmAccessoriesSensor.cs index 98aa1cf..542f19a 100644 --- a/FrmAccessoriesSensor.cs +++ b/FrmAccessoriesSensor.cs @@ -240,7 +240,7 @@ { if (clbPipeLine.CheckedItems.Count > 0) { - Utility.RemoveFeatureFromName(globeControl1, "trackPolygon"); + FeatureTools.RemoveFeatureFromName(globeControl1, "trackPolygon"); globeControl1.Globe.Action = EnumAction3D.TrackPolygon; globeControl1.TrackPolygonEndEvent += globeControl1_TrackPolygonEndEvent; } @@ -259,7 +259,7 @@ private void FrmAccessoriesgather_FormClosing(object sender, FormClosingEventArgs e) { frm = null; - Utility.RemoveFeatureFromName(globeControl1, "trackPolygon"); + FeatureTools.RemoveFeatureFromName(globeControl1, "trackPolygon"); globeControl1.Globe.Action = EnumAction3D.ActionNull; globeControl1.TrackPolygonEndEvent -= globeControl1_TrackPolygonEndEvent; } diff --git a/FrmAccessoriesgather.cs b/FrmAccessoriesgather.cs index e1d176e..c36273b 100644 --- a/FrmAccessoriesgather.cs +++ b/FrmAccessoriesgather.cs @@ -118,7 +118,7 @@ { if (clbPipeLine2.Text!="") { - Utility.RemoveFeatureFromName(globeControl1, "trackPolygon"); + FeatureTools.RemoveFeatureFromName(globeControl1, "trackPolygon"); globeControl1.Globe.Action = EnumAction3D.TrackPolygon; globeControl1.Globe.TrackPolygonTool.TrackMode = EnumTrackMode.SpaceTrack; globeControl1.TrackPolygonEndEvent += globeControl1_TrackPolygonEndEvent; @@ -295,7 +295,7 @@ private void FrmAccessoriesgather_FormClosing(object sender, FormClosingEventArgs e) { frm = null; - Utility.RemoveFeatureFromName(globeControl1, "trackPolygon"); + FeatureTools.RemoveFeatureFromName(globeControl1, "trackPolygon"); globeControl1.TrackPolygonEndEvent -= globeControl1_TrackPolygonEndEvent; globeControl1.Globe.Action = EnumAction3D.ActionNull; diff --git a/FrmAddWellShp.cs b/FrmAddWellShp.cs index 7983349..78d8946 100644 --- a/FrmAddWellShp.cs +++ b/FrmAddWellShp.cs @@ -100,7 +100,7 @@ catch (Exception ex) { LogError.PublishError(ex); - LogHelper.WriteLog(typeof(FrmAddWellShp), ex.Message); + LogHelper.Error(ex.Message); } } diff --git a/FrmBSQStatis.cs b/FrmBSQStatis.cs index 5b05926..b5e581d 100644 --- a/FrmBSQStatis.cs +++ b/FrmBSQStatis.cs @@ -97,7 +97,7 @@ } catch (Exception ex) { - LogHelper.WriteLog(typeof(FrmBSQStatis),ex.Message); + LogHelper.Error(ex.Message); } return typeAndCount; } @@ -108,7 +108,7 @@ GSOLayer layer = globeControl1.Globe.Layers.GetLayerByCaption("标识器"); GSOFeatures bsqFs = FeatureStatisticsService.GetLayerFeatures(polygon, layer); if (bsqFs == null || bsqFs.Length <= 0) { - LogHelper.WriteLog(typeof(FrmBSQStatis),"标识器图层下的Feature为空"); + LogHelper.Error("标识器图层下的Feature为空!"); return null; } diff --git a/FrmBasicQuery.cs b/FrmBasicQuery.cs index baeeade..cc8d3ff 100644 --- a/FrmBasicQuery.cs +++ b/FrmBasicQuery.cs @@ -224,7 +224,7 @@ } catch(Exception ex) { - LogHelper.WriteLog(typeof(FrmBasicQuery), ex.Message); + LogHelper.Error(ex.Message); } } else diff --git a/FrmCodingQuery.cs b/FrmCodingQuery.cs index f1ac322..d4ec095 100644 --- a/FrmCodingQuery.cs +++ b/FrmCodingQuery.cs @@ -82,7 +82,7 @@ } catch (Exception ex) { - LogHelper.WriteLog(typeof(FrmCodingQuery), ex.Message); ; + LogHelper.Error(ex.Message); } } diff --git a/FrmDiameterQuery.cs b/FrmDiameterQuery.cs index e7b3657..75d7949 100644 --- a/FrmDiameterQuery.cs +++ b/FrmDiameterQuery.cs @@ -150,7 +150,7 @@ catch (Exception ex) { //LogError.PublishError(ex); - LogHelper.WriteLog(typeof(FrmDiameterQuery), ex.Message); + LogHelper.Error(ex.Message); MessageBox.Show("请输入正确的管径范围！"); return; } diff --git a/FrmFittingQuery.cs b/FrmFittingQuery.cs index 12f6007..8645011 100644 --- a/FrmFittingQuery.cs +++ b/FrmFittingQuery.cs @@ -69,7 +69,7 @@ } catch (Exception ex) { - LogHelper.WriteLog(typeof(FrmFittingQuery), ex.Message); + LogHelper.Error(ex.Message); } } /// diff --git a/FrmKeywordQuery.cs b/FrmKeywordQuery.cs index 405524f..ede0a93 100644 --- a/FrmKeywordQuery.cs +++ b/FrmKeywordQuery.cs @@ -87,7 +87,7 @@ } catch (Exception ex) { - LogHelper.WriteLog(typeof(FrmKeywordQuery), ex.Message); + LogHelper.Error(ex.Message); } } diff --git a/FrmLogin.cs b/FrmLogin.cs index 1172c23..6fbaed9 100644 --- a/FrmLogin.cs +++ b/FrmLogin.cs @@ -2,6 +2,8 @@ using System.Data; using System.Data.OracleClient; using System.IO; +using System.Net; +using System.Text; using System.Windows.Forms; using System.Xml; using DevComponents.DotNetBar; @@ -10,16 +12,15 @@ { public partial class FrmLogin : Office2007Form { + + //登录界面 -- 配置文件的路径 + public static string filename = Application.StartupPath + "\\login.xml"; + + public FrmLogin() { InitializeComponent(); } - public string rolename = "浏览"; - public string username = ""; - public string department = ""; - - //登录界面 -- 配置文件的路径 - public static string filename = Application.StartupPath + "\\login.xml"; /// /// 登录按钮事件处理 /// @@ -28,9 +29,10 @@ private void button1_Click(object sender, EventArgs e) { bool result = ValidateUser(); +// bool result =ValidateFromUrl();//从平台获取用户角色信息，判断是否能登陆成功 if (result) { - username = txtUser.Text.Trim(); + WriteXml(); Utility.userName = txtUser.Text.Trim(); DialogResult = DialogResult.OK; Close(); @@ -43,80 +45,6 @@ } } /// - /// 关闭按钮事件处理 - /// - /// - /// - private void button2_Click(object sender, EventArgs e) - { - Close(); - } - /// - /// 验证端口号 - /// - /// - //private bool ValiPort() - //{ - // Ping p = new Ping();//创建Ping对象p - // PingReply pr = p.Send(Utility.localicenseserverip);//向指定IP或者主机名的计算机发送ICMP协议的ping数据包 - // if (pr.Status == IPStatus.Success)//如果ping成功 - // { - // try - // { - // TcpClient tcpc = new TcpClient(Utility.localicenseserverip, Utility.localicenseserverport);//对IP地址为"192.168.0.105"的计算机的1500端口提出连接申请 - // tcpc.Close(); - // return true; - // } - // catch (Exception ex) - // { - // LogError.PublishError(ex); - // MessageBox.Show("端口连接错误！" + ex.Message); - // return false; - // } - // } - // else - // { - // int times = 0;//重新连接次数; - // int count = 2;//设置尝试次数 - // while (times < count) - // { - // //Thread.Sleep(1000);//等待时间(方便测试的话，你可以改为1000) - // pr = p.Send(Utility.localicenseserverip); - - // if (pr.Status == IPStatus.Success) - // { - // try - // { - // TcpClient tcpc = new TcpClient(Utility.localicenseserverip, Utility.localicenseserverport);//对IP地址为"192.168.0.105"的计算机的1500端口提出连接申请 - // tcpc.Close(); - // return true; - // } - // catch (Exception ex) - // { - // LogError.PublishError(ex); - // MessageBox.Show("端口连接错误！" + ex.Message); - // return false; - // } - // } - // else - // { - // times++; - // if (times < count) - // { - // continue; - // } - // else - // { - // MessageBox.Show("重新尝试连接失败"); - // return false; - // } - // } - - // } - // return false; - // } - //} - /// /// 验证用户名、密码 /// /// @@ -126,24 +54,64 @@ string sql = "select * from casic_userinfotest where USERNAME='" + txtUser.Text.Trim() + "' and PASSWORD='" + passWord + "' and sysname='GHFX' "; DataTable dt = OledbHelper.QueryTable(sql); - if (dt != null && dt.Rows.Count > 0) + if (dt == null || dt.Rows.Count <= 0) return false; + if (String.IsNullOrEmpty(dt.Rows[0]["rid"].ToString())) return true; + sql = "select gid from casic_userroletest where id=" + dt.Rows[0]["rid"] + " and sysname='GHFX' "; + using (OracleDataReader reader = OracleUtils.ExecuteReader(OracleUtils.ConnectionString, CommandType.Text, sql)) { - WriteXML(); - if (!String.IsNullOrEmpty(dt.Rows[0]["rid"].ToString())) + while (reader.Read()) { - sql = "select gid from casic_userroletest where id=" + dt.Rows[0]["rid"] + " and sysname='GHFX' "; - using (OracleDataReader reader = OracleUtils.ExecuteReader(OracleUtils.ConnectionString, CommandType.Text, sql)) - { - while (reader.Read()) - { - Utility.userRole = reader[0].ToString(); - break; - } - } + Utility.userRole = reader[0].ToString(); + LogHelper.Debug("测试一下"); + break; } - return true; } - return false; + return true; + } + + + + private bool ValidateFromUrl() + { + string user = txtUser.Text.Trim(); + string pwd = textBoxPassWord.Text.Trim(); + //做成配置的 + string roleserver = Utility.RoleServer; + if (roleserver == null || roleserver.Trim().Equals("")) + { + MessageBox.Show("请在Config.xml中配置roleurl！"); + return false; + } + HttpWebRequest request = + WebRequest.Create(roleserver+"/rs/authority/user?username=" + user + "&password=" + pwd + "&appId=21") as HttpWebRequest; + if (request == null) return false; + using (HttpWebResponse response = request.GetResponse() as HttpWebResponse) + { + try + { + if (response == null || response.GetResponseStream() == null) return false; + StreamReader reader = new StreamReader(response.GetResponseStream()); + string[] result = reader.ReadToEnd().Split(','); + //解析result + if (result.Length < 5) return false; + StringBuilder userRole = new StringBuilder(""); + for (int i = 4; i < result.Length; i++) + { + string[] tmpStrings = result[i].Split('_'); + if (tmpStrings.Length < 2) continue; + userRole.Append(tmpStrings[1].Trim() + ","); + } + if (userRole.Length < 3) return false; + userRole.Remove(userRole.Length - 3, 3); + // MessageBox.Show(userRole.ToString()); + Utility.userRole = userRole.ToString(); + return Utility.userRole != null && !Utility.userRole.Equals("null"); + } + catch (Exception e) + { + return false; + } + } } private void FrmLogin_Load(object sender, EventArgs e) @@ -153,74 +121,56 @@ StartPosition = FormStartPosition.CenterScreen; - ReadXML(); + ReadXml(); } /// /// 读取上一次登录的用户名和密码 /// - private void ReadXML() + private void ReadXml() { - if (File.Exists(filename)) + if (!File.Exists(filename)) return; + //初始化XML文档操作类 + XmlDocument myDoc = new XmlDocument(); { - if (!File.Exists(filename)) + //加载XML文件 + try { + myDoc.Load(filename); + } + catch (Exception e) + { + LogError.PublishError(e); return; } - - //初始化XML文档操作类 - XmlDocument myDoc = new XmlDocument(); + //搜索指定的节点 + XmlNode serverRootNode = myDoc.SelectSingleNode("Params"); + XmlNodeList nodes = null; + if (serverRootNode != null) { - //加载XML文件 - try + nodes = serverRootNode.ChildNodes; + } + if (nodes == null) return; + foreach (XmlNode xn in nodes) + { + if (xn.Name.Equals("username")) { - myDoc.Load(filename); + txtUser.Text = xn.InnerText.Trim(); } - catch (Exception e) + else if (xn.Name.Equals("password")) { - LogError.PublishError(e); - return; + textBoxPassWord.Text = xn.InnerText.Trim(); } - //搜索指定的节点 - XmlNode serverRootNode = myDoc.SelectSingleNode("Params"); - XmlNodeList nodes = null; - if (serverRootNode != null) + else if (xn.Name.Equals("isremember")) { - nodes = serverRootNode.ChildNodes; - } - if (nodes != null) - { - foreach (XmlNode xn in nodes) - { - if (xn.Name == "username") - { - txtUser.Text = xn.InnerText.Trim(); - } - else if (xn.Name == "password") - { - textBoxPassWord.Text = xn.InnerText.Trim(); - } - else if (xn.Name == "isremember") - { - if (xn.InnerText.Trim() == "true") - { - checkBoxXRememberPassword.Checked = true; - } - else if (xn.InnerText.Trim() == "false") - { - checkBoxXRememberPassword.Checked = false; - } - } - } - + checkBoxXRememberPassword.Checked = xn.InnerText.Trim().Equals("true"); } } } - } /// /// 记录登录的用户名和密码 /// - private void WriteXML() + private void WriteXml() { if (!File.Exists(filename)) { @@ -252,31 +202,17 @@ foreach (XmlNode xn in nodes) { XmlElement xe = (XmlElement)xn; - if (xe.Name == "username") + if (xe.Name.Equals("username")) { xe.InnerText = txtUser.Text.Trim(); } - else if (xe.Name == "password") + else if (xe.Name.Equals("password")) { - if (checkBoxXRememberPassword.Checked) - { - xe.InnerText = textBoxPassWord.Text.Trim(); - } - else - { - xe.InnerText = ""; - } + xe.InnerText = checkBoxXRememberPassword.Checked ? textBoxPassWord.Text.Trim() : ""; } - else if (xe.Name == "isremember") + else if (xe.Name.Equals("isremember")) { - if (checkBoxXRememberPassword.Checked) - { - xe.InnerText = "true"; - } - else - { - xe.InnerText = "false"; - } + xe.InnerText = checkBoxXRememberPassword.Checked ? "true" : "false"; } } } diff --git a/FrmMaterialSel.cs b/FrmMaterialSel.cs index 8645ab3..d23f385 100644 --- a/FrmMaterialSel.cs +++ b/FrmMaterialSel.cs @@ -157,7 +157,7 @@ } catch (Exception ex) { - LogHelper.WriteLog(typeof(FrmMaterialSel), ex.Message); + LogHelper.Error(ex.Message); } } diff --git a/FrmMetadataStat.cs b/FrmMetadataStat.cs index c3c1359..96029a6 100644 --- a/FrmMetadataStat.cs +++ b/FrmMetadataStat.cs @@ -96,7 +96,7 @@ //统计有多少个图层 private int statistLayer() { - List datasrcs = Utility.layerConfig.datasrcs; + List datasrcs = Utility.LayerConfig.datasrcs; return datasrcs.SelectMany(datasrc => datasrc.layertypes).Sum(layerType => layerType.layers.Count); } diff --git a/FrmpipeDeepstatis.cs b/FrmpipeDeepstatis.cs index 6a5c895..8d915a9 100644 --- a/FrmpipeDeepstatis.cs +++ b/FrmpipeDeepstatis.cs @@ -2,6 +2,7 @@ using System.Collections.Generic; using System.Diagnostics; using System.IO; +using System.Reflection; using System.Text; using System.Windows.Forms; using System.Windows.Forms.DataVisualization.Charting; @@ -320,7 +321,7 @@ MessageBox.Show("请添加分段"); return; } - Utility.RemoveFeatureFromName(globeControl1, "trackPolygon"); + FeatureTools.RemoveFeatureFromName(globeControl1, "trackPolygon"); globeControl1.Globe.Action = EnumAction3D.TrackPolygon; globeControl1.Globe.TrackPolygonTool.TrackMode = EnumTrackMode.SpaceTrack; globeControl1.TrackPolygonEndEvent += globeControl1_TrackPolygonEndEvent; @@ -408,12 +409,11 @@ TextBox control; private void dataGridViewX2_EditingControlShowing(object sender, DataGridViewEditingControlShowingEventArgs e) { - if (e.Control.GetType().BaseType.Name == "TextBox") - { - control = new TextBox(); - control = (TextBox)e.Control; - control.KeyPress += control_KeyPress; - } + MemberInfo memberInfo = e.Control.GetType().BaseType; + if (memberInfo != null && !memberInfo.Name.Equals("TextBox")) return; + control = new TextBox(); + control = (TextBox)e.Control; + control.KeyPress += control_KeyPress; } /// /// 键盘按键按下事件处理 @@ -423,28 +423,24 @@ void control_KeyPress(object sender, KeyPressEventArgs e) { TextBox text = sender as TextBox; + if (text == null) return; if ((e.KeyChar < 48 || e.KeyChar > 57) && (e.KeyChar != 8) && e.KeyChar != 46) { e.Handled = true; } - if (e.KeyChar == 46) //小数点 + if (e.KeyChar != 46) return; + if (text.Text.Length <= 0) + e.Handled = true; //小数点不能在第一位 + else //处理不规则的小数点 { - if (text.Text.Length <= 0) - e.Handled = true; //小数点不能在第一位 - else //处理不规则的小数点 + float f; + float oldf; + bool b1 = false, b2 = false; + b1 = float.TryParse(text.Text, out oldf); + b2 = float.TryParse(text.Text + e.KeyChar, out f); + if (!b2) { - float f; - float oldf; - bool b1 = false, b2 = false; - b1 = float.TryParse(text.Text, out oldf); - b2 = float.TryParse(text.Text + e.KeyChar, out f); - if (b2 == false) - { - if (b1) - e.Handled = true; - else - e.Handled = false; - } + e.Handled = b1; } } } @@ -457,7 +453,7 @@ { frm = null; - Utility.RemoveFeatureFromName(globeControl1, "trackPolygon"); + FeatureTools.RemoveFeatureFromName(globeControl1, "trackPolygon"); globeControl1.TrackPolygonEndEvent -= globeControl1_TrackPolygonEndEvent; globeControl1.Globe.Action = EnumAction3D.ActionNull; diff --git a/FrmpipeDiametergather.cs b/FrmpipeDiametergather.cs index a9d96fa..c09aaf1 100644 --- a/FrmpipeDiametergather.cs +++ b/FrmpipeDiametergather.cs @@ -154,7 +154,7 @@ MessageBox.Show("请选择图层！"); return; } - Utility.RemoveFeatureFromName(globeControl1, "trackPolygon"); + FeatureTools.RemoveFeatureFromName(globeControl1, "trackPolygon"); globeControl1.Globe.Action = EnumAction3D.TrackPolygon; globeControl1.Globe.TrackPolygonTool.TrackMode = EnumTrackMode.SpaceTrack; globeControl1.TrackPolygonEndEvent += globeControl1_TrackPolygonEndEvent; @@ -392,7 +392,7 @@ private void FrmpipeDiametergather_FormClosing(object sender, FormClosingEventArgs e) { frm = null; - Utility.RemoveFeatureFromName(globeControl1, "trackPolygon"); + FeatureTools.RemoveFeatureFromName(globeControl1, "trackPolygon"); globeControl1.TrackPolygonEndEvent -= globeControl1_TrackPolygonEndEvent; globeControl1.Globe.Action = EnumAction3D.ActionNull; diff --git a/FrmpipeMaterialGather.cs b/FrmpipeMaterialGather.cs index 44e7f24..5ca8144 100644 --- a/FrmpipeMaterialGather.cs +++ b/FrmpipeMaterialGather.cs @@ -58,10 +58,9 @@ for (int i = 0; i < pipeLayerNames.Count; i++) { clbPipeLine.Items.Add(pipeLayerNames[i]); - GSOLayer layer = globeControl1.Globe.Layers.GetLayerByCaption(pipeLayerNames[i]); - if (layer.Dataset == null || !layer.Dataset.IsFeatureDataset || layer.Type != EnumLayerType.FeatureLayer) continue; + GSOLayer layer = globeControl1.Globe.Layers.GetLayerByCaption(pipeLayerNames[i]); + if (layer == null || layer.Dataset == null || !layer.Dataset.IsFeatureDataset || layer.Type != EnumLayerType.FeatureLayer) continue; - string name = layer.Name; GSOFeatureLayer flayer = layer as GSOFeatureLayer; GSOFeatures feats = flayer.GetAllFeatures(); @@ -205,7 +204,7 @@ { chart1.Series.Add(clbPipeLine.CheckedItems[i].ToString()); GSOLayer layer = globeControl1.Globe.Layers.GetLayerByCaption(clbPipeLine.CheckedItems[i].ToString()); - if (layer != null && layer is GSOFeatureLayer) + if (layer is GSOFeatureLayer) { GSOFeatureLayer flayer = layer as GSOFeatureLayer; GSOFeatures features = flayer.GetAllFeatures(); @@ -240,10 +239,9 @@ labeStyleAxisX.Enabled = true; chart1.ChartAreas["ChartArea1"].AxisX.LabelStyle = labeStyleAxisX; - Dictionary dic1 = new Dictionary(); for (int j = 0; j < chart1.Series.Count; j++) { - dic1 = new Dictionary(); + Dictionary dic1 = new Dictionary(); foreach (string key in dic.Keys) { if (key.Contains(chart1.Series[j].Name)) @@ -304,7 +302,7 @@ MessageBox.Show("请选择材质类型！"); return; } - Utility.RemoveFeatureFromName(globeControl1, "trackPolygon"); + FeatureTools.RemoveFeatureFromName(globeControl1, "trackPolygon"); globeControl1.Globe.Action = EnumAction3D.TrackPolygon; globeControl1.Globe.TrackPolygonTool.TrackMode = EnumTrackMode.SpaceTrack; globeControl1.TrackPolygonEndEvent += globeControl1_TrackPolygonEndEvent; @@ -318,7 +316,7 @@ private void FrmpipeMaterialGather_FormClosing(object sender, FormClosingEventArgs e) { frm = null; - Utility.RemoveFeatureFromName(globeControl1, "trackPolygon"); + FeatureTools.RemoveFeatureFromName(globeControl1, "trackPolygon"); globeControl1.TrackPolygonEndEvent -= globeControl1_TrackPolygonEndEvent; globeControl1.Globe.Action = EnumAction3D.ActionNull; diff --git a/Frmpipediameterstatis.cs b/Frmpipediameterstatis.cs index 4fb25a8..631a996 100644 --- a/Frmpipediameterstatis.cs +++ b/Frmpipediameterstatis.cs @@ -202,8 +202,8 @@ } catch (Exception ex) { - LogHelper.WriteLog(typeof(Frmpipediameterstatis), ex.Message); //MessageBox.Show(ex.Message); + LogHelper.Error(ex.Message); LogError.PublishError(ex); } } @@ -372,7 +372,7 @@ MessageBox.Show("请添加分段！"); return; } - Utility.RemoveFeatureFromName(globeControl1, "trackPolygon"); + FeatureTools.RemoveFeatureFromName(globeControl1, "trackPolygon"); globeControl1.Globe.Action = EnumAction3D.TrackPolygon; globeControl1.Globe.TrackPolygonTool.TrackMode = EnumTrackMode.SpaceTrack; globeControl1.TrackPolygonEndEvent += globeControl1_TrackPolygonEndEvent; @@ -422,7 +422,7 @@ globeControl1.Globe.Action = EnumAction3D.ActionNull; globeControl1.TrackPolygonEndEvent -= globeControl1_TrackPolygonEndEvent; - Utility.RemoveFeatureFromName(globeControl1, "trackPolygon"); + FeatureTools.RemoveFeatureFromName(globeControl1, "trackPolygon"); globeControl1.Globe.MemoryLayer.RemoveAllFeature(); } diff --git a/LineBuilder.cs b/LineBuilder.cs index 33a216c..b6a8516 100644 --- a/LineBuilder.cs +++ b/LineBuilder.cs @@ -43,8 +43,8 @@ GSOGeoPolyline3D lineeee = f.Geometry as GSOGeoPolyline3D; if (lineeee == null || lineeee.GetSpaceLength(true, 6378137) == 0) { - LogHelper.WriteLog(typeof(LineBuilder), "出现数据无法入库:"+f.ID); - continue; //TODO LIST:判断是否会出现部署数据无法入库情况,Log2Net + LogHelper.Error("出现数据无法入库:" + f.ID); + continue; } GSOFeature newFeature = newFeatureSet.CreateFeature(); diff --git a/LogHelper.cs b/LogHelper.cs index 9ef5f27..04573cf 100644 --- a/LogHelper.cs +++ b/LogHelper.cs @@ -1,4 +1,5 @@ using System; +using System.Diagnostics; using log4net; using log4net.Config; @@ -7,35 +8,82 @@ { public class LogHelper { - /// - /// 输出日志到Log4Net - /// - /// - /// - #region static void WriteLog(Type t, Exception ex) - public static void WriteLog(Type t, Exception ex) + private static ILog _logdebug = log4net.LogManager.GetLogger("logdebug"); + private static ILog _loginfo = log4net.LogManager.GetLogger("loginfo"); + private static ILog _logwarn = log4net.LogManager.GetLogger("logwarn"); + private static ILog _logerror = log4net.LogManager.GetLogger("logerror"); + private static ILog _logfatal = log4net.LogManager.GetLogger("logfatal"); + + public static void Debug(string msg) { - ILog log = log4net.LogManager.GetLogger(t); - log.Error("Error", ex); + StackFrame sf = new StackFrame(1); + msg = string.Format("{0}.{1}:{2}", sf.GetMethod().ReflectedType.FullName, sf.GetMethod().Name, msg); + _logdebug.Debug(msg); + } + public static void Debug(string msg, Exception e) + { + StackFrame sf = new StackFrame(1); + msg = string.Format("{0}.{1}:{2}", sf.GetMethod().ReflectedType.FullName, sf.GetMethod().Name, msg); + _logdebug.Debug(msg, e); } - #endregion - /// - /// 输出日志到Log4Net - /// - /// - /// - #region static void WriteLog(Type t, string msg) - - public static void WriteLog(Type t, string msg) + public static void Info(string msg) { - ILog log = log4net.LogManager.GetLogger(t); - log.Error(msg); + StackFrame sf = new StackFrame(1); + msg = string.Format("{0}.{1}:{2}", sf.GetMethod().ReflectedType.FullName, sf.GetMethod().Name, msg); + _loginfo.Info(msg); + } + public static void Info(string msg, Exception e) + { + StackFrame sf = new StackFrame(1); + msg = string.Format("{0}.{1}:{2}", sf.GetMethod().ReflectedType.FullName, sf.GetMethod().Name, msg); + _loginfo.Info(msg, e); } - #endregion + + public static void Warn(string msg) + { + StackFrame sf = new StackFrame(1); + msg = string.Format("{0}.{1}:{2}", sf.GetMethod().ReflectedType.FullName, sf.GetMethod().Name, msg); + _logwarn.Warn(msg); + } + public static void Warn(string msg, Exception e) + { + StackFrame sf = new StackFrame(1); + msg = string.Format("{0}.{1}:{2}", sf.GetMethod().ReflectedType.FullName, sf.GetMethod().Name, msg); + _logwarn.Warn(msg, e); + } + + + public static void Error(string msg) + { + StackFrame sf = new StackFrame(1); + msg = string.Format("{0}.{1}:{2}", sf.GetMethod().ReflectedType.FullName, sf.GetMethod().Name, msg); + _logerror.Error(msg); + } + public static void Error(string msg, Exception e) + { + StackFrame sf = new StackFrame(1); + msg = string.Format("{0}.{1}:{2}", sf.GetMethod().ReflectedType.FullName, sf.GetMethod().Name, msg); + _logerror.Error(msg, e); + } + + + public static void Fatal(string msg) + { + StackFrame sf = new StackFrame(1); + msg = string.Format("{0}.{1}:{2}", sf.GetMethod().ReflectedType.FullName, sf.GetMethod().Name, msg); + _logfatal.Fatal(msg); + } + public static void Fatal(string msg, Exception e) + { + StackFrame sf = new StackFrame(1); + msg = string.Format("{0}.{1}:{2}", sf.GetMethod().ReflectedType.FullName, sf.GetMethod().Name, msg); + _logfatal.Fatal(msg, e); + } + } diff --git a/FeatureStatisticsService.cs b/FeatureStatisticsService.cs index 331ee47..b127fe3 100644 --- a/FeatureStatisticsService.cs +++ b/FeatureStatisticsService.cs @@ -190,7 +190,7 @@ List result = new List(); //layer.Name是表名 - string[] accessStrs = Utility.getAccStrsByLayer(layer.Name); + string[] accessStrs = FeatureTools.GetAccStrsByLayer(layer.Name); foreach (string accssname in accessStrs) { diff --git a/FeatureTools.cs b/FeatureTools.cs index be4b469..3c08f34 100644 --- a/FeatureTools.cs +++ b/FeatureTools.cs @@ -1,5 +1,6 @@ using System; using System.Collections.Generic; +using System.Data; using System.Linq; using System.Text; using System.Windows.Forms; @@ -43,7 +44,7 @@ } feature.Delete();//地球上删除该feature string sql = "delete from " + layerName + " where LSSYS_ID =" + feature.ID + " and (编号 is null or substr(编号,length(编号)-2)='TMP')"; - OledbHelper.sqlExecuteNonQuery(sql);//目前无法取到LSSYS_ID，所以这个判断条件不太合适，会导致把该类所有新建的都删除了 + OledbHelper.sqlExecuteNonQuery(sql); } catch (Exception) { @@ -106,5 +107,46 @@ } return value; } + + /// + /// 根据附属物图层名字得到里面含有的附属物 + /// + /// + /// + public static string[] GetAccStrsByLayer(string layername) + { + string[] accStrs = null; + string sql = "select 附属物名称 from " + layername + " group by 附属物名称"; + DataSet dataset = OledbHelper.getDataSet(sql, layername); + if (dataset == null) return null; + accStrs = new string[dataset.Tables[0].Rows.Count]; + for (int i = 0; i < dataset.Tables[0].Rows.Count; i++) + { + accStrs[i] = dataset.Tables[0].Rows[i][0].ToString(); + } + return accStrs; + } + + /// + /// 删除内存图层中指定名称的feature + /// + /// + /// + public static void RemoveFeatureFromName(GSOGlobeControl globeControl1, string featureName) + { + GSOFeatures features = globeControl1.Globe.MemoryLayer.GetFeatureByName(featureName, true); + if (features != null) + { + for (int i = features.Length - 1; i >= 0; i--) + { + GSOFeature feature = features[i]; + if (feature != null) + { + globeControl1.Globe.MemoryLayer.RemoveFeatureByID(feature.ID); + } + } + } + globeControl1.Refresh(); + } } } diff --git a/Forms/FrmPipelineModelDataBase.cs b/Forms/FrmPipelineModelDataBase.cs index b577fd8..bc1e479 100644 --- a/Forms/FrmPipelineModelDataBase.cs +++ b/Forms/FrmPipelineModelDataBase.cs @@ -149,7 +149,7 @@ catch (Exception ex) { LogError.PublishError(ex); - LogHelper.WriteLog(typeof(FrmPipelineModelDB), ex.Message); + LogHelper.Error(ex.Message); } } diff --git a/FrmAccessoriesSensor.cs b/FrmAccessoriesSensor.cs index 98aa1cf..542f19a 100644 --- a/FrmAccessoriesSensor.cs +++ b/FrmAccessoriesSensor.cs @@ -240,7 +240,7 @@ { if (clbPipeLine.CheckedItems.Count > 0) { - Utility.RemoveFeatureFromName(globeControl1, "trackPolygon"); + FeatureTools.RemoveFeatureFromName(globeControl1, "trackPolygon"); globeControl1.Globe.Action = EnumAction3D.TrackPolygon; globeControl1.TrackPolygonEndEvent += globeControl1_TrackPolygonEndEvent; } @@ -259,7 +259,7 @@ private void FrmAccessoriesgather_FormClosing(object sender, FormClosingEventArgs e) { frm = null; - Utility.RemoveFeatureFromName(globeControl1, "trackPolygon"); + FeatureTools.RemoveFeatureFromName(globeControl1, "trackPolygon"); globeControl1.Globe.Action = EnumAction3D.ActionNull; globeControl1.TrackPolygonEndEvent -= globeControl1_TrackPolygonEndEvent; } diff --git a/FrmAccessoriesgather.cs b/FrmAccessoriesgather.cs index e1d176e..c36273b 100644 --- a/FrmAccessoriesgather.cs +++ b/FrmAccessoriesgather.cs @@ -118,7 +118,7 @@ { if (clbPipeLine2.Text!="") { - Utility.RemoveFeatureFromName(globeControl1, "trackPolygon"); + FeatureTools.RemoveFeatureFromName(globeControl1, "trackPolygon"); globeControl1.Globe.Action = EnumAction3D.TrackPolygon; globeControl1.Globe.TrackPolygonTool.TrackMode = EnumTrackMode.SpaceTrack; globeControl1.TrackPolygonEndEvent += globeControl1_TrackPolygonEndEvent; @@ -295,7 +295,7 @@ private void FrmAccessoriesgather_FormClosing(object sender, FormClosingEventArgs e) { frm = null; - Utility.RemoveFeatureFromName(globeControl1, "trackPolygon"); + FeatureTools.RemoveFeatureFromName(globeControl1, "trackPolygon"); globeControl1.TrackPolygonEndEvent -= globeControl1_TrackPolygonEndEvent; globeControl1.Globe.Action = EnumAction3D.ActionNull; diff --git a/FrmAddWellShp.cs b/FrmAddWellShp.cs index 7983349..78d8946 100644 --- a/FrmAddWellShp.cs +++ b/FrmAddWellShp.cs @@ -100,7 +100,7 @@ catch (Exception ex) { LogError.PublishError(ex); - LogHelper.WriteLog(typeof(FrmAddWellShp), ex.Message); + LogHelper.Error(ex.Message); } } diff --git a/FrmBSQStatis.cs b/FrmBSQStatis.cs index 5b05926..b5e581d 100644 --- a/FrmBSQStatis.cs +++ b/FrmBSQStatis.cs @@ -97,7 +97,7 @@ } catch (Exception ex) { - LogHelper.WriteLog(typeof(FrmBSQStatis),ex.Message); + LogHelper.Error(ex.Message); } return typeAndCount; } @@ -108,7 +108,7 @@ GSOLayer layer = globeControl1.Globe.Layers.GetLayerByCaption("标识器"); GSOFeatures bsqFs = FeatureStatisticsService.GetLayerFeatures(polygon, layer); if (bsqFs == null || bsqFs.Length <= 0) { - LogHelper.WriteLog(typeof(FrmBSQStatis),"标识器图层下的Feature为空"); + LogHelper.Error("标识器图层下的Feature为空!"); return null; } diff --git a/FrmBasicQuery.cs b/FrmBasicQuery.cs index baeeade..cc8d3ff 100644 --- a/FrmBasicQuery.cs +++ b/FrmBasicQuery.cs @@ -224,7 +224,7 @@ } catch(Exception ex) { - LogHelper.WriteLog(typeof(FrmBasicQuery), ex.Message); + LogHelper.Error(ex.Message); } } else diff --git a/FrmCodingQuery.cs b/FrmCodingQuery.cs index f1ac322..d4ec095 100644 --- a/FrmCodingQuery.cs +++ b/FrmCodingQuery.cs @@ -82,7 +82,7 @@ } catch (Exception ex) { - LogHelper.WriteLog(typeof(FrmCodingQuery), ex.Message); ; + LogHelper.Error(ex.Message); } } diff --git a/FrmDiameterQuery.cs b/FrmDiameterQuery.cs index e7b3657..75d7949 100644 --- a/FrmDiameterQuery.cs +++ b/FrmDiameterQuery.cs @@ -150,7 +150,7 @@ catch (Exception ex) { //LogError.PublishError(ex); - LogHelper.WriteLog(typeof(FrmDiameterQuery), ex.Message); + LogHelper.Error(ex.Message); MessageBox.Show("请输入正确的管径范围！"); return; } diff --git a/FrmFittingQuery.cs b/FrmFittingQuery.cs index 12f6007..8645011 100644 --- a/FrmFittingQuery.cs +++ b/FrmFittingQuery.cs @@ -69,7 +69,7 @@ } catch (Exception ex) { - LogHelper.WriteLog(typeof(FrmFittingQuery), ex.Message); + LogHelper.Error(ex.Message); } } /// diff --git a/FrmKeywordQuery.cs b/FrmKeywordQuery.cs index 405524f..ede0a93 100644 --- a/FrmKeywordQuery.cs +++ b/FrmKeywordQuery.cs @@ -87,7 +87,7 @@ } catch (Exception ex) { - LogHelper.WriteLog(typeof(FrmKeywordQuery), ex.Message); + LogHelper.Error(ex.Message); } } diff --git a/FrmLogin.cs b/FrmLogin.cs index 1172c23..6fbaed9 100644 --- a/FrmLogin.cs +++ b/FrmLogin.cs @@ -2,6 +2,8 @@ using System.Data; using System.Data.OracleClient; using System.IO; +using System.Net; +using System.Text; using System.Windows.Forms; using System.Xml; using DevComponents.DotNetBar; @@ -10,16 +12,15 @@ { public partial class FrmLogin : Office2007Form { + + //登录界面 -- 配置文件的路径 + public static string filename = Application.StartupPath + "\\login.xml"; + + public FrmLogin() { InitializeComponent(); } - public string rolename = "浏览"; - public string username = ""; - public string department = ""; - - //登录界面 -- 配置文件的路径 - public static string filename = Application.StartupPath + "\\login.xml"; /// /// 登录按钮事件处理 /// @@ -28,9 +29,10 @@ private void button1_Click(object sender, EventArgs e) { bool result = ValidateUser(); +// bool result =ValidateFromUrl();//从平台获取用户角色信息，判断是否能登陆成功 if (result) { - username = txtUser.Text.Trim(); + WriteXml(); Utility.userName = txtUser.Text.Trim(); DialogResult = DialogResult.OK; Close(); @@ -43,80 +45,6 @@ } } /// - /// 关闭按钮事件处理 - /// - /// - /// - private void button2_Click(object sender, EventArgs e) - { - Close(); - } - /// - /// 验证端口号 - /// - /// - //private bool ValiPort() - //{ - // Ping p = new Ping();//创建Ping对象p - // PingReply pr = p.Send(Utility.localicenseserverip);//向指定IP或者主机名的计算机发送ICMP协议的ping数据包 - // if (pr.Status == IPStatus.Success)//如果ping成功 - // { - // try - // { - // TcpClient tcpc = new TcpClient(Utility.localicenseserverip, Utility.localicenseserverport);//对IP地址为"192.168.0.105"的计算机的1500端口提出连接申请 - // tcpc.Close(); - // return true; - // } - // catch (Exception ex) - // { - // LogError.PublishError(ex); - // MessageBox.Show("端口连接错误！" + ex.Message); - // return false; - // } - // } - // else - // { - // int times = 0;//重新连接次数; - // int count = 2;//设置尝试次数 - // while (times < count) - // { - // //Thread.Sleep(1000);//等待时间(方便测试的话，你可以改为1000) - // pr = p.Send(Utility.localicenseserverip); - - // if (pr.Status == IPStatus.Success) - // { - // try - // { - // TcpClient tcpc = new TcpClient(Utility.localicenseserverip, Utility.localicenseserverport);//对IP地址为"192.168.0.105"的计算机的1500端口提出连接申请 - // tcpc.Close(); - // return true; - // } - // catch (Exception ex) - // { - // LogError.PublishError(ex); - // MessageBox.Show("端口连接错误！" + ex.Message); - // return false; - // } - // } - // else - // { - // times++; - // if (times < count) - // { - // continue; - // } - // else - // { - // MessageBox.Show("重新尝试连接失败"); - // return false; - // } - // } - - // } - // return false; - // } - //} - /// /// 验证用户名、密码 /// /// @@ -126,24 +54,64 @@ string sql = "select * from casic_userinfotest where USERNAME='" + txtUser.Text.Trim() + "' and PASSWORD='" + passWord + "' and sysname='GHFX' "; DataTable dt = OledbHelper.QueryTable(sql); - if (dt != null && dt.Rows.Count > 0) + if (dt == null || dt.Rows.Count <= 0) return false; + if (String.IsNullOrEmpty(dt.Rows[0]["rid"].ToString())) return true; + sql = "select gid from casic_userroletest where id=" + dt.Rows[0]["rid"] + " and sysname='GHFX' "; + using (OracleDataReader reader = OracleUtils.ExecuteReader(OracleUtils.ConnectionString, CommandType.Text, sql)) { - WriteXML(); - if (!String.IsNullOrEmpty(dt.Rows[0]["rid"].ToString())) + while (reader.Read()) { - sql = "select gid from casic_userroletest where id=" + dt.Rows[0]["rid"] + " and sysname='GHFX' "; - using (OracleDataReader reader = OracleUtils.ExecuteReader(OracleUtils.ConnectionString, CommandType.Text, sql)) - { - while (reader.Read()) - { - Utility.userRole = reader[0].ToString(); - break; - } - } + Utility.userRole = reader[0].ToString(); + LogHelper.Debug("测试一下"); + break; } - return true; } - return false; + return true; + } + + + + private bool ValidateFromUrl() + { + string user = txtUser.Text.Trim(); + string pwd = textBoxPassWord.Text.Trim(); + //做成配置的 + string roleserver = Utility.RoleServer; + if (roleserver == null || roleserver.Trim().Equals("")) + { + MessageBox.Show("请在Config.xml中配置roleurl！"); + return false; + } + HttpWebRequest request = + WebRequest.Create(roleserver+"/rs/authority/user?username=" + user + "&password=" + pwd + "&appId=21") as HttpWebRequest; + if (request == null) return false; + using (HttpWebResponse response = request.GetResponse() as HttpWebResponse) + { + try + { + if (response == null || response.GetResponseStream() == null) return false; + StreamReader reader = new StreamReader(response.GetResponseStream()); + string[] result = reader.ReadToEnd().Split(','); + //解析result + if (result.Length < 5) return false; + StringBuilder userRole = new StringBuilder(""); + for (int i = 4; i < result.Length; i++) + { + string[] tmpStrings = result[i].Split('_'); + if (tmpStrings.Length < 2) continue; + userRole.Append(tmpStrings[1].Trim() + ","); + } + if (userRole.Length < 3) return false; + userRole.Remove(userRole.Length - 3, 3); + // MessageBox.Show(userRole.ToString()); + Utility.userRole = userRole.ToString(); + return Utility.userRole != null && !Utility.userRole.Equals("null"); + } + catch (Exception e) + { + return false; + } + } } private void FrmLogin_Load(object sender, EventArgs e) @@ -153,74 +121,56 @@ StartPosition = FormStartPosition.CenterScreen; - ReadXML(); + ReadXml(); } /// /// 读取上一次登录的用户名和密码 /// - private void ReadXML() + private void ReadXml() { - if (File.Exists(filename)) + if (!File.Exists(filename)) return; + //初始化XML文档操作类 + XmlDocument myDoc = new XmlDocument(); { - if (!File.Exists(filename)) + //加载XML文件 + try { + myDoc.Load(filename); + } + catch (Exception e) + { + LogError.PublishError(e); return; } - - //初始化XML文档操作类 - XmlDocument myDoc = new XmlDocument(); + //搜索指定的节点 + XmlNode serverRootNode = myDoc.SelectSingleNode("Params"); + XmlNodeList nodes = null; + if (serverRootNode != null) { - //加载XML文件 - try + nodes = serverRootNode.ChildNodes; + } + if (nodes == null) return; + foreach (XmlNode xn in nodes) + { + if (xn.Name.Equals("username")) { - myDoc.Load(filename); + txtUser.Text = xn.InnerText.Trim(); } - catch (Exception e) + else if (xn.Name.Equals("password")) { - LogError.PublishError(e); - return; + textBoxPassWord.Text = xn.InnerText.Trim(); } - //搜索指定的节点 - XmlNode serverRootNode = myDoc.SelectSingleNode("Params"); - XmlNodeList nodes = null; - if (serverRootNode != null) + else if (xn.Name.Equals("isremember")) { - nodes = serverRootNode.ChildNodes; - } - if (nodes != null) - { - foreach (XmlNode xn in nodes) - { - if (xn.Name == "username") - { - txtUser.Text = xn.InnerText.Trim(); - } - else if (xn.Name == "password") - { - textBoxPassWord.Text = xn.InnerText.Trim(); - } - else if (xn.Name == "isremember") - { - if (xn.InnerText.Trim() == "true") - { - checkBoxXRememberPassword.Checked = true; - } - else if (xn.InnerText.Trim() == "false") - { - checkBoxXRememberPassword.Checked = false; - } - } - } - + checkBoxXRememberPassword.Checked = xn.InnerText.Trim().Equals("true"); } } } - } /// /// 记录登录的用户名和密码 /// - private void WriteXML() + private void WriteXml() { if (!File.Exists(filename)) { @@ -252,31 +202,17 @@ foreach (XmlNode xn in nodes) { XmlElement xe = (XmlElement)xn; - if (xe.Name == "username") + if (xe.Name.Equals("username")) { xe.InnerText = txtUser.Text.Trim(); } - else if (xe.Name == "password") + else if (xe.Name.Equals("password")) { - if (checkBoxXRememberPassword.Checked) - { - xe.InnerText = textBoxPassWord.Text.Trim(); - } - else - { - xe.InnerText = ""; - } + xe.InnerText = checkBoxXRememberPassword.Checked ? textBoxPassWord.Text.Trim() : ""; } - else if (xe.Name == "isremember") + else if (xe.Name.Equals("isremember")) { - if (checkBoxXRememberPassword.Checked) - { - xe.InnerText = "true"; - } - else - { - xe.InnerText = "false"; - } + xe.InnerText = checkBoxXRememberPassword.Checked ? "true" : "false"; } } } diff --git a/FrmMaterialSel.cs b/FrmMaterialSel.cs index 8645ab3..d23f385 100644 --- a/FrmMaterialSel.cs +++ b/FrmMaterialSel.cs @@ -157,7 +157,7 @@ } catch (Exception ex) { - LogHelper.WriteLog(typeof(FrmMaterialSel), ex.Message); + LogHelper.Error(ex.Message); } } diff --git a/FrmMetadataStat.cs b/FrmMetadataStat.cs index c3c1359..96029a6 100644 --- a/FrmMetadataStat.cs +++ b/FrmMetadataStat.cs @@ -96,7 +96,7 @@ //统计有多少个图层 private int statistLayer() { - List datasrcs = Utility.layerConfig.datasrcs; + List datasrcs = Utility.LayerConfig.datasrcs; return datasrcs.SelectMany(datasrc => datasrc.layertypes).Sum(layerType => layerType.layers.Count); } diff --git a/FrmpipeDeepstatis.cs b/FrmpipeDeepstatis.cs index 6a5c895..8d915a9 100644 --- a/FrmpipeDeepstatis.cs +++ b/FrmpipeDeepstatis.cs @@ -2,6 +2,7 @@ using System.Collections.Generic; using System.Diagnostics; using System.IO; +using System.Reflection; using System.Text; using System.Windows.Forms; using System.Windows.Forms.DataVisualization.Charting; @@ -320,7 +321,7 @@ MessageBox.Show("请添加分段"); return; } - Utility.RemoveFeatureFromName(globeControl1, "trackPolygon"); + FeatureTools.RemoveFeatureFromName(globeControl1, "trackPolygon"); globeControl1.Globe.Action = EnumAction3D.TrackPolygon; globeControl1.Globe.TrackPolygonTool.TrackMode = EnumTrackMode.SpaceTrack; globeControl1.TrackPolygonEndEvent += globeControl1_TrackPolygonEndEvent; @@ -408,12 +409,11 @@ TextBox control; private void dataGridViewX2_EditingControlShowing(object sender, DataGridViewEditingControlShowingEventArgs e) { - if (e.Control.GetType().BaseType.Name == "TextBox") - { - control = new TextBox(); - control = (TextBox)e.Control; - control.KeyPress += control_KeyPress; - } + MemberInfo memberInfo = e.Control.GetType().BaseType; + if (memberInfo != null && !memberInfo.Name.Equals("TextBox")) return; + control = new TextBox(); + control = (TextBox)e.Control; + control.KeyPress += control_KeyPress; } /// /// 键盘按键按下事件处理 @@ -423,28 +423,24 @@ void control_KeyPress(object sender, KeyPressEventArgs e) { TextBox text = sender as TextBox; + if (text == null) return; if ((e.KeyChar < 48 || e.KeyChar > 57) && (e.KeyChar != 8) && e.KeyChar != 46) { e.Handled = true; } - if (e.KeyChar == 46) //小数点 + if (e.KeyChar != 46) return; + if (text.Text.Length <= 0) + e.Handled = true; //小数点不能在第一位 + else //处理不规则的小数点 { - if (text.Text.Length <= 0) - e.Handled = true; //小数点不能在第一位 - else //处理不规则的小数点 + float f; + float oldf; + bool b1 = false, b2 = false; + b1 = float.TryParse(text.Text, out oldf); + b2 = float.TryParse(text.Text + e.KeyChar, out f); + if (!b2) { - float f; - float oldf; - bool b1 = false, b2 = false; - b1 = float.TryParse(text.Text, out oldf); - b2 = float.TryParse(text.Text + e.KeyChar, out f); - if (b2 == false) - { - if (b1) - e.Handled = true; - else - e.Handled = false; - } + e.Handled = b1; } } } @@ -457,7 +453,7 @@ { frm = null; - Utility.RemoveFeatureFromName(globeControl1, "trackPolygon"); + FeatureTools.RemoveFeatureFromName(globeControl1, "trackPolygon"); globeControl1.TrackPolygonEndEvent -= globeControl1_TrackPolygonEndEvent; globeControl1.Globe.Action = EnumAction3D.ActionNull; diff --git a/FrmpipeDiametergather.cs b/FrmpipeDiametergather.cs index a9d96fa..c09aaf1 100644 --- a/FrmpipeDiametergather.cs +++ b/FrmpipeDiametergather.cs @@ -154,7 +154,7 @@ MessageBox.Show("请选择图层！"); return; } - Utility.RemoveFeatureFromName(globeControl1, "trackPolygon"); + FeatureTools.RemoveFeatureFromName(globeControl1, "trackPolygon"); globeControl1.Globe.Action = EnumAction3D.TrackPolygon; globeControl1.Globe.TrackPolygonTool.TrackMode = EnumTrackMode.SpaceTrack; globeControl1.TrackPolygonEndEvent += globeControl1_TrackPolygonEndEvent; @@ -392,7 +392,7 @@ private void FrmpipeDiametergather_FormClosing(object sender, FormClosingEventArgs e) { frm = null; - Utility.RemoveFeatureFromName(globeControl1, "trackPolygon"); + FeatureTools.RemoveFeatureFromName(globeControl1, "trackPolygon"); globeControl1.TrackPolygonEndEvent -= globeControl1_TrackPolygonEndEvent; globeControl1.Globe.Action = EnumAction3D.ActionNull; diff --git a/FrmpipeMaterialGather.cs b/FrmpipeMaterialGather.cs index 44e7f24..5ca8144 100644 --- a/FrmpipeMaterialGather.cs +++ b/FrmpipeMaterialGather.cs @@ -58,10 +58,9 @@ for (int i = 0; i < pipeLayerNames.Count; i++) { clbPipeLine.Items.Add(pipeLayerNames[i]); - GSOLayer layer = globeControl1.Globe.Layers.GetLayerByCaption(pipeLayerNames[i]); - if (layer.Dataset == null || !layer.Dataset.IsFeatureDataset || layer.Type != EnumLayerType.FeatureLayer) continue; + GSOLayer layer = globeControl1.Globe.Layers.GetLayerByCaption(pipeLayerNames[i]); + if (layer == null || layer.Dataset == null || !layer.Dataset.IsFeatureDataset || layer.Type != EnumLayerType.FeatureLayer) continue; - string name = layer.Name; GSOFeatureLayer flayer = layer as GSOFeatureLayer; GSOFeatures feats = flayer.GetAllFeatures(); @@ -205,7 +204,7 @@ { chart1.Series.Add(clbPipeLine.CheckedItems[i].ToString()); GSOLayer layer = globeControl1.Globe.Layers.GetLayerByCaption(clbPipeLine.CheckedItems[i].ToString()); - if (layer != null && layer is GSOFeatureLayer) + if (layer is GSOFeatureLayer) { GSOFeatureLayer flayer = layer as GSOFeatureLayer; GSOFeatures features = flayer.GetAllFeatures(); @@ -240,10 +239,9 @@ labeStyleAxisX.Enabled = true; chart1.ChartAreas["ChartArea1"].AxisX.LabelStyle = labeStyleAxisX; - Dictionary dic1 = new Dictionary(); for (int j = 0; j < chart1.Series.Count; j++) { - dic1 = new Dictionary(); + Dictionary dic1 = new Dictionary(); foreach (string key in dic.Keys) { if (key.Contains(chart1.Series[j].Name)) @@ -304,7 +302,7 @@ MessageBox.Show("请选择材质类型！"); return; } - Utility.RemoveFeatureFromName(globeControl1, "trackPolygon"); + FeatureTools.RemoveFeatureFromName(globeControl1, "trackPolygon"); globeControl1.Globe.Action = EnumAction3D.TrackPolygon; globeControl1.Globe.TrackPolygonTool.TrackMode = EnumTrackMode.SpaceTrack; globeControl1.TrackPolygonEndEvent += globeControl1_TrackPolygonEndEvent; @@ -318,7 +316,7 @@ private void FrmpipeMaterialGather_FormClosing(object sender, FormClosingEventArgs e) { frm = null; - Utility.RemoveFeatureFromName(globeControl1, "trackPolygon"); + FeatureTools.RemoveFeatureFromName(globeControl1, "trackPolygon"); globeControl1.TrackPolygonEndEvent -= globeControl1_TrackPolygonEndEvent; globeControl1.Globe.Action = EnumAction3D.ActionNull; diff --git a/Frmpipediameterstatis.cs b/Frmpipediameterstatis.cs index 4fb25a8..631a996 100644 --- a/Frmpipediameterstatis.cs +++ b/Frmpipediameterstatis.cs @@ -202,8 +202,8 @@ } catch (Exception ex) { - LogHelper.WriteLog(typeof(Frmpipediameterstatis), ex.Message); //MessageBox.Show(ex.Message); + LogHelper.Error(ex.Message); LogError.PublishError(ex); } } @@ -372,7 +372,7 @@ MessageBox.Show("请添加分段！"); return; } - Utility.RemoveFeatureFromName(globeControl1, "trackPolygon"); + FeatureTools.RemoveFeatureFromName(globeControl1, "trackPolygon"); globeControl1.Globe.Action = EnumAction3D.TrackPolygon; globeControl1.Globe.TrackPolygonTool.TrackMode = EnumTrackMode.SpaceTrack; globeControl1.TrackPolygonEndEvent += globeControl1_TrackPolygonEndEvent; @@ -422,7 +422,7 @@ globeControl1.Globe.Action = EnumAction3D.ActionNull; globeControl1.TrackPolygonEndEvent -= globeControl1_TrackPolygonEndEvent; - Utility.RemoveFeatureFromName(globeControl1, "trackPolygon"); + FeatureTools.RemoveFeatureFromName(globeControl1, "trackPolygon"); globeControl1.Globe.MemoryLayer.RemoveAllFeature(); } diff --git a/LineBuilder.cs b/LineBuilder.cs index 33a216c..b6a8516 100644 --- a/LineBuilder.cs +++ b/LineBuilder.cs @@ -43,8 +43,8 @@ GSOGeoPolyline3D lineeee = f.Geometry as GSOGeoPolyline3D; if (lineeee == null || lineeee.GetSpaceLength(true, 6378137) == 0) { - LogHelper.WriteLog(typeof(LineBuilder), "出现数据无法入库:"+f.ID); - continue; //TODO LIST:判断是否会出现部署数据无法入库情况,Log2Net + LogHelper.Error("出现数据无法入库:" + f.ID); + continue; } GSOFeature newFeature = newFeatureSet.CreateFeature(); diff --git a/LogHelper.cs b/LogHelper.cs index 9ef5f27..04573cf 100644 --- a/LogHelper.cs +++ b/LogHelper.cs @@ -1,4 +1,5 @@ using System; +using System.Diagnostics; using log4net; using log4net.Config; @@ -7,35 +8,82 @@ { public class LogHelper { - /// - /// 输出日志到Log4Net - /// - /// - /// - #region static void WriteLog(Type t, Exception ex) - public static void WriteLog(Type t, Exception ex) + private static ILog _logdebug = log4net.LogManager.GetLogger("logdebug"); + private static ILog _loginfo = log4net.LogManager.GetLogger("loginfo"); + private static ILog _logwarn = log4net.LogManager.GetLogger("logwarn"); + private static ILog _logerror = log4net.LogManager.GetLogger("logerror"); + private static ILog _logfatal = log4net.LogManager.GetLogger("logfatal"); + + public static void Debug(string msg) { - ILog log = log4net.LogManager.GetLogger(t); - log.Error("Error", ex); + StackFrame sf = new StackFrame(1); + msg = string.Format("{0}.{1}:{2}", sf.GetMethod().ReflectedType.FullName, sf.GetMethod().Name, msg); + _logdebug.Debug(msg); + } + public static void Debug(string msg, Exception e) + { + StackFrame sf = new StackFrame(1); + msg = string.Format("{0}.{1}:{2}", sf.GetMethod().ReflectedType.FullName, sf.GetMethod().Name, msg); + _logdebug.Debug(msg, e); } - #endregion - /// - /// 输出日志到Log4Net - /// - /// - /// - #region static void WriteLog(Type t, string msg) - - public static void WriteLog(Type t, string msg) + public static void Info(string msg) { - ILog log = log4net.LogManager.GetLogger(t); - log.Error(msg); + StackFrame sf = new StackFrame(1); + msg = string.Format("{0}.{1}:{2}", sf.GetMethod().ReflectedType.FullName, sf.GetMethod().Name, msg); + _loginfo.Info(msg); + } + public static void Info(string msg, Exception e) + { + StackFrame sf = new StackFrame(1); + msg = string.Format("{0}.{1}:{2}", sf.GetMethod().ReflectedType.FullName, sf.GetMethod().Name, msg); + _loginfo.Info(msg, e); } - #endregion + + public static void Warn(string msg) + { + StackFrame sf = new StackFrame(1); + msg = string.Format("{0}.{1}:{2}", sf.GetMethod().ReflectedType.FullName, sf.GetMethod().Name, msg); + _logwarn.Warn(msg); + } + public static void Warn(string msg, Exception e) + { + StackFrame sf = new StackFrame(1); + msg = string.Format("{0}.{1}:{2}", sf.GetMethod().ReflectedType.FullName, sf.GetMethod().Name, msg); + _logwarn.Warn(msg, e); + } + + + public static void Error(string msg) + { + StackFrame sf = new StackFrame(1); + msg = string.Format("{0}.{1}:{2}", sf.GetMethod().ReflectedType.FullName, sf.GetMethod().Name, msg); + _logerror.Error(msg); + } + public static void Error(string msg, Exception e) + { + StackFrame sf = new StackFrame(1); + msg = string.Format("{0}.{1}:{2}", sf.GetMethod().ReflectedType.FullName, sf.GetMethod().Name, msg); + _logerror.Error(msg, e); + } + + + public static void Fatal(string msg) + { + StackFrame sf = new StackFrame(1); + msg = string.Format("{0}.{1}:{2}", sf.GetMethod().ReflectedType.FullName, sf.GetMethod().Name, msg); + _logfatal.Fatal(msg); + } + public static void Fatal(string msg, Exception e) + { + StackFrame sf = new StackFrame(1); + msg = string.Format("{0}.{1}:{2}", sf.GetMethod().ReflectedType.FullName, sf.GetMethod().Name, msg); + _logfatal.Fatal(msg, e); + } + } diff --git a/MainFrm.cs b/MainFrm.cs index 43de664..51f362a 100644 --- a/MainFrm.cs +++ b/MainFrm.cs @@ -18,7 +18,6 @@ using GeoScene.Data; using GeoScene.Engine; using GeoScene.Globe; -using Timer = System.Windows.Forms.Timer; using ToolTip = System.Windows.Forms.ToolTip; namespace Cyberpipe @@ -163,6 +162,7 @@ /// private void AddGZ() { + lendendGZ50 = new GSOHudButton(); lendendGZ50.SetImage(Application.StartupPath + "/Resource/管纵/50.png"); lendendGZ50.SetOffset(0, 0); @@ -1294,18 +1294,19 @@ private void MainFrm_Load(object sender, EventArgs e) { + layerTree.Nodes.Add("正在加载，请稍后……");//树状图加载在图层加载之后，故增加提示 initGlobalControl(); - //initGlobalMap(); - //initLayerTree(); initMarkerTree(); initLayout(); loadData(); - double x = Convert.ToDouble(Utility.Query_Roads["定位"].ToString().Split(',')[0]); - double y = Convert.ToDouble(Utility.Query_Roads["定位"].ToString().Split(',')[1]); - double z = Convert.ToDouble(Utility.Query_Roads["定位"].ToString().Split(',')[2]); + + double x = Convert.ToDouble(Utility.Query_Roads["绿岛"].ToString().Split(',')[0]); + double y = Convert.ToDouble(Utility.Query_Roads["绿岛"].ToString().Split(',')[1]); + double z = Convert.ToDouble(Utility.Query_Roads["绿岛"].ToString().Split(',')[2]); jumpToCameraState(x, y, z); + } #endregion @@ -1315,11 +1316,17 @@ if (e.Layer == null || !e.Layer.Caption.Equals(Utility.roadLayerName)) return; foreach (TreeNode layerTreeNode in layerTree.Nodes) { - foreach (TreeNode node in layerTreeNode.Nodes) + for (int i=0;i dt, DataGridView dataGridView) @@ -7330,7 +7337,7 @@ } catch (Exception ex) { - LogHelper.WriteLog(typeof(MainFrm), ex); + LogHelper.Debug("", ex); } } } @@ -7362,7 +7369,7 @@ GSOLayer layer = globeControl1.Globe.Layers.Add(strDataPath); if (layer == null) {//wxl - LogHelper.WriteLog(typeof(MainFrm), "buttonItemHX1_Click操作中，" + strDataPath + "的layer为空"); + LogHelper.Error("buttonItemHX1_Click操作中，" + strDataPath + "的layer为空"); continue; } GSOFeatures redFeatures = layer.GetAllFeatures(); @@ -7457,17 +7464,12 @@ { try { + globeControl1.BeforeSceneRenderEvent -= globeControl1_BeforeSceneRenderEvent; globeControl2.BeforeSceneRenderEvent -= globeControl2_BeforeSceneRenderEvent; - double x = Convert.ToDouble(Utility.Query_Roads["定位"].ToString().Split(',')[0]); - double y = Convert.ToDouble(Utility.Query_Roads["定位"].ToString().Split(',')[1]); - double z = Convert.ToDouble(Utility.Query_Roads["定位"].ToString().Split(',')[2]); - jumpToCameraState(x, y, z); - /* globeControl1.Globe.FlyToPosition(new GSOPoint3d(120.610963, 31.188121, 50), EnumAltitudeMode.Absolute, -4, 50, 800); globeControl1.Globe.FlyToPointSpeed = 10000000; - * */ globeControl1.Globe.Action = EnumAction3D.SelectObject; globeControl1.Refresh(); @@ -7489,6 +7491,37 @@ } } /// + /// 基础工具 + /// + /// + /// + private void ribbonTabItem1_MouseDown(object sender, MouseEventArgs e) + { + try + { + + globeControl1.BeforeSceneRenderEvent -= globeControl1_BeforeSceneRenderEvent; + globeControl2.BeforeSceneRenderEvent -= globeControl2_BeforeSceneRenderEvent; + + globeControl1.Globe.Action = EnumAction3D.ActionNull; + dataGridViewX1.AutoSizeColumnsMode = DataGridViewAutoSizeColumnsMode.AllCells; + //zhanshi = false; + redSH = false; + splitContainer1.Panel2Collapsed = true; + panelOfTable.Visible = false; + legendSC.Visible = false; + legendSG.Visible = false; + ClearGZData(); + GSOLayer redLayer = globeControl1.Globe.Layers.GetLayerByCaption("红线"); + if (redLayer == null) return; + redLayer.Visible = false; + } + catch (Exception ex) + { + //MessageBox.Show("系统运行错误:" + ex.ToString(), "错误", MessageBoxButtons.OK, MessageBoxIcon.Error); + } + } + /// /// 一键审核 /// /// @@ -7497,6 +7530,7 @@ { try { + globeControl1.BeforeSceneRenderEvent -= globeControl1_BeforeSceneRenderEvent; globeControl2.BeforeSceneRenderEvent -= globeControl2_BeforeSceneRenderEvent; @@ -7518,32 +7552,7 @@ //MessageBox.Show("系统运行错误:" + ex.ToString(), "错误", MessageBoxButtons.OK, MessageBoxIcon.Error); } } - - void ResetRibbonTab() - { - try - { - globeControl1.BeforeSceneRenderEvent -= globeControl1_BeforeSceneRenderEvent; - globeControl2.BeforeSceneRenderEvent -= globeControl2_BeforeSceneRenderEvent; - - globeControl1.Globe.Action = EnumAction3D.ActionNull; - dataGridViewX1.AutoSizeColumnsMode = DataGridViewAutoSizeColumnsMode.AllCells; - //zhanshi = false; - redSH = false; - splitContainer1.Panel2Collapsed = true; - panelOfTable.Visible = false; - legendSC.Visible = false; - legendSG.Visible = false; - ClearGZData(); - GSOLayer redLayer = globeControl1.Globe.Layers.GetLayerByCaption("红线"); - if (redLayer == null) return; - redLayer.Visible = false; - } - catch (Exception ex) - { - LogHelper.WriteLog(typeof(MainFrm), ex); - } - } + /// /// 双屏对比 /// @@ -7553,8 +7562,8 @@ { try { - globeControl1.BeforeSceneRenderEvent += new BeforeSceneRenderEventHandler(globeControl1_BeforeSceneRenderEvent); - globeControl2.BeforeSceneRenderEvent += new BeforeSceneRenderEventHandler(globeControl2_BeforeSceneRenderEvent); + globeControl1.BeforeSceneRenderEvent += globeControl1_BeforeSceneRenderEvent; + globeControl2.BeforeSceneRenderEvent += globeControl2_BeforeSceneRenderEvent; globeControl1.Globe.Action = EnumAction3D.ActionNull; panelOfTable.Visible = false; @@ -7570,32 +7579,43 @@ GSOLayer redLayer = globeControl1.Globe.Layers.GetLayerByCaption("红线"); if (redLayer != null) - { redLayer.Visible = false; - } } catch (Exception ex) { - LogHelper.WriteLog(typeof(MainFrm), ex); + //MessageBox.Show("系统运行错误:" + ex.ToString(), "错误", MessageBoxButtons.OK, MessageBoxIcon.Error); } } /// - /// 基础工具 - /// - /// - /// - private void ribbonTabItem1_MouseDown(object sender, MouseEventArgs e) - { - ResetRibbonTab(); - } - /// /// 文档管理 /// /// /// private void ribbonTabItem4_MouseDown(object sender, MouseEventArgs e) { - ResetRibbonTab(); + try + { + + globeControl1.BeforeSceneRenderEvent -= globeControl1_BeforeSceneRenderEvent; + globeControl2.BeforeSceneRenderEvent -= globeControl2_BeforeSceneRenderEvent; + + globeControl1.Globe.Action = EnumAction3D.ActionNull; + panelOfTable.Visible = false; + //zhanshi = false; + redSH = false; + splitContainer1.Panel2Collapsed = true; + dataGridViewX1.AutoSizeColumnsMode = DataGridViewAutoSizeColumnsMode.AllCells; + legendSC.Visible = false; + legendSG.Visible = false; + ClearGZData(); + GSOLayer redLayer = globeControl1.Globe.Layers.GetLayerByCaption("红线"); + if (redLayer != null) + redLayer.Visible = false; + } + catch (Exception ex) + { + //MessageBox.Show("系统运行错误:" + ex.ToString(), "错误", MessageBoxButtons.OK, MessageBoxIcon.Error); + } } /// /// 基础管理 @@ -7604,7 +7624,29 @@ /// private void ribbonTabItem14_MouseDown(object sender, MouseEventArgs e) { - ResetRibbonTab(); + try + { + globeControl1.BeforeSceneRenderEvent -= globeControl1_BeforeSceneRenderEvent; + globeControl2.BeforeSceneRenderEvent -= globeControl2_BeforeSceneRenderEvent; + + globeControl1.Globe.Action = EnumAction3D.ActionNull; + panelOfTable.Visible = false; + //zhanshi = false; + redSH = false; + splitContainer1.Panel2Collapsed = true; + dataGridViewX1.AutoSizeColumnsMode = DataGridViewAutoSizeColumnsMode.AllCells; + legendSC.Visible = false; + legendSG.Visible = false; + ClearGZData(); + + GSOLayer redLayer = globeControl1.Globe.Layers.GetLayerByCaption("红线"); + if (redLayer != null) + redLayer.Visible = false; + } + catch (Exception ex) + { + //MessageBox.Show("系统运行错误:" + ex.ToString(), "错误", MessageBoxButtons.OK, MessageBoxIcon.Error); + } } /// /// 权限管理 @@ -7613,26 +7655,31 @@ /// private void ribbonTabItem2_MouseDown(object sender, MouseEventArgs e) { - ResetRibbonTab(); + try + { + globeControl1.BeforeSceneRenderEvent -= globeControl1_BeforeSceneRenderEvent; + globeControl2.BeforeSceneRenderEvent -= globeControl2_BeforeSceneRenderEvent; + + globeControl1.Globe.Action = EnumAction3D.ActionNull; + panelOfTable.Visible = false; + //zhanshi = false; + redSH = false; + splitContainer1.Panel2Collapsed = true; + dataGridViewX1.AutoSizeColumnsMode = DataGridViewAutoSizeColumnsMode.AllCells; + legendSC.Visible = false; + legendSG.Visible = false; + ClearGZData(); + + GSOLayer redLayer = globeControl1.Globe.Layers.GetLayerByCaption("红线"); + if (redLayer == null) return; + redLayer.Visible = false; + } + catch (Exception ex) + { + //MessageBox.Show("系统运行错误:" + ex.ToString(), "错误", MessageBoxButtons.OK, MessageBoxIcon.Error); + } } - /// - /// 管线定位 - /// - /// - /// - private void ribbonTabItem7_MouseDown(object sender, MouseEventArgs e) - { - ResetRibbonTab(); - } - /// - /// 标识器管理 - /// - /// - /// - private void ribbonTabItem5_MouseDown(object sender, MouseEventArgs e) - { - ResetRibbonTab(); - } + //GSOFeature dpFeatuer = null; /// /// 双屏分析，点击管段分析 @@ -8017,7 +8064,9 @@ private void btn_flag_Click(object sender, EventArgs e) { if (FrmFlagManagers.IS_OPEN) + { return; + } FrmFlagManagers frm = new FrmFlagManagers(globeControl1); frm.Show(this); } diff --git a/FeatureStatisticsService.cs b/FeatureStatisticsService.cs index 331ee47..b127fe3 100644 --- a/FeatureStatisticsService.cs +++ b/FeatureStatisticsService.cs @@ -190,7 +190,7 @@ List result = new List(); //layer.Name是表名 - string[] accessStrs = Utility.getAccStrsByLayer(layer.Name); + string[] accessStrs = FeatureTools.GetAccStrsByLayer(layer.Name); foreach (string accssname in accessStrs) { diff --git a/FeatureTools.cs b/FeatureTools.cs index be4b469..3c08f34 100644 --- a/FeatureTools.cs +++ b/FeatureTools.cs @@ -1,5 +1,6 @@ using System; using System.Collections.Generic; +using System.Data; using System.Linq; using System.Text; using System.Windows.Forms; @@ -43,7 +44,7 @@ } feature.Delete();//地球上删除该feature string sql = "delete from " + layerName + " where LSSYS_ID =" + feature.ID + " and (编号 is null or substr(编号,length(编号)-2)='TMP')"; - OledbHelper.sqlExecuteNonQuery(sql);//目前无法取到LSSYS_ID，所以这个判断条件不太合适，会导致把该类所有新建的都删除了 + OledbHelper.sqlExecuteNonQuery(sql); } catch (Exception) { @@ -106,5 +107,46 @@ } return value; } + + /// + /// 根据附属物图层名字得到里面含有的附属物 + /// + /// + /// + public static string[] GetAccStrsByLayer(string layername) + { + string[] accStrs = null; + string sql = "select 附属物名称 from " + layername + " group by 附属物名称"; + DataSet dataset = OledbHelper.getDataSet(sql, layername); + if (dataset == null) return null; + accStrs = new string[dataset.Tables[0].Rows.Count]; + for (int i = 0; i < dataset.Tables[0].Rows.Count; i++) + { + accStrs[i] = dataset.Tables[0].Rows[i][0].ToString(); + } + return accStrs; + } + + /// + /// 删除内存图层中指定名称的feature + /// + /// + /// + public static void RemoveFeatureFromName(GSOGlobeControl globeControl1, string featureName) + { + GSOFeatures features = globeControl1.Globe.MemoryLayer.GetFeatureByName(featureName, true); + if (features != null) + { + for (int i = features.Length - 1; i >= 0; i--) + { + GSOFeature feature = features[i]; + if (feature != null) + { + globeControl1.Globe.MemoryLayer.RemoveFeatureByID(feature.ID); + } + } + } + globeControl1.Refresh(); + } } } diff --git a/Forms/FrmPipelineModelDataBase.cs b/Forms/FrmPipelineModelDataBase.cs index b577fd8..bc1e479 100644 --- a/Forms/FrmPipelineModelDataBase.cs +++ b/Forms/FrmPipelineModelDataBase.cs @@ -149,7 +149,7 @@ catch (Exception ex) { LogError.PublishError(ex); - LogHelper.WriteLog(typeof(FrmPipelineModelDB), ex.Message); + LogHelper.Error(ex.Message); } } diff --git a/FrmAccessoriesSensor.cs b/FrmAccessoriesSensor.cs index 98aa1cf..542f19a 100644 --- a/FrmAccessoriesSensor.cs +++ b/FrmAccessoriesSensor.cs @@ -240,7 +240,7 @@ { if (clbPipeLine.CheckedItems.Count > 0) { - Utility.RemoveFeatureFromName(globeControl1, "trackPolygon"); + FeatureTools.RemoveFeatureFromName(globeControl1, "trackPolygon"); globeControl1.Globe.Action = EnumAction3D.TrackPolygon; globeControl1.TrackPolygonEndEvent += globeControl1_TrackPolygonEndEvent; } @@ -259,7 +259,7 @@ private void FrmAccessoriesgather_FormClosing(object sender, FormClosingEventArgs e) { frm = null; - Utility.RemoveFeatureFromName(globeControl1, "trackPolygon"); + FeatureTools.RemoveFeatureFromName(globeControl1, "trackPolygon"); globeControl1.Globe.Action = EnumAction3D.ActionNull; globeControl1.TrackPolygonEndEvent -= globeControl1_TrackPolygonEndEvent; } diff --git a/FrmAccessoriesgather.cs b/FrmAccessoriesgather.cs index e1d176e..c36273b 100644 --- a/FrmAccessoriesgather.cs +++ b/FrmAccessoriesgather.cs @@ -118,7 +118,7 @@ { if (clbPipeLine2.Text!="") { - Utility.RemoveFeatureFromName(globeControl1, "trackPolygon"); + FeatureTools.RemoveFeatureFromName(globeControl1, "trackPolygon"); globeControl1.Globe.Action = EnumAction3D.TrackPolygon; globeControl1.Globe.TrackPolygonTool.TrackMode = EnumTrackMode.SpaceTrack; globeControl1.TrackPolygonEndEvent += globeControl1_TrackPolygonEndEvent; @@ -295,7 +295,7 @@ private void FrmAccessoriesgather_FormClosing(object sender, FormClosingEventArgs e) { frm = null; - Utility.RemoveFeatureFromName(globeControl1, "trackPolygon"); + FeatureTools.RemoveFeatureFromName(globeControl1, "trackPolygon"); globeControl1.TrackPolygonEndEvent -= globeControl1_TrackPolygonEndEvent; globeControl1.Globe.Action = EnumAction3D.ActionNull; diff --git a/FrmAddWellShp.cs b/FrmAddWellShp.cs index 7983349..78d8946 100644 --- a/FrmAddWellShp.cs +++ b/FrmAddWellShp.cs @@ -100,7 +100,7 @@ catch (Exception ex) { LogError.PublishError(ex); - LogHelper.WriteLog(typeof(FrmAddWellShp), ex.Message); + LogHelper.Error(ex.Message); } } diff --git a/FrmBSQStatis.cs b/FrmBSQStatis.cs index 5b05926..b5e581d 100644 --- a/FrmBSQStatis.cs +++ b/FrmBSQStatis.cs @@ -97,7 +97,7 @@ } catch (Exception ex) { - LogHelper.WriteLog(typeof(FrmBSQStatis),ex.Message); + LogHelper.Error(ex.Message); } return typeAndCount; } @@ -108,7 +108,7 @@ GSOLayer layer = globeControl1.Globe.Layers.GetLayerByCaption("标识器"); GSOFeatures bsqFs = FeatureStatisticsService.GetLayerFeatures(polygon, layer); if (bsqFs == null || bsqFs.Length <= 0) { - LogHelper.WriteLog(typeof(FrmBSQStatis),"标识器图层下的Feature为空"); + LogHelper.Error("标识器图层下的Feature为空!"); return null; } diff --git a/FrmBasicQuery.cs b/FrmBasicQuery.cs index baeeade..cc8d3ff 100644 --- a/FrmBasicQuery.cs +++ b/FrmBasicQuery.cs @@ -224,7 +224,7 @@ } catch(Exception ex) { - LogHelper.WriteLog(typeof(FrmBasicQuery), ex.Message); + LogHelper.Error(ex.Message); } } else diff --git a/FrmCodingQuery.cs b/FrmCodingQuery.cs index f1ac322..d4ec095 100644 --- a/FrmCodingQuery.cs +++ b/FrmCodingQuery.cs @@ -82,7 +82,7 @@ } catch (Exception ex) { - LogHelper.WriteLog(typeof(FrmCodingQuery), ex.Message); ; + LogHelper.Error(ex.Message); } } diff --git a/FrmDiameterQuery.cs b/FrmDiameterQuery.cs index e7b3657..75d7949 100644 --- a/FrmDiameterQuery.cs +++ b/FrmDiameterQuery.cs @@ -150,7 +150,7 @@ catch (Exception ex) { //LogError.PublishError(ex); - LogHelper.WriteLog(typeof(FrmDiameterQuery), ex.Message); + LogHelper.Error(ex.Message); MessageBox.Show("请输入正确的管径范围！"); return; } diff --git a/FrmFittingQuery.cs b/FrmFittingQuery.cs index 12f6007..8645011 100644 --- a/FrmFittingQuery.cs +++ b/FrmFittingQuery.cs @@ -69,7 +69,7 @@ } catch (Exception ex) { - LogHelper.WriteLog(typeof(FrmFittingQuery), ex.Message); + LogHelper.Error(ex.Message); } } /// diff --git a/FrmKeywordQuery.cs b/FrmKeywordQuery.cs index 405524f..ede0a93 100644 --- a/FrmKeywordQuery.cs +++ b/FrmKeywordQuery.cs @@ -87,7 +87,7 @@ } catch (Exception ex) { - LogHelper.WriteLog(typeof(FrmKeywordQuery), ex.Message); + LogHelper.Error(ex.Message); } } diff --git a/FrmLogin.cs b/FrmLogin.cs index 1172c23..6fbaed9 100644 --- a/FrmLogin.cs +++ b/FrmLogin.cs @@ -2,6 +2,8 @@ using System.Data; using System.Data.OracleClient; using System.IO; +using System.Net; +using System.Text; using System.Windows.Forms; using System.Xml; using DevComponents.DotNetBar; @@ -10,16 +12,15 @@ { public partial class FrmLogin : Office2007Form { + + //登录界面 -- 配置文件的路径 + public static string filename = Application.StartupPath + "\\login.xml"; + + public FrmLogin() { InitializeComponent(); } - public string rolename = "浏览"; - public string username = ""; - public string department = ""; - - //登录界面 -- 配置文件的路径 - public static string filename = Application.StartupPath + "\\login.xml"; /// /// 登录按钮事件处理 /// @@ -28,9 +29,10 @@ private void button1_Click(object sender, EventArgs e) { bool result = ValidateUser(); +// bool result =ValidateFromUrl();//从平台获取用户角色信息，判断是否能登陆成功 if (result) { - username = txtUser.Text.Trim(); + WriteXml(); Utility.userName = txtUser.Text.Trim(); DialogResult = DialogResult.OK; Close(); @@ -43,80 +45,6 @@ } } /// - /// 关闭按钮事件处理 - /// - /// - /// - private void button2_Click(object sender, EventArgs e) - { - Close(); - } - /// - /// 验证端口号 - /// - /// - //private bool ValiPort() - //{ - // Ping p = new Ping();//创建Ping对象p - // PingReply pr = p.Send(Utility.localicenseserverip);//向指定IP或者主机名的计算机发送ICMP协议的ping数据包 - // if (pr.Status == IPStatus.Success)//如果ping成功 - // { - // try - // { - // TcpClient tcpc = new TcpClient(Utility.localicenseserverip, Utility.localicenseserverport);//对IP地址为"192.168.0.105"的计算机的1500端口提出连接申请 - // tcpc.Close(); - // return true; - // } - // catch (Exception ex) - // { - // LogError.PublishError(ex); - // MessageBox.Show("端口连接错误！" + ex.Message); - // return false; - // } - // } - // else - // { - // int times = 0;//重新连接次数; - // int count = 2;//设置尝试次数 - // while (times < count) - // { - // //Thread.Sleep(1000);//等待时间(方便测试的话，你可以改为1000) - // pr = p.Send(Utility.localicenseserverip); - - // if (pr.Status == IPStatus.Success) - // { - // try - // { - // TcpClient tcpc = new TcpClient(Utility.localicenseserverip, Utility.localicenseserverport);//对IP地址为"192.168.0.105"的计算机的1500端口提出连接申请 - // tcpc.Close(); - // return true; - // } - // catch (Exception ex) - // { - // LogError.PublishError(ex); - // MessageBox.Show("端口连接错误！" + ex.Message); - // return false; - // } - // } - // else - // { - // times++; - // if (times < count) - // { - // continue; - // } - // else - // { - // MessageBox.Show("重新尝试连接失败"); - // return false; - // } - // } - - // } - // return false; - // } - //} - /// /// 验证用户名、密码 /// /// @@ -126,24 +54,64 @@ string sql = "select * from casic_userinfotest where USERNAME='" + txtUser.Text.Trim() + "' and PASSWORD='" + passWord + "' and sysname='GHFX' "; DataTable dt = OledbHelper.QueryTable(sql); - if (dt != null && dt.Rows.Count > 0) + if (dt == null || dt.Rows.Count <= 0) return false; + if (String.IsNullOrEmpty(dt.Rows[0]["rid"].ToString())) return true; + sql = "select gid from casic_userroletest where id=" + dt.Rows[0]["rid"] + " and sysname='GHFX' "; + using (OracleDataReader reader = OracleUtils.ExecuteReader(OracleUtils.ConnectionString, CommandType.Text, sql)) { - WriteXML(); - if (!String.IsNullOrEmpty(dt.Rows[0]["rid"].ToString())) + while (reader.Read()) { - sql = "select gid from casic_userroletest where id=" + dt.Rows[0]["rid"] + " and sysname='GHFX' "; - using (OracleDataReader reader = OracleUtils.ExecuteReader(OracleUtils.ConnectionString, CommandType.Text, sql)) - { - while (reader.Read()) - { - Utility.userRole = reader[0].ToString(); - break; - } - } + Utility.userRole = reader[0].ToString(); + LogHelper.Debug("测试一下"); + break; } - return true; } - return false; + return true; + } + + + + private bool ValidateFromUrl() + { + string user = txtUser.Text.Trim(); + string pwd = textBoxPassWord.Text.Trim(); + //做成配置的 + string roleserver = Utility.RoleServer; + if (roleserver == null || roleserver.Trim().Equals("")) + { + MessageBox.Show("请在Config.xml中配置roleurl！"); + return false; + } + HttpWebRequest request = + WebRequest.Create(roleserver+"/rs/authority/user?username=" + user + "&password=" + pwd + "&appId=21") as HttpWebRequest; + if (request == null) return false; + using (HttpWebResponse response = request.GetResponse() as HttpWebResponse) + { + try + { + if (response == null || response.GetResponseStream() == null) return false; + StreamReader reader = new StreamReader(response.GetResponseStream()); + string[] result = reader.ReadToEnd().Split(','); + //解析result + if (result.Length < 5) return false; + StringBuilder userRole = new StringBuilder(""); + for (int i = 4; i < result.Length; i++) + { + string[] tmpStrings = result[i].Split('_'); + if (tmpStrings.Length < 2) continue; + userRole.Append(tmpStrings[1].Trim() + ","); + } + if (userRole.Length < 3) return false; + userRole.Remove(userRole.Length - 3, 3); + // MessageBox.Show(userRole.ToString()); + Utility.userRole = userRole.ToString(); + return Utility.userRole != null && !Utility.userRole.Equals("null"); + } + catch (Exception e) + { + return false; + } + } } private void FrmLogin_Load(object sender, EventArgs e) @@ -153,74 +121,56 @@ StartPosition = FormStartPosition.CenterScreen; - ReadXML(); + ReadXml(); } /// /// 读取上一次登录的用户名和密码 /// - private void ReadXML() + private void ReadXml() { - if (File.Exists(filename)) + if (!File.Exists(filename)) return; + //初始化XML文档操作类 + XmlDocument myDoc = new XmlDocument(); { - if (!File.Exists(filename)) + //加载XML文件 + try { + myDoc.Load(filename); + } + catch (Exception e) + { + LogError.PublishError(e); return; } - - //初始化XML文档操作类 - XmlDocument myDoc = new XmlDocument(); + //搜索指定的节点 + XmlNode serverRootNode = myDoc.SelectSingleNode("Params"); + XmlNodeList nodes = null; + if (serverRootNode != null) { - //加载XML文件 - try + nodes = serverRootNode.ChildNodes; + } + if (nodes == null) return; + foreach (XmlNode xn in nodes) + { + if (xn.Name.Equals("username")) { - myDoc.Load(filename); + txtUser.Text = xn.InnerText.Trim(); } - catch (Exception e) + else if (xn.Name.Equals("password")) { - LogError.PublishError(e); - return; + textBoxPassWord.Text = xn.InnerText.Trim(); } - //搜索指定的节点 - XmlNode serverRootNode = myDoc.SelectSingleNode("Params"); - XmlNodeList nodes = null; - if (serverRootNode != null) + else if (xn.Name.Equals("isremember")) { - nodes = serverRootNode.ChildNodes; - } - if (nodes != null) - { - foreach (XmlNode xn in nodes) - { - if (xn.Name == "username") - { - txtUser.Text = xn.InnerText.Trim(); - } - else if (xn.Name == "password") - { - textBoxPassWord.Text = xn.InnerText.Trim(); - } - else if (xn.Name == "isremember") - { - if (xn.InnerText.Trim() == "true") - { - checkBoxXRememberPassword.Checked = true; - } - else if (xn.InnerText.Trim() == "false") - { - checkBoxXRememberPassword.Checked = false; - } - } - } - + checkBoxXRememberPassword.Checked = xn.InnerText.Trim().Equals("true"); } } } - } /// /// 记录登录的用户名和密码 /// - private void WriteXML() + private void WriteXml() { if (!File.Exists(filename)) { @@ -252,31 +202,17 @@ foreach (XmlNode xn in nodes) { XmlElement xe = (XmlElement)xn; - if (xe.Name == "username") + if (xe.Name.Equals("username")) { xe.InnerText = txtUser.Text.Trim(); } - else if (xe.Name == "password") + else if (xe.Name.Equals("password")) { - if (checkBoxXRememberPassword.Checked) - { - xe.InnerText = textBoxPassWord.Text.Trim(); - } - else - { - xe.InnerText = ""; - } + xe.InnerText = checkBoxXRememberPassword.Checked ? textBoxPassWord.Text.Trim() : ""; } - else if (xe.Name == "isremember") + else if (xe.Name.Equals("isremember")) { - if (checkBoxXRememberPassword.Checked) - { - xe.InnerText = "true"; - } - else - { - xe.InnerText = "false"; - } + xe.InnerText = checkBoxXRememberPassword.Checked ? "true" : "false"; } } } diff --git a/FrmMaterialSel.cs b/FrmMaterialSel.cs index 8645ab3..d23f385 100644 --- a/FrmMaterialSel.cs +++ b/FrmMaterialSel.cs @@ -157,7 +157,7 @@ } catch (Exception ex) { - LogHelper.WriteLog(typeof(FrmMaterialSel), ex.Message); + LogHelper.Error(ex.Message); } } diff --git a/FrmMetadataStat.cs b/FrmMetadataStat.cs index c3c1359..96029a6 100644 --- a/FrmMetadataStat.cs +++ b/FrmMetadataStat.cs @@ -96,7 +96,7 @@ //统计有多少个图层 private int statistLayer() { - List datasrcs = Utility.layerConfig.datasrcs; + List datasrcs = Utility.LayerConfig.datasrcs; return datasrcs.SelectMany(datasrc => datasrc.layertypes).Sum(layerType => layerType.layers.Count); } diff --git a/FrmpipeDeepstatis.cs b/FrmpipeDeepstatis.cs index 6a5c895..8d915a9 100644 --- a/FrmpipeDeepstatis.cs +++ b/FrmpipeDeepstatis.cs @@ -2,6 +2,7 @@ using System.Collections.Generic; using System.Diagnostics; using System.IO; +using System.Reflection; using System.Text; using System.Windows.Forms; using System.Windows.Forms.DataVisualization.Charting; @@ -320,7 +321,7 @@ MessageBox.Show("请添加分段"); return; } - Utility.RemoveFeatureFromName(globeControl1, "trackPolygon"); + FeatureTools.RemoveFeatureFromName(globeControl1, "trackPolygon"); globeControl1.Globe.Action = EnumAction3D.TrackPolygon; globeControl1.Globe.TrackPolygonTool.TrackMode = EnumTrackMode.SpaceTrack; globeControl1.TrackPolygonEndEvent += globeControl1_TrackPolygonEndEvent; @@ -408,12 +409,11 @@ TextBox control; private void dataGridViewX2_EditingControlShowing(object sender, DataGridViewEditingControlShowingEventArgs e) { - if (e.Control.GetType().BaseType.Name == "TextBox") - { - control = new TextBox(); - control = (TextBox)e.Control; - control.KeyPress += control_KeyPress; - } + MemberInfo memberInfo = e.Control.GetType().BaseType; + if (memberInfo != null && !memberInfo.Name.Equals("TextBox")) return; + control = new TextBox(); + control = (TextBox)e.Control; + control.KeyPress += control_KeyPress; } /// /// 键盘按键按下事件处理 @@ -423,28 +423,24 @@ void control_KeyPress(object sender, KeyPressEventArgs e) { TextBox text = sender as TextBox; + if (text == null) return; if ((e.KeyChar < 48 || e.KeyChar > 57) && (e.KeyChar != 8) && e.KeyChar != 46) { e.Handled = true; } - if (e.KeyChar == 46) //小数点 + if (e.KeyChar != 46) return; + if (text.Text.Length <= 0) + e.Handled = true; //小数点不能在第一位 + else //处理不规则的小数点 { - if (text.Text.Length <= 0) - e.Handled = true; //小数点不能在第一位 - else //处理不规则的小数点 + float f; + float oldf; + bool b1 = false, b2 = false; + b1 = float.TryParse(text.Text, out oldf); + b2 = float.TryParse(text.Text + e.KeyChar, out f); + if (!b2) { - float f; - float oldf; - bool b1 = false, b2 = false; - b1 = float.TryParse(text.Text, out oldf); - b2 = float.TryParse(text.Text + e.KeyChar, out f); - if (b2 == false) - { - if (b1) - e.Handled = true; - else - e.Handled = false; - } + e.Handled = b1; } } } @@ -457,7 +453,7 @@ { frm = null; - Utility.RemoveFeatureFromName(globeControl1, "trackPolygon"); + FeatureTools.RemoveFeatureFromName(globeControl1, "trackPolygon"); globeControl1.TrackPolygonEndEvent -= globeControl1_TrackPolygonEndEvent; globeControl1.Globe.Action = EnumAction3D.ActionNull; diff --git a/FrmpipeDiametergather.cs b/FrmpipeDiametergather.cs index a9d96fa..c09aaf1 100644 --- a/FrmpipeDiametergather.cs +++ b/FrmpipeDiametergather.cs @@ -154,7 +154,7 @@ MessageBox.Show("请选择图层！"); return; } - Utility.RemoveFeatureFromName(globeControl1, "trackPolygon"); + FeatureTools.RemoveFeatureFromName(globeControl1, "trackPolygon"); globeControl1.Globe.Action = EnumAction3D.TrackPolygon; globeControl1.Globe.TrackPolygonTool.TrackMode = EnumTrackMode.SpaceTrack; globeControl1.TrackPolygonEndEvent += globeControl1_TrackPolygonEndEvent; @@ -392,7 +392,7 @@ private void FrmpipeDiametergather_FormClosing(object sender, FormClosingEventArgs e) { frm = null; - Utility.RemoveFeatureFromName(globeControl1, "trackPolygon"); + FeatureTools.RemoveFeatureFromName(globeControl1, "trackPolygon"); globeControl1.TrackPolygonEndEvent -= globeControl1_TrackPolygonEndEvent; globeControl1.Globe.Action = EnumAction3D.ActionNull; diff --git a/FrmpipeMaterialGather.cs b/FrmpipeMaterialGather.cs index 44e7f24..5ca8144 100644 --- a/FrmpipeMaterialGather.cs +++ b/FrmpipeMaterialGather.cs @@ -58,10 +58,9 @@ for (int i = 0; i < pipeLayerNames.Count; i++) { clbPipeLine.Items.Add(pipeLayerNames[i]); - GSOLayer layer = globeControl1.Globe.Layers.GetLayerByCaption(pipeLayerNames[i]); - if (layer.Dataset == null || !layer.Dataset.IsFeatureDataset || layer.Type != EnumLayerType.FeatureLayer) continue; + GSOLayer layer = globeControl1.Globe.Layers.GetLayerByCaption(pipeLayerNames[i]); + if (layer == null || layer.Dataset == null || !layer.Dataset.IsFeatureDataset || layer.Type != EnumLayerType.FeatureLayer) continue; - string name = layer.Name; GSOFeatureLayer flayer = layer as GSOFeatureLayer; GSOFeatures feats = flayer.GetAllFeatures(); @@ -205,7 +204,7 @@ { chart1.Series.Add(clbPipeLine.CheckedItems[i].ToString()); GSOLayer layer = globeControl1.Globe.Layers.GetLayerByCaption(clbPipeLine.CheckedItems[i].ToString()); - if (layer != null && layer is GSOFeatureLayer) + if (layer is GSOFeatureLayer) { GSOFeatureLayer flayer = layer as GSOFeatureLayer; GSOFeatures features = flayer.GetAllFeatures(); @@ -240,10 +239,9 @@ labeStyleAxisX.Enabled = true; chart1.ChartAreas["ChartArea1"].AxisX.LabelStyle = labeStyleAxisX; - Dictionary dic1 = new Dictionary(); for (int j = 0; j < chart1.Series.Count; j++) { - dic1 = new Dictionary(); + Dictionary dic1 = new Dictionary(); foreach (string key in dic.Keys) { if (key.Contains(chart1.Series[j].Name)) @@ -304,7 +302,7 @@ MessageBox.Show("请选择材质类型！"); return; } - Utility.RemoveFeatureFromName(globeControl1, "trackPolygon"); + FeatureTools.RemoveFeatureFromName(globeControl1, "trackPolygon"); globeControl1.Globe.Action = EnumAction3D.TrackPolygon; globeControl1.Globe.TrackPolygonTool.TrackMode = EnumTrackMode.SpaceTrack; globeControl1.TrackPolygonEndEvent += globeControl1_TrackPolygonEndEvent; @@ -318,7 +316,7 @@ private void FrmpipeMaterialGather_FormClosing(object sender, FormClosingEventArgs e) { frm = null; - Utility.RemoveFeatureFromName(globeControl1, "trackPolygon"); + FeatureTools.RemoveFeatureFromName(globeControl1, "trackPolygon"); globeControl1.TrackPolygonEndEvent -= globeControl1_TrackPolygonEndEvent; globeControl1.Globe.Action = EnumAction3D.ActionNull; diff --git a/Frmpipediameterstatis.cs b/Frmpipediameterstatis.cs index 4fb25a8..631a996 100644 --- a/Frmpipediameterstatis.cs +++ b/Frmpipediameterstatis.cs @@ -202,8 +202,8 @@ } catch (Exception ex) { - LogHelper.WriteLog(typeof(Frmpipediameterstatis), ex.Message); //MessageBox.Show(ex.Message); + LogHelper.Error(ex.Message); LogError.PublishError(ex); } } @@ -372,7 +372,7 @@ MessageBox.Show("请添加分段！"); return; } - Utility.RemoveFeatureFromName(globeControl1, "trackPolygon"); + FeatureTools.RemoveFeatureFromName(globeControl1, "trackPolygon"); globeControl1.Globe.Action = EnumAction3D.TrackPolygon; globeControl1.Globe.TrackPolygonTool.TrackMode = EnumTrackMode.SpaceTrack; globeControl1.TrackPolygonEndEvent += globeControl1_TrackPolygonEndEvent; @@ -422,7 +422,7 @@ globeControl1.Globe.Action = EnumAction3D.ActionNull; globeControl1.TrackPolygonEndEvent -= globeControl1_TrackPolygonEndEvent; - Utility.RemoveFeatureFromName(globeControl1, "trackPolygon"); + FeatureTools.RemoveFeatureFromName(globeControl1, "trackPolygon"); globeControl1.Globe.MemoryLayer.RemoveAllFeature(); } diff --git a/LineBuilder.cs b/LineBuilder.cs index 33a216c..b6a8516 100644 --- a/LineBuilder.cs +++ b/LineBuilder.cs @@ -43,8 +43,8 @@ GSOGeoPolyline3D lineeee = f.Geometry as GSOGeoPolyline3D; if (lineeee == null || lineeee.GetSpaceLength(true, 6378137) == 0) { - LogHelper.WriteLog(typeof(LineBuilder), "出现数据无法入库:"+f.ID); - continue; //TODO LIST:判断是否会出现部署数据无法入库情况,Log2Net + LogHelper.Error("出现数据无法入库:" + f.ID); + continue; } GSOFeature newFeature = newFeatureSet.CreateFeature(); diff --git a/LogHelper.cs b/LogHelper.cs index 9ef5f27..04573cf 100644 --- a/LogHelper.cs +++ b/LogHelper.cs @@ -1,4 +1,5 @@ using System; +using System.Diagnostics; using log4net; using log4net.Config; @@ -7,35 +8,82 @@ { public class LogHelper { - /// - /// 输出日志到Log4Net - /// - /// - /// - #region static void WriteLog(Type t, Exception ex) - public static void WriteLog(Type t, Exception ex) + private static ILog _logdebug = log4net.LogManager.GetLogger("logdebug"); + private static ILog _loginfo = log4net.LogManager.GetLogger("loginfo"); + private static ILog _logwarn = log4net.LogManager.GetLogger("logwarn"); + private static ILog _logerror = log4net.LogManager.GetLogger("logerror"); + private static ILog _logfatal = log4net.LogManager.GetLogger("logfatal"); + + public static void Debug(string msg) { - ILog log = log4net.LogManager.GetLogger(t); - log.Error("Error", ex); + StackFrame sf = new StackFrame(1); + msg = string.Format("{0}.{1}:{2}", sf.GetMethod().ReflectedType.FullName, sf.GetMethod().Name, msg); + _logdebug.Debug(msg); + } + public static void Debug(string msg, Exception e) + { + StackFrame sf = new StackFrame(1); + msg = string.Format("{0}.{1}:{2}", sf.GetMethod().ReflectedType.FullName, sf.GetMethod().Name, msg); + _logdebug.Debug(msg, e); } - #endregion - /// - /// 输出日志到Log4Net - /// - /// - /// - #region static void WriteLog(Type t, string msg) - - public static void WriteLog(Type t, string msg) + public static void Info(string msg) { - ILog log = log4net.LogManager.GetLogger(t); - log.Error(msg); + StackFrame sf = new StackFrame(1); + msg = string.Format("{0}.{1}:{2}", sf.GetMethod().ReflectedType.FullName, sf.GetMethod().Name, msg); + _loginfo.Info(msg); + } + public static void Info(string msg, Exception e) + { + StackFrame sf = new StackFrame(1); + msg = string.Format("{0}.{1}:{2}", sf.GetMethod().ReflectedType.FullName, sf.GetMethod().Name, msg); + _loginfo.Info(msg, e); } - #endregion + + public static void Warn(string msg) + { + StackFrame sf = new StackFrame(1); + msg = string.Format("{0}.{1}:{2}", sf.GetMethod().ReflectedType.FullName, sf.GetMethod().Name, msg); + _logwarn.Warn(msg); + } + public static void Warn(string msg, Exception e) + { + StackFrame sf = new StackFrame(1); + msg = string.Format("{0}.{1}:{2}", sf.GetMethod().ReflectedType.FullName, sf.GetMethod().Name, msg); + _logwarn.Warn(msg, e); + } + + + public static void Error(string msg) + { + StackFrame sf = new StackFrame(1); + msg = string.Format("{0}.{1}:{2}", sf.GetMethod().ReflectedType.FullName, sf.GetMethod().Name, msg); + _logerror.Error(msg); + } + public static void Error(string msg, Exception e) + { + StackFrame sf = new StackFrame(1); + msg = string.Format("{0}.{1}:{2}", sf.GetMethod().ReflectedType.FullName, sf.GetMethod().Name, msg); + _logerror.Error(msg, e); + } + + + public static void Fatal(string msg) + { + StackFrame sf = new StackFrame(1); + msg = string.Format("{0}.{1}:{2}", sf.GetMethod().ReflectedType.FullName, sf.GetMethod().Name, msg); + _logfatal.Fatal(msg); + } + public static void Fatal(string msg, Exception e) + { + StackFrame sf = new StackFrame(1); + msg = string.Format("{0}.{1}:{2}", sf.GetMethod().ReflectedType.FullName, sf.GetMethod().Name, msg); + _logfatal.Fatal(msg, e); + } + } diff --git a/MainFrm.cs b/MainFrm.cs index 43de664..51f362a 100644 --- a/MainFrm.cs +++ b/MainFrm.cs @@ -18,7 +18,6 @@ using GeoScene.Data; using GeoScene.Engine; using GeoScene.Globe; -using Timer = System.Windows.Forms.Timer; using ToolTip = System.Windows.Forms.ToolTip; namespace Cyberpipe @@ -163,6 +162,7 @@ /// private void AddGZ() { + lendendGZ50 = new GSOHudButton(); lendendGZ50.SetImage(Application.StartupPath + "/Resource/管纵/50.png"); lendendGZ50.SetOffset(0, 0); @@ -1294,18 +1294,19 @@ private void MainFrm_Load(object sender, EventArgs e) { + layerTree.Nodes.Add("正在加载，请稍后……");//树状图加载在图层加载之后，故增加提示 initGlobalControl(); - //initGlobalMap(); - //initLayerTree(); initMarkerTree(); initLayout(); loadData(); - double x = Convert.ToDouble(Utility.Query_Roads["定位"].ToString().Split(',')[0]); - double y = Convert.ToDouble(Utility.Query_Roads["定位"].ToString().Split(',')[1]); - double z = Convert.ToDouble(Utility.Query_Roads["定位"].ToString().Split(',')[2]); + + double x = Convert.ToDouble(Utility.Query_Roads["绿岛"].ToString().Split(',')[0]); + double y = Convert.ToDouble(Utility.Query_Roads["绿岛"].ToString().Split(',')[1]); + double z = Convert.ToDouble(Utility.Query_Roads["绿岛"].ToString().Split(',')[2]); jumpToCameraState(x, y, z); + } #endregion @@ -1315,11 +1316,17 @@ if (e.Layer == null || !e.Layer.Caption.Equals(Utility.roadLayerName)) return; foreach (TreeNode layerTreeNode in layerTree.Nodes) { - foreach (TreeNode node in layerTreeNode.Nodes) + for (int i=0;i dt, DataGridView dataGridView) @@ -7330,7 +7337,7 @@ } catch (Exception ex) { - LogHelper.WriteLog(typeof(MainFrm), ex); + LogHelper.Debug("", ex); } } } @@ -7362,7 +7369,7 @@ GSOLayer layer = globeControl1.Globe.Layers.Add(strDataPath); if (layer == null) {//wxl - LogHelper.WriteLog(typeof(MainFrm), "buttonItemHX1_Click操作中，" + strDataPath + "的layer为空"); + LogHelper.Error("buttonItemHX1_Click操作中，" + strDataPath + "的layer为空"); continue; } GSOFeatures redFeatures = layer.GetAllFeatures(); @@ -7457,17 +7464,12 @@ { try { + globeControl1.BeforeSceneRenderEvent -= globeControl1_BeforeSceneRenderEvent; globeControl2.BeforeSceneRenderEvent -= globeControl2_BeforeSceneRenderEvent; - double x = Convert.ToDouble(Utility.Query_Roads["定位"].ToString().Split(',')[0]); - double y = Convert.ToDouble(Utility.Query_Roads["定位"].ToString().Split(',')[1]); - double z = Convert.ToDouble(Utility.Query_Roads["定位"].ToString().Split(',')[2]); - jumpToCameraState(x, y, z); - /* globeControl1.Globe.FlyToPosition(new GSOPoint3d(120.610963, 31.188121, 50), EnumAltitudeMode.Absolute, -4, 50, 800); globeControl1.Globe.FlyToPointSpeed = 10000000; - * */ globeControl1.Globe.Action = EnumAction3D.SelectObject; globeControl1.Refresh(); @@ -7489,6 +7491,37 @@ } } /// + /// 基础工具 + /// + /// + /// + private void ribbonTabItem1_MouseDown(object sender, MouseEventArgs e) + { + try + { + + globeControl1.BeforeSceneRenderEvent -= globeControl1_BeforeSceneRenderEvent; + globeControl2.BeforeSceneRenderEvent -= globeControl2_BeforeSceneRenderEvent; + + globeControl1.Globe.Action = EnumAction3D.ActionNull; + dataGridViewX1.AutoSizeColumnsMode = DataGridViewAutoSizeColumnsMode.AllCells; + //zhanshi = false; + redSH = false; + splitContainer1.Panel2Collapsed = true; + panelOfTable.Visible = false; + legendSC.Visible = false; + legendSG.Visible = false; + ClearGZData(); + GSOLayer redLayer = globeControl1.Globe.Layers.GetLayerByCaption("红线"); + if (redLayer == null) return; + redLayer.Visible = false; + } + catch (Exception ex) + { + //MessageBox.Show("系统运行错误:" + ex.ToString(), "错误", MessageBoxButtons.OK, MessageBoxIcon.Error); + } + } + /// /// 一键审核 /// /// @@ -7497,6 +7530,7 @@ { try { + globeControl1.BeforeSceneRenderEvent -= globeControl1_BeforeSceneRenderEvent; globeControl2.BeforeSceneRenderEvent -= globeControl2_BeforeSceneRenderEvent; @@ -7518,32 +7552,7 @@ //MessageBox.Show("系统运行错误:" + ex.ToString(), "错误", MessageBoxButtons.OK, MessageBoxIcon.Error); } } - - void ResetRibbonTab() - { - try - { - globeControl1.BeforeSceneRenderEvent -= globeControl1_BeforeSceneRenderEvent; - globeControl2.BeforeSceneRenderEvent -= globeControl2_BeforeSceneRenderEvent; - - globeControl1.Globe.Action = EnumAction3D.ActionNull; - dataGridViewX1.AutoSizeColumnsMode = DataGridViewAutoSizeColumnsMode.AllCells; - //zhanshi = false; - redSH = false; - splitContainer1.Panel2Collapsed = true; - panelOfTable.Visible = false; - legendSC.Visible = false; - legendSG.Visible = false; - ClearGZData(); - GSOLayer redLayer = globeControl1.Globe.Layers.GetLayerByCaption("红线"); - if (redLayer == null) return; - redLayer.Visible = false; - } - catch (Exception ex) - { - LogHelper.WriteLog(typeof(MainFrm), ex); - } - } + /// /// 双屏对比 /// @@ -7553,8 +7562,8 @@ { try { - globeControl1.BeforeSceneRenderEvent += new BeforeSceneRenderEventHandler(globeControl1_BeforeSceneRenderEvent); - globeControl2.BeforeSceneRenderEvent += new BeforeSceneRenderEventHandler(globeControl2_BeforeSceneRenderEvent); + globeControl1.BeforeSceneRenderEvent += globeControl1_BeforeSceneRenderEvent; + globeControl2.BeforeSceneRenderEvent += globeControl2_BeforeSceneRenderEvent; globeControl1.Globe.Action = EnumAction3D.ActionNull; panelOfTable.Visible = false; @@ -7570,32 +7579,43 @@ GSOLayer redLayer = globeControl1.Globe.Layers.GetLayerByCaption("红线"); if (redLayer != null) - { redLayer.Visible = false; - } } catch (Exception ex) { - LogHelper.WriteLog(typeof(MainFrm), ex); + //MessageBox.Show("系统运行错误:" + ex.ToString(), "错误", MessageBoxButtons.OK, MessageBoxIcon.Error); } } /// - /// 基础工具 - /// - /// - /// - private void ribbonTabItem1_MouseDown(object sender, MouseEventArgs e) - { - ResetRibbonTab(); - } - /// /// 文档管理 /// /// /// private void ribbonTabItem4_MouseDown(object sender, MouseEventArgs e) { - ResetRibbonTab(); + try + { + + globeControl1.BeforeSceneRenderEvent -= globeControl1_BeforeSceneRenderEvent; + globeControl2.BeforeSceneRenderEvent -= globeControl2_BeforeSceneRenderEvent; + + globeControl1.Globe.Action = EnumAction3D.ActionNull; + panelOfTable.Visible = false; + //zhanshi = false; + redSH = false; + splitContainer1.Panel2Collapsed = true; + dataGridViewX1.AutoSizeColumnsMode = DataGridViewAutoSizeColumnsMode.AllCells; + legendSC.Visible = false; + legendSG.Visible = false; + ClearGZData(); + GSOLayer redLayer = globeControl1.Globe.Layers.GetLayerByCaption("红线"); + if (redLayer != null) + redLayer.Visible = false; + } + catch (Exception ex) + { + //MessageBox.Show("系统运行错误:" + ex.ToString(), "错误", MessageBoxButtons.OK, MessageBoxIcon.Error); + } } /// /// 基础管理 @@ -7604,7 +7624,29 @@ /// private void ribbonTabItem14_MouseDown(object sender, MouseEventArgs e) { - ResetRibbonTab(); + try + { + globeControl1.BeforeSceneRenderEvent -= globeControl1_BeforeSceneRenderEvent; + globeControl2.BeforeSceneRenderEvent -= globeControl2_BeforeSceneRenderEvent; + + globeControl1.Globe.Action = EnumAction3D.ActionNull; + panelOfTable.Visible = false; + //zhanshi = false; + redSH = false; + splitContainer1.Panel2Collapsed = true; + dataGridViewX1.AutoSizeColumnsMode = DataGridViewAutoSizeColumnsMode.AllCells; + legendSC.Visible = false; + legendSG.Visible = false; + ClearGZData(); + + GSOLayer redLayer = globeControl1.Globe.Layers.GetLayerByCaption("红线"); + if (redLayer != null) + redLayer.Visible = false; + } + catch (Exception ex) + { + //MessageBox.Show("系统运行错误:" + ex.ToString(), "错误", MessageBoxButtons.OK, MessageBoxIcon.Error); + } } /// /// 权限管理 @@ -7613,26 +7655,31 @@ /// private void ribbonTabItem2_MouseDown(object sender, MouseEventArgs e) { - ResetRibbonTab(); + try + { + globeControl1.BeforeSceneRenderEvent -= globeControl1_BeforeSceneRenderEvent; + globeControl2.BeforeSceneRenderEvent -= globeControl2_BeforeSceneRenderEvent; + + globeControl1.Globe.Action = EnumAction3D.ActionNull; + panelOfTable.Visible = false; + //zhanshi = false; + redSH = false; + splitContainer1.Panel2Collapsed = true; + dataGridViewX1.AutoSizeColumnsMode = DataGridViewAutoSizeColumnsMode.AllCells; + legendSC.Visible = false; + legendSG.Visible = false; + ClearGZData(); + + GSOLayer redLayer = globeControl1.Globe.Layers.GetLayerByCaption("红线"); + if (redLayer == null) return; + redLayer.Visible = false; + } + catch (Exception ex) + { + //MessageBox.Show("系统运行错误:" + ex.ToString(), "错误", MessageBoxButtons.OK, MessageBoxIcon.Error); + } } - /// - /// 管线定位 - /// - /// - /// - private void ribbonTabItem7_MouseDown(object sender, MouseEventArgs e) - { - ResetRibbonTab(); - } - /// - /// 标识器管理 - /// - /// - /// - private void ribbonTabItem5_MouseDown(object sender, MouseEventArgs e) - { - ResetRibbonTab(); - } + //GSOFeature dpFeatuer = null; /// /// 双屏分析，点击管段分析 @@ -8017,7 +8064,9 @@ private void btn_flag_Click(object sender, EventArgs e) { if (FrmFlagManagers.IS_OPEN) + { return; + } FrmFlagManagers frm = new FrmFlagManagers(globeControl1); frm.Show(this); } diff --git a/MainFrm.designer.cs b/MainFrm.designer.cs index e3dca41..73398c0 100644 --- a/MainFrm.designer.cs +++ b/MainFrm.designer.cs @@ -4,6 +4,7 @@ using DevComponents.DotNetBar; using DevComponents.DotNetBar.Controls; using DevComponents.Editors; +using System.Drawing; namespace Cyberpipe { @@ -89,6 +90,7 @@ this.sideBar1 = new DevComponents.DotNetBar.SideBar(); this.panelEx3 = new DevComponents.DotNetBar.PanelEx(); this.layerSensorTree = new System.Windows.Forms.TreeView(); + this.layerTree = new Cyberpipe.MyTreeView(); this.sideBarPanelItem3 = new DevComponents.DotNetBar.SideBarPanelItem(); this.controlContainerItem3 = new DevComponents.DotNetBar.ControlContainerItem(); this.sideBarPanelItem4 = new DevComponents.DotNetBar.SideBarPanelItem(); @@ -243,42 +245,18 @@ this.保存ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.定位ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.ribbonControl1 = new DevComponents.DotNetBar.RibbonControl(); - this.ribbonPanel6 = new DevComponents.DotNetBar.RibbonPanel(); - this.ribbonBar6 = new DevComponents.DotNetBar.RibbonBar(); - this.buttonItemSPSZ = new DevComponents.DotNetBar.ButtonItem(); - this.buttonItem8 = new DevComponents.DotNetBar.ButtonItem(); - this.buttonItemLocation = new DevComponents.DotNetBar.ButtonItem(); - this.sliderItem2 = new DevComponents.DotNetBar.SliderItem(); - this.buttonItemGBJC = new DevComponents.DotNetBar.ButtonItem(); - this.ribbonPanel5 = new DevComponents.DotNetBar.RibbonPanel(); - this.ribbonBar2 = new DevComponents.DotNetBar.RibbonBar(); - this.buttonItemHX1 = new DevComponents.DotNetBar.ButtonItem(); - this.buttonItemHX2 = new DevComponents.DotNetBar.ButtonItem(); - this.buttonItemDCTP = new DevComponents.DotNetBar.ButtonItem(); - this.sliderItem3 = new DevComponents.DotNetBar.SliderItem(); - this.ribbonPanel1 = new DevComponents.DotNetBar.RibbonPanel(); - this.ribbonBar21 = new DevComponents.DotNetBar.RibbonBar(); - this.buttonItem87 = new DevComponents.DotNetBar.ButtonItem(); - this.buttonItem88 = new DevComponents.DotNetBar.ButtonItem(); - this.buttonItem27 = new DevComponents.DotNetBar.ButtonItem(); - this.buttonItem91 = new DevComponents.DotNetBar.ButtonItem(); - this.buttonItem1 = new DevComponents.DotNetBar.ButtonItem(); - this.btnlegendSet = new DevComponents.DotNetBar.ButtonItem(); - this.buttonItem89 = new DevComponents.DotNetBar.ButtonItem(); - this.btnOutputJPG = new DevComponents.DotNetBar.ButtonItem(); - this.ribbonPanel12 = new DevComponents.DotNetBar.RibbonPanel(); - this.ribbonBar18 = new DevComponents.DotNetBar.RibbonBar(); - this.buttonItem133 = new DevComponents.DotNetBar.ButtonItem(); - this.ribbonBar13 = new DevComponents.DotNetBar.RibbonBar(); - this.buttonItem127 = new DevComponents.DotNetBar.ButtonItem(); - this.buttonItem128 = new DevComponents.DotNetBar.ButtonItem(); - this.sliderItem1 = new DevComponents.DotNetBar.SliderItem(); - this.buttonItem134 = new DevComponents.DotNetBar.ButtonItem(); - this.buttonItem130 = new DevComponents.DotNetBar.ButtonItem(); - this.btn_check_history = new DevComponents.DotNetBar.ButtonItem(); - this.ribbonPanel4 = new DevComponents.DotNetBar.RibbonPanel(); - this.ribbonBar1 = new DevComponents.DotNetBar.RibbonBar(); - this.btn_document_info = new DevComponents.DotNetBar.ButtonItem(); + this.ribbonPanel3 = new DevComponents.DotNetBar.RibbonPanel(); + this.ribbonBar4 = new DevComponents.DotNetBar.RibbonBar(); + this.btn_flag = new DevComponents.DotNetBar.ButtonItem(); + this.slider4ground = new DevComponents.DotNetBar.SliderItem(); + this.ribbonPanel7 = new DevComponents.DotNetBar.RibbonPanel(); + this.gxdw_ribbonbar = new DevComponents.DotNetBar.RibbonBar(); + this.buttonItem9 = new DevComponents.DotNetBar.ButtonItem(); + this.buttonItem10 = new DevComponents.DotNetBar.ButtonItem(); + this.buttonItem11 = new DevComponents.DotNetBar.ButtonItem(); + this.buttonItem12 = new DevComponents.DotNetBar.ButtonItem(); + this.buttonItem13 = new DevComponents.DotNetBar.ButtonItem(); + this.buttonItem14 = new DevComponents.DotNetBar.ButtonItem(); this.ribbonPanel15 = new DevComponents.DotNetBar.RibbonPanel(); this.ribbonBar20 = new DevComponents.DotNetBar.RibbonBar(); this.buttonItemSH = new DevComponents.DotNetBar.ButtonItem(); @@ -334,18 +312,6 @@ this.buttonItemXT4 = new DevComponents.DotNetBar.ButtonItem(); this.buttonItemXT4_1 = new DevComponents.DotNetBar.ButtonItem(); this.buttonItemXT4_2 = new DevComponents.DotNetBar.ButtonItem(); - this.ribbonPanel3 = new DevComponents.DotNetBar.RibbonPanel(); - this.ribbonBar4 = new DevComponents.DotNetBar.RibbonBar(); - this.btn_flag = new DevComponents.DotNetBar.ButtonItem(); - this.slider4ground = new DevComponents.DotNetBar.SliderItem(); - this.ribbonPanel7 = new DevComponents.DotNetBar.RibbonPanel(); - this.gxdw_ribbonbar = new DevComponents.DotNetBar.RibbonBar(); - this.buttonItem9 = new DevComponents.DotNetBar.ButtonItem(); - this.buttonItem10 = new DevComponents.DotNetBar.ButtonItem(); - this.buttonItem11 = new DevComponents.DotNetBar.ButtonItem(); - this.buttonItem12 = new DevComponents.DotNetBar.ButtonItem(); - this.buttonItem13 = new DevComponents.DotNetBar.ButtonItem(); - this.buttonItem14 = new DevComponents.DotNetBar.ButtonItem(); this.ribbonPanel2 = new DevComponents.DotNetBar.RibbonPanel(); this.ribbonBar3 = new DevComponents.DotNetBar.RibbonBar(); this.btn_user_info = new DevComponents.DotNetBar.ButtonItem(); @@ -355,6 +321,43 @@ this.btn_user_role = new DevComponents.DotNetBar.ButtonItem(); this.btn_password_edit = new DevComponents.DotNetBar.ButtonItem(); this.buttonItemPasswordReset = new DevComponents.DotNetBar.ButtonItem(); + this.ribbonPanel6 = new DevComponents.DotNetBar.RibbonPanel(); + this.ribbonBar6 = new DevComponents.DotNetBar.RibbonBar(); + this.buttonItemSPSZ = new DevComponents.DotNetBar.ButtonItem(); + this.buttonItem8 = new DevComponents.DotNetBar.ButtonItem(); + this.buttonItemLocation = new DevComponents.DotNetBar.ButtonItem(); + this.sliderItem2 = new DevComponents.DotNetBar.SliderItem(); + this.buttonItemGBJC = new DevComponents.DotNetBar.ButtonItem(); + this.ribbonPanel5 = new DevComponents.DotNetBar.RibbonPanel(); + this.ribbonBar2 = new DevComponents.DotNetBar.RibbonBar(); + this.buttonItemHX1 = new DevComponents.DotNetBar.ButtonItem(); + this.buttonItemHX2 = new DevComponents.DotNetBar.ButtonItem(); + this.buttonItemDCTP = new DevComponents.DotNetBar.ButtonItem(); + this.sliderItem3 = new DevComponents.DotNetBar.SliderItem(); + this.ribbonPanel1 = new DevComponents.DotNetBar.RibbonPanel(); + this.ribbonBar21 = new DevComponents.DotNetBar.RibbonBar(); + this.buttonItem87 = new DevComponents.DotNetBar.ButtonItem(); + this.buttonItem88 = new DevComponents.DotNetBar.ButtonItem(); + this.buttonItem27 = new DevComponents.DotNetBar.ButtonItem(); + this.buttonItem91 = new DevComponents.DotNetBar.ButtonItem(); + this.buttonItem1 = new DevComponents.DotNetBar.ButtonItem(); + this.btnlegendSet = new DevComponents.DotNetBar.ButtonItem(); + this.buttonItem89 = new DevComponents.DotNetBar.ButtonItem(); + this.btnOutputJPG = new DevComponents.DotNetBar.ButtonItem(); + this.ribbonPanel12 = new DevComponents.DotNetBar.RibbonPanel(); + this.ribbonBar18 = new DevComponents.DotNetBar.RibbonBar(); + this.buttonItem133 = new DevComponents.DotNetBar.ButtonItem(); + this.buttonItem132 = new DevComponents.DotNetBar.ButtonItem(); + this.ribbonBar13 = new DevComponents.DotNetBar.RibbonBar(); + this.buttonItem127 = new DevComponents.DotNetBar.ButtonItem(); + this.buttonItem128 = new DevComponents.DotNetBar.ButtonItem(); + this.sliderItem1 = new DevComponents.DotNetBar.SliderItem(); + this.buttonItem134 = new DevComponents.DotNetBar.ButtonItem(); + this.buttonItem130 = new DevComponents.DotNetBar.ButtonItem(); + this.btn_check_history = new DevComponents.DotNetBar.ButtonItem(); + this.ribbonPanel4 = new DevComponents.DotNetBar.RibbonPanel(); + this.ribbonBar1 = new DevComponents.DotNetBar.RibbonBar(); + this.btn_document_info = new DevComponents.DotNetBar.ButtonItem(); this.ribbonTabItem1 = new DevComponents.DotNetBar.RibbonTabItem(); this.ribbonTabItem11 = new DevComponents.DotNetBar.RibbonTabItem(); this.ribbonTabItem6 = new DevComponents.DotNetBar.RibbonTabItem(); @@ -516,7 +519,6 @@ this.labelX17 = new DevComponents.DotNetBar.LabelX(); this.panelEx4 = new DevComponents.DotNetBar.PanelEx(); this.pictureBox1 = new System.Windows.Forms.PictureBox(); - this.layerTree = new Cyberpipe.MyTreeView(); this.statusStrip1.SuspendLayout(); this.sideBar1.SuspendLayout(); this.panelEx3.SuspendLayout(); @@ -527,15 +529,15 @@ this.contextMenuStrip3.SuspendLayout(); this.contextMenuStripDeleteLayerNode.SuspendLayout(); this.ribbonControl1.SuspendLayout(); + this.ribbonPanel3.SuspendLayout(); + this.ribbonPanel7.SuspendLayout(); + this.ribbonPanel15.SuspendLayout(); + this.ribbonPanel2.SuspendLayout(); this.ribbonPanel6.SuspendLayout(); this.ribbonPanel5.SuspendLayout(); this.ribbonPanel1.SuspendLayout(); this.ribbonPanel12.SuspendLayout(); this.ribbonPanel4.SuspendLayout(); - this.ribbonPanel15.SuspendLayout(); - this.ribbonPanel3.SuspendLayout(); - this.ribbonPanel7.SuspendLayout(); - this.ribbonPanel2.SuspendLayout(); this.panelOfTable.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.dataGridViewX1)).BeginInit(); this.statusStrip2.SuspendLayout(); @@ -711,7 +713,8 @@ this.statusLabel.Name = "statusLabel"; this.statusLabel.Size = new System.Drawing.Size(1313, 17); this.statusLabel.Spring = true; - this.statusLabel.Text = " ©2014-2015 苏州航天系统工程有限公司 版权所有"; + this.statusLabel.Text = Utility.Copyright; +// this.statusLabel.Text = " ©2014-2015 苏州航天系统工程有限公司 版权所有"; // // toolStripDropDownButton1 // @@ -956,6 +959,18 @@ this.layerSensorTree.NodeMouseClick += new System.Windows.Forms.TreeNodeMouseClickEventHandler(this.layerMarkerTree_NodeMouseClick); this.layerSensorTree.NodeMouseDoubleClick += new System.Windows.Forms.TreeNodeMouseClickEventHandler(this.layerTree_NodeMouseDoubleClick); // + // layerTree + // + this.layerTree.CheckBoxes = true; + this.layerTree.ItemHeight = 18; + this.layerTree.Location = new System.Drawing.Point(30, 78); + this.layerTree.Name = "layerTree"; + this.layerTree.Size = new System.Drawing.Size(121, 97); + this.layerTree.TabIndex = 1; + this.layerTree.AfterCheck += new System.Windows.Forms.TreeViewEventHandler(this.layerTree_AfterCheck); + this.layerTree.NodeMouseClick += new System.Windows.Forms.TreeNodeMouseClickEventHandler(this.layerTree_NodeMouseClick); + this.layerTree.NodeMouseDoubleClick += new System.Windows.Forms.TreeNodeMouseClickEventHandler(this.layerTree_NodeMouseDoubleClick); + // // sideBarPanelItem3 // this.sideBarPanelItem3.FontBold = true; @@ -2150,13 +2165,13 @@ this.ribbonControl1.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.ribbonControl1.Controls.Add(this.ribbonPanel3); this.ribbonControl1.Controls.Add(this.ribbonPanel7); - this.ribbonControl1.Controls.Add(this.ribbonPanel2); this.ribbonControl1.Controls.Add(this.ribbonPanel15); - this.ribbonControl1.Controls.Add(this.ribbonPanel4); - this.ribbonControl1.Controls.Add(this.ribbonPanel1); + this.ribbonControl1.Controls.Add(this.ribbonPanel2); this.ribbonControl1.Controls.Add(this.ribbonPanel6); - this.ribbonControl1.Controls.Add(this.ribbonPanel12); this.ribbonControl1.Controls.Add(this.ribbonPanel5); + this.ribbonControl1.Controls.Add(this.ribbonPanel1); + this.ribbonControl1.Controls.Add(this.ribbonPanel12); + this.ribbonControl1.Controls.Add(this.ribbonPanel4); this.ribbonControl1.Dock = System.Windows.Forms.DockStyle.Top; this.ribbonControl1.ImeMode = System.Windows.Forms.ImeMode.NoControl; this.ribbonControl1.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { @@ -2200,609 +2215,216 @@ this.ribbonControl1.Text = "ribbonControl1"; this.ribbonControl1.UseCustomizeDialog = false; // - // ribbonPanel6 + // ribbonPanel3 // - this.ribbonPanel6.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.ribbonPanel6.Controls.Add(this.ribbonBar6); - this.ribbonPanel6.Dock = System.Windows.Forms.DockStyle.Fill; - this.ribbonPanel6.Location = new System.Drawing.Point(0, 0); - this.ribbonPanel6.Name = "ribbonPanel6"; - this.ribbonPanel6.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); - this.ribbonPanel6.Size = new System.Drawing.Size(1328, 95); + this.ribbonPanel3.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.ribbonPanel3.Controls.Add(this.ribbonBar4); + this.ribbonPanel3.Dock = System.Windows.Forms.DockStyle.Fill; + this.ribbonPanel3.Location = new System.Drawing.Point(0, 33); + this.ribbonPanel3.Name = "ribbonPanel3"; + this.ribbonPanel3.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); + this.ribbonPanel3.Size = new System.Drawing.Size(1328, 62); // // // - this.ribbonPanel6.Style.Class = ""; - this.ribbonPanel6.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonPanel3.Style.Class = ""; + this.ribbonPanel3.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; // // // - this.ribbonPanel6.StyleMouseDown.Class = ""; - this.ribbonPanel6.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonPanel3.StyleMouseDown.Class = ""; + this.ribbonPanel3.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; // // // - this.ribbonPanel6.StyleMouseOver.Class = ""; - this.ribbonPanel6.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonPanel6.TabIndex = 38; - this.ribbonPanel6.Visible = false; + this.ribbonPanel3.StyleMouseOver.Class = ""; + this.ribbonPanel3.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonPanel3.TabIndex = 40; // - // ribbonBar6 + // ribbonBar4 // - this.ribbonBar6.AutoOverflowEnabled = true; + this.ribbonBar4.AutoOverflowEnabled = true; // // // - this.ribbonBar6.BackgroundMouseOverStyle.Class = ""; - this.ribbonBar6.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar4.BackgroundMouseOverStyle.Class = ""; + this.ribbonBar4.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; // // // - this.ribbonBar6.BackgroundStyle.Class = ""; - this.ribbonBar6.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonBar6.ContainerControlProcessDialogKey = true; - this.ribbonBar6.Dock = System.Windows.Forms.DockStyle.Left; - this.ribbonBar6.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { - this.buttonItemSPSZ, - this.buttonItem8, - this.buttonItemLocation, - this.sliderItem2, - this.buttonItemGBJC}); - this.ribbonBar6.Location = new System.Drawing.Point(3, 0); - this.ribbonBar6.Name = "ribbonBar6"; - this.ribbonBar6.Size = new System.Drawing.Size(427, 92); - this.ribbonBar6.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.ribbonBar6.TabIndex = 0; + this.ribbonBar4.BackgroundStyle.Class = ""; + this.ribbonBar4.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar4.ContainerControlProcessDialogKey = true; + this.ribbonBar4.Dock = System.Windows.Forms.DockStyle.Left; + this.ribbonBar4.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { + this.btn_flag, + this.slider4ground}); + this.ribbonBar4.Location = new System.Drawing.Point(3, 0); + this.ribbonBar4.Name = "ribbonBar4"; + this.ribbonBar4.Size = new System.Drawing.Size(634, 59); + this.ribbonBar4.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.ribbonBar4.TabIndex = 0; // // // - this.ribbonBar6.TitleStyle.Class = ""; - this.ribbonBar6.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar4.TitleStyle.Class = ""; + this.ribbonBar4.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; // // // - this.ribbonBar6.TitleStyleMouseOver.Class = ""; - this.ribbonBar6.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonBar6.TitleVisible = false; + this.ribbonBar4.TitleStyleMouseOver.Class = ""; + this.ribbonBar4.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar4.TitleVisible = false; // - // buttonItemSPSZ + // btn_flag // - this.buttonItemSPSZ.Image = ((System.Drawing.Image)(resources.GetObject("buttonItemSPSZ.Image"))); - this.buttonItemSPSZ.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItemSPSZ.Name = "buttonItemSPSZ"; - this.buttonItemSPSZ.SubItemsExpandWidth = 14; - this.buttonItemSPSZ.Text = "双屏设置"; - this.buttonItemSPSZ.Click += new System.EventHandler(this.buttonItemSPSZ_Click); + this.btn_flag.Image = global::Cyberpipe.Properties.Resources._24x24icon_03_hover; + this.btn_flag.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.btn_flag.Name = "btn_flag"; + this.btn_flag.SubItemsExpandWidth = 14; + this.btn_flag.Text = "标识器管理"; + this.btn_flag.Click += new System.EventHandler(this.btn_flag_Click); // - // buttonItem8 + // slider4ground // - this.buttonItem8.Image = ((System.Drawing.Image)(resources.GetObject("buttonItem8.Image"))); - this.buttonItem8.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem8.Name = "buttonItem8"; - this.buttonItem8.SubItemsExpandWidth = 14; - this.buttonItem8.Text = "双屏分析"; - this.buttonItem8.Click += new System.EventHandler(this.buttonItem8_Click); + this.slider4ground.LabelPosition = DevComponents.DotNetBar.eSliderLabelPosition.Top; + this.slider4ground.LabelWidth = 50; + this.slider4ground.Name = "slider4ground"; + this.slider4ground.Text = "地面透明度"; + this.slider4ground.TextColor = System.Drawing.Color.Black; + this.slider4ground.Value = 0; + this.slider4ground.ValueChanged += new System.EventHandler(this.slider4ground_ValueChanged); // - // buttonItemLocation + // ribbonPanel7 // - this.buttonItemLocation.Image = ((System.Drawing.Image)(resources.GetObject("buttonItemLocation.Image"))); - this.buttonItemLocation.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItemLocation.Name = "buttonItemLocation"; - this.buttonItemLocation.SubItemsExpandWidth = 14; - this.buttonItemLocation.Text = "快速定位"; - this.buttonItemLocation.Click += new System.EventHandler(this.buttonItemLocation_Click); + this.ribbonPanel7.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.ribbonPanel7.Controls.Add(this.gxdw_ribbonbar); + this.ribbonPanel7.Dock = System.Windows.Forms.DockStyle.Fill; + this.ribbonPanel7.Location = new System.Drawing.Point(0, 33); + this.ribbonPanel7.Name = "ribbonPanel7"; + this.ribbonPanel7.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); + this.ribbonPanel7.Size = new System.Drawing.Size(1328, 62); // - // sliderItem2 // - this.sliderItem2.LabelPosition = DevComponents.DotNetBar.eSliderLabelPosition.Top; - this.sliderItem2.LabelWidth = 50; - this.sliderItem2.Name = "sliderItem2"; - this.sliderItem2.Text = "地面透明度"; - this.sliderItem2.TextColor = System.Drawing.Color.Black; - this.sliderItem2.Value = 0; - this.sliderItem2.ValueChanged += new System.EventHandler(this.sliderItem2_ValueChanged); // - // buttonItemGBJC + this.ribbonPanel7.Style.Class = ""; + this.ribbonPanel7.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; // - this.buttonItemGBJC.Image = ((System.Drawing.Image)(resources.GetObject("buttonItemGBJC.Image"))); - this.buttonItemGBJC.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItemGBJC.Name = "buttonItemGBJC"; - this.buttonItemGBJC.SubItemsExpandWidth = 14; - this.buttonItemGBJC.Text = "国标检测"; - this.buttonItemGBJC.Click += new System.EventHandler(this.buttonItemGBJC_Click); // - // ribbonPanel5 // - this.ribbonPanel5.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.ribbonPanel5.Controls.Add(this.ribbonBar2); - this.ribbonPanel5.Dock = System.Windows.Forms.DockStyle.Fill; - this.ribbonPanel5.Location = new System.Drawing.Point(0, 0); - this.ribbonPanel5.Name = "ribbonPanel5"; - this.ribbonPanel5.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); - this.ribbonPanel5.Size = new System.Drawing.Size(1328, 95); + this.ribbonPanel7.StyleMouseDown.Class = ""; + this.ribbonPanel7.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; // // // - this.ribbonPanel5.Style.Class = ""; - this.ribbonPanel5.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonPanel7.StyleMouseOver.Class = ""; + this.ribbonPanel7.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonPanel7.TabIndex = 41; + this.ribbonPanel7.Visible = false; // + // gxdw_ribbonbar // + this.gxdw_ribbonbar.AutoOverflowEnabled = true; // - this.ribbonPanel5.StyleMouseDown.Class = ""; - this.ribbonPanel5.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; // // + this.gxdw_ribbonbar.BackgroundMouseOverStyle.Class = ""; + this.gxdw_ribbonbar.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; // - this.ribbonPanel5.StyleMouseOver.Class = ""; - this.ribbonPanel5.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonPanel5.TabIndex = 37; - this.ribbonPanel5.Visible = false; // - // ribbonBar2 // - this.ribbonBar2.AutoOverflowEnabled = true; + this.gxdw_ribbonbar.BackgroundStyle.Class = ""; + this.gxdw_ribbonbar.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.gxdw_ribbonbar.ContainerControlProcessDialogKey = true; + this.gxdw_ribbonbar.Dock = System.Windows.Forms.DockStyle.Left; + this.gxdw_ribbonbar.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { + this.buttonItem9, + this.buttonItem10, + this.buttonItem11, + this.buttonItem12, + this.buttonItem13, + this.buttonItem14}); + this.gxdw_ribbonbar.Location = new System.Drawing.Point(3, 0); + this.gxdw_ribbonbar.Name = "gxdw_ribbonbar"; + this.gxdw_ribbonbar.Size = new System.Drawing.Size(564, 59); + this.gxdw_ribbonbar.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.gxdw_ribbonbar.TabIndex = 0; + this.gxdw_ribbonbar.Text = "ribbonBar5"; // // // - this.ribbonBar2.BackgroundMouseOverStyle.Class = ""; - this.ribbonBar2.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.gxdw_ribbonbar.TitleStyle.Class = ""; + this.gxdw_ribbonbar.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; // // // - this.ribbonBar2.BackgroundStyle.Class = ""; - this.ribbonBar2.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonBar2.ContainerControlProcessDialogKey = true; - this.ribbonBar2.Dock = System.Windows.Forms.DockStyle.Left; - this.ribbonBar2.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { - this.buttonItemHX1, - this.buttonItemHX2, - this.buttonItemDCTP, - this.sliderItem3}); - this.ribbonBar2.Location = new System.Drawing.Point(3, 0); - this.ribbonBar2.Name = "ribbonBar2"; - this.ribbonBar2.Size = new System.Drawing.Size(350, 92); - this.ribbonBar2.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.ribbonBar2.TabIndex = 0; + this.gxdw_ribbonbar.TitleStyleMouseOver.Class = ""; + this.gxdw_ribbonbar.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.gxdw_ribbonbar.TitleVisible = false; // + // buttonItem9 // + this.buttonItem9.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__76; + this.buttonItem9.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem9.Name = "buttonItem9"; + this.buttonItem9.SubItemsExpandWidth = 14; + this.buttonItem9.Text = "工单管理"; + this.buttonItem9.Click += new System.EventHandler(this.buttonItem9_Click); // - this.ribbonBar2.TitleStyle.Class = ""; - this.ribbonBar2.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // buttonItem10 // + this.buttonItem10.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__69; + this.buttonItem10.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem10.Name = "buttonItem10"; + this.buttonItem10.SubItemsExpandWidth = 14; + this.buttonItem10.Text = "在线任务"; + this.buttonItem10.Click += new System.EventHandler(this.buttonItem10_Click); // + // buttonItem11 // - this.ribbonBar2.TitleStyleMouseOver.Class = ""; - this.ribbonBar2.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonBar2.TitleVisible = false; + this.buttonItem11.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__72; + this.buttonItem11.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem11.Name = "buttonItem11"; + this.buttonItem11.SubItemsExpandWidth = 14; + this.buttonItem11.Text = "事件管理"; + this.buttonItem11.Click += new System.EventHandler(this.buttonItem11_Click); // - // buttonItemHX1 + // buttonItem12 // - this.buttonItemHX1.AutoExpandOnClick = true; - this.buttonItemHX1.Image = ((System.Drawing.Image)(resources.GetObject("buttonItemHX1.Image"))); - this.buttonItemHX1.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItemHX1.Name = "buttonItemHX1"; - this.buttonItemHX1.SubItemsExpandWidth = 14; - this.buttonItemHX1.Text = "导入红线"; - this.buttonItemHX1.Click += new System.EventHandler(this.buttonItemHX1_Click); + this.buttonItem12.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__34; + this.buttonItem12.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem12.Name = "buttonItem12"; + this.buttonItem12.SubItemsExpandWidth = 14; + this.buttonItem12.Text = "探测仪管理"; + this.buttonItem12.Click += new System.EventHandler(this.buttonItem12_Click); // - // buttonItemHX2 + // buttonItem13 // - this.buttonItemHX2.Image = ((System.Drawing.Image)(resources.GetObject("buttonItemHX2.Image"))); - this.buttonItemHX2.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItemHX2.Name = "buttonItemHX2"; - this.buttonItemHX2.SubItemsExpandWidth = 14; - this.buttonItemHX2.Text = "红线审核"; - this.buttonItemHX2.Click += new System.EventHandler(this.buttonItemHX2_Click); + this.buttonItem13.Image = global::Cyberpipe.Properties.Resources._24x24icon_13_hover; + this.buttonItem13.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem13.Name = "buttonItem13"; + this.buttonItem13.SubItemsExpandWidth = 14; + this.buttonItem13.Text = "巡检人员维护"; + this.buttonItem13.Click += new System.EventHandler(this.buttonItem13_Click); // - // buttonItemDCTP + // buttonItem14 // - this.buttonItemDCTP.Image = ((System.Drawing.Image)(resources.GetObject("buttonItemDCTP.Image"))); - this.buttonItemDCTP.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItemDCTP.Name = "buttonItemDCTP"; - this.buttonItemDCTP.SubItemsExpandWidth = 14; - this.buttonItemDCTP.Text = "导出图片"; - this.buttonItemDCTP.Click += new System.EventHandler(this.buttonItemDCTP_Click); - // - // sliderItem3 - // - this.sliderItem3.LabelPosition = DevComponents.DotNetBar.eSliderLabelPosition.Top; - this.sliderItem3.LabelWidth = 50; - this.sliderItem3.Name = "sliderItem3"; - this.sliderItem3.Text = "地面透明度"; - this.sliderItem3.TextColor = System.Drawing.Color.Black; - this.sliderItem3.Value = 0; - this.sliderItem3.ValueChanged += new System.EventHandler(this.sliderItem3_ValueChanged); - // - // ribbonPanel1 - // - this.ribbonPanel1.AutoSize = true; - this.ribbonPanel1.CanvasColor = System.Drawing.Color.Gray; - this.ribbonPanel1.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.ribbonPanel1.Controls.Add(this.ribbonBar21); - this.ribbonPanel1.Dock = System.Windows.Forms.DockStyle.Fill; - this.ribbonPanel1.Location = new System.Drawing.Point(0, 0); - this.ribbonPanel1.Name = "ribbonPanel1"; - this.ribbonPanel1.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); - this.ribbonPanel1.Size = new System.Drawing.Size(1328, 95); - // - // - // - this.ribbonPanel1.Style.Class = ""; - this.ribbonPanel1.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonPanel1.StyleMouseDown.Class = ""; - this.ribbonPanel1.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonPanel1.StyleMouseOver.Class = ""; - this.ribbonPanel1.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonPanel1.TabIndex = 1; - this.ribbonPanel1.Visible = false; - // - // ribbonBar21 - // - this.ribbonBar21.AutoOverflowEnabled = true; - this.ribbonBar21.BackColor = System.Drawing.Color.White; - // - // - // - this.ribbonBar21.BackgroundMouseOverStyle.Class = ""; - this.ribbonBar21.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonBar21.BackgroundStyle.Class = ""; - this.ribbonBar21.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonBar21.ContainerControlProcessDialogKey = true; - this.ribbonBar21.Dock = System.Windows.Forms.DockStyle.Left; - this.ribbonBar21.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { - this.buttonItem87, - this.buttonItem88, - this.buttonItem27, - this.sliderGroundTransSet1, - this.buttonItem91, - this.buttonItem1, - this.btnlegendSet, - this.buttonItem89, - this.btnOutputJPG}); - this.ribbonBar21.Location = new System.Drawing.Point(3, 0); - this.ribbonBar21.Name = "ribbonBar21"; - this.ribbonBar21.Size = new System.Drawing.Size(649, 92); - this.ribbonBar21.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.ribbonBar21.TabIndex = 2; - this.ribbonBar21.Text = "浏览模式"; - // - // - // - this.ribbonBar21.TitleStyle.Class = ""; - this.ribbonBar21.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonBar21.TitleStyleMouseOver.Class = ""; - this.ribbonBar21.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonBar21.TitleVisible = false; - // - // buttonItem87 - // - this.buttonItem87.Image = ((System.Drawing.Image)(resources.GetObject("buttonItem87.Image"))); - this.buttonItem87.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem87.Name = "buttonItem87"; - this.buttonItem87.SubItemsExpandWidth = 14; - this.buttonItem87.Text = "地上模式"; - this.buttonItem87.Click += new System.EventHandler(this.buttonItem87_Click); - // - // buttonItem88 - // - this.buttonItem88.Image = ((System.Drawing.Image)(resources.GetObject("buttonItem88.Image"))); - this.buttonItem88.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem88.Name = "buttonItem88"; - this.buttonItem88.SubItemsExpandWidth = 14; - this.buttonItem88.Text = "地下模式"; - this.buttonItem88.Click += new System.EventHandler(this.buttonItem88_Click); - // - // buttonItem27 - // - this.buttonItem27.Image = ((System.Drawing.Image)(resources.GetObject("buttonItem27.Image"))); - this.buttonItem27.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem27.Name = "buttonItem27"; - this.buttonItem27.SubItemsExpandWidth = 14; - this.buttonItem27.Text = "行走模式"; - this.buttonItem27.Click += new System.EventHandler(this.buttonItem27_Click); - // - // buttonItem91 - // - this.buttonItem91.ForeColor = System.Drawing.Color.Black; - this.buttonItem91.Image = ((System.Drawing.Image)(resources.GetObject("buttonItem91.Image"))); - this.buttonItem91.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem91.Name = "buttonItem91"; - this.buttonItem91.SubItemsExpandWidth = 14; - this.buttonItem91.Text = "快速定位"; - this.buttonItem91.Click += new System.EventHandler(this.buttonItem91_Click); - // - // buttonItem1 - // - this.buttonItem1.Image = ((System.Drawing.Image)(resources.GetObject("buttonItem1.Image"))); - this.buttonItem1.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem1.Name = "buttonItem1"; - this.buttonItem1.SubItemsExpandWidth = 14; - this.buttonItem1.Text = "图层管理"; - this.buttonItem1.Click += new System.EventHandler(this.buttonItem1_Click); - // - // btnlegendSet - // - this.btnlegendSet.Image = ((System.Drawing.Image)(resources.GetObject("btnlegendSet.Image"))); - this.btnlegendSet.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.btnlegendSet.Name = "btnlegendSet"; - this.btnlegendSet.SubItemsExpandWidth = 14; - this.btnlegendSet.Text = "图例"; - this.btnlegendSet.Click += new System.EventHandler(this.btnlegendSet_Click); - // - // buttonItem89 - // - this.buttonItem89.Image = ((System.Drawing.Image)(resources.GetObject("buttonItem89.Image"))); - this.buttonItem89.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem89.Name = "buttonItem89"; - this.buttonItem89.SubItemsExpandWidth = 14; - this.buttonItem89.Text = "全屏显示"; - this.buttonItem89.Click += new System.EventHandler(this.buttonItem89_Click); - // - // btnOutputJPG - // - this.btnOutputJPG.Image = ((System.Drawing.Image)(resources.GetObject("btnOutputJPG.Image"))); - this.btnOutputJPG.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.btnOutputJPG.Name = "btnOutputJPG"; - this.btnOutputJPG.SubItemsExpandWidth = 14; - this.btnOutputJPG.Text = "导出图片"; - this.btnOutputJPG.Click += new System.EventHandler(this.btnOutputJPG_Click); - // - // ribbonPanel12 - // - this.ribbonPanel12.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.ribbonPanel12.Controls.Add(this.ribbonBar18); - this.ribbonPanel12.Controls.Add(this.ribbonBar13); - this.ribbonPanel12.Dock = System.Windows.Forms.DockStyle.Fill; - this.ribbonPanel12.Location = new System.Drawing.Point(0, 0); - this.ribbonPanel12.Name = "ribbonPanel12"; - this.ribbonPanel12.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); - this.ribbonPanel12.Size = new System.Drawing.Size(1328, 95); - // - // - // - this.ribbonPanel12.Style.Class = ""; - this.ribbonPanel12.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonPanel12.StyleMouseDown.Class = ""; - this.ribbonPanel12.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonPanel12.StyleMouseOver.Class = ""; - this.ribbonPanel12.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonPanel12.TabIndex = 34; - this.ribbonPanel12.Visible = false; - // - // ribbonBar18 - // - this.ribbonBar18.AutoOverflowEnabled = true; - // - // - // - this.ribbonBar18.BackgroundMouseOverStyle.Class = ""; - this.ribbonBar18.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonBar18.BackgroundStyle.Class = ""; - this.ribbonBar18.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonBar18.ContainerControlProcessDialogKey = true; - this.ribbonBar18.Dock = System.Windows.Forms.DockStyle.Left; - this.ribbonBar18.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { - this.buttonItem133}); - this.ribbonBar18.Location = new System.Drawing.Point(531, 0); - this.ribbonBar18.Name = "ribbonBar18"; - this.ribbonBar18.Size = new System.Drawing.Size(129, 92); - this.ribbonBar18.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.ribbonBar18.TabIndex = 1; - // - // - // - this.ribbonBar18.TitleStyle.Class = ""; - this.ribbonBar18.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonBar18.TitleStyleMouseOver.Class = ""; - this.ribbonBar18.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonBar18.TitleVisible = false; - // - // buttonItem133 - // - this.buttonItem133.Image = ((System.Drawing.Image)(resources.GetObject("buttonItem133.Image"))); - this.buttonItem133.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem133.Name = "buttonItem133"; - this.buttonItem133.SubItemsExpandWidth = 14; - this.buttonItem133.Text = "审核入库"; - this.buttonItem133.Click += new System.EventHandler(this.buttonItem133_Click_1); - // - // ribbonBar13 - // - this.ribbonBar13.AutoOverflowEnabled = true; - // - // - // - this.ribbonBar13.BackgroundMouseOverStyle.Class = ""; - this.ribbonBar13.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonBar13.BackgroundStyle.Class = ""; - this.ribbonBar13.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonBar13.ContainerControlProcessDialogKey = true; - this.ribbonBar13.Dock = System.Windows.Forms.DockStyle.Left; - this.ribbonBar13.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { - this.buttonItem127, - this.buttonItem128, - this.sliderItem1, - this.buttonItem134, - this.buttonItem130, - this.btn_check_history}); - this.ribbonBar13.Location = new System.Drawing.Point(3, 0); - this.ribbonBar13.Name = "ribbonBar13"; - this.ribbonBar13.Size = new System.Drawing.Size(528, 92); - this.ribbonBar13.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.ribbonBar13.TabIndex = 0; - // - // - // - this.ribbonBar13.TitleStyle.Class = ""; - this.ribbonBar13.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonBar13.TitleStyleMouseOver.Class = ""; - this.ribbonBar13.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonBar13.TitleVisible = false; - // - // buttonItem127 - // - this.buttonItem127.Image = ((System.Drawing.Image)(resources.GetObject("buttonItem127.Image"))); - this.buttonItem127.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem127.Name = "buttonItem127"; - this.buttonItem127.SubItemsExpandWidth = 14; - this.buttonItem127.Text = "打开数据"; - this.buttonItem127.Click += new System.EventHandler(this.buttonItem127_Click_2); - // - // buttonItem128 - // - this.buttonItem128.Image = ((System.Drawing.Image)(resources.GetObject("buttonItem128.Image"))); - this.buttonItem128.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem128.Name = "buttonItem128"; - this.buttonItem128.SubItemsExpandWidth = 14; - this.buttonItem128.Text = "一键审核"; - this.buttonItem128.Click += new System.EventHandler(this.buttonItem128_Click); - // - // sliderItem1 - // - this.sliderItem1.LabelPosition = DevComponents.DotNetBar.eSliderLabelPosition.Top; - this.sliderItem1.LabelWidth = 50; - this.sliderItem1.Name = "sliderItem1"; - this.sliderItem1.Text = "地面透明度"; - this.sliderItem1.TextColor = System.Drawing.Color.Black; - this.sliderItem1.Value = 0; - this.sliderItem1.ValueChanged += new System.EventHandler(this.sliderItem1_ValueChanged); - // - // buttonItem134 - // - this.buttonItem134.Image = ((System.Drawing.Image)(resources.GetObject("buttonItem134.Image"))); - this.buttonItem134.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem134.Name = "buttonItem134"; - this.buttonItem134.SubItemsExpandWidth = 14; - this.buttonItem134.Text = "模拟设计修改"; - this.buttonItem134.Click += new System.EventHandler(this.buttonItem134_Click_1); - // - // buttonItem130 - // - this.buttonItem130.Image = ((System.Drawing.Image)(resources.GetObject("buttonItem130.Image"))); - this.buttonItem130.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem130.Name = "buttonItem130"; - this.buttonItem130.SubItemsExpandWidth = 14; - this.buttonItem130.Text = "导出审核图"; - this.buttonItem130.Click += new System.EventHandler(this.buttonItem130_Click_1); - // - // btn_check_history - // - this.btn_check_history.Image = ((System.Drawing.Image)(resources.GetObject("btn_check_history.Image"))); - this.btn_check_history.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.btn_check_history.Name = "btn_check_history"; - this.btn_check_history.SubItemsExpandWidth = 14; - this.btn_check_history.Text = "审核历史"; - this.btn_check_history.Click += new System.EventHandler(this.btn_check_history_Click); - // - // ribbonPanel4 - // - this.ribbonPanel4.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.ribbonPanel4.Controls.Add(this.ribbonBar1); - this.ribbonPanel4.Dock = System.Windows.Forms.DockStyle.Fill; - this.ribbonPanel4.Location = new System.Drawing.Point(0, 0); - this.ribbonPanel4.Name = "ribbonPanel4"; - this.ribbonPanel4.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); - this.ribbonPanel4.Size = new System.Drawing.Size(1328, 95); - // - // - // - this.ribbonPanel4.Style.Class = ""; - this.ribbonPanel4.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonPanel4.StyleMouseDown.Class = ""; - this.ribbonPanel4.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonPanel4.StyleMouseOver.Class = ""; - this.ribbonPanel4.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonPanel4.TabIndex = 36; - this.ribbonPanel4.Visible = false; - // - // ribbonBar1 - // - this.ribbonBar1.AutoOverflowEnabled = true; - // - // - // - this.ribbonBar1.BackgroundMouseOverStyle.Class = ""; - this.ribbonBar1.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonBar1.BackgroundStyle.Class = ""; - this.ribbonBar1.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonBar1.ContainerControlProcessDialogKey = true; - this.ribbonBar1.Dock = System.Windows.Forms.DockStyle.Left; - this.ribbonBar1.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { - this.btn_document_info}); - this.ribbonBar1.Location = new System.Drawing.Point(3, 0); - this.ribbonBar1.Name = "ribbonBar1"; - this.ribbonBar1.Size = new System.Drawing.Size(88, 92); - this.ribbonBar1.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.ribbonBar1.TabIndex = 0; - // - // - // - this.ribbonBar1.TitleStyle.Class = ""; - this.ribbonBar1.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonBar1.TitleStyleMouseOver.Class = ""; - this.ribbonBar1.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonBar1.TitleVisible = false; - // - // btn_document_info - // - this.btn_document_info.Image = ((System.Drawing.Image)(resources.GetObject("btn_document_info.Image"))); - this.btn_document_info.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.btn_document_info.Name = "btn_document_info"; - this.btn_document_info.SubItemsExpandWidth = 14; - this.btn_document_info.Text = "文档管理"; - this.btn_document_info.Click += new System.EventHandler(this.btn_document_info_Click); + this.buttonItem14.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__56; + this.buttonItem14.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem14.Name = "buttonItem14"; + this.buttonItem14.SubItemsExpandWidth = 14; + this.buttonItem14.Text = "导出施工图"; + this.buttonItem14.Click += new System.EventHandler(this.buttonItem14_Click); // // ribbonPanel15 // this.ribbonPanel15.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; this.ribbonPanel15.Controls.Add(this.ribbonBar20); this.ribbonPanel15.Dock = System.Windows.Forms.DockStyle.Fill; - this.ribbonPanel15.Location = new System.Drawing.Point(0, 0); + this.ribbonPanel15.Location = new System.Drawing.Point(0, 33); this.ribbonPanel15.Name = "ribbonPanel15"; this.ribbonPanel15.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); - this.ribbonPanel15.Size = new System.Drawing.Size(1328, 95); + this.ribbonPanel15.Size = new System.Drawing.Size(1328, 62); // // // @@ -2843,7 +2465,7 @@ this.buttonItemXTGL}); this.ribbonBar20.Location = new System.Drawing.Point(3, 0); this.ribbonBar20.Name = "ribbonBar20"; - this.ribbonBar20.Size = new System.Drawing.Size(283, 92); + this.ribbonBar20.Size = new System.Drawing.Size(283, 59); this.ribbonBar20.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; this.ribbonBar20.TabIndex = 0; // @@ -3274,216 +2896,15 @@ this.buttonItemXT4_2.Text = "人员修改"; this.buttonItemXT4_2.Click += new System.EventHandler(this.buttonItemXT4_2_Click); // - // ribbonPanel3 - // - this.ribbonPanel3.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.ribbonPanel3.Controls.Add(this.ribbonBar4); - this.ribbonPanel3.Dock = System.Windows.Forms.DockStyle.Fill; - this.ribbonPanel3.Location = new System.Drawing.Point(0, 33); - this.ribbonPanel3.Name = "ribbonPanel3"; - this.ribbonPanel3.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); - this.ribbonPanel3.Size = new System.Drawing.Size(1328, 62); - // - // - // - this.ribbonPanel3.Style.Class = ""; - this.ribbonPanel3.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonPanel3.StyleMouseDown.Class = ""; - this.ribbonPanel3.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonPanel3.StyleMouseOver.Class = ""; - this.ribbonPanel3.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonPanel3.TabIndex = 40; - // - // ribbonBar4 - // - this.ribbonBar4.AutoOverflowEnabled = true; - // - // - // - this.ribbonBar4.BackgroundMouseOverStyle.Class = ""; - this.ribbonBar4.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonBar4.BackgroundStyle.Class = ""; - this.ribbonBar4.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonBar4.ContainerControlProcessDialogKey = true; - this.ribbonBar4.Dock = System.Windows.Forms.DockStyle.Left; - this.ribbonBar4.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { - this.btn_flag, - this.slider4ground}); - this.ribbonBar4.Location = new System.Drawing.Point(3, 0); - this.ribbonBar4.Name = "ribbonBar4"; - this.ribbonBar4.Size = new System.Drawing.Size(321, 59); - this.ribbonBar4.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.ribbonBar4.TabIndex = 0; - // - // - // - this.ribbonBar4.TitleStyle.Class = ""; - this.ribbonBar4.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonBar4.TitleStyleMouseOver.Class = ""; - this.ribbonBar4.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonBar4.TitleVisible = false; - // - // btn_flag - // - this.btn_flag.Image = global::Cyberpipe.Properties.Resources._24x24icon_03_hover; - this.btn_flag.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.btn_flag.Name = "btn_flag"; - this.btn_flag.SubItemsExpandWidth = 14; - this.btn_flag.Text = "标识器管理"; - this.btn_flag.Click += new System.EventHandler(this.btn_flag_Click); - // - // slider4ground - // - this.slider4ground.LabelPosition = DevComponents.DotNetBar.eSliderLabelPosition.Top; - this.slider4ground.LabelWidth = 50; - this.slider4ground.Name = "slider4ground"; - this.slider4ground.Text = "地面透明度"; - this.slider4ground.TextColor = System.Drawing.Color.Black; - this.slider4ground.Value = 0; - this.slider4ground.ValueChanged += new System.EventHandler(this.slider4ground_ValueChanged); - // - // ribbonPanel7 - // - this.ribbonPanel7.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.ribbonPanel7.Controls.Add(this.gxdw_ribbonbar); - this.ribbonPanel7.Dock = System.Windows.Forms.DockStyle.Fill; - this.ribbonPanel7.Location = new System.Drawing.Point(0, 33); - this.ribbonPanel7.Name = "ribbonPanel7"; - this.ribbonPanel7.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); - this.ribbonPanel7.Size = new System.Drawing.Size(1328, 62); - // - // - // - this.ribbonPanel7.Style.Class = ""; - this.ribbonPanel7.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonPanel7.StyleMouseDown.Class = ""; - this.ribbonPanel7.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonPanel7.StyleMouseOver.Class = ""; - this.ribbonPanel7.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonPanel7.TabIndex = 41; - this.ribbonPanel7.Visible = false; - // - // gxdw_ribbonbar - // - this.gxdw_ribbonbar.AutoOverflowEnabled = true; - // - // - // - this.gxdw_ribbonbar.BackgroundMouseOverStyle.Class = ""; - this.gxdw_ribbonbar.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.gxdw_ribbonbar.BackgroundStyle.Class = ""; - this.gxdw_ribbonbar.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.gxdw_ribbonbar.ContainerControlProcessDialogKey = true; - this.gxdw_ribbonbar.Dock = System.Windows.Forms.DockStyle.Left; - this.gxdw_ribbonbar.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { - this.buttonItem9, - this.buttonItem10, - this.buttonItem11, - this.buttonItem12, - this.buttonItem13, - this.buttonItem14}); - this.gxdw_ribbonbar.Location = new System.Drawing.Point(3, 0); - this.gxdw_ribbonbar.Name = "gxdw_ribbonbar"; - this.gxdw_ribbonbar.Size = new System.Drawing.Size(522, 59); - this.gxdw_ribbonbar.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.gxdw_ribbonbar.TabIndex = 0; - this.gxdw_ribbonbar.Text = "ribbonBar5"; - // - // - // - this.gxdw_ribbonbar.TitleStyle.Class = ""; - this.gxdw_ribbonbar.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.gxdw_ribbonbar.TitleStyleMouseOver.Class = ""; - this.gxdw_ribbonbar.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.gxdw_ribbonbar.TitleVisible = false; - // - // buttonItem9 - // - this.buttonItem9.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__76; - this.buttonItem9.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem9.Name = "buttonItem9"; - this.buttonItem9.SubItemsExpandWidth = 14; - this.buttonItem9.Text = "工单管理"; - this.buttonItem9.Click += new System.EventHandler(this.buttonItem9_Click); - // - // buttonItem10 - // - this.buttonItem10.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__69; - this.buttonItem10.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem10.Name = "buttonItem10"; - this.buttonItem10.SubItemsExpandWidth = 14; - this.buttonItem10.Text = "在线任务"; - this.buttonItem10.Click += new System.EventHandler(this.buttonItem10_Click); - // - // buttonItem11 - // - this.buttonItem11.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__72; - this.buttonItem11.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem11.Name = "buttonItem11"; - this.buttonItem11.SubItemsExpandWidth = 14; - this.buttonItem11.Text = "事件管理"; - this.buttonItem11.Click += new System.EventHandler(this.buttonItem11_Click); - // - // buttonItem12 - // - this.buttonItem12.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__34; - this.buttonItem12.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem12.Name = "buttonItem12"; - this.buttonItem12.SubItemsExpandWidth = 14; - this.buttonItem12.Text = "探测仪管理"; - this.buttonItem12.Click += new System.EventHandler(this.buttonItem12_Click); - // - // buttonItem13 - // - this.buttonItem13.Image = global::Cyberpipe.Properties.Resources._24x24icon_13_hover; - this.buttonItem13.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem13.Name = "buttonItem13"; - this.buttonItem13.SubItemsExpandWidth = 14; - this.buttonItem13.Text = "巡检人员维护"; - this.buttonItem13.Click += new System.EventHandler(this.buttonItem13_Click); - // - // buttonItem14 - // - this.buttonItem14.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__56; - this.buttonItem14.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem14.Name = "buttonItem14"; - this.buttonItem14.SubItemsExpandWidth = 14; - this.buttonItem14.Text = "导出施工图"; - this.buttonItem14.Click += new System.EventHandler(this.buttonItem14_Click); - // // ribbonPanel2 // this.ribbonPanel2.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; this.ribbonPanel2.Controls.Add(this.ribbonBar3); this.ribbonPanel2.Dock = System.Windows.Forms.DockStyle.Fill; - this.ribbonPanel2.Location = new System.Drawing.Point(0, 33); + this.ribbonPanel2.Location = new System.Drawing.Point(0, 0); this.ribbonPanel2.Name = "ribbonPanel2"; this.ribbonPanel2.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); - this.ribbonPanel2.Size = new System.Drawing.Size(1328, 62); + this.ribbonPanel2.Size = new System.Drawing.Size(1328, 95); // // // @@ -3527,7 +2948,7 @@ this.buttonItemPasswordReset}); this.ribbonBar3.Location = new System.Drawing.Point(3, 0); this.ribbonBar3.Name = "ribbonBar3"; - this.ribbonBar3.Size = new System.Drawing.Size(551, 59); + this.ribbonBar3.Size = new System.Drawing.Size(551, 92); this.ribbonBar3.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; this.ribbonBar3.TabIndex = 1; // @@ -3567,6 +2988,7 @@ this.btn_resc_info.Name = "btn_resc_info"; this.btn_resc_info.SubItemsExpandWidth = 14; this.btn_resc_info.Text = "资源管理"; + this.btn_resc_info.Visible = false; this.btn_resc_info.Click += new System.EventHandler(this.btn_resc_info_Click); // // btn_role_resc @@ -3605,6 +3027,605 @@ this.buttonItemPasswordReset.Text = "重置密码"; this.buttonItemPasswordReset.Click += new System.EventHandler(this.buttonItemPasswordReset_Click); // + // ribbonPanel6 + // + this.ribbonPanel6.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.ribbonPanel6.Controls.Add(this.ribbonBar6); + this.ribbonPanel6.Dock = System.Windows.Forms.DockStyle.Fill; + this.ribbonPanel6.Location = new System.Drawing.Point(0, 0); + this.ribbonPanel6.Name = "ribbonPanel6"; + this.ribbonPanel6.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); + this.ribbonPanel6.Size = new System.Drawing.Size(1328, 95); + // + // + // + this.ribbonPanel6.Style.Class = ""; + this.ribbonPanel6.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonPanel6.StyleMouseDown.Class = ""; + this.ribbonPanel6.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonPanel6.StyleMouseOver.Class = ""; + this.ribbonPanel6.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonPanel6.TabIndex = 38; + this.ribbonPanel6.Visible = false; + // + // ribbonBar6 + // + this.ribbonBar6.AutoOverflowEnabled = true; + // + // + // + this.ribbonBar6.BackgroundMouseOverStyle.Class = ""; + this.ribbonBar6.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonBar6.BackgroundStyle.Class = ""; + this.ribbonBar6.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar6.ContainerControlProcessDialogKey = true; + this.ribbonBar6.Dock = System.Windows.Forms.DockStyle.Left; + this.ribbonBar6.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { + this.buttonItemSPSZ, + this.buttonItem8, + this.buttonItemLocation, + this.sliderItem2, + this.buttonItemGBJC}); + this.ribbonBar6.Location = new System.Drawing.Point(3, 0); + this.ribbonBar6.Name = "ribbonBar6"; + this.ribbonBar6.Size = new System.Drawing.Size(427, 92); + this.ribbonBar6.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.ribbonBar6.TabIndex = 0; + // + // + // + this.ribbonBar6.TitleStyle.Class = ""; + this.ribbonBar6.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonBar6.TitleStyleMouseOver.Class = ""; + this.ribbonBar6.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar6.TitleVisible = false; + // + // buttonItemSPSZ + // + this.buttonItemSPSZ.Image = ((System.Drawing.Image)(resources.GetObject("buttonItemSPSZ.Image"))); + this.buttonItemSPSZ.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItemSPSZ.Name = "buttonItemSPSZ"; + this.buttonItemSPSZ.SubItemsExpandWidth = 14; + this.buttonItemSPSZ.Text = "双屏设置"; + this.buttonItemSPSZ.Click += new System.EventHandler(this.buttonItemSPSZ_Click); + // + // buttonItem8 + // + this.buttonItem8.Image = ((System.Drawing.Image)(resources.GetObject("buttonItem8.Image"))); + this.buttonItem8.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem8.Name = "buttonItem8"; + this.buttonItem8.SubItemsExpandWidth = 14; + this.buttonItem8.Text = "双屏分析"; + this.buttonItem8.Click += new System.EventHandler(this.buttonItem8_Click); + // + // buttonItemLocation + // + this.buttonItemLocation.Image = ((System.Drawing.Image)(resources.GetObject("buttonItemLocation.Image"))); + this.buttonItemLocation.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItemLocation.Name = "buttonItemLocation"; + this.buttonItemLocation.SubItemsExpandWidth = 14; + this.buttonItemLocation.Text = "快速定位"; + this.buttonItemLocation.Click += new System.EventHandler(this.buttonItemLocation_Click); + // + // sliderItem2 + // + this.sliderItem2.LabelPosition = DevComponents.DotNetBar.eSliderLabelPosition.Top; + this.sliderItem2.LabelWidth = 50; + this.sliderItem2.Name = "sliderItem2"; + this.sliderItem2.Text = "地面透明度"; + this.sliderItem2.TextColor = System.Drawing.Color.Black; + this.sliderItem2.Value = 0; + this.sliderItem2.ValueChanged += new System.EventHandler(this.sliderItem2_ValueChanged); + // + // buttonItemGBJC + // + this.buttonItemGBJC.Image = ((System.Drawing.Image)(resources.GetObject("buttonItemGBJC.Image"))); + this.buttonItemGBJC.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItemGBJC.Name = "buttonItemGBJC"; + this.buttonItemGBJC.SubItemsExpandWidth = 14; + this.buttonItemGBJC.Text = "国标检测"; + this.buttonItemGBJC.Click += new System.EventHandler(this.buttonItemGBJC_Click); + // + // ribbonPanel5 + // + this.ribbonPanel5.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.ribbonPanel5.Controls.Add(this.ribbonBar2); + this.ribbonPanel5.Dock = System.Windows.Forms.DockStyle.Fill; + this.ribbonPanel5.Location = new System.Drawing.Point(0, 33); + this.ribbonPanel5.Name = "ribbonPanel5"; + this.ribbonPanel5.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); + this.ribbonPanel5.Size = new System.Drawing.Size(1328, 62); + // + // + // + this.ribbonPanel5.Style.Class = ""; + this.ribbonPanel5.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonPanel5.StyleMouseDown.Class = ""; + this.ribbonPanel5.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonPanel5.StyleMouseOver.Class = ""; + this.ribbonPanel5.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonPanel5.TabIndex = 37; + this.ribbonPanel5.Visible = false; + // + // ribbonBar2 + // + this.ribbonBar2.AutoOverflowEnabled = true; + // + // + // + this.ribbonBar2.BackgroundMouseOverStyle.Class = ""; + this.ribbonBar2.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonBar2.BackgroundStyle.Class = ""; + this.ribbonBar2.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar2.ContainerControlProcessDialogKey = true; + this.ribbonBar2.Dock = System.Windows.Forms.DockStyle.Left; + this.ribbonBar2.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { + this.buttonItemHX1, + this.buttonItemHX2, + this.buttonItemDCTP, + this.sliderItem3}); + this.ribbonBar2.Location = new System.Drawing.Point(3, 0); + this.ribbonBar2.Name = "ribbonBar2"; + this.ribbonBar2.Size = new System.Drawing.Size(350, 59); + this.ribbonBar2.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.ribbonBar2.TabIndex = 0; + // + // + // + this.ribbonBar2.TitleStyle.Class = ""; + this.ribbonBar2.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonBar2.TitleStyleMouseOver.Class = ""; + this.ribbonBar2.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar2.TitleVisible = false; + // + // buttonItemHX1 + // + this.buttonItemHX1.AutoExpandOnClick = true; + this.buttonItemHX1.Image = ((System.Drawing.Image)(resources.GetObject("buttonItemHX1.Image"))); + this.buttonItemHX1.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItemHX1.Name = "buttonItemHX1"; + this.buttonItemHX1.SubItemsExpandWidth = 14; + this.buttonItemHX1.Text = "导入红线"; + this.buttonItemHX1.Click += new System.EventHandler(this.buttonItemHX1_Click); + // + // buttonItemHX2 + // + this.buttonItemHX2.Image = ((System.Drawing.Image)(resources.GetObject("buttonItemHX2.Image"))); + this.buttonItemHX2.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItemHX2.Name = "buttonItemHX2"; + this.buttonItemHX2.SubItemsExpandWidth = 14; + this.buttonItemHX2.Text = "红线审核"; + this.buttonItemHX2.Click += new System.EventHandler(this.buttonItemHX2_Click); + // + // buttonItemDCTP + // + this.buttonItemDCTP.Image = ((System.Drawing.Image)(resources.GetObject("buttonItemDCTP.Image"))); + this.buttonItemDCTP.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItemDCTP.Name = "buttonItemDCTP"; + this.buttonItemDCTP.SubItemsExpandWidth = 14; + this.buttonItemDCTP.Text = "导出图片"; + this.buttonItemDCTP.Click += new System.EventHandler(this.buttonItemDCTP_Click); + // + // sliderItem3 + // + this.sliderItem3.LabelPosition = DevComponents.DotNetBar.eSliderLabelPosition.Top; + this.sliderItem3.LabelWidth = 50; + this.sliderItem3.Name = "sliderItem3"; + this.sliderItem3.Text = "地面透明度"; + this.sliderItem3.TextColor = System.Drawing.Color.Black; + this.sliderItem3.Value = 0; + this.sliderItem3.ValueChanged += new System.EventHandler(this.sliderItem3_ValueChanged); + // + // ribbonPanel1 + // + this.ribbonPanel1.AutoSize = true; + this.ribbonPanel1.CanvasColor = System.Drawing.Color.Gray; + this.ribbonPanel1.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.ribbonPanel1.Controls.Add(this.ribbonBar21); + this.ribbonPanel1.Dock = System.Windows.Forms.DockStyle.Fill; + this.ribbonPanel1.Location = new System.Drawing.Point(0, 33); + this.ribbonPanel1.Name = "ribbonPanel1"; + this.ribbonPanel1.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); + this.ribbonPanel1.Size = new System.Drawing.Size(1328, 62); + // + // + // + this.ribbonPanel1.Style.Class = ""; + this.ribbonPanel1.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonPanel1.StyleMouseDown.Class = ""; + this.ribbonPanel1.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonPanel1.StyleMouseOver.Class = ""; + this.ribbonPanel1.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonPanel1.TabIndex = 1; + this.ribbonPanel1.Visible = false; + // + // ribbonBar21 + // + this.ribbonBar21.AutoOverflowEnabled = true; + this.ribbonBar21.BackColor = System.Drawing.Color.White; + // + // + // + this.ribbonBar21.BackgroundMouseOverStyle.Class = ""; + this.ribbonBar21.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonBar21.BackgroundStyle.Class = ""; + this.ribbonBar21.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar21.ContainerControlProcessDialogKey = true; + this.ribbonBar21.Dock = System.Windows.Forms.DockStyle.Left; + this.ribbonBar21.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { + this.buttonItem87, + this.buttonItem88, + this.buttonItem27, + this.sliderGroundTransSet1, + this.buttonItem91, + this.buttonItem1, + this.btnlegendSet, + this.buttonItem89, + this.btnOutputJPG}); + this.ribbonBar21.Location = new System.Drawing.Point(3, 0); + this.ribbonBar21.Name = "ribbonBar21"; + this.ribbonBar21.Size = new System.Drawing.Size(649, 59); + this.ribbonBar21.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.ribbonBar21.TabIndex = 2; + this.ribbonBar21.Text = "浏览模式"; + // + // + // + this.ribbonBar21.TitleStyle.Class = ""; + this.ribbonBar21.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonBar21.TitleStyleMouseOver.Class = ""; + this.ribbonBar21.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar21.TitleVisible = false; + // + // buttonItem87 + // + this.buttonItem87.Image = ((System.Drawing.Image)(resources.GetObject("buttonItem87.Image"))); + this.buttonItem87.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem87.Name = "buttonItem87"; + this.buttonItem87.SubItemsExpandWidth = 14; + this.buttonItem87.Text = "地上模式"; + this.buttonItem87.Click += new System.EventHandler(this.buttonItem87_Click); + // + // buttonItem88 + // + this.buttonItem88.Image = ((System.Drawing.Image)(resources.GetObject("buttonItem88.Image"))); + this.buttonItem88.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem88.Name = "buttonItem88"; + this.buttonItem88.SubItemsExpandWidth = 14; + this.buttonItem88.Text = "地下模式"; + this.buttonItem88.Click += new System.EventHandler(this.buttonItem88_Click); + // + // buttonItem27 + // + this.buttonItem27.Image = ((System.Drawing.Image)(resources.GetObject("buttonItem27.Image"))); + this.buttonItem27.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem27.Name = "buttonItem27"; + this.buttonItem27.SubItemsExpandWidth = 14; + this.buttonItem27.Text = "行走模式"; + this.buttonItem27.Click += new System.EventHandler(this.buttonItem27_Click); + // + // buttonItem91 + // + this.buttonItem91.ForeColor = System.Drawing.Color.Black; + this.buttonItem91.Image = ((System.Drawing.Image)(resources.GetObject("buttonItem91.Image"))); + this.buttonItem91.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem91.Name = "buttonItem91"; + this.buttonItem91.SubItemsExpandWidth = 14; + this.buttonItem91.Text = "快速定位"; + this.buttonItem91.Click += new System.EventHandler(this.buttonItem91_Click); + // + // buttonItem1 + // + this.buttonItem1.Image = ((System.Drawing.Image)(resources.GetObject("buttonItem1.Image"))); + this.buttonItem1.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem1.Name = "buttonItem1"; + this.buttonItem1.SubItemsExpandWidth = 14; + this.buttonItem1.Text = "图层管理"; + this.buttonItem1.Click += new System.EventHandler(this.buttonItem1_Click); + // + // btnlegendSet + // + this.btnlegendSet.Image = ((System.Drawing.Image)(resources.GetObject("btnlegendSet.Image"))); + this.btnlegendSet.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.btnlegendSet.Name = "btnlegendSet"; + this.btnlegendSet.SubItemsExpandWidth = 14; + this.btnlegendSet.Text = "图例"; + this.btnlegendSet.Click += new System.EventHandler(this.btnlegendSet_Click); + // + // buttonItem89 + // + this.buttonItem89.Image = ((System.Drawing.Image)(resources.GetObject("buttonItem89.Image"))); + this.buttonItem89.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem89.Name = "buttonItem89"; + this.buttonItem89.SubItemsExpandWidth = 14; + this.buttonItem89.Text = "全屏显示"; + this.buttonItem89.Click += new System.EventHandler(this.buttonItem89_Click); + // + // btnOutputJPG + // + this.btnOutputJPG.Image = ((System.Drawing.Image)(resources.GetObject("btnOutputJPG.Image"))); + this.btnOutputJPG.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.btnOutputJPG.Name = "btnOutputJPG"; + this.btnOutputJPG.SubItemsExpandWidth = 14; + this.btnOutputJPG.Text = "导出图片"; + this.btnOutputJPG.Click += new System.EventHandler(this.btnOutputJPG_Click); + // + // ribbonPanel12 + // + this.ribbonPanel12.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.ribbonPanel12.Controls.Add(this.ribbonBar18); + this.ribbonPanel12.Controls.Add(this.ribbonBar13); + this.ribbonPanel12.Dock = System.Windows.Forms.DockStyle.Fill; + this.ribbonPanel12.Location = new System.Drawing.Point(0, 33); + this.ribbonPanel12.Name = "ribbonPanel12"; + this.ribbonPanel12.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); + this.ribbonPanel12.Size = new System.Drawing.Size(1328, 62); + // + // + // + this.ribbonPanel12.Style.Class = ""; + this.ribbonPanel12.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonPanel12.StyleMouseDown.Class = ""; + this.ribbonPanel12.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonPanel12.StyleMouseOver.Class = ""; + this.ribbonPanel12.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonPanel12.TabIndex = 34; + this.ribbonPanel12.Visible = false; + // + // ribbonBar18 + // + this.ribbonBar18.AutoOverflowEnabled = true; + // + // + // + this.ribbonBar18.BackgroundMouseOverStyle.Class = ""; + this.ribbonBar18.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonBar18.BackgroundStyle.Class = ""; + this.ribbonBar18.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar18.ContainerControlProcessDialogKey = true; + this.ribbonBar18.Dock = System.Windows.Forms.DockStyle.Left; + this.ribbonBar18.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { + this.buttonItem133, + this.buttonItem132}); + this.ribbonBar18.Location = new System.Drawing.Point(508, 0); + this.ribbonBar18.Name = "ribbonBar18"; + this.ribbonBar18.Size = new System.Drawing.Size(75, 59); + this.ribbonBar18.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.ribbonBar18.TabIndex = 1; + // + // + // + this.ribbonBar18.TitleStyle.Class = ""; + this.ribbonBar18.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonBar18.TitleStyleMouseOver.Class = ""; + this.ribbonBar18.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar18.TitleVisible = false; + // + // buttonItem133 + // + this.buttonItem133.Image = ((System.Drawing.Image)(resources.GetObject("buttonItem133.Image"))); + this.buttonItem133.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem133.Name = "buttonItem133"; + this.buttonItem133.SubItemsExpandWidth = 14; + this.buttonItem133.Text = "审核入库"; + this.buttonItem133.Click += new System.EventHandler(this.buttonItem133_Click_1); + // + // buttonItem132 + // + this.buttonItem132.Name = "buttonItem132"; + // + // ribbonBar13 + // + this.ribbonBar13.AutoOverflowEnabled = true; + // + // + // + this.ribbonBar13.BackgroundMouseOverStyle.Class = ""; + this.ribbonBar13.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonBar13.BackgroundStyle.Class = ""; + this.ribbonBar13.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar13.ContainerControlProcessDialogKey = true; + this.ribbonBar13.Dock = System.Windows.Forms.DockStyle.Left; + this.ribbonBar13.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { + this.buttonItem127, + this.buttonItem128, + this.sliderItem1, + this.buttonItem134, + this.buttonItem130, + this.btn_check_history}); + this.ribbonBar13.Location = new System.Drawing.Point(3, 0); + this.ribbonBar13.Name = "ribbonBar13"; + this.ribbonBar13.Size = new System.Drawing.Size(505, 59); + this.ribbonBar13.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.ribbonBar13.TabIndex = 0; + // + // + // + this.ribbonBar13.TitleStyle.Class = ""; + this.ribbonBar13.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonBar13.TitleStyleMouseOver.Class = ""; + this.ribbonBar13.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar13.TitleVisible = false; + // + // buttonItem127 + // + this.buttonItem127.Image = ((System.Drawing.Image)(resources.GetObject("buttonItem127.Image"))); + this.buttonItem127.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem127.Name = "buttonItem127"; + this.buttonItem127.SubItemsExpandWidth = 14; + this.buttonItem127.Text = "打开数据"; + this.buttonItem127.Click += new System.EventHandler(this.buttonItem127_Click_2); + // + // buttonItem128 + // + this.buttonItem128.Image = ((System.Drawing.Image)(resources.GetObject("buttonItem128.Image"))); + this.buttonItem128.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem128.Name = "buttonItem128"; + this.buttonItem128.SubItemsExpandWidth = 14; + this.buttonItem128.Text = "一键审核"; + this.buttonItem128.Click += new System.EventHandler(this.buttonItem128_Click); + // + // sliderItem1 + // + this.sliderItem1.LabelPosition = DevComponents.DotNetBar.eSliderLabelPosition.Top; + this.sliderItem1.LabelWidth = 50; + this.sliderItem1.Name = "sliderItem1"; + this.sliderItem1.Text = "地面透明度"; + this.sliderItem1.TextColor = System.Drawing.Color.Black; + this.sliderItem1.Value = 0; + this.sliderItem1.ValueChanged += new System.EventHandler(this.sliderItem1_ValueChanged); + // + // buttonItem134 + // + this.buttonItem134.Image = ((System.Drawing.Image)(resources.GetObject("buttonItem134.Image"))); + this.buttonItem134.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem134.Name = "buttonItem134"; + this.buttonItem134.SubItemsExpandWidth = 14; + this.buttonItem134.Text = "模拟设计修改"; + this.buttonItem134.Click += new System.EventHandler(this.buttonItem134_Click_1); + // + // buttonItem130 + // + this.buttonItem130.Image = ((System.Drawing.Image)(resources.GetObject("buttonItem130.Image"))); + this.buttonItem130.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem130.Name = "buttonItem130"; + this.buttonItem130.SubItemsExpandWidth = 14; + this.buttonItem130.Text = "导出审核图"; + this.buttonItem130.Click += new System.EventHandler(this.buttonItem130_Click_1); + // + // btn_check_history + // + this.btn_check_history.Image = ((System.Drawing.Image)(resources.GetObject("btn_check_history.Image"))); + this.btn_check_history.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.btn_check_history.Name = "btn_check_history"; + this.btn_check_history.SubItemsExpandWidth = 14; + this.btn_check_history.Text = "审核历史"; + this.btn_check_history.Click += new System.EventHandler(this.btn_check_history_Click); + // + // ribbonPanel4 + // + this.ribbonPanel4.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.ribbonPanel4.Controls.Add(this.ribbonBar1); + this.ribbonPanel4.Dock = System.Windows.Forms.DockStyle.Fill; + this.ribbonPanel4.Location = new System.Drawing.Point(0, 33); + this.ribbonPanel4.Name = "ribbonPanel4"; + this.ribbonPanel4.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); + this.ribbonPanel4.Size = new System.Drawing.Size(1328, 62); + // + // + // + this.ribbonPanel4.Style.Class = ""; + this.ribbonPanel4.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonPanel4.StyleMouseDown.Class = ""; + this.ribbonPanel4.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonPanel4.StyleMouseOver.Class = ""; + this.ribbonPanel4.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonPanel4.TabIndex = 36; + this.ribbonPanel4.Visible = false; + // + // ribbonBar1 + // + this.ribbonBar1.AutoOverflowEnabled = true; + // + // + // + this.ribbonBar1.BackgroundMouseOverStyle.Class = ""; + this.ribbonBar1.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonBar1.BackgroundStyle.Class = ""; + this.ribbonBar1.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar1.ContainerControlProcessDialogKey = true; + this.ribbonBar1.Dock = System.Windows.Forms.DockStyle.Left; + this.ribbonBar1.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { + this.btn_document_info}); + this.ribbonBar1.Location = new System.Drawing.Point(3, 0); + this.ribbonBar1.Name = "ribbonBar1"; + this.ribbonBar1.Size = new System.Drawing.Size(88, 59); + this.ribbonBar1.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.ribbonBar1.TabIndex = 0; + // + // + // + this.ribbonBar1.TitleStyle.Class = ""; + this.ribbonBar1.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonBar1.TitleStyleMouseOver.Class = ""; + this.ribbonBar1.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar1.TitleVisible = false; + // + // btn_document_info + // + this.btn_document_info.Image = ((System.Drawing.Image)(resources.GetObject("btn_document_info.Image"))); + this.btn_document_info.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.btn_document_info.Name = "btn_document_info"; + this.btn_document_info.SubItemsExpandWidth = 14; + this.btn_document_info.Text = "文档管理"; + this.btn_document_info.Click += new System.EventHandler(this.btn_document_info_Click); + // // ribbonTabItem1 // this.ribbonTabItem1.ButtonStyle = DevComponents.DotNetBar.eButtonStyle.ImageAndText; @@ -3673,7 +3694,6 @@ this.ribbonTabItem7.Name = "ribbonTabItem7"; this.ribbonTabItem7.Panel = this.ribbonPanel7; this.ribbonTabItem7.Text = "管线定位"; - this.ribbonTabItem7.MouseDown += new System.Windows.Forms.MouseEventHandler(this.ribbonTabItem7_MouseDown); // // ribbonTabItem5 // @@ -3684,7 +3704,6 @@ this.ribbonTabItem5.Name = "ribbonTabItem5"; this.ribbonTabItem5.Panel = this.ribbonPanel3; this.ribbonTabItem5.Text = "标识器管理"; - this.ribbonTabItem5.MouseDown += new System.Windows.Forms.MouseEventHandler(this.ribbonTabItem5_MouseDown); // // ribbonTabItem2 // @@ -4451,7 +4470,7 @@ this.dataGridViewX2.ReadOnly = true; this.dataGridViewX2.RowHeadersVisible = false; this.dataGridViewX2.RowTemplate.Height = 23; - this.dataGridViewX2.Size = new System.Drawing.Size(31081, 92); + this.dataGridViewX2.Size = new System.Drawing.Size(31378, 92); this.dataGridViewX2.TabIndex = 11; // // dataGridViewTextBoxColumn10 @@ -4545,7 +4564,7 @@ this.dataGridViewX3.ReadOnly = true; this.dataGridViewX3.RowHeadersVisible = false; this.dataGridViewX3.RowTemplate.Height = 23; - this.dataGridViewX3.Size = new System.Drawing.Size(31080, 127); + this.dataGridViewX3.Size = new System.Drawing.Size(31377, 127); this.dataGridViewX3.TabIndex = 5; this.dataGridViewX3.MouseDoubleClick += new System.Windows.Forms.MouseEventHandler(this.dataGridViewX3_MouseDoubleClick); // @@ -5722,7 +5741,8 @@ // pictureBox1 // this.pictureBox1.Dock = System.Windows.Forms.DockStyle.Top; - this.pictureBox1.Image = ((System.Drawing.Image)(resources.GetObject("pictureBox1.Image"))); +// this.pictureBox1.Image = ((System.Drawing.Image)(resources.GetObject("pictureBox1.Image"))); + this.pictureBox1.Image = Image.FromFile(Application.StartupPath + Utility.TitleImagePath); this.pictureBox1.Location = new System.Drawing.Point(0, 0); this.pictureBox1.Margin = new System.Windows.Forms.Padding(0); this.pictureBox1.Name = "pictureBox1"; @@ -5732,18 +5752,6 @@ this.pictureBox1.TabStop = false; this.pictureBox1.Paint += new System.Windows.Forms.PaintEventHandler(this.pictureBox1_Paint); // - // layerTree - // - this.layerTree.CheckBoxes = true; - this.layerTree.ItemHeight = 18; - this.layerTree.Location = new System.Drawing.Point(30, 78); - this.layerTree.Name = "layerTree"; - this.layerTree.Size = new System.Drawing.Size(121, 97); - this.layerTree.TabIndex = 1; - this.layerTree.AfterCheck += new System.Windows.Forms.TreeViewEventHandler(this.layerTree_AfterCheck); - this.layerTree.NodeMouseClick += new System.Windows.Forms.TreeNodeMouseClickEventHandler(this.layerTree_NodeMouseClick); - this.layerTree.NodeMouseDoubleClick += new System.Windows.Forms.TreeNodeMouseClickEventHandler(this.layerTree_NodeMouseDoubleClick); - // // MainFrm // this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Inherit; @@ -5770,7 +5778,8 @@ this.KeyPreview = true; this.Name = "MainFrm"; this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen; - this.Text = "智慧太湖新城管网规划分析系统6.0"; +// this.Text = "智慧太湖新城管网规划分析系统6.0"; + this.Text = Utility.SysnameVersion; this.WindowState = System.Windows.Forms.FormWindowState.Maximized; this.FormClosing += new System.Windows.Forms.FormClosingEventHandler(this.MainFrm_FormClosing); this.Load += new System.EventHandler(this.MainFrm_Load); @@ -5787,15 +5796,15 @@ this.contextMenuStripDeleteLayerNode.ResumeLayout(false); this.ribbonControl1.ResumeLayout(false); this.ribbonControl1.PerformLayout(); + this.ribbonPanel3.ResumeLayout(false); + this.ribbonPanel7.ResumeLayout(false); + this.ribbonPanel15.ResumeLayout(false); + this.ribbonPanel2.ResumeLayout(false); this.ribbonPanel6.ResumeLayout(false); this.ribbonPanel5.ResumeLayout(false); this.ribbonPanel1.ResumeLayout(false); this.ribbonPanel12.ResumeLayout(false); this.ribbonPanel4.ResumeLayout(false); - this.ribbonPanel15.ResumeLayout(false); - this.ribbonPanel3.ResumeLayout(false); - this.ribbonPanel7.ResumeLayout(false); - this.ribbonPanel2.ResumeLayout(false); this.panelOfTable.ResumeLayout(false); this.panelOfTable.PerformLayout(); ((System.ComponentModel.ISupportInitialize)(this.dataGridViewX1)).EndInit(); @@ -5955,6 +5964,7 @@ private RibbonTabItem ribbonTabItem11; private ButtonItem buttonItem130; private RibbonBar ribbonBar18; + private ButtonItem buttonItem132; private SliderItem sliderItem1; private ButtonItem buttonItem133; private ButtonItem buttonItem134; diff --git a/FeatureStatisticsService.cs b/FeatureStatisticsService.cs index 331ee47..b127fe3 100644 --- a/FeatureStatisticsService.cs +++ b/FeatureStatisticsService.cs @@ -190,7 +190,7 @@ List result = new List(); //layer.Name是表名 - string[] accessStrs = Utility.getAccStrsByLayer(layer.Name); + string[] accessStrs = FeatureTools.GetAccStrsByLayer(layer.Name); foreach (string accssname in accessStrs) { diff --git a/FeatureTools.cs b/FeatureTools.cs index be4b469..3c08f34 100644 --- a/FeatureTools.cs +++ b/FeatureTools.cs @@ -1,5 +1,6 @@ using System; using System.Collections.Generic; +using System.Data; using System.Linq; using System.Text; using System.Windows.Forms; @@ -43,7 +44,7 @@ } feature.Delete();//地球上删除该feature string sql = "delete from " + layerName + " where LSSYS_ID =" + feature.ID + " and (编号 is null or substr(编号,length(编号)-2)='TMP')"; - OledbHelper.sqlExecuteNonQuery(sql);//目前无法取到LSSYS_ID，所以这个判断条件不太合适，会导致把该类所有新建的都删除了 + OledbHelper.sqlExecuteNonQuery(sql); } catch (Exception) { @@ -106,5 +107,46 @@ } return value; } + + /// + /// 根据附属物图层名字得到里面含有的附属物 + /// + /// + /// + public static string[] GetAccStrsByLayer(string layername) + { + string[] accStrs = null; + string sql = "select 附属物名称 from " + layername + " group by 附属物名称"; + DataSet dataset = OledbHelper.getDataSet(sql, layername); + if (dataset == null) return null; + accStrs = new string[dataset.Tables[0].Rows.Count]; + for (int i = 0; i < dataset.Tables[0].Rows.Count; i++) + { + accStrs[i] = dataset.Tables[0].Rows[i][0].ToString(); + } + return accStrs; + } + + /// + /// 删除内存图层中指定名称的feature + /// + /// + /// + public static void RemoveFeatureFromName(GSOGlobeControl globeControl1, string featureName) + { + GSOFeatures features = globeControl1.Globe.MemoryLayer.GetFeatureByName(featureName, true); + if (features != null) + { + for (int i = features.Length - 1; i >= 0; i--) + { + GSOFeature feature = features[i]; + if (feature != null) + { + globeControl1.Globe.MemoryLayer.RemoveFeatureByID(feature.ID); + } + } + } + globeControl1.Refresh(); + } } } diff --git a/Forms/FrmPipelineModelDataBase.cs b/Forms/FrmPipelineModelDataBase.cs index b577fd8..bc1e479 100644 --- a/Forms/FrmPipelineModelDataBase.cs +++ b/Forms/FrmPipelineModelDataBase.cs @@ -149,7 +149,7 @@ catch (Exception ex) { LogError.PublishError(ex); - LogHelper.WriteLog(typeof(FrmPipelineModelDB), ex.Message); + LogHelper.Error(ex.Message); } } diff --git a/FrmAccessoriesSensor.cs b/FrmAccessoriesSensor.cs index 98aa1cf..542f19a 100644 --- a/FrmAccessoriesSensor.cs +++ b/FrmAccessoriesSensor.cs @@ -240,7 +240,7 @@ { if (clbPipeLine.CheckedItems.Count > 0) { - Utility.RemoveFeatureFromName(globeControl1, "trackPolygon"); + FeatureTools.RemoveFeatureFromName(globeControl1, "trackPolygon"); globeControl1.Globe.Action = EnumAction3D.TrackPolygon; globeControl1.TrackPolygonEndEvent += globeControl1_TrackPolygonEndEvent; } @@ -259,7 +259,7 @@ private void FrmAccessoriesgather_FormClosing(object sender, FormClosingEventArgs e) { frm = null; - Utility.RemoveFeatureFromName(globeControl1, "trackPolygon"); + FeatureTools.RemoveFeatureFromName(globeControl1, "trackPolygon"); globeControl1.Globe.Action = EnumAction3D.ActionNull; globeControl1.TrackPolygonEndEvent -= globeControl1_TrackPolygonEndEvent; } diff --git a/FrmAccessoriesgather.cs b/FrmAccessoriesgather.cs index e1d176e..c36273b 100644 --- a/FrmAccessoriesgather.cs +++ b/FrmAccessoriesgather.cs @@ -118,7 +118,7 @@ { if (clbPipeLine2.Text!="") { - Utility.RemoveFeatureFromName(globeControl1, "trackPolygon"); + FeatureTools.RemoveFeatureFromName(globeControl1, "trackPolygon"); globeControl1.Globe.Action = EnumAction3D.TrackPolygon; globeControl1.Globe.TrackPolygonTool.TrackMode = EnumTrackMode.SpaceTrack; globeControl1.TrackPolygonEndEvent += globeControl1_TrackPolygonEndEvent; @@ -295,7 +295,7 @@ private void FrmAccessoriesgather_FormClosing(object sender, FormClosingEventArgs e) { frm = null; - Utility.RemoveFeatureFromName(globeControl1, "trackPolygon"); + FeatureTools.RemoveFeatureFromName(globeControl1, "trackPolygon"); globeControl1.TrackPolygonEndEvent -= globeControl1_TrackPolygonEndEvent; globeControl1.Globe.Action = EnumAction3D.ActionNull; diff --git a/FrmAddWellShp.cs b/FrmAddWellShp.cs index 7983349..78d8946 100644 --- a/FrmAddWellShp.cs +++ b/FrmAddWellShp.cs @@ -100,7 +100,7 @@ catch (Exception ex) { LogError.PublishError(ex); - LogHelper.WriteLog(typeof(FrmAddWellShp), ex.Message); + LogHelper.Error(ex.Message); } } diff --git a/FrmBSQStatis.cs b/FrmBSQStatis.cs index 5b05926..b5e581d 100644 --- a/FrmBSQStatis.cs +++ b/FrmBSQStatis.cs @@ -97,7 +97,7 @@ } catch (Exception ex) { - LogHelper.WriteLog(typeof(FrmBSQStatis),ex.Message); + LogHelper.Error(ex.Message); } return typeAndCount; } @@ -108,7 +108,7 @@ GSOLayer layer = globeControl1.Globe.Layers.GetLayerByCaption("标识器"); GSOFeatures bsqFs = FeatureStatisticsService.GetLayerFeatures(polygon, layer); if (bsqFs == null || bsqFs.Length <= 0) { - LogHelper.WriteLog(typeof(FrmBSQStatis),"标识器图层下的Feature为空"); + LogHelper.Error("标识器图层下的Feature为空!"); return null; } diff --git a/FrmBasicQuery.cs b/FrmBasicQuery.cs index baeeade..cc8d3ff 100644 --- a/FrmBasicQuery.cs +++ b/FrmBasicQuery.cs @@ -224,7 +224,7 @@ } catch(Exception ex) { - LogHelper.WriteLog(typeof(FrmBasicQuery), ex.Message); + LogHelper.Error(ex.Message); } } else diff --git a/FrmCodingQuery.cs b/FrmCodingQuery.cs index f1ac322..d4ec095 100644 --- a/FrmCodingQuery.cs +++ b/FrmCodingQuery.cs @@ -82,7 +82,7 @@ } catch (Exception ex) { - LogHelper.WriteLog(typeof(FrmCodingQuery), ex.Message); ; + LogHelper.Error(ex.Message); } } diff --git a/FrmDiameterQuery.cs b/FrmDiameterQuery.cs index e7b3657..75d7949 100644 --- a/FrmDiameterQuery.cs +++ b/FrmDiameterQuery.cs @@ -150,7 +150,7 @@ catch (Exception ex) { //LogError.PublishError(ex); - LogHelper.WriteLog(typeof(FrmDiameterQuery), ex.Message); + LogHelper.Error(ex.Message); MessageBox.Show("请输入正确的管径范围！"); return; } diff --git a/FrmFittingQuery.cs b/FrmFittingQuery.cs index 12f6007..8645011 100644 --- a/FrmFittingQuery.cs +++ b/FrmFittingQuery.cs @@ -69,7 +69,7 @@ } catch (Exception ex) { - LogHelper.WriteLog(typeof(FrmFittingQuery), ex.Message); + LogHelper.Error(ex.Message); } } /// diff --git a/FrmKeywordQuery.cs b/FrmKeywordQuery.cs index 405524f..ede0a93 100644 --- a/FrmKeywordQuery.cs +++ b/FrmKeywordQuery.cs @@ -87,7 +87,7 @@ } catch (Exception ex) { - LogHelper.WriteLog(typeof(FrmKeywordQuery), ex.Message); + LogHelper.Error(ex.Message); } } diff --git a/FrmLogin.cs b/FrmLogin.cs index 1172c23..6fbaed9 100644 --- a/FrmLogin.cs +++ b/FrmLogin.cs @@ -2,6 +2,8 @@ using System.Data; using System.Data.OracleClient; using System.IO; +using System.Net; +using System.Text; using System.Windows.Forms; using System.Xml; using DevComponents.DotNetBar; @@ -10,16 +12,15 @@ { public partial class FrmLogin : Office2007Form { + + //登录界面 -- 配置文件的路径 + public static string filename = Application.StartupPath + "\\login.xml"; + + public FrmLogin() { InitializeComponent(); } - public string rolename = "浏览"; - public string username = ""; - public string department = ""; - - //登录界面 -- 配置文件的路径 - public static string filename = Application.StartupPath + "\\login.xml"; /// /// 登录按钮事件处理 /// @@ -28,9 +29,10 @@ private void button1_Click(object sender, EventArgs e) { bool result = ValidateUser(); +// bool result =ValidateFromUrl();//从平台获取用户角色信息，判断是否能登陆成功 if (result) { - username = txtUser.Text.Trim(); + WriteXml(); Utility.userName = txtUser.Text.Trim(); DialogResult = DialogResult.OK; Close(); @@ -43,80 +45,6 @@ } } /// - /// 关闭按钮事件处理 - /// - /// - /// - private void button2_Click(object sender, EventArgs e) - { - Close(); - } - /// - /// 验证端口号 - /// - /// - //private bool ValiPort() - //{ - // Ping p = new Ping();//创建Ping对象p - // PingReply pr = p.Send(Utility.localicenseserverip);//向指定IP或者主机名的计算机发送ICMP协议的ping数据包 - // if (pr.Status == IPStatus.Success)//如果ping成功 - // { - // try - // { - // TcpClient tcpc = new TcpClient(Utility.localicenseserverip, Utility.localicenseserverport);//对IP地址为"192.168.0.105"的计算机的1500端口提出连接申请 - // tcpc.Close(); - // return true; - // } - // catch (Exception ex) - // { - // LogError.PublishError(ex); - // MessageBox.Show("端口连接错误！" + ex.Message); - // return false; - // } - // } - // else - // { - // int times = 0;//重新连接次数; - // int count = 2;//设置尝试次数 - // while (times < count) - // { - // //Thread.Sleep(1000);//等待时间(方便测试的话，你可以改为1000) - // pr = p.Send(Utility.localicenseserverip); - - // if (pr.Status == IPStatus.Success) - // { - // try - // { - // TcpClient tcpc = new TcpClient(Utility.localicenseserverip, Utility.localicenseserverport);//对IP地址为"192.168.0.105"的计算机的1500端口提出连接申请 - // tcpc.Close(); - // return true; - // } - // catch (Exception ex) - // { - // LogError.PublishError(ex); - // MessageBox.Show("端口连接错误！" + ex.Message); - // return false; - // } - // } - // else - // { - // times++; - // if (times < count) - // { - // continue; - // } - // else - // { - // MessageBox.Show("重新尝试连接失败"); - // return false; - // } - // } - - // } - // return false; - // } - //} - /// /// 验证用户名、密码 /// /// @@ -126,24 +54,64 @@ string sql = "select * from casic_userinfotest where USERNAME='" + txtUser.Text.Trim() + "' and PASSWORD='" + passWord + "' and sysname='GHFX' "; DataTable dt = OledbHelper.QueryTable(sql); - if (dt != null && dt.Rows.Count > 0) + if (dt == null || dt.Rows.Count <= 0) return false; + if (String.IsNullOrEmpty(dt.Rows[0]["rid"].ToString())) return true; + sql = "select gid from casic_userroletest where id=" + dt.Rows[0]["rid"] + " and sysname='GHFX' "; + using (OracleDataReader reader = OracleUtils.ExecuteReader(OracleUtils.ConnectionString, CommandType.Text, sql)) { - WriteXML(); - if (!String.IsNullOrEmpty(dt.Rows[0]["rid"].ToString())) + while (reader.Read()) { - sql = "select gid from casic_userroletest where id=" + dt.Rows[0]["rid"] + " and sysname='GHFX' "; - using (OracleDataReader reader = OracleUtils.ExecuteReader(OracleUtils.ConnectionString, CommandType.Text, sql)) - { - while (reader.Read()) - { - Utility.userRole = reader[0].ToString(); - break; - } - } + Utility.userRole = reader[0].ToString(); + LogHelper.Debug("测试一下"); + break; } - return true; } - return false; + return true; + } + + + + private bool ValidateFromUrl() + { + string user = txtUser.Text.Trim(); + string pwd = textBoxPassWord.Text.Trim(); + //做成配置的 + string roleserver = Utility.RoleServer; + if (roleserver == null || roleserver.Trim().Equals("")) + { + MessageBox.Show("请在Config.xml中配置roleurl！"); + return false; + } + HttpWebRequest request = + WebRequest.Create(roleserver+"/rs/authority/user?username=" + user + "&password=" + pwd + "&appId=21") as HttpWebRequest; + if (request == null) return false; + using (HttpWebResponse response = request.GetResponse() as HttpWebResponse) + { + try + { + if (response == null || response.GetResponseStream() == null) return false; + StreamReader reader = new StreamReader(response.GetResponseStream()); + string[] result = reader.ReadToEnd().Split(','); + //解析result + if (result.Length < 5) return false; + StringBuilder userRole = new StringBuilder(""); + for (int i = 4; i < result.Length; i++) + { + string[] tmpStrings = result[i].Split('_'); + if (tmpStrings.Length < 2) continue; + userRole.Append(tmpStrings[1].Trim() + ","); + } + if (userRole.Length < 3) return false; + userRole.Remove(userRole.Length - 3, 3); + // MessageBox.Show(userRole.ToString()); + Utility.userRole = userRole.ToString(); + return Utility.userRole != null && !Utility.userRole.Equals("null"); + } + catch (Exception e) + { + return false; + } + } } private void FrmLogin_Load(object sender, EventArgs e) @@ -153,74 +121,56 @@ StartPosition = FormStartPosition.CenterScreen; - ReadXML(); + ReadXml(); } /// /// 读取上一次登录的用户名和密码 /// - private void ReadXML() + private void ReadXml() { - if (File.Exists(filename)) + if (!File.Exists(filename)) return; + //初始化XML文档操作类 + XmlDocument myDoc = new XmlDocument(); { - if (!File.Exists(filename)) + //加载XML文件 + try { + myDoc.Load(filename); + } + catch (Exception e) + { + LogError.PublishError(e); return; } - - //初始化XML文档操作类 - XmlDocument myDoc = new XmlDocument(); + //搜索指定的节点 + XmlNode serverRootNode = myDoc.SelectSingleNode("Params"); + XmlNodeList nodes = null; + if (serverRootNode != null) { - //加载XML文件 - try + nodes = serverRootNode.ChildNodes; + } + if (nodes == null) return; + foreach (XmlNode xn in nodes) + { + if (xn.Name.Equals("username")) { - myDoc.Load(filename); + txtUser.Text = xn.InnerText.Trim(); } - catch (Exception e) + else if (xn.Name.Equals("password")) { - LogError.PublishError(e); - return; + textBoxPassWord.Text = xn.InnerText.Trim(); } - //搜索指定的节点 - XmlNode serverRootNode = myDoc.SelectSingleNode("Params"); - XmlNodeList nodes = null; - if (serverRootNode != null) + else if (xn.Name.Equals("isremember")) { - nodes = serverRootNode.ChildNodes; - } - if (nodes != null) - { - foreach (XmlNode xn in nodes) - { - if (xn.Name == "username") - { - txtUser.Text = xn.InnerText.Trim(); - } - else if (xn.Name == "password") - { - textBoxPassWord.Text = xn.InnerText.Trim(); - } - else if (xn.Name == "isremember") - { - if (xn.InnerText.Trim() == "true") - { - checkBoxXRememberPassword.Checked = true; - } - else if (xn.InnerText.Trim() == "false") - { - checkBoxXRememberPassword.Checked = false; - } - } - } - + checkBoxXRememberPassword.Checked = xn.InnerText.Trim().Equals("true"); } } } - } /// /// 记录登录的用户名和密码 /// - private void WriteXML() + private void WriteXml() { if (!File.Exists(filename)) { @@ -252,31 +202,17 @@ foreach (XmlNode xn in nodes) { XmlElement xe = (XmlElement)xn; - if (xe.Name == "username") + if (xe.Name.Equals("username")) { xe.InnerText = txtUser.Text.Trim(); } - else if (xe.Name == "password") + else if (xe.Name.Equals("password")) { - if (checkBoxXRememberPassword.Checked) - { - xe.InnerText = textBoxPassWord.Text.Trim(); - } - else - { - xe.InnerText = ""; - } + xe.InnerText = checkBoxXRememberPassword.Checked ? textBoxPassWord.Text.Trim() : ""; } - else if (xe.Name == "isremember") + else if (xe.Name.Equals("isremember")) { - if (checkBoxXRememberPassword.Checked) - { - xe.InnerText = "true"; - } - else - { - xe.InnerText = "false"; - } + xe.InnerText = checkBoxXRememberPassword.Checked ? "true" : "false"; } } } diff --git a/FrmMaterialSel.cs b/FrmMaterialSel.cs index 8645ab3..d23f385 100644 --- a/FrmMaterialSel.cs +++ b/FrmMaterialSel.cs @@ -157,7 +157,7 @@ } catch (Exception ex) { - LogHelper.WriteLog(typeof(FrmMaterialSel), ex.Message); + LogHelper.Error(ex.Message); } } diff --git a/FrmMetadataStat.cs b/FrmMetadataStat.cs index c3c1359..96029a6 100644 --- a/FrmMetadataStat.cs +++ b/FrmMetadataStat.cs @@ -96,7 +96,7 @@ //统计有多少个图层 private int statistLayer() { - List datasrcs = Utility.layerConfig.datasrcs; + List datasrcs = Utility.LayerConfig.datasrcs; return datasrcs.SelectMany(datasrc => datasrc.layertypes).Sum(layerType => layerType.layers.Count); } diff --git a/FrmpipeDeepstatis.cs b/FrmpipeDeepstatis.cs index 6a5c895..8d915a9 100644 --- a/FrmpipeDeepstatis.cs +++ b/FrmpipeDeepstatis.cs @@ -2,6 +2,7 @@ using System.Collections.Generic; using System.Diagnostics; using System.IO; +using System.Reflection; using System.Text; using System.Windows.Forms; using System.Windows.Forms.DataVisualization.Charting; @@ -320,7 +321,7 @@ MessageBox.Show("请添加分段"); return; } - Utility.RemoveFeatureFromName(globeControl1, "trackPolygon"); + FeatureTools.RemoveFeatureFromName(globeControl1, "trackPolygon"); globeControl1.Globe.Action = EnumAction3D.TrackPolygon; globeControl1.Globe.TrackPolygonTool.TrackMode = EnumTrackMode.SpaceTrack; globeControl1.TrackPolygonEndEvent += globeControl1_TrackPolygonEndEvent; @@ -408,12 +409,11 @@ TextBox control; private void dataGridViewX2_EditingControlShowing(object sender, DataGridViewEditingControlShowingEventArgs e) { - if (e.Control.GetType().BaseType.Name == "TextBox") - { - control = new TextBox(); - control = (TextBox)e.Control; - control.KeyPress += control_KeyPress; - } + MemberInfo memberInfo = e.Control.GetType().BaseType; + if (memberInfo != null && !memberInfo.Name.Equals("TextBox")) return; + control = new TextBox(); + control = (TextBox)e.Control; + control.KeyPress += control_KeyPress; } /// /// 键盘按键按下事件处理 @@ -423,28 +423,24 @@ void control_KeyPress(object sender, KeyPressEventArgs e) { TextBox text = sender as TextBox; + if (text == null) return; if ((e.KeyChar < 48 || e.KeyChar > 57) && (e.KeyChar != 8) && e.KeyChar != 46) { e.Handled = true; } - if (e.KeyChar == 46) //小数点 + if (e.KeyChar != 46) return; + if (text.Text.Length <= 0) + e.Handled = true; //小数点不能在第一位 + else //处理不规则的小数点 { - if (text.Text.Length <= 0) - e.Handled = true; //小数点不能在第一位 - else //处理不规则的小数点 + float f; + float oldf; + bool b1 = false, b2 = false; + b1 = float.TryParse(text.Text, out oldf); + b2 = float.TryParse(text.Text + e.KeyChar, out f); + if (!b2) { - float f; - float oldf; - bool b1 = false, b2 = false; - b1 = float.TryParse(text.Text, out oldf); - b2 = float.TryParse(text.Text + e.KeyChar, out f); - if (b2 == false) - { - if (b1) - e.Handled = true; - else - e.Handled = false; - } + e.Handled = b1; } } } @@ -457,7 +453,7 @@ { frm = null; - Utility.RemoveFeatureFromName(globeControl1, "trackPolygon"); + FeatureTools.RemoveFeatureFromName(globeControl1, "trackPolygon"); globeControl1.TrackPolygonEndEvent -= globeControl1_TrackPolygonEndEvent; globeControl1.Globe.Action = EnumAction3D.ActionNull; diff --git a/FrmpipeDiametergather.cs b/FrmpipeDiametergather.cs index a9d96fa..c09aaf1 100644 --- a/FrmpipeDiametergather.cs +++ b/FrmpipeDiametergather.cs @@ -154,7 +154,7 @@ MessageBox.Show("请选择图层！"); return; } - Utility.RemoveFeatureFromName(globeControl1, "trackPolygon"); + FeatureTools.RemoveFeatureFromName(globeControl1, "trackPolygon"); globeControl1.Globe.Action = EnumAction3D.TrackPolygon; globeControl1.Globe.TrackPolygonTool.TrackMode = EnumTrackMode.SpaceTrack; globeControl1.TrackPolygonEndEvent += globeControl1_TrackPolygonEndEvent; @@ -392,7 +392,7 @@ private void FrmpipeDiametergather_FormClosing(object sender, FormClosingEventArgs e) { frm = null; - Utility.RemoveFeatureFromName(globeControl1, "trackPolygon"); + FeatureTools.RemoveFeatureFromName(globeControl1, "trackPolygon"); globeControl1.TrackPolygonEndEvent -= globeControl1_TrackPolygonEndEvent; globeControl1.Globe.Action = EnumAction3D.ActionNull; diff --git a/FrmpipeMaterialGather.cs b/FrmpipeMaterialGather.cs index 44e7f24..5ca8144 100644 --- a/FrmpipeMaterialGather.cs +++ b/FrmpipeMaterialGather.cs @@ -58,10 +58,9 @@ for (int i = 0; i < pipeLayerNames.Count; i++) { clbPipeLine.Items.Add(pipeLayerNames[i]); - GSOLayer layer = globeControl1.Globe.Layers.GetLayerByCaption(pipeLayerNames[i]); - if (layer.Dataset == null || !layer.Dataset.IsFeatureDataset || layer.Type != EnumLayerType.FeatureLayer) continue; + GSOLayer layer = globeControl1.Globe.Layers.GetLayerByCaption(pipeLayerNames[i]); + if (layer == null || layer.Dataset == null || !layer.Dataset.IsFeatureDataset || layer.Type != EnumLayerType.FeatureLayer) continue; - string name = layer.Name; GSOFeatureLayer flayer = layer as GSOFeatureLayer; GSOFeatures feats = flayer.GetAllFeatures(); @@ -205,7 +204,7 @@ { chart1.Series.Add(clbPipeLine.CheckedItems[i].ToString()); GSOLayer layer = globeControl1.Globe.Layers.GetLayerByCaption(clbPipeLine.CheckedItems[i].ToString()); - if (layer != null && layer is GSOFeatureLayer) + if (layer is GSOFeatureLayer) { GSOFeatureLayer flayer = layer as GSOFeatureLayer; GSOFeatures features = flayer.GetAllFeatures(); @@ -240,10 +239,9 @@ labeStyleAxisX.Enabled = true; chart1.ChartAreas["ChartArea1"].AxisX.LabelStyle = labeStyleAxisX; - Dictionary dic1 = new Dictionary(); for (int j = 0; j < chart1.Series.Count; j++) { - dic1 = new Dictionary(); + Dictionary dic1 = new Dictionary(); foreach (string key in dic.Keys) { if (key.Contains(chart1.Series[j].Name)) @@ -304,7 +302,7 @@ MessageBox.Show("请选择材质类型！"); return; } - Utility.RemoveFeatureFromName(globeControl1, "trackPolygon"); + FeatureTools.RemoveFeatureFromName(globeControl1, "trackPolygon"); globeControl1.Globe.Action = EnumAction3D.TrackPolygon; globeControl1.Globe.TrackPolygonTool.TrackMode = EnumTrackMode.SpaceTrack; globeControl1.TrackPolygonEndEvent += globeControl1_TrackPolygonEndEvent; @@ -318,7 +316,7 @@ private void FrmpipeMaterialGather_FormClosing(object sender, FormClosingEventArgs e) { frm = null; - Utility.RemoveFeatureFromName(globeControl1, "trackPolygon"); + FeatureTools.RemoveFeatureFromName(globeControl1, "trackPolygon"); globeControl1.TrackPolygonEndEvent -= globeControl1_TrackPolygonEndEvent; globeControl1.Globe.Action = EnumAction3D.ActionNull; diff --git a/Frmpipediameterstatis.cs b/Frmpipediameterstatis.cs index 4fb25a8..631a996 100644 --- a/Frmpipediameterstatis.cs +++ b/Frmpipediameterstatis.cs @@ -202,8 +202,8 @@ } catch (Exception ex) { - LogHelper.WriteLog(typeof(Frmpipediameterstatis), ex.Message); //MessageBox.Show(ex.Message); + LogHelper.Error(ex.Message); LogError.PublishError(ex); } } @@ -372,7 +372,7 @@ MessageBox.Show("请添加分段！"); return; } - Utility.RemoveFeatureFromName(globeControl1, "trackPolygon"); + FeatureTools.RemoveFeatureFromName(globeControl1, "trackPolygon"); globeControl1.Globe.Action = EnumAction3D.TrackPolygon; globeControl1.Globe.TrackPolygonTool.TrackMode = EnumTrackMode.SpaceTrack; globeControl1.TrackPolygonEndEvent += globeControl1_TrackPolygonEndEvent; @@ -422,7 +422,7 @@ globeControl1.Globe.Action = EnumAction3D.ActionNull; globeControl1.TrackPolygonEndEvent -= globeControl1_TrackPolygonEndEvent; - Utility.RemoveFeatureFromName(globeControl1, "trackPolygon"); + FeatureTools.RemoveFeatureFromName(globeControl1, "trackPolygon"); globeControl1.Globe.MemoryLayer.RemoveAllFeature(); } diff --git a/LineBuilder.cs b/LineBuilder.cs index 33a216c..b6a8516 100644 --- a/LineBuilder.cs +++ b/LineBuilder.cs @@ -43,8 +43,8 @@ GSOGeoPolyline3D lineeee = f.Geometry as GSOGeoPolyline3D; if (lineeee == null || lineeee.GetSpaceLength(true, 6378137) == 0) { - LogHelper.WriteLog(typeof(LineBuilder), "出现数据无法入库:"+f.ID); - continue; //TODO LIST:判断是否会出现部署数据无法入库情况,Log2Net + LogHelper.Error("出现数据无法入库:" + f.ID); + continue; } GSOFeature newFeature = newFeatureSet.CreateFeature(); diff --git a/LogHelper.cs b/LogHelper.cs index 9ef5f27..04573cf 100644 --- a/LogHelper.cs +++ b/LogHelper.cs @@ -1,4 +1,5 @@ using System; +using System.Diagnostics; using log4net; using log4net.Config; @@ -7,35 +8,82 @@ { public class LogHelper { - /// - /// 输出日志到Log4Net - /// - /// - /// - #region static void WriteLog(Type t, Exception ex) - public static void WriteLog(Type t, Exception ex) + private static ILog _logdebug = log4net.LogManager.GetLogger("logdebug"); + private static ILog _loginfo = log4net.LogManager.GetLogger("loginfo"); + private static ILog _logwarn = log4net.LogManager.GetLogger("logwarn"); + private static ILog _logerror = log4net.LogManager.GetLogger("logerror"); + private static ILog _logfatal = log4net.LogManager.GetLogger("logfatal"); + + public static void Debug(string msg) { - ILog log = log4net.LogManager.GetLogger(t); - log.Error("Error", ex); + StackFrame sf = new StackFrame(1); + msg = string.Format("{0}.{1}:{2}", sf.GetMethod().ReflectedType.FullName, sf.GetMethod().Name, msg); + _logdebug.Debug(msg); + } + public static void Debug(string msg, Exception e) + { + StackFrame sf = new StackFrame(1); + msg = string.Format("{0}.{1}:{2}", sf.GetMethod().ReflectedType.FullName, sf.GetMethod().Name, msg); + _logdebug.Debug(msg, e); } - #endregion - /// - /// 输出日志到Log4Net - /// - /// - /// - #region static void WriteLog(Type t, string msg) - - public static void WriteLog(Type t, string msg) + public static void Info(string msg) { - ILog log = log4net.LogManager.GetLogger(t); - log.Error(msg); + StackFrame sf = new StackFrame(1); + msg = string.Format("{0}.{1}:{2}", sf.GetMethod().ReflectedType.FullName, sf.GetMethod().Name, msg); + _loginfo.Info(msg); + } + public static void Info(string msg, Exception e) + { + StackFrame sf = new StackFrame(1); + msg = string.Format("{0}.{1}:{2}", sf.GetMethod().ReflectedType.FullName, sf.GetMethod().Name, msg); + _loginfo.Info(msg, e); } - #endregion + + public static void Warn(string msg) + { + StackFrame sf = new StackFrame(1); + msg = string.Format("{0}.{1}:{2}", sf.GetMethod().ReflectedType.FullName, sf.GetMethod().Name, msg); + _logwarn.Warn(msg); + } + public static void Warn(string msg, Exception e) + { + StackFrame sf = new StackFrame(1); + msg = string.Format("{0}.{1}:{2}", sf.GetMethod().ReflectedType.FullName, sf.GetMethod().Name, msg); + _logwarn.Warn(msg, e); + } + + + public static void Error(string msg) + { + StackFrame sf = new StackFrame(1); + msg = string.Format("{0}.{1}:{2}", sf.GetMethod().ReflectedType.FullName, sf.GetMethod().Name, msg); + _logerror.Error(msg); + } + public static void Error(string msg, Exception e) + { + StackFrame sf = new StackFrame(1); + msg = string.Format("{0}.{1}:{2}", sf.GetMethod().ReflectedType.FullName, sf.GetMethod().Name, msg); + _logerror.Error(msg, e); + } + + + public static void Fatal(string msg) + { + StackFrame sf = new StackFrame(1); + msg = string.Format("{0}.{1}:{2}", sf.GetMethod().ReflectedType.FullName, sf.GetMethod().Name, msg); + _logfatal.Fatal(msg); + } + public static void Fatal(string msg, Exception e) + { + StackFrame sf = new StackFrame(1); + msg = string.Format("{0}.{1}:{2}", sf.GetMethod().ReflectedType.FullName, sf.GetMethod().Name, msg); + _logfatal.Fatal(msg, e); + } + } diff --git a/MainFrm.cs b/MainFrm.cs index 43de664..51f362a 100644 --- a/MainFrm.cs +++ b/MainFrm.cs @@ -18,7 +18,6 @@ using GeoScene.Data; using GeoScene.Engine; using GeoScene.Globe; -using Timer = System.Windows.Forms.Timer; using ToolTip = System.Windows.Forms.ToolTip; namespace Cyberpipe @@ -163,6 +162,7 @@ /// private void AddGZ() { + lendendGZ50 = new GSOHudButton(); lendendGZ50.SetImage(Application.StartupPath + "/Resource/管纵/50.png"); lendendGZ50.SetOffset(0, 0); @@ -1294,18 +1294,19 @@ private void MainFrm_Load(object sender, EventArgs e) { + layerTree.Nodes.Add("正在加载，请稍后……");//树状图加载在图层加载之后，故增加提示 initGlobalControl(); - //initGlobalMap(); - //initLayerTree(); initMarkerTree(); initLayout(); loadData(); - double x = Convert.ToDouble(Utility.Query_Roads["定位"].ToString().Split(',')[0]); - double y = Convert.ToDouble(Utility.Query_Roads["定位"].ToString().Split(',')[1]); - double z = Convert.ToDouble(Utility.Query_Roads["定位"].ToString().Split(',')[2]); + + double x = Convert.ToDouble(Utility.Query_Roads["绿岛"].ToString().Split(',')[0]); + double y = Convert.ToDouble(Utility.Query_Roads["绿岛"].ToString().Split(',')[1]); + double z = Convert.ToDouble(Utility.Query_Roads["绿岛"].ToString().Split(',')[2]); jumpToCameraState(x, y, z); + } #endregion @@ -1315,11 +1316,17 @@ if (e.Layer == null || !e.Layer.Caption.Equals(Utility.roadLayerName)) return; foreach (TreeNode layerTreeNode in layerTree.Nodes) { - foreach (TreeNode node in layerTreeNode.Nodes) + for (int i=0;i dt, DataGridView dataGridView) @@ -7330,7 +7337,7 @@ } catch (Exception ex) { - LogHelper.WriteLog(typeof(MainFrm), ex); + LogHelper.Debug("", ex); } } } @@ -7362,7 +7369,7 @@ GSOLayer layer = globeControl1.Globe.Layers.Add(strDataPath); if (layer == null) {//wxl - LogHelper.WriteLog(typeof(MainFrm), "buttonItemHX1_Click操作中，" + strDataPath + "的layer为空"); + LogHelper.Error("buttonItemHX1_Click操作中，" + strDataPath + "的layer为空"); continue; } GSOFeatures redFeatures = layer.GetAllFeatures(); @@ -7457,17 +7464,12 @@ { try { + globeControl1.BeforeSceneRenderEvent -= globeControl1_BeforeSceneRenderEvent; globeControl2.BeforeSceneRenderEvent -= globeControl2_BeforeSceneRenderEvent; - double x = Convert.ToDouble(Utility.Query_Roads["定位"].ToString().Split(',')[0]); - double y = Convert.ToDouble(Utility.Query_Roads["定位"].ToString().Split(',')[1]); - double z = Convert.ToDouble(Utility.Query_Roads["定位"].ToString().Split(',')[2]); - jumpToCameraState(x, y, z); - /* globeControl1.Globe.FlyToPosition(new GSOPoint3d(120.610963, 31.188121, 50), EnumAltitudeMode.Absolute, -4, 50, 800); globeControl1.Globe.FlyToPointSpeed = 10000000; - * */ globeControl1.Globe.Action = EnumAction3D.SelectObject; globeControl1.Refresh(); @@ -7489,6 +7491,37 @@ } } /// + /// 基础工具 + /// + /// + /// + private void ribbonTabItem1_MouseDown(object sender, MouseEventArgs e) + { + try + { + + globeControl1.BeforeSceneRenderEvent -= globeControl1_BeforeSceneRenderEvent; + globeControl2.BeforeSceneRenderEvent -= globeControl2_BeforeSceneRenderEvent; + + globeControl1.Globe.Action = EnumAction3D.ActionNull; + dataGridViewX1.AutoSizeColumnsMode = DataGridViewAutoSizeColumnsMode.AllCells; + //zhanshi = false; + redSH = false; + splitContainer1.Panel2Collapsed = true; + panelOfTable.Visible = false; + legendSC.Visible = false; + legendSG.Visible = false; + ClearGZData(); + GSOLayer redLayer = globeControl1.Globe.Layers.GetLayerByCaption("红线"); + if (redLayer == null) return; + redLayer.Visible = false; + } + catch (Exception ex) + { + //MessageBox.Show("系统运行错误:" + ex.ToString(), "错误", MessageBoxButtons.OK, MessageBoxIcon.Error); + } + } + /// /// 一键审核 /// /// @@ -7497,6 +7530,7 @@ { try { + globeControl1.BeforeSceneRenderEvent -= globeControl1_BeforeSceneRenderEvent; globeControl2.BeforeSceneRenderEvent -= globeControl2_BeforeSceneRenderEvent; @@ -7518,32 +7552,7 @@ //MessageBox.Show("系统运行错误:" + ex.ToString(), "错误", MessageBoxButtons.OK, MessageBoxIcon.Error); } } - - void ResetRibbonTab() - { - try - { - globeControl1.BeforeSceneRenderEvent -= globeControl1_BeforeSceneRenderEvent; - globeControl2.BeforeSceneRenderEvent -= globeControl2_BeforeSceneRenderEvent; - - globeControl1.Globe.Action = EnumAction3D.ActionNull; - dataGridViewX1.AutoSizeColumnsMode = DataGridViewAutoSizeColumnsMode.AllCells; - //zhanshi = false; - redSH = false; - splitContainer1.Panel2Collapsed = true; - panelOfTable.Visible = false; - legendSC.Visible = false; - legendSG.Visible = false; - ClearGZData(); - GSOLayer redLayer = globeControl1.Globe.Layers.GetLayerByCaption("红线"); - if (redLayer == null) return; - redLayer.Visible = false; - } - catch (Exception ex) - { - LogHelper.WriteLog(typeof(MainFrm), ex); - } - } + /// /// 双屏对比 /// @@ -7553,8 +7562,8 @@ { try { - globeControl1.BeforeSceneRenderEvent += new BeforeSceneRenderEventHandler(globeControl1_BeforeSceneRenderEvent); - globeControl2.BeforeSceneRenderEvent += new BeforeSceneRenderEventHandler(globeControl2_BeforeSceneRenderEvent); + globeControl1.BeforeSceneRenderEvent += globeControl1_BeforeSceneRenderEvent; + globeControl2.BeforeSceneRenderEvent += globeControl2_BeforeSceneRenderEvent; globeControl1.Globe.Action = EnumAction3D.ActionNull; panelOfTable.Visible = false; @@ -7570,32 +7579,43 @@ GSOLayer redLayer = globeControl1.Globe.Layers.GetLayerByCaption("红线"); if (redLayer != null) - { redLayer.Visible = false; - } } catch (Exception ex) { - LogHelper.WriteLog(typeof(MainFrm), ex); + //MessageBox.Show("系统运行错误:" + ex.ToString(), "错误", MessageBoxButtons.OK, MessageBoxIcon.Error); } } /// - /// 基础工具 - /// - /// - /// - private void ribbonTabItem1_MouseDown(object sender, MouseEventArgs e) - { - ResetRibbonTab(); - } - /// /// 文档管理 /// /// /// private void ribbonTabItem4_MouseDown(object sender, MouseEventArgs e) { - ResetRibbonTab(); + try + { + + globeControl1.BeforeSceneRenderEvent -= globeControl1_BeforeSceneRenderEvent; + globeControl2.BeforeSceneRenderEvent -= globeControl2_BeforeSceneRenderEvent; + + globeControl1.Globe.Action = EnumAction3D.ActionNull; + panelOfTable.Visible = false; + //zhanshi = false; + redSH = false; + splitContainer1.Panel2Collapsed = true; + dataGridViewX1.AutoSizeColumnsMode = DataGridViewAutoSizeColumnsMode.AllCells; + legendSC.Visible = false; + legendSG.Visible = false; + ClearGZData(); + GSOLayer redLayer = globeControl1.Globe.Layers.GetLayerByCaption("红线"); + if (redLayer != null) + redLayer.Visible = false; + } + catch (Exception ex) + { + //MessageBox.Show("系统运行错误:" + ex.ToString(), "错误", MessageBoxButtons.OK, MessageBoxIcon.Error); + } } /// /// 基础管理 @@ -7604,7 +7624,29 @@ /// private void ribbonTabItem14_MouseDown(object sender, MouseEventArgs e) { - ResetRibbonTab(); + try + { + globeControl1.BeforeSceneRenderEvent -= globeControl1_BeforeSceneRenderEvent; + globeControl2.BeforeSceneRenderEvent -= globeControl2_BeforeSceneRenderEvent; + + globeControl1.Globe.Action = EnumAction3D.ActionNull; + panelOfTable.Visible = false; + //zhanshi = false; + redSH = false; + splitContainer1.Panel2Collapsed = true; + dataGridViewX1.AutoSizeColumnsMode = DataGridViewAutoSizeColumnsMode.AllCells; + legendSC.Visible = false; + legendSG.Visible = false; + ClearGZData(); + + GSOLayer redLayer = globeControl1.Globe.Layers.GetLayerByCaption("红线"); + if (redLayer != null) + redLayer.Visible = false; + } + catch (Exception ex) + { + //MessageBox.Show("系统运行错误:" + ex.ToString(), "错误", MessageBoxButtons.OK, MessageBoxIcon.Error); + } } /// /// 权限管理 @@ -7613,26 +7655,31 @@ /// private void ribbonTabItem2_MouseDown(object sender, MouseEventArgs e) { - ResetRibbonTab(); + try + { + globeControl1.BeforeSceneRenderEvent -= globeControl1_BeforeSceneRenderEvent; + globeControl2.BeforeSceneRenderEvent -= globeControl2_BeforeSceneRenderEvent; + + globeControl1.Globe.Action = EnumAction3D.ActionNull; + panelOfTable.Visible = false; + //zhanshi = false; + redSH = false; + splitContainer1.Panel2Collapsed = true; + dataGridViewX1.AutoSizeColumnsMode = DataGridViewAutoSizeColumnsMode.AllCells; + legendSC.Visible = false; + legendSG.Visible = false; + ClearGZData(); + + GSOLayer redLayer = globeControl1.Globe.Layers.GetLayerByCaption("红线"); + if (redLayer == null) return; + redLayer.Visible = false; + } + catch (Exception ex) + { + //MessageBox.Show("系统运行错误:" + ex.ToString(), "错误", MessageBoxButtons.OK, MessageBoxIcon.Error); + } } - /// - /// 管线定位 - /// - /// - /// - private void ribbonTabItem7_MouseDown(object sender, MouseEventArgs e) - { - ResetRibbonTab(); - } - /// - /// 标识器管理 - /// - /// - /// - private void ribbonTabItem5_MouseDown(object sender, MouseEventArgs e) - { - ResetRibbonTab(); - } + //GSOFeature dpFeatuer = null; /// /// 双屏分析，点击管段分析 @@ -8017,7 +8064,9 @@ private void btn_flag_Click(object sender, EventArgs e) { if (FrmFlagManagers.IS_OPEN) + { return; + } FrmFlagManagers frm = new FrmFlagManagers(globeControl1); frm.Show(this); } diff --git a/MainFrm.designer.cs b/MainFrm.designer.cs index e3dca41..73398c0 100644 --- a/MainFrm.designer.cs +++ b/MainFrm.designer.cs @@ -4,6 +4,7 @@ using DevComponents.DotNetBar; using DevComponents.DotNetBar.Controls; using DevComponents.Editors; +using System.Drawing; namespace Cyberpipe { @@ -89,6 +90,7 @@ this.sideBar1 = new DevComponents.DotNetBar.SideBar(); this.panelEx3 = new DevComponents.DotNetBar.PanelEx(); this.layerSensorTree = new System.Windows.Forms.TreeView(); + this.layerTree = new Cyberpipe.MyTreeView(); this.sideBarPanelItem3 = new DevComponents.DotNetBar.SideBarPanelItem(); this.controlContainerItem3 = new DevComponents.DotNetBar.ControlContainerItem(); this.sideBarPanelItem4 = new DevComponents.DotNetBar.SideBarPanelItem(); @@ -243,42 +245,18 @@ this.保存ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.定位ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.ribbonControl1 = new DevComponents.DotNetBar.RibbonControl(); - this.ribbonPanel6 = new DevComponents.DotNetBar.RibbonPanel(); - this.ribbonBar6 = new DevComponents.DotNetBar.RibbonBar(); - this.buttonItemSPSZ = new DevComponents.DotNetBar.ButtonItem(); - this.buttonItem8 = new DevComponents.DotNetBar.ButtonItem(); - this.buttonItemLocation = new DevComponents.DotNetBar.ButtonItem(); - this.sliderItem2 = new DevComponents.DotNetBar.SliderItem(); - this.buttonItemGBJC = new DevComponents.DotNetBar.ButtonItem(); - this.ribbonPanel5 = new DevComponents.DotNetBar.RibbonPanel(); - this.ribbonBar2 = new DevComponents.DotNetBar.RibbonBar(); - this.buttonItemHX1 = new DevComponents.DotNetBar.ButtonItem(); - this.buttonItemHX2 = new DevComponents.DotNetBar.ButtonItem(); - this.buttonItemDCTP = new DevComponents.DotNetBar.ButtonItem(); - this.sliderItem3 = new DevComponents.DotNetBar.SliderItem(); - this.ribbonPanel1 = new DevComponents.DotNetBar.RibbonPanel(); - this.ribbonBar21 = new DevComponents.DotNetBar.RibbonBar(); - this.buttonItem87 = new DevComponents.DotNetBar.ButtonItem(); - this.buttonItem88 = new DevComponents.DotNetBar.ButtonItem(); - this.buttonItem27 = new DevComponents.DotNetBar.ButtonItem(); - this.buttonItem91 = new DevComponents.DotNetBar.ButtonItem(); - this.buttonItem1 = new DevComponents.DotNetBar.ButtonItem(); - this.btnlegendSet = new DevComponents.DotNetBar.ButtonItem(); - this.buttonItem89 = new DevComponents.DotNetBar.ButtonItem(); - this.btnOutputJPG = new DevComponents.DotNetBar.ButtonItem(); - this.ribbonPanel12 = new DevComponents.DotNetBar.RibbonPanel(); - this.ribbonBar18 = new DevComponents.DotNetBar.RibbonBar(); - this.buttonItem133 = new DevComponents.DotNetBar.ButtonItem(); - this.ribbonBar13 = new DevComponents.DotNetBar.RibbonBar(); - this.buttonItem127 = new DevComponents.DotNetBar.ButtonItem(); - this.buttonItem128 = new DevComponents.DotNetBar.ButtonItem(); - this.sliderItem1 = new DevComponents.DotNetBar.SliderItem(); - this.buttonItem134 = new DevComponents.DotNetBar.ButtonItem(); - this.buttonItem130 = new DevComponents.DotNetBar.ButtonItem(); - this.btn_check_history = new DevComponents.DotNetBar.ButtonItem(); - this.ribbonPanel4 = new DevComponents.DotNetBar.RibbonPanel(); - this.ribbonBar1 = new DevComponents.DotNetBar.RibbonBar(); - this.btn_document_info = new DevComponents.DotNetBar.ButtonItem(); + this.ribbonPanel3 = new DevComponents.DotNetBar.RibbonPanel(); + this.ribbonBar4 = new DevComponents.DotNetBar.RibbonBar(); + this.btn_flag = new DevComponents.DotNetBar.ButtonItem(); + this.slider4ground = new DevComponents.DotNetBar.SliderItem(); + this.ribbonPanel7 = new DevComponents.DotNetBar.RibbonPanel(); + this.gxdw_ribbonbar = new DevComponents.DotNetBar.RibbonBar(); + this.buttonItem9 = new DevComponents.DotNetBar.ButtonItem(); + this.buttonItem10 = new DevComponents.DotNetBar.ButtonItem(); + this.buttonItem11 = new DevComponents.DotNetBar.ButtonItem(); + this.buttonItem12 = new DevComponents.DotNetBar.ButtonItem(); + this.buttonItem13 = new DevComponents.DotNetBar.ButtonItem(); + this.buttonItem14 = new DevComponents.DotNetBar.ButtonItem(); this.ribbonPanel15 = new DevComponents.DotNetBar.RibbonPanel(); this.ribbonBar20 = new DevComponents.DotNetBar.RibbonBar(); this.buttonItemSH = new DevComponents.DotNetBar.ButtonItem(); @@ -334,18 +312,6 @@ this.buttonItemXT4 = new DevComponents.DotNetBar.ButtonItem(); this.buttonItemXT4_1 = new DevComponents.DotNetBar.ButtonItem(); this.buttonItemXT4_2 = new DevComponents.DotNetBar.ButtonItem(); - this.ribbonPanel3 = new DevComponents.DotNetBar.RibbonPanel(); - this.ribbonBar4 = new DevComponents.DotNetBar.RibbonBar(); - this.btn_flag = new DevComponents.DotNetBar.ButtonItem(); - this.slider4ground = new DevComponents.DotNetBar.SliderItem(); - this.ribbonPanel7 = new DevComponents.DotNetBar.RibbonPanel(); - this.gxdw_ribbonbar = new DevComponents.DotNetBar.RibbonBar(); - this.buttonItem9 = new DevComponents.DotNetBar.ButtonItem(); - this.buttonItem10 = new DevComponents.DotNetBar.ButtonItem(); - this.buttonItem11 = new DevComponents.DotNetBar.ButtonItem(); - this.buttonItem12 = new DevComponents.DotNetBar.ButtonItem(); - this.buttonItem13 = new DevComponents.DotNetBar.ButtonItem(); - this.buttonItem14 = new DevComponents.DotNetBar.ButtonItem(); this.ribbonPanel2 = new DevComponents.DotNetBar.RibbonPanel(); this.ribbonBar3 = new DevComponents.DotNetBar.RibbonBar(); this.btn_user_info = new DevComponents.DotNetBar.ButtonItem(); @@ -355,6 +321,43 @@ this.btn_user_role = new DevComponents.DotNetBar.ButtonItem(); this.btn_password_edit = new DevComponents.DotNetBar.ButtonItem(); this.buttonItemPasswordReset = new DevComponents.DotNetBar.ButtonItem(); + this.ribbonPanel6 = new DevComponents.DotNetBar.RibbonPanel(); + this.ribbonBar6 = new DevComponents.DotNetBar.RibbonBar(); + this.buttonItemSPSZ = new DevComponents.DotNetBar.ButtonItem(); + this.buttonItem8 = new DevComponents.DotNetBar.ButtonItem(); + this.buttonItemLocation = new DevComponents.DotNetBar.ButtonItem(); + this.sliderItem2 = new DevComponents.DotNetBar.SliderItem(); + this.buttonItemGBJC = new DevComponents.DotNetBar.ButtonItem(); + this.ribbonPanel5 = new DevComponents.DotNetBar.RibbonPanel(); + this.ribbonBar2 = new DevComponents.DotNetBar.RibbonBar(); + this.buttonItemHX1 = new DevComponents.DotNetBar.ButtonItem(); + this.buttonItemHX2 = new DevComponents.DotNetBar.ButtonItem(); + this.buttonItemDCTP = new DevComponents.DotNetBar.ButtonItem(); + this.sliderItem3 = new DevComponents.DotNetBar.SliderItem(); + this.ribbonPanel1 = new DevComponents.DotNetBar.RibbonPanel(); + this.ribbonBar21 = new DevComponents.DotNetBar.RibbonBar(); + this.buttonItem87 = new DevComponents.DotNetBar.ButtonItem(); + this.buttonItem88 = new DevComponents.DotNetBar.ButtonItem(); + this.buttonItem27 = new DevComponents.DotNetBar.ButtonItem(); + this.buttonItem91 = new DevComponents.DotNetBar.ButtonItem(); + this.buttonItem1 = new DevComponents.DotNetBar.ButtonItem(); + this.btnlegendSet = new DevComponents.DotNetBar.ButtonItem(); + this.buttonItem89 = new DevComponents.DotNetBar.ButtonItem(); + this.btnOutputJPG = new DevComponents.DotNetBar.ButtonItem(); + this.ribbonPanel12 = new DevComponents.DotNetBar.RibbonPanel(); + this.ribbonBar18 = new DevComponents.DotNetBar.RibbonBar(); + this.buttonItem133 = new DevComponents.DotNetBar.ButtonItem(); + this.buttonItem132 = new DevComponents.DotNetBar.ButtonItem(); + this.ribbonBar13 = new DevComponents.DotNetBar.RibbonBar(); + this.buttonItem127 = new DevComponents.DotNetBar.ButtonItem(); + this.buttonItem128 = new DevComponents.DotNetBar.ButtonItem(); + this.sliderItem1 = new DevComponents.DotNetBar.SliderItem(); + this.buttonItem134 = new DevComponents.DotNetBar.ButtonItem(); + this.buttonItem130 = new DevComponents.DotNetBar.ButtonItem(); + this.btn_check_history = new DevComponents.DotNetBar.ButtonItem(); + this.ribbonPanel4 = new DevComponents.DotNetBar.RibbonPanel(); + this.ribbonBar1 = new DevComponents.DotNetBar.RibbonBar(); + this.btn_document_info = new DevComponents.DotNetBar.ButtonItem(); this.ribbonTabItem1 = new DevComponents.DotNetBar.RibbonTabItem(); this.ribbonTabItem11 = new DevComponents.DotNetBar.RibbonTabItem(); this.ribbonTabItem6 = new DevComponents.DotNetBar.RibbonTabItem(); @@ -516,7 +519,6 @@ this.labelX17 = new DevComponents.DotNetBar.LabelX(); this.panelEx4 = new DevComponents.DotNetBar.PanelEx(); this.pictureBox1 = new System.Windows.Forms.PictureBox(); - this.layerTree = new Cyberpipe.MyTreeView(); this.statusStrip1.SuspendLayout(); this.sideBar1.SuspendLayout(); this.panelEx3.SuspendLayout(); @@ -527,15 +529,15 @@ this.contextMenuStrip3.SuspendLayout(); this.contextMenuStripDeleteLayerNode.SuspendLayout(); this.ribbonControl1.SuspendLayout(); + this.ribbonPanel3.SuspendLayout(); + this.ribbonPanel7.SuspendLayout(); + this.ribbonPanel15.SuspendLayout(); + this.ribbonPanel2.SuspendLayout(); this.ribbonPanel6.SuspendLayout(); this.ribbonPanel5.SuspendLayout(); this.ribbonPanel1.SuspendLayout(); this.ribbonPanel12.SuspendLayout(); this.ribbonPanel4.SuspendLayout(); - this.ribbonPanel15.SuspendLayout(); - this.ribbonPanel3.SuspendLayout(); - this.ribbonPanel7.SuspendLayout(); - this.ribbonPanel2.SuspendLayout(); this.panelOfTable.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.dataGridViewX1)).BeginInit(); this.statusStrip2.SuspendLayout(); @@ -711,7 +713,8 @@ this.statusLabel.Name = "statusLabel"; this.statusLabel.Size = new System.Drawing.Size(1313, 17); this.statusLabel.Spring = true; - this.statusLabel.Text = " ©2014-2015 苏州航天系统工程有限公司 版权所有"; + this.statusLabel.Text = Utility.Copyright; +// this.statusLabel.Text = " ©2014-2015 苏州航天系统工程有限公司 版权所有"; // // toolStripDropDownButton1 // @@ -956,6 +959,18 @@ this.layerSensorTree.NodeMouseClick += new System.Windows.Forms.TreeNodeMouseClickEventHandler(this.layerMarkerTree_NodeMouseClick); this.layerSensorTree.NodeMouseDoubleClick += new System.Windows.Forms.TreeNodeMouseClickEventHandler(this.layerTree_NodeMouseDoubleClick); // + // layerTree + // + this.layerTree.CheckBoxes = true; + this.layerTree.ItemHeight = 18; + this.layerTree.Location = new System.Drawing.Point(30, 78); + this.layerTree.Name = "layerTree"; + this.layerTree.Size = new System.Drawing.Size(121, 97); + this.layerTree.TabIndex = 1; + this.layerTree.AfterCheck += new System.Windows.Forms.TreeViewEventHandler(this.layerTree_AfterCheck); + this.layerTree.NodeMouseClick += new System.Windows.Forms.TreeNodeMouseClickEventHandler(this.layerTree_NodeMouseClick); + this.layerTree.NodeMouseDoubleClick += new System.Windows.Forms.TreeNodeMouseClickEventHandler(this.layerTree_NodeMouseDoubleClick); + // // sideBarPanelItem3 // this.sideBarPanelItem3.FontBold = true; @@ -2150,13 +2165,13 @@ this.ribbonControl1.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.ribbonControl1.Controls.Add(this.ribbonPanel3); this.ribbonControl1.Controls.Add(this.ribbonPanel7); - this.ribbonControl1.Controls.Add(this.ribbonPanel2); this.ribbonControl1.Controls.Add(this.ribbonPanel15); - this.ribbonControl1.Controls.Add(this.ribbonPanel4); - this.ribbonControl1.Controls.Add(this.ribbonPanel1); + this.ribbonControl1.Controls.Add(this.ribbonPanel2); this.ribbonControl1.Controls.Add(this.ribbonPanel6); - this.ribbonControl1.Controls.Add(this.ribbonPanel12); this.ribbonControl1.Controls.Add(this.ribbonPanel5); + this.ribbonControl1.Controls.Add(this.ribbonPanel1); + this.ribbonControl1.Controls.Add(this.ribbonPanel12); + this.ribbonControl1.Controls.Add(this.ribbonPanel4); this.ribbonControl1.Dock = System.Windows.Forms.DockStyle.Top; this.ribbonControl1.ImeMode = System.Windows.Forms.ImeMode.NoControl; this.ribbonControl1.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { @@ -2200,609 +2215,216 @@ this.ribbonControl1.Text = "ribbonControl1"; this.ribbonControl1.UseCustomizeDialog = false; // - // ribbonPanel6 + // ribbonPanel3 // - this.ribbonPanel6.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.ribbonPanel6.Controls.Add(this.ribbonBar6); - this.ribbonPanel6.Dock = System.Windows.Forms.DockStyle.Fill; - this.ribbonPanel6.Location = new System.Drawing.Point(0, 0); - this.ribbonPanel6.Name = "ribbonPanel6"; - this.ribbonPanel6.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); - this.ribbonPanel6.Size = new System.Drawing.Size(1328, 95); + this.ribbonPanel3.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.ribbonPanel3.Controls.Add(this.ribbonBar4); + this.ribbonPanel3.Dock = System.Windows.Forms.DockStyle.Fill; + this.ribbonPanel3.Location = new System.Drawing.Point(0, 33); + this.ribbonPanel3.Name = "ribbonPanel3"; + this.ribbonPanel3.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); + this.ribbonPanel3.Size = new System.Drawing.Size(1328, 62); // // // - this.ribbonPanel6.Style.Class = ""; - this.ribbonPanel6.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonPanel3.Style.Class = ""; + this.ribbonPanel3.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; // // // - this.ribbonPanel6.StyleMouseDown.Class = ""; - this.ribbonPanel6.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonPanel3.StyleMouseDown.Class = ""; + this.ribbonPanel3.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; // // // - this.ribbonPanel6.StyleMouseOver.Class = ""; - this.ribbonPanel6.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonPanel6.TabIndex = 38; - this.ribbonPanel6.Visible = false; + this.ribbonPanel3.StyleMouseOver.Class = ""; + this.ribbonPanel3.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonPanel3.TabIndex = 40; // - // ribbonBar6 + // ribbonBar4 // - this.ribbonBar6.AutoOverflowEnabled = true; + this.ribbonBar4.AutoOverflowEnabled = true; // // // - this.ribbonBar6.BackgroundMouseOverStyle.Class = ""; - this.ribbonBar6.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar4.BackgroundMouseOverStyle.Class = ""; + this.ribbonBar4.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; // // // - this.ribbonBar6.BackgroundStyle.Class = ""; - this.ribbonBar6.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonBar6.ContainerControlProcessDialogKey = true; - this.ribbonBar6.Dock = System.Windows.Forms.DockStyle.Left; - this.ribbonBar6.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { - this.buttonItemSPSZ, - this.buttonItem8, - this.buttonItemLocation, - this.sliderItem2, - this.buttonItemGBJC}); - this.ribbonBar6.Location = new System.Drawing.Point(3, 0); - this.ribbonBar6.Name = "ribbonBar6"; - this.ribbonBar6.Size = new System.Drawing.Size(427, 92); - this.ribbonBar6.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.ribbonBar6.TabIndex = 0; + this.ribbonBar4.BackgroundStyle.Class = ""; + this.ribbonBar4.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar4.ContainerControlProcessDialogKey = true; + this.ribbonBar4.Dock = System.Windows.Forms.DockStyle.Left; + this.ribbonBar4.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { + this.btn_flag, + this.slider4ground}); + this.ribbonBar4.Location = new System.Drawing.Point(3, 0); + this.ribbonBar4.Name = "ribbonBar4"; + this.ribbonBar4.Size = new System.Drawing.Size(634, 59); + this.ribbonBar4.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.ribbonBar4.TabIndex = 0; // // // - this.ribbonBar6.TitleStyle.Class = ""; - this.ribbonBar6.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar4.TitleStyle.Class = ""; + this.ribbonBar4.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; // // // - this.ribbonBar6.TitleStyleMouseOver.Class = ""; - this.ribbonBar6.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonBar6.TitleVisible = false; + this.ribbonBar4.TitleStyleMouseOver.Class = ""; + this.ribbonBar4.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar4.TitleVisible = false; // - // buttonItemSPSZ + // btn_flag // - this.buttonItemSPSZ.Image = ((System.Drawing.Image)(resources.GetObject("buttonItemSPSZ.Image"))); - this.buttonItemSPSZ.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItemSPSZ.Name = "buttonItemSPSZ"; - this.buttonItemSPSZ.SubItemsExpandWidth = 14; - this.buttonItemSPSZ.Text = "双屏设置"; - this.buttonItemSPSZ.Click += new System.EventHandler(this.buttonItemSPSZ_Click); + this.btn_flag.Image = global::Cyberpipe.Properties.Resources._24x24icon_03_hover; + this.btn_flag.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.btn_flag.Name = "btn_flag"; + this.btn_flag.SubItemsExpandWidth = 14; + this.btn_flag.Text = "标识器管理"; + this.btn_flag.Click += new System.EventHandler(this.btn_flag_Click); // - // buttonItem8 + // slider4ground // - this.buttonItem8.Image = ((System.Drawing.Image)(resources.GetObject("buttonItem8.Image"))); - this.buttonItem8.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem8.Name = "buttonItem8"; - this.buttonItem8.SubItemsExpandWidth = 14; - this.buttonItem8.Text = "双屏分析"; - this.buttonItem8.Click += new System.EventHandler(this.buttonItem8_Click); + this.slider4ground.LabelPosition = DevComponents.DotNetBar.eSliderLabelPosition.Top; + this.slider4ground.LabelWidth = 50; + this.slider4ground.Name = "slider4ground"; + this.slider4ground.Text = "地面透明度"; + this.slider4ground.TextColor = System.Drawing.Color.Black; + this.slider4ground.Value = 0; + this.slider4ground.ValueChanged += new System.EventHandler(this.slider4ground_ValueChanged); // - // buttonItemLocation + // ribbonPanel7 // - this.buttonItemLocation.Image = ((System.Drawing.Image)(resources.GetObject("buttonItemLocation.Image"))); - this.buttonItemLocation.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItemLocation.Name = "buttonItemLocation"; - this.buttonItemLocation.SubItemsExpandWidth = 14; - this.buttonItemLocation.Text = "快速定位"; - this.buttonItemLocation.Click += new System.EventHandler(this.buttonItemLocation_Click); + this.ribbonPanel7.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.ribbonPanel7.Controls.Add(this.gxdw_ribbonbar); + this.ribbonPanel7.Dock = System.Windows.Forms.DockStyle.Fill; + this.ribbonPanel7.Location = new System.Drawing.Point(0, 33); + this.ribbonPanel7.Name = "ribbonPanel7"; + this.ribbonPanel7.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); + this.ribbonPanel7.Size = new System.Drawing.Size(1328, 62); // - // sliderItem2 // - this.sliderItem2.LabelPosition = DevComponents.DotNetBar.eSliderLabelPosition.Top; - this.sliderItem2.LabelWidth = 50; - this.sliderItem2.Name = "sliderItem2"; - this.sliderItem2.Text = "地面透明度"; - this.sliderItem2.TextColor = System.Drawing.Color.Black; - this.sliderItem2.Value = 0; - this.sliderItem2.ValueChanged += new System.EventHandler(this.sliderItem2_ValueChanged); // - // buttonItemGBJC + this.ribbonPanel7.Style.Class = ""; + this.ribbonPanel7.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; // - this.buttonItemGBJC.Image = ((System.Drawing.Image)(resources.GetObject("buttonItemGBJC.Image"))); - this.buttonItemGBJC.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItemGBJC.Name = "buttonItemGBJC"; - this.buttonItemGBJC.SubItemsExpandWidth = 14; - this.buttonItemGBJC.Text = "国标检测"; - this.buttonItemGBJC.Click += new System.EventHandler(this.buttonItemGBJC_Click); // - // ribbonPanel5 // - this.ribbonPanel5.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.ribbonPanel5.Controls.Add(this.ribbonBar2); - this.ribbonPanel5.Dock = System.Windows.Forms.DockStyle.Fill; - this.ribbonPanel5.Location = new System.Drawing.Point(0, 0); - this.ribbonPanel5.Name = "ribbonPanel5"; - this.ribbonPanel5.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); - this.ribbonPanel5.Size = new System.Drawing.Size(1328, 95); + this.ribbonPanel7.StyleMouseDown.Class = ""; + this.ribbonPanel7.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; // // // - this.ribbonPanel5.Style.Class = ""; - this.ribbonPanel5.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonPanel7.StyleMouseOver.Class = ""; + this.ribbonPanel7.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonPanel7.TabIndex = 41; + this.ribbonPanel7.Visible = false; // + // gxdw_ribbonbar // + this.gxdw_ribbonbar.AutoOverflowEnabled = true; // - this.ribbonPanel5.StyleMouseDown.Class = ""; - this.ribbonPanel5.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; // // + this.gxdw_ribbonbar.BackgroundMouseOverStyle.Class = ""; + this.gxdw_ribbonbar.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; // - this.ribbonPanel5.StyleMouseOver.Class = ""; - this.ribbonPanel5.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonPanel5.TabIndex = 37; - this.ribbonPanel5.Visible = false; // - // ribbonBar2 // - this.ribbonBar2.AutoOverflowEnabled = true; + this.gxdw_ribbonbar.BackgroundStyle.Class = ""; + this.gxdw_ribbonbar.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.gxdw_ribbonbar.ContainerControlProcessDialogKey = true; + this.gxdw_ribbonbar.Dock = System.Windows.Forms.DockStyle.Left; + this.gxdw_ribbonbar.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { + this.buttonItem9, + this.buttonItem10, + this.buttonItem11, + this.buttonItem12, + this.buttonItem13, + this.buttonItem14}); + this.gxdw_ribbonbar.Location = new System.Drawing.Point(3, 0); + this.gxdw_ribbonbar.Name = "gxdw_ribbonbar"; + this.gxdw_ribbonbar.Size = new System.Drawing.Size(564, 59); + this.gxdw_ribbonbar.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.gxdw_ribbonbar.TabIndex = 0; + this.gxdw_ribbonbar.Text = "ribbonBar5"; // // // - this.ribbonBar2.BackgroundMouseOverStyle.Class = ""; - this.ribbonBar2.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.gxdw_ribbonbar.TitleStyle.Class = ""; + this.gxdw_ribbonbar.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; // // // - this.ribbonBar2.BackgroundStyle.Class = ""; - this.ribbonBar2.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonBar2.ContainerControlProcessDialogKey = true; - this.ribbonBar2.Dock = System.Windows.Forms.DockStyle.Left; - this.ribbonBar2.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { - this.buttonItemHX1, - this.buttonItemHX2, - this.buttonItemDCTP, - this.sliderItem3}); - this.ribbonBar2.Location = new System.Drawing.Point(3, 0); - this.ribbonBar2.Name = "ribbonBar2"; - this.ribbonBar2.Size = new System.Drawing.Size(350, 92); - this.ribbonBar2.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.ribbonBar2.TabIndex = 0; + this.gxdw_ribbonbar.TitleStyleMouseOver.Class = ""; + this.gxdw_ribbonbar.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.gxdw_ribbonbar.TitleVisible = false; // + // buttonItem9 // + this.buttonItem9.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__76; + this.buttonItem9.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem9.Name = "buttonItem9"; + this.buttonItem9.SubItemsExpandWidth = 14; + this.buttonItem9.Text = "工单管理"; + this.buttonItem9.Click += new System.EventHandler(this.buttonItem9_Click); // - this.ribbonBar2.TitleStyle.Class = ""; - this.ribbonBar2.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // buttonItem10 // + this.buttonItem10.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__69; + this.buttonItem10.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem10.Name = "buttonItem10"; + this.buttonItem10.SubItemsExpandWidth = 14; + this.buttonItem10.Text = "在线任务"; + this.buttonItem10.Click += new System.EventHandler(this.buttonItem10_Click); // + // buttonItem11 // - this.ribbonBar2.TitleStyleMouseOver.Class = ""; - this.ribbonBar2.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonBar2.TitleVisible = false; + this.buttonItem11.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__72; + this.buttonItem11.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem11.Name = "buttonItem11"; + this.buttonItem11.SubItemsExpandWidth = 14; + this.buttonItem11.Text = "事件管理"; + this.buttonItem11.Click += new System.EventHandler(this.buttonItem11_Click); // - // buttonItemHX1 + // buttonItem12 // - this.buttonItemHX1.AutoExpandOnClick = true; - this.buttonItemHX1.Image = ((System.Drawing.Image)(resources.GetObject("buttonItemHX1.Image"))); - this.buttonItemHX1.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItemHX1.Name = "buttonItemHX1"; - this.buttonItemHX1.SubItemsExpandWidth = 14; - this.buttonItemHX1.Text = "导入红线"; - this.buttonItemHX1.Click += new System.EventHandler(this.buttonItemHX1_Click); + this.buttonItem12.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__34; + this.buttonItem12.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem12.Name = "buttonItem12"; + this.buttonItem12.SubItemsExpandWidth = 14; + this.buttonItem12.Text = "探测仪管理"; + this.buttonItem12.Click += new System.EventHandler(this.buttonItem12_Click); // - // buttonItemHX2 + // buttonItem13 // - this.buttonItemHX2.Image = ((System.Drawing.Image)(resources.GetObject("buttonItemHX2.Image"))); - this.buttonItemHX2.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItemHX2.Name = "buttonItemHX2"; - this.buttonItemHX2.SubItemsExpandWidth = 14; - this.buttonItemHX2.Text = "红线审核"; - this.buttonItemHX2.Click += new System.EventHandler(this.buttonItemHX2_Click); + this.buttonItem13.Image = global::Cyberpipe.Properties.Resources._24x24icon_13_hover; + this.buttonItem13.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem13.Name = "buttonItem13"; + this.buttonItem13.SubItemsExpandWidth = 14; + this.buttonItem13.Text = "巡检人员维护"; + this.buttonItem13.Click += new System.EventHandler(this.buttonItem13_Click); // - // buttonItemDCTP + // buttonItem14 // - this.buttonItemDCTP.Image = ((System.Drawing.Image)(resources.GetObject("buttonItemDCTP.Image"))); - this.buttonItemDCTP.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItemDCTP.Name = "buttonItemDCTP"; - this.buttonItemDCTP.SubItemsExpandWidth = 14; - this.buttonItemDCTP.Text = "导出图片"; - this.buttonItemDCTP.Click += new System.EventHandler(this.buttonItemDCTP_Click); - // - // sliderItem3 - // - this.sliderItem3.LabelPosition = DevComponents.DotNetBar.eSliderLabelPosition.Top; - this.sliderItem3.LabelWidth = 50; - this.sliderItem3.Name = "sliderItem3"; - this.sliderItem3.Text = "地面透明度"; - this.sliderItem3.TextColor = System.Drawing.Color.Black; - this.sliderItem3.Value = 0; - this.sliderItem3.ValueChanged += new System.EventHandler(this.sliderItem3_ValueChanged); - // - // ribbonPanel1 - // - this.ribbonPanel1.AutoSize = true; - this.ribbonPanel1.CanvasColor = System.Drawing.Color.Gray; - this.ribbonPanel1.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.ribbonPanel1.Controls.Add(this.ribbonBar21); - this.ribbonPanel1.Dock = System.Windows.Forms.DockStyle.Fill; - this.ribbonPanel1.Location = new System.Drawing.Point(0, 0); - this.ribbonPanel1.Name = "ribbonPanel1"; - this.ribbonPanel1.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); - this.ribbonPanel1.Size = new System.Drawing.Size(1328, 95); - // - // - // - this.ribbonPanel1.Style.Class = ""; - this.ribbonPanel1.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonPanel1.StyleMouseDown.Class = ""; - this.ribbonPanel1.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonPanel1.StyleMouseOver.Class = ""; - this.ribbonPanel1.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonPanel1.TabIndex = 1; - this.ribbonPanel1.Visible = false; - // - // ribbonBar21 - // - this.ribbonBar21.AutoOverflowEnabled = true; - this.ribbonBar21.BackColor = System.Drawing.Color.White; - // - // - // - this.ribbonBar21.BackgroundMouseOverStyle.Class = ""; - this.ribbonBar21.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonBar21.BackgroundStyle.Class = ""; - this.ribbonBar21.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonBar21.ContainerControlProcessDialogKey = true; - this.ribbonBar21.Dock = System.Windows.Forms.DockStyle.Left; - this.ribbonBar21.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { - this.buttonItem87, - this.buttonItem88, - this.buttonItem27, - this.sliderGroundTransSet1, - this.buttonItem91, - this.buttonItem1, - this.btnlegendSet, - this.buttonItem89, - this.btnOutputJPG}); - this.ribbonBar21.Location = new System.Drawing.Point(3, 0); - this.ribbonBar21.Name = "ribbonBar21"; - this.ribbonBar21.Size = new System.Drawing.Size(649, 92); - this.ribbonBar21.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.ribbonBar21.TabIndex = 2; - this.ribbonBar21.Text = "浏览模式"; - // - // - // - this.ribbonBar21.TitleStyle.Class = ""; - this.ribbonBar21.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonBar21.TitleStyleMouseOver.Class = ""; - this.ribbonBar21.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonBar21.TitleVisible = false; - // - // buttonItem87 - // - this.buttonItem87.Image = ((System.Drawing.Image)(resources.GetObject("buttonItem87.Image"))); - this.buttonItem87.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem87.Name = "buttonItem87"; - this.buttonItem87.SubItemsExpandWidth = 14; - this.buttonItem87.Text = "地上模式"; - this.buttonItem87.Click += new System.EventHandler(this.buttonItem87_Click); - // - // buttonItem88 - // - this.buttonItem88.Image = ((System.Drawing.Image)(resources.GetObject("buttonItem88.Image"))); - this.buttonItem88.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem88.Name = "buttonItem88"; - this.buttonItem88.SubItemsExpandWidth = 14; - this.buttonItem88.Text = "地下模式"; - this.buttonItem88.Click += new System.EventHandler(this.buttonItem88_Click); - // - // buttonItem27 - // - this.buttonItem27.Image = ((System.Drawing.Image)(resources.GetObject("buttonItem27.Image"))); - this.buttonItem27.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem27.Name = "buttonItem27"; - this.buttonItem27.SubItemsExpandWidth = 14; - this.buttonItem27.Text = "行走模式"; - this.buttonItem27.Click += new System.EventHandler(this.buttonItem27_Click); - // - // buttonItem91 - // - this.buttonItem91.ForeColor = System.Drawing.Color.Black; - this.buttonItem91.Image = ((System.Drawing.Image)(resources.GetObject("buttonItem91.Image"))); - this.buttonItem91.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem91.Name = "buttonItem91"; - this.buttonItem91.SubItemsExpandWidth = 14; - this.buttonItem91.Text = "快速定位"; - this.buttonItem91.Click += new System.EventHandler(this.buttonItem91_Click); - // - // buttonItem1 - // - this.buttonItem1.Image = ((System.Drawing.Image)(resources.GetObject("buttonItem1.Image"))); - this.buttonItem1.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem1.Name = "buttonItem1"; - this.buttonItem1.SubItemsExpandWidth = 14; - this.buttonItem1.Text = "图层管理"; - this.buttonItem1.Click += new System.EventHandler(this.buttonItem1_Click); - // - // btnlegendSet - // - this.btnlegendSet.Image = ((System.Drawing.Image)(resources.GetObject("btnlegendSet.Image"))); - this.btnlegendSet.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.btnlegendSet.Name = "btnlegendSet"; - this.btnlegendSet.SubItemsExpandWidth = 14; - this.btnlegendSet.Text = "图例"; - this.btnlegendSet.Click += new System.EventHandler(this.btnlegendSet_Click); - // - // buttonItem89 - // - this.buttonItem89.Image = ((System.Drawing.Image)(resources.GetObject("buttonItem89.Image"))); - this.buttonItem89.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem89.Name = "buttonItem89"; - this.buttonItem89.SubItemsExpandWidth = 14; - this.buttonItem89.Text = "全屏显示"; - this.buttonItem89.Click += new System.EventHandler(this.buttonItem89_Click); - // - // btnOutputJPG - // - this.btnOutputJPG.Image = ((System.Drawing.Image)(resources.GetObject("btnOutputJPG.Image"))); - this.btnOutputJPG.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.btnOutputJPG.Name = "btnOutputJPG"; - this.btnOutputJPG.SubItemsExpandWidth = 14; - this.btnOutputJPG.Text = "导出图片"; - this.btnOutputJPG.Click += new System.EventHandler(this.btnOutputJPG_Click); - // - // ribbonPanel12 - // - this.ribbonPanel12.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.ribbonPanel12.Controls.Add(this.ribbonBar18); - this.ribbonPanel12.Controls.Add(this.ribbonBar13); - this.ribbonPanel12.Dock = System.Windows.Forms.DockStyle.Fill; - this.ribbonPanel12.Location = new System.Drawing.Point(0, 0); - this.ribbonPanel12.Name = "ribbonPanel12"; - this.ribbonPanel12.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); - this.ribbonPanel12.Size = new System.Drawing.Size(1328, 95); - // - // - // - this.ribbonPanel12.Style.Class = ""; - this.ribbonPanel12.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonPanel12.StyleMouseDown.Class = ""; - this.ribbonPanel12.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonPanel12.StyleMouseOver.Class = ""; - this.ribbonPanel12.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonPanel12.TabIndex = 34; - this.ribbonPanel12.Visible = false; - // - // ribbonBar18 - // - this.ribbonBar18.AutoOverflowEnabled = true; - // - // - // - this.ribbonBar18.BackgroundMouseOverStyle.Class = ""; - this.ribbonBar18.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonBar18.BackgroundStyle.Class = ""; - this.ribbonBar18.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonBar18.ContainerControlProcessDialogKey = true; - this.ribbonBar18.Dock = System.Windows.Forms.DockStyle.Left; - this.ribbonBar18.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { - this.buttonItem133}); - this.ribbonBar18.Location = new System.Drawing.Point(531, 0); - this.ribbonBar18.Name = "ribbonBar18"; - this.ribbonBar18.Size = new System.Drawing.Size(129, 92); - this.ribbonBar18.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.ribbonBar18.TabIndex = 1; - // - // - // - this.ribbonBar18.TitleStyle.Class = ""; - this.ribbonBar18.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonBar18.TitleStyleMouseOver.Class = ""; - this.ribbonBar18.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonBar18.TitleVisible = false; - // - // buttonItem133 - // - this.buttonItem133.Image = ((System.Drawing.Image)(resources.GetObject("buttonItem133.Image"))); - this.buttonItem133.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem133.Name = "buttonItem133"; - this.buttonItem133.SubItemsExpandWidth = 14; - this.buttonItem133.Text = "审核入库"; - this.buttonItem133.Click += new System.EventHandler(this.buttonItem133_Click_1); - // - // ribbonBar13 - // - this.ribbonBar13.AutoOverflowEnabled = true; - // - // - // - this.ribbonBar13.BackgroundMouseOverStyle.Class = ""; - this.ribbonBar13.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonBar13.BackgroundStyle.Class = ""; - this.ribbonBar13.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonBar13.ContainerControlProcessDialogKey = true; - this.ribbonBar13.Dock = System.Windows.Forms.DockStyle.Left; - this.ribbonBar13.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { - this.buttonItem127, - this.buttonItem128, - this.sliderItem1, - this.buttonItem134, - this.buttonItem130, - this.btn_check_history}); - this.ribbonBar13.Location = new System.Drawing.Point(3, 0); - this.ribbonBar13.Name = "ribbonBar13"; - this.ribbonBar13.Size = new System.Drawing.Size(528, 92); - this.ribbonBar13.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.ribbonBar13.TabIndex = 0; - // - // - // - this.ribbonBar13.TitleStyle.Class = ""; - this.ribbonBar13.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonBar13.TitleStyleMouseOver.Class = ""; - this.ribbonBar13.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonBar13.TitleVisible = false; - // - // buttonItem127 - // - this.buttonItem127.Image = ((System.Drawing.Image)(resources.GetObject("buttonItem127.Image"))); - this.buttonItem127.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem127.Name = "buttonItem127"; - this.buttonItem127.SubItemsExpandWidth = 14; - this.buttonItem127.Text = "打开数据"; - this.buttonItem127.Click += new System.EventHandler(this.buttonItem127_Click_2); - // - // buttonItem128 - // - this.buttonItem128.Image = ((System.Drawing.Image)(resources.GetObject("buttonItem128.Image"))); - this.buttonItem128.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem128.Name = "buttonItem128"; - this.buttonItem128.SubItemsExpandWidth = 14; - this.buttonItem128.Text = "一键审核"; - this.buttonItem128.Click += new System.EventHandler(this.buttonItem128_Click); - // - // sliderItem1 - // - this.sliderItem1.LabelPosition = DevComponents.DotNetBar.eSliderLabelPosition.Top; - this.sliderItem1.LabelWidth = 50; - this.sliderItem1.Name = "sliderItem1"; - this.sliderItem1.Text = "地面透明度"; - this.sliderItem1.TextColor = System.Drawing.Color.Black; - this.sliderItem1.Value = 0; - this.sliderItem1.ValueChanged += new System.EventHandler(this.sliderItem1_ValueChanged); - // - // buttonItem134 - // - this.buttonItem134.Image = ((System.Drawing.Image)(resources.GetObject("buttonItem134.Image"))); - this.buttonItem134.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem134.Name = "buttonItem134"; - this.buttonItem134.SubItemsExpandWidth = 14; - this.buttonItem134.Text = "模拟设计修改"; - this.buttonItem134.Click += new System.EventHandler(this.buttonItem134_Click_1); - // - // buttonItem130 - // - this.buttonItem130.Image = ((System.Drawing.Image)(resources.GetObject("buttonItem130.Image"))); - this.buttonItem130.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem130.Name = "buttonItem130"; - this.buttonItem130.SubItemsExpandWidth = 14; - this.buttonItem130.Text = "导出审核图"; - this.buttonItem130.Click += new System.EventHandler(this.buttonItem130_Click_1); - // - // btn_check_history - // - this.btn_check_history.Image = ((System.Drawing.Image)(resources.GetObject("btn_check_history.Image"))); - this.btn_check_history.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.btn_check_history.Name = "btn_check_history"; - this.btn_check_history.SubItemsExpandWidth = 14; - this.btn_check_history.Text = "审核历史"; - this.btn_check_history.Click += new System.EventHandler(this.btn_check_history_Click); - // - // ribbonPanel4 - // - this.ribbonPanel4.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.ribbonPanel4.Controls.Add(this.ribbonBar1); - this.ribbonPanel4.Dock = System.Windows.Forms.DockStyle.Fill; - this.ribbonPanel4.Location = new System.Drawing.Point(0, 0); - this.ribbonPanel4.Name = "ribbonPanel4"; - this.ribbonPanel4.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); - this.ribbonPanel4.Size = new System.Drawing.Size(1328, 95); - // - // - // - this.ribbonPanel4.Style.Class = ""; - this.ribbonPanel4.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonPanel4.StyleMouseDown.Class = ""; - this.ribbonPanel4.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonPanel4.StyleMouseOver.Class = ""; - this.ribbonPanel4.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonPanel4.TabIndex = 36; - this.ribbonPanel4.Visible = false; - // - // ribbonBar1 - // - this.ribbonBar1.AutoOverflowEnabled = true; - // - // - // - this.ribbonBar1.BackgroundMouseOverStyle.Class = ""; - this.ribbonBar1.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonBar1.BackgroundStyle.Class = ""; - this.ribbonBar1.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonBar1.ContainerControlProcessDialogKey = true; - this.ribbonBar1.Dock = System.Windows.Forms.DockStyle.Left; - this.ribbonBar1.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { - this.btn_document_info}); - this.ribbonBar1.Location = new System.Drawing.Point(3, 0); - this.ribbonBar1.Name = "ribbonBar1"; - this.ribbonBar1.Size = new System.Drawing.Size(88, 92); - this.ribbonBar1.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.ribbonBar1.TabIndex = 0; - // - // - // - this.ribbonBar1.TitleStyle.Class = ""; - this.ribbonBar1.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonBar1.TitleStyleMouseOver.Class = ""; - this.ribbonBar1.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonBar1.TitleVisible = false; - // - // btn_document_info - // - this.btn_document_info.Image = ((System.Drawing.Image)(resources.GetObject("btn_document_info.Image"))); - this.btn_document_info.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.btn_document_info.Name = "btn_document_info"; - this.btn_document_info.SubItemsExpandWidth = 14; - this.btn_document_info.Text = "文档管理"; - this.btn_document_info.Click += new System.EventHandler(this.btn_document_info_Click); + this.buttonItem14.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__56; + this.buttonItem14.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem14.Name = "buttonItem14"; + this.buttonItem14.SubItemsExpandWidth = 14; + this.buttonItem14.Text = "导出施工图"; + this.buttonItem14.Click += new System.EventHandler(this.buttonItem14_Click); // // ribbonPanel15 // this.ribbonPanel15.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; this.ribbonPanel15.Controls.Add(this.ribbonBar20); this.ribbonPanel15.Dock = System.Windows.Forms.DockStyle.Fill; - this.ribbonPanel15.Location = new System.Drawing.Point(0, 0); + this.ribbonPanel15.Location = new System.Drawing.Point(0, 33); this.ribbonPanel15.Name = "ribbonPanel15"; this.ribbonPanel15.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); - this.ribbonPanel15.Size = new System.Drawing.Size(1328, 95); + this.ribbonPanel15.Size = new System.Drawing.Size(1328, 62); // // // @@ -2843,7 +2465,7 @@ this.buttonItemXTGL}); this.ribbonBar20.Location = new System.Drawing.Point(3, 0); this.ribbonBar20.Name = "ribbonBar20"; - this.ribbonBar20.Size = new System.Drawing.Size(283, 92); + this.ribbonBar20.Size = new System.Drawing.Size(283, 59); this.ribbonBar20.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; this.ribbonBar20.TabIndex = 0; // @@ -3274,216 +2896,15 @@ this.buttonItemXT4_2.Text = "人员修改"; this.buttonItemXT4_2.Click += new System.EventHandler(this.buttonItemXT4_2_Click); // - // ribbonPanel3 - // - this.ribbonPanel3.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.ribbonPanel3.Controls.Add(this.ribbonBar4); - this.ribbonPanel3.Dock = System.Windows.Forms.DockStyle.Fill; - this.ribbonPanel3.Location = new System.Drawing.Point(0, 33); - this.ribbonPanel3.Name = "ribbonPanel3"; - this.ribbonPanel3.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); - this.ribbonPanel3.Size = new System.Drawing.Size(1328, 62); - // - // - // - this.ribbonPanel3.Style.Class = ""; - this.ribbonPanel3.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonPanel3.StyleMouseDown.Class = ""; - this.ribbonPanel3.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonPanel3.StyleMouseOver.Class = ""; - this.ribbonPanel3.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonPanel3.TabIndex = 40; - // - // ribbonBar4 - // - this.ribbonBar4.AutoOverflowEnabled = true; - // - // - // - this.ribbonBar4.BackgroundMouseOverStyle.Class = ""; - this.ribbonBar4.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonBar4.BackgroundStyle.Class = ""; - this.ribbonBar4.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonBar4.ContainerControlProcessDialogKey = true; - this.ribbonBar4.Dock = System.Windows.Forms.DockStyle.Left; - this.ribbonBar4.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { - this.btn_flag, - this.slider4ground}); - this.ribbonBar4.Location = new System.Drawing.Point(3, 0); - this.ribbonBar4.Name = "ribbonBar4"; - this.ribbonBar4.Size = new System.Drawing.Size(321, 59); - this.ribbonBar4.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.ribbonBar4.TabIndex = 0; - // - // - // - this.ribbonBar4.TitleStyle.Class = ""; - this.ribbonBar4.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonBar4.TitleStyleMouseOver.Class = ""; - this.ribbonBar4.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonBar4.TitleVisible = false; - // - // btn_flag - // - this.btn_flag.Image = global::Cyberpipe.Properties.Resources._24x24icon_03_hover; - this.btn_flag.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.btn_flag.Name = "btn_flag"; - this.btn_flag.SubItemsExpandWidth = 14; - this.btn_flag.Text = "标识器管理"; - this.btn_flag.Click += new System.EventHandler(this.btn_flag_Click); - // - // slider4ground - // - this.slider4ground.LabelPosition = DevComponents.DotNetBar.eSliderLabelPosition.Top; - this.slider4ground.LabelWidth = 50; - this.slider4ground.Name = "slider4ground"; - this.slider4ground.Text = "地面透明度"; - this.slider4ground.TextColor = System.Drawing.Color.Black; - this.slider4ground.Value = 0; - this.slider4ground.ValueChanged += new System.EventHandler(this.slider4ground_ValueChanged); - // - // ribbonPanel7 - // - this.ribbonPanel7.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.ribbonPanel7.Controls.Add(this.gxdw_ribbonbar); - this.ribbonPanel7.Dock = System.Windows.Forms.DockStyle.Fill; - this.ribbonPanel7.Location = new System.Drawing.Point(0, 33); - this.ribbonPanel7.Name = "ribbonPanel7"; - this.ribbonPanel7.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); - this.ribbonPanel7.Size = new System.Drawing.Size(1328, 62); - // - // - // - this.ribbonPanel7.Style.Class = ""; - this.ribbonPanel7.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonPanel7.StyleMouseDown.Class = ""; - this.ribbonPanel7.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonPanel7.StyleMouseOver.Class = ""; - this.ribbonPanel7.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonPanel7.TabIndex = 41; - this.ribbonPanel7.Visible = false; - // - // gxdw_ribbonbar - // - this.gxdw_ribbonbar.AutoOverflowEnabled = true; - // - // - // - this.gxdw_ribbonbar.BackgroundMouseOverStyle.Class = ""; - this.gxdw_ribbonbar.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.gxdw_ribbonbar.BackgroundStyle.Class = ""; - this.gxdw_ribbonbar.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.gxdw_ribbonbar.ContainerControlProcessDialogKey = true; - this.gxdw_ribbonbar.Dock = System.Windows.Forms.DockStyle.Left; - this.gxdw_ribbonbar.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { - this.buttonItem9, - this.buttonItem10, - this.buttonItem11, - this.buttonItem12, - this.buttonItem13, - this.buttonItem14}); - this.gxdw_ribbonbar.Location = new System.Drawing.Point(3, 0); - this.gxdw_ribbonbar.Name = "gxdw_ribbonbar"; - this.gxdw_ribbonbar.Size = new System.Drawing.Size(522, 59); - this.gxdw_ribbonbar.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.gxdw_ribbonbar.TabIndex = 0; - this.gxdw_ribbonbar.Text = "ribbonBar5"; - // - // - // - this.gxdw_ribbonbar.TitleStyle.Class = ""; - this.gxdw_ribbonbar.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.gxdw_ribbonbar.TitleStyleMouseOver.Class = ""; - this.gxdw_ribbonbar.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.gxdw_ribbonbar.TitleVisible = false; - // - // buttonItem9 - // - this.buttonItem9.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__76; - this.buttonItem9.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem9.Name = "buttonItem9"; - this.buttonItem9.SubItemsExpandWidth = 14; - this.buttonItem9.Text = "工单管理"; - this.buttonItem9.Click += new System.EventHandler(this.buttonItem9_Click); - // - // buttonItem10 - // - this.buttonItem10.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__69; - this.buttonItem10.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem10.Name = "buttonItem10"; - this.buttonItem10.SubItemsExpandWidth = 14; - this.buttonItem10.Text = "在线任务"; - this.buttonItem10.Click += new System.EventHandler(this.buttonItem10_Click); - // - // buttonItem11 - // - this.buttonItem11.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__72; - this.buttonItem11.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem11.Name = "buttonItem11"; - this.buttonItem11.SubItemsExpandWidth = 14; - this.buttonItem11.Text = "事件管理"; - this.buttonItem11.Click += new System.EventHandler(this.buttonItem11_Click); - // - // buttonItem12 - // - this.buttonItem12.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__34; - this.buttonItem12.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem12.Name = "buttonItem12"; - this.buttonItem12.SubItemsExpandWidth = 14; - this.buttonItem12.Text = "探测仪管理"; - this.buttonItem12.Click += new System.EventHandler(this.buttonItem12_Click); - // - // buttonItem13 - // - this.buttonItem13.Image = global::Cyberpipe.Properties.Resources._24x24icon_13_hover; - this.buttonItem13.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem13.Name = "buttonItem13"; - this.buttonItem13.SubItemsExpandWidth = 14; - this.buttonItem13.Text = "巡检人员维护"; - this.buttonItem13.Click += new System.EventHandler(this.buttonItem13_Click); - // - // buttonItem14 - // - this.buttonItem14.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__56; - this.buttonItem14.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem14.Name = "buttonItem14"; - this.buttonItem14.SubItemsExpandWidth = 14; - this.buttonItem14.Text = "导出施工图"; - this.buttonItem14.Click += new System.EventHandler(this.buttonItem14_Click); - // // ribbonPanel2 // this.ribbonPanel2.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; this.ribbonPanel2.Controls.Add(this.ribbonBar3); this.ribbonPanel2.Dock = System.Windows.Forms.DockStyle.Fill; - this.ribbonPanel2.Location = new System.Drawing.Point(0, 33); + this.ribbonPanel2.Location = new System.Drawing.Point(0, 0); this.ribbonPanel2.Name = "ribbonPanel2"; this.ribbonPanel2.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); - this.ribbonPanel2.Size = new System.Drawing.Size(1328, 62); + this.ribbonPanel2.Size = new System.Drawing.Size(1328, 95); // // // @@ -3527,7 +2948,7 @@ this.buttonItemPasswordReset}); this.ribbonBar3.Location = new System.Drawing.Point(3, 0); this.ribbonBar3.Name = "ribbonBar3"; - this.ribbonBar3.Size = new System.Drawing.Size(551, 59); + this.ribbonBar3.Size = new System.Drawing.Size(551, 92); this.ribbonBar3.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; this.ribbonBar3.TabIndex = 1; // @@ -3567,6 +2988,7 @@ this.btn_resc_info.Name = "btn_resc_info"; this.btn_resc_info.SubItemsExpandWidth = 14; this.btn_resc_info.Text = "资源管理"; + this.btn_resc_info.Visible = false; this.btn_resc_info.Click += new System.EventHandler(this.btn_resc_info_Click); // // btn_role_resc @@ -3605,6 +3027,605 @@ this.buttonItemPasswordReset.Text = "重置密码"; this.buttonItemPasswordReset.Click += new System.EventHandler(this.buttonItemPasswordReset_Click); // + // ribbonPanel6 + // + this.ribbonPanel6.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.ribbonPanel6.Controls.Add(this.ribbonBar6); + this.ribbonPanel6.Dock = System.Windows.Forms.DockStyle.Fill; + this.ribbonPanel6.Location = new System.Drawing.Point(0, 0); + this.ribbonPanel6.Name = "ribbonPanel6"; + this.ribbonPanel6.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); + this.ribbonPanel6.Size = new System.Drawing.Size(1328, 95); + // + // + // + this.ribbonPanel6.Style.Class = ""; + this.ribbonPanel6.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonPanel6.StyleMouseDown.Class = ""; + this.ribbonPanel6.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonPanel6.StyleMouseOver.Class = ""; + this.ribbonPanel6.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonPanel6.TabIndex = 38; + this.ribbonPanel6.Visible = false; + // + // ribbonBar6 + // + this.ribbonBar6.AutoOverflowEnabled = true; + // + // + // + this.ribbonBar6.BackgroundMouseOverStyle.Class = ""; + this.ribbonBar6.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonBar6.BackgroundStyle.Class = ""; + this.ribbonBar6.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar6.ContainerControlProcessDialogKey = true; + this.ribbonBar6.Dock = System.Windows.Forms.DockStyle.Left; + this.ribbonBar6.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { + this.buttonItemSPSZ, + this.buttonItem8, + this.buttonItemLocation, + this.sliderItem2, + this.buttonItemGBJC}); + this.ribbonBar6.Location = new System.Drawing.Point(3, 0); + this.ribbonBar6.Name = "ribbonBar6"; + this.ribbonBar6.Size = new System.Drawing.Size(427, 92); + this.ribbonBar6.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.ribbonBar6.TabIndex = 0; + // + // + // + this.ribbonBar6.TitleStyle.Class = ""; + this.ribbonBar6.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonBar6.TitleStyleMouseOver.Class = ""; + this.ribbonBar6.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar6.TitleVisible = false; + // + // buttonItemSPSZ + // + this.buttonItemSPSZ.Image = ((System.Drawing.Image)(resources.GetObject("buttonItemSPSZ.Image"))); + this.buttonItemSPSZ.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItemSPSZ.Name = "buttonItemSPSZ"; + this.buttonItemSPSZ.SubItemsExpandWidth = 14; + this.buttonItemSPSZ.Text = "双屏设置"; + this.buttonItemSPSZ.Click += new System.EventHandler(this.buttonItemSPSZ_Click); + // + // buttonItem8 + // + this.buttonItem8.Image = ((System.Drawing.Image)(resources.GetObject("buttonItem8.Image"))); + this.buttonItem8.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem8.Name = "buttonItem8"; + this.buttonItem8.SubItemsExpandWidth = 14; + this.buttonItem8.Text = "双屏分析"; + this.buttonItem8.Click += new System.EventHandler(this.buttonItem8_Click); + // + // buttonItemLocation + // + this.buttonItemLocation.Image = ((System.Drawing.Image)(resources.GetObject("buttonItemLocation.Image"))); + this.buttonItemLocation.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItemLocation.Name = "buttonItemLocation"; + this.buttonItemLocation.SubItemsExpandWidth = 14; + this.buttonItemLocation.Text = "快速定位"; + this.buttonItemLocation.Click += new System.EventHandler(this.buttonItemLocation_Click); + // + // sliderItem2 + // + this.sliderItem2.LabelPosition = DevComponents.DotNetBar.eSliderLabelPosition.Top; + this.sliderItem2.LabelWidth = 50; + this.sliderItem2.Name = "sliderItem2"; + this.sliderItem2.Text = "地面透明度"; + this.sliderItem2.TextColor = System.Drawing.Color.Black; + this.sliderItem2.Value = 0; + this.sliderItem2.ValueChanged += new System.EventHandler(this.sliderItem2_ValueChanged); + // + // buttonItemGBJC + // + this.buttonItemGBJC.Image = ((System.Drawing.Image)(resources.GetObject("buttonItemGBJC.Image"))); + this.buttonItemGBJC.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItemGBJC.Name = "buttonItemGBJC"; + this.buttonItemGBJC.SubItemsExpandWidth = 14; + this.buttonItemGBJC.Text = "国标检测"; + this.buttonItemGBJC.Click += new System.EventHandler(this.buttonItemGBJC_Click); + // + // ribbonPanel5 + // + this.ribbonPanel5.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.ribbonPanel5.Controls.Add(this.ribbonBar2); + this.ribbonPanel5.Dock = System.Windows.Forms.DockStyle.Fill; + this.ribbonPanel5.Location = new System.Drawing.Point(0, 33); + this.ribbonPanel5.Name = "ribbonPanel5"; + this.ribbonPanel5.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); + this.ribbonPanel5.Size = new System.Drawing.Size(1328, 62); + // + // + // + this.ribbonPanel5.Style.Class = ""; + this.ribbonPanel5.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonPanel5.StyleMouseDown.Class = ""; + this.ribbonPanel5.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonPanel5.StyleMouseOver.Class = ""; + this.ribbonPanel5.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonPanel5.TabIndex = 37; + this.ribbonPanel5.Visible = false; + // + // ribbonBar2 + // + this.ribbonBar2.AutoOverflowEnabled = true; + // + // + // + this.ribbonBar2.BackgroundMouseOverStyle.Class = ""; + this.ribbonBar2.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonBar2.BackgroundStyle.Class = ""; + this.ribbonBar2.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar2.ContainerControlProcessDialogKey = true; + this.ribbonBar2.Dock = System.Windows.Forms.DockStyle.Left; + this.ribbonBar2.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { + this.buttonItemHX1, + this.buttonItemHX2, + this.buttonItemDCTP, + this.sliderItem3}); + this.ribbonBar2.Location = new System.Drawing.Point(3, 0); + this.ribbonBar2.Name = "ribbonBar2"; + this.ribbonBar2.Size = new System.Drawing.Size(350, 59); + this.ribbonBar2.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.ribbonBar2.TabIndex = 0; + // + // + // + this.ribbonBar2.TitleStyle.Class = ""; + this.ribbonBar2.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonBar2.TitleStyleMouseOver.Class = ""; + this.ribbonBar2.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar2.TitleVisible = false; + // + // buttonItemHX1 + // + this.buttonItemHX1.AutoExpandOnClick = true; + this.buttonItemHX1.Image = ((System.Drawing.Image)(resources.GetObject("buttonItemHX1.Image"))); + this.buttonItemHX1.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItemHX1.Name = "buttonItemHX1"; + this.buttonItemHX1.SubItemsExpandWidth = 14; + this.buttonItemHX1.Text = "导入红线"; + this.buttonItemHX1.Click += new System.EventHandler(this.buttonItemHX1_Click); + // + // buttonItemHX2 + // + this.buttonItemHX2.Image = ((System.Drawing.Image)(resources.GetObject("buttonItemHX2.Image"))); + this.buttonItemHX2.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItemHX2.Name = "buttonItemHX2"; + this.buttonItemHX2.SubItemsExpandWidth = 14; + this.buttonItemHX2.Text = "红线审核"; + this.buttonItemHX2.Click += new System.EventHandler(this.buttonItemHX2_Click); + // + // buttonItemDCTP + // + this.buttonItemDCTP.Image = ((System.Drawing.Image)(resources.GetObject("buttonItemDCTP.Image"))); + this.buttonItemDCTP.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItemDCTP.Name = "buttonItemDCTP"; + this.buttonItemDCTP.SubItemsExpandWidth = 14; + this.buttonItemDCTP.Text = "导出图片"; + this.buttonItemDCTP.Click += new System.EventHandler(this.buttonItemDCTP_Click); + // + // sliderItem3 + // + this.sliderItem3.LabelPosition = DevComponents.DotNetBar.eSliderLabelPosition.Top; + this.sliderItem3.LabelWidth = 50; + this.sliderItem3.Name = "sliderItem3"; + this.sliderItem3.Text = "地面透明度"; + this.sliderItem3.TextColor = System.Drawing.Color.Black; + this.sliderItem3.Value = 0; + this.sliderItem3.ValueChanged += new System.EventHandler(this.sliderItem3_ValueChanged); + // + // ribbonPanel1 + // + this.ribbonPanel1.AutoSize = true; + this.ribbonPanel1.CanvasColor = System.Drawing.Color.Gray; + this.ribbonPanel1.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.ribbonPanel1.Controls.Add(this.ribbonBar21); + this.ribbonPanel1.Dock = System.Windows.Forms.DockStyle.Fill; + this.ribbonPanel1.Location = new System.Drawing.Point(0, 33); + this.ribbonPanel1.Name = "ribbonPanel1"; + this.ribbonPanel1.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); + this.ribbonPanel1.Size = new System.Drawing.Size(1328, 62); + // + // + // + this.ribbonPanel1.Style.Class = ""; + this.ribbonPanel1.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonPanel1.StyleMouseDown.Class = ""; + this.ribbonPanel1.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonPanel1.StyleMouseOver.Class = ""; + this.ribbonPanel1.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonPanel1.TabIndex = 1; + this.ribbonPanel1.Visible = false; + // + // ribbonBar21 + // + this.ribbonBar21.AutoOverflowEnabled = true; + this.ribbonBar21.BackColor = System.Drawing.Color.White; + // + // + // + this.ribbonBar21.BackgroundMouseOverStyle.Class = ""; + this.ribbonBar21.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonBar21.BackgroundStyle.Class = ""; + this.ribbonBar21.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar21.ContainerControlProcessDialogKey = true; + this.ribbonBar21.Dock = System.Windows.Forms.DockStyle.Left; + this.ribbonBar21.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { + this.buttonItem87, + this.buttonItem88, + this.buttonItem27, + this.sliderGroundTransSet1, + this.buttonItem91, + this.buttonItem1, + this.btnlegendSet, + this.buttonItem89, + this.btnOutputJPG}); + this.ribbonBar21.Location = new System.Drawing.Point(3, 0); + this.ribbonBar21.Name = "ribbonBar21"; + this.ribbonBar21.Size = new System.Drawing.Size(649, 59); + this.ribbonBar21.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.ribbonBar21.TabIndex = 2; + this.ribbonBar21.Text = "浏览模式"; + // + // + // + this.ribbonBar21.TitleStyle.Class = ""; + this.ribbonBar21.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonBar21.TitleStyleMouseOver.Class = ""; + this.ribbonBar21.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar21.TitleVisible = false; + // + // buttonItem87 + // + this.buttonItem87.Image = ((System.Drawing.Image)(resources.GetObject("buttonItem87.Image"))); + this.buttonItem87.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem87.Name = "buttonItem87"; + this.buttonItem87.SubItemsExpandWidth = 14; + this.buttonItem87.Text = "地上模式"; + this.buttonItem87.Click += new System.EventHandler(this.buttonItem87_Click); + // + // buttonItem88 + // + this.buttonItem88.Image = ((System.Drawing.Image)(resources.GetObject("buttonItem88.Image"))); + this.buttonItem88.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem88.Name = "buttonItem88"; + this.buttonItem88.SubItemsExpandWidth = 14; + this.buttonItem88.Text = "地下模式"; + this.buttonItem88.Click += new System.EventHandler(this.buttonItem88_Click); + // + // buttonItem27 + // + this.buttonItem27.Image = ((System.Drawing.Image)(resources.GetObject("buttonItem27.Image"))); + this.buttonItem27.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem27.Name = "buttonItem27"; + this.buttonItem27.SubItemsExpandWidth = 14; + this.buttonItem27.Text = "行走模式"; + this.buttonItem27.Click += new System.EventHandler(this.buttonItem27_Click); + // + // buttonItem91 + // + this.buttonItem91.ForeColor = System.Drawing.Color.Black; + this.buttonItem91.Image = ((System.Drawing.Image)(resources.GetObject("buttonItem91.Image"))); + this.buttonItem91.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem91.Name = "buttonItem91"; + this.buttonItem91.SubItemsExpandWidth = 14; + this.buttonItem91.Text = "快速定位"; + this.buttonItem91.Click += new System.EventHandler(this.buttonItem91_Click); + // + // buttonItem1 + // + this.buttonItem1.Image = ((System.Drawing.Image)(resources.GetObject("buttonItem1.Image"))); + this.buttonItem1.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem1.Name = "buttonItem1"; + this.buttonItem1.SubItemsExpandWidth = 14; + this.buttonItem1.Text = "图层管理"; + this.buttonItem1.Click += new System.EventHandler(this.buttonItem1_Click); + // + // btnlegendSet + // + this.btnlegendSet.Image = ((System.Drawing.Image)(resources.GetObject("btnlegendSet.Image"))); + this.btnlegendSet.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.btnlegendSet.Name = "btnlegendSet"; + this.btnlegendSet.SubItemsExpandWidth = 14; + this.btnlegendSet.Text = "图例"; + this.btnlegendSet.Click += new System.EventHandler(this.btnlegendSet_Click); + // + // buttonItem89 + // + this.buttonItem89.Image = ((System.Drawing.Image)(resources.GetObject("buttonItem89.Image"))); + this.buttonItem89.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem89.Name = "buttonItem89"; + this.buttonItem89.SubItemsExpandWidth = 14; + this.buttonItem89.Text = "全屏显示"; + this.buttonItem89.Click += new System.EventHandler(this.buttonItem89_Click); + // + // btnOutputJPG + // + this.btnOutputJPG.Image = ((System.Drawing.Image)(resources.GetObject("btnOutputJPG.Image"))); + this.btnOutputJPG.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.btnOutputJPG.Name = "btnOutputJPG"; + this.btnOutputJPG.SubItemsExpandWidth = 14; + this.btnOutputJPG.Text = "导出图片"; + this.btnOutputJPG.Click += new System.EventHandler(this.btnOutputJPG_Click); + // + // ribbonPanel12 + // + this.ribbonPanel12.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.ribbonPanel12.Controls.Add(this.ribbonBar18); + this.ribbonPanel12.Controls.Add(this.ribbonBar13); + this.ribbonPanel12.Dock = System.Windows.Forms.DockStyle.Fill; + this.ribbonPanel12.Location = new System.Drawing.Point(0, 33); + this.ribbonPanel12.Name = "ribbonPanel12"; + this.ribbonPanel12.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); + this.ribbonPanel12.Size = new System.Drawing.Size(1328, 62); + // + // + // + this.ribbonPanel12.Style.Class = ""; + this.ribbonPanel12.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonPanel12.StyleMouseDown.Class = ""; + this.ribbonPanel12.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonPanel12.StyleMouseOver.Class = ""; + this.ribbonPanel12.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonPanel12.TabIndex = 34; + this.ribbonPanel12.Visible = false; + // + // ribbonBar18 + // + this.ribbonBar18.AutoOverflowEnabled = true; + // + // + // + this.ribbonBar18.BackgroundMouseOverStyle.Class = ""; + this.ribbonBar18.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonBar18.BackgroundStyle.Class = ""; + this.ribbonBar18.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar18.ContainerControlProcessDialogKey = true; + this.ribbonBar18.Dock = System.Windows.Forms.DockStyle.Left; + this.ribbonBar18.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { + this.buttonItem133, + this.buttonItem132}); + this.ribbonBar18.Location = new System.Drawing.Point(508, 0); + this.ribbonBar18.Name = "ribbonBar18"; + this.ribbonBar18.Size = new System.Drawing.Size(75, 59); + this.ribbonBar18.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.ribbonBar18.TabIndex = 1; + // + // + // + this.ribbonBar18.TitleStyle.Class = ""; + this.ribbonBar18.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonBar18.TitleStyleMouseOver.Class = ""; + this.ribbonBar18.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar18.TitleVisible = false; + // + // buttonItem133 + // + this.buttonItem133.Image = ((System.Drawing.Image)(resources.GetObject("buttonItem133.Image"))); + this.buttonItem133.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem133.Name = "buttonItem133"; + this.buttonItem133.SubItemsExpandWidth = 14; + this.buttonItem133.Text = "审核入库"; + this.buttonItem133.Click += new System.EventHandler(this.buttonItem133_Click_1); + // + // buttonItem132 + // + this.buttonItem132.Name = "buttonItem132"; + // + // ribbonBar13 + // + this.ribbonBar13.AutoOverflowEnabled = true; + // + // + // + this.ribbonBar13.BackgroundMouseOverStyle.Class = ""; + this.ribbonBar13.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonBar13.BackgroundStyle.Class = ""; + this.ribbonBar13.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar13.ContainerControlProcessDialogKey = true; + this.ribbonBar13.Dock = System.Windows.Forms.DockStyle.Left; + this.ribbonBar13.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { + this.buttonItem127, + this.buttonItem128, + this.sliderItem1, + this.buttonItem134, + this.buttonItem130, + this.btn_check_history}); + this.ribbonBar13.Location = new System.Drawing.Point(3, 0); + this.ribbonBar13.Name = "ribbonBar13"; + this.ribbonBar13.Size = new System.Drawing.Size(505, 59); + this.ribbonBar13.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.ribbonBar13.TabIndex = 0; + // + // + // + this.ribbonBar13.TitleStyle.Class = ""; + this.ribbonBar13.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonBar13.TitleStyleMouseOver.Class = ""; + this.ribbonBar13.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar13.TitleVisible = false; + // + // buttonItem127 + // + this.buttonItem127.Image = ((System.Drawing.Image)(resources.GetObject("buttonItem127.Image"))); + this.buttonItem127.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem127.Name = "buttonItem127"; + this.buttonItem127.SubItemsExpandWidth = 14; + this.buttonItem127.Text = "打开数据"; + this.buttonItem127.Click += new System.EventHandler(this.buttonItem127_Click_2); + // + // buttonItem128 + // + this.buttonItem128.Image = ((System.Drawing.Image)(resources.GetObject("buttonItem128.Image"))); + this.buttonItem128.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem128.Name = "buttonItem128"; + this.buttonItem128.SubItemsExpandWidth = 14; + this.buttonItem128.Text = "一键审核"; + this.buttonItem128.Click += new System.EventHandler(this.buttonItem128_Click); + // + // sliderItem1 + // + this.sliderItem1.LabelPosition = DevComponents.DotNetBar.eSliderLabelPosition.Top; + this.sliderItem1.LabelWidth = 50; + this.sliderItem1.Name = "sliderItem1"; + this.sliderItem1.Text = "地面透明度"; + this.sliderItem1.TextColor = System.Drawing.Color.Black; + this.sliderItem1.Value = 0; + this.sliderItem1.ValueChanged += new System.EventHandler(this.sliderItem1_ValueChanged); + // + // buttonItem134 + // + this.buttonItem134.Image = ((System.Drawing.Image)(resources.GetObject("buttonItem134.Image"))); + this.buttonItem134.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem134.Name = "buttonItem134"; + this.buttonItem134.SubItemsExpandWidth = 14; + this.buttonItem134.Text = "模拟设计修改"; + this.buttonItem134.Click += new System.EventHandler(this.buttonItem134_Click_1); + // + // buttonItem130 + // + this.buttonItem130.Image = ((System.Drawing.Image)(resources.GetObject("buttonItem130.Image"))); + this.buttonItem130.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem130.Name = "buttonItem130"; + this.buttonItem130.SubItemsExpandWidth = 14; + this.buttonItem130.Text = "导出审核图"; + this.buttonItem130.Click += new System.EventHandler(this.buttonItem130_Click_1); + // + // btn_check_history + // + this.btn_check_history.Image = ((System.Drawing.Image)(resources.GetObject("btn_check_history.Image"))); + this.btn_check_history.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.btn_check_history.Name = "btn_check_history"; + this.btn_check_history.SubItemsExpandWidth = 14; + this.btn_check_history.Text = "审核历史"; + this.btn_check_history.Click += new System.EventHandler(this.btn_check_history_Click); + // + // ribbonPanel4 + // + this.ribbonPanel4.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.ribbonPanel4.Controls.Add(this.ribbonBar1); + this.ribbonPanel4.Dock = System.Windows.Forms.DockStyle.Fill; + this.ribbonPanel4.Location = new System.Drawing.Point(0, 33); + this.ribbonPanel4.Name = "ribbonPanel4"; + this.ribbonPanel4.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); + this.ribbonPanel4.Size = new System.Drawing.Size(1328, 62); + // + // + // + this.ribbonPanel4.Style.Class = ""; + this.ribbonPanel4.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonPanel4.StyleMouseDown.Class = ""; + this.ribbonPanel4.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonPanel4.StyleMouseOver.Class = ""; + this.ribbonPanel4.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonPanel4.TabIndex = 36; + this.ribbonPanel4.Visible = false; + // + // ribbonBar1 + // + this.ribbonBar1.AutoOverflowEnabled = true; + // + // + // + this.ribbonBar1.BackgroundMouseOverStyle.Class = ""; + this.ribbonBar1.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonBar1.BackgroundStyle.Class = ""; + this.ribbonBar1.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar1.ContainerControlProcessDialogKey = true; + this.ribbonBar1.Dock = System.Windows.Forms.DockStyle.Left; + this.ribbonBar1.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { + this.btn_document_info}); + this.ribbonBar1.Location = new System.Drawing.Point(3, 0); + this.ribbonBar1.Name = "ribbonBar1"; + this.ribbonBar1.Size = new System.Drawing.Size(88, 59); + this.ribbonBar1.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.ribbonBar1.TabIndex = 0; + // + // + // + this.ribbonBar1.TitleStyle.Class = ""; + this.ribbonBar1.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonBar1.TitleStyleMouseOver.Class = ""; + this.ribbonBar1.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar1.TitleVisible = false; + // + // btn_document_info + // + this.btn_document_info.Image = ((System.Drawing.Image)(resources.GetObject("btn_document_info.Image"))); + this.btn_document_info.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.btn_document_info.Name = "btn_document_info"; + this.btn_document_info.SubItemsExpandWidth = 14; + this.btn_document_info.Text = "文档管理"; + this.btn_document_info.Click += new System.EventHandler(this.btn_document_info_Click); + // // ribbonTabItem1 // this.ribbonTabItem1.ButtonStyle = DevComponents.DotNetBar.eButtonStyle.ImageAndText; @@ -3673,7 +3694,6 @@ this.ribbonTabItem7.Name = "ribbonTabItem7"; this.ribbonTabItem7.Panel = this.ribbonPanel7; this.ribbonTabItem7.Text = "管线定位"; - this.ribbonTabItem7.MouseDown += new System.Windows.Forms.MouseEventHandler(this.ribbonTabItem7_MouseDown); // // ribbonTabItem5 // @@ -3684,7 +3704,6 @@ this.ribbonTabItem5.Name = "ribbonTabItem5"; this.ribbonTabItem5.Panel = this.ribbonPanel3; this.ribbonTabItem5.Text = "标识器管理"; - this.ribbonTabItem5.MouseDown += new System.Windows.Forms.MouseEventHandler(this.ribbonTabItem5_MouseDown); // // ribbonTabItem2 // @@ -4451,7 +4470,7 @@ this.dataGridViewX2.ReadOnly = true; this.dataGridViewX2.RowHeadersVisible = false; this.dataGridViewX2.RowTemplate.Height = 23; - this.dataGridViewX2.Size = new System.Drawing.Size(31081, 92); + this.dataGridViewX2.Size = new System.Drawing.Size(31378, 92); this.dataGridViewX2.TabIndex = 11; // // dataGridViewTextBoxColumn10 @@ -4545,7 +4564,7 @@ this.dataGridViewX3.ReadOnly = true; this.dataGridViewX3.RowHeadersVisible = false; this.dataGridViewX3.RowTemplate.Height = 23; - this.dataGridViewX3.Size = new System.Drawing.Size(31080, 127); + this.dataGridViewX3.Size = new System.Drawing.Size(31377, 127); this.dataGridViewX3.TabIndex = 5; this.dataGridViewX3.MouseDoubleClick += new System.Windows.Forms.MouseEventHandler(this.dataGridViewX3_MouseDoubleClick); // @@ -5722,7 +5741,8 @@ // pictureBox1 // this.pictureBox1.Dock = System.Windows.Forms.DockStyle.Top; - this.pictureBox1.Image = ((System.Drawing.Image)(resources.GetObject("pictureBox1.Image"))); +// this.pictureBox1.Image = ((System.Drawing.Image)(resources.GetObject("pictureBox1.Image"))); + this.pictureBox1.Image = Image.FromFile(Application.StartupPath + Utility.TitleImagePath); this.pictureBox1.Location = new System.Drawing.Point(0, 0); this.pictureBox1.Margin = new System.Windows.Forms.Padding(0); this.pictureBox1.Name = "pictureBox1"; @@ -5732,18 +5752,6 @@ this.pictureBox1.TabStop = false; this.pictureBox1.Paint += new System.Windows.Forms.PaintEventHandler(this.pictureBox1_Paint); // - // layerTree - // - this.layerTree.CheckBoxes = true; - this.layerTree.ItemHeight = 18; - this.layerTree.Location = new System.Drawing.Point(30, 78); - this.layerTree.Name = "layerTree"; - this.layerTree.Size = new System.Drawing.Size(121, 97); - this.layerTree.TabIndex = 1; - this.layerTree.AfterCheck += new System.Windows.Forms.TreeViewEventHandler(this.layerTree_AfterCheck); - this.layerTree.NodeMouseClick += new System.Windows.Forms.TreeNodeMouseClickEventHandler(this.layerTree_NodeMouseClick); - this.layerTree.NodeMouseDoubleClick += new System.Windows.Forms.TreeNodeMouseClickEventHandler(this.layerTree_NodeMouseDoubleClick); - // // MainFrm // this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Inherit; @@ -5770,7 +5778,8 @@ this.KeyPreview = true; this.Name = "MainFrm"; this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen; - this.Text = "智慧太湖新城管网规划分析系统6.0"; +// this.Text = "智慧太湖新城管网规划分析系统6.0"; + this.Text = Utility.SysnameVersion; this.WindowState = System.Windows.Forms.FormWindowState.Maximized; this.FormClosing += new System.Windows.Forms.FormClosingEventHandler(this.MainFrm_FormClosing); this.Load += new System.EventHandler(this.MainFrm_Load); @@ -5787,15 +5796,15 @@ this.contextMenuStripDeleteLayerNode.ResumeLayout(false); this.ribbonControl1.ResumeLayout(false); this.ribbonControl1.PerformLayout(); + this.ribbonPanel3.ResumeLayout(false); + this.ribbonPanel7.ResumeLayout(false); + this.ribbonPanel15.ResumeLayout(false); + this.ribbonPanel2.ResumeLayout(false); this.ribbonPanel6.ResumeLayout(false); this.ribbonPanel5.ResumeLayout(false); this.ribbonPanel1.ResumeLayout(false); this.ribbonPanel12.ResumeLayout(false); this.ribbonPanel4.ResumeLayout(false); - this.ribbonPanel15.ResumeLayout(false); - this.ribbonPanel3.ResumeLayout(false); - this.ribbonPanel7.ResumeLayout(false); - this.ribbonPanel2.ResumeLayout(false); this.panelOfTable.ResumeLayout(false); this.panelOfTable.PerformLayout(); ((System.ComponentModel.ISupportInitialize)(this.dataGridViewX1)).EndInit(); @@ -5955,6 +5964,7 @@ private RibbonTabItem ribbonTabItem11; private ButtonItem buttonItem130; private RibbonBar ribbonBar18; + private ButtonItem buttonItem132; private SliderItem sliderItem1; private ButtonItem buttonItem133; private ButtonItem buttonItem134; diff --git a/MainFrm.resx b/MainFrm.resx index 9f9bba4..ce490c1 100644 --- a/MainFrm.resx +++ b/MainFrm.resx @@ -351,6 +351,146 @@ 766, 54 + + + iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 + YQUAAAAZdEVYdFNvZnR3YXJlAEFkb2JlIEltYWdlUmVhZHlxyWU8AAADZmlUWHRYTUw6Y29tLmFkb2Jl + LnhtcAAAAAAAPD94cGFja2V0IGJlZ2luPSLvu78iIGlkPSJXNU0wTXBDZWhpSHpyZVN6TlRjemtjOWQi + Pz4gPHg6eG1wbWV0YSB4bWxuczp4PSJhZG9iZTpuczptZXRhLyIgeDp4bXB0az0iQWRvYmUgWE1QIENv + cmUgNS4zLWMwMTEgNjYuMTQ1NjYxLCAyMDEyLzAyLzA2LTE0OjU2OjI3ICAgICAgICAiPiA8cmRmOlJE + RiB4bWxuczpyZGY9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkvMDIvMjItcmRmLXN5bnRheC1ucyMiPiA8 + cmRmOkRlc2NyaXB0aW9uIHJkZjphYm91dD0iIiB4bWxuczp4bXBNTT0iaHR0cDovL25zLmFkb2JlLmNv + bS94YXAvMS4wL21tLyIgeG1sbnM6c3RSZWY9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlw + ZS9SZXNvdXJjZVJlZiMiIHhtbG5zOnhtcD0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wLyIgeG1w + TU06T3JpZ2luYWxEb2N1bWVudElEPSJ4bXAuZGlkOjYzQTM5NEY4Mjg0OUU0MTE5NDBEQTc4ODZEQzk5 + N0NGIiB4bXBNTTpEb2N1bWVudElEPSJ4bXAuZGlkOjEwQ0IxNzBBNEM1QzExRTRBNkNGQzRBMjhDQzI0 + MkY4IiB4bXBNTTpJbnN0YW5jZUlEPSJ4bXAuaWlkOjEwQ0IxNzA5NEM1QzExRTRBNkNGQzRBMjhDQzI0 + MkY4IiB4bXA6Q3JlYXRvclRvb2w9IkFkb2JlIFBob3Rvc2hvcCBDUzYgKFdpbmRvd3MpIj4gPHhtcE1N + OkRlcml2ZWRGcm9tIHN0UmVmOmluc3RhbmNlSUQ9InhtcC5paWQ6NTEzMDNDMjA1QjRDRTQxMTg4NERE + MUVBOEQ4QTgyNTUiIHN0UmVmOmRvY3VtZW50SUQ9InhtcC5kaWQ6NjNBMzk0RjgyODQ5RTQxMTk0MERB + Nzg4NkRDOTk3Q0YiLz4gPC9yZGY6RGVzY3JpcHRpb24+IDwvcmRmOlJERj4gPC94OnhtcG1ldGE+IDw/ + eHBhY2tldCBlbmQ9InIiPz43wa2/AAAFaUlEQVRIS6WUC0xTVxzGKy0UkSmlFGjBFilSkNpSaAWRh63y + sIiAArKs4spLRLQoiEJlSMGoMCc6CBOnYHzMOHUqqOhEHOqCbjNu6kCd6KYje5mZ6KbObd/OuVL3cEzj + /skv997/+b7v39PTW9aj3/BM+OKxPEIZoW/gyrOuPbP+GvRPSNBQQqXYLwSW1etw7cYt5kqfaZ+uD8QM + Xg8f/f4UxGhHMHv4qlG6vAb9394G6T+BPpdV1oCuUx3VD8Q9XT8//PUJRMghlLhLg1C41IK+r/pB+oNC + 16mO6qmP+gdi/6y793+hwTYEk9uoQOSaStHzxQ2Q/nND9XMKy0D9NIfmDcSzaLhI4KXE7LwinLtwGXfu + PXhhqJ/m0DyS62EdUGWpqcf3P97DD3d++t/QnKraBjpghXWAiC+WN0ZNScOe1mP45vbdF2ZvWwdoDs/D + b6ejs6ecxHPoAG/l+Fhkzy+FyCcY0YkG7D/yAW5+d+e5oXrqo36aQ/McnNyjyAAuHWA05pfgzPlehhyT + mflV6FOMaDt2Ctf7bw8KXac6qqc+a4Zx3hLwRLJCZgcJjcPIEPkyIZmeX1SB7vOX0dn9KQy5jw8r8eVc + HOrsxidXP0d9hxlzd4QgeYMzEt7kQVvOR0pFFNpOHmd81E9znIS+dSTc1foVGWfNKUZjyy6Ex6SQl0cD + 09IVxHAFh0+cReqr+QjK8ERqEw+VHWOwoycSR/v1OHwzDlsvhcNCeqkbedAYxQiPm87kZOQVw0nkW0QG + 2DFnIA+JRm3DFpzr/RKNW3ZDE5UAsX8ocizZiFs7DEUHvPFunw4Hb05B+y09jn49lYHe0x5doxqqLVlf + DJrnyB+pIQNs6QAhf6R8tZu3CqpwPdZu2I6PLl3HwnV5iHv9JVSeUOKdqzq81xeDvddiYG73R0aLEIZm + IRa1jUbjxQnYRHa17YqW0VJPwHT3LocRbirrDiymspXo6L6AgiXV8JSNQ2i6GpNWOqK4U4n1n0Vge68W + 9ecmIKnBBSqDCIp4P2RWGDB/QxqS6l1QcToIld3BqDobgsXEQ73+Se5HrGcgdJEokGzIx66DXXi7dRvC + yx2Q2RqApR+GoPbjCag8pUZ6sxjqWRKEldljRr07ZjaKmHt5qpBZKzkeiIJ2BbIPKmA8MIbJUC/ghrM0 + RfYsDtdhqJNIVulK/ku0BQokbfZGZrsKBR3BmEsMOfvl0FY7o7ypDPo1brCcGc+QUCdExabXEFsjQO4B + ObL2BSBlqx8SWwibvBE0334nK3Ael+yEbIW81DZszlhZ2oieuAYvpO5VIHGzP9J2+CN9pz/CzDwExMox + eZUbFnZpkEc+gLZagJjMWOiqXZDVqmC0+kZf6Nb4IHKFCPIsu92sgCw7BlJswjBJLCdenmuPyFUS6Gp9 + oG/yRdJWGSKqhYjKDgLRImK5ACGlzsy9d/zwXn2DBMZDSkZLPaHlnpBncyGO5kxj+Rps/wYdJE2xzfOb + zcU4sye0b0gRu3E0Ypt8ELTICRFGNcShUgjHuZyWxNu2096sdiXS9o1ltNQjyyDhes4SkuXEGpXC+Ve8 + kjlzpDPtoCkVQrdOihgyIHmXP6LryGEX86Ba6ISJNR7IeF+JV8gAfbOM0XoTj8dktpmEOxM4rJHTBscz + njNNnMiBagEfU98ajRnbZMg7GojCk2oGU1cw5nUGw7BHAZWJD6oVhLFzSDCPCacljGP/J7xAm6Hu0ew6 + STIXkcvckN7ig8XHVCjvUiNvdwAmW0Twms6FayS7meM4REoihxPoeT4u10nsZ0LKhhdsIxZEsVcLtOyL + pHffVcd+IJjI7uGHsRscJEPURMMn2FMtNTwuFusPrjFl48ji7nIAAAAASUVORK5CYII= + + + + + iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 + YQUAAAAZdEVYdFNvZnR3YXJlAEFkb2JlIEltYWdlUmVhZHlxyWU8AAADZmlUWHRYTUw6Y29tLmFkb2Jl + LnhtcAAAAAAAPD94cGFja2V0IGJlZ2luPSLvu78iIGlkPSJXNU0wTXBDZWhpSHpyZVN6TlRjemtjOWQi + Pz4gPHg6eG1wbWV0YSB4bWxuczp4PSJhZG9iZTpuczptZXRhLyIgeDp4bXB0az0iQWRvYmUgWE1QIENv + cmUgNS4zLWMwMTEgNjYuMTQ1NjYxLCAyMDEyLzAyLzA2LTE0OjU2OjI3ICAgICAgICAiPiA8cmRmOlJE + RiB4bWxuczpyZGY9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkvMDIvMjItcmRmLXN5bnRheC1ucyMiPiA8 + cmRmOkRlc2NyaXB0aW9uIHJkZjphYm91dD0iIiB4bWxuczp4bXBNTT0iaHR0cDovL25zLmFkb2JlLmNv + bS94YXAvMS4wL21tLyIgeG1sbnM6c3RSZWY9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlw + ZS9SZXNvdXJjZVJlZiMiIHhtbG5zOnhtcD0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wLyIgeG1w + TU06T3JpZ2luYWxEb2N1bWVudElEPSJ4bXAuZGlkOjYzQTM5NEY4Mjg0OUU0MTE5NDBEQTc4ODZEQzk5 + N0NGIiB4bXBNTTpEb2N1bWVudElEPSJ4bXAuZGlkOkUyMTg3NjEyNDlEODExRTQ4NjNGQjM2Mzk1QkNB + RkQwIiB4bXBNTTpJbnN0YW5jZUlEPSJ4bXAuaWlkOkUyMTg3NjExNDlEODExRTQ4NjNGQjM2Mzk1QkNB + RkQwIiB4bXA6Q3JlYXRvclRvb2w9IkFkb2JlIFBob3Rvc2hvcCBDUzYgKFdpbmRvd3MpIj4gPHhtcE1N + OkRlcml2ZWRGcm9tIHN0UmVmOmluc3RhbmNlSUQ9InhtcC5paWQ6NkJCNTE0NDlEODQ5RTQxMUE0QzNB + MjdEOTJBQzc3QkMiIHN0UmVmOmRvY3VtZW50SUQ9InhtcC5kaWQ6NjNBMzk0RjgyODQ5RTQxMTk0MERB + Nzg4NkRDOTk3Q0YiLz4gPC9yZGY6RGVzY3JpcHRpb24+IDwvcmRmOlJERj4gPC94OnhtcG1ldGE+IDw/ + eHBhY2tldCBlbmQ9InIiPz5e5MstAAADiUlEQVRIS+2UW0yTdxjGcePwtYyVVpAUCi1tv9ImrVbxhAei + kjGphAgFT4jzEJ0gGuJhDk0sml0sglmWmC1hqHNKWwI4srgNh3phpjg1O1yIN5DMbFHQZUu42O76+D4f + 3Fl6Z7ILn+SXvH3f533++X/98iUBeKW81v9Uwx1G1+1240EhfKfdeE/4U3qTAqaZZO/2aeN9IXLrY+Ph + wVOZHll9YyohgYZOGS4JsYdXVDy+NQ8Tvy3BP6OlmPyjDP9OBDRYs8cZPfRy5/uQISIRqcIsLSye+j7I + wN+PluOvhyWY+NmL8fsOjP9kxdN7BRh/YJHfFjy5m48nd4ThQjy968bEgwV49usicFciTEKKFhZPXXv1 + eHxtLsYGPBjttwsWjF0xY+ybOfj9uylYs8cZPfQS7kpEnqDTwuLp9GYlfKZeifUfzcb1j/Iw/IkNv3Q6 + MfKVC6O9bg3W7HFGD73cORlMG5AIizDzAaVtunD5ESXWfNSEY/tNCO00oG1zOkJBBSeqUjVYh6R3Qmat + zSY0Hjah7IASW7hPuSoRvIGihcVTSauCppvFODRUjJZvPWgaKMTuXgt2RHOxLTwHDd3EjPfCudgesWJX + jxM7eryo7/Ni8SGFj8gp6LWwePLvS0Og043A5y5UdtkQOJeLivM5ePf8bJSfM04zG2u7chDoysW6Thsq + zqpY0+GAvymNB/gEgxYWT64tKdGihpSYv8WEpSEzVp0pwDuf2SVQReCiS4M1e5zRQy937NXJ1yRirjDz + AVmVJyNZa9+PObauh7ptKdR6FY6N2SisTYe1OlmDNXtqvRNqwxLYt1TCVLY1ZijZOSQRbuEtLSyeTOXH + sfLDH1EauoFFx6/Cd6Qf7pYI1ObLsO+9iMLdF+DccwEuqd2Nl+Br6sbCxiiKd/XBuPogH1HiAzJXHMC8 + YA98td1wb4rCuaEH1roo8oMR5JGaMPIFa10Ejtowiuouw1vzJTwVXyBz+X4ekPgRZfgbohkLtsfMy47B + tqYdakUnPFUM6YUv+LUGa/Y4o8e8rBXcSffWDkpE4j9ZpEvNmb9KsZV16BzrBnVq1YjeVf1MX1Tzn74o + iCmkdq1/LrNHOkfgB6Vg9afJRrVOdv2ClRkMmklvCnyPs4V8ge81v5RegddnCGHNHmf00JslcJcZCcWv + IU1pAhcyhLcFXj1zGtbscUYPvdyZ+Uv6Wi8rKekFBjoX2627by8AAAAASUVORK5CYII= + + + + + iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 + YQUAAAAZdEVYdFNvZnR3YXJlAEFkb2JlIEltYWdlUmVhZHlxyWU8AAADZmlUWHRYTUw6Y29tLmFkb2Jl + LnhtcAAAAAAAPD94cGFja2V0IGJlZ2luPSLvu78iIGlkPSJXNU0wTXBDZWhpSHpyZVN6TlRjemtjOWQi + Pz4gPHg6eG1wbWV0YSB4bWxuczp4PSJhZG9iZTpuczptZXRhLyIgeDp4bXB0az0iQWRvYmUgWE1QIENv + cmUgNS4zLWMwMTEgNjYuMTQ1NjYxLCAyMDEyLzAyLzA2LTE0OjU2OjI3ICAgICAgICAiPiA8cmRmOlJE + RiB4bWxuczpyZGY9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkvMDIvMjItcmRmLXN5bnRheC1ucyMiPiA8 + cmRmOkRlc2NyaXB0aW9uIHJkZjphYm91dD0iIiB4bWxuczp4bXBNTT0iaHR0cDovL25zLmFkb2JlLmNv + bS94YXAvMS4wL21tLyIgeG1sbnM6c3RSZWY9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlw + ZS9SZXNvdXJjZVJlZiMiIHhtbG5zOnhtcD0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wLyIgeG1w + TU06T3JpZ2luYWxEb2N1bWVudElEPSJ4bXAuZGlkOjYzQTM5NEY4Mjg0OUU0MTE5NDBEQTc4ODZEQzk5 + N0NGIiB4bXBNTTpEb2N1bWVudElEPSJ4bXAuZGlkOkE2Q0VGMDE2NDlEQTExRTQ4NTlCQTI3NTMyOEY5 + NEU2IiB4bXBNTTpJbnN0YW5jZUlEPSJ4bXAuaWlkOkE2Q0VGMDE1NDlEQTExRTQ4NTlCQTI3NTMyOEY5 + NEU2IiB4bXA6Q3JlYXRvclRvb2w9IkFkb2JlIFBob3Rvc2hvcCBDUzYgKFdpbmRvd3MpIj4gPHhtcE1N + OkRlcml2ZWRGcm9tIHN0UmVmOmluc3RhbmNlSUQ9InhtcC5paWQ6NjA1MjM3NzFEOTQ5RTQxMUE0QzNB + MjdEOTJBQzc3QkMiIHN0UmVmOmRvY3VtZW50SUQ9InhtcC5kaWQ6NjNBMzk0RjgyODQ5RTQxMTk0MERB + Nzg4NkRDOTk3Q0YiLz4gPC9yZGY6RGVzY3JpcHRpb24+IDwvcmRmOlJERj4gPC94OnhtcG1ldGE+IDw/ + eHBhY2tldCBlbmQ9InIiPz6UH16BAAABrElEQVRIS63N70tTURzH8fsnKSGCCEIQCBKISMq2iILCgQOL + JUxQAoVKdMGQuwgWFepsMGjFZCMuorsIJV4WFatpvzdr1ZAFsaIHn8559v1eDsI91wevJ/ee7/tjbMRH + fAFwJOWRF6oopTzyQhWlVEdBwRbgUhICAnuvilKGtXDGzW6WV/CvbjE/xTfxr+R6q4xSxtP5YTf8rVn4 + s5dG+809Rv5zvVVGKaNwfYgyBfhksoH83CCF9seiL7LBBnLXTlP4/W4dza0ZLS0nCdlgA9npAQq/qk/Q + sKa0NJ8nIBtsIBPrp9CqPMJBYVLLj+04ZIMNrF49ReHwVRafH1/R8m3zJmSDDdy/fJJC88Ua3mcjWurW + LGSDDaQifRS+O8uopsNaPhVnIBts4E64l0Jj5y4qDy5q+ZCPQTbYgHmph8LXZ0m8TJ3Xsp+LQjbYQOJC + N4XadgLl22e1vM1OQDbYwK1zXRS+lBbhmEHsLgU8kTeVh+OQDTawEDpB2U4mitfpMS22GYJssIH5QCcV + FGwBmuRtkA3cGO3whcZUlEdeqKKU8sgLVZRSfjw+MP4DJ2GPpDR9OIsAAAAASUVORK5CYII= + + + + + iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 + YQUAAAAZdEVYdFNvZnR3YXJlAEFkb2JlIEltYWdlUmVhZHlxyWU8AAADZmlUWHRYTUw6Y29tLmFkb2Jl + LnhtcAAAAAAAPD94cGFja2V0IGJlZ2luPSLvu78iIGlkPSJXNU0wTXBDZWhpSHpyZVN6TlRjemtjOWQi + Pz4gPHg6eG1wbWV0YSB4bWxuczp4PSJhZG9iZTpuczptZXRhLyIgeDp4bXB0az0iQWRvYmUgWE1QIENv + cmUgNS4zLWMwMTEgNjYuMTQ1NjYxLCAyMDEyLzAyLzA2LTE0OjU2OjI3ICAgICAgICAiPiA8cmRmOlJE + RiB4bWxuczpyZGY9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkvMDIvMjItcmRmLXN5bnRheC1ucyMiPiA8 + cmRmOkRlc2NyaXB0aW9uIHJkZjphYm91dD0iIiB4bWxuczp4bXBNTT0iaHR0cDovL25zLmFkb2JlLmNv + bS94YXAvMS4wL21tLyIgeG1sbnM6c3RSZWY9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlw + ZS9SZXNvdXJjZVJlZiMiIHhtbG5zOnhtcD0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wLyIgeG1w + TU06T3JpZ2luYWxEb2N1bWVudElEPSJ4bXAuZGlkOjYzQTM5NEY4Mjg0OUU0MTE5NDBEQTc4ODZEQzk5 + N0NGIiB4bXBNTTpEb2N1bWVudElEPSJ4bXAuZGlkOjJGRTU5OEQ1NDlEQjExRTRBRUVDOTkyMjQ5NzEw + REUwIiB4bXBNTTpJbnN0YW5jZUlEPSJ4bXAuaWlkOjJGRTU5OEQ0NDlEQjExRTRBRUVDOTkyMjQ5NzEw + REUwIiB4bXA6Q3JlYXRvclRvb2w9IkFkb2JlIFBob3Rvc2hvcCBDUzYgKFdpbmRvd3MpIj4gPHhtcE1N + OkRlcml2ZWRGcm9tIHN0UmVmOmluc3RhbmNlSUQ9InhtcC5paWQ6MTY0MkI1RjlEQTQ5RTQxMUE0QzNB + MjdEOTJBQzc3QkMiIHN0UmVmOmRvY3VtZW50SUQ9InhtcC5kaWQ6NjNBMzk0RjgyODQ5RTQxMTk0MERB + Nzg4NkRDOTk3Q0YiLz4gPC9yZGY6RGVzY3JpcHRpb24+IDwvcmRmOlJERj4gPC94OnhtcG1ldGE+IDw/ + eHBhY2tldCBlbmQ9InIiPz6B5sF9AAACe0lEQVRIS7WVb2jMcRzHL7UHanF/Mts5prE/1li3kAfu5Ak7 + 5IHNobBkSC2UIuGJkrrSWRvTmHQWK8U1T8jqUtYwkZpaGjV/Js6to5YwfXze39+fu/v23f36hXe9us+f + 7/v9rd/dr3MQ0X/F4Zm3+K9QhWajNNlBFZqN0mQHS6lMdrCUyqSgimllUsy4XmOmp+QRDllQWbygjjq6 + uimZStOX8a+ixox3pXrM1JLCDAqYJmY7c669M0bff07mcLbtEl9QE8k6V6BH5ooXMsHZZX7ae+AY7W45 + SrPm19LbsSR9m/iRA2bYGefggVePzUgKBzeu9sQpmZ4QcG/WMtk7eLjv0WMz0kOz+TX6MUXvP6cFeNbD + bz6YvQFm2Bk9PPByZO6jksLB5KvRTzTyLikIrG2ktsvXzd4g2hGjYP1ms4eHvb850qkl65LCQW/ntVs0 + 9HpMcPx0K1X4V1Ff/3NzhnphbVDsjBk8Lm/VE44s0ZJ1KS4Ie8uXUvPBE7Tn0ElCzTMqrV5BO/cfEaDG + TD5X6PFFONLygsTF7jj1vxihyPkYNTS1iFrFxm37KHIhJmp43L7qZxzp0pJ1SeHhQGgLJQaH6fb9R1QX + 2EB3Ek9FryLe95j8K9eLT/TB0FZcskOP1iRdkIh23aR7Ay9pzaZddKY9Jup8nIpeoXXhZlHD655b85Bj + p2npLOmCML+dD/iTZhaX3+UvbRB1PpzeygFnSUUvatecRUMzisoOc+x0LZ3FixxYhQyK1cxyZhkTYhqY + RgnM6hmcwVl4ljDI0KS4AC+Kmyli8Jv2MF7GNwXY4QzOwgNv5mWTL7CLpVQmO1hKZbKDpVR/1P8OcvwB + lh7gOXXZq9sAAAAASUVORK5CYII= + + iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 @@ -598,147 +738,7 @@ 1BGxz38BvCwLsyQ3iHgAAAAASUVORK5CYII= - - - iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAZdEVYdFNvZnR3YXJlAEFkb2JlIEltYWdlUmVhZHlxyWU8AAADZmlUWHRYTUw6Y29tLmFkb2Jl - LnhtcAAAAAAAPD94cGFja2V0IGJlZ2luPSLvu78iIGlkPSJXNU0wTXBDZWhpSHpyZVN6TlRjemtjOWQi - Pz4gPHg6eG1wbWV0YSB4bWxuczp4PSJhZG9iZTpuczptZXRhLyIgeDp4bXB0az0iQWRvYmUgWE1QIENv - cmUgNS4zLWMwMTEgNjYuMTQ1NjYxLCAyMDEyLzAyLzA2LTE0OjU2OjI3ICAgICAgICAiPiA8cmRmOlJE - RiB4bWxuczpyZGY9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkvMDIvMjItcmRmLXN5bnRheC1ucyMiPiA8 - cmRmOkRlc2NyaXB0aW9uIHJkZjphYm91dD0iIiB4bWxuczp4bXBNTT0iaHR0cDovL25zLmFkb2JlLmNv - bS94YXAvMS4wL21tLyIgeG1sbnM6c3RSZWY9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlw - ZS9SZXNvdXJjZVJlZiMiIHhtbG5zOnhtcD0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wLyIgeG1w - TU06T3JpZ2luYWxEb2N1bWVudElEPSJ4bXAuZGlkOjYzQTM5NEY4Mjg0OUU0MTE5NDBEQTc4ODZEQzk5 - N0NGIiB4bXBNTTpEb2N1bWVudElEPSJ4bXAuZGlkOjEwQ0IxNzBBNEM1QzExRTRBNkNGQzRBMjhDQzI0 - MkY4IiB4bXBNTTpJbnN0YW5jZUlEPSJ4bXAuaWlkOjEwQ0IxNzA5NEM1QzExRTRBNkNGQzRBMjhDQzI0 - MkY4IiB4bXA6Q3JlYXRvclRvb2w9IkFkb2JlIFBob3Rvc2hvcCBDUzYgKFdpbmRvd3MpIj4gPHhtcE1N - OkRlcml2ZWRGcm9tIHN0UmVmOmluc3RhbmNlSUQ9InhtcC5paWQ6NTEzMDNDMjA1QjRDRTQxMTg4NERE - MUVBOEQ4QTgyNTUiIHN0UmVmOmRvY3VtZW50SUQ9InhtcC5kaWQ6NjNBMzk0RjgyODQ5RTQxMTk0MERB - Nzg4NkRDOTk3Q0YiLz4gPC9yZGY6RGVzY3JpcHRpb24+IDwvcmRmOlJERj4gPC94OnhtcG1ldGE+IDw/ - eHBhY2tldCBlbmQ9InIiPz43wa2/AAAFaUlEQVRIS6WUC0xTVxzGKy0UkSmlFGjBFilSkNpSaAWRh63y - sIiAArKs4spLRLQoiEJlSMGoMCc6CBOnYHzMOHUqqOhEHOqCbjNu6kCd6KYje5mZ6KbObd/OuVL3cEzj - /skv997/+b7v39PTW9aj3/BM+OKxPEIZoW/gyrOuPbP+GvRPSNBQQqXYLwSW1etw7cYt5kqfaZ+uD8QM - Xg8f/f4UxGhHMHv4qlG6vAb9394G6T+BPpdV1oCuUx3VD8Q9XT8//PUJRMghlLhLg1C41IK+r/pB+oNC - 16mO6qmP+gdi/6y793+hwTYEk9uoQOSaStHzxQ2Q/nND9XMKy0D9NIfmDcSzaLhI4KXE7LwinLtwGXfu - PXhhqJ/m0DyS62EdUGWpqcf3P97DD3d++t/QnKraBjpghXWAiC+WN0ZNScOe1mP45vbdF2ZvWwdoDs/D - b6ejs6ecxHPoAG/l+Fhkzy+FyCcY0YkG7D/yAW5+d+e5oXrqo36aQ/McnNyjyAAuHWA05pfgzPlehhyT - mflV6FOMaDt2Ctf7bw8KXac6qqc+a4Zx3hLwRLJCZgcJjcPIEPkyIZmeX1SB7vOX0dn9KQy5jw8r8eVc - HOrsxidXP0d9hxlzd4QgeYMzEt7kQVvOR0pFFNpOHmd81E9znIS+dSTc1foVGWfNKUZjyy6Ex6SQl0cD - 09IVxHAFh0+cReqr+QjK8ERqEw+VHWOwoycSR/v1OHwzDlsvhcNCeqkbedAYxQiPm87kZOQVw0nkW0QG - 2DFnIA+JRm3DFpzr/RKNW3ZDE5UAsX8ocizZiFs7DEUHvPFunw4Hb05B+y09jn49lYHe0x5doxqqLVlf - DJrnyB+pIQNs6QAhf6R8tZu3CqpwPdZu2I6PLl3HwnV5iHv9JVSeUOKdqzq81xeDvddiYG73R0aLEIZm - IRa1jUbjxQnYRHa17YqW0VJPwHT3LocRbirrDiymspXo6L6AgiXV8JSNQ2i6GpNWOqK4U4n1n0Vge68W - 9ecmIKnBBSqDCIp4P2RWGDB/QxqS6l1QcToIld3BqDobgsXEQ73+Se5HrGcgdJEokGzIx66DXXi7dRvC - yx2Q2RqApR+GoPbjCag8pUZ6sxjqWRKEldljRr07ZjaKmHt5qpBZKzkeiIJ2BbIPKmA8MIbJUC/ghrM0 - RfYsDtdhqJNIVulK/ku0BQokbfZGZrsKBR3BmEsMOfvl0FY7o7ypDPo1brCcGc+QUCdExabXEFsjQO4B - ObL2BSBlqx8SWwibvBE0334nK3Ael+yEbIW81DZszlhZ2oieuAYvpO5VIHGzP9J2+CN9pz/CzDwExMox - eZUbFnZpkEc+gLZagJjMWOiqXZDVqmC0+kZf6Nb4IHKFCPIsu92sgCw7BlJswjBJLCdenmuPyFUS6Gp9 - oG/yRdJWGSKqhYjKDgLRImK5ACGlzsy9d/zwXn2DBMZDSkZLPaHlnpBncyGO5kxj+Rps/wYdJE2xzfOb - zcU4sye0b0gRu3E0Ypt8ELTICRFGNcShUgjHuZyWxNu2096sdiXS9o1ltNQjyyDhes4SkuXEGpXC+Ve8 - kjlzpDPtoCkVQrdOihgyIHmXP6LryGEX86Ba6ISJNR7IeF+JV8gAfbOM0XoTj8dktpmEOxM4rJHTBscz - njNNnMiBagEfU98ajRnbZMg7GojCk2oGU1cw5nUGw7BHAZWJD6oVhLFzSDCPCacljGP/J7xAm6Hu0ew6 - STIXkcvckN7ig8XHVCjvUiNvdwAmW0Twms6FayS7meM4REoihxPoeT4u10nsZ0LKhhdsIxZEsVcLtOyL - pHffVcd+IJjI7uGHsRscJEPURMMn2FMtNTwuFusPrjFl48ji7nIAAAAASUVORK5CYII= - - - - - iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAZdEVYdFNvZnR3YXJlAEFkb2JlIEltYWdlUmVhZHlxyWU8AAADZmlUWHRYTUw6Y29tLmFkb2Jl - LnhtcAAAAAAAPD94cGFja2V0IGJlZ2luPSLvu78iIGlkPSJXNU0wTXBDZWhpSHpyZVN6TlRjemtjOWQi - Pz4gPHg6eG1wbWV0YSB4bWxuczp4PSJhZG9iZTpuczptZXRhLyIgeDp4bXB0az0iQWRvYmUgWE1QIENv - cmUgNS4zLWMwMTEgNjYuMTQ1NjYxLCAyMDEyLzAyLzA2LTE0OjU2OjI3ICAgICAgICAiPiA8cmRmOlJE - RiB4bWxuczpyZGY9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkvMDIvMjItcmRmLXN5bnRheC1ucyMiPiA8 - cmRmOkRlc2NyaXB0aW9uIHJkZjphYm91dD0iIiB4bWxuczp4bXBNTT0iaHR0cDovL25zLmFkb2JlLmNv - bS94YXAvMS4wL21tLyIgeG1sbnM6c3RSZWY9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlw - ZS9SZXNvdXJjZVJlZiMiIHhtbG5zOnhtcD0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wLyIgeG1w - TU06T3JpZ2luYWxEb2N1bWVudElEPSJ4bXAuZGlkOjYzQTM5NEY4Mjg0OUU0MTE5NDBEQTc4ODZEQzk5 - N0NGIiB4bXBNTTpEb2N1bWVudElEPSJ4bXAuZGlkOkUyMTg3NjEyNDlEODExRTQ4NjNGQjM2Mzk1QkNB - RkQwIiB4bXBNTTpJbnN0YW5jZUlEPSJ4bXAuaWlkOkUyMTg3NjExNDlEODExRTQ4NjNGQjM2Mzk1QkNB - RkQwIiB4bXA6Q3JlYXRvclRvb2w9IkFkb2JlIFBob3Rvc2hvcCBDUzYgKFdpbmRvd3MpIj4gPHhtcE1N - OkRlcml2ZWRGcm9tIHN0UmVmOmluc3RhbmNlSUQ9InhtcC5paWQ6NkJCNTE0NDlEODQ5RTQxMUE0QzNB - MjdEOTJBQzc3QkMiIHN0UmVmOmRvY3VtZW50SUQ9InhtcC5kaWQ6NjNBMzk0RjgyODQ5RTQxMTk0MERB - Nzg4NkRDOTk3Q0YiLz4gPC9yZGY6RGVzY3JpcHRpb24+IDwvcmRmOlJERj4gPC94OnhtcG1ldGE+IDw/ - eHBhY2tldCBlbmQ9InIiPz5e5MstAAADiUlEQVRIS+2UW0yTdxjGcePwtYyVVpAUCi1tv9ImrVbxhAei - kjGphAgFT4jzEJ0gGuJhDk0sml0sglmWmC1hqHNKWwI4srgNh3phpjg1O1yIN5DMbFHQZUu42O76+D4f - 3Fl6Z7ILn+SXvH3f533++X/98iUBeKW81v9Uwx1G1+1240EhfKfdeE/4U3qTAqaZZO/2aeN9IXLrY+Ph - wVOZHll9YyohgYZOGS4JsYdXVDy+NQ8Tvy3BP6OlmPyjDP9OBDRYs8cZPfRy5/uQISIRqcIsLSye+j7I - wN+PluOvhyWY+NmL8fsOjP9kxdN7BRh/YJHfFjy5m48nd4ThQjy968bEgwV49usicFciTEKKFhZPXXv1 - eHxtLsYGPBjttwsWjF0xY+ybOfj9uylYs8cZPfQS7kpEnqDTwuLp9GYlfKZeifUfzcb1j/Iw/IkNv3Q6 - MfKVC6O9bg3W7HFGD73cORlMG5AIizDzAaVtunD5ESXWfNSEY/tNCO00oG1zOkJBBSeqUjVYh6R3Qmat - zSY0Hjah7IASW7hPuSoRvIGihcVTSauCppvFODRUjJZvPWgaKMTuXgt2RHOxLTwHDd3EjPfCudgesWJX - jxM7eryo7/Ni8SGFj8gp6LWwePLvS0Og043A5y5UdtkQOJeLivM5ePf8bJSfM04zG2u7chDoysW6Thsq - zqpY0+GAvymNB/gEgxYWT64tKdGihpSYv8WEpSEzVp0pwDuf2SVQReCiS4M1e5zRQy937NXJ1yRirjDz - AVmVJyNZa9+PObauh7ptKdR6FY6N2SisTYe1OlmDNXtqvRNqwxLYt1TCVLY1ZijZOSQRbuEtLSyeTOXH - sfLDH1EauoFFx6/Cd6Qf7pYI1ObLsO+9iMLdF+DccwEuqd2Nl+Br6sbCxiiKd/XBuPogH1HiAzJXHMC8 - YA98td1wb4rCuaEH1roo8oMR5JGaMPIFa10Ejtowiuouw1vzJTwVXyBz+X4ekPgRZfgbohkLtsfMy47B - tqYdakUnPFUM6YUv+LUGa/Y4o8e8rBXcSffWDkpE4j9ZpEvNmb9KsZV16BzrBnVq1YjeVf1MX1Tzn74o - iCmkdq1/LrNHOkfgB6Vg9afJRrVOdv2ClRkMmklvCnyPs4V8ge81v5RegddnCGHNHmf00JslcJcZCcWv - IU1pAhcyhLcFXj1zGtbscUYPvdyZ+Uv6Wi8rKekFBjoX2627by8AAAAASUVORK5CYII= - - - - - iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAZdEVYdFNvZnR3YXJlAEFkb2JlIEltYWdlUmVhZHlxyWU8AAADZmlUWHRYTUw6Y29tLmFkb2Jl - LnhtcAAAAAAAPD94cGFja2V0IGJlZ2luPSLvu78iIGlkPSJXNU0wTXBDZWhpSHpyZVN6TlRjemtjOWQi - Pz4gPHg6eG1wbWV0YSB4bWxuczp4PSJhZG9iZTpuczptZXRhLyIgeDp4bXB0az0iQWRvYmUgWE1QIENv - cmUgNS4zLWMwMTEgNjYuMTQ1NjYxLCAyMDEyLzAyLzA2LTE0OjU2OjI3ICAgICAgICAiPiA8cmRmOlJE - RiB4bWxuczpyZGY9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkvMDIvMjItcmRmLXN5bnRheC1ucyMiPiA8 - cmRmOkRlc2NyaXB0aW9uIHJkZjphYm91dD0iIiB4bWxuczp4bXBNTT0iaHR0cDovL25zLmFkb2JlLmNv - bS94YXAvMS4wL21tLyIgeG1sbnM6c3RSZWY9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlw - ZS9SZXNvdXJjZVJlZiMiIHhtbG5zOnhtcD0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wLyIgeG1w - TU06T3JpZ2luYWxEb2N1bWVudElEPSJ4bXAuZGlkOjYzQTM5NEY4Mjg0OUU0MTE5NDBEQTc4ODZEQzk5 - N0NGIiB4bXBNTTpEb2N1bWVudElEPSJ4bXAuZGlkOkE2Q0VGMDE2NDlEQTExRTQ4NTlCQTI3NTMyOEY5 - NEU2IiB4bXBNTTpJbnN0YW5jZUlEPSJ4bXAuaWlkOkE2Q0VGMDE1NDlEQTExRTQ4NTlCQTI3NTMyOEY5 - NEU2IiB4bXA6Q3JlYXRvclRvb2w9IkFkb2JlIFBob3Rvc2hvcCBDUzYgKFdpbmRvd3MpIj4gPHhtcE1N - OkRlcml2ZWRGcm9tIHN0UmVmOmluc3RhbmNlSUQ9InhtcC5paWQ6NjA1MjM3NzFEOTQ5RTQxMUE0QzNB - MjdEOTJBQzc3QkMiIHN0UmVmOmRvY3VtZW50SUQ9InhtcC5kaWQ6NjNBMzk0RjgyODQ5RTQxMTk0MERB - Nzg4NkRDOTk3Q0YiLz4gPC9yZGY6RGVzY3JpcHRpb24+IDwvcmRmOlJERj4gPC94OnhtcG1ldGE+IDw/ - eHBhY2tldCBlbmQ9InIiPz6UH16BAAABrElEQVRIS63N70tTURzH8fsnKSGCCEIQCBKISMq2iILCgQOL - JUxQAoVKdMGQuwgWFepsMGjFZCMuorsIJV4WFatpvzdr1ZAFsaIHn8559v1eDsI91wevJ/ee7/tjbMRH - fAFwJOWRF6oopTzyQhWlVEdBwRbgUhICAnuvilKGtXDGzW6WV/CvbjE/xTfxr+R6q4xSxtP5YTf8rVn4 - s5dG+809Rv5zvVVGKaNwfYgyBfhksoH83CCF9seiL7LBBnLXTlP4/W4dza0ZLS0nCdlgA9npAQq/qk/Q - sKa0NJ8nIBtsIBPrp9CqPMJBYVLLj+04ZIMNrF49ReHwVRafH1/R8m3zJmSDDdy/fJJC88Ua3mcjWurW - LGSDDaQifRS+O8uopsNaPhVnIBts4E64l0Jj5y4qDy5q+ZCPQTbYgHmph8LXZ0m8TJ3Xsp+LQjbYQOJC - N4XadgLl22e1vM1OQDbYwK1zXRS+lBbhmEHsLgU8kTeVh+OQDTawEDpB2U4mitfpMS22GYJssIH5QCcV - FGwBmuRtkA3cGO3whcZUlEdeqKKU8sgLVZRSfjw+MP4DJ2GPpDR9OIsAAAAASUVORK5CYII= - - - - - iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAZdEVYdFNvZnR3YXJlAEFkb2JlIEltYWdlUmVhZHlxyWU8AAADZmlUWHRYTUw6Y29tLmFkb2Jl - LnhtcAAAAAAAPD94cGFja2V0IGJlZ2luPSLvu78iIGlkPSJXNU0wTXBDZWhpSHpyZVN6TlRjemtjOWQi - Pz4gPHg6eG1wbWV0YSB4bWxuczp4PSJhZG9iZTpuczptZXRhLyIgeDp4bXB0az0iQWRvYmUgWE1QIENv - cmUgNS4zLWMwMTEgNjYuMTQ1NjYxLCAyMDEyLzAyLzA2LTE0OjU2OjI3ICAgICAgICAiPiA8cmRmOlJE - RiB4bWxuczpyZGY9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkvMDIvMjItcmRmLXN5bnRheC1ucyMiPiA8 - cmRmOkRlc2NyaXB0aW9uIHJkZjphYm91dD0iIiB4bWxuczp4bXBNTT0iaHR0cDovL25zLmFkb2JlLmNv - bS94YXAvMS4wL21tLyIgeG1sbnM6c3RSZWY9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlw - ZS9SZXNvdXJjZVJlZiMiIHhtbG5zOnhtcD0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wLyIgeG1w - TU06T3JpZ2luYWxEb2N1bWVudElEPSJ4bXAuZGlkOjYzQTM5NEY4Mjg0OUU0MTE5NDBEQTc4ODZEQzk5 - N0NGIiB4bXBNTTpEb2N1bWVudElEPSJ4bXAuZGlkOjJGRTU5OEQ1NDlEQjExRTRBRUVDOTkyMjQ5NzEw - REUwIiB4bXBNTTpJbnN0YW5jZUlEPSJ4bXAuaWlkOjJGRTU5OEQ0NDlEQjExRTRBRUVDOTkyMjQ5NzEw - REUwIiB4bXA6Q3JlYXRvclRvb2w9IkFkb2JlIFBob3Rvc2hvcCBDUzYgKFdpbmRvd3MpIj4gPHhtcE1N - OkRlcml2ZWRGcm9tIHN0UmVmOmluc3RhbmNlSUQ9InhtcC5paWQ6MTY0MkI1RjlEQTQ5RTQxMUE0QzNB - MjdEOTJBQzc3QkMiIHN0UmVmOmRvY3VtZW50SUQ9InhtcC5kaWQ6NjNBMzk0RjgyODQ5RTQxMTk0MERB - Nzg4NkRDOTk3Q0YiLz4gPC9yZGY6RGVzY3JpcHRpb24+IDwvcmRmOlJERj4gPC94OnhtcG1ldGE+IDw/ - eHBhY2tldCBlbmQ9InIiPz6B5sF9AAACe0lEQVRIS7WVb2jMcRzHL7UHanF/Mts5prE/1li3kAfu5Ak7 - 5IHNobBkSC2UIuGJkrrSWRvTmHQWK8U1T8jqUtYwkZpaGjV/Js6to5YwfXze39+fu/v23f36hXe9us+f - 7/v9rd/dr3MQ0X/F4Zm3+K9QhWajNNlBFZqN0mQHS6lMdrCUyqSgimllUsy4XmOmp+QRDllQWbygjjq6 - uimZStOX8a+ixox3pXrM1JLCDAqYJmY7c669M0bff07mcLbtEl9QE8k6V6BH5ooXMsHZZX7ae+AY7W45 - SrPm19LbsSR9m/iRA2bYGefggVePzUgKBzeu9sQpmZ4QcG/WMtk7eLjv0WMz0kOz+TX6MUXvP6cFeNbD - bz6YvQFm2Bk9PPByZO6jksLB5KvRTzTyLikIrG2ktsvXzd4g2hGjYP1ms4eHvb850qkl65LCQW/ntVs0 - 9HpMcPx0K1X4V1Ff/3NzhnphbVDsjBk8Lm/VE44s0ZJ1KS4Ie8uXUvPBE7Tn0ElCzTMqrV5BO/cfEaDG - TD5X6PFFONLygsTF7jj1vxihyPkYNTS1iFrFxm37KHIhJmp43L7qZxzp0pJ1SeHhQGgLJQaH6fb9R1QX - 2EB3Ek9FryLe95j8K9eLT/TB0FZcskOP1iRdkIh23aR7Ay9pzaZddKY9Jup8nIpeoXXhZlHD655b85Bj - p2npLOmCML+dD/iTZhaX3+UvbRB1PpzeygFnSUUvatecRUMzisoOc+x0LZ3FixxYhQyK1cxyZhkTYhqY - RgnM6hmcwVl4ljDI0KS4AC+Kmyli8Jv2MF7GNwXY4QzOwgNv5mWTL7CLpVQmO1hKZbKDpVR/1P8OcvwB - lh7gOXXZq9sAAAAASUVORK5CYII= - - - + iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 YQUAAAAZdEVYdFNvZnR3YXJlAEFkb2JlIEltYWdlUmVhZHlxyWU8AAADZmlUWHRYTUw6Y29tLmFkb2Jl @@ -750,26 +750,244 @@ bS94YXAvMS4wL21tLyIgeG1sbnM6c3RSZWY9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlw ZS9SZXNvdXJjZVJlZiMiIHhtbG5zOnhtcD0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wLyIgeG1w TU06T3JpZ2luYWxEb2N1bWVudElEPSJ4bXAuZGlkOjJGQzkyMzc0Rjk0OUU0MTE5NjNCQjRENDMzQjlC - MUM4IiB4bXBNTTpEb2N1bWVudElEPSJ4bXAuZGlkOjJERjY3MEZENEQyMzExRTRCNDlGQUMwMzk0OTAw - Qzc4IiB4bXBNTTpJbnN0YW5jZUlEPSJ4bXAuaWlkOjJERjY3MEZDNEQyMzExRTRCNDlGQUMwMzk0OTAw - Qzc4IiB4bXA6Q3JlYXRvclRvb2w9IkFkb2JlIFBob3Rvc2hvcCBDUzYgKFdpbmRvd3MpIj4gPHhtcE1N - OkRlcml2ZWRGcm9tIHN0UmVmOmluc3RhbmNlSUQ9InhtcC5paWQ6NjhGOUEyRDEyMTRERTQxMUIzNkJE + MUM4IiB4bXBNTTpEb2N1bWVudElEPSJ4bXAuZGlkOjlDMzFEOUI4NEFBRjExRTQ4OTA5OUYwQ0QzM0Q2 + NEI4IiB4bXBNTTpJbnN0YW5jZUlEPSJ4bXAuaWlkOjlDMzFEOUI3NEFBRjExRTQ4OTA5OUYwQ0QzM0Q2 + NEI4IiB4bXA6Q3JlYXRvclRvb2w9IkFkb2JlIFBob3Rvc2hvcCBDUzYgKFdpbmRvd3MpIj4gPHhtcE1N + OkRlcml2ZWRGcm9tIHN0UmVmOmluc3RhbmNlSUQ9InhtcC5paWQ6MDk5Mzk2NTZBRjRBRTQxMTk3NEFD + QUFFQjRCMzVENkUiIHN0UmVmOmRvY3VtZW50SUQ9InhtcC5kaWQ6MkZDOTIzNzRGOTQ5RTQxMTk2M0JC + NEQ0MzNCOUIxQzgiLz4gPC9yZGY6RGVzY3JpcHRpb24+IDwvcmRmOlJERj4gPC94OnhtcG1ldGE+IDw/ + eHBhY2tldCBlbmQ9InIiPz73sIMwAAADIElEQVRIS7WVa0iTYRTH56Uiysvm3TkvpLl5DRIvQYWVWl+6 + iNEVg0yhQqloQZHkLT+Y0YdAs75IpEUhzERZoZhsRpZlS7soblotsRwoxhqWeTrnYZtv+u7NsB74cZ5z + zv89/z17HzYRAPxXeIv/EpFXcOyi4BvKhfehv4FvKBfeh+ayqIUDlIgBgT8whpRYoT2fhgvNVJKBQT9s + hB8/QZDPpnEIjEhg0J5Pw4Vm0mwygG9T06BSqQQhTUhUMoRGpyxYT7OZwfhXC6jVakFIYzNYqN5uMGKa + BI1GIwhpghXJaJJi13d0dEB2bj74hsWzSDlXbzfQG02g0+kEIU2wIomdovzKdVifngnFFytBeb4cLN+n + WaSc6hfKKqB/eHTWoHfwExgMBkFII5MnQUD4WlAWloO26wVs35MDmifPmQFFyqlO/aKKqlmDp31DYDKZ + BCGNTJ4IPqHx8LJvACbNUw7p6e2HuJQMNIhhBuaHj3vBYrEI0tb1BoIiE9kJ9h7Oh7EJM+g/jEJuwVlY + s24ri5RTnfo5BedAIoueIYPumvomuHzjzm9cq2uCq7UNUH2rEarr7kNd0yP26Y+eKoSWtk4wfpmAg7kn + ITY5DUorq1g8cOQEqze3aplOEhRtJoMcL1mMTixV9IgD5a/tSBVDYql8AKOBQLEJtTP08gY/jjFiktKg + 5FIV21Ok3NazvmR2AvrFkCAJyGYk1comZAuHDM/AyLvHThfBveZ26NOPwI59eey7LsbhFCmnOvVJ5+Ef + rrYZLEU8EZ85+HLwW7ZCLMVTFWdkHoLut+/hgbYHaE9XN31XNsupTrWV3jKVs+uS3cyAD0cLe331jW3Q + qRt0CPUlQVHDKI+fN9iGo4W90uNnyuA2vvRtWTlQgxeg/dk7FimnOvU9/CNqUe47b7ANRwt7AfjpKvAK + Gt18Qur35ymhRfsKKLr5hN7EyzDq7humWrrcfSfKxbz/QlwcLDck1snZJdUzYHUDmk57+K1qdXJyzsL6 + RmQD9ZmObygXB8sVIRO6fXQB4hC6eRQppzr1XXmHclnAckFomLc1Um5dItEvhZ97MQXP9N0AAAAASUVO + RK5CYII= + + + + + iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 + YQUAAAAZdEVYdFNvZnR3YXJlAEFkb2JlIEltYWdlUmVhZHlxyWU8AAADZmlUWHRYTUw6Y29tLmFkb2Jl + LnhtcAAAAAAAPD94cGFja2V0IGJlZ2luPSLvu78iIGlkPSJXNU0wTXBDZWhpSHpyZVN6TlRjemtjOWQi + Pz4gPHg6eG1wbWV0YSB4bWxuczp4PSJhZG9iZTpuczptZXRhLyIgeDp4bXB0az0iQWRvYmUgWE1QIENv + cmUgNS4zLWMwMTEgNjYuMTQ1NjYxLCAyMDEyLzAyLzA2LTE0OjU2OjI3ICAgICAgICAiPiA8cmRmOlJE + RiB4bWxuczpyZGY9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkvMDIvMjItcmRmLXN5bnRheC1ucyMiPiA8 + cmRmOkRlc2NyaXB0aW9uIHJkZjphYm91dD0iIiB4bWxuczp4bXBNTT0iaHR0cDovL25zLmFkb2JlLmNv + bS94YXAvMS4wL21tLyIgeG1sbnM6c3RSZWY9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlw + ZS9SZXNvdXJjZVJlZiMiIHhtbG5zOnhtcD0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wLyIgeG1w + TU06T3JpZ2luYWxEb2N1bWVudElEPSJ4bXAuZGlkOjJGQzkyMzc0Rjk0OUU0MTE5NjNCQjRENDMzQjlC + MUM4IiB4bXBNTTpEb2N1bWVudElEPSJ4bXAuZGlkOjhDMTdBQjRENEFBRTExRTQ4QjQyODY0MDNBNTJE + NzNCIiB4bXBNTTpJbnN0YW5jZUlEPSJ4bXAuaWlkOjhDMTdBQjRDNEFBRTExRTQ4QjQyODY0MDNBNTJE + NzNCIiB4bXA6Q3JlYXRvclRvb2w9IkFkb2JlIFBob3Rvc2hvcCBDUzYgKFdpbmRvd3MpIj4gPHhtcE1N + OkRlcml2ZWRGcm9tIHN0UmVmOmluc3RhbmNlSUQ9InhtcC5paWQ6NUQyMjc4QTlBQjRBRTQxMTk3NEFD + QUFFQjRCMzVENkUiIHN0UmVmOmRvY3VtZW50SUQ9InhtcC5kaWQ6MkZDOTIzNzRGOTQ5RTQxMTk2M0JC + NEQ0MzNCOUIxQzgiLz4gPC9yZGY6RGVzY3JpcHRpb24+IDwvcmRmOlJERj4gPC94OnhtcG1ldGE+IDw/ + eHBhY2tldCBlbmQ9InIiPz4eHsDfAAAB00lEQVRIS7XVWytEURQH8HniTTNHLs0NCXNcXjTN5dH9g/gM + 3jx590QhFDJS0gyTGmpqaqJIMW4hzlAoOaWISS7LWifntI3ddnTGrl92e/57/We/DBsA/CvuYSHZSr0t + lvCGsriX/oI3lMW9lM/SwgF9SEHwizs08IX2vAyLZvZRgXJ+cQWv7yB0q96Ds86voT0vw6KZNJsK4Pnl + DWKxmBBlqhpDUN0UNp2n2VrB/WMOEomEEGX0ArN5o+BGfYB0Oi1EGa8cwpKw6bxRcH6lQiaTEaKMVw5q + rzCbNwr2z65BURQhynh8Qe0VZvNGwdZBFlRVFaKMxxfQXmE2rxc8rW3sQy6XE0puHoG7IaC9YnV9j5th + pbZPqOCDCrbH5uIwOD7/zWgkDkNTizAyuwQjkWWIxFNQWduqmVxI/MiPz6/A8HTUuDMTTYLkbrqhgt5S + T3PG4ZJ3HE7focElZx0u3yn+VQiG1ZLymmm7s74f88f42S6bl9zyJZ6d6Xckd+Mt5ieogH4xJORHHajt + SzvqZPSgECpHZSiA2DztuxBlad+NgnpBEbIjusiiYboKRF+kGFHegUR5ImkFv7G0eAPzWVq8gfksLd5/ + oULiHhYS97BwwPYJlSCUgVubViQAAAAASUVORK5CYII= + + + + + iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 + YQUAAAAZdEVYdFNvZnR3YXJlAEFkb2JlIEltYWdlUmVhZHlxyWU8AAADZmlUWHRYTUw6Y29tLmFkb2Jl + LnhtcAAAAAAAPD94cGFja2V0IGJlZ2luPSLvu78iIGlkPSJXNU0wTXBDZWhpSHpyZVN6TlRjemtjOWQi + Pz4gPHg6eG1wbWV0YSB4bWxuczp4PSJhZG9iZTpuczptZXRhLyIgeDp4bXB0az0iQWRvYmUgWE1QIENv + cmUgNS4zLWMwMTEgNjYuMTQ1NjYxLCAyMDEyLzAyLzA2LTE0OjU2OjI3ICAgICAgICAiPiA8cmRmOlJE + RiB4bWxuczpyZGY9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkvMDIvMjItcmRmLXN5bnRheC1ucyMiPiA8 + cmRmOkRlc2NyaXB0aW9uIHJkZjphYm91dD0iIiB4bWxuczp4bXBNTT0iaHR0cDovL25zLmFkb2JlLmNv + bS94YXAvMS4wL21tLyIgeG1sbnM6c3RSZWY9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlw + ZS9SZXNvdXJjZVJlZiMiIHhtbG5zOnhtcD0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wLyIgeG1w + TU06T3JpZ2luYWxEb2N1bWVudElEPSJ4bXAuZGlkOjJGQzkyMzc0Rjk0OUU0MTE5NjNCQjRENDMzQjlC + MUM4IiB4bXBNTTpEb2N1bWVudElEPSJ4bXAuZGlkOjJEMDQyOEZBNEFEMjExRTRBN0MxRDBCNzJGRUND + MDEzIiB4bXBNTTpJbnN0YW5jZUlEPSJ4bXAuaWlkOjJEMDQyOEY5NEFEMjExRTRBN0MxRDBCNzJGRUND + MDEzIiB4bXA6Q3JlYXRvclRvb2w9IkFkb2JlIFBob3Rvc2hvcCBDUzYgKFdpbmRvd3MpIj4gPHhtcE1N + OkRlcml2ZWRGcm9tIHN0UmVmOmluc3RhbmNlSUQ9InhtcC5paWQ6QkRDRkI1RDVEMTRBRTQxMTk3NEFD + QUFFQjRCMzVENkUiIHN0UmVmOmRvY3VtZW50SUQ9InhtcC5kaWQ6MkZDOTIzNzRGOTQ5RTQxMTk2M0JC + NEQ0MzNCOUIxQzgiLz4gPC9yZGY6RGVzY3JpcHRpb24+IDwvcmRmOlJERj4gPC94OnhtcG1ldGE+IDw/ + eHBhY2tldCBlbmQ9InIiPz59jfe3AAAEbUlEQVRIS8WTeUybZRzHF48/pnFOuQRajkFLgQFb5iRLNJr4 + l/EPgsniUI4xZDAY1zyxwApsMJyIME61rByl3DfoYGBrgbWUY06FcZSCha4rQ8jYxkqPr2/fvkv8o2Sg + S/wkT970eb6/T5/39z7Prv8dt/Oql4mR4HZJ3ccoXFxhVCzB9DT9JueJdSq6c1wzVZFupepVzxu34XVj + CaEDi1jX6hF8ZQoeokl4iBVwzV9YdU1XRlIl28eVo8phCdXwGltEeOUsro6psaHVwcSDh5volc4iOO8X + 7KuVwb1hEi7J8myq9PEQO//I85oafr0KtEpUpNSETm+AwWDAvfv3YTQaybnm/t/AyO6Ga+UonJOnIijF + 1hA9tWI2qle9RxcI+RIpmZpTIfBULhIyyqHVahHPKcN70TmYnFFCp9OhqXcc9KwW0DOHVl3YU1aUyjJu + F1SpfhO3EM6bMMsVt+D8Zhz2HIpC4oU6bG5uIu4cD3tfTwAjIBNypQYbGxsISquBU34PaDHiVEplGXee + SuIjVaBv3Lz7gJg8vHg4FlZvc+ATVoLipiHsD8qCXWAO7IPK8MG5FjLXKboOeoYADkldUkplGWb7vOb4 + 4BzxIXXQE/1m59WDXdgBvxPfwz6UC4eQUth/WIBDZ2qQXj+K7IYRImeE5s5fOFrcDPvPapcJzVNmmwVY + VxWG9U09uau1tTVymPpc0iYFLew7OEUJ4BwtALfvJpl5xMrKCu6s3cUrn5YbCM1us80CrJZZVWjXr7j3 + 4CE0y8v4IrcaH+cK4Bv+DRyPl8ApphYuia3wZ3eCUzOA1PIfcVuzjHnlIgK/vgy7mHzTG+w12yzA5E53 + edYPo1c2i/X1dQTEfwvbwDQ4hhXg8OcN4P48Df+UTrgkNIAeW4Hg3Hbo9Xq0iGSgs4ls5CUhoXnObLOA + S8pkhG/bdZzgDZJnffT3GXieLAA9XgB2/RjZjuQqMWhxfBw824H55XWyhcfy+HDNqoB1SH4Codn6G7iw + p3d78EaVPlXX0CaZgkqlgly1gpCiK0htHCH/IL6oFcEF3ZjT3CUvXqv0DzDSS0FPq1a/8EbYS5Rqa+if + SAJ8KoeNR7gitEsnoVQqSbGOkJmYX1ggxaY70SabwIGMUrjn8I3WIXnBRPnWu/8nDnE9Sd7cAaP/ZSES + 6/rRKJRArpiHXC7HzekZNIukiCyrhW9mGZgXa4w2kUVnibJnzdXbxP5URzyDO4QjxGl5i9uNpMZeKP5U + IrywAq9yCnGAOGGMonbYxpVnEPGdyR9BO/MTj8kfgXeNFPt5IngVtoF1kQ9WcTs8qgfgmNreQMS21xZL + 0E6Ln6ef75tg8sfgXT8O77oReAkkYNXJ4PRV/4ztyfo9VPTf4xjdf9CpQKzdxxuGe6UMbhXEmc8V6mze + r3qNivx3HGN7UmglQ6CVDMIxXwybo5UcaunJQD8te9rhyx4JrWwItlGNUut3y5+hlp4cDhFCpl14k9jq + nR+Y1NTjIe7NlmMnWKoHsOtvjWYcKpheqFQAAAAASUVORK5CYII= + + + + + iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 + YQUAAAAZdEVYdFNvZnR3YXJlAEFkb2JlIEltYWdlUmVhZHlxyWU8AAADZmlUWHRYTUw6Y29tLmFkb2Jl + LnhtcAAAAAAAPD94cGFja2V0IGJlZ2luPSLvu78iIGlkPSJXNU0wTXBDZWhpSHpyZVN6TlRjemtjOWQi + Pz4gPHg6eG1wbWV0YSB4bWxuczp4PSJhZG9iZTpuczptZXRhLyIgeDp4bXB0az0iQWRvYmUgWE1QIENv + cmUgNS4zLWMwMTEgNjYuMTQ1NjYxLCAyMDEyLzAyLzA2LTE0OjU2OjI3ICAgICAgICAiPiA8cmRmOlJE + RiB4bWxuczpyZGY9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkvMDIvMjItcmRmLXN5bnRheC1ucyMiPiA8 + cmRmOkRlc2NyaXB0aW9uIHJkZjphYm91dD0iIiB4bWxuczp4bXBNTT0iaHR0cDovL25zLmFkb2JlLmNv + bS94YXAvMS4wL21tLyIgeG1sbnM6c3RSZWY9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlw + ZS9SZXNvdXJjZVJlZiMiIHhtbG5zOnhtcD0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wLyIgeG1w + TU06T3JpZ2luYWxEb2N1bWVudElEPSJ4bXAuZGlkOjJGQzkyMzc0Rjk0OUU0MTE5NjNCQjRENDMzQjlC + MUM4IiB4bXBNTTpEb2N1bWVudElEPSJ4bXAuZGlkOjJERTg4QTFENEQyMjExRTRBODEyODk0M0RBMTc5 + Qjg3IiB4bXBNTTpJbnN0YW5jZUlEPSJ4bXAuaWlkOjJERTg4QTFDNEQyMjExRTRBODEyODk0M0RBMTc5 + Qjg3IiB4bXA6Q3JlYXRvclRvb2w9IkFkb2JlIFBob3Rvc2hvcCBDUzYgKFdpbmRvd3MpIj4gPHhtcE1N + OkRlcml2ZWRGcm9tIHN0UmVmOmluc3RhbmNlSUQ9InhtcC5paWQ6NjJGOUEyRDEyMTRERTQxMUIzNkJE NUVDQjU5MzE1NjIiIHN0UmVmOmRvY3VtZW50SUQ9InhtcC5kaWQ6MkZDOTIzNzRGOTQ5RTQxMTk2M0JC NEQ0MzNCOUIxQzgiLz4gPC9yZGY6RGVzY3JpcHRpb24+IDwvcmRmOlJERj4gPC94OnhtcG1ldGE+IDw/ - eHBhY2tldCBlbmQ9InIiPz6GKmpFAAAC+UlEQVRIS63T20vTYRzH8Yforj/Ei24UiSgKIygKi8oyxZQo - cvNYeXaesmzqPGu2POd0ulSsnIdaurTSTJ3O6UxTPGya5vCQx5AuPn39RbHop7nZxQt+z3ie93e/Z4w1 - p7nsCoBt8R6yBF/UHPv+Wb0rfFFzm99CRIwEW1gnqXzxTXxRc0ydctm4OlID2sxrw6iCtiwItC+A2P/D - frLnjwGNSZdMq6N1WOvLwFpP4l/WdRlY6Jaio9Ab7QXba8sVoDHZGdT8PYS9THDqMGnLsKpNw0qXGCua - BO55VZdNQ6U/DRRibVCGb+N1pH5bukoRqHmDHOIG1N8/X2F4I8WyNhtf2+9hqSsZxqZ4upbb6HsSZLHO - Im90ym6hNVcIaktYTexZyUelGEvaHMy/jcFiZxo0xX5Y7ivGcn8JkVmA9uvlWBmqwpJeAWovs+poR99O - eRgWtQWYVUdgrj0FH+i+F3XF3NoappZYGJrEoLaOVYpOOTY/FGJB+xjTqnDMtMTTAC/Ma/Ix/TLUKl9e - x0JfFQpql7PykBP7lWIXzPeUYLIhHCPKCLr/AMy2ZsKoDLTKdNNdvM8TgNpRTBZwfJ885CTmaIChPhwa - mS+GnkdhqjEWY9X+VplqvIMXEhdQ24mZeuSs0N/BNNWWj4k6EdSZHhhXxWH0aSCGFd4c4Tk7zk7XBlUM - FKLToK4Nm+0qYnneRzqGGiSYaIiiyZdhVCdgqFSIwRJPjucZW85O1pvnRmvDkO9zFNTdy2Y6HjGp4HCF - 5kk4xhoiURd/EROv4tBfeM0qAyUC9Mp9QM0+7o829T6LZV0/mNycS6+nFKFWfAGj9ZHozfGwil7miZYH - 7qCmghsw+S6VpV894KuUuKFbfhNNqa749CwY3dm0toK+VABl3HlQM5obYHybwFLc7W1y/Y5BlX6FfgNn - DNcEY0DhZZX+MiGKbh0DNR24AYYWMSfJzc6GZBApwS5skIzNODcg0dV2V36FtsJ7yBJ8UXO8hyzBFzXH - ++H/A/YDv9/V87iOlrYAAAAASUVORK5CYII= + eHBhY2tldCBlbmQ9InIiPz6wJF34AAACl0lEQVRIS62Vy08TURSH73/QhQtXVnBhxEcMiUkhbEg0hB1R + Q1i68C8wIW5cEqMLN7ho2Ji4YiEhWq0prYUhfULbadN3obTaChobtZEUsFY9nnPS6WM6HYowyZf87j33 + nG/amaai9geOBYA+4pTxihmBE8DcTQB4J8em/9IwSQyagmrtL+z9rMFmvnhkKvtV7tcVHPz6DVsftulA + AckdhUg8zf19eoLKAd597iMLMItewfOxUDTN/bqCH3tVSG8VWIBZ9AoJApEk9+sKvu/uQ2IjzwJkGtH8 + OrTwy3Hu77vIAnV9mgWlcgWiqRwLjAMmkOMbPbNTKnN/JJntqJGEBZ++7oKcyLLgLN4JrU8Cms2C4pcy + BKKZumCI18temQ/8DzSLZlBmQX7nG/jCKdpgAa0driCtY5iFHuqHSjNoFtaags1iCdzBBG+QgNY2aZ0F + mIUe6osENAtrTUEq/7kDq9PHAszU5yYoq9f1i9cUSCD5ozxDEeTsrhAoONwyxLLb8MrhYQFmZYCHsnpd + v3hNgQROb5hnKIK29944MAThTBEWbS4WYBZ6qC/sKSy5ZJ6BGUQg8b4Bbhjod4AZXlhXWdBa10LrIVul + AM9ggS+aa6AIMMO8ZYUO0KeyIOMtZyaQpXpNi4LFucYzMINwhbMNcMNw5oIJMMNKIA0LNg88mZuH/ssj + dPgBMnN+cBRmny1wrRtSMMMzWCCFMg0UAeY2Fh0+GL5xG8Zu3oHXUrCj3g0WONdTbeBm21/o1N17gPtg + 98Xh3VoS3qzKMDI22agfglnY/Uld8NDc/ZlZwAwvl4Ngun6LGh8rdfVDViNs3rguOOzq6XOD8PDpc7g2 + OkHDH7XWtYa2It66Y4eCQ8cRfpvUNa2hTUD8A6JMaBvCyTdJAAAAAElFTkSuQmCC + + + + + iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 + YQUAAAAZdEVYdFNvZnR3YXJlAEFkb2JlIEltYWdlUmVhZHlxyWU8AAADZmlUWHRYTUw6Y29tLmFkb2Jl + LnhtcAAAAAAAPD94cGFja2V0IGJlZ2luPSLvu78iIGlkPSJXNU0wTXBDZWhpSHpyZVN6TlRjemtjOWQi + Pz4gPHg6eG1wbWV0YSB4bWxuczp4PSJhZG9iZTpuczptZXRhLyIgeDp4bXB0az0iQWRvYmUgWE1QIENv + cmUgNS4zLWMwMTEgNjYuMTQ1NjYxLCAyMDEyLzAyLzA2LTE0OjU2OjI3ICAgICAgICAiPiA8cmRmOlJE + RiB4bWxuczpyZGY9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkvMDIvMjItcmRmLXN5bnRheC1ucyMiPiA8 + cmRmOkRlc2NyaXB0aW9uIHJkZjphYm91dD0iIiB4bWxuczp4bXBNTT0iaHR0cDovL25zLmFkb2JlLmNv + bS94YXAvMS4wL21tLyIgeG1sbnM6c3RSZWY9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlw + ZS9SZXNvdXJjZVJlZiMiIHhtbG5zOnhtcD0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wLyIgeG1w + TU06T3JpZ2luYWxEb2N1bWVudElEPSJ4bXAuZGlkOjJGQzkyMzc0Rjk0OUU0MTE5NjNCQjRENDMzQjlC + MUM4IiB4bXBNTTpEb2N1bWVudElEPSJ4bXAuZGlkOkUzNzJDMjE3NEFENjExRTRCNjE0OEVEQzI4MEM0 + RTZDIiB4bXBNTTpJbnN0YW5jZUlEPSJ4bXAuaWlkOkUzNzJDMjE2NEFENjExRTRCNjE0OEVEQzI4MEM0 + RTZDIiB4bXA6Q3JlYXRvclRvb2w9IkFkb2JlIFBob3Rvc2hvcCBDUzYgKFdpbmRvd3MpIj4gPHhtcE1N + OkRlcml2ZWRGcm9tIHN0UmVmOmluc3RhbmNlSUQ9InhtcC5paWQ6RkI3NUQ0QkNENDRBRTQxMTk3NEFD + QUFFQjRCMzVENkUiIHN0UmVmOmRvY3VtZW50SUQ9InhtcC5kaWQ6MkZDOTIzNzRGOTQ5RTQxMTk2M0JC + NEQ0MzNCOUIxQzgiLz4gPC9yZGY6RGVzY3JpcHRpb24+IDwvcmRmOlJERj4gPC94OnhtcG1ldGE+IDw/ + eHBhY2tldCBlbmQ9InIiPz6PyaLfAAADMElEQVRIS6VUXUiTYRT+vi3Tzd+ps23+3KRigtiPkolEQReG + UYTkhWatpWlWGkRdddfdSPImqUAJjSIT00oxLJIk0cR+tFSyzDJtgaMkDEPkdM7ZPvm2vS6jBx6es3Pe + 8zzvtm+TohLS/ov+AACStLgEQuJyLRJWYK1yzh/+FgCoQrpnfM4fOGBhcUlIMkEVkma4H4i1y2kFcMD8 + wqKQZILKZqTqmlTAWrfvMjhgbv63Dwm0hLWQohn1eNEbzrlfPiTQAtZCKjP1GXdAIC+r4XD+9CGBFrDm + RVJ1re6pZ0GyHHMvIawauYVNCFPfvvuQQAtYC6meKXU0amNsaGN/ZR60xIf9aIgN3cpGE9OzZCZ85nEm + pGiWlLABmuJCnUOXrNB7chdct4TUo32ANDbp4NuielDpqWfePdaPX6GrohSK4uLhlCEo96YlZLbOFHzH + oJXjMSBcGn4/zQGovEDqXXtzeTb+BTrKj0J3+Q54djYP7EZdTU2MPjFSK8eieQR9QtLg6GcOQPWgqKeQ + ZyOfoK30CDw+lg2Ot3Z4VLoNqo269mCNHIa2WjYn9A1PcAAqU6m9VV3TF9psOwwPS3JgZugCdNoyocwU + jU+RlImWBpezGz0vxzkA1YOiHvPFO7Ca1kGHLQtmXp2HdutmqN+/F6JiU+h3kOpyVeHJwBgHoLIpqajm + 189HoaG4CNqsGTA1UAWth9Lg6r490PygGyLjUikgzuWqQlffCAegelDdUwLqigqhpXgjTPYeh+bCFCg2 + RkEk3vxuVz/P0c43oLP3DQegLhspNalSFxiNcLswHT48LYNbBUlQk7ebzenmyhm08w1o7xmiAP6hRZiT + 70eYkzpctUuJWdHmwWs74+F1Uz7cyE+E4ohQB5mHm9a3GywpTXzektyKduIAIsKI3ISkL4rIdYle05C9 + VrZVBmvtl7eboUyv7V4jSQdwRn8FdI72iErtCUxnIuifkJ5hUqUOq9Jr7OeCNU6bTpNVqtMcDJSldOwn + KnOk+jypJ5QANRWc0cs5SEelXr54QidfwVYAMoiHq4W/gNM6OaNCJ+diaUIqN/43+Atwg27t+9ZXBUn6 + A2MdqQeVc5pWAAAAAElFTkSuQmCC + + + + + iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAIAAABvFaqvAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 + YQUAAAAZdEVYdFNvZnR3YXJlAEFkb2JlIEltYWdlUmVhZHlxyWU8AAADZmlUWHRYTUw6Y29tLmFkb2Jl + LnhtcAAAAAAAPD94cGFja2V0IGJlZ2luPSLvu78iIGlkPSJXNU0wTXBDZWhpSHpyZVN6TlRjemtjOWQi + Pz4gPHg6eG1wbWV0YSB4bWxuczp4PSJhZG9iZTpuczptZXRhLyIgeDp4bXB0az0iQWRvYmUgWE1QIENv + cmUgNS4zLWMwMTEgNjYuMTQ1NjYxLCAyMDEyLzAyLzA2LTE0OjU2OjI3ICAgICAgICAiPiA8cmRmOlJE + RiB4bWxuczpyZGY9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkvMDIvMjItcmRmLXN5bnRheC1ucyMiPiA8 + cmRmOkRlc2NyaXB0aW9uIHJkZjphYm91dD0iIiB4bWxuczp4bXBNTT0iaHR0cDovL25zLmFkb2JlLmNv + bS94YXAvMS4wL21tLyIgeG1sbnM6c3RSZWY9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlw + ZS9SZXNvdXJjZVJlZiMiIHhtbG5zOnhtcD0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wLyIgeG1w + TU06T3JpZ2luYWxEb2N1bWVudElEPSJ4bXAuZGlkOjJGQzkyMzc0Rjk0OUU0MTE5NjNCQjRENDMzQjlC + MUM4IiB4bXBNTTpEb2N1bWVudElEPSJ4bXAuZGlkOjUzQzNGNDI5NEQyQzExRTQ4QkE1QUNCMEVDRDZF + MDVEIiB4bXBNTTpJbnN0YW5jZUlEPSJ4bXAuaWlkOjUzQzNGNDI4NEQyQzExRTQ4QkE1QUNCMEVDRDZF + MDVEIiB4bXA6Q3JlYXRvclRvb2w9IkFkb2JlIFBob3Rvc2hvcCBDUzYgKFdpbmRvd3MpIj4gPHhtcE1N + OkRlcml2ZWRGcm9tIHN0UmVmOmluc3RhbmNlSUQ9InhtcC5paWQ6RkI1NUY4OTYyQTRERTQxMUIzNkJE + NUVDQjU5MzE1NjIiIHN0UmVmOmRvY3VtZW50SUQ9InhtcC5kaWQ6MkZDOTIzNzRGOTQ5RTQxMTk2M0JC + NEQ0MzNCOUIxQzgiLz4gPC9yZGY6RGVzY3JpcHRpb24+IDwvcmRmOlJERj4gPC94OnhtcG1ldGE+IDw/ + eHBhY2tldCBlbmQ9InIiPz6IsaOmAAADF0lEQVQ4T62U/UuTURTH+0nICqRI1ERMMyNQe8N0ChqBwQhN + yvwhEgJjVCqJ/qCibZo6tzQ339h6Nre5prapUzc1XzItX1ilzuWMLLVAen+xf6DTuTxjdxsFVj58ebjc + c+7nnud7z3228DbpIaDFH/CfoqCn72DIDvNfPDM2KAqyr8PcJxqY+QBTb8kkjocXQTsKigGwfqYJHqIg + 1OxHGHvlWPx4hXB1YyA3g4CBhqst+piEnrDA3rA95vBAY1x8d7lq/DVZwm5PQZNvoKYdypSgHgbVEIh1 + cLOZzOCbSSsyRQRba6uWtcpVLbPcwlglInNUCJNWWKqABqMLCGvGlfpJELaQ/V1Vd1lujAhe0chtUrH5 + ZExnmJ85MdomEa+qZMbIEF2BHGunILSjdZwYgTt4gJqjjj0Rltml1Zq9AeL0Mn71Wn2mtDU80MIvsFTw + O+KPIoWC8BNYRIUaqrRQroJKjQOk9N+xLBF2pXJFKfnsDGYa8gS6xOO2whyMuoHaHpGzZ/pBM0IMrtXD + nT4HqNHXe0lYoogMFeQP4jbSDkCPTUyXmnNoPutSo+9WN5DEQDyeWCWnhqm4p7Oimt3b54rzmmKPVHKz + 0Xg0AU1pz87VJp+yXOfd9t3mBmLXsGrsJhSsDtF4iOWxKdpzyQNnuRW7vEUp13obFG05OVUBPtO5V1Sn + k5q4SX8ENfWA6C7xHsP981Bb2sf38ZKd4JhSuXUJHPHhg/WJnAeZFw0Xzt/w8erRtLmBnB/CSmaC599I + 2PYVRl+CXigu3R9SfCC0Pf1MZ1oqvqvjogX7gtRFJfb1n24g7GblfQcFP2fkBYm5anxqQcbLKgzyK/Df + WRTkV5+RMTg84ZrgAOHo4ZIDVNdJw67CpsVLZ5gifj97Typlq2ZFQXj8LKh5EHpnaIar8N+Al5l9Y9Vs + T7OiIAzjqaMsa6QJnBkeWvgOHdPkAuIV67PSeQpCYYZplsZ+KyyWLRyFF8D553EDbURY770J0rrYJbda + SYE4iWb9NcgpRKDrOMAWwYP6d5BTaC52zyaAWDlAm/DweL8AX9zXukfxHsIAAAAASUVORK5CYII= + + + + + iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 + YQUAAAAZdEVYdFNvZnR3YXJlAEFkb2JlIEltYWdlUmVhZHlxyWU8AAADZmlUWHRYTUw6Y29tLmFkb2Jl + LnhtcAAAAAAAPD94cGFja2V0IGJlZ2luPSLvu78iIGlkPSJXNU0wTXBDZWhpSHpyZVN6TlRjemtjOWQi + Pz4gPHg6eG1wbWV0YSB4bWxuczp4PSJhZG9iZTpuczptZXRhLyIgeDp4bXB0az0iQWRvYmUgWE1QIENv + cmUgNS4zLWMwMTEgNjYuMTQ1NjYxLCAyMDEyLzAyLzA2LTE0OjU2OjI3ICAgICAgICAiPiA8cmRmOlJE + RiB4bWxuczpyZGY9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkvMDIvMjItcmRmLXN5bnRheC1ucyMiPiA8 + cmRmOkRlc2NyaXB0aW9uIHJkZjphYm91dD0iIiB4bWxuczp4bXBNTT0iaHR0cDovL25zLmFkb2JlLmNv + bS94YXAvMS4wL21tLyIgeG1sbnM6c3RSZWY9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlw + ZS9SZXNvdXJjZVJlZiMiIHhtbG5zOnhtcD0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wLyIgeG1w + TU06T3JpZ2luYWxEb2N1bWVudElEPSJ4bXAuZGlkOjJGQzkyMzc0Rjk0OUU0MTE5NjNCQjRENDMzQjlC + MUM4IiB4bXBNTTpEb2N1bWVudElEPSJ4bXAuZGlkOkVENUYwQThBNEQyOTExRTQ5QzUzQzdFMkFGQkQy + NTA1IiB4bXBNTTpJbnN0YW5jZUlEPSJ4bXAuaWlkOkVENUYwQTg5NEQyOTExRTQ5QzUzQzdFMkFGQkQy + NTA1IiB4bXA6Q3JlYXRvclRvb2w9IkFkb2JlIFBob3Rvc2hvcCBDUzYgKFdpbmRvd3MpIj4gPHhtcE1N + OkRlcml2ZWRGcm9tIHN0UmVmOmluc3RhbmNlSUQ9InhtcC5paWQ6MkRGNkEzOUYyOTRERTQxMUIzNkJE + NUVDQjU5MzE1NjIiIHN0UmVmOmRvY3VtZW50SUQ9InhtcC5kaWQ6MkZDOTIzNzRGOTQ5RTQxMTk2M0JC + NEQ0MzNCOUIxQzgiLz4gPC9yZGY6RGVzY3JpcHRpb24+IDwvcmRmOlJERj4gPC94OnhtcG1ldGE+IDw/ + eHBhY2tldCBlbmQ9InIiPz6npMy1AAAGEUlEQVRIS7WVeVDUZRjHf7Ase8ECu+wl4LIXcqyyHC783AWW + 5QaRFTHkMi9SQvE+UhLzwk0BUcQSgQBBgcYDzStMSzOPcpqcmo5pmqk/+rOapqb+iG/PbzfFcSz/6pn5 + zPN739/7fp/nvZn/3TSLjj+XJy2/RaItPCT5vaBd8m1+q2Qku1lcrcvki+iXr7fFU6ZZeOx5KDU1b7jU + 1Z2bVPMPWNMbRXrXkWAc+ywVLbcS8fKwFjlu8VdpW0XzSc6f8PEIPzJ19dFnU3WEJdHL9P3X9O1nkdB8 + CQrX7i3mKn9zfqsUq29ZsPfjRBx5aMO2cTMy94gm7FuF7XyJTwDJTo5GVdHxNALVgsPd5Ceye+9g8b0f + UXbjB8RtH4Msd+MeXS7f6twjxbILZiy7pEHDtTBsvG7BqivTUXpsClLWCbtJNpDwBlGVH3ySIFV520eW + nedRcf0HVJGwbeRrOHs/h2n1CGRZDe7wND/W1hiI8sEYlJ4KRcVpJcrfVqByNBILhqLh3KeA+UXBOpL2 + jkRZduARPGXZ/vH4pnMou/gd7INfIPn4QyQc/RSOzk9hrBtEiKPerUn1Y5PXBaDojWlwdgUjr0+G/H4Z + cnpCUNJrQNZ+LeLrBD/LYnixFEDAKFz7vJQ0r49dO4zikS8x8/ADxLd9jIT2B5ix/z7SX78Pw+K3EJy2 + wq1M4rEz6sRwthgw82Ag2KNS2I5JPZ4rZx00ImGNHIZSfisFkDGhxbs5AkKLd/3kaLkDlgTjXrsNc/Md + mPfeQeyOD2HbcRu6yi4E2Wrd8ngeG71IBPtePWa4JUhsD0DykQAkHQqApUWCFLcGyZvDoZ/P/5oCTGXk + hU2MvGB7rbGmG47dd2Fa+x6iX/kAMa/eQvS2m4jaeAPspvcROb8TQexid3CcL2usFCJjnwE5nQYU9RhR + PGDC7D4TCrqMyDqkR9oePbRz/SZEKh8rI8vdyshyXhmzLD8DS/1VGOquwtgw7glkXH0Nhvp3kbL2GrSl + hyC11ril03xZfbkQKZuVsDeq4NihRtYuDbJ2auBoUsO2TQXrJiWMlWIExflWMiHOjRzfJy0bg776HCKX + vANd7WXol1/xeN3Si7A2XIXW1YbAxAq3UO0zPTSd1yG38bplLK//vxBrffKY4PQ1HH9aKk8jonQUUyvO + Qlt9HtqaCx4/tXIMyXWXMXXOAQTEv+D2zCvDhBBTCN1zCGOCZq3k+DXO1YcpRYOY4hpF2LzTCCs74/VE + 3IvnEVd1EhGFblBbWot6BKXWQZq64tlYa2+TuJwQM9KU5cRL35hyOxCe2w913hA0hcPQFI16KRzxEFtO + a1Q9htSVN5C+5S5x7x/uIm3DR7CvuomUReOImt1FU7nwEolHECImMGkJE5i46EJkejNM+X1QOPqhzBqC + KvskVDmnJuHKT/K4bgjKzBMItXcjJv84NOwWiKPndJK40TOCgPgaRmIur1dZ1yM6txvyWT0ITR+AImOQ + gg39N1ybDBJP60PorC5My3oTwQm18FdNryBxbq0EJL6AEUTYZBTkF0NGKyKdvZDb3qJOAxSIOqcP/jtp + JyC3D1BSvYgp6EN4aiNlP/cTEk4gFASPEUeXkWd8RaY5jcrEBkTn9UCT4Q3gzfBfRvJE9rrsfpicHSRe + NsFXmJeSXhTBXXY+jMjk8uArVkpExuKb6pkbYJ7L7Ria37xTUBeMeCkcncRTN0z/TyLKNYy4khNQJq2G + IMLBXdUWQkXwCYYR6md7IPP1k8WEC3UFDzSpG2BZeAZJtXQWFpyls3HOC50JzkdQnbFqDInLLiC2rBcq + 6xoSzzzP+NDVwDBaQkx4XzahNv8xZH48sVotCHeOUnnCWNJG18Q4UjddB7vlfbBbPwC7+YannLTyIrS5 + OyHU5v3hr07poL7JBHe4Jh8bzgQROY8h46IKCAVfbi73D3PcpfoJlX0VtEVN0JXsQlj2ZoRaaynj7N/8 + NfZLPLFmHrXnpiWSCCL8iMl32T/M6YGMq+R+covD7QADwfoIgqt4QVGtfvIZJ4lRv5CY4zypbjfjy+eE + M4l4gtuSwYSQ4DS4EZAew/wNiCYQJlvQU3cAAAAASUVORK5CYII= @@ -1054,142 +1272,6 @@ R2K5fxKLWbbp/7Dc0CBY8Q+pPmOq0VkzzQAAAABJRU5ErkJggg== - - - iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAZdEVYdFNvZnR3YXJlAEFkb2JlIEltYWdlUmVhZHlxyWU8AAADZmlUWHRYTUw6Y29tLmFkb2Jl - LnhtcAAAAAAAPD94cGFja2V0IGJlZ2luPSLvu78iIGlkPSJXNU0wTXBDZWhpSHpyZVN6TlRjemtjOWQi - Pz4gPHg6eG1wbWV0YSB4bWxuczp4PSJhZG9iZTpuczptZXRhLyIgeDp4bXB0az0iQWRvYmUgWE1QIENv - cmUgNS4zLWMwMTEgNjYuMTQ1NjYxLCAyMDEyLzAyLzA2LTE0OjU2OjI3ICAgICAgICAiPiA8cmRmOlJE - RiB4bWxuczpyZGY9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkvMDIvMjItcmRmLXN5bnRheC1ucyMiPiA8 - cmRmOkRlc2NyaXB0aW9uIHJkZjphYm91dD0iIiB4bWxuczp4bXBNTT0iaHR0cDovL25zLmFkb2JlLmNv - bS94YXAvMS4wL21tLyIgeG1sbnM6c3RSZWY9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlw - ZS9SZXNvdXJjZVJlZiMiIHhtbG5zOnhtcD0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wLyIgeG1w - TU06T3JpZ2luYWxEb2N1bWVudElEPSJ4bXAuZGlkOjJGQzkyMzc0Rjk0OUU0MTE5NjNCQjRENDMzQjlC - MUM4IiB4bXBNTTpEb2N1bWVudElEPSJ4bXAuZGlkOjlDMzFEOUI4NEFBRjExRTQ4OTA5OUYwQ0QzM0Q2 - NEI4IiB4bXBNTTpJbnN0YW5jZUlEPSJ4bXAuaWlkOjlDMzFEOUI3NEFBRjExRTQ4OTA5OUYwQ0QzM0Q2 - NEI4IiB4bXA6Q3JlYXRvclRvb2w9IkFkb2JlIFBob3Rvc2hvcCBDUzYgKFdpbmRvd3MpIj4gPHhtcE1N - OkRlcml2ZWRGcm9tIHN0UmVmOmluc3RhbmNlSUQ9InhtcC5paWQ6MDk5Mzk2NTZBRjRBRTQxMTk3NEFD - QUFFQjRCMzVENkUiIHN0UmVmOmRvY3VtZW50SUQ9InhtcC5kaWQ6MkZDOTIzNzRGOTQ5RTQxMTk2M0JC - NEQ0MzNCOUIxQzgiLz4gPC9yZGY6RGVzY3JpcHRpb24+IDwvcmRmOlJERj4gPC94OnhtcG1ldGE+IDw/ - eHBhY2tldCBlbmQ9InIiPz73sIMwAAADIElEQVRIS7WVa0iTYRTH56Uiysvm3TkvpLl5DRIvQYWVWl+6 - iNEVg0yhQqloQZHkLT+Y0YdAs75IpEUhzERZoZhsRpZlS7soblotsRwoxhqWeTrnYZtv+u7NsB74cZ5z - zv89/z17HzYRAPxXeIv/EpFXcOyi4BvKhfehv4FvKBfeh+ayqIUDlIgBgT8whpRYoT2fhgvNVJKBQT9s - hB8/QZDPpnEIjEhg0J5Pw4Vm0mwygG9T06BSqQQhTUhUMoRGpyxYT7OZwfhXC6jVakFIYzNYqN5uMGKa - BI1GIwhpghXJaJJi13d0dEB2bj74hsWzSDlXbzfQG02g0+kEIU2wIomdovzKdVifngnFFytBeb4cLN+n - WaSc6hfKKqB/eHTWoHfwExgMBkFII5MnQUD4WlAWloO26wVs35MDmifPmQFFyqlO/aKKqlmDp31DYDKZ - BCGNTJ4IPqHx8LJvACbNUw7p6e2HuJQMNIhhBuaHj3vBYrEI0tb1BoIiE9kJ9h7Oh7EJM+g/jEJuwVlY - s24ri5RTnfo5BedAIoueIYPumvomuHzjzm9cq2uCq7UNUH2rEarr7kNd0yP26Y+eKoSWtk4wfpmAg7kn - ITY5DUorq1g8cOQEqze3aplOEhRtJoMcL1mMTixV9IgD5a/tSBVDYql8AKOBQLEJtTP08gY/jjFiktKg - 5FIV21Ok3NazvmR2AvrFkCAJyGYk1comZAuHDM/AyLvHThfBveZ26NOPwI59eey7LsbhFCmnOvVJ5+Ef - rrYZLEU8EZ85+HLwW7ZCLMVTFWdkHoLut+/hgbYHaE9XN31XNsupTrWV3jKVs+uS3cyAD0cLe331jW3Q - qRt0CPUlQVHDKI+fN9iGo4W90uNnyuA2vvRtWTlQgxeg/dk7FimnOvU9/CNqUe47b7ANRwt7AfjpKvAK - Gt18Qur35ymhRfsKKLr5hN7EyzDq7humWrrcfSfKxbz/QlwcLDck1snZJdUzYHUDmk57+K1qdXJyzsL6 - RmQD9ZmObygXB8sVIRO6fXQB4hC6eRQppzr1XXmHclnAckFomLc1Um5dItEvhZ97MQXP9N0AAAAASUVO - RK5CYII= - - - - - iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAZdEVYdFNvZnR3YXJlAEFkb2JlIEltYWdlUmVhZHlxyWU8AAADZmlUWHRYTUw6Y29tLmFkb2Jl - LnhtcAAAAAAAPD94cGFja2V0IGJlZ2luPSLvu78iIGlkPSJXNU0wTXBDZWhpSHpyZVN6TlRjemtjOWQi - Pz4gPHg6eG1wbWV0YSB4bWxuczp4PSJhZG9iZTpuczptZXRhLyIgeDp4bXB0az0iQWRvYmUgWE1QIENv - cmUgNS4zLWMwMTEgNjYuMTQ1NjYxLCAyMDEyLzAyLzA2LTE0OjU2OjI3ICAgICAgICAiPiA8cmRmOlJE - RiB4bWxuczpyZGY9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkvMDIvMjItcmRmLXN5bnRheC1ucyMiPiA8 - cmRmOkRlc2NyaXB0aW9uIHJkZjphYm91dD0iIiB4bWxuczp4bXBNTT0iaHR0cDovL25zLmFkb2JlLmNv - bS94YXAvMS4wL21tLyIgeG1sbnM6c3RSZWY9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlw - ZS9SZXNvdXJjZVJlZiMiIHhtbG5zOnhtcD0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wLyIgeG1w - TU06T3JpZ2luYWxEb2N1bWVudElEPSJ4bXAuZGlkOjJGQzkyMzc0Rjk0OUU0MTE5NjNCQjRENDMzQjlC - MUM4IiB4bXBNTTpEb2N1bWVudElEPSJ4bXAuZGlkOjhDMTdBQjRENEFBRTExRTQ4QjQyODY0MDNBNTJE - NzNCIiB4bXBNTTpJbnN0YW5jZUlEPSJ4bXAuaWlkOjhDMTdBQjRDNEFBRTExRTQ4QjQyODY0MDNBNTJE - NzNCIiB4bXA6Q3JlYXRvclRvb2w9IkFkb2JlIFBob3Rvc2hvcCBDUzYgKFdpbmRvd3MpIj4gPHhtcE1N - OkRlcml2ZWRGcm9tIHN0UmVmOmluc3RhbmNlSUQ9InhtcC5paWQ6NUQyMjc4QTlBQjRBRTQxMTk3NEFD - QUFFQjRCMzVENkUiIHN0UmVmOmRvY3VtZW50SUQ9InhtcC5kaWQ6MkZDOTIzNzRGOTQ5RTQxMTk2M0JC - NEQ0MzNCOUIxQzgiLz4gPC9yZGY6RGVzY3JpcHRpb24+IDwvcmRmOlJERj4gPC94OnhtcG1ldGE+IDw/ - eHBhY2tldCBlbmQ9InIiPz4eHsDfAAAB00lEQVRIS7XVWytEURQH8HniTTNHLs0NCXNcXjTN5dH9g/gM - 3jx590QhFDJS0gyTGmpqaqJIMW4hzlAoOaWISS7LWifntI3ddnTGrl92e/57/We/DBsA/CvuYSHZSr0t - lvCGsriX/oI3lMW9lM/SwgF9SEHwizs08IX2vAyLZvZRgXJ+cQWv7yB0q96Ds86voT0vw6KZNJsK4Pnl - DWKxmBBlqhpDUN0UNp2n2VrB/WMOEomEEGX0ArN5o+BGfYB0Oi1EGa8cwpKw6bxRcH6lQiaTEaKMVw5q - rzCbNwr2z65BURQhynh8Qe0VZvNGwdZBFlRVFaKMxxfQXmE2rxc8rW3sQy6XE0puHoG7IaC9YnV9j5th - pbZPqOCDCrbH5uIwOD7/zWgkDkNTizAyuwQjkWWIxFNQWduqmVxI/MiPz6/A8HTUuDMTTYLkbrqhgt5S - T3PG4ZJ3HE7focElZx0u3yn+VQiG1ZLymmm7s74f88f42S6bl9zyJZ6d6Xckd+Mt5ieogH4xJORHHajt - SzvqZPSgECpHZSiA2DztuxBlad+NgnpBEbIjusiiYboKRF+kGFHegUR5ImkFv7G0eAPzWVq8gfksLd5/ - oULiHhYS97BwwPYJlSCUgVubViQAAAAASUVORK5CYII= - - - - - iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAZdEVYdFNvZnR3YXJlAEFkb2JlIEltYWdlUmVhZHlxyWU8AAADZmlUWHRYTUw6Y29tLmFkb2Jl - LnhtcAAAAAAAPD94cGFja2V0IGJlZ2luPSLvu78iIGlkPSJXNU0wTXBDZWhpSHpyZVN6TlRjemtjOWQi - Pz4gPHg6eG1wbWV0YSB4bWxuczp4PSJhZG9iZTpuczptZXRhLyIgeDp4bXB0az0iQWRvYmUgWE1QIENv - cmUgNS4zLWMwMTEgNjYuMTQ1NjYxLCAyMDEyLzAyLzA2LTE0OjU2OjI3ICAgICAgICAiPiA8cmRmOlJE - RiB4bWxuczpyZGY9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkvMDIvMjItcmRmLXN5bnRheC1ucyMiPiA8 - cmRmOkRlc2NyaXB0aW9uIHJkZjphYm91dD0iIiB4bWxuczp4bXBNTT0iaHR0cDovL25zLmFkb2JlLmNv - bS94YXAvMS4wL21tLyIgeG1sbnM6c3RSZWY9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlw - ZS9SZXNvdXJjZVJlZiMiIHhtbG5zOnhtcD0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wLyIgeG1w - TU06T3JpZ2luYWxEb2N1bWVudElEPSJ4bXAuZGlkOjJGQzkyMzc0Rjk0OUU0MTE5NjNCQjRENDMzQjlC - MUM4IiB4bXBNTTpEb2N1bWVudElEPSJ4bXAuZGlkOjJEMDQyOEZBNEFEMjExRTRBN0MxRDBCNzJGRUND - MDEzIiB4bXBNTTpJbnN0YW5jZUlEPSJ4bXAuaWlkOjJEMDQyOEY5NEFEMjExRTRBN0MxRDBCNzJGRUND - MDEzIiB4bXA6Q3JlYXRvclRvb2w9IkFkb2JlIFBob3Rvc2hvcCBDUzYgKFdpbmRvd3MpIj4gPHhtcE1N - OkRlcml2ZWRGcm9tIHN0UmVmOmluc3RhbmNlSUQ9InhtcC5paWQ6QkRDRkI1RDVEMTRBRTQxMTk3NEFD - QUFFQjRCMzVENkUiIHN0UmVmOmRvY3VtZW50SUQ9InhtcC5kaWQ6MkZDOTIzNzRGOTQ5RTQxMTk2M0JC - NEQ0MzNCOUIxQzgiLz4gPC9yZGY6RGVzY3JpcHRpb24+IDwvcmRmOlJERj4gPC94OnhtcG1ldGE+IDw/ - eHBhY2tldCBlbmQ9InIiPz59jfe3AAAEbUlEQVRIS8WTeUybZRzHF48/pnFOuQRajkFLgQFb5iRLNJr4 - l/EPgsniUI4xZDAY1zyxwApsMJyIME61rByl3DfoYGBrgbWUY06FcZSCha4rQ8jYxkqPr2/fvkv8o2Sg - S/wkT970eb6/T5/39z7Prv8dt/Oql4mR4HZJ3ccoXFxhVCzB9DT9JueJdSq6c1wzVZFupepVzxu34XVj - CaEDi1jX6hF8ZQoeokl4iBVwzV9YdU1XRlIl28eVo8phCdXwGltEeOUsro6psaHVwcSDh5volc4iOO8X - 7KuVwb1hEi7J8myq9PEQO//I85oafr0KtEpUpNSETm+AwWDAvfv3YTQaybnm/t/AyO6Ga+UonJOnIijF - 1hA9tWI2qle9RxcI+RIpmZpTIfBULhIyyqHVahHPKcN70TmYnFFCp9OhqXcc9KwW0DOHVl3YU1aUyjJu - F1SpfhO3EM6bMMsVt+D8Zhz2HIpC4oU6bG5uIu4cD3tfTwAjIBNypQYbGxsISquBU34PaDHiVEplGXee - SuIjVaBv3Lz7gJg8vHg4FlZvc+ATVoLipiHsD8qCXWAO7IPK8MG5FjLXKboOeoYADkldUkplGWb7vOb4 - 4BzxIXXQE/1m59WDXdgBvxPfwz6UC4eQUth/WIBDZ2qQXj+K7IYRImeE5s5fOFrcDPvPapcJzVNmmwVY - VxWG9U09uau1tTVymPpc0iYFLew7OEUJ4BwtALfvJpl5xMrKCu6s3cUrn5YbCM1us80CrJZZVWjXr7j3 - 4CE0y8v4IrcaH+cK4Bv+DRyPl8ApphYuia3wZ3eCUzOA1PIfcVuzjHnlIgK/vgy7mHzTG+w12yzA5E53 - edYPo1c2i/X1dQTEfwvbwDQ4hhXg8OcN4P48Df+UTrgkNIAeW4Hg3Hbo9Xq0iGSgs4ls5CUhoXnObLOA - S8pkhG/bdZzgDZJnffT3GXieLAA9XgB2/RjZjuQqMWhxfBw824H55XWyhcfy+HDNqoB1SH4Codn6G7iw - p3d78EaVPlXX0CaZgkqlgly1gpCiK0htHCH/IL6oFcEF3ZjT3CUvXqv0DzDSS0FPq1a/8EbYS5Rqa+if - SAJ8KoeNR7gitEsnoVQqSbGOkJmYX1ggxaY70SabwIGMUrjn8I3WIXnBRPnWu/8nDnE9Sd7cAaP/ZSES - 6/rRKJRArpiHXC7HzekZNIukiCyrhW9mGZgXa4w2kUVnibJnzdXbxP5URzyDO4QjxGl5i9uNpMZeKP5U - IrywAq9yCnGAOGGMonbYxpVnEPGdyR9BO/MTj8kfgXeNFPt5IngVtoF1kQ9WcTs8qgfgmNreQMS21xZL - 0E6Ln6ef75tg8sfgXT8O77oReAkkYNXJ4PRV/4ztyfo9VPTf4xjdf9CpQKzdxxuGe6UMbhXEmc8V6mze - r3qNivx3HGN7UmglQ6CVDMIxXwybo5UcaunJQD8te9rhyx4JrWwItlGNUut3y5+hlp4cDhFCpl14k9jq - nR+Y1NTjIe7NlmMnWKoHsOtvjWYcKpheqFQAAAAASUVORK5CYII= - - - - - iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAZdEVYdFNvZnR3YXJlAEFkb2JlIEltYWdlUmVhZHlxyWU8AAADZmlUWHRYTUw6Y29tLmFkb2Jl - LnhtcAAAAAAAPD94cGFja2V0IGJlZ2luPSLvu78iIGlkPSJXNU0wTXBDZWhpSHpyZVN6TlRjemtjOWQi - Pz4gPHg6eG1wbWV0YSB4bWxuczp4PSJhZG9iZTpuczptZXRhLyIgeDp4bXB0az0iQWRvYmUgWE1QIENv - cmUgNS4zLWMwMTEgNjYuMTQ1NjYxLCAyMDEyLzAyLzA2LTE0OjU2OjI3ICAgICAgICAiPiA8cmRmOlJE - RiB4bWxuczpyZGY9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkvMDIvMjItcmRmLXN5bnRheC1ucyMiPiA8 - cmRmOkRlc2NyaXB0aW9uIHJkZjphYm91dD0iIiB4bWxuczp4bXBNTT0iaHR0cDovL25zLmFkb2JlLmNv - bS94YXAvMS4wL21tLyIgeG1sbnM6c3RSZWY9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlw - ZS9SZXNvdXJjZVJlZiMiIHhtbG5zOnhtcD0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wLyIgeG1w - TU06T3JpZ2luYWxEb2N1bWVudElEPSJ4bXAuZGlkOjJGQzkyMzc0Rjk0OUU0MTE5NjNCQjRENDMzQjlC - MUM4IiB4bXBNTTpEb2N1bWVudElEPSJ4bXAuZGlkOjJERTg4QTFENEQyMjExRTRBODEyODk0M0RBMTc5 - Qjg3IiB4bXBNTTpJbnN0YW5jZUlEPSJ4bXAuaWlkOjJERTg4QTFDNEQyMjExRTRBODEyODk0M0RBMTc5 - Qjg3IiB4bXA6Q3JlYXRvclRvb2w9IkFkb2JlIFBob3Rvc2hvcCBDUzYgKFdpbmRvd3MpIj4gPHhtcE1N - OkRlcml2ZWRGcm9tIHN0UmVmOmluc3RhbmNlSUQ9InhtcC5paWQ6NjJGOUEyRDEyMTRERTQxMUIzNkJE - NUVDQjU5MzE1NjIiIHN0UmVmOmRvY3VtZW50SUQ9InhtcC5kaWQ6MkZDOTIzNzRGOTQ5RTQxMTk2M0JC - NEQ0MzNCOUIxQzgiLz4gPC9yZGY6RGVzY3JpcHRpb24+IDwvcmRmOlJERj4gPC94OnhtcG1ldGE+IDw/ - eHBhY2tldCBlbmQ9InIiPz6wJF34AAACl0lEQVRIS62Vy08TURSH73/QhQtXVnBhxEcMiUkhbEg0hB1R - Q1i68C8wIW5cEqMLN7ho2Ji4YiEhWq0prYUhfULbadN3obTaChobtZEUsFY9nnPS6WM6HYowyZf87j33 - nG/amaai9geOBYA+4pTxihmBE8DcTQB4J8em/9IwSQyagmrtL+z9rMFmvnhkKvtV7tcVHPz6DVsftulA - AckdhUg8zf19eoLKAd597iMLMItewfOxUDTN/bqCH3tVSG8VWIBZ9AoJApEk9+sKvu/uQ2IjzwJkGtH8 - OrTwy3Hu77vIAnV9mgWlcgWiqRwLjAMmkOMbPbNTKnN/JJntqJGEBZ++7oKcyLLgLN4JrU8Cms2C4pcy - BKKZumCI18temQ/8DzSLZlBmQX7nG/jCKdpgAa0driCtY5iFHuqHSjNoFtaags1iCdzBBG+QgNY2aZ0F - mIUe6osENAtrTUEq/7kDq9PHAszU5yYoq9f1i9cUSCD5ozxDEeTsrhAoONwyxLLb8MrhYQFmZYCHsnpd - v3hNgQROb5hnKIK29944MAThTBEWbS4WYBZ6qC/sKSy5ZJ6BGUQg8b4Bbhjod4AZXlhXWdBa10LrIVul - AM9ggS+aa6AIMMO8ZYUO0KeyIOMtZyaQpXpNi4LFucYzMINwhbMNcMNw5oIJMMNKIA0LNg88mZuH/ssj - dPgBMnN+cBRmny1wrRtSMMMzWCCFMg0UAeY2Fh0+GL5xG8Zu3oHXUrCj3g0WONdTbeBm21/o1N17gPtg - 98Xh3VoS3qzKMDI22agfglnY/Uld8NDc/ZlZwAwvl4Ngun6LGh8rdfVDViNs3rguOOzq6XOD8PDpc7g2 - OkHDH7XWtYa2It66Y4eCQ8cRfpvUNa2hTUD8A6JMaBvCyTdJAAAAAElFTkSuQmCC - - iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 @@ -1403,7 +1485,7 @@ AAAASUVORK5CYII= - + iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 YQUAAAAZdEVYdFNvZnR3YXJlAEFkb2JlIEltYWdlUmVhZHlxyWU8AAADZmlUWHRYTUw6Y29tLmFkb2Jl @@ -1415,108 +1497,26 @@ bS94YXAvMS4wL21tLyIgeG1sbnM6c3RSZWY9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlw ZS9SZXNvdXJjZVJlZiMiIHhtbG5zOnhtcD0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wLyIgeG1w TU06T3JpZ2luYWxEb2N1bWVudElEPSJ4bXAuZGlkOjJGQzkyMzc0Rjk0OUU0MTE5NjNCQjRENDMzQjlC - MUM4IiB4bXBNTTpEb2N1bWVudElEPSJ4bXAuZGlkOkUzNzJDMjE3NEFENjExRTRCNjE0OEVEQzI4MEM0 - RTZDIiB4bXBNTTpJbnN0YW5jZUlEPSJ4bXAuaWlkOkUzNzJDMjE2NEFENjExRTRCNjE0OEVEQzI4MEM0 - RTZDIiB4bXA6Q3JlYXRvclRvb2w9IkFkb2JlIFBob3Rvc2hvcCBDUzYgKFdpbmRvd3MpIj4gPHhtcE1N - OkRlcml2ZWRGcm9tIHN0UmVmOmluc3RhbmNlSUQ9InhtcC5paWQ6RkI3NUQ0QkNENDRBRTQxMTk3NEFD - QUFFQjRCMzVENkUiIHN0UmVmOmRvY3VtZW50SUQ9InhtcC5kaWQ6MkZDOTIzNzRGOTQ5RTQxMTk2M0JC - NEQ0MzNCOUIxQzgiLz4gPC9yZGY6RGVzY3JpcHRpb24+IDwvcmRmOlJERj4gPC94OnhtcG1ldGE+IDw/ - eHBhY2tldCBlbmQ9InIiPz6PyaLfAAADMElEQVRIS6VUXUiTYRT+vi3Tzd+ps23+3KRigtiPkolEQReG - UYTkhWatpWlWGkRdddfdSPImqUAJjSIT00oxLJIk0cR+tFSyzDJtgaMkDEPkdM7ZPvm2vS6jBx6es3Pe - 8zzvtm+TohLS/ov+AACStLgEQuJyLRJWYK1yzh/+FgCoQrpnfM4fOGBhcUlIMkEVkma4H4i1y2kFcMD8 - wqKQZILKZqTqmlTAWrfvMjhgbv63Dwm0hLWQohn1eNEbzrlfPiTQAtZCKjP1GXdAIC+r4XD+9CGBFrDm - RVJ1re6pZ0GyHHMvIawauYVNCFPfvvuQQAtYC6meKXU0amNsaGN/ZR60xIf9aIgN3cpGE9OzZCZ85nEm - pGiWlLABmuJCnUOXrNB7chdct4TUo32ANDbp4NuielDpqWfePdaPX6GrohSK4uLhlCEo96YlZLbOFHzH - oJXjMSBcGn4/zQGovEDqXXtzeTb+BTrKj0J3+Q54djYP7EZdTU2MPjFSK8eieQR9QtLg6GcOQPWgqKeQ - ZyOfoK30CDw+lg2Ot3Z4VLoNqo269mCNHIa2WjYn9A1PcAAqU6m9VV3TF9psOwwPS3JgZugCdNoyocwU - jU+RlImWBpezGz0vxzkA1YOiHvPFO7Ca1kGHLQtmXp2HdutmqN+/F6JiU+h3kOpyVeHJwBgHoLIpqajm - 189HoaG4CNqsGTA1UAWth9Lg6r490PygGyLjUikgzuWqQlffCAegelDdUwLqigqhpXgjTPYeh+bCFCg2 - RkEk3vxuVz/P0c43oLP3DQegLhspNalSFxiNcLswHT48LYNbBUlQk7ebzenmyhm08w1o7xmiAP6hRZiT - 70eYkzpctUuJWdHmwWs74+F1Uz7cyE+E4ohQB5mHm9a3GywpTXzektyKduIAIsKI3ISkL4rIdYle05C9 - VrZVBmvtl7eboUyv7V4jSQdwRn8FdI72iErtCUxnIuifkJ5hUqUOq9Jr7OeCNU6bTpNVqtMcDJSldOwn - KnOk+jypJ5QANRWc0cs5SEelXr54QidfwVYAMoiHq4W/gNM6OaNCJ+diaUIqN/43+Atwg27t+9ZXBUn6 - A2MdqQeVc5pWAAAAAElFTkSuQmCC - - - - - iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAIAAABvFaqvAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAZdEVYdFNvZnR3YXJlAEFkb2JlIEltYWdlUmVhZHlxyWU8AAADZmlUWHRYTUw6Y29tLmFkb2Jl - LnhtcAAAAAAAPD94cGFja2V0IGJlZ2luPSLvu78iIGlkPSJXNU0wTXBDZWhpSHpyZVN6TlRjemtjOWQi - Pz4gPHg6eG1wbWV0YSB4bWxuczp4PSJhZG9iZTpuczptZXRhLyIgeDp4bXB0az0iQWRvYmUgWE1QIENv - cmUgNS4zLWMwMTEgNjYuMTQ1NjYxLCAyMDEyLzAyLzA2LTE0OjU2OjI3ICAgICAgICAiPiA8cmRmOlJE - RiB4bWxuczpyZGY9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkvMDIvMjItcmRmLXN5bnRheC1ucyMiPiA8 - cmRmOkRlc2NyaXB0aW9uIHJkZjphYm91dD0iIiB4bWxuczp4bXBNTT0iaHR0cDovL25zLmFkb2JlLmNv - bS94YXAvMS4wL21tLyIgeG1sbnM6c3RSZWY9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlw - ZS9SZXNvdXJjZVJlZiMiIHhtbG5zOnhtcD0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wLyIgeG1w - TU06T3JpZ2luYWxEb2N1bWVudElEPSJ4bXAuZGlkOjJGQzkyMzc0Rjk0OUU0MTE5NjNCQjRENDMzQjlC - MUM4IiB4bXBNTTpEb2N1bWVudElEPSJ4bXAuZGlkOjUzQzNGNDI5NEQyQzExRTQ4QkE1QUNCMEVDRDZF - MDVEIiB4bXBNTTpJbnN0YW5jZUlEPSJ4bXAuaWlkOjUzQzNGNDI4NEQyQzExRTQ4QkE1QUNCMEVDRDZF - MDVEIiB4bXA6Q3JlYXRvclRvb2w9IkFkb2JlIFBob3Rvc2hvcCBDUzYgKFdpbmRvd3MpIj4gPHhtcE1N - OkRlcml2ZWRGcm9tIHN0UmVmOmluc3RhbmNlSUQ9InhtcC5paWQ6RkI1NUY4OTYyQTRERTQxMUIzNkJE + MUM4IiB4bXBNTTpEb2N1bWVudElEPSJ4bXAuZGlkOjJERjY3MEZENEQyMzExRTRCNDlGQUMwMzk0OTAw + Qzc4IiB4bXBNTTpJbnN0YW5jZUlEPSJ4bXAuaWlkOjJERjY3MEZDNEQyMzExRTRCNDlGQUMwMzk0OTAw + Qzc4IiB4bXA6Q3JlYXRvclRvb2w9IkFkb2JlIFBob3Rvc2hvcCBDUzYgKFdpbmRvd3MpIj4gPHhtcE1N + OkRlcml2ZWRGcm9tIHN0UmVmOmluc3RhbmNlSUQ9InhtcC5paWQ6NjhGOUEyRDEyMTRERTQxMUIzNkJE NUVDQjU5MzE1NjIiIHN0UmVmOmRvY3VtZW50SUQ9InhtcC5kaWQ6MkZDOTIzNzRGOTQ5RTQxMTk2M0JC NEQ0MzNCOUIxQzgiLz4gPC9yZGY6RGVzY3JpcHRpb24+IDwvcmRmOlJERj4gPC94OnhtcG1ldGE+IDw/ - eHBhY2tldCBlbmQ9InIiPz6IsaOmAAADF0lEQVQ4T62U/UuTURTH+0nICqRI1ERMMyNQe8N0ChqBwQhN - yvwhEgJjVCqJ/qCibZo6tzQ339h6Nre5prapUzc1XzItX1ilzuWMLLVAen+xf6DTuTxjdxsFVj58ebjc - c+7nnud7z3228DbpIaDFH/CfoqCn72DIDvNfPDM2KAqyr8PcJxqY+QBTb8kkjocXQTsKigGwfqYJHqIg - 1OxHGHvlWPx4hXB1YyA3g4CBhqst+piEnrDA3rA95vBAY1x8d7lq/DVZwm5PQZNvoKYdypSgHgbVEIh1 - cLOZzOCbSSsyRQRba6uWtcpVLbPcwlglInNUCJNWWKqABqMLCGvGlfpJELaQ/V1Vd1lujAhe0chtUrH5 - ZExnmJ85MdomEa+qZMbIEF2BHGunILSjdZwYgTt4gJqjjj0Rltml1Zq9AeL0Mn71Wn2mtDU80MIvsFTw - O+KPIoWC8BNYRIUaqrRQroJKjQOk9N+xLBF2pXJFKfnsDGYa8gS6xOO2whyMuoHaHpGzZ/pBM0IMrtXD - nT4HqNHXe0lYoogMFeQP4jbSDkCPTUyXmnNoPutSo+9WN5DEQDyeWCWnhqm4p7Oimt3b54rzmmKPVHKz - 0Xg0AU1pz87VJp+yXOfd9t3mBmLXsGrsJhSsDtF4iOWxKdpzyQNnuRW7vEUp13obFG05OVUBPtO5V1Sn - k5q4SX8ENfWA6C7xHsP981Bb2sf38ZKd4JhSuXUJHPHhg/WJnAeZFw0Xzt/w8erRtLmBnB/CSmaC599I - 2PYVRl+CXigu3R9SfCC0Pf1MZ1oqvqvjogX7gtRFJfb1n24g7GblfQcFP2fkBYm5anxqQcbLKgzyK/Df - WRTkV5+RMTg84ZrgAOHo4ZIDVNdJw67CpsVLZ5gifj97Typlq2ZFQXj8LKh5EHpnaIar8N+Al5l9Y9Vs - T7OiIAzjqaMsa6QJnBkeWvgOHdPkAuIV67PSeQpCYYZplsZ+KyyWLRyFF8D553EDbURY770J0rrYJbda - SYE4iWb9NcgpRKDrOMAWwYP6d5BTaC52zyaAWDlAm/DweL8AX9zXukfxHsIAAAAASUVORK5CYII= - - - - - iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAZdEVYdFNvZnR3YXJlAEFkb2JlIEltYWdlUmVhZHlxyWU8AAADZmlUWHRYTUw6Y29tLmFkb2Jl - LnhtcAAAAAAAPD94cGFja2V0IGJlZ2luPSLvu78iIGlkPSJXNU0wTXBDZWhpSHpyZVN6TlRjemtjOWQi - Pz4gPHg6eG1wbWV0YSB4bWxuczp4PSJhZG9iZTpuczptZXRhLyIgeDp4bXB0az0iQWRvYmUgWE1QIENv - cmUgNS4zLWMwMTEgNjYuMTQ1NjYxLCAyMDEyLzAyLzA2LTE0OjU2OjI3ICAgICAgICAiPiA8cmRmOlJE - RiB4bWxuczpyZGY9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkvMDIvMjItcmRmLXN5bnRheC1ucyMiPiA8 - cmRmOkRlc2NyaXB0aW9uIHJkZjphYm91dD0iIiB4bWxuczp4bXBNTT0iaHR0cDovL25zLmFkb2JlLmNv - bS94YXAvMS4wL21tLyIgeG1sbnM6c3RSZWY9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlw - ZS9SZXNvdXJjZVJlZiMiIHhtbG5zOnhtcD0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wLyIgeG1w - TU06T3JpZ2luYWxEb2N1bWVudElEPSJ4bXAuZGlkOjJGQzkyMzc0Rjk0OUU0MTE5NjNCQjRENDMzQjlC - MUM4IiB4bXBNTTpEb2N1bWVudElEPSJ4bXAuZGlkOkVENUYwQThBNEQyOTExRTQ5QzUzQzdFMkFGQkQy - NTA1IiB4bXBNTTpJbnN0YW5jZUlEPSJ4bXAuaWlkOkVENUYwQTg5NEQyOTExRTQ5QzUzQzdFMkFGQkQy - NTA1IiB4bXA6Q3JlYXRvclRvb2w9IkFkb2JlIFBob3Rvc2hvcCBDUzYgKFdpbmRvd3MpIj4gPHhtcE1N - OkRlcml2ZWRGcm9tIHN0UmVmOmluc3RhbmNlSUQ9InhtcC5paWQ6MkRGNkEzOUYyOTRERTQxMUIzNkJE - NUVDQjU5MzE1NjIiIHN0UmVmOmRvY3VtZW50SUQ9InhtcC5kaWQ6MkZDOTIzNzRGOTQ5RTQxMTk2M0JC - NEQ0MzNCOUIxQzgiLz4gPC9yZGY6RGVzY3JpcHRpb24+IDwvcmRmOlJERj4gPC94OnhtcG1ldGE+IDw/ - eHBhY2tldCBlbmQ9InIiPz6npMy1AAAGEUlEQVRIS7WVeVDUZRjHf7Ase8ECu+wl4LIXcqyyHC783AWW - 5QaRFTHkMi9SQvE+UhLzwk0BUcQSgQBBgcYDzStMSzOPcpqcmo5pmqk/+rOapqb+iG/PbzfFcSz/6pn5 - zPN739/7fp/nvZn/3TSLjj+XJy2/RaItPCT5vaBd8m1+q2Qku1lcrcvki+iXr7fFU6ZZeOx5KDU1b7jU - 1Z2bVPMPWNMbRXrXkWAc+ywVLbcS8fKwFjlu8VdpW0XzSc6f8PEIPzJ19dFnU3WEJdHL9P3X9O1nkdB8 - CQrX7i3mKn9zfqsUq29ZsPfjRBx5aMO2cTMy94gm7FuF7XyJTwDJTo5GVdHxNALVgsPd5Ceye+9g8b0f - UXbjB8RtH4Msd+MeXS7f6twjxbILZiy7pEHDtTBsvG7BqivTUXpsClLWCbtJNpDwBlGVH3ySIFV520eW - nedRcf0HVJGwbeRrOHs/h2n1CGRZDe7wND/W1hiI8sEYlJ4KRcVpJcrfVqByNBILhqLh3KeA+UXBOpL2 - jkRZduARPGXZ/vH4pnMou/gd7INfIPn4QyQc/RSOzk9hrBtEiKPerUn1Y5PXBaDojWlwdgUjr0+G/H4Z - cnpCUNJrQNZ+LeLrBD/LYnixFEDAKFz7vJQ0r49dO4zikS8x8/ADxLd9jIT2B5ix/z7SX78Pw+K3EJy2 - wq1M4rEz6sRwthgw82Ag2KNS2I5JPZ4rZx00ImGNHIZSfisFkDGhxbs5AkKLd/3kaLkDlgTjXrsNc/Md - mPfeQeyOD2HbcRu6yi4E2Wrd8ngeG71IBPtePWa4JUhsD0DykQAkHQqApUWCFLcGyZvDoZ/P/5oCTGXk - hU2MvGB7rbGmG47dd2Fa+x6iX/kAMa/eQvS2m4jaeAPspvcROb8TQexid3CcL2usFCJjnwE5nQYU9RhR - PGDC7D4TCrqMyDqkR9oePbRz/SZEKh8rI8vdyshyXhmzLD8DS/1VGOquwtgw7glkXH0Nhvp3kbL2GrSl - hyC11ril03xZfbkQKZuVsDeq4NihRtYuDbJ2auBoUsO2TQXrJiWMlWIExflWMiHOjRzfJy0bg776HCKX - vANd7WXol1/xeN3Si7A2XIXW1YbAxAq3UO0zPTSd1yG38bplLK//vxBrffKY4PQ1HH9aKk8jonQUUyvO - Qlt9HtqaCx4/tXIMyXWXMXXOAQTEv+D2zCvDhBBTCN1zCGOCZq3k+DXO1YcpRYOY4hpF2LzTCCs74/VE - 3IvnEVd1EhGFblBbWot6BKXWQZq64tlYa2+TuJwQM9KU5cRL35hyOxCe2w913hA0hcPQFI16KRzxEFtO - a1Q9htSVN5C+5S5x7x/uIm3DR7CvuomUReOImt1FU7nwEolHECImMGkJE5i46EJkejNM+X1QOPqhzBqC - KvskVDmnJuHKT/K4bgjKzBMItXcjJv84NOwWiKPndJK40TOCgPgaRmIur1dZ1yM6txvyWT0ITR+AImOQ - gg39N1ybDBJP60PorC5My3oTwQm18FdNryBxbq0EJL6AEUTYZBTkF0NGKyKdvZDb3qJOAxSIOqcP/jtp - JyC3D1BSvYgp6EN4aiNlP/cTEk4gFASPEUeXkWd8RaY5jcrEBkTn9UCT4Q3gzfBfRvJE9rrsfpicHSRe - NsFXmJeSXhTBXXY+jMjk8uArVkpExuKb6pkbYJ7L7Ria37xTUBeMeCkcncRTN0z/TyLKNYy4khNQJq2G - IMLBXdUWQkXwCYYR6md7IPP1k8WEC3UFDzSpG2BZeAZJtXQWFpyls3HOC50JzkdQnbFqDInLLiC2rBcq - 6xoSzzzP+NDVwDBaQkx4XzahNv8xZH48sVotCHeOUnnCWNJG18Q4UjddB7vlfbBbPwC7+YannLTyIrS5 - OyHU5v3hr07poL7JBHe4Jh8bzgQROY8h46IKCAVfbi73D3PcpfoJlX0VtEVN0JXsQlj2ZoRaaynj7N/8 - NfZLPLFmHrXnpiWSCCL8iMl32T/M6YGMq+R+covD7QADwfoIgqt4QVGtfvIZJ4lRv5CY4zypbjfjy+eE - M4l4gtuSwYSQ4DS4EZAew/wNiCYQJlvQU3cAAAAASUVORK5CYII= + eHBhY2tldCBlbmQ9InIiPz6GKmpFAAAC+UlEQVRIS63T20vTYRzH8Yforj/Ei24UiSgKIygKi8oyxZQo + cvNYeXaesmzqPGu2POd0ulSsnIdaurTSTJ3O6UxTPGya5vCQx5AuPn39RbHop7nZxQt+z3ie93e/Z4w1 + p7nsCoBt8R6yBF/UHPv+Wb0rfFFzm99CRIwEW1gnqXzxTXxRc0ydctm4OlID2sxrw6iCtiwItC+A2P/D + frLnjwGNSZdMq6N1WOvLwFpP4l/WdRlY6Jaio9Ab7QXba8sVoDHZGdT8PYS9THDqMGnLsKpNw0qXGCua + BO55VZdNQ6U/DRRibVCGb+N1pH5bukoRqHmDHOIG1N8/X2F4I8WyNhtf2+9hqSsZxqZ4upbb6HsSZLHO + Im90ym6hNVcIaktYTexZyUelGEvaHMy/jcFiZxo0xX5Y7ivGcn8JkVmA9uvlWBmqwpJeAWovs+poR99O + eRgWtQWYVUdgrj0FH+i+F3XF3NoappZYGJrEoLaOVYpOOTY/FGJB+xjTqnDMtMTTAC/Ma/Ix/TLUKl9e + x0JfFQpql7PykBP7lWIXzPeUYLIhHCPKCLr/AMy2ZsKoDLTKdNNdvM8TgNpRTBZwfJ885CTmaIChPhwa + mS+GnkdhqjEWY9X+VplqvIMXEhdQ24mZeuSs0N/BNNWWj4k6EdSZHhhXxWH0aSCGFd4c4Tk7zk7XBlUM + FKLToK4Nm+0qYnneRzqGGiSYaIiiyZdhVCdgqFSIwRJPjucZW85O1pvnRmvDkO9zFNTdy2Y6HjGp4HCF + 5kk4xhoiURd/EROv4tBfeM0qAyUC9Mp9QM0+7o829T6LZV0/mNycS6+nFKFWfAGj9ZHozfGwil7miZYH + 7qCmghsw+S6VpV894KuUuKFbfhNNqa749CwY3dm0toK+VABl3HlQM5obYHybwFLc7W1y/Y5BlX6FfgNn + DNcEY0DhZZX+MiGKbh0DNR24AYYWMSfJzc6GZBApwS5skIzNODcg0dV2V36FtsJ7yBJ8UXO8hyzBFzXH + ++H/A/YDv9/V87iOlrYAAAAASUVORK5CYII= @@ -3164,9 +3164,6 @@ 864, 17 - - 864, 17 - iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 diff --git a/FeatureStatisticsService.cs b/FeatureStatisticsService.cs index 331ee47..b127fe3 100644 --- a/FeatureStatisticsService.cs +++ b/FeatureStatisticsService.cs @@ -190,7 +190,7 @@ List result = new List(); //layer.Name是表名 - string[] accessStrs = Utility.getAccStrsByLayer(layer.Name); + string[] accessStrs = FeatureTools.GetAccStrsByLayer(layer.Name); foreach (string accssname in accessStrs) { diff --git a/FeatureTools.cs b/FeatureTools.cs index be4b469..3c08f34 100644 --- a/FeatureTools.cs +++ b/FeatureTools.cs @@ -1,5 +1,6 @@ using System; using System.Collections.Generic; +using System.Data; using System.Linq; using System.Text; using System.Windows.Forms; @@ -43,7 +44,7 @@ } feature.Delete();//地球上删除该feature string sql = "delete from " + layerName + " where LSSYS_ID =" + feature.ID + " and (编号 is null or substr(编号,length(编号)-2)='TMP')"; - OledbHelper.sqlExecuteNonQuery(sql);//目前无法取到LSSYS_ID，所以这个判断条件不太合适，会导致把该类所有新建的都删除了 + OledbHelper.sqlExecuteNonQuery(sql); } catch (Exception) { @@ -106,5 +107,46 @@ } return value; } + + /// + /// 根据附属物图层名字得到里面含有的附属物 + /// + /// + /// + public static string[] GetAccStrsByLayer(string layername) + { + string[] accStrs = null; + string sql = "select 附属物名称 from " + layername + " group by 附属物名称"; + DataSet dataset = OledbHelper.getDataSet(sql, layername); + if (dataset == null) return null; + accStrs = new string[dataset.Tables[0].Rows.Count]; + for (int i = 0; i < dataset.Tables[0].Rows.Count; i++) + { + accStrs[i] = dataset.Tables[0].Rows[i][0].ToString(); + } + return accStrs; + } + + /// + /// 删除内存图层中指定名称的feature + /// + /// + /// + public static void RemoveFeatureFromName(GSOGlobeControl globeControl1, string featureName) + { + GSOFeatures features = globeControl1.Globe.MemoryLayer.GetFeatureByName(featureName, true); + if (features != null) + { + for (int i = features.Length - 1; i >= 0; i--) + { + GSOFeature feature = features[i]; + if (feature != null) + { + globeControl1.Globe.MemoryLayer.RemoveFeatureByID(feature.ID); + } + } + } + globeControl1.Refresh(); + } } } diff --git a/Forms/FrmPipelineModelDataBase.cs b/Forms/FrmPipelineModelDataBase.cs index b577fd8..bc1e479 100644 --- a/Forms/FrmPipelineModelDataBase.cs +++ b/Forms/FrmPipelineModelDataBase.cs @@ -149,7 +149,7 @@ catch (Exception ex) { LogError.PublishError(ex); - LogHelper.WriteLog(typeof(FrmPipelineModelDB), ex.Message); + LogHelper.Error(ex.Message); } } diff --git a/FrmAccessoriesSensor.cs b/FrmAccessoriesSensor.cs index 98aa1cf..542f19a 100644 --- a/FrmAccessoriesSensor.cs +++ b/FrmAccessoriesSensor.cs @@ -240,7 +240,7 @@ { if (clbPipeLine.CheckedItems.Count > 0) { - Utility.RemoveFeatureFromName(globeControl1, "trackPolygon"); + FeatureTools.RemoveFeatureFromName(globeControl1, "trackPolygon"); globeControl1.Globe.Action = EnumAction3D.TrackPolygon; globeControl1.TrackPolygonEndEvent += globeControl1_TrackPolygonEndEvent; } @@ -259,7 +259,7 @@ private void FrmAccessoriesgather_FormClosing(object sender, FormClosingEventArgs e) { frm = null; - Utility.RemoveFeatureFromName(globeControl1, "trackPolygon"); + FeatureTools.RemoveFeatureFromName(globeControl1, "trackPolygon"); globeControl1.Globe.Action = EnumAction3D.ActionNull; globeControl1.TrackPolygonEndEvent -= globeControl1_TrackPolygonEndEvent; } diff --git a/FrmAccessoriesgather.cs b/FrmAccessoriesgather.cs index e1d176e..c36273b 100644 --- a/FrmAccessoriesgather.cs +++ b/FrmAccessoriesgather.cs @@ -118,7 +118,7 @@ { if (clbPipeLine2.Text!="") { - Utility.RemoveFeatureFromName(globeControl1, "trackPolygon"); + FeatureTools.RemoveFeatureFromName(globeControl1, "trackPolygon"); globeControl1.Globe.Action = EnumAction3D.TrackPolygon; globeControl1.Globe.TrackPolygonTool.TrackMode = EnumTrackMode.SpaceTrack; globeControl1.TrackPolygonEndEvent += globeControl1_TrackPolygonEndEvent; @@ -295,7 +295,7 @@ private void FrmAccessoriesgather_FormClosing(object sender, FormClosingEventArgs e) { frm = null; - Utility.RemoveFeatureFromName(globeControl1, "trackPolygon"); + FeatureTools.RemoveFeatureFromName(globeControl1, "trackPolygon"); globeControl1.TrackPolygonEndEvent -= globeControl1_TrackPolygonEndEvent; globeControl1.Globe.Action = EnumAction3D.ActionNull; diff --git a/FrmAddWellShp.cs b/FrmAddWellShp.cs index 7983349..78d8946 100644 --- a/FrmAddWellShp.cs +++ b/FrmAddWellShp.cs @@ -100,7 +100,7 @@ catch (Exception ex) { LogError.PublishError(ex); - LogHelper.WriteLog(typeof(FrmAddWellShp), ex.Message); + LogHelper.Error(ex.Message); } } diff --git a/FrmBSQStatis.cs b/FrmBSQStatis.cs index 5b05926..b5e581d 100644 --- a/FrmBSQStatis.cs +++ b/FrmBSQStatis.cs @@ -97,7 +97,7 @@ } catch (Exception ex) { - LogHelper.WriteLog(typeof(FrmBSQStatis),ex.Message); + LogHelper.Error(ex.Message); } return typeAndCount; } @@ -108,7 +108,7 @@ GSOLayer layer = globeControl1.Globe.Layers.GetLayerByCaption("标识器"); GSOFeatures bsqFs = FeatureStatisticsService.GetLayerFeatures(polygon, layer); if (bsqFs == null || bsqFs.Length <= 0) { - LogHelper.WriteLog(typeof(FrmBSQStatis),"标识器图层下的Feature为空"); + LogHelper.Error("标识器图层下的Feature为空!"); return null; } diff --git a/FrmBasicQuery.cs b/FrmBasicQuery.cs index baeeade..cc8d3ff 100644 --- a/FrmBasicQuery.cs +++ b/FrmBasicQuery.cs @@ -224,7 +224,7 @@ } catch(Exception ex) { - LogHelper.WriteLog(typeof(FrmBasicQuery), ex.Message); + LogHelper.Error(ex.Message); } } else diff --git a/FrmCodingQuery.cs b/FrmCodingQuery.cs index f1ac322..d4ec095 100644 --- a/FrmCodingQuery.cs +++ b/FrmCodingQuery.cs @@ -82,7 +82,7 @@ } catch (Exception ex) { - LogHelper.WriteLog(typeof(FrmCodingQuery), ex.Message); ; + LogHelper.Error(ex.Message); } } diff --git a/FrmDiameterQuery.cs b/FrmDiameterQuery.cs index e7b3657..75d7949 100644 --- a/FrmDiameterQuery.cs +++ b/FrmDiameterQuery.cs @@ -150,7 +150,7 @@ catch (Exception ex) { //LogError.PublishError(ex); - LogHelper.WriteLog(typeof(FrmDiameterQuery), ex.Message); + LogHelper.Error(ex.Message); MessageBox.Show("请输入正确的管径范围！"); return; } diff --git a/FrmFittingQuery.cs b/FrmFittingQuery.cs index 12f6007..8645011 100644 --- a/FrmFittingQuery.cs +++ b/FrmFittingQuery.cs @@ -69,7 +69,7 @@ } catch (Exception ex) { - LogHelper.WriteLog(typeof(FrmFittingQuery), ex.Message); + LogHelper.Error(ex.Message); } } /// diff --git a/FrmKeywordQuery.cs b/FrmKeywordQuery.cs index 405524f..ede0a93 100644 --- a/FrmKeywordQuery.cs +++ b/FrmKeywordQuery.cs @@ -87,7 +87,7 @@ } catch (Exception ex) { - LogHelper.WriteLog(typeof(FrmKeywordQuery), ex.Message); + LogHelper.Error(ex.Message); } } diff --git a/FrmLogin.cs b/FrmLogin.cs index 1172c23..6fbaed9 100644 --- a/FrmLogin.cs +++ b/FrmLogin.cs @@ -2,6 +2,8 @@ using System.Data; using System.Data.OracleClient; using System.IO; +using System.Net; +using System.Text; using System.Windows.Forms; using System.Xml; using DevComponents.DotNetBar; @@ -10,16 +12,15 @@ { public partial class FrmLogin : Office2007Form { + + //登录界面 -- 配置文件的路径 + public static string filename = Application.StartupPath + "\\login.xml"; + + public FrmLogin() { InitializeComponent(); } - public string rolename = "浏览"; - public string username = ""; - public string department = ""; - - //登录界面 -- 配置文件的路径 - public static string filename = Application.StartupPath + "\\login.xml"; /// /// 登录按钮事件处理 /// @@ -28,9 +29,10 @@ private void button1_Click(object sender, EventArgs e) { bool result = ValidateUser(); +// bool result =ValidateFromUrl();//从平台获取用户角色信息，判断是否能登陆成功 if (result) { - username = txtUser.Text.Trim(); + WriteXml(); Utility.userName = txtUser.Text.Trim(); DialogResult = DialogResult.OK; Close(); @@ -43,80 +45,6 @@ } } /// - /// 关闭按钮事件处理 - /// - /// - /// - private void button2_Click(object sender, EventArgs e) - { - Close(); - } - /// - /// 验证端口号 - /// - /// - //private bool ValiPort() - //{ - // Ping p = new Ping();//创建Ping对象p - // PingReply pr = p.Send(Utility.localicenseserverip);//向指定IP或者主机名的计算机发送ICMP协议的ping数据包 - // if (pr.Status == IPStatus.Success)//如果ping成功 - // { - // try - // { - // TcpClient tcpc = new TcpClient(Utility.localicenseserverip, Utility.localicenseserverport);//对IP地址为"192.168.0.105"的计算机的1500端口提出连接申请 - // tcpc.Close(); - // return true; - // } - // catch (Exception ex) - // { - // LogError.PublishError(ex); - // MessageBox.Show("端口连接错误！" + ex.Message); - // return false; - // } - // } - // else - // { - // int times = 0;//重新连接次数; - // int count = 2;//设置尝试次数 - // while (times < count) - // { - // //Thread.Sleep(1000);//等待时间(方便测试的话，你可以改为1000) - // pr = p.Send(Utility.localicenseserverip); - - // if (pr.Status == IPStatus.Success) - // { - // try - // { - // TcpClient tcpc = new TcpClient(Utility.localicenseserverip, Utility.localicenseserverport);//对IP地址为"192.168.0.105"的计算机的1500端口提出连接申请 - // tcpc.Close(); - // return true; - // } - // catch (Exception ex) - // { - // LogError.PublishError(ex); - // MessageBox.Show("端口连接错误！" + ex.Message); - // return false; - // } - // } - // else - // { - // times++; - // if (times < count) - // { - // continue; - // } - // else - // { - // MessageBox.Show("重新尝试连接失败"); - // return false; - // } - // } - - // } - // return false; - // } - //} - /// /// 验证用户名、密码 /// /// @@ -126,24 +54,64 @@ string sql = "select * from casic_userinfotest where USERNAME='" + txtUser.Text.Trim() + "' and PASSWORD='" + passWord + "' and sysname='GHFX' "; DataTable dt = OledbHelper.QueryTable(sql); - if (dt != null && dt.Rows.Count > 0) + if (dt == null || dt.Rows.Count <= 0) return false; + if (String.IsNullOrEmpty(dt.Rows[0]["rid"].ToString())) return true; + sql = "select gid from casic_userroletest where id=" + dt.Rows[0]["rid"] + " and sysname='GHFX' "; + using (OracleDataReader reader = OracleUtils.ExecuteReader(OracleUtils.ConnectionString, CommandType.Text, sql)) { - WriteXML(); - if (!String.IsNullOrEmpty(dt.Rows[0]["rid"].ToString())) + while (reader.Read()) { - sql = "select gid from casic_userroletest where id=" + dt.Rows[0]["rid"] + " and sysname='GHFX' "; - using (OracleDataReader reader = OracleUtils.ExecuteReader(OracleUtils.ConnectionString, CommandType.Text, sql)) - { - while (reader.Read()) - { - Utility.userRole = reader[0].ToString(); - break; - } - } + Utility.userRole = reader[0].ToString(); + LogHelper.Debug("测试一下"); + break; } - return true; } - return false; + return true; + } + + + + private bool ValidateFromUrl() + { + string user = txtUser.Text.Trim(); + string pwd = textBoxPassWord.Text.Trim(); + //做成配置的 + string roleserver = Utility.RoleServer; + if (roleserver == null || roleserver.Trim().Equals("")) + { + MessageBox.Show("请在Config.xml中配置roleurl！"); + return false; + } + HttpWebRequest request = + WebRequest.Create(roleserver+"/rs/authority/user?username=" + user + "&password=" + pwd + "&appId=21") as HttpWebRequest; + if (request == null) return false; + using (HttpWebResponse response = request.GetResponse() as HttpWebResponse) + { + try + { + if (response == null || response.GetResponseStream() == null) return false; + StreamReader reader = new StreamReader(response.GetResponseStream()); + string[] result = reader.ReadToEnd().Split(','); + //解析result + if (result.Length < 5) return false; + StringBuilder userRole = new StringBuilder(""); + for (int i = 4; i < result.Length; i++) + { + string[] tmpStrings = result[i].Split('_'); + if (tmpStrings.Length < 2) continue; + userRole.Append(tmpStrings[1].Trim() + ","); + } + if (userRole.Length < 3) return false; + userRole.Remove(userRole.Length - 3, 3); + // MessageBox.Show(userRole.ToString()); + Utility.userRole = userRole.ToString(); + return Utility.userRole != null && !Utility.userRole.Equals("null"); + } + catch (Exception e) + { + return false; + } + } } private void FrmLogin_Load(object sender, EventArgs e) @@ -153,74 +121,56 @@ StartPosition = FormStartPosition.CenterScreen; - ReadXML(); + ReadXml(); } /// /// 读取上一次登录的用户名和密码 /// - private void ReadXML() + private void ReadXml() { - if (File.Exists(filename)) + if (!File.Exists(filename)) return; + //初始化XML文档操作类 + XmlDocument myDoc = new XmlDocument(); { - if (!File.Exists(filename)) + //加载XML文件 + try { + myDoc.Load(filename); + } + catch (Exception e) + { + LogError.PublishError(e); return; } - - //初始化XML文档操作类 - XmlDocument myDoc = new XmlDocument(); + //搜索指定的节点 + XmlNode serverRootNode = myDoc.SelectSingleNode("Params"); + XmlNodeList nodes = null; + if (serverRootNode != null) { - //加载XML文件 - try + nodes = serverRootNode.ChildNodes; + } + if (nodes == null) return; + foreach (XmlNode xn in nodes) + { + if (xn.Name.Equals("username")) { - myDoc.Load(filename); + txtUser.Text = xn.InnerText.Trim(); } - catch (Exception e) + else if (xn.Name.Equals("password")) { - LogError.PublishError(e); - return; + textBoxPassWord.Text = xn.InnerText.Trim(); } - //搜索指定的节点 - XmlNode serverRootNode = myDoc.SelectSingleNode("Params"); - XmlNodeList nodes = null; - if (serverRootNode != null) + else if (xn.Name.Equals("isremember")) { - nodes = serverRootNode.ChildNodes; - } - if (nodes != null) - { - foreach (XmlNode xn in nodes) - { - if (xn.Name == "username") - { - txtUser.Text = xn.InnerText.Trim(); - } - else if (xn.Name == "password") - { - textBoxPassWord.Text = xn.InnerText.Trim(); - } - else if (xn.Name == "isremember") - { - if (xn.InnerText.Trim() == "true") - { - checkBoxXRememberPassword.Checked = true; - } - else if (xn.InnerText.Trim() == "false") - { - checkBoxXRememberPassword.Checked = false; - } - } - } - + checkBoxXRememberPassword.Checked = xn.InnerText.Trim().Equals("true"); } } } - } /// /// 记录登录的用户名和密码 /// - private void WriteXML() + private void WriteXml() { if (!File.Exists(filename)) { @@ -252,31 +202,17 @@ foreach (XmlNode xn in nodes) { XmlElement xe = (XmlElement)xn; - if (xe.Name == "username") + if (xe.Name.Equals("username")) { xe.InnerText = txtUser.Text.Trim(); } - else if (xe.Name == "password") + else if (xe.Name.Equals("password")) { - if (checkBoxXRememberPassword.Checked) - { - xe.InnerText = textBoxPassWord.Text.Trim(); - } - else - { - xe.InnerText = ""; - } + xe.InnerText = checkBoxXRememberPassword.Checked ? textBoxPassWord.Text.Trim() : ""; } - else if (xe.Name == "isremember") + else if (xe.Name.Equals("isremember")) { - if (checkBoxXRememberPassword.Checked) - { - xe.InnerText = "true"; - } - else - { - xe.InnerText = "false"; - } + xe.InnerText = checkBoxXRememberPassword.Checked ? "true" : "false"; } } } diff --git a/FrmMaterialSel.cs b/FrmMaterialSel.cs index 8645ab3..d23f385 100644 --- a/FrmMaterialSel.cs +++ b/FrmMaterialSel.cs @@ -157,7 +157,7 @@ } catch (Exception ex) { - LogHelper.WriteLog(typeof(FrmMaterialSel), ex.Message); + LogHelper.Error(ex.Message); } } diff --git a/FrmMetadataStat.cs b/FrmMetadataStat.cs index c3c1359..96029a6 100644 --- a/FrmMetadataStat.cs +++ b/FrmMetadataStat.cs @@ -96,7 +96,7 @@ //统计有多少个图层 private int statistLayer() { - List datasrcs = Utility.layerConfig.datasrcs; + List datasrcs = Utility.LayerConfig.datasrcs; return datasrcs.SelectMany(datasrc => datasrc.layertypes).Sum(layerType => layerType.layers.Count); } diff --git a/FrmpipeDeepstatis.cs b/FrmpipeDeepstatis.cs index 6a5c895..8d915a9 100644 --- a/FrmpipeDeepstatis.cs +++ b/FrmpipeDeepstatis.cs @@ -2,6 +2,7 @@ using System.Collections.Generic; using System.Diagnostics; using System.IO; +using System.Reflection; using System.Text; using System.Windows.Forms; using System.Windows.Forms.DataVisualization.Charting; @@ -320,7 +321,7 @@ MessageBox.Show("请添加分段"); return; } - Utility.RemoveFeatureFromName(globeControl1, "trackPolygon"); + FeatureTools.RemoveFeatureFromName(globeControl1, "trackPolygon"); globeControl1.Globe.Action = EnumAction3D.TrackPolygon; globeControl1.Globe.TrackPolygonTool.TrackMode = EnumTrackMode.SpaceTrack; globeControl1.TrackPolygonEndEvent += globeControl1_TrackPolygonEndEvent; @@ -408,12 +409,11 @@ TextBox control; private void dataGridViewX2_EditingControlShowing(object sender, DataGridViewEditingControlShowingEventArgs e) { - if (e.Control.GetType().BaseType.Name == "TextBox") - { - control = new TextBox(); - control = (TextBox)e.Control; - control.KeyPress += control_KeyPress; - } + MemberInfo memberInfo = e.Control.GetType().BaseType; + if (memberInfo != null && !memberInfo.Name.Equals("TextBox")) return; + control = new TextBox(); + control = (TextBox)e.Control; + control.KeyPress += control_KeyPress; } /// /// 键盘按键按下事件处理 @@ -423,28 +423,24 @@ void control_KeyPress(object sender, KeyPressEventArgs e) { TextBox text = sender as TextBox; + if (text == null) return; if ((e.KeyChar < 48 || e.KeyChar > 57) && (e.KeyChar != 8) && e.KeyChar != 46) { e.Handled = true; } - if (e.KeyChar == 46) //小数点 + if (e.KeyChar != 46) return; + if (text.Text.Length <= 0) + e.Handled = true; //小数点不能在第一位 + else //处理不规则的小数点 { - if (text.Text.Length <= 0) - e.Handled = true; //小数点不能在第一位 - else //处理不规则的小数点 + float f; + float oldf; + bool b1 = false, b2 = false; + b1 = float.TryParse(text.Text, out oldf); + b2 = float.TryParse(text.Text + e.KeyChar, out f); + if (!b2) { - float f; - float oldf; - bool b1 = false, b2 = false; - b1 = float.TryParse(text.Text, out oldf); - b2 = float.TryParse(text.Text + e.KeyChar, out f); - if (b2 == false) - { - if (b1) - e.Handled = true; - else - e.Handled = false; - } + e.Handled = b1; } } } @@ -457,7 +453,7 @@ { frm = null; - Utility.RemoveFeatureFromName(globeControl1, "trackPolygon"); + FeatureTools.RemoveFeatureFromName(globeControl1, "trackPolygon"); globeControl1.TrackPolygonEndEvent -= globeControl1_TrackPolygonEndEvent; globeControl1.Globe.Action = EnumAction3D.ActionNull; diff --git a/FrmpipeDiametergather.cs b/FrmpipeDiametergather.cs index a9d96fa..c09aaf1 100644 --- a/FrmpipeDiametergather.cs +++ b/FrmpipeDiametergather.cs @@ -154,7 +154,7 @@ MessageBox.Show("请选择图层！"); return; } - Utility.RemoveFeatureFromName(globeControl1, "trackPolygon"); + FeatureTools.RemoveFeatureFromName(globeControl1, "trackPolygon"); globeControl1.Globe.Action = EnumAction3D.TrackPolygon; globeControl1.Globe.TrackPolygonTool.TrackMode = EnumTrackMode.SpaceTrack; globeControl1.TrackPolygonEndEvent += globeControl1_TrackPolygonEndEvent; @@ -392,7 +392,7 @@ private void FrmpipeDiametergather_FormClosing(object sender, FormClosingEventArgs e) { frm = null; - Utility.RemoveFeatureFromName(globeControl1, "trackPolygon"); + FeatureTools.RemoveFeatureFromName(globeControl1, "trackPolygon"); globeControl1.TrackPolygonEndEvent -= globeControl1_TrackPolygonEndEvent; globeControl1.Globe.Action = EnumAction3D.ActionNull; diff --git a/FrmpipeMaterialGather.cs b/FrmpipeMaterialGather.cs index 44e7f24..5ca8144 100644 --- a/FrmpipeMaterialGather.cs +++ b/FrmpipeMaterialGather.cs @@ -58,10 +58,9 @@ for (int i = 0; i < pipeLayerNames.Count; i++) { clbPipeLine.Items.Add(pipeLayerNames[i]); - GSOLayer layer = globeControl1.Globe.Layers.GetLayerByCaption(pipeLayerNames[i]); - if (layer.Dataset == null || !layer.Dataset.IsFeatureDataset || layer.Type != EnumLayerType.FeatureLayer) continue; + GSOLayer layer = globeControl1.Globe.Layers.GetLayerByCaption(pipeLayerNames[i]); + if (layer == null || layer.Dataset == null || !layer.Dataset.IsFeatureDataset || layer.Type != EnumLayerType.FeatureLayer) continue; - string name = layer.Name; GSOFeatureLayer flayer = layer as GSOFeatureLayer; GSOFeatures feats = flayer.GetAllFeatures(); @@ -205,7 +204,7 @@ { chart1.Series.Add(clbPipeLine.CheckedItems[i].ToString()); GSOLayer layer = globeControl1.Globe.Layers.GetLayerByCaption(clbPipeLine.CheckedItems[i].ToString()); - if (layer != null && layer is GSOFeatureLayer) + if (layer is GSOFeatureLayer) { GSOFeatureLayer flayer = layer as GSOFeatureLayer; GSOFeatures features = flayer.GetAllFeatures(); @@ -240,10 +239,9 @@ labeStyleAxisX.Enabled = true; chart1.ChartAreas["ChartArea1"].AxisX.LabelStyle = labeStyleAxisX; - Dictionary dic1 = new Dictionary(); for (int j = 0; j < chart1.Series.Count; j++) { - dic1 = new Dictionary(); + Dictionary dic1 = new Dictionary(); foreach (string key in dic.Keys) { if (key.Contains(chart1.Series[j].Name)) @@ -304,7 +302,7 @@ MessageBox.Show("请选择材质类型！"); return; } - Utility.RemoveFeatureFromName(globeControl1, "trackPolygon"); + FeatureTools.RemoveFeatureFromName(globeControl1, "trackPolygon"); globeControl1.Globe.Action = EnumAction3D.TrackPolygon; globeControl1.Globe.TrackPolygonTool.TrackMode = EnumTrackMode.SpaceTrack; globeControl1.TrackPolygonEndEvent += globeControl1_TrackPolygonEndEvent; @@ -318,7 +316,7 @@ private void FrmpipeMaterialGather_FormClosing(object sender, FormClosingEventArgs e) { frm = null; - Utility.RemoveFeatureFromName(globeControl1, "trackPolygon"); + FeatureTools.RemoveFeatureFromName(globeControl1, "trackPolygon"); globeControl1.TrackPolygonEndEvent -= globeControl1_TrackPolygonEndEvent; globeControl1.Globe.Action = EnumAction3D.ActionNull; diff --git a/Frmpipediameterstatis.cs b/Frmpipediameterstatis.cs index 4fb25a8..631a996 100644 --- a/Frmpipediameterstatis.cs +++ b/Frmpipediameterstatis.cs @@ -202,8 +202,8 @@ } catch (Exception ex) { - LogHelper.WriteLog(typeof(Frmpipediameterstatis), ex.Message); //MessageBox.Show(ex.Message); + LogHelper.Error(ex.Message); LogError.PublishError(ex); } } @@ -372,7 +372,7 @@ MessageBox.Show("请添加分段！"); return; } - Utility.RemoveFeatureFromName(globeControl1, "trackPolygon"); + FeatureTools.RemoveFeatureFromName(globeControl1, "trackPolygon"); globeControl1.Globe.Action = EnumAction3D.TrackPolygon; globeControl1.Globe.TrackPolygonTool.TrackMode = EnumTrackMode.SpaceTrack; globeControl1.TrackPolygonEndEvent += globeControl1_TrackPolygonEndEvent; @@ -422,7 +422,7 @@ globeControl1.Globe.Action = EnumAction3D.ActionNull; globeControl1.TrackPolygonEndEvent -= globeControl1_TrackPolygonEndEvent; - Utility.RemoveFeatureFromName(globeControl1, "trackPolygon"); + FeatureTools.RemoveFeatureFromName(globeControl1, "trackPolygon"); globeControl1.Globe.MemoryLayer.RemoveAllFeature(); } diff --git a/LineBuilder.cs b/LineBuilder.cs index 33a216c..b6a8516 100644 --- a/LineBuilder.cs +++ b/LineBuilder.cs @@ -43,8 +43,8 @@ GSOGeoPolyline3D lineeee = f.Geometry as GSOGeoPolyline3D; if (lineeee == null || lineeee.GetSpaceLength(true, 6378137) == 0) { - LogHelper.WriteLog(typeof(LineBuilder), "出现数据无法入库:"+f.ID); - continue; //TODO LIST:判断是否会出现部署数据无法入库情况,Log2Net + LogHelper.Error("出现数据无法入库:" + f.ID); + continue; } GSOFeature newFeature = newFeatureSet.CreateFeature(); diff --git a/LogHelper.cs b/LogHelper.cs index 9ef5f27..04573cf 100644 --- a/LogHelper.cs +++ b/LogHelper.cs @@ -1,4 +1,5 @@ using System; +using System.Diagnostics; using log4net; using log4net.Config; @@ -7,35 +8,82 @@ { public class LogHelper { - /// - /// 输出日志到Log4Net - /// - /// - /// - #region static void WriteLog(Type t, Exception ex) - public static void WriteLog(Type t, Exception ex) + private static ILog _logdebug = log4net.LogManager.GetLogger("logdebug"); + private static ILog _loginfo = log4net.LogManager.GetLogger("loginfo"); + private static ILog _logwarn = log4net.LogManager.GetLogger("logwarn"); + private static ILog _logerror = log4net.LogManager.GetLogger("logerror"); + private static ILog _logfatal = log4net.LogManager.GetLogger("logfatal"); + + public static void Debug(string msg) { - ILog log = log4net.LogManager.GetLogger(t); - log.Error("Error", ex); + StackFrame sf = new StackFrame(1); + msg = string.Format("{0}.{1}:{2}", sf.GetMethod().ReflectedType.FullName, sf.GetMethod().Name, msg); + _logdebug.Debug(msg); + } + public static void Debug(string msg, Exception e) + { + StackFrame sf = new StackFrame(1); + msg = string.Format("{0}.{1}:{2}", sf.GetMethod().ReflectedType.FullName, sf.GetMethod().Name, msg); + _logdebug.Debug(msg, e); } - #endregion - /// - /// 输出日志到Log4Net - /// - /// - /// - #region static void WriteLog(Type t, string msg) - - public static void WriteLog(Type t, string msg) + public static void Info(string msg) { - ILog log = log4net.LogManager.GetLogger(t); - log.Error(msg); + StackFrame sf = new StackFrame(1); + msg = string.Format("{0}.{1}:{2}", sf.GetMethod().ReflectedType.FullName, sf.GetMethod().Name, msg); + _loginfo.Info(msg); + } + public static void Info(string msg, Exception e) + { + StackFrame sf = new StackFrame(1); + msg = string.Format("{0}.{1}:{2}", sf.GetMethod().ReflectedType.FullName, sf.GetMethod().Name, msg); + _loginfo.Info(msg, e); } - #endregion + + public static void Warn(string msg) + { + StackFrame sf = new StackFrame(1); + msg = string.Format("{0}.{1}:{2}", sf.GetMethod().ReflectedType.FullName, sf.GetMethod().Name, msg); + _logwarn.Warn(msg); + } + public static void Warn(string msg, Exception e) + { + StackFrame sf = new StackFrame(1); + msg = string.Format("{0}.{1}:{2}", sf.GetMethod().ReflectedType.FullName, sf.GetMethod().Name, msg); + _logwarn.Warn(msg, e); + } + + + public static void Error(string msg) + { + StackFrame sf = new StackFrame(1); + msg = string.Format("{0}.{1}:{2}", sf.GetMethod().ReflectedType.FullName, sf.GetMethod().Name, msg); + _logerror.Error(msg); + } + public static void Error(string msg, Exception e) + { + StackFrame sf = new StackFrame(1); + msg = string.Format("{0}.{1}:{2}", sf.GetMethod().ReflectedType.FullName, sf.GetMethod().Name, msg); + _logerror.Error(msg, e); + } + + + public static void Fatal(string msg) + { + StackFrame sf = new StackFrame(1); + msg = string.Format("{0}.{1}:{2}", sf.GetMethod().ReflectedType.FullName, sf.GetMethod().Name, msg); + _logfatal.Fatal(msg); + } + public static void Fatal(string msg, Exception e) + { + StackFrame sf = new StackFrame(1); + msg = string.Format("{0}.{1}:{2}", sf.GetMethod().ReflectedType.FullName, sf.GetMethod().Name, msg); + _logfatal.Fatal(msg, e); + } + } diff --git a/MainFrm.cs b/MainFrm.cs index 43de664..51f362a 100644 --- a/MainFrm.cs +++ b/MainFrm.cs @@ -18,7 +18,6 @@ using GeoScene.Data; using GeoScene.Engine; using GeoScene.Globe; -using Timer = System.Windows.Forms.Timer; using ToolTip = System.Windows.Forms.ToolTip; namespace Cyberpipe @@ -163,6 +162,7 @@ /// private void AddGZ() { + lendendGZ50 = new GSOHudButton(); lendendGZ50.SetImage(Application.StartupPath + "/Resource/管纵/50.png"); lendendGZ50.SetOffset(0, 0); @@ -1294,18 +1294,19 @@ private void MainFrm_Load(object sender, EventArgs e) { + layerTree.Nodes.Add("正在加载，请稍后……");//树状图加载在图层加载之后，故增加提示 initGlobalControl(); - //initGlobalMap(); - //initLayerTree(); initMarkerTree(); initLayout(); loadData(); - double x = Convert.ToDouble(Utility.Query_Roads["定位"].ToString().Split(',')[0]); - double y = Convert.ToDouble(Utility.Query_Roads["定位"].ToString().Split(',')[1]); - double z = Convert.ToDouble(Utility.Query_Roads["定位"].ToString().Split(',')[2]); + + double x = Convert.ToDouble(Utility.Query_Roads["绿岛"].ToString().Split(',')[0]); + double y = Convert.ToDouble(Utility.Query_Roads["绿岛"].ToString().Split(',')[1]); + double z = Convert.ToDouble(Utility.Query_Roads["绿岛"].ToString().Split(',')[2]); jumpToCameraState(x, y, z); + } #endregion @@ -1315,11 +1316,17 @@ if (e.Layer == null || !e.Layer.Caption.Equals(Utility.roadLayerName)) return; foreach (TreeNode layerTreeNode in layerTree.Nodes) { - foreach (TreeNode node in layerTreeNode.Nodes) + for (int i=0;i dt, DataGridView dataGridView) @@ -7330,7 +7337,7 @@ } catch (Exception ex) { - LogHelper.WriteLog(typeof(MainFrm), ex); + LogHelper.Debug("", ex); } } } @@ -7362,7 +7369,7 @@ GSOLayer layer = globeControl1.Globe.Layers.Add(strDataPath); if (layer == null) {//wxl - LogHelper.WriteLog(typeof(MainFrm), "buttonItemHX1_Click操作中，" + strDataPath + "的layer为空"); + LogHelper.Error("buttonItemHX1_Click操作中，" + strDataPath + "的layer为空"); continue; } GSOFeatures redFeatures = layer.GetAllFeatures(); @@ -7457,17 +7464,12 @@ { try { + globeControl1.BeforeSceneRenderEvent -= globeControl1_BeforeSceneRenderEvent; globeControl2.BeforeSceneRenderEvent -= globeControl2_BeforeSceneRenderEvent; - double x = Convert.ToDouble(Utility.Query_Roads["定位"].ToString().Split(',')[0]); - double y = Convert.ToDouble(Utility.Query_Roads["定位"].ToString().Split(',')[1]); - double z = Convert.ToDouble(Utility.Query_Roads["定位"].ToString().Split(',')[2]); - jumpToCameraState(x, y, z); - /* globeControl1.Globe.FlyToPosition(new GSOPoint3d(120.610963, 31.188121, 50), EnumAltitudeMode.Absolute, -4, 50, 800); globeControl1.Globe.FlyToPointSpeed = 10000000; - * */ globeControl1.Globe.Action = EnumAction3D.SelectObject; globeControl1.Refresh(); @@ -7489,6 +7491,37 @@ } } /// + /// 基础工具 + /// + /// + /// + private void ribbonTabItem1_MouseDown(object sender, MouseEventArgs e) + { + try + { + + globeControl1.BeforeSceneRenderEvent -= globeControl1_BeforeSceneRenderEvent; + globeControl2.BeforeSceneRenderEvent -= globeControl2_BeforeSceneRenderEvent; + + globeControl1.Globe.Action = EnumAction3D.ActionNull; + dataGridViewX1.AutoSizeColumnsMode = DataGridViewAutoSizeColumnsMode.AllCells; + //zhanshi = false; + redSH = false; + splitContainer1.Panel2Collapsed = true; + panelOfTable.Visible = false; + legendSC.Visible = false; + legendSG.Visible = false; + ClearGZData(); + GSOLayer redLayer = globeControl1.Globe.Layers.GetLayerByCaption("红线"); + if (redLayer == null) return; + redLayer.Visible = false; + } + catch (Exception ex) + { + //MessageBox.Show("系统运行错误:" + ex.ToString(), "错误", MessageBoxButtons.OK, MessageBoxIcon.Error); + } + } + /// /// 一键审核 /// /// @@ -7497,6 +7530,7 @@ { try { + globeControl1.BeforeSceneRenderEvent -= globeControl1_BeforeSceneRenderEvent; globeControl2.BeforeSceneRenderEvent -= globeControl2_BeforeSceneRenderEvent; @@ -7518,32 +7552,7 @@ //MessageBox.Show("系统运行错误:" + ex.ToString(), "错误", MessageBoxButtons.OK, MessageBoxIcon.Error); } } - - void ResetRibbonTab() - { - try - { - globeControl1.BeforeSceneRenderEvent -= globeControl1_BeforeSceneRenderEvent; - globeControl2.BeforeSceneRenderEvent -= globeControl2_BeforeSceneRenderEvent; - - globeControl1.Globe.Action = EnumAction3D.ActionNull; - dataGridViewX1.AutoSizeColumnsMode = DataGridViewAutoSizeColumnsMode.AllCells; - //zhanshi = false; - redSH = false; - splitContainer1.Panel2Collapsed = true; - panelOfTable.Visible = false; - legendSC.Visible = false; - legendSG.Visible = false; - ClearGZData(); - GSOLayer redLayer = globeControl1.Globe.Layers.GetLayerByCaption("红线"); - if (redLayer == null) return; - redLayer.Visible = false; - } - catch (Exception ex) - { - LogHelper.WriteLog(typeof(MainFrm), ex); - } - } + /// /// 双屏对比 /// @@ -7553,8 +7562,8 @@ { try { - globeControl1.BeforeSceneRenderEvent += new BeforeSceneRenderEventHandler(globeControl1_BeforeSceneRenderEvent); - globeControl2.BeforeSceneRenderEvent += new BeforeSceneRenderEventHandler(globeControl2_BeforeSceneRenderEvent); + globeControl1.BeforeSceneRenderEvent += globeControl1_BeforeSceneRenderEvent; + globeControl2.BeforeSceneRenderEvent += globeControl2_BeforeSceneRenderEvent; globeControl1.Globe.Action = EnumAction3D.ActionNull; panelOfTable.Visible = false; @@ -7570,32 +7579,43 @@ GSOLayer redLayer = globeControl1.Globe.Layers.GetLayerByCaption("红线"); if (redLayer != null) - { redLayer.Visible = false; - } } catch (Exception ex) { - LogHelper.WriteLog(typeof(MainFrm), ex); + //MessageBox.Show("系统运行错误:" + ex.ToString(), "错误", MessageBoxButtons.OK, MessageBoxIcon.Error); } } /// - /// 基础工具 - /// - /// - /// - private void ribbonTabItem1_MouseDown(object sender, MouseEventArgs e) - { - ResetRibbonTab(); - } - /// /// 文档管理 /// /// /// private void ribbonTabItem4_MouseDown(object sender, MouseEventArgs e) { - ResetRibbonTab(); + try + { + + globeControl1.BeforeSceneRenderEvent -= globeControl1_BeforeSceneRenderEvent; + globeControl2.BeforeSceneRenderEvent -= globeControl2_BeforeSceneRenderEvent; + + globeControl1.Globe.Action = EnumAction3D.ActionNull; + panelOfTable.Visible = false; + //zhanshi = false; + redSH = false; + splitContainer1.Panel2Collapsed = true; + dataGridViewX1.AutoSizeColumnsMode = DataGridViewAutoSizeColumnsMode.AllCells; + legendSC.Visible = false; + legendSG.Visible = false; + ClearGZData(); + GSOLayer redLayer = globeControl1.Globe.Layers.GetLayerByCaption("红线"); + if (redLayer != null) + redLayer.Visible = false; + } + catch (Exception ex) + { + //MessageBox.Show("系统运行错误:" + ex.ToString(), "错误", MessageBoxButtons.OK, MessageBoxIcon.Error); + } } /// /// 基础管理 @@ -7604,7 +7624,29 @@ /// private void ribbonTabItem14_MouseDown(object sender, MouseEventArgs e) { - ResetRibbonTab(); + try + { + globeControl1.BeforeSceneRenderEvent -= globeControl1_BeforeSceneRenderEvent; + globeControl2.BeforeSceneRenderEvent -= globeControl2_BeforeSceneRenderEvent; + + globeControl1.Globe.Action = EnumAction3D.ActionNull; + panelOfTable.Visible = false; + //zhanshi = false; + redSH = false; + splitContainer1.Panel2Collapsed = true; + dataGridViewX1.AutoSizeColumnsMode = DataGridViewAutoSizeColumnsMode.AllCells; + legendSC.Visible = false; + legendSG.Visible = false; + ClearGZData(); + + GSOLayer redLayer = globeControl1.Globe.Layers.GetLayerByCaption("红线"); + if (redLayer != null) + redLayer.Visible = false; + } + catch (Exception ex) + { + //MessageBox.Show("系统运行错误:" + ex.ToString(), "错误", MessageBoxButtons.OK, MessageBoxIcon.Error); + } } /// /// 权限管理 @@ -7613,26 +7655,31 @@ /// private void ribbonTabItem2_MouseDown(object sender, MouseEventArgs e) { - ResetRibbonTab(); + try + { + globeControl1.BeforeSceneRenderEvent -= globeControl1_BeforeSceneRenderEvent; + globeControl2.BeforeSceneRenderEvent -= globeControl2_BeforeSceneRenderEvent; + + globeControl1.Globe.Action = EnumAction3D.ActionNull; + panelOfTable.Visible = false; + //zhanshi = false; + redSH = false; + splitContainer1.Panel2Collapsed = true; + dataGridViewX1.AutoSizeColumnsMode = DataGridViewAutoSizeColumnsMode.AllCells; + legendSC.Visible = false; + legendSG.Visible = false; + ClearGZData(); + + GSOLayer redLayer = globeControl1.Globe.Layers.GetLayerByCaption("红线"); + if (redLayer == null) return; + redLayer.Visible = false; + } + catch (Exception ex) + { + //MessageBox.Show("系统运行错误:" + ex.ToString(), "错误", MessageBoxButtons.OK, MessageBoxIcon.Error); + } } - /// - /// 管线定位 - /// - /// - /// - private void ribbonTabItem7_MouseDown(object sender, MouseEventArgs e) - { - ResetRibbonTab(); - } - /// - /// 标识器管理 - /// - /// - /// - private void ribbonTabItem5_MouseDown(object sender, MouseEventArgs e) - { - ResetRibbonTab(); - } + //GSOFeature dpFeatuer = null; /// /// 双屏分析，点击管段分析 @@ -8017,7 +8064,9 @@ private void btn_flag_Click(object sender, EventArgs e) { if (FrmFlagManagers.IS_OPEN) + { return; + } FrmFlagManagers frm = new FrmFlagManagers(globeControl1); frm.Show(this); } diff --git a/MainFrm.designer.cs b/MainFrm.designer.cs index e3dca41..73398c0 100644 --- a/MainFrm.designer.cs +++ b/MainFrm.designer.cs @@ -4,6 +4,7 @@ using DevComponents.DotNetBar; using DevComponents.DotNetBar.Controls; using DevComponents.Editors; +using System.Drawing; namespace Cyberpipe { @@ -89,6 +90,7 @@ this.sideBar1 = new DevComponents.DotNetBar.SideBar(); this.panelEx3 = new DevComponents.DotNetBar.PanelEx(); this.layerSensorTree = new System.Windows.Forms.TreeView(); + this.layerTree = new Cyberpipe.MyTreeView(); this.sideBarPanelItem3 = new DevComponents.DotNetBar.SideBarPanelItem(); this.controlContainerItem3 = new DevComponents.DotNetBar.ControlContainerItem(); this.sideBarPanelItem4 = new DevComponents.DotNetBar.SideBarPanelItem(); @@ -243,42 +245,18 @@ this.保存ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.定位ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.ribbonControl1 = new DevComponents.DotNetBar.RibbonControl(); - this.ribbonPanel6 = new DevComponents.DotNetBar.RibbonPanel(); - this.ribbonBar6 = new DevComponents.DotNetBar.RibbonBar(); - this.buttonItemSPSZ = new DevComponents.DotNetBar.ButtonItem(); - this.buttonItem8 = new DevComponents.DotNetBar.ButtonItem(); - this.buttonItemLocation = new DevComponents.DotNetBar.ButtonItem(); - this.sliderItem2 = new DevComponents.DotNetBar.SliderItem(); - this.buttonItemGBJC = new DevComponents.DotNetBar.ButtonItem(); - this.ribbonPanel5 = new DevComponents.DotNetBar.RibbonPanel(); - this.ribbonBar2 = new DevComponents.DotNetBar.RibbonBar(); - this.buttonItemHX1 = new DevComponents.DotNetBar.ButtonItem(); - this.buttonItemHX2 = new DevComponents.DotNetBar.ButtonItem(); - this.buttonItemDCTP = new DevComponents.DotNetBar.ButtonItem(); - this.sliderItem3 = new DevComponents.DotNetBar.SliderItem(); - this.ribbonPanel1 = new DevComponents.DotNetBar.RibbonPanel(); - this.ribbonBar21 = new DevComponents.DotNetBar.RibbonBar(); - this.buttonItem87 = new DevComponents.DotNetBar.ButtonItem(); - this.buttonItem88 = new DevComponents.DotNetBar.ButtonItem(); - this.buttonItem27 = new DevComponents.DotNetBar.ButtonItem(); - this.buttonItem91 = new DevComponents.DotNetBar.ButtonItem(); - this.buttonItem1 = new DevComponents.DotNetBar.ButtonItem(); - this.btnlegendSet = new DevComponents.DotNetBar.ButtonItem(); - this.buttonItem89 = new DevComponents.DotNetBar.ButtonItem(); - this.btnOutputJPG = new DevComponents.DotNetBar.ButtonItem(); - this.ribbonPanel12 = new DevComponents.DotNetBar.RibbonPanel(); - this.ribbonBar18 = new DevComponents.DotNetBar.RibbonBar(); - this.buttonItem133 = new DevComponents.DotNetBar.ButtonItem(); - this.ribbonBar13 = new DevComponents.DotNetBar.RibbonBar(); - this.buttonItem127 = new DevComponents.DotNetBar.ButtonItem(); - this.buttonItem128 = new DevComponents.DotNetBar.ButtonItem(); - this.sliderItem1 = new DevComponents.DotNetBar.SliderItem(); - this.buttonItem134 = new DevComponents.DotNetBar.ButtonItem(); - this.buttonItem130 = new DevComponents.DotNetBar.ButtonItem(); - this.btn_check_history = new DevComponents.DotNetBar.ButtonItem(); - this.ribbonPanel4 = new DevComponents.DotNetBar.RibbonPanel(); - this.ribbonBar1 = new DevComponents.DotNetBar.RibbonBar(); - this.btn_document_info = new DevComponents.DotNetBar.ButtonItem(); + this.ribbonPanel3 = new DevComponents.DotNetBar.RibbonPanel(); + this.ribbonBar4 = new DevComponents.DotNetBar.RibbonBar(); + this.btn_flag = new DevComponents.DotNetBar.ButtonItem(); + this.slider4ground = new DevComponents.DotNetBar.SliderItem(); + this.ribbonPanel7 = new DevComponents.DotNetBar.RibbonPanel(); + this.gxdw_ribbonbar = new DevComponents.DotNetBar.RibbonBar(); + this.buttonItem9 = new DevComponents.DotNetBar.ButtonItem(); + this.buttonItem10 = new DevComponents.DotNetBar.ButtonItem(); + this.buttonItem11 = new DevComponents.DotNetBar.ButtonItem(); + this.buttonItem12 = new DevComponents.DotNetBar.ButtonItem(); + this.buttonItem13 = new DevComponents.DotNetBar.ButtonItem(); + this.buttonItem14 = new DevComponents.DotNetBar.ButtonItem(); this.ribbonPanel15 = new DevComponents.DotNetBar.RibbonPanel(); this.ribbonBar20 = new DevComponents.DotNetBar.RibbonBar(); this.buttonItemSH = new DevComponents.DotNetBar.ButtonItem(); @@ -334,18 +312,6 @@ this.buttonItemXT4 = new DevComponents.DotNetBar.ButtonItem(); this.buttonItemXT4_1 = new DevComponents.DotNetBar.ButtonItem(); this.buttonItemXT4_2 = new DevComponents.DotNetBar.ButtonItem(); - this.ribbonPanel3 = new DevComponents.DotNetBar.RibbonPanel(); - this.ribbonBar4 = new DevComponents.DotNetBar.RibbonBar(); - this.btn_flag = new DevComponents.DotNetBar.ButtonItem(); - this.slider4ground = new DevComponents.DotNetBar.SliderItem(); - this.ribbonPanel7 = new DevComponents.DotNetBar.RibbonPanel(); - this.gxdw_ribbonbar = new DevComponents.DotNetBar.RibbonBar(); - this.buttonItem9 = new DevComponents.DotNetBar.ButtonItem(); - this.buttonItem10 = new DevComponents.DotNetBar.ButtonItem(); - this.buttonItem11 = new DevComponents.DotNetBar.ButtonItem(); - this.buttonItem12 = new DevComponents.DotNetBar.ButtonItem(); - this.buttonItem13 = new DevComponents.DotNetBar.ButtonItem(); - this.buttonItem14 = new DevComponents.DotNetBar.ButtonItem(); this.ribbonPanel2 = new DevComponents.DotNetBar.RibbonPanel(); this.ribbonBar3 = new DevComponents.DotNetBar.RibbonBar(); this.btn_user_info = new DevComponents.DotNetBar.ButtonItem(); @@ -355,6 +321,43 @@ this.btn_user_role = new DevComponents.DotNetBar.ButtonItem(); this.btn_password_edit = new DevComponents.DotNetBar.ButtonItem(); this.buttonItemPasswordReset = new DevComponents.DotNetBar.ButtonItem(); + this.ribbonPanel6 = new DevComponents.DotNetBar.RibbonPanel(); + this.ribbonBar6 = new DevComponents.DotNetBar.RibbonBar(); + this.buttonItemSPSZ = new DevComponents.DotNetBar.ButtonItem(); + this.buttonItem8 = new DevComponents.DotNetBar.ButtonItem(); + this.buttonItemLocation = new DevComponents.DotNetBar.ButtonItem(); + this.sliderItem2 = new DevComponents.DotNetBar.SliderItem(); + this.buttonItemGBJC = new DevComponents.DotNetBar.ButtonItem(); + this.ribbonPanel5 = new DevComponents.DotNetBar.RibbonPanel(); + this.ribbonBar2 = new DevComponents.DotNetBar.RibbonBar(); + this.buttonItemHX1 = new DevComponents.DotNetBar.ButtonItem(); + this.buttonItemHX2 = new DevComponents.DotNetBar.ButtonItem(); + this.buttonItemDCTP = new DevComponents.DotNetBar.ButtonItem(); + this.sliderItem3 = new DevComponents.DotNetBar.SliderItem(); + this.ribbonPanel1 = new DevComponents.DotNetBar.RibbonPanel(); + this.ribbonBar21 = new DevComponents.DotNetBar.RibbonBar(); + this.buttonItem87 = new DevComponents.DotNetBar.ButtonItem(); + this.buttonItem88 = new DevComponents.DotNetBar.ButtonItem(); + this.buttonItem27 = new DevComponents.DotNetBar.ButtonItem(); + this.buttonItem91 = new DevComponents.DotNetBar.ButtonItem(); + this.buttonItem1 = new DevComponents.DotNetBar.ButtonItem(); + this.btnlegendSet = new DevComponents.DotNetBar.ButtonItem(); + this.buttonItem89 = new DevComponents.DotNetBar.ButtonItem(); + this.btnOutputJPG = new DevComponents.DotNetBar.ButtonItem(); + this.ribbonPanel12 = new DevComponents.DotNetBar.RibbonPanel(); + this.ribbonBar18 = new DevComponents.DotNetBar.RibbonBar(); + this.buttonItem133 = new DevComponents.DotNetBar.ButtonItem(); + this.buttonItem132 = new DevComponents.DotNetBar.ButtonItem(); + this.ribbonBar13 = new DevComponents.DotNetBar.RibbonBar(); + this.buttonItem127 = new DevComponents.DotNetBar.ButtonItem(); + this.buttonItem128 = new DevComponents.DotNetBar.ButtonItem(); + this.sliderItem1 = new DevComponents.DotNetBar.SliderItem(); + this.buttonItem134 = new DevComponents.DotNetBar.ButtonItem(); + this.buttonItem130 = new DevComponents.DotNetBar.ButtonItem(); + this.btn_check_history = new DevComponents.DotNetBar.ButtonItem(); + this.ribbonPanel4 = new DevComponents.DotNetBar.RibbonPanel(); + this.ribbonBar1 = new DevComponents.DotNetBar.RibbonBar(); + this.btn_document_info = new DevComponents.DotNetBar.ButtonItem(); this.ribbonTabItem1 = new DevComponents.DotNetBar.RibbonTabItem(); this.ribbonTabItem11 = new DevComponents.DotNetBar.RibbonTabItem(); this.ribbonTabItem6 = new DevComponents.DotNetBar.RibbonTabItem(); @@ -516,7 +519,6 @@ this.labelX17 = new DevComponents.DotNetBar.LabelX(); this.panelEx4 = new DevComponents.DotNetBar.PanelEx(); this.pictureBox1 = new System.Windows.Forms.PictureBox(); - this.layerTree = new Cyberpipe.MyTreeView(); this.statusStrip1.SuspendLayout(); this.sideBar1.SuspendLayout(); this.panelEx3.SuspendLayout(); @@ -527,15 +529,15 @@ this.contextMenuStrip3.SuspendLayout(); this.contextMenuStripDeleteLayerNode.SuspendLayout(); this.ribbonControl1.SuspendLayout(); + this.ribbonPanel3.SuspendLayout(); + this.ribbonPanel7.SuspendLayout(); + this.ribbonPanel15.SuspendLayout(); + this.ribbonPanel2.SuspendLayout(); this.ribbonPanel6.SuspendLayout(); this.ribbonPanel5.SuspendLayout(); this.ribbonPanel1.SuspendLayout(); this.ribbonPanel12.SuspendLayout(); this.ribbonPanel4.SuspendLayout(); - this.ribbonPanel15.SuspendLayout(); - this.ribbonPanel3.SuspendLayout(); - this.ribbonPanel7.SuspendLayout(); - this.ribbonPanel2.SuspendLayout(); this.panelOfTable.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.dataGridViewX1)).BeginInit(); this.statusStrip2.SuspendLayout(); @@ -711,7 +713,8 @@ this.statusLabel.Name = "statusLabel"; this.statusLabel.Size = new System.Drawing.Size(1313, 17); this.statusLabel.Spring = true; - this.statusLabel.Text = " ©2014-2015 苏州航天系统工程有限公司 版权所有"; + this.statusLabel.Text = Utility.Copyright; +// this.statusLabel.Text = " ©2014-2015 苏州航天系统工程有限公司 版权所有"; // // toolStripDropDownButton1 // @@ -956,6 +959,18 @@ this.layerSensorTree.NodeMouseClick += new System.Windows.Forms.TreeNodeMouseClickEventHandler(this.layerMarkerTree_NodeMouseClick); this.layerSensorTree.NodeMouseDoubleClick += new System.Windows.Forms.TreeNodeMouseClickEventHandler(this.layerTree_NodeMouseDoubleClick); // + // layerTree + // + this.layerTree.CheckBoxes = true; + this.layerTree.ItemHeight = 18; + this.layerTree.Location = new System.Drawing.Point(30, 78); + this.layerTree.Name = "layerTree"; + this.layerTree.Size = new System.Drawing.Size(121, 97); + this.layerTree.TabIndex = 1; + this.layerTree.AfterCheck += new System.Windows.Forms.TreeViewEventHandler(this.layerTree_AfterCheck); + this.layerTree.NodeMouseClick += new System.Windows.Forms.TreeNodeMouseClickEventHandler(this.layerTree_NodeMouseClick); + this.layerTree.NodeMouseDoubleClick += new System.Windows.Forms.TreeNodeMouseClickEventHandler(this.layerTree_NodeMouseDoubleClick); + // // sideBarPanelItem3 // this.sideBarPanelItem3.FontBold = true; @@ -2150,13 +2165,13 @@ this.ribbonControl1.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.ribbonControl1.Controls.Add(this.ribbonPanel3); this.ribbonControl1.Controls.Add(this.ribbonPanel7); - this.ribbonControl1.Controls.Add(this.ribbonPanel2); this.ribbonControl1.Controls.Add(this.ribbonPanel15); - this.ribbonControl1.Controls.Add(this.ribbonPanel4); - this.ribbonControl1.Controls.Add(this.ribbonPanel1); + this.ribbonControl1.Controls.Add(this.ribbonPanel2); this.ribbonControl1.Controls.Add(this.ribbonPanel6); - this.ribbonControl1.Controls.Add(this.ribbonPanel12); this.ribbonControl1.Controls.Add(this.ribbonPanel5); + this.ribbonControl1.Controls.Add(this.ribbonPanel1); + this.ribbonControl1.Controls.Add(this.ribbonPanel12); + this.ribbonControl1.Controls.Add(this.ribbonPanel4); this.ribbonControl1.Dock = System.Windows.Forms.DockStyle.Top; this.ribbonControl1.ImeMode = System.Windows.Forms.ImeMode.NoControl; this.ribbonControl1.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { @@ -2200,609 +2215,216 @@ this.ribbonControl1.Text = "ribbonControl1"; this.ribbonControl1.UseCustomizeDialog = false; // - // ribbonPanel6 + // ribbonPanel3 // - this.ribbonPanel6.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.ribbonPanel6.Controls.Add(this.ribbonBar6); - this.ribbonPanel6.Dock = System.Windows.Forms.DockStyle.Fill; - this.ribbonPanel6.Location = new System.Drawing.Point(0, 0); - this.ribbonPanel6.Name = "ribbonPanel6"; - this.ribbonPanel6.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); - this.ribbonPanel6.Size = new System.Drawing.Size(1328, 95); + this.ribbonPanel3.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.ribbonPanel3.Controls.Add(this.ribbonBar4); + this.ribbonPanel3.Dock = System.Windows.Forms.DockStyle.Fill; + this.ribbonPanel3.Location = new System.Drawing.Point(0, 33); + this.ribbonPanel3.Name = "ribbonPanel3"; + this.ribbonPanel3.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); + this.ribbonPanel3.Size = new System.Drawing.Size(1328, 62); // // // - this.ribbonPanel6.Style.Class = ""; - this.ribbonPanel6.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonPanel3.Style.Class = ""; + this.ribbonPanel3.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; // // // - this.ribbonPanel6.StyleMouseDown.Class = ""; - this.ribbonPanel6.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonPanel3.StyleMouseDown.Class = ""; + this.ribbonPanel3.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; // // // - this.ribbonPanel6.StyleMouseOver.Class = ""; - this.ribbonPanel6.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonPanel6.TabIndex = 38; - this.ribbonPanel6.Visible = false; + this.ribbonPanel3.StyleMouseOver.Class = ""; + this.ribbonPanel3.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonPanel3.TabIndex = 40; // - // ribbonBar6 + // ribbonBar4 // - this.ribbonBar6.AutoOverflowEnabled = true; + this.ribbonBar4.AutoOverflowEnabled = true; // // // - this.ribbonBar6.BackgroundMouseOverStyle.Class = ""; - this.ribbonBar6.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar4.BackgroundMouseOverStyle.Class = ""; + this.ribbonBar4.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; // // // - this.ribbonBar6.BackgroundStyle.Class = ""; - this.ribbonBar6.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonBar6.ContainerControlProcessDialogKey = true; - this.ribbonBar6.Dock = System.Windows.Forms.DockStyle.Left; - this.ribbonBar6.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { - this.buttonItemSPSZ, - this.buttonItem8, - this.buttonItemLocation, - this.sliderItem2, - this.buttonItemGBJC}); - this.ribbonBar6.Location = new System.Drawing.Point(3, 0); - this.ribbonBar6.Name = "ribbonBar6"; - this.ribbonBar6.Size = new System.Drawing.Size(427, 92); - this.ribbonBar6.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.ribbonBar6.TabIndex = 0; + this.ribbonBar4.BackgroundStyle.Class = ""; + this.ribbonBar4.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar4.ContainerControlProcessDialogKey = true; + this.ribbonBar4.Dock = System.Windows.Forms.DockStyle.Left; + this.ribbonBar4.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { + this.btn_flag, + this.slider4ground}); + this.ribbonBar4.Location = new System.Drawing.Point(3, 0); + this.ribbonBar4.Name = "ribbonBar4"; + this.ribbonBar4.Size = new System.Drawing.Size(634, 59); + this.ribbonBar4.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.ribbonBar4.TabIndex = 0; // // // - this.ribbonBar6.TitleStyle.Class = ""; - this.ribbonBar6.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar4.TitleStyle.Class = ""; + this.ribbonBar4.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; // // // - this.ribbonBar6.TitleStyleMouseOver.Class = ""; - this.ribbonBar6.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonBar6.TitleVisible = false; + this.ribbonBar4.TitleStyleMouseOver.Class = ""; + this.ribbonBar4.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar4.TitleVisible = false; // - // buttonItemSPSZ + // btn_flag // - this.buttonItemSPSZ.Image = ((System.Drawing.Image)(resources.GetObject("buttonItemSPSZ.Image"))); - this.buttonItemSPSZ.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItemSPSZ.Name = "buttonItemSPSZ"; - this.buttonItemSPSZ.SubItemsExpandWidth = 14; - this.buttonItemSPSZ.Text = "双屏设置"; - this.buttonItemSPSZ.Click += new System.EventHandler(this.buttonItemSPSZ_Click); + this.btn_flag.Image = global::Cyberpipe.Properties.Resources._24x24icon_03_hover; + this.btn_flag.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.btn_flag.Name = "btn_flag"; + this.btn_flag.SubItemsExpandWidth = 14; + this.btn_flag.Text = "标识器管理"; + this.btn_flag.Click += new System.EventHandler(this.btn_flag_Click); // - // buttonItem8 + // slider4ground // - this.buttonItem8.Image = ((System.Drawing.Image)(resources.GetObject("buttonItem8.Image"))); - this.buttonItem8.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem8.Name = "buttonItem8"; - this.buttonItem8.SubItemsExpandWidth = 14; - this.buttonItem8.Text = "双屏分析"; - this.buttonItem8.Click += new System.EventHandler(this.buttonItem8_Click); + this.slider4ground.LabelPosition = DevComponents.DotNetBar.eSliderLabelPosition.Top; + this.slider4ground.LabelWidth = 50; + this.slider4ground.Name = "slider4ground"; + this.slider4ground.Text = "地面透明度"; + this.slider4ground.TextColor = System.Drawing.Color.Black; + this.slider4ground.Value = 0; + this.slider4ground.ValueChanged += new System.EventHandler(this.slider4ground_ValueChanged); // - // buttonItemLocation + // ribbonPanel7 // - this.buttonItemLocation.Image = ((System.Drawing.Image)(resources.GetObject("buttonItemLocation.Image"))); - this.buttonItemLocation.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItemLocation.Name = "buttonItemLocation"; - this.buttonItemLocation.SubItemsExpandWidth = 14; - this.buttonItemLocation.Text = "快速定位"; - this.buttonItemLocation.Click += new System.EventHandler(this.buttonItemLocation_Click); + this.ribbonPanel7.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.ribbonPanel7.Controls.Add(this.gxdw_ribbonbar); + this.ribbonPanel7.Dock = System.Windows.Forms.DockStyle.Fill; + this.ribbonPanel7.Location = new System.Drawing.Point(0, 33); + this.ribbonPanel7.Name = "ribbonPanel7"; + this.ribbonPanel7.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); + this.ribbonPanel7.Size = new System.Drawing.Size(1328, 62); // - // sliderItem2 // - this.sliderItem2.LabelPosition = DevComponents.DotNetBar.eSliderLabelPosition.Top; - this.sliderItem2.LabelWidth = 50; - this.sliderItem2.Name = "sliderItem2"; - this.sliderItem2.Text = "地面透明度"; - this.sliderItem2.TextColor = System.Drawing.Color.Black; - this.sliderItem2.Value = 0; - this.sliderItem2.ValueChanged += new System.EventHandler(this.sliderItem2_ValueChanged); // - // buttonItemGBJC + this.ribbonPanel7.Style.Class = ""; + this.ribbonPanel7.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; // - this.buttonItemGBJC.Image = ((System.Drawing.Image)(resources.GetObject("buttonItemGBJC.Image"))); - this.buttonItemGBJC.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItemGBJC.Name = "buttonItemGBJC"; - this.buttonItemGBJC.SubItemsExpandWidth = 14; - this.buttonItemGBJC.Text = "国标检测"; - this.buttonItemGBJC.Click += new System.EventHandler(this.buttonItemGBJC_Click); // - // ribbonPanel5 // - this.ribbonPanel5.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.ribbonPanel5.Controls.Add(this.ribbonBar2); - this.ribbonPanel5.Dock = System.Windows.Forms.DockStyle.Fill; - this.ribbonPanel5.Location = new System.Drawing.Point(0, 0); - this.ribbonPanel5.Name = "ribbonPanel5"; - this.ribbonPanel5.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); - this.ribbonPanel5.Size = new System.Drawing.Size(1328, 95); + this.ribbonPanel7.StyleMouseDown.Class = ""; + this.ribbonPanel7.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; // // // - this.ribbonPanel5.Style.Class = ""; - this.ribbonPanel5.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonPanel7.StyleMouseOver.Class = ""; + this.ribbonPanel7.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonPanel7.TabIndex = 41; + this.ribbonPanel7.Visible = false; // + // gxdw_ribbonbar // + this.gxdw_ribbonbar.AutoOverflowEnabled = true; // - this.ribbonPanel5.StyleMouseDown.Class = ""; - this.ribbonPanel5.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; // // + this.gxdw_ribbonbar.BackgroundMouseOverStyle.Class = ""; + this.gxdw_ribbonbar.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; // - this.ribbonPanel5.StyleMouseOver.Class = ""; - this.ribbonPanel5.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonPanel5.TabIndex = 37; - this.ribbonPanel5.Visible = false; // - // ribbonBar2 // - this.ribbonBar2.AutoOverflowEnabled = true; + this.gxdw_ribbonbar.BackgroundStyle.Class = ""; + this.gxdw_ribbonbar.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.gxdw_ribbonbar.ContainerControlProcessDialogKey = true; + this.gxdw_ribbonbar.Dock = System.Windows.Forms.DockStyle.Left; + this.gxdw_ribbonbar.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { + this.buttonItem9, + this.buttonItem10, + this.buttonItem11, + this.buttonItem12, + this.buttonItem13, + this.buttonItem14}); + this.gxdw_ribbonbar.Location = new System.Drawing.Point(3, 0); + this.gxdw_ribbonbar.Name = "gxdw_ribbonbar"; + this.gxdw_ribbonbar.Size = new System.Drawing.Size(564, 59); + this.gxdw_ribbonbar.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.gxdw_ribbonbar.TabIndex = 0; + this.gxdw_ribbonbar.Text = "ribbonBar5"; // // // - this.ribbonBar2.BackgroundMouseOverStyle.Class = ""; - this.ribbonBar2.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.gxdw_ribbonbar.TitleStyle.Class = ""; + this.gxdw_ribbonbar.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; // // // - this.ribbonBar2.BackgroundStyle.Class = ""; - this.ribbonBar2.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonBar2.ContainerControlProcessDialogKey = true; - this.ribbonBar2.Dock = System.Windows.Forms.DockStyle.Left; - this.ribbonBar2.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { - this.buttonItemHX1, - this.buttonItemHX2, - this.buttonItemDCTP, - this.sliderItem3}); - this.ribbonBar2.Location = new System.Drawing.Point(3, 0); - this.ribbonBar2.Name = "ribbonBar2"; - this.ribbonBar2.Size = new System.Drawing.Size(350, 92); - this.ribbonBar2.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.ribbonBar2.TabIndex = 0; + this.gxdw_ribbonbar.TitleStyleMouseOver.Class = ""; + this.gxdw_ribbonbar.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.gxdw_ribbonbar.TitleVisible = false; // + // buttonItem9 // + this.buttonItem9.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__76; + this.buttonItem9.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem9.Name = "buttonItem9"; + this.buttonItem9.SubItemsExpandWidth = 14; + this.buttonItem9.Text = "工单管理"; + this.buttonItem9.Click += new System.EventHandler(this.buttonItem9_Click); // - this.ribbonBar2.TitleStyle.Class = ""; - this.ribbonBar2.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // buttonItem10 // + this.buttonItem10.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__69; + this.buttonItem10.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem10.Name = "buttonItem10"; + this.buttonItem10.SubItemsExpandWidth = 14; + this.buttonItem10.Text = "在线任务"; + this.buttonItem10.Click += new System.EventHandler(this.buttonItem10_Click); // + // buttonItem11 // - this.ribbonBar2.TitleStyleMouseOver.Class = ""; - this.ribbonBar2.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonBar2.TitleVisible = false; + this.buttonItem11.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__72; + this.buttonItem11.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem11.Name = "buttonItem11"; + this.buttonItem11.SubItemsExpandWidth = 14; + this.buttonItem11.Text = "事件管理"; + this.buttonItem11.Click += new System.EventHandler(this.buttonItem11_Click); // - // buttonItemHX1 + // buttonItem12 // - this.buttonItemHX1.AutoExpandOnClick = true; - this.buttonItemHX1.Image = ((System.Drawing.Image)(resources.GetObject("buttonItemHX1.Image"))); - this.buttonItemHX1.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItemHX1.Name = "buttonItemHX1"; - this.buttonItemHX1.SubItemsExpandWidth = 14; - this.buttonItemHX1.Text = "导入红线"; - this.buttonItemHX1.Click += new System.EventHandler(this.buttonItemHX1_Click); + this.buttonItem12.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__34; + this.buttonItem12.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem12.Name = "buttonItem12"; + this.buttonItem12.SubItemsExpandWidth = 14; + this.buttonItem12.Text = "探测仪管理"; + this.buttonItem12.Click += new System.EventHandler(this.buttonItem12_Click); // - // buttonItemHX2 + // buttonItem13 // - this.buttonItemHX2.Image = ((System.Drawing.Image)(resources.GetObject("buttonItemHX2.Image"))); - this.buttonItemHX2.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItemHX2.Name = "buttonItemHX2"; - this.buttonItemHX2.SubItemsExpandWidth = 14; - this.buttonItemHX2.Text = "红线审核"; - this.buttonItemHX2.Click += new System.EventHandler(this.buttonItemHX2_Click); + this.buttonItem13.Image = global::Cyberpipe.Properties.Resources._24x24icon_13_hover; + this.buttonItem13.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem13.Name = "buttonItem13"; + this.buttonItem13.SubItemsExpandWidth = 14; + this.buttonItem13.Text = "巡检人员维护"; + this.buttonItem13.Click += new System.EventHandler(this.buttonItem13_Click); // - // buttonItemDCTP + // buttonItem14 // - this.buttonItemDCTP.Image = ((System.Drawing.Image)(resources.GetObject("buttonItemDCTP.Image"))); - this.buttonItemDCTP.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItemDCTP.Name = "buttonItemDCTP"; - this.buttonItemDCTP.SubItemsExpandWidth = 14; - this.buttonItemDCTP.Text = "导出图片"; - this.buttonItemDCTP.Click += new System.EventHandler(this.buttonItemDCTP_Click); - // - // sliderItem3 - // - this.sliderItem3.LabelPosition = DevComponents.DotNetBar.eSliderLabelPosition.Top; - this.sliderItem3.LabelWidth = 50; - this.sliderItem3.Name = "sliderItem3"; - this.sliderItem3.Text = "地面透明度"; - this.sliderItem3.TextColor = System.Drawing.Color.Black; - this.sliderItem3.Value = 0; - this.sliderItem3.ValueChanged += new System.EventHandler(this.sliderItem3_ValueChanged); - // - // ribbonPanel1 - // - this.ribbonPanel1.AutoSize = true; - this.ribbonPanel1.CanvasColor = System.Drawing.Color.Gray; - this.ribbonPanel1.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.ribbonPanel1.Controls.Add(this.ribbonBar21); - this.ribbonPanel1.Dock = System.Windows.Forms.DockStyle.Fill; - this.ribbonPanel1.Location = new System.Drawing.Point(0, 0); - this.ribbonPanel1.Name = "ribbonPanel1"; - this.ribbonPanel1.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); - this.ribbonPanel1.Size = new System.Drawing.Size(1328, 95); - // - // - // - this.ribbonPanel1.Style.Class = ""; - this.ribbonPanel1.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonPanel1.StyleMouseDown.Class = ""; - this.ribbonPanel1.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonPanel1.StyleMouseOver.Class = ""; - this.ribbonPanel1.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonPanel1.TabIndex = 1; - this.ribbonPanel1.Visible = false; - // - // ribbonBar21 - // - this.ribbonBar21.AutoOverflowEnabled = true; - this.ribbonBar21.BackColor = System.Drawing.Color.White; - // - // - // - this.ribbonBar21.BackgroundMouseOverStyle.Class = ""; - this.ribbonBar21.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonBar21.BackgroundStyle.Class = ""; - this.ribbonBar21.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonBar21.ContainerControlProcessDialogKey = true; - this.ribbonBar21.Dock = System.Windows.Forms.DockStyle.Left; - this.ribbonBar21.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { - this.buttonItem87, - this.buttonItem88, - this.buttonItem27, - this.sliderGroundTransSet1, - this.buttonItem91, - this.buttonItem1, - this.btnlegendSet, - this.buttonItem89, - this.btnOutputJPG}); - this.ribbonBar21.Location = new System.Drawing.Point(3, 0); - this.ribbonBar21.Name = "ribbonBar21"; - this.ribbonBar21.Size = new System.Drawing.Size(649, 92); - this.ribbonBar21.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.ribbonBar21.TabIndex = 2; - this.ribbonBar21.Text = "浏览模式"; - // - // - // - this.ribbonBar21.TitleStyle.Class = ""; - this.ribbonBar21.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonBar21.TitleStyleMouseOver.Class = ""; - this.ribbonBar21.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonBar21.TitleVisible = false; - // - // buttonItem87 - // - this.buttonItem87.Image = ((System.Drawing.Image)(resources.GetObject("buttonItem87.Image"))); - this.buttonItem87.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem87.Name = "buttonItem87"; - this.buttonItem87.SubItemsExpandWidth = 14; - this.buttonItem87.Text = "地上模式"; - this.buttonItem87.Click += new System.EventHandler(this.buttonItem87_Click); - // - // buttonItem88 - // - this.buttonItem88.Image = ((System.Drawing.Image)(resources.GetObject("buttonItem88.Image"))); - this.buttonItem88.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem88.Name = "buttonItem88"; - this.buttonItem88.SubItemsExpandWidth = 14; - this.buttonItem88.Text = "地下模式"; - this.buttonItem88.Click += new System.EventHandler(this.buttonItem88_Click); - // - // buttonItem27 - // - this.buttonItem27.Image = ((System.Drawing.Image)(resources.GetObject("buttonItem27.Image"))); - this.buttonItem27.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem27.Name = "buttonItem27"; - this.buttonItem27.SubItemsExpandWidth = 14; - this.buttonItem27.Text = "行走模式"; - this.buttonItem27.Click += new System.EventHandler(this.buttonItem27_Click); - // - // buttonItem91 - // - this.buttonItem91.ForeColor = System.Drawing.Color.Black; - this.buttonItem91.Image = ((System.Drawing.Image)(resources.GetObject("buttonItem91.Image"))); - this.buttonItem91.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem91.Name = "buttonItem91"; - this.buttonItem91.SubItemsExpandWidth = 14; - this.buttonItem91.Text = "快速定位"; - this.buttonItem91.Click += new System.EventHandler(this.buttonItem91_Click); - // - // buttonItem1 - // - this.buttonItem1.Image = ((System.Drawing.Image)(resources.GetObject("buttonItem1.Image"))); - this.buttonItem1.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem1.Name = "buttonItem1"; - this.buttonItem1.SubItemsExpandWidth = 14; - this.buttonItem1.Text = "图层管理"; - this.buttonItem1.Click += new System.EventHandler(this.buttonItem1_Click); - // - // btnlegendSet - // - this.btnlegendSet.Image = ((System.Drawing.Image)(resources.GetObject("btnlegendSet.Image"))); - this.btnlegendSet.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.btnlegendSet.Name = "btnlegendSet"; - this.btnlegendSet.SubItemsExpandWidth = 14; - this.btnlegendSet.Text = "图例"; - this.btnlegendSet.Click += new System.EventHandler(this.btnlegendSet_Click); - // - // buttonItem89 - // - this.buttonItem89.Image = ((System.Drawing.Image)(resources.GetObject("buttonItem89.Image"))); - this.buttonItem89.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem89.Name = "buttonItem89"; - this.buttonItem89.SubItemsExpandWidth = 14; - this.buttonItem89.Text = "全屏显示"; - this.buttonItem89.Click += new System.EventHandler(this.buttonItem89_Click); - // - // btnOutputJPG - // - this.btnOutputJPG.Image = ((System.Drawing.Image)(resources.GetObject("btnOutputJPG.Image"))); - this.btnOutputJPG.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.btnOutputJPG.Name = "btnOutputJPG"; - this.btnOutputJPG.SubItemsExpandWidth = 14; - this.btnOutputJPG.Text = "导出图片"; - this.btnOutputJPG.Click += new System.EventHandler(this.btnOutputJPG_Click); - // - // ribbonPanel12 - // - this.ribbonPanel12.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.ribbonPanel12.Controls.Add(this.ribbonBar18); - this.ribbonPanel12.Controls.Add(this.ribbonBar13); - this.ribbonPanel12.Dock = System.Windows.Forms.DockStyle.Fill; - this.ribbonPanel12.Location = new System.Drawing.Point(0, 0); - this.ribbonPanel12.Name = "ribbonPanel12"; - this.ribbonPanel12.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); - this.ribbonPanel12.Size = new System.Drawing.Size(1328, 95); - // - // - // - this.ribbonPanel12.Style.Class = ""; - this.ribbonPanel12.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonPanel12.StyleMouseDown.Class = ""; - this.ribbonPanel12.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonPanel12.StyleMouseOver.Class = ""; - this.ribbonPanel12.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonPanel12.TabIndex = 34; - this.ribbonPanel12.Visible = false; - // - // ribbonBar18 - // - this.ribbonBar18.AutoOverflowEnabled = true; - // - // - // - this.ribbonBar18.BackgroundMouseOverStyle.Class = ""; - this.ribbonBar18.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonBar18.BackgroundStyle.Class = ""; - this.ribbonBar18.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonBar18.ContainerControlProcessDialogKey = true; - this.ribbonBar18.Dock = System.Windows.Forms.DockStyle.Left; - this.ribbonBar18.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { - this.buttonItem133}); - this.ribbonBar18.Location = new System.Drawing.Point(531, 0); - this.ribbonBar18.Name = "ribbonBar18"; - this.ribbonBar18.Size = new System.Drawing.Size(129, 92); - this.ribbonBar18.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.ribbonBar18.TabIndex = 1; - // - // - // - this.ribbonBar18.TitleStyle.Class = ""; - this.ribbonBar18.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonBar18.TitleStyleMouseOver.Class = ""; - this.ribbonBar18.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonBar18.TitleVisible = false; - // - // buttonItem133 - // - this.buttonItem133.Image = ((System.Drawing.Image)(resources.GetObject("buttonItem133.Image"))); - this.buttonItem133.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem133.Name = "buttonItem133"; - this.buttonItem133.SubItemsExpandWidth = 14; - this.buttonItem133.Text = "审核入库"; - this.buttonItem133.Click += new System.EventHandler(this.buttonItem133_Click_1); - // - // ribbonBar13 - // - this.ribbonBar13.AutoOverflowEnabled = true; - // - // - // - this.ribbonBar13.BackgroundMouseOverStyle.Class = ""; - this.ribbonBar13.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonBar13.BackgroundStyle.Class = ""; - this.ribbonBar13.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonBar13.ContainerControlProcessDialogKey = true; - this.ribbonBar13.Dock = System.Windows.Forms.DockStyle.Left; - this.ribbonBar13.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { - this.buttonItem127, - this.buttonItem128, - this.sliderItem1, - this.buttonItem134, - this.buttonItem130, - this.btn_check_history}); - this.ribbonBar13.Location = new System.Drawing.Point(3, 0); - this.ribbonBar13.Name = "ribbonBar13"; - this.ribbonBar13.Size = new System.Drawing.Size(528, 92); - this.ribbonBar13.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.ribbonBar13.TabIndex = 0; - // - // - // - this.ribbonBar13.TitleStyle.Class = ""; - this.ribbonBar13.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonBar13.TitleStyleMouseOver.Class = ""; - this.ribbonBar13.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonBar13.TitleVisible = false; - // - // buttonItem127 - // - this.buttonItem127.Image = ((System.Drawing.Image)(resources.GetObject("buttonItem127.Image"))); - this.buttonItem127.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem127.Name = "buttonItem127"; - this.buttonItem127.SubItemsExpandWidth = 14; - this.buttonItem127.Text = "打开数据"; - this.buttonItem127.Click += new System.EventHandler(this.buttonItem127_Click_2); - // - // buttonItem128 - // - this.buttonItem128.Image = ((System.Drawing.Image)(resources.GetObject("buttonItem128.Image"))); - this.buttonItem128.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem128.Name = "buttonItem128"; - this.buttonItem128.SubItemsExpandWidth = 14; - this.buttonItem128.Text = "一键审核"; - this.buttonItem128.Click += new System.EventHandler(this.buttonItem128_Click); - // - // sliderItem1 - // - this.sliderItem1.LabelPosition = DevComponents.DotNetBar.eSliderLabelPosition.Top; - this.sliderItem1.LabelWidth = 50; - this.sliderItem1.Name = "sliderItem1"; - this.sliderItem1.Text = "地面透明度"; - this.sliderItem1.TextColor = System.Drawing.Color.Black; - this.sliderItem1.Value = 0; - this.sliderItem1.ValueChanged += new System.EventHandler(this.sliderItem1_ValueChanged); - // - // buttonItem134 - // - this.buttonItem134.Image = ((System.Drawing.Image)(resources.GetObject("buttonItem134.Image"))); - this.buttonItem134.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem134.Name = "buttonItem134"; - this.buttonItem134.SubItemsExpandWidth = 14; - this.buttonItem134.Text = "模拟设计修改"; - this.buttonItem134.Click += new System.EventHandler(this.buttonItem134_Click_1); - // - // buttonItem130 - // - this.buttonItem130.Image = ((System.Drawing.Image)(resources.GetObject("buttonItem130.Image"))); - this.buttonItem130.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem130.Name = "buttonItem130"; - this.buttonItem130.SubItemsExpandWidth = 14; - this.buttonItem130.Text = "导出审核图"; - this.buttonItem130.Click += new System.EventHandler(this.buttonItem130_Click_1); - // - // btn_check_history - // - this.btn_check_history.Image = ((System.Drawing.Image)(resources.GetObject("btn_check_history.Image"))); - this.btn_check_history.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.btn_check_history.Name = "btn_check_history"; - this.btn_check_history.SubItemsExpandWidth = 14; - this.btn_check_history.Text = "审核历史"; - this.btn_check_history.Click += new System.EventHandler(this.btn_check_history_Click); - // - // ribbonPanel4 - // - this.ribbonPanel4.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.ribbonPanel4.Controls.Add(this.ribbonBar1); - this.ribbonPanel4.Dock = System.Windows.Forms.DockStyle.Fill; - this.ribbonPanel4.Location = new System.Drawing.Point(0, 0); - this.ribbonPanel4.Name = "ribbonPanel4"; - this.ribbonPanel4.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); - this.ribbonPanel4.Size = new System.Drawing.Size(1328, 95); - // - // - // - this.ribbonPanel4.Style.Class = ""; - this.ribbonPanel4.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonPanel4.StyleMouseDown.Class = ""; - this.ribbonPanel4.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonPanel4.StyleMouseOver.Class = ""; - this.ribbonPanel4.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonPanel4.TabIndex = 36; - this.ribbonPanel4.Visible = false; - // - // ribbonBar1 - // - this.ribbonBar1.AutoOverflowEnabled = true; - // - // - // - this.ribbonBar1.BackgroundMouseOverStyle.Class = ""; - this.ribbonBar1.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonBar1.BackgroundStyle.Class = ""; - this.ribbonBar1.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonBar1.ContainerControlProcessDialogKey = true; - this.ribbonBar1.Dock = System.Windows.Forms.DockStyle.Left; - this.ribbonBar1.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { - this.btn_document_info}); - this.ribbonBar1.Location = new System.Drawing.Point(3, 0); - this.ribbonBar1.Name = "ribbonBar1"; - this.ribbonBar1.Size = new System.Drawing.Size(88, 92); - this.ribbonBar1.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.ribbonBar1.TabIndex = 0; - // - // - // - this.ribbonBar1.TitleStyle.Class = ""; - this.ribbonBar1.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonBar1.TitleStyleMouseOver.Class = ""; - this.ribbonBar1.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonBar1.TitleVisible = false; - // - // btn_document_info - // - this.btn_document_info.Image = ((System.Drawing.Image)(resources.GetObject("btn_document_info.Image"))); - this.btn_document_info.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.btn_document_info.Name = "btn_document_info"; - this.btn_document_info.SubItemsExpandWidth = 14; - this.btn_document_info.Text = "文档管理"; - this.btn_document_info.Click += new System.EventHandler(this.btn_document_info_Click); + this.buttonItem14.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__56; + this.buttonItem14.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem14.Name = "buttonItem14"; + this.buttonItem14.SubItemsExpandWidth = 14; + this.buttonItem14.Text = "导出施工图"; + this.buttonItem14.Click += new System.EventHandler(this.buttonItem14_Click); // // ribbonPanel15 // this.ribbonPanel15.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; this.ribbonPanel15.Controls.Add(this.ribbonBar20); this.ribbonPanel15.Dock = System.Windows.Forms.DockStyle.Fill; - this.ribbonPanel15.Location = new System.Drawing.Point(0, 0); + this.ribbonPanel15.Location = new System.Drawing.Point(0, 33); this.ribbonPanel15.Name = "ribbonPanel15"; this.ribbonPanel15.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); - this.ribbonPanel15.Size = new System.Drawing.Size(1328, 95); + this.ribbonPanel15.Size = new System.Drawing.Size(1328, 62); // // // @@ -2843,7 +2465,7 @@ this.buttonItemXTGL}); this.ribbonBar20.Location = new System.Drawing.Point(3, 0); this.ribbonBar20.Name = "ribbonBar20"; - this.ribbonBar20.Size = new System.Drawing.Size(283, 92); + this.ribbonBar20.Size = new System.Drawing.Size(283, 59); this.ribbonBar20.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; this.ribbonBar20.TabIndex = 0; // @@ -3274,216 +2896,15 @@ this.buttonItemXT4_2.Text = "人员修改"; this.buttonItemXT4_2.Click += new System.EventHandler(this.buttonItemXT4_2_Click); // - // ribbonPanel3 - // - this.ribbonPanel3.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.ribbonPanel3.Controls.Add(this.ribbonBar4); - this.ribbonPanel3.Dock = System.Windows.Forms.DockStyle.Fill; - this.ribbonPanel3.Location = new System.Drawing.Point(0, 33); - this.ribbonPanel3.Name = "ribbonPanel3"; - this.ribbonPanel3.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); - this.ribbonPanel3.Size = new System.Drawing.Size(1328, 62); - // - // - // - this.ribbonPanel3.Style.Class = ""; - this.ribbonPanel3.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonPanel3.StyleMouseDown.Class = ""; - this.ribbonPanel3.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonPanel3.StyleMouseOver.Class = ""; - this.ribbonPanel3.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonPanel3.TabIndex = 40; - // - // ribbonBar4 - // - this.ribbonBar4.AutoOverflowEnabled = true; - // - // - // - this.ribbonBar4.BackgroundMouseOverStyle.Class = ""; - this.ribbonBar4.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonBar4.BackgroundStyle.Class = ""; - this.ribbonBar4.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonBar4.ContainerControlProcessDialogKey = true; - this.ribbonBar4.Dock = System.Windows.Forms.DockStyle.Left; - this.ribbonBar4.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { - this.btn_flag, - this.slider4ground}); - this.ribbonBar4.Location = new System.Drawing.Point(3, 0); - this.ribbonBar4.Name = "ribbonBar4"; - this.ribbonBar4.Size = new System.Drawing.Size(321, 59); - this.ribbonBar4.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.ribbonBar4.TabIndex = 0; - // - // - // - this.ribbonBar4.TitleStyle.Class = ""; - this.ribbonBar4.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonBar4.TitleStyleMouseOver.Class = ""; - this.ribbonBar4.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonBar4.TitleVisible = false; - // - // btn_flag - // - this.btn_flag.Image = global::Cyberpipe.Properties.Resources._24x24icon_03_hover; - this.btn_flag.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.btn_flag.Name = "btn_flag"; - this.btn_flag.SubItemsExpandWidth = 14; - this.btn_flag.Text = "标识器管理"; - this.btn_flag.Click += new System.EventHandler(this.btn_flag_Click); - // - // slider4ground - // - this.slider4ground.LabelPosition = DevComponents.DotNetBar.eSliderLabelPosition.Top; - this.slider4ground.LabelWidth = 50; - this.slider4ground.Name = "slider4ground"; - this.slider4ground.Text = "地面透明度"; - this.slider4ground.TextColor = System.Drawing.Color.Black; - this.slider4ground.Value = 0; - this.slider4ground.ValueChanged += new System.EventHandler(this.slider4ground_ValueChanged); - // - // ribbonPanel7 - // - this.ribbonPanel7.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.ribbonPanel7.Controls.Add(this.gxdw_ribbonbar); - this.ribbonPanel7.Dock = System.Windows.Forms.DockStyle.Fill; - this.ribbonPanel7.Location = new System.Drawing.Point(0, 33); - this.ribbonPanel7.Name = "ribbonPanel7"; - this.ribbonPanel7.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); - this.ribbonPanel7.Size = new System.Drawing.Size(1328, 62); - // - // - // - this.ribbonPanel7.Style.Class = ""; - this.ribbonPanel7.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonPanel7.StyleMouseDown.Class = ""; - this.ribbonPanel7.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonPanel7.StyleMouseOver.Class = ""; - this.ribbonPanel7.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonPanel7.TabIndex = 41; - this.ribbonPanel7.Visible = false; - // - // gxdw_ribbonbar - // - this.gxdw_ribbonbar.AutoOverflowEnabled = true; - // - // - // - this.gxdw_ribbonbar.BackgroundMouseOverStyle.Class = ""; - this.gxdw_ribbonbar.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.gxdw_ribbonbar.BackgroundStyle.Class = ""; - this.gxdw_ribbonbar.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.gxdw_ribbonbar.ContainerControlProcessDialogKey = true; - this.gxdw_ribbonbar.Dock = System.Windows.Forms.DockStyle.Left; - this.gxdw_ribbonbar.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { - this.buttonItem9, - this.buttonItem10, - this.buttonItem11, - this.buttonItem12, - this.buttonItem13, - this.buttonItem14}); - this.gxdw_ribbonbar.Location = new System.Drawing.Point(3, 0); - this.gxdw_ribbonbar.Name = "gxdw_ribbonbar"; - this.gxdw_ribbonbar.Size = new System.Drawing.Size(522, 59); - this.gxdw_ribbonbar.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.gxdw_ribbonbar.TabIndex = 0; - this.gxdw_ribbonbar.Text = "ribbonBar5"; - // - // - // - this.gxdw_ribbonbar.TitleStyle.Class = ""; - this.gxdw_ribbonbar.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.gxdw_ribbonbar.TitleStyleMouseOver.Class = ""; - this.gxdw_ribbonbar.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.gxdw_ribbonbar.TitleVisible = false; - // - // buttonItem9 - // - this.buttonItem9.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__76; - this.buttonItem9.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem9.Name = "buttonItem9"; - this.buttonItem9.SubItemsExpandWidth = 14; - this.buttonItem9.Text = "工单管理"; - this.buttonItem9.Click += new System.EventHandler(this.buttonItem9_Click); - // - // buttonItem10 - // - this.buttonItem10.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__69; - this.buttonItem10.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem10.Name = "buttonItem10"; - this.buttonItem10.SubItemsExpandWidth = 14; - this.buttonItem10.Text = "在线任务"; - this.buttonItem10.Click += new System.EventHandler(this.buttonItem10_Click); - // - // buttonItem11 - // - this.buttonItem11.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__72; - this.buttonItem11.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem11.Name = "buttonItem11"; - this.buttonItem11.SubItemsExpandWidth = 14; - this.buttonItem11.Text = "事件管理"; - this.buttonItem11.Click += new System.EventHandler(this.buttonItem11_Click); - // - // buttonItem12 - // - this.buttonItem12.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__34; - this.buttonItem12.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem12.Name = "buttonItem12"; - this.buttonItem12.SubItemsExpandWidth = 14; - this.buttonItem12.Text = "探测仪管理"; - this.buttonItem12.Click += new System.EventHandler(this.buttonItem12_Click); - // - // buttonItem13 - // - this.buttonItem13.Image = global::Cyberpipe.Properties.Resources._24x24icon_13_hover; - this.buttonItem13.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem13.Name = "buttonItem13"; - this.buttonItem13.SubItemsExpandWidth = 14; - this.buttonItem13.Text = "巡检人员维护"; - this.buttonItem13.Click += new System.EventHandler(this.buttonItem13_Click); - // - // buttonItem14 - // - this.buttonItem14.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__56; - this.buttonItem14.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem14.Name = "buttonItem14"; - this.buttonItem14.SubItemsExpandWidth = 14; - this.buttonItem14.Text = "导出施工图"; - this.buttonItem14.Click += new System.EventHandler(this.buttonItem14_Click); - // // ribbonPanel2 // this.ribbonPanel2.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; this.ribbonPanel2.Controls.Add(this.ribbonBar3); this.ribbonPanel2.Dock = System.Windows.Forms.DockStyle.Fill; - this.ribbonPanel2.Location = new System.Drawing.Point(0, 33); + this.ribbonPanel2.Location = new System.Drawing.Point(0, 0); this.ribbonPanel2.Name = "ribbonPanel2"; this.ribbonPanel2.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); - this.ribbonPanel2.Size = new System.Drawing.Size(1328, 62); + this.ribbonPanel2.Size = new System.Drawing.Size(1328, 95); // // // @@ -3527,7 +2948,7 @@ this.buttonItemPasswordReset}); this.ribbonBar3.Location = new System.Drawing.Point(3, 0); this.ribbonBar3.Name = "ribbonBar3"; - this.ribbonBar3.Size = new System.Drawing.Size(551, 59); + this.ribbonBar3.Size = new System.Drawing.Size(551, 92); this.ribbonBar3.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; this.ribbonBar3.TabIndex = 1; // @@ -3567,6 +2988,7 @@ this.btn_resc_info.Name = "btn_resc_info"; this.btn_resc_info.SubItemsExpandWidth = 14; this.btn_resc_info.Text = "资源管理"; + this.btn_resc_info.Visible = false; this.btn_resc_info.Click += new System.EventHandler(this.btn_resc_info_Click); // // btn_role_resc @@ -3605,6 +3027,605 @@ this.buttonItemPasswordReset.Text = "重置密码"; this.buttonItemPasswordReset.Click += new System.EventHandler(this.buttonItemPasswordReset_Click); // + // ribbonPanel6 + // + this.ribbonPanel6.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.ribbonPanel6.Controls.Add(this.ribbonBar6); + this.ribbonPanel6.Dock = System.Windows.Forms.DockStyle.Fill; + this.ribbonPanel6.Location = new System.Drawing.Point(0, 0); + this.ribbonPanel6.Name = "ribbonPanel6"; + this.ribbonPanel6.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); + this.ribbonPanel6.Size = new System.Drawing.Size(1328, 95); + // + // + // + this.ribbonPanel6.Style.Class = ""; + this.ribbonPanel6.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonPanel6.StyleMouseDown.Class = ""; + this.ribbonPanel6.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonPanel6.StyleMouseOver.Class = ""; + this.ribbonPanel6.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonPanel6.TabIndex = 38; + this.ribbonPanel6.Visible = false; + // + // ribbonBar6 + // + this.ribbonBar6.AutoOverflowEnabled = true; + // + // + // + this.ribbonBar6.BackgroundMouseOverStyle.Class = ""; + this.ribbonBar6.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonBar6.BackgroundStyle.Class = ""; + this.ribbonBar6.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar6.ContainerControlProcessDialogKey = true; + this.ribbonBar6.Dock = System.Windows.Forms.DockStyle.Left; + this.ribbonBar6.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { + this.buttonItemSPSZ, + this.buttonItem8, + this.buttonItemLocation, + this.sliderItem2, + this.buttonItemGBJC}); + this.ribbonBar6.Location = new System.Drawing.Point(3, 0); + this.ribbonBar6.Name = "ribbonBar6"; + this.ribbonBar6.Size = new System.Drawing.Size(427, 92); + this.ribbonBar6.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.ribbonBar6.TabIndex = 0; + // + // + // + this.ribbonBar6.TitleStyle.Class = ""; + this.ribbonBar6.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonBar6.TitleStyleMouseOver.Class = ""; + this.ribbonBar6.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar6.TitleVisible = false; + // + // buttonItemSPSZ + // + this.buttonItemSPSZ.Image = ((System.Drawing.Image)(resources.GetObject("buttonItemSPSZ.Image"))); + this.buttonItemSPSZ.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItemSPSZ.Name = "buttonItemSPSZ"; + this.buttonItemSPSZ.SubItemsExpandWidth = 14; + this.buttonItemSPSZ.Text = "双屏设置"; + this.buttonItemSPSZ.Click += new System.EventHandler(this.buttonItemSPSZ_Click); + // + // buttonItem8 + // + this.buttonItem8.Image = ((System.Drawing.Image)(resources.GetObject("buttonItem8.Image"))); + this.buttonItem8.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem8.Name = "buttonItem8"; + this.buttonItem8.SubItemsExpandWidth = 14; + this.buttonItem8.Text = "双屏分析"; + this.buttonItem8.Click += new System.EventHandler(this.buttonItem8_Click); + // + // buttonItemLocation + // + this.buttonItemLocation.Image = ((System.Drawing.Image)(resources.GetObject("buttonItemLocation.Image"))); + this.buttonItemLocation.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItemLocation.Name = "buttonItemLocation"; + this.buttonItemLocation.SubItemsExpandWidth = 14; + this.buttonItemLocation.Text = "快速定位"; + this.buttonItemLocation.Click += new System.EventHandler(this.buttonItemLocation_Click); + // + // sliderItem2 + // + this.sliderItem2.LabelPosition = DevComponents.DotNetBar.eSliderLabelPosition.Top; + this.sliderItem2.LabelWidth = 50; + this.sliderItem2.Name = "sliderItem2"; + this.sliderItem2.Text = "地面透明度"; + this.sliderItem2.TextColor = System.Drawing.Color.Black; + this.sliderItem2.Value = 0; + this.sliderItem2.ValueChanged += new System.EventHandler(this.sliderItem2_ValueChanged); + // + // buttonItemGBJC + // + this.buttonItemGBJC.Image = ((System.Drawing.Image)(resources.GetObject("buttonItemGBJC.Image"))); + this.buttonItemGBJC.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItemGBJC.Name = "buttonItemGBJC"; + this.buttonItemGBJC.SubItemsExpandWidth = 14; + this.buttonItemGBJC.Text = "国标检测"; + this.buttonItemGBJC.Click += new System.EventHandler(this.buttonItemGBJC_Click); + // + // ribbonPanel5 + // + this.ribbonPanel5.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.ribbonPanel5.Controls.Add(this.ribbonBar2); + this.ribbonPanel5.Dock = System.Windows.Forms.DockStyle.Fill; + this.ribbonPanel5.Location = new System.Drawing.Point(0, 33); + this.ribbonPanel5.Name = "ribbonPanel5"; + this.ribbonPanel5.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); + this.ribbonPanel5.Size = new System.Drawing.Size(1328, 62); + // + // + // + this.ribbonPanel5.Style.Class = ""; + this.ribbonPanel5.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonPanel5.StyleMouseDown.Class = ""; + this.ribbonPanel5.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonPanel5.StyleMouseOver.Class = ""; + this.ribbonPanel5.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonPanel5.TabIndex = 37; + this.ribbonPanel5.Visible = false; + // + // ribbonBar2 + // + this.ribbonBar2.AutoOverflowEnabled = true; + // + // + // + this.ribbonBar2.BackgroundMouseOverStyle.Class = ""; + this.ribbonBar2.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonBar2.BackgroundStyle.Class = ""; + this.ribbonBar2.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar2.ContainerControlProcessDialogKey = true; + this.ribbonBar2.Dock = System.Windows.Forms.DockStyle.Left; + this.ribbonBar2.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { + this.buttonItemHX1, + this.buttonItemHX2, + this.buttonItemDCTP, + this.sliderItem3}); + this.ribbonBar2.Location = new System.Drawing.Point(3, 0); + this.ribbonBar2.Name = "ribbonBar2"; + this.ribbonBar2.Size = new System.Drawing.Size(350, 59); + this.ribbonBar2.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.ribbonBar2.TabIndex = 0; + // + // + // + this.ribbonBar2.TitleStyle.Class = ""; + this.ribbonBar2.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonBar2.TitleStyleMouseOver.Class = ""; + this.ribbonBar2.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar2.TitleVisible = false; + // + // buttonItemHX1 + // + this.buttonItemHX1.AutoExpandOnClick = true; + this.buttonItemHX1.Image = ((System.Drawing.Image)(resources.GetObject("buttonItemHX1.Image"))); + this.buttonItemHX1.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItemHX1.Name = "buttonItemHX1"; + this.buttonItemHX1.SubItemsExpandWidth = 14; + this.buttonItemHX1.Text = "导入红线"; + this.buttonItemHX1.Click += new System.EventHandler(this.buttonItemHX1_Click); + // + // buttonItemHX2 + // + this.buttonItemHX2.Image = ((System.Drawing.Image)(resources.GetObject("buttonItemHX2.Image"))); + this.buttonItemHX2.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItemHX2.Name = "buttonItemHX2"; + this.buttonItemHX2.SubItemsExpandWidth = 14; + this.buttonItemHX2.Text = "红线审核"; + this.buttonItemHX2.Click += new System.EventHandler(this.buttonItemHX2_Click); + // + // buttonItemDCTP + // + this.buttonItemDCTP.Image = ((System.Drawing.Image)(resources.GetObject("buttonItemDCTP.Image"))); + this.buttonItemDCTP.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItemDCTP.Name = "buttonItemDCTP"; + this.buttonItemDCTP.SubItemsExpandWidth = 14; + this.buttonItemDCTP.Text = "导出图片"; + this.buttonItemDCTP.Click += new System.EventHandler(this.buttonItemDCTP_Click); + // + // sliderItem3 + // + this.sliderItem3.LabelPosition = DevComponents.DotNetBar.eSliderLabelPosition.Top; + this.sliderItem3.LabelWidth = 50; + this.sliderItem3.Name = "sliderItem3"; + this.sliderItem3.Text = "地面透明度"; + this.sliderItem3.TextColor = System.Drawing.Color.Black; + this.sliderItem3.Value = 0; + this.sliderItem3.ValueChanged += new System.EventHandler(this.sliderItem3_ValueChanged); + // + // ribbonPanel1 + // + this.ribbonPanel1.AutoSize = true; + this.ribbonPanel1.CanvasColor = System.Drawing.Color.Gray; + this.ribbonPanel1.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.ribbonPanel1.Controls.Add(this.ribbonBar21); + this.ribbonPanel1.Dock = System.Windows.Forms.DockStyle.Fill; + this.ribbonPanel1.Location = new System.Drawing.Point(0, 33); + this.ribbonPanel1.Name = "ribbonPanel1"; + this.ribbonPanel1.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); + this.ribbonPanel1.Size = new System.Drawing.Size(1328, 62); + // + // + // + this.ribbonPanel1.Style.Class = ""; + this.ribbonPanel1.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonPanel1.StyleMouseDown.Class = ""; + this.ribbonPanel1.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonPanel1.StyleMouseOver.Class = ""; + this.ribbonPanel1.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonPanel1.TabIndex = 1; + this.ribbonPanel1.Visible = false; + // + // ribbonBar21 + // + this.ribbonBar21.AutoOverflowEnabled = true; + this.ribbonBar21.BackColor = System.Drawing.Color.White; + // + // + // + this.ribbonBar21.BackgroundMouseOverStyle.Class = ""; + this.ribbonBar21.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonBar21.BackgroundStyle.Class = ""; + this.ribbonBar21.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar21.ContainerControlProcessDialogKey = true; + this.ribbonBar21.Dock = System.Windows.Forms.DockStyle.Left; + this.ribbonBar21.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { + this.buttonItem87, + this.buttonItem88, + this.buttonItem27, + this.sliderGroundTransSet1, + this.buttonItem91, + this.buttonItem1, + this.btnlegendSet, + this.buttonItem89, + this.btnOutputJPG}); + this.ribbonBar21.Location = new System.Drawing.Point(3, 0); + this.ribbonBar21.Name = "ribbonBar21"; + this.ribbonBar21.Size = new System.Drawing.Size(649, 59); + this.ribbonBar21.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.ribbonBar21.TabIndex = 2; + this.ribbonBar21.Text = "浏览模式"; + // + // + // + this.ribbonBar21.TitleStyle.Class = ""; + this.ribbonBar21.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonBar21.TitleStyleMouseOver.Class = ""; + this.ribbonBar21.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar21.TitleVisible = false; + // + // buttonItem87 + // + this.buttonItem87.Image = ((System.Drawing.Image)(resources.GetObject("buttonItem87.Image"))); + this.buttonItem87.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem87.Name = "buttonItem87"; + this.buttonItem87.SubItemsExpandWidth = 14; + this.buttonItem87.Text = "地上模式"; + this.buttonItem87.Click += new System.EventHandler(this.buttonItem87_Click); + // + // buttonItem88 + // + this.buttonItem88.Image = ((System.Drawing.Image)(resources.GetObject("buttonItem88.Image"))); + this.buttonItem88.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem88.Name = "buttonItem88"; + this.buttonItem88.SubItemsExpandWidth = 14; + this.buttonItem88.Text = "地下模式"; + this.buttonItem88.Click += new System.EventHandler(this.buttonItem88_Click); + // + // buttonItem27 + // + this.buttonItem27.Image = ((System.Drawing.Image)(resources.GetObject("buttonItem27.Image"))); + this.buttonItem27.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem27.Name = "buttonItem27"; + this.buttonItem27.SubItemsExpandWidth = 14; + this.buttonItem27.Text = "行走模式"; + this.buttonItem27.Click += new System.EventHandler(this.buttonItem27_Click); + // + // buttonItem91 + // + this.buttonItem91.ForeColor = System.Drawing.Color.Black; + this.buttonItem91.Image = ((System.Drawing.Image)(resources.GetObject("buttonItem91.Image"))); + this.buttonItem91.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem91.Name = "buttonItem91"; + this.buttonItem91.SubItemsExpandWidth = 14; + this.buttonItem91.Text = "快速定位"; + this.buttonItem91.Click += new System.EventHandler(this.buttonItem91_Click); + // + // buttonItem1 + // + this.buttonItem1.Image = ((System.Drawing.Image)(resources.GetObject("buttonItem1.Image"))); + this.buttonItem1.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem1.Name = "buttonItem1"; + this.buttonItem1.SubItemsExpandWidth = 14; + this.buttonItem1.Text = "图层管理"; + this.buttonItem1.Click += new System.EventHandler(this.buttonItem1_Click); + // + // btnlegendSet + // + this.btnlegendSet.Image = ((System.Drawing.Image)(resources.GetObject("btnlegendSet.Image"))); + this.btnlegendSet.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.btnlegendSet.Name = "btnlegendSet"; + this.btnlegendSet.SubItemsExpandWidth = 14; + this.btnlegendSet.Text = "图例"; + this.btnlegendSet.Click += new System.EventHandler(this.btnlegendSet_Click); + // + // buttonItem89 + // + this.buttonItem89.Image = ((System.Drawing.Image)(resources.GetObject("buttonItem89.Image"))); + this.buttonItem89.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem89.Name = "buttonItem89"; + this.buttonItem89.SubItemsExpandWidth = 14; + this.buttonItem89.Text = "全屏显示"; + this.buttonItem89.Click += new System.EventHandler(this.buttonItem89_Click); + // + // btnOutputJPG + // + this.btnOutputJPG.Image = ((System.Drawing.Image)(resources.GetObject("btnOutputJPG.Image"))); + this.btnOutputJPG.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.btnOutputJPG.Name = "btnOutputJPG"; + this.btnOutputJPG.SubItemsExpandWidth = 14; + this.btnOutputJPG.Text = "导出图片"; + this.btnOutputJPG.Click += new System.EventHandler(this.btnOutputJPG_Click); + // + // ribbonPanel12 + // + this.ribbonPanel12.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.ribbonPanel12.Controls.Add(this.ribbonBar18); + this.ribbonPanel12.Controls.Add(this.ribbonBar13); + this.ribbonPanel12.Dock = System.Windows.Forms.DockStyle.Fill; + this.ribbonPanel12.Location = new System.Drawing.Point(0, 33); + this.ribbonPanel12.Name = "ribbonPanel12"; + this.ribbonPanel12.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); + this.ribbonPanel12.Size = new System.Drawing.Size(1328, 62); + // + // + // + this.ribbonPanel12.Style.Class = ""; + this.ribbonPanel12.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonPanel12.StyleMouseDown.Class = ""; + this.ribbonPanel12.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonPanel12.StyleMouseOver.Class = ""; + this.ribbonPanel12.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonPanel12.TabIndex = 34; + this.ribbonPanel12.Visible = false; + // + // ribbonBar18 + // + this.ribbonBar18.AutoOverflowEnabled = true; + // + // + // + this.ribbonBar18.BackgroundMouseOverStyle.Class = ""; + this.ribbonBar18.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonBar18.BackgroundStyle.Class = ""; + this.ribbonBar18.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar18.ContainerControlProcessDialogKey = true; + this.ribbonBar18.Dock = System.Windows.Forms.DockStyle.Left; + this.ribbonBar18.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { + this.buttonItem133, + this.buttonItem132}); + this.ribbonBar18.Location = new System.Drawing.Point(508, 0); + this.ribbonBar18.Name = "ribbonBar18"; + this.ribbonBar18.Size = new System.Drawing.Size(75, 59); + this.ribbonBar18.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.ribbonBar18.TabIndex = 1; + // + // + // + this.ribbonBar18.TitleStyle.Class = ""; + this.ribbonBar18.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonBar18.TitleStyleMouseOver.Class = ""; + this.ribbonBar18.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar18.TitleVisible = false; + // + // buttonItem133 + // + this.buttonItem133.Image = ((System.Drawing.Image)(resources.GetObject("buttonItem133.Image"))); + this.buttonItem133.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem133.Name = "buttonItem133"; + this.buttonItem133.SubItemsExpandWidth = 14; + this.buttonItem133.Text = "审核入库"; + this.buttonItem133.Click += new System.EventHandler(this.buttonItem133_Click_1); + // + // buttonItem132 + // + this.buttonItem132.Name = "buttonItem132"; + // + // ribbonBar13 + // + this.ribbonBar13.AutoOverflowEnabled = true; + // + // + // + this.ribbonBar13.BackgroundMouseOverStyle.Class = ""; + this.ribbonBar13.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonBar13.BackgroundStyle.Class = ""; + this.ribbonBar13.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar13.ContainerControlProcessDialogKey = true; + this.ribbonBar13.Dock = System.Windows.Forms.DockStyle.Left; + this.ribbonBar13.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { + this.buttonItem127, + this.buttonItem128, + this.sliderItem1, + this.buttonItem134, + this.buttonItem130, + this.btn_check_history}); + this.ribbonBar13.Location = new System.Drawing.Point(3, 0); + this.ribbonBar13.Name = "ribbonBar13"; + this.ribbonBar13.Size = new System.Drawing.Size(505, 59); + this.ribbonBar13.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.ribbonBar13.TabIndex = 0; + // + // + // + this.ribbonBar13.TitleStyle.Class = ""; + this.ribbonBar13.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonBar13.TitleStyleMouseOver.Class = ""; + this.ribbonBar13.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar13.TitleVisible = false; + // + // buttonItem127 + // + this.buttonItem127.Image = ((System.Drawing.Image)(resources.GetObject("buttonItem127.Image"))); + this.buttonItem127.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem127.Name = "buttonItem127"; + this.buttonItem127.SubItemsExpandWidth = 14; + this.buttonItem127.Text = "打开数据"; + this.buttonItem127.Click += new System.EventHandler(this.buttonItem127_Click_2); + // + // buttonItem128 + // + this.buttonItem128.Image = ((System.Drawing.Image)(resources.GetObject("buttonItem128.Image"))); + this.buttonItem128.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem128.Name = "buttonItem128"; + this.buttonItem128.SubItemsExpandWidth = 14; + this.buttonItem128.Text = "一键审核"; + this.buttonItem128.Click += new System.EventHandler(this.buttonItem128_Click); + // + // sliderItem1 + // + this.sliderItem1.LabelPosition = DevComponents.DotNetBar.eSliderLabelPosition.Top; + this.sliderItem1.LabelWidth = 50; + this.sliderItem1.Name = "sliderItem1"; + this.sliderItem1.Text = "地面透明度"; + this.sliderItem1.TextColor = System.Drawing.Color.Black; + this.sliderItem1.Value = 0; + this.sliderItem1.ValueChanged += new System.EventHandler(this.sliderItem1_ValueChanged); + // + // buttonItem134 + // + this.buttonItem134.Image = ((System.Drawing.Image)(resources.GetObject("buttonItem134.Image"))); + this.buttonItem134.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem134.Name = "buttonItem134"; + this.buttonItem134.SubItemsExpandWidth = 14; + this.buttonItem134.Text = "模拟设计修改"; + this.buttonItem134.Click += new System.EventHandler(this.buttonItem134_Click_1); + // + // buttonItem130 + // + this.buttonItem130.Image = ((System.Drawing.Image)(resources.GetObject("buttonItem130.Image"))); + this.buttonItem130.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem130.Name = "buttonItem130"; + this.buttonItem130.SubItemsExpandWidth = 14; + this.buttonItem130.Text = "导出审核图"; + this.buttonItem130.Click += new System.EventHandler(this.buttonItem130_Click_1); + // + // btn_check_history + // + this.btn_check_history.Image = ((System.Drawing.Image)(resources.GetObject("btn_check_history.Image"))); + this.btn_check_history.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.btn_check_history.Name = "btn_check_history"; + this.btn_check_history.SubItemsExpandWidth = 14; + this.btn_check_history.Text = "审核历史"; + this.btn_check_history.Click += new System.EventHandler(this.btn_check_history_Click); + // + // ribbonPanel4 + // + this.ribbonPanel4.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.ribbonPanel4.Controls.Add(this.ribbonBar1); + this.ribbonPanel4.Dock = System.Windows.Forms.DockStyle.Fill; + this.ribbonPanel4.Location = new System.Drawing.Point(0, 33); + this.ribbonPanel4.Name = "ribbonPanel4"; + this.ribbonPanel4.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); + this.ribbonPanel4.Size = new System.Drawing.Size(1328, 62); + // + // + // + this.ribbonPanel4.Style.Class = ""; + this.ribbonPanel4.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonPanel4.StyleMouseDown.Class = ""; + this.ribbonPanel4.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonPanel4.StyleMouseOver.Class = ""; + this.ribbonPanel4.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonPanel4.TabIndex = 36; + this.ribbonPanel4.Visible = false; + // + // ribbonBar1 + // + this.ribbonBar1.AutoOverflowEnabled = true; + // + // + // + this.ribbonBar1.BackgroundMouseOverStyle.Class = ""; + this.ribbonBar1.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonBar1.BackgroundStyle.Class = ""; + this.ribbonBar1.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar1.ContainerControlProcessDialogKey = true; + this.ribbonBar1.Dock = System.Windows.Forms.DockStyle.Left; + this.ribbonBar1.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { + this.btn_document_info}); + this.ribbonBar1.Location = new System.Drawing.Point(3, 0); + this.ribbonBar1.Name = "ribbonBar1"; + this.ribbonBar1.Size = new System.Drawing.Size(88, 59); + this.ribbonBar1.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.ribbonBar1.TabIndex = 0; + // + // + // + this.ribbonBar1.TitleStyle.Class = ""; + this.ribbonBar1.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonBar1.TitleStyleMouseOver.Class = ""; + this.ribbonBar1.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar1.TitleVisible = false; + // + // btn_document_info + // + this.btn_document_info.Image = ((System.Drawing.Image)(resources.GetObject("btn_document_info.Image"))); + this.btn_document_info.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.btn_document_info.Name = "btn_document_info"; + this.btn_document_info.SubItemsExpandWidth = 14; + this.btn_document_info.Text = "文档管理"; + this.btn_document_info.Click += new System.EventHandler(this.btn_document_info_Click); + // // ribbonTabItem1 // this.ribbonTabItem1.ButtonStyle = DevComponents.DotNetBar.eButtonStyle.ImageAndText; @@ -3673,7 +3694,6 @@ this.ribbonTabItem7.Name = "ribbonTabItem7"; this.ribbonTabItem7.Panel = this.ribbonPanel7; this.ribbonTabItem7.Text = "管线定位"; - this.ribbonTabItem7.MouseDown += new System.Windows.Forms.MouseEventHandler(this.ribbonTabItem7_MouseDown); // // ribbonTabItem5 // @@ -3684,7 +3704,6 @@ this.ribbonTabItem5.Name = "ribbonTabItem5"; this.ribbonTabItem5.Panel = this.ribbonPanel3; this.ribbonTabItem5.Text = "标识器管理"; - this.ribbonTabItem5.MouseDown += new System.Windows.Forms.MouseEventHandler(this.ribbonTabItem5_MouseDown); // // ribbonTabItem2 // @@ -4451,7 +4470,7 @@ this.dataGridViewX2.ReadOnly = true; this.dataGridViewX2.RowHeadersVisible = false; this.dataGridViewX2.RowTemplate.Height = 23; - this.dataGridViewX2.Size = new System.Drawing.Size(31081, 92); + this.dataGridViewX2.Size = new System.Drawing.Size(31378, 92); this.dataGridViewX2.TabIndex = 11; // // dataGridViewTextBoxColumn10 @@ -4545,7 +4564,7 @@ this.dataGridViewX3.ReadOnly = true; this.dataGridViewX3.RowHeadersVisible = false; this.dataGridViewX3.RowTemplate.Height = 23; - this.dataGridViewX3.Size = new System.Drawing.Size(31080, 127); + this.dataGridViewX3.Size = new System.Drawing.Size(31377, 127); this.dataGridViewX3.TabIndex = 5; this.dataGridViewX3.MouseDoubleClick += new System.Windows.Forms.MouseEventHandler(this.dataGridViewX3_MouseDoubleClick); // @@ -5722,7 +5741,8 @@ // pictureBox1 // this.pictureBox1.Dock = System.Windows.Forms.DockStyle.Top; - this.pictureBox1.Image = ((System.Drawing.Image)(resources.GetObject("pictureBox1.Image"))); +// this.pictureBox1.Image = ((System.Drawing.Image)(resources.GetObject("pictureBox1.Image"))); + this.pictureBox1.Image = Image.FromFile(Application.StartupPath + Utility.TitleImagePath); this.pictureBox1.Location = new System.Drawing.Point(0, 0); this.pictureBox1.Margin = new System.Windows.Forms.Padding(0); this.pictureBox1.Name = "pictureBox1"; @@ -5732,18 +5752,6 @@ this.pictureBox1.TabStop = false; this.pictureBox1.Paint += new System.Windows.Forms.PaintEventHandler(this.pictureBox1_Paint); // - // layerTree - // - this.layerTree.CheckBoxes = true; - this.layerTree.ItemHeight = 18; - this.layerTree.Location = new System.Drawing.Point(30, 78); - this.layerTree.Name = "layerTree"; - this.layerTree.Size = new System.Drawing.Size(121, 97); - this.layerTree.TabIndex = 1; - this.layerTree.AfterCheck += new System.Windows.Forms.TreeViewEventHandler(this.layerTree_AfterCheck); - this.layerTree.NodeMouseClick += new System.Windows.Forms.TreeNodeMouseClickEventHandler(this.layerTree_NodeMouseClick); - this.layerTree.NodeMouseDoubleClick += new System.Windows.Forms.TreeNodeMouseClickEventHandler(this.layerTree_NodeMouseDoubleClick); - // // MainFrm // this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Inherit; @@ -5770,7 +5778,8 @@ this.KeyPreview = true; this.Name = "MainFrm"; this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen; - this.Text = "智慧太湖新城管网规划分析系统6.0"; +// this.Text = "智慧太湖新城管网规划分析系统6.0"; + this.Text = Utility.SysnameVersion; this.WindowState = System.Windows.Forms.FormWindowState.Maximized; this.FormClosing += new System.Windows.Forms.FormClosingEventHandler(this.MainFrm_FormClosing); this.Load += new System.EventHandler(this.MainFrm_Load); @@ -5787,15 +5796,15 @@ this.contextMenuStripDeleteLayerNode.ResumeLayout(false); this.ribbonControl1.ResumeLayout(false); this.ribbonControl1.PerformLayout(); + this.ribbonPanel3.ResumeLayout(false); + this.ribbonPanel7.ResumeLayout(false); + this.ribbonPanel15.ResumeLayout(false); + this.ribbonPanel2.ResumeLayout(false); this.ribbonPanel6.ResumeLayout(false); this.ribbonPanel5.ResumeLayout(false); this.ribbonPanel1.ResumeLayout(false); this.ribbonPanel12.ResumeLayout(false); this.ribbonPanel4.ResumeLayout(false); - this.ribbonPanel15.ResumeLayout(false); - this.ribbonPanel3.ResumeLayout(false); - this.ribbonPanel7.ResumeLayout(false); - this.ribbonPanel2.ResumeLayout(false); this.panelOfTable.ResumeLayout(false); this.panelOfTable.PerformLayout(); ((System.ComponentModel.ISupportInitialize)(this.dataGridViewX1)).EndInit(); @@ -5955,6 +5964,7 @@ private RibbonTabItem ribbonTabItem11; private ButtonItem buttonItem130; private RibbonBar ribbonBar18; + private ButtonItem buttonItem132; private SliderItem sliderItem1; private ButtonItem buttonItem133; private ButtonItem buttonItem134; diff --git a/MainFrm.resx b/MainFrm.resx index 9f9bba4..ce490c1 100644 --- a/MainFrm.resx +++ b/MainFrm.resx @@ -351,6 +351,146 @@ 766, 54 + + + iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 + YQUAAAAZdEVYdFNvZnR3YXJlAEFkb2JlIEltYWdlUmVhZHlxyWU8AAADZmlUWHRYTUw6Y29tLmFkb2Jl + LnhtcAAAAAAAPD94cGFja2V0IGJlZ2luPSLvu78iIGlkPSJXNU0wTXBDZWhpSHpyZVN6TlRjemtjOWQi + Pz4gPHg6eG1wbWV0YSB4bWxuczp4PSJhZG9iZTpuczptZXRhLyIgeDp4bXB0az0iQWRvYmUgWE1QIENv + cmUgNS4zLWMwMTEgNjYuMTQ1NjYxLCAyMDEyLzAyLzA2LTE0OjU2OjI3ICAgICAgICAiPiA8cmRmOlJE + RiB4bWxuczpyZGY9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkvMDIvMjItcmRmLXN5bnRheC1ucyMiPiA8 + cmRmOkRlc2NyaXB0aW9uIHJkZjphYm91dD0iIiB4bWxuczp4bXBNTT0iaHR0cDovL25zLmFkb2JlLmNv + bS94YXAvMS4wL21tLyIgeG1sbnM6c3RSZWY9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlw + ZS9SZXNvdXJjZVJlZiMiIHhtbG5zOnhtcD0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wLyIgeG1w + TU06T3JpZ2luYWxEb2N1bWVudElEPSJ4bXAuZGlkOjYzQTM5NEY4Mjg0OUU0MTE5NDBEQTc4ODZEQzk5 + N0NGIiB4bXBNTTpEb2N1bWVudElEPSJ4bXAuZGlkOjEwQ0IxNzBBNEM1QzExRTRBNkNGQzRBMjhDQzI0 + MkY4IiB4bXBNTTpJbnN0YW5jZUlEPSJ4bXAuaWlkOjEwQ0IxNzA5NEM1QzExRTRBNkNGQzRBMjhDQzI0 + MkY4IiB4bXA6Q3JlYXRvclRvb2w9IkFkb2JlIFBob3Rvc2hvcCBDUzYgKFdpbmRvd3MpIj4gPHhtcE1N + OkRlcml2ZWRGcm9tIHN0UmVmOmluc3RhbmNlSUQ9InhtcC5paWQ6NTEzMDNDMjA1QjRDRTQxMTg4NERE + MUVBOEQ4QTgyNTUiIHN0UmVmOmRvY3VtZW50SUQ9InhtcC5kaWQ6NjNBMzk0RjgyODQ5RTQxMTk0MERB + Nzg4NkRDOTk3Q0YiLz4gPC9yZGY6RGVzY3JpcHRpb24+IDwvcmRmOlJERj4gPC94OnhtcG1ldGE+IDw/ + eHBhY2tldCBlbmQ9InIiPz43wa2/AAAFaUlEQVRIS6WUC0xTVxzGKy0UkSmlFGjBFilSkNpSaAWRh63y + sIiAArKs4spLRLQoiEJlSMGoMCc6CBOnYHzMOHUqqOhEHOqCbjNu6kCd6KYje5mZ6KbObd/OuVL3cEzj + /skv997/+b7v39PTW9aj3/BM+OKxPEIZoW/gyrOuPbP+GvRPSNBQQqXYLwSW1etw7cYt5kqfaZ+uD8QM + Xg8f/f4UxGhHMHv4qlG6vAb9394G6T+BPpdV1oCuUx3VD8Q9XT8//PUJRMghlLhLg1C41IK+r/pB+oNC + 16mO6qmP+gdi/6y793+hwTYEk9uoQOSaStHzxQ2Q/nND9XMKy0D9NIfmDcSzaLhI4KXE7LwinLtwGXfu + PXhhqJ/m0DyS62EdUGWpqcf3P97DD3d++t/QnKraBjpghXWAiC+WN0ZNScOe1mP45vbdF2ZvWwdoDs/D + b6ejs6ecxHPoAG/l+Fhkzy+FyCcY0YkG7D/yAW5+d+e5oXrqo36aQ/McnNyjyAAuHWA05pfgzPlehhyT + mflV6FOMaDt2Ctf7bw8KXac6qqc+a4Zx3hLwRLJCZgcJjcPIEPkyIZmeX1SB7vOX0dn9KQy5jw8r8eVc + HOrsxidXP0d9hxlzd4QgeYMzEt7kQVvOR0pFFNpOHmd81E9znIS+dSTc1foVGWfNKUZjyy6Ex6SQl0cD + 09IVxHAFh0+cReqr+QjK8ERqEw+VHWOwoycSR/v1OHwzDlsvhcNCeqkbedAYxQiPm87kZOQVw0nkW0QG + 2DFnIA+JRm3DFpzr/RKNW3ZDE5UAsX8ocizZiFs7DEUHvPFunw4Hb05B+y09jn49lYHe0x5doxqqLVlf + DJrnyB+pIQNs6QAhf6R8tZu3CqpwPdZu2I6PLl3HwnV5iHv9JVSeUOKdqzq81xeDvddiYG73R0aLEIZm + IRa1jUbjxQnYRHa17YqW0VJPwHT3LocRbirrDiymspXo6L6AgiXV8JSNQ2i6GpNWOqK4U4n1n0Vge68W + 9ecmIKnBBSqDCIp4P2RWGDB/QxqS6l1QcToIld3BqDobgsXEQ73+Se5HrGcgdJEokGzIx66DXXi7dRvC + yx2Q2RqApR+GoPbjCag8pUZ6sxjqWRKEldljRr07ZjaKmHt5qpBZKzkeiIJ2BbIPKmA8MIbJUC/ghrM0 + RfYsDtdhqJNIVulK/ku0BQokbfZGZrsKBR3BmEsMOfvl0FY7o7ypDPo1brCcGc+QUCdExabXEFsjQO4B + ObL2BSBlqx8SWwibvBE0334nK3Ael+yEbIW81DZszlhZ2oieuAYvpO5VIHGzP9J2+CN9pz/CzDwExMox + eZUbFnZpkEc+gLZagJjMWOiqXZDVqmC0+kZf6Nb4IHKFCPIsu92sgCw7BlJswjBJLCdenmuPyFUS6Gp9 + oG/yRdJWGSKqhYjKDgLRImK5ACGlzsy9d/zwXn2DBMZDSkZLPaHlnpBncyGO5kxj+Rps/wYdJE2xzfOb + zcU4sye0b0gRu3E0Ypt8ELTICRFGNcShUgjHuZyWxNu2096sdiXS9o1ltNQjyyDhes4SkuXEGpXC+Ve8 + kjlzpDPtoCkVQrdOihgyIHmXP6LryGEX86Ba6ISJNR7IeF+JV8gAfbOM0XoTj8dktpmEOxM4rJHTBscz + njNNnMiBagEfU98ajRnbZMg7GojCk2oGU1cw5nUGw7BHAZWJD6oVhLFzSDCPCacljGP/J7xAm6Hu0ew6 + STIXkcvckN7ig8XHVCjvUiNvdwAmW0Twms6FayS7meM4REoihxPoeT4u10nsZ0LKhhdsIxZEsVcLtOyL + pHffVcd+IJjI7uGHsRscJEPURMMn2FMtNTwuFusPrjFl48ji7nIAAAAASUVORK5CYII= + + + + + iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 + YQUAAAAZdEVYdFNvZnR3YXJlAEFkb2JlIEltYWdlUmVhZHlxyWU8AAADZmlUWHRYTUw6Y29tLmFkb2Jl + LnhtcAAAAAAAPD94cGFja2V0IGJlZ2luPSLvu78iIGlkPSJXNU0wTXBDZWhpSHpyZVN6TlRjemtjOWQi + Pz4gPHg6eG1wbWV0YSB4bWxuczp4PSJhZG9iZTpuczptZXRhLyIgeDp4bXB0az0iQWRvYmUgWE1QIENv + cmUgNS4zLWMwMTEgNjYuMTQ1NjYxLCAyMDEyLzAyLzA2LTE0OjU2OjI3ICAgICAgICAiPiA8cmRmOlJE + RiB4bWxuczpyZGY9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkvMDIvMjItcmRmLXN5bnRheC1ucyMiPiA8 + cmRmOkRlc2NyaXB0aW9uIHJkZjphYm91dD0iIiB4bWxuczp4bXBNTT0iaHR0cDovL25zLmFkb2JlLmNv + bS94YXAvMS4wL21tLyIgeG1sbnM6c3RSZWY9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlw + ZS9SZXNvdXJjZVJlZiMiIHhtbG5zOnhtcD0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wLyIgeG1w + TU06T3JpZ2luYWxEb2N1bWVudElEPSJ4bXAuZGlkOjYzQTM5NEY4Mjg0OUU0MTE5NDBEQTc4ODZEQzk5 + N0NGIiB4bXBNTTpEb2N1bWVudElEPSJ4bXAuZGlkOkUyMTg3NjEyNDlEODExRTQ4NjNGQjM2Mzk1QkNB + RkQwIiB4bXBNTTpJbnN0YW5jZUlEPSJ4bXAuaWlkOkUyMTg3NjExNDlEODExRTQ4NjNGQjM2Mzk1QkNB + RkQwIiB4bXA6Q3JlYXRvclRvb2w9IkFkb2JlIFBob3Rvc2hvcCBDUzYgKFdpbmRvd3MpIj4gPHhtcE1N + OkRlcml2ZWRGcm9tIHN0UmVmOmluc3RhbmNlSUQ9InhtcC5paWQ6NkJCNTE0NDlEODQ5RTQxMUE0QzNB + MjdEOTJBQzc3QkMiIHN0UmVmOmRvY3VtZW50SUQ9InhtcC5kaWQ6NjNBMzk0RjgyODQ5RTQxMTk0MERB + Nzg4NkRDOTk3Q0YiLz4gPC9yZGY6RGVzY3JpcHRpb24+IDwvcmRmOlJERj4gPC94OnhtcG1ldGE+IDw/ + eHBhY2tldCBlbmQ9InIiPz5e5MstAAADiUlEQVRIS+2UW0yTdxjGcePwtYyVVpAUCi1tv9ImrVbxhAei + kjGphAgFT4jzEJ0gGuJhDk0sml0sglmWmC1hqHNKWwI4srgNh3phpjg1O1yIN5DMbFHQZUu42O76+D4f + 3Fl6Z7ILn+SXvH3f533++X/98iUBeKW81v9Uwx1G1+1240EhfKfdeE/4U3qTAqaZZO/2aeN9IXLrY+Ph + wVOZHll9YyohgYZOGS4JsYdXVDy+NQ8Tvy3BP6OlmPyjDP9OBDRYs8cZPfRy5/uQISIRqcIsLSye+j7I + wN+PluOvhyWY+NmL8fsOjP9kxdN7BRh/YJHfFjy5m48nd4ThQjy968bEgwV49usicFciTEKKFhZPXXv1 + eHxtLsYGPBjttwsWjF0xY+ybOfj9uylYs8cZPfQS7kpEnqDTwuLp9GYlfKZeifUfzcb1j/Iw/IkNv3Q6 + MfKVC6O9bg3W7HFGD73cORlMG5AIizDzAaVtunD5ESXWfNSEY/tNCO00oG1zOkJBBSeqUjVYh6R3Qmat + zSY0Hjah7IASW7hPuSoRvIGihcVTSauCppvFODRUjJZvPWgaKMTuXgt2RHOxLTwHDd3EjPfCudgesWJX + jxM7eryo7/Ni8SGFj8gp6LWwePLvS0Og043A5y5UdtkQOJeLivM5ePf8bJSfM04zG2u7chDoysW6Thsq + zqpY0+GAvymNB/gEgxYWT64tKdGihpSYv8WEpSEzVp0pwDuf2SVQReCiS4M1e5zRQy937NXJ1yRirjDz + AVmVJyNZa9+PObauh7ptKdR6FY6N2SisTYe1OlmDNXtqvRNqwxLYt1TCVLY1ZijZOSQRbuEtLSyeTOXH + sfLDH1EauoFFx6/Cd6Qf7pYI1ObLsO+9iMLdF+DccwEuqd2Nl+Br6sbCxiiKd/XBuPogH1HiAzJXHMC8 + YA98td1wb4rCuaEH1roo8oMR5JGaMPIFa10Ejtowiuouw1vzJTwVXyBz+X4ekPgRZfgbohkLtsfMy47B + tqYdakUnPFUM6YUv+LUGa/Y4o8e8rBXcSffWDkpE4j9ZpEvNmb9KsZV16BzrBnVq1YjeVf1MX1Tzn74o + iCmkdq1/LrNHOkfgB6Vg9afJRrVOdv2ClRkMmklvCnyPs4V8ge81v5RegddnCGHNHmf00JslcJcZCcWv + IU1pAhcyhLcFXj1zGtbscUYPvdyZ+Uv6Wi8rKekFBjoX2627by8AAAAASUVORK5CYII= + + + + + iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 + YQUAAAAZdEVYdFNvZnR3YXJlAEFkb2JlIEltYWdlUmVhZHlxyWU8AAADZmlUWHRYTUw6Y29tLmFkb2Jl + LnhtcAAAAAAAPD94cGFja2V0IGJlZ2luPSLvu78iIGlkPSJXNU0wTXBDZWhpSHpyZVN6TlRjemtjOWQi + Pz4gPHg6eG1wbWV0YSB4bWxuczp4PSJhZG9iZTpuczptZXRhLyIgeDp4bXB0az0iQWRvYmUgWE1QIENv + cmUgNS4zLWMwMTEgNjYuMTQ1NjYxLCAyMDEyLzAyLzA2LTE0OjU2OjI3ICAgICAgICAiPiA8cmRmOlJE + RiB4bWxuczpyZGY9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkvMDIvMjItcmRmLXN5bnRheC1ucyMiPiA8 + cmRmOkRlc2NyaXB0aW9uIHJkZjphYm91dD0iIiB4bWxuczp4bXBNTT0iaHR0cDovL25zLmFkb2JlLmNv + bS94YXAvMS4wL21tLyIgeG1sbnM6c3RSZWY9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlw + ZS9SZXNvdXJjZVJlZiMiIHhtbG5zOnhtcD0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wLyIgeG1w + TU06T3JpZ2luYWxEb2N1bWVudElEPSJ4bXAuZGlkOjYzQTM5NEY4Mjg0OUU0MTE5NDBEQTc4ODZEQzk5 + N0NGIiB4bXBNTTpEb2N1bWVudElEPSJ4bXAuZGlkOkE2Q0VGMDE2NDlEQTExRTQ4NTlCQTI3NTMyOEY5 + NEU2IiB4bXBNTTpJbnN0YW5jZUlEPSJ4bXAuaWlkOkE2Q0VGMDE1NDlEQTExRTQ4NTlCQTI3NTMyOEY5 + NEU2IiB4bXA6Q3JlYXRvclRvb2w9IkFkb2JlIFBob3Rvc2hvcCBDUzYgKFdpbmRvd3MpIj4gPHhtcE1N + OkRlcml2ZWRGcm9tIHN0UmVmOmluc3RhbmNlSUQ9InhtcC5paWQ6NjA1MjM3NzFEOTQ5RTQxMUE0QzNB + MjdEOTJBQzc3QkMiIHN0UmVmOmRvY3VtZW50SUQ9InhtcC5kaWQ6NjNBMzk0RjgyODQ5RTQxMTk0MERB + Nzg4NkRDOTk3Q0YiLz4gPC9yZGY6RGVzY3JpcHRpb24+IDwvcmRmOlJERj4gPC94OnhtcG1ldGE+IDw/ + eHBhY2tldCBlbmQ9InIiPz6UH16BAAABrElEQVRIS63N70tTURzH8fsnKSGCCEIQCBKISMq2iILCgQOL + JUxQAoVKdMGQuwgWFepsMGjFZCMuorsIJV4WFatpvzdr1ZAFsaIHn8559v1eDsI91wevJ/ee7/tjbMRH + fAFwJOWRF6oopTzyQhWlVEdBwRbgUhICAnuvilKGtXDGzW6WV/CvbjE/xTfxr+R6q4xSxtP5YTf8rVn4 + s5dG+809Rv5zvVVGKaNwfYgyBfhksoH83CCF9seiL7LBBnLXTlP4/W4dza0ZLS0nCdlgA9npAQq/qk/Q + sKa0NJ8nIBtsIBPrp9CqPMJBYVLLj+04ZIMNrF49ReHwVRafH1/R8m3zJmSDDdy/fJJC88Ua3mcjWurW + LGSDDaQifRS+O8uopsNaPhVnIBts4E64l0Jj5y4qDy5q+ZCPQTbYgHmph8LXZ0m8TJ3Xsp+LQjbYQOJC + N4XadgLl22e1vM1OQDbYwK1zXRS+lBbhmEHsLgU8kTeVh+OQDTawEDpB2U4mitfpMS22GYJssIH5QCcV + FGwBmuRtkA3cGO3whcZUlEdeqKKU8sgLVZRSfjw+MP4DJ2GPpDR9OIsAAAAASUVORK5CYII= + + + + + iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 + YQUAAAAZdEVYdFNvZnR3YXJlAEFkb2JlIEltYWdlUmVhZHlxyWU8AAADZmlUWHRYTUw6Y29tLmFkb2Jl + LnhtcAAAAAAAPD94cGFja2V0IGJlZ2luPSLvu78iIGlkPSJXNU0wTXBDZWhpSHpyZVN6TlRjemtjOWQi + Pz4gPHg6eG1wbWV0YSB4bWxuczp4PSJhZG9iZTpuczptZXRhLyIgeDp4bXB0az0iQWRvYmUgWE1QIENv + cmUgNS4zLWMwMTEgNjYuMTQ1NjYxLCAyMDEyLzAyLzA2LTE0OjU2OjI3ICAgICAgICAiPiA8cmRmOlJE + RiB4bWxuczpyZGY9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkvMDIvMjItcmRmLXN5bnRheC1ucyMiPiA8 + cmRmOkRlc2NyaXB0aW9uIHJkZjphYm91dD0iIiB4bWxuczp4bXBNTT0iaHR0cDovL25zLmFkb2JlLmNv + bS94YXAvMS4wL21tLyIgeG1sbnM6c3RSZWY9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlw + ZS9SZXNvdXJjZVJlZiMiIHhtbG5zOnhtcD0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wLyIgeG1w + TU06T3JpZ2luYWxEb2N1bWVudElEPSJ4bXAuZGlkOjYzQTM5NEY4Mjg0OUU0MTE5NDBEQTc4ODZEQzk5 + N0NGIiB4bXBNTTpEb2N1bWVudElEPSJ4bXAuZGlkOjJGRTU5OEQ1NDlEQjExRTRBRUVDOTkyMjQ5NzEw + REUwIiB4bXBNTTpJbnN0YW5jZUlEPSJ4bXAuaWlkOjJGRTU5OEQ0NDlEQjExRTRBRUVDOTkyMjQ5NzEw + REUwIiB4bXA6Q3JlYXRvclRvb2w9IkFkb2JlIFBob3Rvc2hvcCBDUzYgKFdpbmRvd3MpIj4gPHhtcE1N + OkRlcml2ZWRGcm9tIHN0UmVmOmluc3RhbmNlSUQ9InhtcC5paWQ6MTY0MkI1RjlEQTQ5RTQxMUE0QzNB + MjdEOTJBQzc3QkMiIHN0UmVmOmRvY3VtZW50SUQ9InhtcC5kaWQ6NjNBMzk0RjgyODQ5RTQxMTk0MERB + Nzg4NkRDOTk3Q0YiLz4gPC9yZGY6RGVzY3JpcHRpb24+IDwvcmRmOlJERj4gPC94OnhtcG1ldGE+IDw/ + eHBhY2tldCBlbmQ9InIiPz6B5sF9AAACe0lEQVRIS7WVb2jMcRzHL7UHanF/Mts5prE/1li3kAfu5Ak7 + 5IHNobBkSC2UIuGJkrrSWRvTmHQWK8U1T8jqUtYwkZpaGjV/Js6to5YwfXze39+fu/v23f36hXe9us+f + 7/v9rd/dr3MQ0X/F4Zm3+K9QhWajNNlBFZqN0mQHS6lMdrCUyqSgimllUsy4XmOmp+QRDllQWbygjjq6 + uimZStOX8a+ixox3pXrM1JLCDAqYJmY7c669M0bff07mcLbtEl9QE8k6V6BH5ooXMsHZZX7ae+AY7W45 + SrPm19LbsSR9m/iRA2bYGefggVePzUgKBzeu9sQpmZ4QcG/WMtk7eLjv0WMz0kOz+TX6MUXvP6cFeNbD + bz6YvQFm2Bk9PPByZO6jksLB5KvRTzTyLikIrG2ktsvXzd4g2hGjYP1ms4eHvb850qkl65LCQW/ntVs0 + 9HpMcPx0K1X4V1Ff/3NzhnphbVDsjBk8Lm/VE44s0ZJ1KS4Ie8uXUvPBE7Tn0ElCzTMqrV5BO/cfEaDG + TD5X6PFFONLygsTF7jj1vxihyPkYNTS1iFrFxm37KHIhJmp43L7qZxzp0pJ1SeHhQGgLJQaH6fb9R1QX + 2EB3Ek9FryLe95j8K9eLT/TB0FZcskOP1iRdkIh23aR7Ay9pzaZddKY9Jup8nIpeoXXhZlHD655b85Bj + p2npLOmCML+dD/iTZhaX3+UvbRB1PpzeygFnSUUvatecRUMzisoOc+x0LZ3FixxYhQyK1cxyZhkTYhqY + RgnM6hmcwVl4ljDI0KS4AC+Kmyli8Jv2MF7GNwXY4QzOwgNv5mWTL7CLpVQmO1hKZbKDpVR/1P8OcvwB + lh7gOXXZq9sAAAAASUVORK5CYII= + + iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 @@ -598,147 +738,7 @@ 1BGxz38BvCwLsyQ3iHgAAAAASUVORK5CYII= - - - iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAZdEVYdFNvZnR3YXJlAEFkb2JlIEltYWdlUmVhZHlxyWU8AAADZmlUWHRYTUw6Y29tLmFkb2Jl - LnhtcAAAAAAAPD94cGFja2V0IGJlZ2luPSLvu78iIGlkPSJXNU0wTXBDZWhpSHpyZVN6TlRjemtjOWQi - Pz4gPHg6eG1wbWV0YSB4bWxuczp4PSJhZG9iZTpuczptZXRhLyIgeDp4bXB0az0iQWRvYmUgWE1QIENv - cmUgNS4zLWMwMTEgNjYuMTQ1NjYxLCAyMDEyLzAyLzA2LTE0OjU2OjI3ICAgICAgICAiPiA8cmRmOlJE - RiB4bWxuczpyZGY9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkvMDIvMjItcmRmLXN5bnRheC1ucyMiPiA8 - cmRmOkRlc2NyaXB0aW9uIHJkZjphYm91dD0iIiB4bWxuczp4bXBNTT0iaHR0cDovL25zLmFkb2JlLmNv - bS94YXAvMS4wL21tLyIgeG1sbnM6c3RSZWY9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlw - ZS9SZXNvdXJjZVJlZiMiIHhtbG5zOnhtcD0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wLyIgeG1w - TU06T3JpZ2luYWxEb2N1bWVudElEPSJ4bXAuZGlkOjYzQTM5NEY4Mjg0OUU0MTE5NDBEQTc4ODZEQzk5 - N0NGIiB4bXBNTTpEb2N1bWVudElEPSJ4bXAuZGlkOjEwQ0IxNzBBNEM1QzExRTRBNkNGQzRBMjhDQzI0 - MkY4IiB4bXBNTTpJbnN0YW5jZUlEPSJ4bXAuaWlkOjEwQ0IxNzA5NEM1QzExRTRBNkNGQzRBMjhDQzI0 - MkY4IiB4bXA6Q3JlYXRvclRvb2w9IkFkb2JlIFBob3Rvc2hvcCBDUzYgKFdpbmRvd3MpIj4gPHhtcE1N - OkRlcml2ZWRGcm9tIHN0UmVmOmluc3RhbmNlSUQ9InhtcC5paWQ6NTEzMDNDMjA1QjRDRTQxMTg4NERE - MUVBOEQ4QTgyNTUiIHN0UmVmOmRvY3VtZW50SUQ9InhtcC5kaWQ6NjNBMzk0RjgyODQ5RTQxMTk0MERB - Nzg4NkRDOTk3Q0YiLz4gPC9yZGY6RGVzY3JpcHRpb24+IDwvcmRmOlJERj4gPC94OnhtcG1ldGE+IDw/ - eHBhY2tldCBlbmQ9InIiPz43wa2/AAAFaUlEQVRIS6WUC0xTVxzGKy0UkSmlFGjBFilSkNpSaAWRh63y - sIiAArKs4spLRLQoiEJlSMGoMCc6CBOnYHzMOHUqqOhEHOqCbjNu6kCd6KYje5mZ6KbObd/OuVL3cEzj - /skv997/+b7v39PTW9aj3/BM+OKxPEIZoW/gyrOuPbP+GvRPSNBQQqXYLwSW1etw7cYt5kqfaZ+uD8QM - Xg8f/f4UxGhHMHv4qlG6vAb9394G6T+BPpdV1oCuUx3VD8Q9XT8//PUJRMghlLhLg1C41IK+r/pB+oNC - 16mO6qmP+gdi/6y793+hwTYEk9uoQOSaStHzxQ2Q/nND9XMKy0D9NIfmDcSzaLhI4KXE7LwinLtwGXfu - PXhhqJ/m0DyS62EdUGWpqcf3P97DD3d++t/QnKraBjpghXWAiC+WN0ZNScOe1mP45vbdF2ZvWwdoDs/D - b6ejs6ecxHPoAG/l+Fhkzy+FyCcY0YkG7D/yAW5+d+e5oXrqo36aQ/McnNyjyAAuHWA05pfgzPlehhyT - mflV6FOMaDt2Ctf7bw8KXac6qqc+a4Zx3hLwRLJCZgcJjcPIEPkyIZmeX1SB7vOX0dn9KQy5jw8r8eVc - HOrsxidXP0d9hxlzd4QgeYMzEt7kQVvOR0pFFNpOHmd81E9znIS+dSTc1foVGWfNKUZjyy6Ex6SQl0cD - 09IVxHAFh0+cReqr+QjK8ERqEw+VHWOwoycSR/v1OHwzDlsvhcNCeqkbedAYxQiPm87kZOQVw0nkW0QG - 2DFnIA+JRm3DFpzr/RKNW3ZDE5UAsX8ocizZiFs7DEUHvPFunw4Hb05B+y09jn49lYHe0x5doxqqLVlf - DJrnyB+pIQNs6QAhf6R8tZu3CqpwPdZu2I6PLl3HwnV5iHv9JVSeUOKdqzq81xeDvddiYG73R0aLEIZm - IRa1jUbjxQnYRHa17YqW0VJPwHT3LocRbirrDiymspXo6L6AgiXV8JSNQ2i6GpNWOqK4U4n1n0Vge68W - 9ecmIKnBBSqDCIp4P2RWGDB/QxqS6l1QcToIld3BqDobgsXEQ73+Se5HrGcgdJEokGzIx66DXXi7dRvC - yx2Q2RqApR+GoPbjCag8pUZ6sxjqWRKEldljRr07ZjaKmHt5qpBZKzkeiIJ2BbIPKmA8MIbJUC/ghrM0 - RfYsDtdhqJNIVulK/ku0BQokbfZGZrsKBR3BmEsMOfvl0FY7o7ypDPo1brCcGc+QUCdExabXEFsjQO4B - ObL2BSBlqx8SWwibvBE0334nK3Ael+yEbIW81DZszlhZ2oieuAYvpO5VIHGzP9J2+CN9pz/CzDwExMox - eZUbFnZpkEc+gLZagJjMWOiqXZDVqmC0+kZf6Nb4IHKFCPIsu92sgCw7BlJswjBJLCdenmuPyFUS6Gp9 - oG/yRdJWGSKqhYjKDgLRImK5ACGlzsy9d/zwXn2DBMZDSkZLPaHlnpBncyGO5kxj+Rps/wYdJE2xzfOb - zcU4sye0b0gRu3E0Ypt8ELTICRFGNcShUgjHuZyWxNu2096sdiXS9o1ltNQjyyDhes4SkuXEGpXC+Ve8 - kjlzpDPtoCkVQrdOihgyIHmXP6LryGEX86Ba6ISJNR7IeF+JV8gAfbOM0XoTj8dktpmEOxM4rJHTBscz - njNNnMiBagEfU98ajRnbZMg7GojCk2oGU1cw5nUGw7BHAZWJD6oVhLFzSDCPCacljGP/J7xAm6Hu0ew6 - STIXkcvckN7ig8XHVCjvUiNvdwAmW0Twms6FayS7meM4REoihxPoeT4u10nsZ0LKhhdsIxZEsVcLtOyL - pHffVcd+IJjI7uGHsRscJEPURMMn2FMtNTwuFusPrjFl48ji7nIAAAAASUVORK5CYII= - - - - - iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAZdEVYdFNvZnR3YXJlAEFkb2JlIEltYWdlUmVhZHlxyWU8AAADZmlUWHRYTUw6Y29tLmFkb2Jl - LnhtcAAAAAAAPD94cGFja2V0IGJlZ2luPSLvu78iIGlkPSJXNU0wTXBDZWhpSHpyZVN6TlRjemtjOWQi - Pz4gPHg6eG1wbWV0YSB4bWxuczp4PSJhZG9iZTpuczptZXRhLyIgeDp4bXB0az0iQWRvYmUgWE1QIENv - cmUgNS4zLWMwMTEgNjYuMTQ1NjYxLCAyMDEyLzAyLzA2LTE0OjU2OjI3ICAgICAgICAiPiA8cmRmOlJE - RiB4bWxuczpyZGY9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkvMDIvMjItcmRmLXN5bnRheC1ucyMiPiA8 - cmRmOkRlc2NyaXB0aW9uIHJkZjphYm91dD0iIiB4bWxuczp4bXBNTT0iaHR0cDovL25zLmFkb2JlLmNv - bS94YXAvMS4wL21tLyIgeG1sbnM6c3RSZWY9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlw - ZS9SZXNvdXJjZVJlZiMiIHhtbG5zOnhtcD0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wLyIgeG1w - TU06T3JpZ2luYWxEb2N1bWVudElEPSJ4bXAuZGlkOjYzQTM5NEY4Mjg0OUU0MTE5NDBEQTc4ODZEQzk5 - N0NGIiB4bXBNTTpEb2N1bWVudElEPSJ4bXAuZGlkOkUyMTg3NjEyNDlEODExRTQ4NjNGQjM2Mzk1QkNB - RkQwIiB4bXBNTTpJbnN0YW5jZUlEPSJ4bXAuaWlkOkUyMTg3NjExNDlEODExRTQ4NjNGQjM2Mzk1QkNB - RkQwIiB4bXA6Q3JlYXRvclRvb2w9IkFkb2JlIFBob3Rvc2hvcCBDUzYgKFdpbmRvd3MpIj4gPHhtcE1N - OkRlcml2ZWRGcm9tIHN0UmVmOmluc3RhbmNlSUQ9InhtcC5paWQ6NkJCNTE0NDlEODQ5RTQxMUE0QzNB - MjdEOTJBQzc3QkMiIHN0UmVmOmRvY3VtZW50SUQ9InhtcC5kaWQ6NjNBMzk0RjgyODQ5RTQxMTk0MERB - Nzg4NkRDOTk3Q0YiLz4gPC9yZGY6RGVzY3JpcHRpb24+IDwvcmRmOlJERj4gPC94OnhtcG1ldGE+IDw/ - eHBhY2tldCBlbmQ9InIiPz5e5MstAAADiUlEQVRIS+2UW0yTdxjGcePwtYyVVpAUCi1tv9ImrVbxhAei - kjGphAgFT4jzEJ0gGuJhDk0sml0sglmWmC1hqHNKWwI4srgNh3phpjg1O1yIN5DMbFHQZUu42O76+D4f - 3Fl6Z7ILn+SXvH3f533++X/98iUBeKW81v9Uwx1G1+1240EhfKfdeE/4U3qTAqaZZO/2aeN9IXLrY+Ph - wVOZHll9YyohgYZOGS4JsYdXVDy+NQ8Tvy3BP6OlmPyjDP9OBDRYs8cZPfRy5/uQISIRqcIsLSye+j7I - wN+PluOvhyWY+NmL8fsOjP9kxdN7BRh/YJHfFjy5m48nd4ThQjy968bEgwV49usicFciTEKKFhZPXXv1 - eHxtLsYGPBjttwsWjF0xY+ybOfj9uylYs8cZPfQS7kpEnqDTwuLp9GYlfKZeifUfzcb1j/Iw/IkNv3Q6 - MfKVC6O9bg3W7HFGD73cORlMG5AIizDzAaVtunD5ESXWfNSEY/tNCO00oG1zOkJBBSeqUjVYh6R3Qmat - zSY0Hjah7IASW7hPuSoRvIGihcVTSauCppvFODRUjJZvPWgaKMTuXgt2RHOxLTwHDd3EjPfCudgesWJX - jxM7eryo7/Ni8SGFj8gp6LWwePLvS0Og043A5y5UdtkQOJeLivM5ePf8bJSfM04zG2u7chDoysW6Thsq - zqpY0+GAvymNB/gEgxYWT64tKdGihpSYv8WEpSEzVp0pwDuf2SVQReCiS4M1e5zRQy937NXJ1yRirjDz - AVmVJyNZa9+PObauh7ptKdR6FY6N2SisTYe1OlmDNXtqvRNqwxLYt1TCVLY1ZijZOSQRbuEtLSyeTOXH - sfLDH1EauoFFx6/Cd6Qf7pYI1ObLsO+9iMLdF+DccwEuqd2Nl+Br6sbCxiiKd/XBuPogH1HiAzJXHMC8 - YA98td1wb4rCuaEH1roo8oMR5JGaMPIFa10Ejtowiuouw1vzJTwVXyBz+X4ekPgRZfgbohkLtsfMy47B - tqYdakUnPFUM6YUv+LUGa/Y4o8e8rBXcSffWDkpE4j9ZpEvNmb9KsZV16BzrBnVq1YjeVf1MX1Tzn74o - iCmkdq1/LrNHOkfgB6Vg9afJRrVOdv2ClRkMmklvCnyPs4V8ge81v5RegddnCGHNHmf00JslcJcZCcWv - IU1pAhcyhLcFXj1zGtbscUYPvdyZ+Uv6Wi8rKekFBjoX2627by8AAAAASUVORK5CYII= - - - - - iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAZdEVYdFNvZnR3YXJlAEFkb2JlIEltYWdlUmVhZHlxyWU8AAADZmlUWHRYTUw6Y29tLmFkb2Jl - LnhtcAAAAAAAPD94cGFja2V0IGJlZ2luPSLvu78iIGlkPSJXNU0wTXBDZWhpSHpyZVN6TlRjemtjOWQi - Pz4gPHg6eG1wbWV0YSB4bWxuczp4PSJhZG9iZTpuczptZXRhLyIgeDp4bXB0az0iQWRvYmUgWE1QIENv - cmUgNS4zLWMwMTEgNjYuMTQ1NjYxLCAyMDEyLzAyLzA2LTE0OjU2OjI3ICAgICAgICAiPiA8cmRmOlJE - RiB4bWxuczpyZGY9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkvMDIvMjItcmRmLXN5bnRheC1ucyMiPiA8 - cmRmOkRlc2NyaXB0aW9uIHJkZjphYm91dD0iIiB4bWxuczp4bXBNTT0iaHR0cDovL25zLmFkb2JlLmNv - bS94YXAvMS4wL21tLyIgeG1sbnM6c3RSZWY9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlw - ZS9SZXNvdXJjZVJlZiMiIHhtbG5zOnhtcD0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wLyIgeG1w - TU06T3JpZ2luYWxEb2N1bWVudElEPSJ4bXAuZGlkOjYzQTM5NEY4Mjg0OUU0MTE5NDBEQTc4ODZEQzk5 - N0NGIiB4bXBNTTpEb2N1bWVudElEPSJ4bXAuZGlkOkE2Q0VGMDE2NDlEQTExRTQ4NTlCQTI3NTMyOEY5 - NEU2IiB4bXBNTTpJbnN0YW5jZUlEPSJ4bXAuaWlkOkE2Q0VGMDE1NDlEQTExRTQ4NTlCQTI3NTMyOEY5 - NEU2IiB4bXA6Q3JlYXRvclRvb2w9IkFkb2JlIFBob3Rvc2hvcCBDUzYgKFdpbmRvd3MpIj4gPHhtcE1N - OkRlcml2ZWRGcm9tIHN0UmVmOmluc3RhbmNlSUQ9InhtcC5paWQ6NjA1MjM3NzFEOTQ5RTQxMUE0QzNB - MjdEOTJBQzc3QkMiIHN0UmVmOmRvY3VtZW50SUQ9InhtcC5kaWQ6NjNBMzk0RjgyODQ5RTQxMTk0MERB - Nzg4NkRDOTk3Q0YiLz4gPC9yZGY6RGVzY3JpcHRpb24+IDwvcmRmOlJERj4gPC94OnhtcG1ldGE+IDw/ - eHBhY2tldCBlbmQ9InIiPz6UH16BAAABrElEQVRIS63N70tTURzH8fsnKSGCCEIQCBKISMq2iILCgQOL - JUxQAoVKdMGQuwgWFepsMGjFZCMuorsIJV4WFatpvzdr1ZAFsaIHn8559v1eDsI91wevJ/ee7/tjbMRH - fAFwJOWRF6oopTzyQhWlVEdBwRbgUhICAnuvilKGtXDGzW6WV/CvbjE/xTfxr+R6q4xSxtP5YTf8rVn4 - s5dG+809Rv5zvVVGKaNwfYgyBfhksoH83CCF9seiL7LBBnLXTlP4/W4dza0ZLS0nCdlgA9npAQq/qk/Q - sKa0NJ8nIBtsIBPrp9CqPMJBYVLLj+04ZIMNrF49ReHwVRafH1/R8m3zJmSDDdy/fJJC88Ua3mcjWurW - LGSDDaQifRS+O8uopsNaPhVnIBts4E64l0Jj5y4qDy5q+ZCPQTbYgHmph8LXZ0m8TJ3Xsp+LQjbYQOJC - N4XadgLl22e1vM1OQDbYwK1zXRS+lBbhmEHsLgU8kTeVh+OQDTawEDpB2U4mitfpMS22GYJssIH5QCcV - FGwBmuRtkA3cGO3whcZUlEdeqKKU8sgLVZRSfjw+MP4DJ2GPpDR9OIsAAAAASUVORK5CYII= - - - - - iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAZdEVYdFNvZnR3YXJlAEFkb2JlIEltYWdlUmVhZHlxyWU8AAADZmlUWHRYTUw6Y29tLmFkb2Jl - LnhtcAAAAAAAPD94cGFja2V0IGJlZ2luPSLvu78iIGlkPSJXNU0wTXBDZWhpSHpyZVN6TlRjemtjOWQi - Pz4gPHg6eG1wbWV0YSB4bWxuczp4PSJhZG9iZTpuczptZXRhLyIgeDp4bXB0az0iQWRvYmUgWE1QIENv - cmUgNS4zLWMwMTEgNjYuMTQ1NjYxLCAyMDEyLzAyLzA2LTE0OjU2OjI3ICAgICAgICAiPiA8cmRmOlJE - RiB4bWxuczpyZGY9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkvMDIvMjItcmRmLXN5bnRheC1ucyMiPiA8 - cmRmOkRlc2NyaXB0aW9uIHJkZjphYm91dD0iIiB4bWxuczp4bXBNTT0iaHR0cDovL25zLmFkb2JlLmNv - bS94YXAvMS4wL21tLyIgeG1sbnM6c3RSZWY9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlw - ZS9SZXNvdXJjZVJlZiMiIHhtbG5zOnhtcD0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wLyIgeG1w - TU06T3JpZ2luYWxEb2N1bWVudElEPSJ4bXAuZGlkOjYzQTM5NEY4Mjg0OUU0MTE5NDBEQTc4ODZEQzk5 - N0NGIiB4bXBNTTpEb2N1bWVudElEPSJ4bXAuZGlkOjJGRTU5OEQ1NDlEQjExRTRBRUVDOTkyMjQ5NzEw - REUwIiB4bXBNTTpJbnN0YW5jZUlEPSJ4bXAuaWlkOjJGRTU5OEQ0NDlEQjExRTRBRUVDOTkyMjQ5NzEw - REUwIiB4bXA6Q3JlYXRvclRvb2w9IkFkb2JlIFBob3Rvc2hvcCBDUzYgKFdpbmRvd3MpIj4gPHhtcE1N - OkRlcml2ZWRGcm9tIHN0UmVmOmluc3RhbmNlSUQ9InhtcC5paWQ6MTY0MkI1RjlEQTQ5RTQxMUE0QzNB - MjdEOTJBQzc3QkMiIHN0UmVmOmRvY3VtZW50SUQ9InhtcC5kaWQ6NjNBMzk0RjgyODQ5RTQxMTk0MERB - Nzg4NkRDOTk3Q0YiLz4gPC9yZGY6RGVzY3JpcHRpb24+IDwvcmRmOlJERj4gPC94OnhtcG1ldGE+IDw/ - eHBhY2tldCBlbmQ9InIiPz6B5sF9AAACe0lEQVRIS7WVb2jMcRzHL7UHanF/Mts5prE/1li3kAfu5Ak7 - 5IHNobBkSC2UIuGJkrrSWRvTmHQWK8U1T8jqUtYwkZpaGjV/Js6to5YwfXze39+fu/v23f36hXe9us+f - 7/v9rd/dr3MQ0X/F4Zm3+K9QhWajNNlBFZqN0mQHS6lMdrCUyqSgimllUsy4XmOmp+QRDllQWbygjjq6 - uimZStOX8a+ixox3pXrM1JLCDAqYJmY7c669M0bff07mcLbtEl9QE8k6V6BH5ooXMsHZZX7ae+AY7W45 - SrPm19LbsSR9m/iRA2bYGefggVePzUgKBzeu9sQpmZ4QcG/WMtk7eLjv0WMz0kOz+TX6MUXvP6cFeNbD - bz6YvQFm2Bk9PPByZO6jksLB5KvRTzTyLikIrG2ktsvXzd4g2hGjYP1ms4eHvb850qkl65LCQW/ntVs0 - 9HpMcPx0K1X4V1Ff/3NzhnphbVDsjBk8Lm/VE44s0ZJ1KS4Ie8uXUvPBE7Tn0ElCzTMqrV5BO/cfEaDG - TD5X6PFFONLygsTF7jj1vxihyPkYNTS1iFrFxm37KHIhJmp43L7qZxzp0pJ1SeHhQGgLJQaH6fb9R1QX - 2EB3Ek9FryLe95j8K9eLT/TB0FZcskOP1iRdkIh23aR7Ay9pzaZddKY9Jup8nIpeoXXhZlHD655b85Bj - p2npLOmCML+dD/iTZhaX3+UvbRB1PpzeygFnSUUvatecRUMzisoOc+x0LZ3FixxYhQyK1cxyZhkTYhqY - RgnM6hmcwVl4ljDI0KS4AC+Kmyli8Jv2MF7GNwXY4QzOwgNv5mWTL7CLpVQmO1hKZbKDpVR/1P8OcvwB - lh7gOXXZq9sAAAAASUVORK5CYII= - - - + iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 YQUAAAAZdEVYdFNvZnR3YXJlAEFkb2JlIEltYWdlUmVhZHlxyWU8AAADZmlUWHRYTUw6Y29tLmFkb2Jl @@ -750,26 +750,244 @@ bS94YXAvMS4wL21tLyIgeG1sbnM6c3RSZWY9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlw ZS9SZXNvdXJjZVJlZiMiIHhtbG5zOnhtcD0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wLyIgeG1w TU06T3JpZ2luYWxEb2N1bWVudElEPSJ4bXAuZGlkOjJGQzkyMzc0Rjk0OUU0MTE5NjNCQjRENDMzQjlC - MUM4IiB4bXBNTTpEb2N1bWVudElEPSJ4bXAuZGlkOjJERjY3MEZENEQyMzExRTRCNDlGQUMwMzk0OTAw - Qzc4IiB4bXBNTTpJbnN0YW5jZUlEPSJ4bXAuaWlkOjJERjY3MEZDNEQyMzExRTRCNDlGQUMwMzk0OTAw - Qzc4IiB4bXA6Q3JlYXRvclRvb2w9IkFkb2JlIFBob3Rvc2hvcCBDUzYgKFdpbmRvd3MpIj4gPHhtcE1N - OkRlcml2ZWRGcm9tIHN0UmVmOmluc3RhbmNlSUQ9InhtcC5paWQ6NjhGOUEyRDEyMTRERTQxMUIzNkJE + MUM4IiB4bXBNTTpEb2N1bWVudElEPSJ4bXAuZGlkOjlDMzFEOUI4NEFBRjExRTQ4OTA5OUYwQ0QzM0Q2 + NEI4IiB4bXBNTTpJbnN0YW5jZUlEPSJ4bXAuaWlkOjlDMzFEOUI3NEFBRjExRTQ4OTA5OUYwQ0QzM0Q2 + NEI4IiB4bXA6Q3JlYXRvclRvb2w9IkFkb2JlIFBob3Rvc2hvcCBDUzYgKFdpbmRvd3MpIj4gPHhtcE1N + OkRlcml2ZWRGcm9tIHN0UmVmOmluc3RhbmNlSUQ9InhtcC5paWQ6MDk5Mzk2NTZBRjRBRTQxMTk3NEFD + QUFFQjRCMzVENkUiIHN0UmVmOmRvY3VtZW50SUQ9InhtcC5kaWQ6MkZDOTIzNzRGOTQ5RTQxMTk2M0JC + NEQ0MzNCOUIxQzgiLz4gPC9yZGY6RGVzY3JpcHRpb24+IDwvcmRmOlJERj4gPC94OnhtcG1ldGE+IDw/ + eHBhY2tldCBlbmQ9InIiPz73sIMwAAADIElEQVRIS7WVa0iTYRTH56Uiysvm3TkvpLl5DRIvQYWVWl+6 + iNEVg0yhQqloQZHkLT+Y0YdAs75IpEUhzERZoZhsRpZlS7soblotsRwoxhqWeTrnYZtv+u7NsB74cZ5z + zv89/z17HzYRAPxXeIv/EpFXcOyi4BvKhfehv4FvKBfeh+ayqIUDlIgBgT8whpRYoT2fhgvNVJKBQT9s + hB8/QZDPpnEIjEhg0J5Pw4Vm0mwygG9T06BSqQQhTUhUMoRGpyxYT7OZwfhXC6jVakFIYzNYqN5uMGKa + BI1GIwhpghXJaJJi13d0dEB2bj74hsWzSDlXbzfQG02g0+kEIU2wIomdovzKdVifngnFFytBeb4cLN+n + WaSc6hfKKqB/eHTWoHfwExgMBkFII5MnQUD4WlAWloO26wVs35MDmifPmQFFyqlO/aKKqlmDp31DYDKZ + BCGNTJ4IPqHx8LJvACbNUw7p6e2HuJQMNIhhBuaHj3vBYrEI0tb1BoIiE9kJ9h7Oh7EJM+g/jEJuwVlY + s24ri5RTnfo5BedAIoueIYPumvomuHzjzm9cq2uCq7UNUH2rEarr7kNd0yP26Y+eKoSWtk4wfpmAg7kn + ITY5DUorq1g8cOQEqze3aplOEhRtJoMcL1mMTixV9IgD5a/tSBVDYql8AKOBQLEJtTP08gY/jjFiktKg + 5FIV21Ok3NazvmR2AvrFkCAJyGYk1comZAuHDM/AyLvHThfBveZ26NOPwI59eey7LsbhFCmnOvVJ5+Ef + rrYZLEU8EZ85+HLwW7ZCLMVTFWdkHoLut+/hgbYHaE9XN31XNsupTrWV3jKVs+uS3cyAD0cLe331jW3Q + qRt0CPUlQVHDKI+fN9iGo4W90uNnyuA2vvRtWTlQgxeg/dk7FimnOvU9/CNqUe47b7ANRwt7AfjpKvAK + Gt18Qur35ymhRfsKKLr5hN7EyzDq7humWrrcfSfKxbz/QlwcLDck1snZJdUzYHUDmk57+K1qdXJyzsL6 + RmQD9ZmObygXB8sVIRO6fXQB4hC6eRQppzr1XXmHclnAckFomLc1Um5dItEvhZ97MQXP9N0AAAAASUVO + RK5CYII= + + + + + iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 + YQUAAAAZdEVYdFNvZnR3YXJlAEFkb2JlIEltYWdlUmVhZHlxyWU8AAADZmlUWHRYTUw6Y29tLmFkb2Jl + LnhtcAAAAAAAPD94cGFja2V0IGJlZ2luPSLvu78iIGlkPSJXNU0wTXBDZWhpSHpyZVN6TlRjemtjOWQi + Pz4gPHg6eG1wbWV0YSB4bWxuczp4PSJhZG9iZTpuczptZXRhLyIgeDp4bXB0az0iQWRvYmUgWE1QIENv + cmUgNS4zLWMwMTEgNjYuMTQ1NjYxLCAyMDEyLzAyLzA2LTE0OjU2OjI3ICAgICAgICAiPiA8cmRmOlJE + RiB4bWxuczpyZGY9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkvMDIvMjItcmRmLXN5bnRheC1ucyMiPiA8 + cmRmOkRlc2NyaXB0aW9uIHJkZjphYm91dD0iIiB4bWxuczp4bXBNTT0iaHR0cDovL25zLmFkb2JlLmNv + bS94YXAvMS4wL21tLyIgeG1sbnM6c3RSZWY9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlw + ZS9SZXNvdXJjZVJlZiMiIHhtbG5zOnhtcD0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wLyIgeG1w + TU06T3JpZ2luYWxEb2N1bWVudElEPSJ4bXAuZGlkOjJGQzkyMzc0Rjk0OUU0MTE5NjNCQjRENDMzQjlC + MUM4IiB4bXBNTTpEb2N1bWVudElEPSJ4bXAuZGlkOjhDMTdBQjRENEFBRTExRTQ4QjQyODY0MDNBNTJE + NzNCIiB4bXBNTTpJbnN0YW5jZUlEPSJ4bXAuaWlkOjhDMTdBQjRDNEFBRTExRTQ4QjQyODY0MDNBNTJE + NzNCIiB4bXA6Q3JlYXRvclRvb2w9IkFkb2JlIFBob3Rvc2hvcCBDUzYgKFdpbmRvd3MpIj4gPHhtcE1N + OkRlcml2ZWRGcm9tIHN0UmVmOmluc3RhbmNlSUQ9InhtcC5paWQ6NUQyMjc4QTlBQjRBRTQxMTk3NEFD + QUFFQjRCMzVENkUiIHN0UmVmOmRvY3VtZW50SUQ9InhtcC5kaWQ6MkZDOTIzNzRGOTQ5RTQxMTk2M0JC + NEQ0MzNCOUIxQzgiLz4gPC9yZGY6RGVzY3JpcHRpb24+IDwvcmRmOlJERj4gPC94OnhtcG1ldGE+IDw/ + eHBhY2tldCBlbmQ9InIiPz4eHsDfAAAB00lEQVRIS7XVWytEURQH8HniTTNHLs0NCXNcXjTN5dH9g/gM + 3jx590QhFDJS0gyTGmpqaqJIMW4hzlAoOaWISS7LWifntI3ddnTGrl92e/57/We/DBsA/CvuYSHZSr0t + lvCGsriX/oI3lMW9lM/SwgF9SEHwizs08IX2vAyLZvZRgXJ+cQWv7yB0q96Ds86voT0vw6KZNJsK4Pnl + DWKxmBBlqhpDUN0UNp2n2VrB/WMOEomEEGX0ArN5o+BGfYB0Oi1EGa8cwpKw6bxRcH6lQiaTEaKMVw5q + rzCbNwr2z65BURQhynh8Qe0VZvNGwdZBFlRVFaKMxxfQXmE2rxc8rW3sQy6XE0puHoG7IaC9YnV9j5th + pbZPqOCDCrbH5uIwOD7/zWgkDkNTizAyuwQjkWWIxFNQWduqmVxI/MiPz6/A8HTUuDMTTYLkbrqhgt5S + T3PG4ZJ3HE7focElZx0u3yn+VQiG1ZLymmm7s74f88f42S6bl9zyJZ6d6Xckd+Mt5ieogH4xJORHHajt + SzvqZPSgECpHZSiA2DztuxBlad+NgnpBEbIjusiiYboKRF+kGFHegUR5ImkFv7G0eAPzWVq8gfksLd5/ + oULiHhYS97BwwPYJlSCUgVubViQAAAAASUVORK5CYII= + + + + + iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 + YQUAAAAZdEVYdFNvZnR3YXJlAEFkb2JlIEltYWdlUmVhZHlxyWU8AAADZmlUWHRYTUw6Y29tLmFkb2Jl + LnhtcAAAAAAAPD94cGFja2V0IGJlZ2luPSLvu78iIGlkPSJXNU0wTXBDZWhpSHpyZVN6TlRjemtjOWQi + Pz4gPHg6eG1wbWV0YSB4bWxuczp4PSJhZG9iZTpuczptZXRhLyIgeDp4bXB0az0iQWRvYmUgWE1QIENv + cmUgNS4zLWMwMTEgNjYuMTQ1NjYxLCAyMDEyLzAyLzA2LTE0OjU2OjI3ICAgICAgICAiPiA8cmRmOlJE + RiB4bWxuczpyZGY9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkvMDIvMjItcmRmLXN5bnRheC1ucyMiPiA8 + cmRmOkRlc2NyaXB0aW9uIHJkZjphYm91dD0iIiB4bWxuczp4bXBNTT0iaHR0cDovL25zLmFkb2JlLmNv + bS94YXAvMS4wL21tLyIgeG1sbnM6c3RSZWY9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlw + ZS9SZXNvdXJjZVJlZiMiIHhtbG5zOnhtcD0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wLyIgeG1w + TU06T3JpZ2luYWxEb2N1bWVudElEPSJ4bXAuZGlkOjJGQzkyMzc0Rjk0OUU0MTE5NjNCQjRENDMzQjlC + MUM4IiB4bXBNTTpEb2N1bWVudElEPSJ4bXAuZGlkOjJEMDQyOEZBNEFEMjExRTRBN0MxRDBCNzJGRUND + MDEzIiB4bXBNTTpJbnN0YW5jZUlEPSJ4bXAuaWlkOjJEMDQyOEY5NEFEMjExRTRBN0MxRDBCNzJGRUND + MDEzIiB4bXA6Q3JlYXRvclRvb2w9IkFkb2JlIFBob3Rvc2hvcCBDUzYgKFdpbmRvd3MpIj4gPHhtcE1N + OkRlcml2ZWRGcm9tIHN0UmVmOmluc3RhbmNlSUQ9InhtcC5paWQ6QkRDRkI1RDVEMTRBRTQxMTk3NEFD + QUFFQjRCMzVENkUiIHN0UmVmOmRvY3VtZW50SUQ9InhtcC5kaWQ6MkZDOTIzNzRGOTQ5RTQxMTk2M0JC + NEQ0MzNCOUIxQzgiLz4gPC9yZGY6RGVzY3JpcHRpb24+IDwvcmRmOlJERj4gPC94OnhtcG1ldGE+IDw/ + eHBhY2tldCBlbmQ9InIiPz59jfe3AAAEbUlEQVRIS8WTeUybZRzHF48/pnFOuQRajkFLgQFb5iRLNJr4 + l/EPgsniUI4xZDAY1zyxwApsMJyIME61rByl3DfoYGBrgbWUY06FcZSCha4rQ8jYxkqPr2/fvkv8o2Sg + S/wkT970eb6/T5/39z7Prv8dt/Oql4mR4HZJ3ccoXFxhVCzB9DT9JueJdSq6c1wzVZFupepVzxu34XVj + CaEDi1jX6hF8ZQoeokl4iBVwzV9YdU1XRlIl28eVo8phCdXwGltEeOUsro6psaHVwcSDh5volc4iOO8X + 7KuVwb1hEi7J8myq9PEQO//I85oafr0KtEpUpNSETm+AwWDAvfv3YTQaybnm/t/AyO6Ga+UonJOnIijF + 1hA9tWI2qle9RxcI+RIpmZpTIfBULhIyyqHVahHPKcN70TmYnFFCp9OhqXcc9KwW0DOHVl3YU1aUyjJu + F1SpfhO3EM6bMMsVt+D8Zhz2HIpC4oU6bG5uIu4cD3tfTwAjIBNypQYbGxsISquBU34PaDHiVEplGXee + SuIjVaBv3Lz7gJg8vHg4FlZvc+ATVoLipiHsD8qCXWAO7IPK8MG5FjLXKboOeoYADkldUkplGWb7vOb4 + 4BzxIXXQE/1m59WDXdgBvxPfwz6UC4eQUth/WIBDZ2qQXj+K7IYRImeE5s5fOFrcDPvPapcJzVNmmwVY + VxWG9U09uau1tTVymPpc0iYFLew7OEUJ4BwtALfvJpl5xMrKCu6s3cUrn5YbCM1us80CrJZZVWjXr7j3 + 4CE0y8v4IrcaH+cK4Bv+DRyPl8ApphYuia3wZ3eCUzOA1PIfcVuzjHnlIgK/vgy7mHzTG+w12yzA5E53 + edYPo1c2i/X1dQTEfwvbwDQ4hhXg8OcN4P48Df+UTrgkNIAeW4Hg3Hbo9Xq0iGSgs4ls5CUhoXnObLOA + S8pkhG/bdZzgDZJnffT3GXieLAA9XgB2/RjZjuQqMWhxfBw824H55XWyhcfy+HDNqoB1SH4Codn6G7iw + p3d78EaVPlXX0CaZgkqlgly1gpCiK0htHCH/IL6oFcEF3ZjT3CUvXqv0DzDSS0FPq1a/8EbYS5Rqa+if + SAJ8KoeNR7gitEsnoVQqSbGOkJmYX1ggxaY70SabwIGMUrjn8I3WIXnBRPnWu/8nDnE9Sd7cAaP/ZSES + 6/rRKJRArpiHXC7HzekZNIukiCyrhW9mGZgXa4w2kUVnibJnzdXbxP5URzyDO4QjxGl5i9uNpMZeKP5U + IrywAq9yCnGAOGGMonbYxpVnEPGdyR9BO/MTj8kfgXeNFPt5IngVtoF1kQ9WcTs8qgfgmNreQMS21xZL + 0E6Ln6ef75tg8sfgXT8O77oReAkkYNXJ4PRV/4ztyfo9VPTf4xjdf9CpQKzdxxuGe6UMbhXEmc8V6mze + r3qNivx3HGN7UmglQ6CVDMIxXwybo5UcaunJQD8te9rhyx4JrWwItlGNUut3y5+hlp4cDhFCpl14k9jq + nR+Y1NTjIe7NlmMnWKoHsOtvjWYcKpheqFQAAAAASUVORK5CYII= + + + + + iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 + YQUAAAAZdEVYdFNvZnR3YXJlAEFkb2JlIEltYWdlUmVhZHlxyWU8AAADZmlUWHRYTUw6Y29tLmFkb2Jl + LnhtcAAAAAAAPD94cGFja2V0IGJlZ2luPSLvu78iIGlkPSJXNU0wTXBDZWhpSHpyZVN6TlRjemtjOWQi + Pz4gPHg6eG1wbWV0YSB4bWxuczp4PSJhZG9iZTpuczptZXRhLyIgeDp4bXB0az0iQWRvYmUgWE1QIENv + cmUgNS4zLWMwMTEgNjYuMTQ1NjYxLCAyMDEyLzAyLzA2LTE0OjU2OjI3ICAgICAgICAiPiA8cmRmOlJE + RiB4bWxuczpyZGY9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkvMDIvMjItcmRmLXN5bnRheC1ucyMiPiA8 + cmRmOkRlc2NyaXB0aW9uIHJkZjphYm91dD0iIiB4bWxuczp4bXBNTT0iaHR0cDovL25zLmFkb2JlLmNv + bS94YXAvMS4wL21tLyIgeG1sbnM6c3RSZWY9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlw + ZS9SZXNvdXJjZVJlZiMiIHhtbG5zOnhtcD0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wLyIgeG1w + TU06T3JpZ2luYWxEb2N1bWVudElEPSJ4bXAuZGlkOjJGQzkyMzc0Rjk0OUU0MTE5NjNCQjRENDMzQjlC + MUM4IiB4bXBNTTpEb2N1bWVudElEPSJ4bXAuZGlkOjJERTg4QTFENEQyMjExRTRBODEyODk0M0RBMTc5 + Qjg3IiB4bXBNTTpJbnN0YW5jZUlEPSJ4bXAuaWlkOjJERTg4QTFDNEQyMjExRTRBODEyODk0M0RBMTc5 + Qjg3IiB4bXA6Q3JlYXRvclRvb2w9IkFkb2JlIFBob3Rvc2hvcCBDUzYgKFdpbmRvd3MpIj4gPHhtcE1N + OkRlcml2ZWRGcm9tIHN0UmVmOmluc3RhbmNlSUQ9InhtcC5paWQ6NjJGOUEyRDEyMTRERTQxMUIzNkJE NUVDQjU5MzE1NjIiIHN0UmVmOmRvY3VtZW50SUQ9InhtcC5kaWQ6MkZDOTIzNzRGOTQ5RTQxMTk2M0JC NEQ0MzNCOUIxQzgiLz4gPC9yZGY6RGVzY3JpcHRpb24+IDwvcmRmOlJERj4gPC94OnhtcG1ldGE+IDw/ - eHBhY2tldCBlbmQ9InIiPz6GKmpFAAAC+UlEQVRIS63T20vTYRzH8Yforj/Ei24UiSgKIygKi8oyxZQo - cvNYeXaesmzqPGu2POd0ulSsnIdaurTSTJ3O6UxTPGya5vCQx5AuPn39RbHop7nZxQt+z3ie93e/Z4w1 - p7nsCoBt8R6yBF/UHPv+Wb0rfFFzm99CRIwEW1gnqXzxTXxRc0ydctm4OlID2sxrw6iCtiwItC+A2P/D - frLnjwGNSZdMq6N1WOvLwFpP4l/WdRlY6Jaio9Ab7QXba8sVoDHZGdT8PYS9THDqMGnLsKpNw0qXGCua - BO55VZdNQ6U/DRRibVCGb+N1pH5bukoRqHmDHOIG1N8/X2F4I8WyNhtf2+9hqSsZxqZ4upbb6HsSZLHO - Im90ym6hNVcIaktYTexZyUelGEvaHMy/jcFiZxo0xX5Y7ivGcn8JkVmA9uvlWBmqwpJeAWovs+poR99O - eRgWtQWYVUdgrj0FH+i+F3XF3NoappZYGJrEoLaOVYpOOTY/FGJB+xjTqnDMtMTTAC/Ma/Ix/TLUKl9e - x0JfFQpql7PykBP7lWIXzPeUYLIhHCPKCLr/AMy2ZsKoDLTKdNNdvM8TgNpRTBZwfJ885CTmaIChPhwa - mS+GnkdhqjEWY9X+VplqvIMXEhdQ24mZeuSs0N/BNNWWj4k6EdSZHhhXxWH0aSCGFd4c4Tk7zk7XBlUM - FKLToK4Nm+0qYnneRzqGGiSYaIiiyZdhVCdgqFSIwRJPjucZW85O1pvnRmvDkO9zFNTdy2Y6HjGp4HCF - 5kk4xhoiURd/EROv4tBfeM0qAyUC9Mp9QM0+7o829T6LZV0/mNycS6+nFKFWfAGj9ZHozfGwil7miZYH - 7qCmghsw+S6VpV894KuUuKFbfhNNqa749CwY3dm0toK+VABl3HlQM5obYHybwFLc7W1y/Y5BlX6FfgNn - DNcEY0DhZZX+MiGKbh0DNR24AYYWMSfJzc6GZBApwS5skIzNODcg0dV2V36FtsJ7yBJ8UXO8hyzBFzXH - ++H/A/YDv9/V87iOlrYAAAAASUVORK5CYII= + eHBhY2tldCBlbmQ9InIiPz6wJF34AAACl0lEQVRIS62Vy08TURSH73/QhQtXVnBhxEcMiUkhbEg0hB1R + Q1i68C8wIW5cEqMLN7ho2Ji4YiEhWq0prYUhfULbadN3obTaChobtZEUsFY9nnPS6WM6HYowyZf87j33 + nG/amaai9geOBYA+4pTxihmBE8DcTQB4J8em/9IwSQyagmrtL+z9rMFmvnhkKvtV7tcVHPz6DVsftulA + AckdhUg8zf19eoLKAd597iMLMItewfOxUDTN/bqCH3tVSG8VWIBZ9AoJApEk9+sKvu/uQ2IjzwJkGtH8 + OrTwy3Hu77vIAnV9mgWlcgWiqRwLjAMmkOMbPbNTKnN/JJntqJGEBZ++7oKcyLLgLN4JrU8Cms2C4pcy + BKKZumCI18temQ/8DzSLZlBmQX7nG/jCKdpgAa0driCtY5iFHuqHSjNoFtaags1iCdzBBG+QgNY2aZ0F + mIUe6osENAtrTUEq/7kDq9PHAszU5yYoq9f1i9cUSCD5ozxDEeTsrhAoONwyxLLb8MrhYQFmZYCHsnpd + v3hNgQROb5hnKIK29944MAThTBEWbS4WYBZ6qC/sKSy5ZJ6BGUQg8b4Bbhjod4AZXlhXWdBa10LrIVul + AM9ggS+aa6AIMMO8ZYUO0KeyIOMtZyaQpXpNi4LFucYzMINwhbMNcMNw5oIJMMNKIA0LNg88mZuH/ssj + dPgBMnN+cBRmny1wrRtSMMMzWCCFMg0UAeY2Fh0+GL5xG8Zu3oHXUrCj3g0WONdTbeBm21/o1N17gPtg + 98Xh3VoS3qzKMDI22agfglnY/Uld8NDc/ZlZwAwvl4Ngun6LGh8rdfVDViNs3rguOOzq6XOD8PDpc7g2 + OkHDH7XWtYa2It66Y4eCQ8cRfpvUNa2hTUD8A6JMaBvCyTdJAAAAAElFTkSuQmCC + + + + + iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 + YQUAAAAZdEVYdFNvZnR3YXJlAEFkb2JlIEltYWdlUmVhZHlxyWU8AAADZmlUWHRYTUw6Y29tLmFkb2Jl + LnhtcAAAAAAAPD94cGFja2V0IGJlZ2luPSLvu78iIGlkPSJXNU0wTXBDZWhpSHpyZVN6TlRjemtjOWQi + Pz4gPHg6eG1wbWV0YSB4bWxuczp4PSJhZG9iZTpuczptZXRhLyIgeDp4bXB0az0iQWRvYmUgWE1QIENv + cmUgNS4zLWMwMTEgNjYuMTQ1NjYxLCAyMDEyLzAyLzA2LTE0OjU2OjI3ICAgICAgICAiPiA8cmRmOlJE + RiB4bWxuczpyZGY9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkvMDIvMjItcmRmLXN5bnRheC1ucyMiPiA8 + cmRmOkRlc2NyaXB0aW9uIHJkZjphYm91dD0iIiB4bWxuczp4bXBNTT0iaHR0cDovL25zLmFkb2JlLmNv + bS94YXAvMS4wL21tLyIgeG1sbnM6c3RSZWY9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlw + ZS9SZXNvdXJjZVJlZiMiIHhtbG5zOnhtcD0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wLyIgeG1w + TU06T3JpZ2luYWxEb2N1bWVudElEPSJ4bXAuZGlkOjJGQzkyMzc0Rjk0OUU0MTE5NjNCQjRENDMzQjlC + MUM4IiB4bXBNTTpEb2N1bWVudElEPSJ4bXAuZGlkOkUzNzJDMjE3NEFENjExRTRCNjE0OEVEQzI4MEM0 + RTZDIiB4bXBNTTpJbnN0YW5jZUlEPSJ4bXAuaWlkOkUzNzJDMjE2NEFENjExRTRCNjE0OEVEQzI4MEM0 + RTZDIiB4bXA6Q3JlYXRvclRvb2w9IkFkb2JlIFBob3Rvc2hvcCBDUzYgKFdpbmRvd3MpIj4gPHhtcE1N + OkRlcml2ZWRGcm9tIHN0UmVmOmluc3RhbmNlSUQ9InhtcC5paWQ6RkI3NUQ0QkNENDRBRTQxMTk3NEFD + QUFFQjRCMzVENkUiIHN0UmVmOmRvY3VtZW50SUQ9InhtcC5kaWQ6MkZDOTIzNzRGOTQ5RTQxMTk2M0JC + NEQ0MzNCOUIxQzgiLz4gPC9yZGY6RGVzY3JpcHRpb24+IDwvcmRmOlJERj4gPC94OnhtcG1ldGE+IDw/ + eHBhY2tldCBlbmQ9InIiPz6PyaLfAAADMElEQVRIS6VUXUiTYRT+vi3Tzd+ps23+3KRigtiPkolEQReG + UYTkhWatpWlWGkRdddfdSPImqUAJjSIT00oxLJIk0cR+tFSyzDJtgaMkDEPkdM7ZPvm2vS6jBx6es3Pe + 8zzvtm+TohLS/ov+AACStLgEQuJyLRJWYK1yzh/+FgCoQrpnfM4fOGBhcUlIMkEVkma4H4i1y2kFcMD8 + wqKQZILKZqTqmlTAWrfvMjhgbv63Dwm0hLWQohn1eNEbzrlfPiTQAtZCKjP1GXdAIC+r4XD+9CGBFrDm + RVJ1re6pZ0GyHHMvIawauYVNCFPfvvuQQAtYC6meKXU0amNsaGN/ZR60xIf9aIgN3cpGE9OzZCZ85nEm + pGiWlLABmuJCnUOXrNB7chdct4TUo32ANDbp4NuielDpqWfePdaPX6GrohSK4uLhlCEo96YlZLbOFHzH + oJXjMSBcGn4/zQGovEDqXXtzeTb+BTrKj0J3+Q54djYP7EZdTU2MPjFSK8eieQR9QtLg6GcOQPWgqKeQ + ZyOfoK30CDw+lg2Ot3Z4VLoNqo269mCNHIa2WjYn9A1PcAAqU6m9VV3TF9psOwwPS3JgZugCdNoyocwU + jU+RlImWBpezGz0vxzkA1YOiHvPFO7Ca1kGHLQtmXp2HdutmqN+/F6JiU+h3kOpyVeHJwBgHoLIpqajm + 189HoaG4CNqsGTA1UAWth9Lg6r490PygGyLjUikgzuWqQlffCAegelDdUwLqigqhpXgjTPYeh+bCFCg2 + RkEk3vxuVz/P0c43oLP3DQegLhspNalSFxiNcLswHT48LYNbBUlQk7ebzenmyhm08w1o7xmiAP6hRZiT + 70eYkzpctUuJWdHmwWs74+F1Uz7cyE+E4ohQB5mHm9a3GywpTXzektyKduIAIsKI3ISkL4rIdYle05C9 + VrZVBmvtl7eboUyv7V4jSQdwRn8FdI72iErtCUxnIuifkJ5hUqUOq9Jr7OeCNU6bTpNVqtMcDJSldOwn + KnOk+jypJ5QANRWc0cs5SEelXr54QidfwVYAMoiHq4W/gNM6OaNCJ+diaUIqN/43+Atwg27t+9ZXBUn6 + A2MdqQeVc5pWAAAAAElFTkSuQmCC + + + + + iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAIAAABvFaqvAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 + YQUAAAAZdEVYdFNvZnR3YXJlAEFkb2JlIEltYWdlUmVhZHlxyWU8AAADZmlUWHRYTUw6Y29tLmFkb2Jl + LnhtcAAAAAAAPD94cGFja2V0IGJlZ2luPSLvu78iIGlkPSJXNU0wTXBDZWhpSHpyZVN6TlRjemtjOWQi + Pz4gPHg6eG1wbWV0YSB4bWxuczp4PSJhZG9iZTpuczptZXRhLyIgeDp4bXB0az0iQWRvYmUgWE1QIENv + cmUgNS4zLWMwMTEgNjYuMTQ1NjYxLCAyMDEyLzAyLzA2LTE0OjU2OjI3ICAgICAgICAiPiA8cmRmOlJE + RiB4bWxuczpyZGY9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkvMDIvMjItcmRmLXN5bnRheC1ucyMiPiA8 + cmRmOkRlc2NyaXB0aW9uIHJkZjphYm91dD0iIiB4bWxuczp4bXBNTT0iaHR0cDovL25zLmFkb2JlLmNv + bS94YXAvMS4wL21tLyIgeG1sbnM6c3RSZWY9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlw + ZS9SZXNvdXJjZVJlZiMiIHhtbG5zOnhtcD0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wLyIgeG1w + TU06T3JpZ2luYWxEb2N1bWVudElEPSJ4bXAuZGlkOjJGQzkyMzc0Rjk0OUU0MTE5NjNCQjRENDMzQjlC + MUM4IiB4bXBNTTpEb2N1bWVudElEPSJ4bXAuZGlkOjUzQzNGNDI5NEQyQzExRTQ4QkE1QUNCMEVDRDZF + MDVEIiB4bXBNTTpJbnN0YW5jZUlEPSJ4bXAuaWlkOjUzQzNGNDI4NEQyQzExRTQ4QkE1QUNCMEVDRDZF + MDVEIiB4bXA6Q3JlYXRvclRvb2w9IkFkb2JlIFBob3Rvc2hvcCBDUzYgKFdpbmRvd3MpIj4gPHhtcE1N + OkRlcml2ZWRGcm9tIHN0UmVmOmluc3RhbmNlSUQ9InhtcC5paWQ6RkI1NUY4OTYyQTRERTQxMUIzNkJE + NUVDQjU5MzE1NjIiIHN0UmVmOmRvY3VtZW50SUQ9InhtcC5kaWQ6MkZDOTIzNzRGOTQ5RTQxMTk2M0JC + NEQ0MzNCOUIxQzgiLz4gPC9yZGY6RGVzY3JpcHRpb24+IDwvcmRmOlJERj4gPC94OnhtcG1ldGE+IDw/ + eHBhY2tldCBlbmQ9InIiPz6IsaOmAAADF0lEQVQ4T62U/UuTURTH+0nICqRI1ERMMyNQe8N0ChqBwQhN + yvwhEgJjVCqJ/qCibZo6tzQ339h6Nre5prapUzc1XzItX1ilzuWMLLVAen+xf6DTuTxjdxsFVj58ebjc + c+7nnud7z3228DbpIaDFH/CfoqCn72DIDvNfPDM2KAqyr8PcJxqY+QBTb8kkjocXQTsKigGwfqYJHqIg + 1OxHGHvlWPx4hXB1YyA3g4CBhqst+piEnrDA3rA95vBAY1x8d7lq/DVZwm5PQZNvoKYdypSgHgbVEIh1 + cLOZzOCbSSsyRQRba6uWtcpVLbPcwlglInNUCJNWWKqABqMLCGvGlfpJELaQ/V1Vd1lujAhe0chtUrH5 + ZExnmJ85MdomEa+qZMbIEF2BHGunILSjdZwYgTt4gJqjjj0Rltml1Zq9AeL0Mn71Wn2mtDU80MIvsFTw + O+KPIoWC8BNYRIUaqrRQroJKjQOk9N+xLBF2pXJFKfnsDGYa8gS6xOO2whyMuoHaHpGzZ/pBM0IMrtXD + nT4HqNHXe0lYoogMFeQP4jbSDkCPTUyXmnNoPutSo+9WN5DEQDyeWCWnhqm4p7Oimt3b54rzmmKPVHKz + 0Xg0AU1pz87VJp+yXOfd9t3mBmLXsGrsJhSsDtF4iOWxKdpzyQNnuRW7vEUp13obFG05OVUBPtO5V1Sn + k5q4SX8ENfWA6C7xHsP981Bb2sf38ZKd4JhSuXUJHPHhg/WJnAeZFw0Xzt/w8erRtLmBnB/CSmaC599I + 2PYVRl+CXigu3R9SfCC0Pf1MZ1oqvqvjogX7gtRFJfb1n24g7GblfQcFP2fkBYm5anxqQcbLKgzyK/Df + WRTkV5+RMTg84ZrgAOHo4ZIDVNdJw67CpsVLZ5gifj97Typlq2ZFQXj8LKh5EHpnaIar8N+Al5l9Y9Vs + T7OiIAzjqaMsa6QJnBkeWvgOHdPkAuIV67PSeQpCYYZplsZ+KyyWLRyFF8D553EDbURY770J0rrYJbda + SYE4iWb9NcgpRKDrOMAWwYP6d5BTaC52zyaAWDlAm/DweL8AX9zXukfxHsIAAAAASUVORK5CYII= + + + + + iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 + YQUAAAAZdEVYdFNvZnR3YXJlAEFkb2JlIEltYWdlUmVhZHlxyWU8AAADZmlUWHRYTUw6Y29tLmFkb2Jl + LnhtcAAAAAAAPD94cGFja2V0IGJlZ2luPSLvu78iIGlkPSJXNU0wTXBDZWhpSHpyZVN6TlRjemtjOWQi + Pz4gPHg6eG1wbWV0YSB4bWxuczp4PSJhZG9iZTpuczptZXRhLyIgeDp4bXB0az0iQWRvYmUgWE1QIENv + cmUgNS4zLWMwMTEgNjYuMTQ1NjYxLCAyMDEyLzAyLzA2LTE0OjU2OjI3ICAgICAgICAiPiA8cmRmOlJE + RiB4bWxuczpyZGY9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkvMDIvMjItcmRmLXN5bnRheC1ucyMiPiA8 + cmRmOkRlc2NyaXB0aW9uIHJkZjphYm91dD0iIiB4bWxuczp4bXBNTT0iaHR0cDovL25zLmFkb2JlLmNv + bS94YXAvMS4wL21tLyIgeG1sbnM6c3RSZWY9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlw + ZS9SZXNvdXJjZVJlZiMiIHhtbG5zOnhtcD0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wLyIgeG1w + TU06T3JpZ2luYWxEb2N1bWVudElEPSJ4bXAuZGlkOjJGQzkyMzc0Rjk0OUU0MTE5NjNCQjRENDMzQjlC + MUM4IiB4bXBNTTpEb2N1bWVudElEPSJ4bXAuZGlkOkVENUYwQThBNEQyOTExRTQ5QzUzQzdFMkFGQkQy + NTA1IiB4bXBNTTpJbnN0YW5jZUlEPSJ4bXAuaWlkOkVENUYwQTg5NEQyOTExRTQ5QzUzQzdFMkFGQkQy + NTA1IiB4bXA6Q3JlYXRvclRvb2w9IkFkb2JlIFBob3Rvc2hvcCBDUzYgKFdpbmRvd3MpIj4gPHhtcE1N + OkRlcml2ZWRGcm9tIHN0UmVmOmluc3RhbmNlSUQ9InhtcC5paWQ6MkRGNkEzOUYyOTRERTQxMUIzNkJE + NUVDQjU5MzE1NjIiIHN0UmVmOmRvY3VtZW50SUQ9InhtcC5kaWQ6MkZDOTIzNzRGOTQ5RTQxMTk2M0JC + NEQ0MzNCOUIxQzgiLz4gPC9yZGY6RGVzY3JpcHRpb24+IDwvcmRmOlJERj4gPC94OnhtcG1ldGE+IDw/ + eHBhY2tldCBlbmQ9InIiPz6npMy1AAAGEUlEQVRIS7WVeVDUZRjHf7Ase8ECu+wl4LIXcqyyHC783AWW + 5QaRFTHkMi9SQvE+UhLzwk0BUcQSgQBBgcYDzStMSzOPcpqcmo5pmqk/+rOapqb+iG/PbzfFcSz/6pn5 + zPN739/7fp/nvZn/3TSLjj+XJy2/RaItPCT5vaBd8m1+q2Qku1lcrcvki+iXr7fFU6ZZeOx5KDU1b7jU + 1Z2bVPMPWNMbRXrXkWAc+ywVLbcS8fKwFjlu8VdpW0XzSc6f8PEIPzJ19dFnU3WEJdHL9P3X9O1nkdB8 + CQrX7i3mKn9zfqsUq29ZsPfjRBx5aMO2cTMy94gm7FuF7XyJTwDJTo5GVdHxNALVgsPd5Ceye+9g8b0f + UXbjB8RtH4Msd+MeXS7f6twjxbILZiy7pEHDtTBsvG7BqivTUXpsClLWCbtJNpDwBlGVH3ySIFV520eW + nedRcf0HVJGwbeRrOHs/h2n1CGRZDe7wND/W1hiI8sEYlJ4KRcVpJcrfVqByNBILhqLh3KeA+UXBOpL2 + jkRZduARPGXZ/vH4pnMou/gd7INfIPn4QyQc/RSOzk9hrBtEiKPerUn1Y5PXBaDojWlwdgUjr0+G/H4Z + cnpCUNJrQNZ+LeLrBD/LYnixFEDAKFz7vJQ0r49dO4zikS8x8/ADxLd9jIT2B5ix/z7SX78Pw+K3EJy2 + wq1M4rEz6sRwthgw82Ag2KNS2I5JPZ4rZx00ImGNHIZSfisFkDGhxbs5AkKLd/3kaLkDlgTjXrsNc/Md + mPfeQeyOD2HbcRu6yi4E2Wrd8ngeG71IBPtePWa4JUhsD0DykQAkHQqApUWCFLcGyZvDoZ/P/5oCTGXk + hU2MvGB7rbGmG47dd2Fa+x6iX/kAMa/eQvS2m4jaeAPspvcROb8TQexid3CcL2usFCJjnwE5nQYU9RhR + PGDC7D4TCrqMyDqkR9oePbRz/SZEKh8rI8vdyshyXhmzLD8DS/1VGOquwtgw7glkXH0Nhvp3kbL2GrSl + hyC11ril03xZfbkQKZuVsDeq4NihRtYuDbJ2auBoUsO2TQXrJiWMlWIExflWMiHOjRzfJy0bg776HCKX + vANd7WXol1/xeN3Si7A2XIXW1YbAxAq3UO0zPTSd1yG38bplLK//vxBrffKY4PQ1HH9aKk8jonQUUyvO + Qlt9HtqaCx4/tXIMyXWXMXXOAQTEv+D2zCvDhBBTCN1zCGOCZq3k+DXO1YcpRYOY4hpF2LzTCCs74/VE + 3IvnEVd1EhGFblBbWot6BKXWQZq64tlYa2+TuJwQM9KU5cRL35hyOxCe2w913hA0hcPQFI16KRzxEFtO + a1Q9htSVN5C+5S5x7x/uIm3DR7CvuomUReOImt1FU7nwEolHECImMGkJE5i46EJkejNM+X1QOPqhzBqC + KvskVDmnJuHKT/K4bgjKzBMItXcjJv84NOwWiKPndJK40TOCgPgaRmIur1dZ1yM6txvyWT0ITR+AImOQ + gg39N1ybDBJP60PorC5My3oTwQm18FdNryBxbq0EJL6AEUTYZBTkF0NGKyKdvZDb3qJOAxSIOqcP/jtp + JyC3D1BSvYgp6EN4aiNlP/cTEk4gFASPEUeXkWd8RaY5jcrEBkTn9UCT4Q3gzfBfRvJE9rrsfpicHSRe + NsFXmJeSXhTBXXY+jMjk8uArVkpExuKb6pkbYJ7L7Ria37xTUBeMeCkcncRTN0z/TyLKNYy4khNQJq2G + IMLBXdUWQkXwCYYR6md7IPP1k8WEC3UFDzSpG2BZeAZJtXQWFpyls3HOC50JzkdQnbFqDInLLiC2rBcq + 6xoSzzzP+NDVwDBaQkx4XzahNv8xZH48sVotCHeOUnnCWNJG18Q4UjddB7vlfbBbPwC7+YannLTyIrS5 + OyHU5v3hr07poL7JBHe4Jh8bzgQROY8h46IKCAVfbi73D3PcpfoJlX0VtEVN0JXsQlj2ZoRaaynj7N/8 + NfZLPLFmHrXnpiWSCCL8iMl32T/M6YGMq+R+covD7QADwfoIgqt4QVGtfvIZJ4lRv5CY4zypbjfjy+eE + M4l4gtuSwYSQ4DS4EZAew/wNiCYQJlvQU3cAAAAASUVORK5CYII= @@ -1054,142 +1272,6 @@ R2K5fxKLWbbp/7Dc0CBY8Q+pPmOq0VkzzQAAAABJRU5ErkJggg== - - - iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAZdEVYdFNvZnR3YXJlAEFkb2JlIEltYWdlUmVhZHlxyWU8AAADZmlUWHRYTUw6Y29tLmFkb2Jl - LnhtcAAAAAAAPD94cGFja2V0IGJlZ2luPSLvu78iIGlkPSJXNU0wTXBDZWhpSHpyZVN6TlRjemtjOWQi - Pz4gPHg6eG1wbWV0YSB4bWxuczp4PSJhZG9iZTpuczptZXRhLyIgeDp4bXB0az0iQWRvYmUgWE1QIENv - cmUgNS4zLWMwMTEgNjYuMTQ1NjYxLCAyMDEyLzAyLzA2LTE0OjU2OjI3ICAgICAgICAiPiA8cmRmOlJE - RiB4bWxuczpyZGY9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkvMDIvMjItcmRmLXN5bnRheC1ucyMiPiA8 - cmRmOkRlc2NyaXB0aW9uIHJkZjphYm91dD0iIiB4bWxuczp4bXBNTT0iaHR0cDovL25zLmFkb2JlLmNv - bS94YXAvMS4wL21tLyIgeG1sbnM6c3RSZWY9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlw - ZS9SZXNvdXJjZVJlZiMiIHhtbG5zOnhtcD0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wLyIgeG1w - TU06T3JpZ2luYWxEb2N1bWVudElEPSJ4bXAuZGlkOjJGQzkyMzc0Rjk0OUU0MTE5NjNCQjRENDMzQjlC - MUM4IiB4bXBNTTpEb2N1bWVudElEPSJ4bXAuZGlkOjlDMzFEOUI4NEFBRjExRTQ4OTA5OUYwQ0QzM0Q2 - NEI4IiB4bXBNTTpJbnN0YW5jZUlEPSJ4bXAuaWlkOjlDMzFEOUI3NEFBRjExRTQ4OTA5OUYwQ0QzM0Q2 - NEI4IiB4bXA6Q3JlYXRvclRvb2w9IkFkb2JlIFBob3Rvc2hvcCBDUzYgKFdpbmRvd3MpIj4gPHhtcE1N - OkRlcml2ZWRGcm9tIHN0UmVmOmluc3RhbmNlSUQ9InhtcC5paWQ6MDk5Mzk2NTZBRjRBRTQxMTk3NEFD - QUFFQjRCMzVENkUiIHN0UmVmOmRvY3VtZW50SUQ9InhtcC5kaWQ6MkZDOTIzNzRGOTQ5RTQxMTk2M0JC - NEQ0MzNCOUIxQzgiLz4gPC9yZGY6RGVzY3JpcHRpb24+IDwvcmRmOlJERj4gPC94OnhtcG1ldGE+IDw/ - eHBhY2tldCBlbmQ9InIiPz73sIMwAAADIElEQVRIS7WVa0iTYRTH56Uiysvm3TkvpLl5DRIvQYWVWl+6 - iNEVg0yhQqloQZHkLT+Y0YdAs75IpEUhzERZoZhsRpZlS7soblotsRwoxhqWeTrnYZtv+u7NsB74cZ5z - zv89/z17HzYRAPxXeIv/EpFXcOyi4BvKhfehv4FvKBfeh+ayqIUDlIgBgT8whpRYoT2fhgvNVJKBQT9s - hB8/QZDPpnEIjEhg0J5Pw4Vm0mwygG9T06BSqQQhTUhUMoRGpyxYT7OZwfhXC6jVakFIYzNYqN5uMGKa - BI1GIwhpghXJaJJi13d0dEB2bj74hsWzSDlXbzfQG02g0+kEIU2wIomdovzKdVifngnFFytBeb4cLN+n - WaSc6hfKKqB/eHTWoHfwExgMBkFII5MnQUD4WlAWloO26wVs35MDmifPmQFFyqlO/aKKqlmDp31DYDKZ - BCGNTJ4IPqHx8LJvACbNUw7p6e2HuJQMNIhhBuaHj3vBYrEI0tb1BoIiE9kJ9h7Oh7EJM+g/jEJuwVlY - s24ri5RTnfo5BedAIoueIYPumvomuHzjzm9cq2uCq7UNUH2rEarr7kNd0yP26Y+eKoSWtk4wfpmAg7kn - ITY5DUorq1g8cOQEqze3aplOEhRtJoMcL1mMTixV9IgD5a/tSBVDYql8AKOBQLEJtTP08gY/jjFiktKg - 5FIV21Ok3NazvmR2AvrFkCAJyGYk1comZAuHDM/AyLvHThfBveZ26NOPwI59eey7LsbhFCmnOvVJ5+Ef - rrYZLEU8EZ85+HLwW7ZCLMVTFWdkHoLut+/hgbYHaE9XN31XNsupTrWV3jKVs+uS3cyAD0cLe331jW3Q - qRt0CPUlQVHDKI+fN9iGo4W90uNnyuA2vvRtWTlQgxeg/dk7FimnOvU9/CNqUe47b7ANRwt7AfjpKvAK - Gt18Qur35ymhRfsKKLr5hN7EyzDq7humWrrcfSfKxbz/QlwcLDck1snZJdUzYHUDmk57+K1qdXJyzsL6 - RmQD9ZmObygXB8sVIRO6fXQB4hC6eRQppzr1XXmHclnAckFomLc1Um5dItEvhZ97MQXP9N0AAAAASUVO - RK5CYII= - - - - - iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAZdEVYdFNvZnR3YXJlAEFkb2JlIEltYWdlUmVhZHlxyWU8AAADZmlUWHRYTUw6Y29tLmFkb2Jl - LnhtcAAAAAAAPD94cGFja2V0IGJlZ2luPSLvu78iIGlkPSJXNU0wTXBDZWhpSHpyZVN6TlRjemtjOWQi - Pz4gPHg6eG1wbWV0YSB4bWxuczp4PSJhZG9iZTpuczptZXRhLyIgeDp4bXB0az0iQWRvYmUgWE1QIENv - cmUgNS4zLWMwMTEgNjYuMTQ1NjYxLCAyMDEyLzAyLzA2LTE0OjU2OjI3ICAgICAgICAiPiA8cmRmOlJE - RiB4bWxuczpyZGY9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkvMDIvMjItcmRmLXN5bnRheC1ucyMiPiA8 - cmRmOkRlc2NyaXB0aW9uIHJkZjphYm91dD0iIiB4bWxuczp4bXBNTT0iaHR0cDovL25zLmFkb2JlLmNv - bS94YXAvMS4wL21tLyIgeG1sbnM6c3RSZWY9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlw - ZS9SZXNvdXJjZVJlZiMiIHhtbG5zOnhtcD0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wLyIgeG1w - TU06T3JpZ2luYWxEb2N1bWVudElEPSJ4bXAuZGlkOjJGQzkyMzc0Rjk0OUU0MTE5NjNCQjRENDMzQjlC - MUM4IiB4bXBNTTpEb2N1bWVudElEPSJ4bXAuZGlkOjhDMTdBQjRENEFBRTExRTQ4QjQyODY0MDNBNTJE - NzNCIiB4bXBNTTpJbnN0YW5jZUlEPSJ4bXAuaWlkOjhDMTdBQjRDNEFBRTExRTQ4QjQyODY0MDNBNTJE - NzNCIiB4bXA6Q3JlYXRvclRvb2w9IkFkb2JlIFBob3Rvc2hvcCBDUzYgKFdpbmRvd3MpIj4gPHhtcE1N - OkRlcml2ZWRGcm9tIHN0UmVmOmluc3RhbmNlSUQ9InhtcC5paWQ6NUQyMjc4QTlBQjRBRTQxMTk3NEFD - QUFFQjRCMzVENkUiIHN0UmVmOmRvY3VtZW50SUQ9InhtcC5kaWQ6MkZDOTIzNzRGOTQ5RTQxMTk2M0JC - NEQ0MzNCOUIxQzgiLz4gPC9yZGY6RGVzY3JpcHRpb24+IDwvcmRmOlJERj4gPC94OnhtcG1ldGE+IDw/ - eHBhY2tldCBlbmQ9InIiPz4eHsDfAAAB00lEQVRIS7XVWytEURQH8HniTTNHLs0NCXNcXjTN5dH9g/gM - 3jx590QhFDJS0gyTGmpqaqJIMW4hzlAoOaWISS7LWifntI3ddnTGrl92e/57/We/DBsA/CvuYSHZSr0t - lvCGsriX/oI3lMW9lM/SwgF9SEHwizs08IX2vAyLZvZRgXJ+cQWv7yB0q96Ds86voT0vw6KZNJsK4Pnl - DWKxmBBlqhpDUN0UNp2n2VrB/WMOEomEEGX0ArN5o+BGfYB0Oi1EGa8cwpKw6bxRcH6lQiaTEaKMVw5q - rzCbNwr2z65BURQhynh8Qe0VZvNGwdZBFlRVFaKMxxfQXmE2rxc8rW3sQy6XE0puHoG7IaC9YnV9j5th - pbZPqOCDCrbH5uIwOD7/zWgkDkNTizAyuwQjkWWIxFNQWduqmVxI/MiPz6/A8HTUuDMTTYLkbrqhgt5S - T3PG4ZJ3HE7focElZx0u3yn+VQiG1ZLymmm7s74f88f42S6bl9zyJZ6d6Xckd+Mt5ieogH4xJORHHajt - SzvqZPSgECpHZSiA2DztuxBlad+NgnpBEbIjusiiYboKRF+kGFHegUR5ImkFv7G0eAPzWVq8gfksLd5/ - oULiHhYS97BwwPYJlSCUgVubViQAAAAASUVORK5CYII= - - - - - iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAZdEVYdFNvZnR3YXJlAEFkb2JlIEltYWdlUmVhZHlxyWU8AAADZmlUWHRYTUw6Y29tLmFkb2Jl - LnhtcAAAAAAAPD94cGFja2V0IGJlZ2luPSLvu78iIGlkPSJXNU0wTXBDZWhpSHpyZVN6TlRjemtjOWQi - Pz4gPHg6eG1wbWV0YSB4bWxuczp4PSJhZG9iZTpuczptZXRhLyIgeDp4bXB0az0iQWRvYmUgWE1QIENv - cmUgNS4zLWMwMTEgNjYuMTQ1NjYxLCAyMDEyLzAyLzA2LTE0OjU2OjI3ICAgICAgICAiPiA8cmRmOlJE - RiB4bWxuczpyZGY9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkvMDIvMjItcmRmLXN5bnRheC1ucyMiPiA8 - cmRmOkRlc2NyaXB0aW9uIHJkZjphYm91dD0iIiB4bWxuczp4bXBNTT0iaHR0cDovL25zLmFkb2JlLmNv - bS94YXAvMS4wL21tLyIgeG1sbnM6c3RSZWY9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlw - ZS9SZXNvdXJjZVJlZiMiIHhtbG5zOnhtcD0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wLyIgeG1w - TU06T3JpZ2luYWxEb2N1bWVudElEPSJ4bXAuZGlkOjJGQzkyMzc0Rjk0OUU0MTE5NjNCQjRENDMzQjlC - MUM4IiB4bXBNTTpEb2N1bWVudElEPSJ4bXAuZGlkOjJEMDQyOEZBNEFEMjExRTRBN0MxRDBCNzJGRUND - MDEzIiB4bXBNTTpJbnN0YW5jZUlEPSJ4bXAuaWlkOjJEMDQyOEY5NEFEMjExRTRBN0MxRDBCNzJGRUND - MDEzIiB4bXA6Q3JlYXRvclRvb2w9IkFkb2JlIFBob3Rvc2hvcCBDUzYgKFdpbmRvd3MpIj4gPHhtcE1N - OkRlcml2ZWRGcm9tIHN0UmVmOmluc3RhbmNlSUQ9InhtcC5paWQ6QkRDRkI1RDVEMTRBRTQxMTk3NEFD - QUFFQjRCMzVENkUiIHN0UmVmOmRvY3VtZW50SUQ9InhtcC5kaWQ6MkZDOTIzNzRGOTQ5RTQxMTk2M0JC - NEQ0MzNCOUIxQzgiLz4gPC9yZGY6RGVzY3JpcHRpb24+IDwvcmRmOlJERj4gPC94OnhtcG1ldGE+IDw/ - eHBhY2tldCBlbmQ9InIiPz59jfe3AAAEbUlEQVRIS8WTeUybZRzHF48/pnFOuQRajkFLgQFb5iRLNJr4 - l/EPgsniUI4xZDAY1zyxwApsMJyIME61rByl3DfoYGBrgbWUY06FcZSCha4rQ8jYxkqPr2/fvkv8o2Sg - S/wkT970eb6/T5/39z7Prv8dt/Oql4mR4HZJ3ccoXFxhVCzB9DT9JueJdSq6c1wzVZFupepVzxu34XVj - CaEDi1jX6hF8ZQoeokl4iBVwzV9YdU1XRlIl28eVo8phCdXwGltEeOUsro6psaHVwcSDh5volc4iOO8X - 7KuVwb1hEi7J8myq9PEQO//I85oafr0KtEpUpNSETm+AwWDAvfv3YTQaybnm/t/AyO6Ga+UonJOnIijF - 1hA9tWI2qle9RxcI+RIpmZpTIfBULhIyyqHVahHPKcN70TmYnFFCp9OhqXcc9KwW0DOHVl3YU1aUyjJu - F1SpfhO3EM6bMMsVt+D8Zhz2HIpC4oU6bG5uIu4cD3tfTwAjIBNypQYbGxsISquBU34PaDHiVEplGXee - SuIjVaBv3Lz7gJg8vHg4FlZvc+ATVoLipiHsD8qCXWAO7IPK8MG5FjLXKboOeoYADkldUkplGWb7vOb4 - 4BzxIXXQE/1m59WDXdgBvxPfwz6UC4eQUth/WIBDZ2qQXj+K7IYRImeE5s5fOFrcDPvPapcJzVNmmwVY - VxWG9U09uau1tTVymPpc0iYFLew7OEUJ4BwtALfvJpl5xMrKCu6s3cUrn5YbCM1us80CrJZZVWjXr7j3 - 4CE0y8v4IrcaH+cK4Bv+DRyPl8ApphYuia3wZ3eCUzOA1PIfcVuzjHnlIgK/vgy7mHzTG+w12yzA5E53 - edYPo1c2i/X1dQTEfwvbwDQ4hhXg8OcN4P48Df+UTrgkNIAeW4Hg3Hbo9Xq0iGSgs4ls5CUhoXnObLOA - S8pkhG/bdZzgDZJnffT3GXieLAA9XgB2/RjZjuQqMWhxfBw824H55XWyhcfy+HDNqoB1SH4Codn6G7iw - p3d78EaVPlXX0CaZgkqlgly1gpCiK0htHCH/IL6oFcEF3ZjT3CUvXqv0DzDSS0FPq1a/8EbYS5Rqa+if - SAJ8KoeNR7gitEsnoVQqSbGOkJmYX1ggxaY70SabwIGMUrjn8I3WIXnBRPnWu/8nDnE9Sd7cAaP/ZSES - 6/rRKJRArpiHXC7HzekZNIukiCyrhW9mGZgXa4w2kUVnibJnzdXbxP5URzyDO4QjxGl5i9uNpMZeKP5U - IrywAq9yCnGAOGGMonbYxpVnEPGdyR9BO/MTj8kfgXeNFPt5IngVtoF1kQ9WcTs8qgfgmNreQMS21xZL - 0E6Ln6ef75tg8sfgXT8O77oReAkkYNXJ4PRV/4ztyfo9VPTf4xjdf9CpQKzdxxuGe6UMbhXEmc8V6mze - r3qNivx3HGN7UmglQ6CVDMIxXwybo5UcaunJQD8te9rhyx4JrWwItlGNUut3y5+hlp4cDhFCpl14k9jq - nR+Y1NTjIe7NlmMnWKoHsOtvjWYcKpheqFQAAAAASUVORK5CYII= - - - - - iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAZdEVYdFNvZnR3YXJlAEFkb2JlIEltYWdlUmVhZHlxyWU8AAADZmlUWHRYTUw6Y29tLmFkb2Jl - LnhtcAAAAAAAPD94cGFja2V0IGJlZ2luPSLvu78iIGlkPSJXNU0wTXBDZWhpSHpyZVN6TlRjemtjOWQi - Pz4gPHg6eG1wbWV0YSB4bWxuczp4PSJhZG9iZTpuczptZXRhLyIgeDp4bXB0az0iQWRvYmUgWE1QIENv - cmUgNS4zLWMwMTEgNjYuMTQ1NjYxLCAyMDEyLzAyLzA2LTE0OjU2OjI3ICAgICAgICAiPiA8cmRmOlJE - RiB4bWxuczpyZGY9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkvMDIvMjItcmRmLXN5bnRheC1ucyMiPiA8 - cmRmOkRlc2NyaXB0aW9uIHJkZjphYm91dD0iIiB4bWxuczp4bXBNTT0iaHR0cDovL25zLmFkb2JlLmNv - bS94YXAvMS4wL21tLyIgeG1sbnM6c3RSZWY9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlw - ZS9SZXNvdXJjZVJlZiMiIHhtbG5zOnhtcD0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wLyIgeG1w - TU06T3JpZ2luYWxEb2N1bWVudElEPSJ4bXAuZGlkOjJGQzkyMzc0Rjk0OUU0MTE5NjNCQjRENDMzQjlC - MUM4IiB4bXBNTTpEb2N1bWVudElEPSJ4bXAuZGlkOjJERTg4QTFENEQyMjExRTRBODEyODk0M0RBMTc5 - Qjg3IiB4bXBNTTpJbnN0YW5jZUlEPSJ4bXAuaWlkOjJERTg4QTFDNEQyMjExRTRBODEyODk0M0RBMTc5 - Qjg3IiB4bXA6Q3JlYXRvclRvb2w9IkFkb2JlIFBob3Rvc2hvcCBDUzYgKFdpbmRvd3MpIj4gPHhtcE1N - OkRlcml2ZWRGcm9tIHN0UmVmOmluc3RhbmNlSUQ9InhtcC5paWQ6NjJGOUEyRDEyMTRERTQxMUIzNkJE - NUVDQjU5MzE1NjIiIHN0UmVmOmRvY3VtZW50SUQ9InhtcC5kaWQ6MkZDOTIzNzRGOTQ5RTQxMTk2M0JC - NEQ0MzNCOUIxQzgiLz4gPC9yZGY6RGVzY3JpcHRpb24+IDwvcmRmOlJERj4gPC94OnhtcG1ldGE+IDw/ - eHBhY2tldCBlbmQ9InIiPz6wJF34AAACl0lEQVRIS62Vy08TURSH73/QhQtXVnBhxEcMiUkhbEg0hB1R - Q1i68C8wIW5cEqMLN7ho2Ji4YiEhWq0prYUhfULbadN3obTaChobtZEUsFY9nnPS6WM6HYowyZf87j33 - nG/amaai9geOBYA+4pTxihmBE8DcTQB4J8em/9IwSQyagmrtL+z9rMFmvnhkKvtV7tcVHPz6DVsftulA - AckdhUg8zf19eoLKAd597iMLMItewfOxUDTN/bqCH3tVSG8VWIBZ9AoJApEk9+sKvu/uQ2IjzwJkGtH8 - OrTwy3Hu77vIAnV9mgWlcgWiqRwLjAMmkOMbPbNTKnN/JJntqJGEBZ++7oKcyLLgLN4JrU8Cms2C4pcy - BKKZumCI18temQ/8DzSLZlBmQX7nG/jCKdpgAa0driCtY5iFHuqHSjNoFtaags1iCdzBBG+QgNY2aZ0F - mIUe6osENAtrTUEq/7kDq9PHAszU5yYoq9f1i9cUSCD5ozxDEeTsrhAoONwyxLLb8MrhYQFmZYCHsnpd - v3hNgQROb5hnKIK29944MAThTBEWbS4WYBZ6qC/sKSy5ZJ6BGUQg8b4Bbhjod4AZXlhXWdBa10LrIVul - AM9ggS+aa6AIMMO8ZYUO0KeyIOMtZyaQpXpNi4LFucYzMINwhbMNcMNw5oIJMMNKIA0LNg88mZuH/ssj - dPgBMnN+cBRmny1wrRtSMMMzWCCFMg0UAeY2Fh0+GL5xG8Zu3oHXUrCj3g0WONdTbeBm21/o1N17gPtg - 98Xh3VoS3qzKMDI22agfglnY/Uld8NDc/ZlZwAwvl4Ngun6LGh8rdfVDViNs3rguOOzq6XOD8PDpc7g2 - OkHDH7XWtYa2It66Y4eCQ8cRfpvUNa2hTUD8A6JMaBvCyTdJAAAAAElFTkSuQmCC - - iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 @@ -1403,7 +1485,7 @@ AAAASUVORK5CYII= - + iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 YQUAAAAZdEVYdFNvZnR3YXJlAEFkb2JlIEltYWdlUmVhZHlxyWU8AAADZmlUWHRYTUw6Y29tLmFkb2Jl @@ -1415,108 +1497,26 @@ bS94YXAvMS4wL21tLyIgeG1sbnM6c3RSZWY9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlw ZS9SZXNvdXJjZVJlZiMiIHhtbG5zOnhtcD0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wLyIgeG1w TU06T3JpZ2luYWxEb2N1bWVudElEPSJ4bXAuZGlkOjJGQzkyMzc0Rjk0OUU0MTE5NjNCQjRENDMzQjlC - MUM4IiB4bXBNTTpEb2N1bWVudElEPSJ4bXAuZGlkOkUzNzJDMjE3NEFENjExRTRCNjE0OEVEQzI4MEM0 - RTZDIiB4bXBNTTpJbnN0YW5jZUlEPSJ4bXAuaWlkOkUzNzJDMjE2NEFENjExRTRCNjE0OEVEQzI4MEM0 - RTZDIiB4bXA6Q3JlYXRvclRvb2w9IkFkb2JlIFBob3Rvc2hvcCBDUzYgKFdpbmRvd3MpIj4gPHhtcE1N - OkRlcml2ZWRGcm9tIHN0UmVmOmluc3RhbmNlSUQ9InhtcC5paWQ6RkI3NUQ0QkNENDRBRTQxMTk3NEFD - QUFFQjRCMzVENkUiIHN0UmVmOmRvY3VtZW50SUQ9InhtcC5kaWQ6MkZDOTIzNzRGOTQ5RTQxMTk2M0JC - NEQ0MzNCOUIxQzgiLz4gPC9yZGY6RGVzY3JpcHRpb24+IDwvcmRmOlJERj4gPC94OnhtcG1ldGE+IDw/ - eHBhY2tldCBlbmQ9InIiPz6PyaLfAAADMElEQVRIS6VUXUiTYRT+vi3Tzd+ps23+3KRigtiPkolEQReG - UYTkhWatpWlWGkRdddfdSPImqUAJjSIT00oxLJIk0cR+tFSyzDJtgaMkDEPkdM7ZPvm2vS6jBx6es3Pe - 8zzvtm+TohLS/ov+AACStLgEQuJyLRJWYK1yzh/+FgCoQrpnfM4fOGBhcUlIMkEVkma4H4i1y2kFcMD8 - wqKQZILKZqTqmlTAWrfvMjhgbv63Dwm0hLWQohn1eNEbzrlfPiTQAtZCKjP1GXdAIC+r4XD+9CGBFrDm - RVJ1re6pZ0GyHHMvIawauYVNCFPfvvuQQAtYC6meKXU0amNsaGN/ZR60xIf9aIgN3cpGE9OzZCZ85nEm - pGiWlLABmuJCnUOXrNB7chdct4TUo32ANDbp4NuielDpqWfePdaPX6GrohSK4uLhlCEo96YlZLbOFHzH - oJXjMSBcGn4/zQGovEDqXXtzeTb+BTrKj0J3+Q54djYP7EZdTU2MPjFSK8eieQR9QtLg6GcOQPWgqKeQ - ZyOfoK30CDw+lg2Ot3Z4VLoNqo269mCNHIa2WjYn9A1PcAAqU6m9VV3TF9psOwwPS3JgZugCdNoyocwU - jU+RlImWBpezGz0vxzkA1YOiHvPFO7Ca1kGHLQtmXp2HdutmqN+/F6JiU+h3kOpyVeHJwBgHoLIpqajm - 189HoaG4CNqsGTA1UAWth9Lg6r490PygGyLjUikgzuWqQlffCAegelDdUwLqigqhpXgjTPYeh+bCFCg2 - RkEk3vxuVz/P0c43oLP3DQegLhspNalSFxiNcLswHT48LYNbBUlQk7ebzenmyhm08w1o7xmiAP6hRZiT - 70eYkzpctUuJWdHmwWs74+F1Uz7cyE+E4ohQB5mHm9a3GywpTXzektyKduIAIsKI3ISkL4rIdYle05C9 - VrZVBmvtl7eboUyv7V4jSQdwRn8FdI72iErtCUxnIuifkJ5hUqUOq9Jr7OeCNU6bTpNVqtMcDJSldOwn - KnOk+jypJ5QANRWc0cs5SEelXr54QidfwVYAMoiHq4W/gNM6OaNCJ+diaUIqN/43+Atwg27t+9ZXBUn6 - A2MdqQeVc5pWAAAAAElFTkSuQmCC - - - - - iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAIAAABvFaqvAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAZdEVYdFNvZnR3YXJlAEFkb2JlIEltYWdlUmVhZHlxyWU8AAADZmlUWHRYTUw6Y29tLmFkb2Jl - LnhtcAAAAAAAPD94cGFja2V0IGJlZ2luPSLvu78iIGlkPSJXNU0wTXBDZWhpSHpyZVN6TlRjemtjOWQi - Pz4gPHg6eG1wbWV0YSB4bWxuczp4PSJhZG9iZTpuczptZXRhLyIgeDp4bXB0az0iQWRvYmUgWE1QIENv - cmUgNS4zLWMwMTEgNjYuMTQ1NjYxLCAyMDEyLzAyLzA2LTE0OjU2OjI3ICAgICAgICAiPiA8cmRmOlJE - RiB4bWxuczpyZGY9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkvMDIvMjItcmRmLXN5bnRheC1ucyMiPiA8 - cmRmOkRlc2NyaXB0aW9uIHJkZjphYm91dD0iIiB4bWxuczp4bXBNTT0iaHR0cDovL25zLmFkb2JlLmNv - bS94YXAvMS4wL21tLyIgeG1sbnM6c3RSZWY9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlw - ZS9SZXNvdXJjZVJlZiMiIHhtbG5zOnhtcD0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wLyIgeG1w - TU06T3JpZ2luYWxEb2N1bWVudElEPSJ4bXAuZGlkOjJGQzkyMzc0Rjk0OUU0MTE5NjNCQjRENDMzQjlC - MUM4IiB4bXBNTTpEb2N1bWVudElEPSJ4bXAuZGlkOjUzQzNGNDI5NEQyQzExRTQ4QkE1QUNCMEVDRDZF - MDVEIiB4bXBNTTpJbnN0YW5jZUlEPSJ4bXAuaWlkOjUzQzNGNDI4NEQyQzExRTQ4QkE1QUNCMEVDRDZF - MDVEIiB4bXA6Q3JlYXRvclRvb2w9IkFkb2JlIFBob3Rvc2hvcCBDUzYgKFdpbmRvd3MpIj4gPHhtcE1N - OkRlcml2ZWRGcm9tIHN0UmVmOmluc3RhbmNlSUQ9InhtcC5paWQ6RkI1NUY4OTYyQTRERTQxMUIzNkJE + MUM4IiB4bXBNTTpEb2N1bWVudElEPSJ4bXAuZGlkOjJERjY3MEZENEQyMzExRTRCNDlGQUMwMzk0OTAw + Qzc4IiB4bXBNTTpJbnN0YW5jZUlEPSJ4bXAuaWlkOjJERjY3MEZDNEQyMzExRTRCNDlGQUMwMzk0OTAw + Qzc4IiB4bXA6Q3JlYXRvclRvb2w9IkFkb2JlIFBob3Rvc2hvcCBDUzYgKFdpbmRvd3MpIj4gPHhtcE1N + OkRlcml2ZWRGcm9tIHN0UmVmOmluc3RhbmNlSUQ9InhtcC5paWQ6NjhGOUEyRDEyMTRERTQxMUIzNkJE NUVDQjU5MzE1NjIiIHN0UmVmOmRvY3VtZW50SUQ9InhtcC5kaWQ6MkZDOTIzNzRGOTQ5RTQxMTk2M0JC NEQ0MzNCOUIxQzgiLz4gPC9yZGY6RGVzY3JpcHRpb24+IDwvcmRmOlJERj4gPC94OnhtcG1ldGE+IDw/ - eHBhY2tldCBlbmQ9InIiPz6IsaOmAAADF0lEQVQ4T62U/UuTURTH+0nICqRI1ERMMyNQe8N0ChqBwQhN - yvwhEgJjVCqJ/qCibZo6tzQ339h6Nre5prapUzc1XzItX1ilzuWMLLVAen+xf6DTuTxjdxsFVj58ebjc - c+7nnud7z3228DbpIaDFH/CfoqCn72DIDvNfPDM2KAqyr8PcJxqY+QBTb8kkjocXQTsKigGwfqYJHqIg - 1OxHGHvlWPx4hXB1YyA3g4CBhqst+piEnrDA3rA95vBAY1x8d7lq/DVZwm5PQZNvoKYdypSgHgbVEIh1 - cLOZzOCbSSsyRQRba6uWtcpVLbPcwlglInNUCJNWWKqABqMLCGvGlfpJELaQ/V1Vd1lujAhe0chtUrH5 - ZExnmJ85MdomEa+qZMbIEF2BHGunILSjdZwYgTt4gJqjjj0Rltml1Zq9AeL0Mn71Wn2mtDU80MIvsFTw - O+KPIoWC8BNYRIUaqrRQroJKjQOk9N+xLBF2pXJFKfnsDGYa8gS6xOO2whyMuoHaHpGzZ/pBM0IMrtXD - nT4HqNHXe0lYoogMFeQP4jbSDkCPTUyXmnNoPutSo+9WN5DEQDyeWCWnhqm4p7Oimt3b54rzmmKPVHKz - 0Xg0AU1pz87VJp+yXOfd9t3mBmLXsGrsJhSsDtF4iOWxKdpzyQNnuRW7vEUp13obFG05OVUBPtO5V1Sn - k5q4SX8ENfWA6C7xHsP981Bb2sf38ZKd4JhSuXUJHPHhg/WJnAeZFw0Xzt/w8erRtLmBnB/CSmaC599I - 2PYVRl+CXigu3R9SfCC0Pf1MZ1oqvqvjogX7gtRFJfb1n24g7GblfQcFP2fkBYm5anxqQcbLKgzyK/Df - WRTkV5+RMTg84ZrgAOHo4ZIDVNdJw67CpsVLZ5gifj97Typlq2ZFQXj8LKh5EHpnaIar8N+Al5l9Y9Vs - T7OiIAzjqaMsa6QJnBkeWvgOHdPkAuIV67PSeQpCYYZplsZ+KyyWLRyFF8D553EDbURY770J0rrYJbda - SYE4iWb9NcgpRKDrOMAWwYP6d5BTaC52zyaAWDlAm/DweL8AX9zXukfxHsIAAAAASUVORK5CYII= - - - - - iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAZdEVYdFNvZnR3YXJlAEFkb2JlIEltYWdlUmVhZHlxyWU8AAADZmlUWHRYTUw6Y29tLmFkb2Jl - LnhtcAAAAAAAPD94cGFja2V0IGJlZ2luPSLvu78iIGlkPSJXNU0wTXBDZWhpSHpyZVN6TlRjemtjOWQi - Pz4gPHg6eG1wbWV0YSB4bWxuczp4PSJhZG9iZTpuczptZXRhLyIgeDp4bXB0az0iQWRvYmUgWE1QIENv - cmUgNS4zLWMwMTEgNjYuMTQ1NjYxLCAyMDEyLzAyLzA2LTE0OjU2OjI3ICAgICAgICAiPiA8cmRmOlJE - RiB4bWxuczpyZGY9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkvMDIvMjItcmRmLXN5bnRheC1ucyMiPiA8 - cmRmOkRlc2NyaXB0aW9uIHJkZjphYm91dD0iIiB4bWxuczp4bXBNTT0iaHR0cDovL25zLmFkb2JlLmNv - bS94YXAvMS4wL21tLyIgeG1sbnM6c3RSZWY9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlw - ZS9SZXNvdXJjZVJlZiMiIHhtbG5zOnhtcD0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wLyIgeG1w - TU06T3JpZ2luYWxEb2N1bWVudElEPSJ4bXAuZGlkOjJGQzkyMzc0Rjk0OUU0MTE5NjNCQjRENDMzQjlC - MUM4IiB4bXBNTTpEb2N1bWVudElEPSJ4bXAuZGlkOkVENUYwQThBNEQyOTExRTQ5QzUzQzdFMkFGQkQy - NTA1IiB4bXBNTTpJbnN0YW5jZUlEPSJ4bXAuaWlkOkVENUYwQTg5NEQyOTExRTQ5QzUzQzdFMkFGQkQy - NTA1IiB4bXA6Q3JlYXRvclRvb2w9IkFkb2JlIFBob3Rvc2hvcCBDUzYgKFdpbmRvd3MpIj4gPHhtcE1N - OkRlcml2ZWRGcm9tIHN0UmVmOmluc3RhbmNlSUQ9InhtcC5paWQ6MkRGNkEzOUYyOTRERTQxMUIzNkJE - NUVDQjU5MzE1NjIiIHN0UmVmOmRvY3VtZW50SUQ9InhtcC5kaWQ6MkZDOTIzNzRGOTQ5RTQxMTk2M0JC - NEQ0MzNCOUIxQzgiLz4gPC9yZGY6RGVzY3JpcHRpb24+IDwvcmRmOlJERj4gPC94OnhtcG1ldGE+IDw/ - eHBhY2tldCBlbmQ9InIiPz6npMy1AAAGEUlEQVRIS7WVeVDUZRjHf7Ase8ECu+wl4LIXcqyyHC783AWW - 5QaRFTHkMi9SQvE+UhLzwk0BUcQSgQBBgcYDzStMSzOPcpqcmo5pmqk/+rOapqb+iG/PbzfFcSz/6pn5 - zPN739/7fp/nvZn/3TSLjj+XJy2/RaItPCT5vaBd8m1+q2Qku1lcrcvki+iXr7fFU6ZZeOx5KDU1b7jU - 1Z2bVPMPWNMbRXrXkWAc+ywVLbcS8fKwFjlu8VdpW0XzSc6f8PEIPzJ19dFnU3WEJdHL9P3X9O1nkdB8 - CQrX7i3mKn9zfqsUq29ZsPfjRBx5aMO2cTMy94gm7FuF7XyJTwDJTo5GVdHxNALVgsPd5Ceye+9g8b0f - UXbjB8RtH4Msd+MeXS7f6twjxbILZiy7pEHDtTBsvG7BqivTUXpsClLWCbtJNpDwBlGVH3ySIFV520eW - nedRcf0HVJGwbeRrOHs/h2n1CGRZDe7wND/W1hiI8sEYlJ4KRcVpJcrfVqByNBILhqLh3KeA+UXBOpL2 - jkRZduARPGXZ/vH4pnMou/gd7INfIPn4QyQc/RSOzk9hrBtEiKPerUn1Y5PXBaDojWlwdgUjr0+G/H4Z - cnpCUNJrQNZ+LeLrBD/LYnixFEDAKFz7vJQ0r49dO4zikS8x8/ADxLd9jIT2B5ix/z7SX78Pw+K3EJy2 - wq1M4rEz6sRwthgw82Ag2KNS2I5JPZ4rZx00ImGNHIZSfisFkDGhxbs5AkKLd/3kaLkDlgTjXrsNc/Md - mPfeQeyOD2HbcRu6yi4E2Wrd8ngeG71IBPtePWa4JUhsD0DykQAkHQqApUWCFLcGyZvDoZ/P/5oCTGXk - hU2MvGB7rbGmG47dd2Fa+x6iX/kAMa/eQvS2m4jaeAPspvcROb8TQexid3CcL2usFCJjnwE5nQYU9RhR - PGDC7D4TCrqMyDqkR9oePbRz/SZEKh8rI8vdyshyXhmzLD8DS/1VGOquwtgw7glkXH0Nhvp3kbL2GrSl - hyC11ril03xZfbkQKZuVsDeq4NihRtYuDbJ2auBoUsO2TQXrJiWMlWIExflWMiHOjRzfJy0bg776HCKX - vANd7WXol1/xeN3Si7A2XIXW1YbAxAq3UO0zPTSd1yG38bplLK//vxBrffKY4PQ1HH9aKk8jonQUUyvO - Qlt9HtqaCx4/tXIMyXWXMXXOAQTEv+D2zCvDhBBTCN1zCGOCZq3k+DXO1YcpRYOY4hpF2LzTCCs74/VE - 3IvnEVd1EhGFblBbWot6BKXWQZq64tlYa2+TuJwQM9KU5cRL35hyOxCe2w913hA0hcPQFI16KRzxEFtO - a1Q9htSVN5C+5S5x7x/uIm3DR7CvuomUReOImt1FU7nwEolHECImMGkJE5i46EJkejNM+X1QOPqhzBqC - KvskVDmnJuHKT/K4bgjKzBMItXcjJv84NOwWiKPndJK40TOCgPgaRmIur1dZ1yM6txvyWT0ITR+AImOQ - gg39N1ybDBJP60PorC5My3oTwQm18FdNryBxbq0EJL6AEUTYZBTkF0NGKyKdvZDb3qJOAxSIOqcP/jtp - JyC3D1BSvYgp6EN4aiNlP/cTEk4gFASPEUeXkWd8RaY5jcrEBkTn9UCT4Q3gzfBfRvJE9rrsfpicHSRe - NsFXmJeSXhTBXXY+jMjk8uArVkpExuKb6pkbYJ7L7Ria37xTUBeMeCkcncRTN0z/TyLKNYy4khNQJq2G - IMLBXdUWQkXwCYYR6md7IPP1k8WEC3UFDzSpG2BZeAZJtXQWFpyls3HOC50JzkdQnbFqDInLLiC2rBcq - 6xoSzzzP+NDVwDBaQkx4XzahNv8xZH48sVotCHeOUnnCWNJG18Q4UjddB7vlfbBbPwC7+YannLTyIrS5 - OyHU5v3hr07poL7JBHe4Jh8bzgQROY8h46IKCAVfbi73D3PcpfoJlX0VtEVN0JXsQlj2ZoRaaynj7N/8 - NfZLPLFmHrXnpiWSCCL8iMl32T/M6YGMq+R+covD7QADwfoIgqt4QVGtfvIZJ4lRv5CY4zypbjfjy+eE - M4l4gtuSwYSQ4DS4EZAew/wNiCYQJlvQU3cAAAAASUVORK5CYII= + eHBhY2tldCBlbmQ9InIiPz6GKmpFAAAC+UlEQVRIS63T20vTYRzH8Yforj/Ei24UiSgKIygKi8oyxZQo + cvNYeXaesmzqPGu2POd0ulSsnIdaurTSTJ3O6UxTPGya5vCQx5AuPn39RbHop7nZxQt+z3ie93e/Z4w1 + p7nsCoBt8R6yBF/UHPv+Wb0rfFFzm99CRIwEW1gnqXzxTXxRc0ydctm4OlID2sxrw6iCtiwItC+A2P/D + frLnjwGNSZdMq6N1WOvLwFpP4l/WdRlY6Jaio9Ab7QXba8sVoDHZGdT8PYS9THDqMGnLsKpNw0qXGCua + BO55VZdNQ6U/DRRibVCGb+N1pH5bukoRqHmDHOIG1N8/X2F4I8WyNhtf2+9hqSsZxqZ4upbb6HsSZLHO + Im90ym6hNVcIaktYTexZyUelGEvaHMy/jcFiZxo0xX5Y7ivGcn8JkVmA9uvlWBmqwpJeAWovs+poR99O + eRgWtQWYVUdgrj0FH+i+F3XF3NoappZYGJrEoLaOVYpOOTY/FGJB+xjTqnDMtMTTAC/Ma/Ix/TLUKl9e + x0JfFQpql7PykBP7lWIXzPeUYLIhHCPKCLr/AMy2ZsKoDLTKdNNdvM8TgNpRTBZwfJ885CTmaIChPhwa + mS+GnkdhqjEWY9X+VplqvIMXEhdQ24mZeuSs0N/BNNWWj4k6EdSZHhhXxWH0aSCGFd4c4Tk7zk7XBlUM + FKLToK4Nm+0qYnneRzqGGiSYaIiiyZdhVCdgqFSIwRJPjucZW85O1pvnRmvDkO9zFNTdy2Y6HjGp4HCF + 5kk4xhoiURd/EROv4tBfeM0qAyUC9Mp9QM0+7o829T6LZV0/mNycS6+nFKFWfAGj9ZHozfGwil7miZYH + 7qCmghsw+S6VpV894KuUuKFbfhNNqa749CwY3dm0toK+VABl3HlQM5obYHybwFLc7W1y/Y5BlX6FfgNn + DNcEY0DhZZX+MiGKbh0DNR24AYYWMSfJzc6GZBApwS5skIzNODcg0dV2V36FtsJ7yBJ8UXO8hyzBFzXH + ++H/A/YDv9/V87iOlrYAAAAASUVORK5CYII= @@ -3164,9 +3164,6 @@ 864, 17 - - 864, 17 - iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 diff --git a/Program.cs b/Program.cs index e38f7b8..a76d0d4 100644 --- a/Program.cs +++ b/Program.cs @@ -16,14 +16,14 @@ [STAThread] static void Main() { - ValidateInfo validateInfo = ValidateConfig.LoadConfig(); + ValidateConfig.LoadConfig(); string localConfigPath = Application.StartupPath + "/Config.xml"; //获取程序及版本信息 string currentVersionCode = Assembly.GetExecutingAssembly().GetName().Version.ToString(); //获取文件版本信息 FileVersionInfo.GetVersionInfo(Application.ExecutablePath); - + Utility.SysInfoConfig(); string configUrl = getProgramUrl(localConfigPath, "configurl"); if (configUrl != "") { diff --git a/FeatureStatisticsService.cs b/FeatureStatisticsService.cs index 331ee47..b127fe3 100644 --- a/FeatureStatisticsService.cs +++ b/FeatureStatisticsService.cs @@ -190,7 +190,7 @@ List result = new List(); //layer.Name是表名 - string[] accessStrs = Utility.getAccStrsByLayer(layer.Name); + string[] accessStrs = FeatureTools.GetAccStrsByLayer(layer.Name); foreach (string accssname in accessStrs) { diff --git a/FeatureTools.cs b/FeatureTools.cs index be4b469..3c08f34 100644 --- a/FeatureTools.cs +++ b/FeatureTools.cs @@ -1,5 +1,6 @@ using System; using System.Collections.Generic; +using System.Data; using System.Linq; using System.Text; using System.Windows.Forms; @@ -43,7 +44,7 @@ } feature.Delete();//地球上删除该feature string sql = "delete from " + layerName + " where LSSYS_ID =" + feature.ID + " and (编号 is null or substr(编号,length(编号)-2)='TMP')"; - OledbHelper.sqlExecuteNonQuery(sql);//目前无法取到LSSYS_ID，所以这个判断条件不太合适，会导致把该类所有新建的都删除了 + OledbHelper.sqlExecuteNonQuery(sql); } catch (Exception) { @@ -106,5 +107,46 @@ } return value; } + + /// + /// 根据附属物图层名字得到里面含有的附属物 + /// + /// + /// + public static string[] GetAccStrsByLayer(string layername) + { + string[] accStrs = null; + string sql = "select 附属物名称 from " + layername + " group by 附属物名称"; + DataSet dataset = OledbHelper.getDataSet(sql, layername); + if (dataset == null) return null; + accStrs = new string[dataset.Tables[0].Rows.Count]; + for (int i = 0; i < dataset.Tables[0].Rows.Count; i++) + { + accStrs[i] = dataset.Tables[0].Rows[i][0].ToString(); + } + return accStrs; + } + + /// + /// 删除内存图层中指定名称的feature + /// + /// + /// + public static void RemoveFeatureFromName(GSOGlobeControl globeControl1, string featureName) + { + GSOFeatures features = globeControl1.Globe.MemoryLayer.GetFeatureByName(featureName, true); + if (features != null) + { + for (int i = features.Length - 1; i >= 0; i--) + { + GSOFeature feature = features[i]; + if (feature != null) + { + globeControl1.Globe.MemoryLayer.RemoveFeatureByID(feature.ID); + } + } + } + globeControl1.Refresh(); + } } } diff --git a/Forms/FrmPipelineModelDataBase.cs b/Forms/FrmPipelineModelDataBase.cs index b577fd8..bc1e479 100644 --- a/Forms/FrmPipelineModelDataBase.cs +++ b/Forms/FrmPipelineModelDataBase.cs @@ -149,7 +149,7 @@ catch (Exception ex) { LogError.PublishError(ex); - LogHelper.WriteLog(typeof(FrmPipelineModelDB), ex.Message); + LogHelper.Error(ex.Message); } } diff --git a/FrmAccessoriesSensor.cs b/FrmAccessoriesSensor.cs index 98aa1cf..542f19a 100644 --- a/FrmAccessoriesSensor.cs +++ b/FrmAccessoriesSensor.cs @@ -240,7 +240,7 @@ { if (clbPipeLine.CheckedItems.Count > 0) { - Utility.RemoveFeatureFromName(globeControl1, "trackPolygon"); + FeatureTools.RemoveFeatureFromName(globeControl1, "trackPolygon"); globeControl1.Globe.Action = EnumAction3D.TrackPolygon; globeControl1.TrackPolygonEndEvent += globeControl1_TrackPolygonEndEvent; } @@ -259,7 +259,7 @@ private void FrmAccessoriesgather_FormClosing(object sender, FormClosingEventArgs e) { frm = null; - Utility.RemoveFeatureFromName(globeControl1, "trackPolygon"); + FeatureTools.RemoveFeatureFromName(globeControl1, "trackPolygon"); globeControl1.Globe.Action = EnumAction3D.ActionNull; globeControl1.TrackPolygonEndEvent -= globeControl1_TrackPolygonEndEvent; } diff --git a/FrmAccessoriesgather.cs b/FrmAccessoriesgather.cs index e1d176e..c36273b 100644 --- a/FrmAccessoriesgather.cs +++ b/FrmAccessoriesgather.cs @@ -118,7 +118,7 @@ { if (clbPipeLine2.Text!="") { - Utility.RemoveFeatureFromName(globeControl1, "trackPolygon"); + FeatureTools.RemoveFeatureFromName(globeControl1, "trackPolygon"); globeControl1.Globe.Action = EnumAction3D.TrackPolygon; globeControl1.Globe.TrackPolygonTool.TrackMode = EnumTrackMode.SpaceTrack; globeControl1.TrackPolygonEndEvent += globeControl1_TrackPolygonEndEvent; @@ -295,7 +295,7 @@ private void FrmAccessoriesgather_FormClosing(object sender, FormClosingEventArgs e) { frm = null; - Utility.RemoveFeatureFromName(globeControl1, "trackPolygon"); + FeatureTools.RemoveFeatureFromName(globeControl1, "trackPolygon"); globeControl1.TrackPolygonEndEvent -= globeControl1_TrackPolygonEndEvent; globeControl1.Globe.Action = EnumAction3D.ActionNull; diff --git a/FrmAddWellShp.cs b/FrmAddWellShp.cs index 7983349..78d8946 100644 --- a/FrmAddWellShp.cs +++ b/FrmAddWellShp.cs @@ -100,7 +100,7 @@ catch (Exception ex) { LogError.PublishError(ex); - LogHelper.WriteLog(typeof(FrmAddWellShp), ex.Message); + LogHelper.Error(ex.Message); } } diff --git a/FrmBSQStatis.cs b/FrmBSQStatis.cs index 5b05926..b5e581d 100644 --- a/FrmBSQStatis.cs +++ b/FrmBSQStatis.cs @@ -97,7 +97,7 @@ } catch (Exception ex) { - LogHelper.WriteLog(typeof(FrmBSQStatis),ex.Message); + LogHelper.Error(ex.Message); } return typeAndCount; } @@ -108,7 +108,7 @@ GSOLayer layer = globeControl1.Globe.Layers.GetLayerByCaption("标识器"); GSOFeatures bsqFs = FeatureStatisticsService.GetLayerFeatures(polygon, layer); if (bsqFs == null || bsqFs.Length <= 0) { - LogHelper.WriteLog(typeof(FrmBSQStatis),"标识器图层下的Feature为空"); + LogHelper.Error("标识器图层下的Feature为空!"); return null; } diff --git a/FrmBasicQuery.cs b/FrmBasicQuery.cs index baeeade..cc8d3ff 100644 --- a/FrmBasicQuery.cs +++ b/FrmBasicQuery.cs @@ -224,7 +224,7 @@ } catch(Exception ex) { - LogHelper.WriteLog(typeof(FrmBasicQuery), ex.Message); + LogHelper.Error(ex.Message); } } else diff --git a/FrmCodingQuery.cs b/FrmCodingQuery.cs index f1ac322..d4ec095 100644 --- a/FrmCodingQuery.cs +++ b/FrmCodingQuery.cs @@ -82,7 +82,7 @@ } catch (Exception ex) { - LogHelper.WriteLog(typeof(FrmCodingQuery), ex.Message); ; + LogHelper.Error(ex.Message); } } diff --git a/FrmDiameterQuery.cs b/FrmDiameterQuery.cs index e7b3657..75d7949 100644 --- a/FrmDiameterQuery.cs +++ b/FrmDiameterQuery.cs @@ -150,7 +150,7 @@ catch (Exception ex) { //LogError.PublishError(ex); - LogHelper.WriteLog(typeof(FrmDiameterQuery), ex.Message); + LogHelper.Error(ex.Message); MessageBox.Show("请输入正确的管径范围！"); return; } diff --git a/FrmFittingQuery.cs b/FrmFittingQuery.cs index 12f6007..8645011 100644 --- a/FrmFittingQuery.cs +++ b/FrmFittingQuery.cs @@ -69,7 +69,7 @@ } catch (Exception ex) { - LogHelper.WriteLog(typeof(FrmFittingQuery), ex.Message); + LogHelper.Error(ex.Message); } } /// diff --git a/FrmKeywordQuery.cs b/FrmKeywordQuery.cs index 405524f..ede0a93 100644 --- a/FrmKeywordQuery.cs +++ b/FrmKeywordQuery.cs @@ -87,7 +87,7 @@ } catch (Exception ex) { - LogHelper.WriteLog(typeof(FrmKeywordQuery), ex.Message); + LogHelper.Error(ex.Message); } } diff --git a/FrmLogin.cs b/FrmLogin.cs index 1172c23..6fbaed9 100644 --- a/FrmLogin.cs +++ b/FrmLogin.cs @@ -2,6 +2,8 @@ using System.Data; using System.Data.OracleClient; using System.IO; +using System.Net; +using System.Text; using System.Windows.Forms; using System.Xml; using DevComponents.DotNetBar; @@ -10,16 +12,15 @@ { public partial class FrmLogin : Office2007Form { + + //登录界面 -- 配置文件的路径 + public static string filename = Application.StartupPath + "\\login.xml"; + + public FrmLogin() { InitializeComponent(); } - public string rolename = "浏览"; - public string username = ""; - public string department = ""; - - //登录界面 -- 配置文件的路径 - public static string filename = Application.StartupPath + "\\login.xml"; /// /// 登录按钮事件处理 /// @@ -28,9 +29,10 @@ private void button1_Click(object sender, EventArgs e) { bool result = ValidateUser(); +// bool result =ValidateFromUrl();//从平台获取用户角色信息，判断是否能登陆成功 if (result) { - username = txtUser.Text.Trim(); + WriteXml(); Utility.userName = txtUser.Text.Trim(); DialogResult = DialogResult.OK; Close(); @@ -43,80 +45,6 @@ } } /// - /// 关闭按钮事件处理 - /// - /// - /// - private void button2_Click(object sender, EventArgs e) - { - Close(); - } - /// - /// 验证端口号 - /// - /// - //private bool ValiPort() - //{ - // Ping p = new Ping();//创建Ping对象p - // PingReply pr = p.Send(Utility.localicenseserverip);//向指定IP或者主机名的计算机发送ICMP协议的ping数据包 - // if (pr.Status == IPStatus.Success)//如果ping成功 - // { - // try - // { - // TcpClient tcpc = new TcpClient(Utility.localicenseserverip, Utility.localicenseserverport);//对IP地址为"192.168.0.105"的计算机的1500端口提出连接申请 - // tcpc.Close(); - // return true; - // } - // catch (Exception ex) - // { - // LogError.PublishError(ex); - // MessageBox.Show("端口连接错误！" + ex.Message); - // return false; - // } - // } - // else - // { - // int times = 0;//重新连接次数; - // int count = 2;//设置尝试次数 - // while (times < count) - // { - // //Thread.Sleep(1000);//等待时间(方便测试的话，你可以改为1000) - // pr = p.Send(Utility.localicenseserverip); - - // if (pr.Status == IPStatus.Success) - // { - // try - // { - // TcpClient tcpc = new TcpClient(Utility.localicenseserverip, Utility.localicenseserverport);//对IP地址为"192.168.0.105"的计算机的1500端口提出连接申请 - // tcpc.Close(); - // return true; - // } - // catch (Exception ex) - // { - // LogError.PublishError(ex); - // MessageBox.Show("端口连接错误！" + ex.Message); - // return false; - // } - // } - // else - // { - // times++; - // if (times < count) - // { - // continue; - // } - // else - // { - // MessageBox.Show("重新尝试连接失败"); - // return false; - // } - // } - - // } - // return false; - // } - //} - /// /// 验证用户名、密码 /// /// @@ -126,24 +54,64 @@ string sql = "select * from casic_userinfotest where USERNAME='" + txtUser.Text.Trim() + "' and PASSWORD='" + passWord + "' and sysname='GHFX' "; DataTable dt = OledbHelper.QueryTable(sql); - if (dt != null && dt.Rows.Count > 0) + if (dt == null || dt.Rows.Count <= 0) return false; + if (String.IsNullOrEmpty(dt.Rows[0]["rid"].ToString())) return true; + sql = "select gid from casic_userroletest where id=" + dt.Rows[0]["rid"] + " and sysname='GHFX' "; + using (OracleDataReader reader = OracleUtils.ExecuteReader(OracleUtils.ConnectionString, CommandType.Text, sql)) { - WriteXML(); - if (!String.IsNullOrEmpty(dt.Rows[0]["rid"].ToString())) + while (reader.Read()) { - sql = "select gid from casic_userroletest where id=" + dt.Rows[0]["rid"] + " and sysname='GHFX' "; - using (OracleDataReader reader = OracleUtils.ExecuteReader(OracleUtils.ConnectionString, CommandType.Text, sql)) - { - while (reader.Read()) - { - Utility.userRole = reader[0].ToString(); - break; - } - } + Utility.userRole = reader[0].ToString(); + LogHelper.Debug("测试一下"); + break; } - return true; } - return false; + return true; + } + + + + private bool ValidateFromUrl() + { + string user = txtUser.Text.Trim(); + string pwd = textBoxPassWord.Text.Trim(); + //做成配置的 + string roleserver = Utility.RoleServer; + if (roleserver == null || roleserver.Trim().Equals("")) + { + MessageBox.Show("请在Config.xml中配置roleurl！"); + return false; + } + HttpWebRequest request = + WebRequest.Create(roleserver+"/rs/authority/user?username=" + user + "&password=" + pwd + "&appId=21") as HttpWebRequest; + if (request == null) return false; + using (HttpWebResponse response = request.GetResponse() as HttpWebResponse) + { + try + { + if (response == null || response.GetResponseStream() == null) return false; + StreamReader reader = new StreamReader(response.GetResponseStream()); + string[] result = reader.ReadToEnd().Split(','); + //解析result + if (result.Length < 5) return false; + StringBuilder userRole = new StringBuilder(""); + for (int i = 4; i < result.Length; i++) + { + string[] tmpStrings = result[i].Split('_'); + if (tmpStrings.Length < 2) continue; + userRole.Append(tmpStrings[1].Trim() + ","); + } + if (userRole.Length < 3) return false; + userRole.Remove(userRole.Length - 3, 3); + // MessageBox.Show(userRole.ToString()); + Utility.userRole = userRole.ToString(); + return Utility.userRole != null && !Utility.userRole.Equals("null"); + } + catch (Exception e) + { + return false; + } + } } private void FrmLogin_Load(object sender, EventArgs e) @@ -153,74 +121,56 @@ StartPosition = FormStartPosition.CenterScreen; - ReadXML(); + ReadXml(); } /// /// 读取上一次登录的用户名和密码 /// - private void ReadXML() + private void ReadXml() { - if (File.Exists(filename)) + if (!File.Exists(filename)) return; + //初始化XML文档操作类 + XmlDocument myDoc = new XmlDocument(); { - if (!File.Exists(filename)) + //加载XML文件 + try { + myDoc.Load(filename); + } + catch (Exception e) + { + LogError.PublishError(e); return; } - - //初始化XML文档操作类 - XmlDocument myDoc = new XmlDocument(); + //搜索指定的节点 + XmlNode serverRootNode = myDoc.SelectSingleNode("Params"); + XmlNodeList nodes = null; + if (serverRootNode != null) { - //加载XML文件 - try + nodes = serverRootNode.ChildNodes; + } + if (nodes == null) return; + foreach (XmlNode xn in nodes) + { + if (xn.Name.Equals("username")) { - myDoc.Load(filename); + txtUser.Text = xn.InnerText.Trim(); } - catch (Exception e) + else if (xn.Name.Equals("password")) { - LogError.PublishError(e); - return; + textBoxPassWord.Text = xn.InnerText.Trim(); } - //搜索指定的节点 - XmlNode serverRootNode = myDoc.SelectSingleNode("Params"); - XmlNodeList nodes = null; - if (serverRootNode != null) + else if (xn.Name.Equals("isremember")) { - nodes = serverRootNode.ChildNodes; - } - if (nodes != null) - { - foreach (XmlNode xn in nodes) - { - if (xn.Name == "username") - { - txtUser.Text = xn.InnerText.Trim(); - } - else if (xn.Name == "password") - { - textBoxPassWord.Text = xn.InnerText.Trim(); - } - else if (xn.Name == "isremember") - { - if (xn.InnerText.Trim() == "true") - { - checkBoxXRememberPassword.Checked = true; - } - else if (xn.InnerText.Trim() == "false") - { - checkBoxXRememberPassword.Checked = false; - } - } - } - + checkBoxXRememberPassword.Checked = xn.InnerText.Trim().Equals("true"); } } } - } /// /// 记录登录的用户名和密码 /// - private void WriteXML() + private void WriteXml() { if (!File.Exists(filename)) { @@ -252,31 +202,17 @@ foreach (XmlNode xn in nodes) { XmlElement xe = (XmlElement)xn; - if (xe.Name == "username") + if (xe.Name.Equals("username")) { xe.InnerText = txtUser.Text.Trim(); } - else if (xe.Name == "password") + else if (xe.Name.Equals("password")) { - if (checkBoxXRememberPassword.Checked) - { - xe.InnerText = textBoxPassWord.Text.Trim(); - } - else - { - xe.InnerText = ""; - } + xe.InnerText = checkBoxXRememberPassword.Checked ? textBoxPassWord.Text.Trim() : ""; } - else if (xe.Name == "isremember") + else if (xe.Name.Equals("isremember")) { - if (checkBoxXRememberPassword.Checked) - { - xe.InnerText = "true"; - } - else - { - xe.InnerText = "false"; - } + xe.InnerText = checkBoxXRememberPassword.Checked ? "true" : "false"; } } } diff --git a/FrmMaterialSel.cs b/FrmMaterialSel.cs index 8645ab3..d23f385 100644 --- a/FrmMaterialSel.cs +++ b/FrmMaterialSel.cs @@ -157,7 +157,7 @@ } catch (Exception ex) { - LogHelper.WriteLog(typeof(FrmMaterialSel), ex.Message); + LogHelper.Error(ex.Message); } } diff --git a/FrmMetadataStat.cs b/FrmMetadataStat.cs index c3c1359..96029a6 100644 --- a/FrmMetadataStat.cs +++ b/FrmMetadataStat.cs @@ -96,7 +96,7 @@ //统计有多少个图层 private int statistLayer() { - List datasrcs = Utility.layerConfig.datasrcs; + List datasrcs = Utility.LayerConfig.datasrcs; return datasrcs.SelectMany(datasrc => datasrc.layertypes).Sum(layerType => layerType.layers.Count); } diff --git a/FrmpipeDeepstatis.cs b/FrmpipeDeepstatis.cs index 6a5c895..8d915a9 100644 --- a/FrmpipeDeepstatis.cs +++ b/FrmpipeDeepstatis.cs @@ -2,6 +2,7 @@ using System.Collections.Generic; using System.Diagnostics; using System.IO; +using System.Reflection; using System.Text; using System.Windows.Forms; using System.Windows.Forms.DataVisualization.Charting; @@ -320,7 +321,7 @@ MessageBox.Show("请添加分段"); return; } - Utility.RemoveFeatureFromName(globeControl1, "trackPolygon"); + FeatureTools.RemoveFeatureFromName(globeControl1, "trackPolygon"); globeControl1.Globe.Action = EnumAction3D.TrackPolygon; globeControl1.Globe.TrackPolygonTool.TrackMode = EnumTrackMode.SpaceTrack; globeControl1.TrackPolygonEndEvent += globeControl1_TrackPolygonEndEvent; @@ -408,12 +409,11 @@ TextBox control; private void dataGridViewX2_EditingControlShowing(object sender, DataGridViewEditingControlShowingEventArgs e) { - if (e.Control.GetType().BaseType.Name == "TextBox") - { - control = new TextBox(); - control = (TextBox)e.Control; - control.KeyPress += control_KeyPress; - } + MemberInfo memberInfo = e.Control.GetType().BaseType; + if (memberInfo != null && !memberInfo.Name.Equals("TextBox")) return; + control = new TextBox(); + control = (TextBox)e.Control; + control.KeyPress += control_KeyPress; } /// /// 键盘按键按下事件处理 @@ -423,28 +423,24 @@ void control_KeyPress(object sender, KeyPressEventArgs e) { TextBox text = sender as TextBox; + if (text == null) return; if ((e.KeyChar < 48 || e.KeyChar > 57) && (e.KeyChar != 8) && e.KeyChar != 46) { e.Handled = true; } - if (e.KeyChar == 46) //小数点 + if (e.KeyChar != 46) return; + if (text.Text.Length <= 0) + e.Handled = true; //小数点不能在第一位 + else //处理不规则的小数点 { - if (text.Text.Length <= 0) - e.Handled = true; //小数点不能在第一位 - else //处理不规则的小数点 + float f; + float oldf; + bool b1 = false, b2 = false; + b1 = float.TryParse(text.Text, out oldf); + b2 = float.TryParse(text.Text + e.KeyChar, out f); + if (!b2) { - float f; - float oldf; - bool b1 = false, b2 = false; - b1 = float.TryParse(text.Text, out oldf); - b2 = float.TryParse(text.Text + e.KeyChar, out f); - if (b2 == false) - { - if (b1) - e.Handled = true; - else - e.Handled = false; - } + e.Handled = b1; } } } @@ -457,7 +453,7 @@ { frm = null; - Utility.RemoveFeatureFromName(globeControl1, "trackPolygon"); + FeatureTools.RemoveFeatureFromName(globeControl1, "trackPolygon"); globeControl1.TrackPolygonEndEvent -= globeControl1_TrackPolygonEndEvent; globeControl1.Globe.Action = EnumAction3D.ActionNull; diff --git a/FrmpipeDiametergather.cs b/FrmpipeDiametergather.cs index a9d96fa..c09aaf1 100644 --- a/FrmpipeDiametergather.cs +++ b/FrmpipeDiametergather.cs @@ -154,7 +154,7 @@ MessageBox.Show("请选择图层！"); return; } - Utility.RemoveFeatureFromName(globeControl1, "trackPolygon"); + FeatureTools.RemoveFeatureFromName(globeControl1, "trackPolygon"); globeControl1.Globe.Action = EnumAction3D.TrackPolygon; globeControl1.Globe.TrackPolygonTool.TrackMode = EnumTrackMode.SpaceTrack; globeControl1.TrackPolygonEndEvent += globeControl1_TrackPolygonEndEvent; @@ -392,7 +392,7 @@ private void FrmpipeDiametergather_FormClosing(object sender, FormClosingEventArgs e) { frm = null; - Utility.RemoveFeatureFromName(globeControl1, "trackPolygon"); + FeatureTools.RemoveFeatureFromName(globeControl1, "trackPolygon"); globeControl1.TrackPolygonEndEvent -= globeControl1_TrackPolygonEndEvent; globeControl1.Globe.Action = EnumAction3D.ActionNull; diff --git a/FrmpipeMaterialGather.cs b/FrmpipeMaterialGather.cs index 44e7f24..5ca8144 100644 --- a/FrmpipeMaterialGather.cs +++ b/FrmpipeMaterialGather.cs @@ -58,10 +58,9 @@ for (int i = 0; i < pipeLayerNames.Count; i++) { clbPipeLine.Items.Add(pipeLayerNames[i]); - GSOLayer layer = globeControl1.Globe.Layers.GetLayerByCaption(pipeLayerNames[i]); - if (layer.Dataset == null || !layer.Dataset.IsFeatureDataset || layer.Type != EnumLayerType.FeatureLayer) continue; + GSOLayer layer = globeControl1.Globe.Layers.GetLayerByCaption(pipeLayerNames[i]); + if (layer == null || layer.Dataset == null || !layer.Dataset.IsFeatureDataset || layer.Type != EnumLayerType.FeatureLayer) continue; - string name = layer.Name; GSOFeatureLayer flayer = layer as GSOFeatureLayer; GSOFeatures feats = flayer.GetAllFeatures(); @@ -205,7 +204,7 @@ { chart1.Series.Add(clbPipeLine.CheckedItems[i].ToString()); GSOLayer layer = globeControl1.Globe.Layers.GetLayerByCaption(clbPipeLine.CheckedItems[i].ToString()); - if (layer != null && layer is GSOFeatureLayer) + if (layer is GSOFeatureLayer) { GSOFeatureLayer flayer = layer as GSOFeatureLayer; GSOFeatures features = flayer.GetAllFeatures(); @@ -240,10 +239,9 @@ labeStyleAxisX.Enabled = true; chart1.ChartAreas["ChartArea1"].AxisX.LabelStyle = labeStyleAxisX; - Dictionary dic1 = new Dictionary(); for (int j = 0; j < chart1.Series.Count; j++) { - dic1 = new Dictionary(); + Dictionary dic1 = new Dictionary(); foreach (string key in dic.Keys) { if (key.Contains(chart1.Series[j].Name)) @@ -304,7 +302,7 @@ MessageBox.Show("请选择材质类型！"); return; } - Utility.RemoveFeatureFromName(globeControl1, "trackPolygon"); + FeatureTools.RemoveFeatureFromName(globeControl1, "trackPolygon"); globeControl1.Globe.Action = EnumAction3D.TrackPolygon; globeControl1.Globe.TrackPolygonTool.TrackMode = EnumTrackMode.SpaceTrack; globeControl1.TrackPolygonEndEvent += globeControl1_TrackPolygonEndEvent; @@ -318,7 +316,7 @@ private void FrmpipeMaterialGather_FormClosing(object sender, FormClosingEventArgs e) { frm = null; - Utility.RemoveFeatureFromName(globeControl1, "trackPolygon"); + FeatureTools.RemoveFeatureFromName(globeControl1, "trackPolygon"); globeControl1.TrackPolygonEndEvent -= globeControl1_TrackPolygonEndEvent; globeControl1.Globe.Action = EnumAction3D.ActionNull; diff --git a/Frmpipediameterstatis.cs b/Frmpipediameterstatis.cs index 4fb25a8..631a996 100644 --- a/Frmpipediameterstatis.cs +++ b/Frmpipediameterstatis.cs @@ -202,8 +202,8 @@ } catch (Exception ex) { - LogHelper.WriteLog(typeof(Frmpipediameterstatis), ex.Message); //MessageBox.Show(ex.Message); + LogHelper.Error(ex.Message); LogError.PublishError(ex); } } @@ -372,7 +372,7 @@ MessageBox.Show("请添加分段！"); return; } - Utility.RemoveFeatureFromName(globeControl1, "trackPolygon"); + FeatureTools.RemoveFeatureFromName(globeControl1, "trackPolygon"); globeControl1.Globe.Action = EnumAction3D.TrackPolygon; globeControl1.Globe.TrackPolygonTool.TrackMode = EnumTrackMode.SpaceTrack; globeControl1.TrackPolygonEndEvent += globeControl1_TrackPolygonEndEvent; @@ -422,7 +422,7 @@ globeControl1.Globe.Action = EnumAction3D.ActionNull; globeControl1.TrackPolygonEndEvent -= globeControl1_TrackPolygonEndEvent; - Utility.RemoveFeatureFromName(globeControl1, "trackPolygon"); + FeatureTools.RemoveFeatureFromName(globeControl1, "trackPolygon"); globeControl1.Globe.MemoryLayer.RemoveAllFeature(); } diff --git a/LineBuilder.cs b/LineBuilder.cs index 33a216c..b6a8516 100644 --- a/LineBuilder.cs +++ b/LineBuilder.cs @@ -43,8 +43,8 @@ GSOGeoPolyline3D lineeee = f.Geometry as GSOGeoPolyline3D; if (lineeee == null || lineeee.GetSpaceLength(true, 6378137) == 0) { - LogHelper.WriteLog(typeof(LineBuilder), "出现数据无法入库:"+f.ID); - continue; //TODO LIST:判断是否会出现部署数据无法入库情况,Log2Net + LogHelper.Error("出现数据无法入库:" + f.ID); + continue; } GSOFeature newFeature = newFeatureSet.CreateFeature(); diff --git a/LogHelper.cs b/LogHelper.cs index 9ef5f27..04573cf 100644 --- a/LogHelper.cs +++ b/LogHelper.cs @@ -1,4 +1,5 @@ using System; +using System.Diagnostics; using log4net; using log4net.Config; @@ -7,35 +8,82 @@ { public class LogHelper { - /// - /// 输出日志到Log4Net - /// - /// - /// - #region static void WriteLog(Type t, Exception ex) - public static void WriteLog(Type t, Exception ex) + private static ILog _logdebug = log4net.LogManager.GetLogger("logdebug"); + private static ILog _loginfo = log4net.LogManager.GetLogger("loginfo"); + private static ILog _logwarn = log4net.LogManager.GetLogger("logwarn"); + private static ILog _logerror = log4net.LogManager.GetLogger("logerror"); + private static ILog _logfatal = log4net.LogManager.GetLogger("logfatal"); + + public static void Debug(string msg) { - ILog log = log4net.LogManager.GetLogger(t); - log.Error("Error", ex); + StackFrame sf = new StackFrame(1); + msg = string.Format("{0}.{1}:{2}", sf.GetMethod().ReflectedType.FullName, sf.GetMethod().Name, msg); + _logdebug.Debug(msg); + } + public static void Debug(string msg, Exception e) + { + StackFrame sf = new StackFrame(1); + msg = string.Format("{0}.{1}:{2}", sf.GetMethod().ReflectedType.FullName, sf.GetMethod().Name, msg); + _logdebug.Debug(msg, e); } - #endregion - /// - /// 输出日志到Log4Net - /// - /// - /// - #region static void WriteLog(Type t, string msg) - - public static void WriteLog(Type t, string msg) + public static void Info(string msg) { - ILog log = log4net.LogManager.GetLogger(t); - log.Error(msg); + StackFrame sf = new StackFrame(1); + msg = string.Format("{0}.{1}:{2}", sf.GetMethod().ReflectedType.FullName, sf.GetMethod().Name, msg); + _loginfo.Info(msg); + } + public static void Info(string msg, Exception e) + { + StackFrame sf = new StackFrame(1); + msg = string.Format("{0}.{1}:{2}", sf.GetMethod().ReflectedType.FullName, sf.GetMethod().Name, msg); + _loginfo.Info(msg, e); } - #endregion + + public static void Warn(string msg) + { + StackFrame sf = new StackFrame(1); + msg = string.Format("{0}.{1}:{2}", sf.GetMethod().ReflectedType.FullName, sf.GetMethod().Name, msg); + _logwarn.Warn(msg); + } + public static void Warn(string msg, Exception e) + { + StackFrame sf = new StackFrame(1); + msg = string.Format("{0}.{1}:{2}", sf.GetMethod().ReflectedType.FullName, sf.GetMethod().Name, msg); + _logwarn.Warn(msg, e); + } + + + public static void Error(string msg) + { + StackFrame sf = new StackFrame(1); + msg = string.Format("{0}.{1}:{2}", sf.GetMethod().ReflectedType.FullName, sf.GetMethod().Name, msg); + _logerror.Error(msg); + } + public static void Error(string msg, Exception e) + { + StackFrame sf = new StackFrame(1); + msg = string.Format("{0}.{1}:{2}", sf.GetMethod().ReflectedType.FullName, sf.GetMethod().Name, msg); + _logerror.Error(msg, e); + } + + + public static void Fatal(string msg) + { + StackFrame sf = new StackFrame(1); + msg = string.Format("{0}.{1}:{2}", sf.GetMethod().ReflectedType.FullName, sf.GetMethod().Name, msg); + _logfatal.Fatal(msg); + } + public static void Fatal(string msg, Exception e) + { + StackFrame sf = new StackFrame(1); + msg = string.Format("{0}.{1}:{2}", sf.GetMethod().ReflectedType.FullName, sf.GetMethod().Name, msg); + _logfatal.Fatal(msg, e); + } + } diff --git a/MainFrm.cs b/MainFrm.cs index 43de664..51f362a 100644 --- a/MainFrm.cs +++ b/MainFrm.cs @@ -18,7 +18,6 @@ using GeoScene.Data; using GeoScene.Engine; using GeoScene.Globe; -using Timer = System.Windows.Forms.Timer; using ToolTip = System.Windows.Forms.ToolTip; namespace Cyberpipe @@ -163,6 +162,7 @@ /// private void AddGZ() { + lendendGZ50 = new GSOHudButton(); lendendGZ50.SetImage(Application.StartupPath + "/Resource/管纵/50.png"); lendendGZ50.SetOffset(0, 0); @@ -1294,18 +1294,19 @@ private void MainFrm_Load(object sender, EventArgs e) { + layerTree.Nodes.Add("正在加载，请稍后……");//树状图加载在图层加载之后，故增加提示 initGlobalControl(); - //initGlobalMap(); - //initLayerTree(); initMarkerTree(); initLayout(); loadData(); - double x = Convert.ToDouble(Utility.Query_Roads["定位"].ToString().Split(',')[0]); - double y = Convert.ToDouble(Utility.Query_Roads["定位"].ToString().Split(',')[1]); - double z = Convert.ToDouble(Utility.Query_Roads["定位"].ToString().Split(',')[2]); + + double x = Convert.ToDouble(Utility.Query_Roads["绿岛"].ToString().Split(',')[0]); + double y = Convert.ToDouble(Utility.Query_Roads["绿岛"].ToString().Split(',')[1]); + double z = Convert.ToDouble(Utility.Query_Roads["绿岛"].ToString().Split(',')[2]); jumpToCameraState(x, y, z); + } #endregion @@ -1315,11 +1316,17 @@ if (e.Layer == null || !e.Layer.Caption.Equals(Utility.roadLayerName)) return; foreach (TreeNode layerTreeNode in layerTree.Nodes) { - foreach (TreeNode node in layerTreeNode.Nodes) + for (int i=0;i dt, DataGridView dataGridView) @@ -7330,7 +7337,7 @@ } catch (Exception ex) { - LogHelper.WriteLog(typeof(MainFrm), ex); + LogHelper.Debug("", ex); } } } @@ -7362,7 +7369,7 @@ GSOLayer layer = globeControl1.Globe.Layers.Add(strDataPath); if (layer == null) {//wxl - LogHelper.WriteLog(typeof(MainFrm), "buttonItemHX1_Click操作中，" + strDataPath + "的layer为空"); + LogHelper.Error("buttonItemHX1_Click操作中，" + strDataPath + "的layer为空"); continue; } GSOFeatures redFeatures = layer.GetAllFeatures(); @@ -7457,17 +7464,12 @@ { try { + globeControl1.BeforeSceneRenderEvent -= globeControl1_BeforeSceneRenderEvent; globeControl2.BeforeSceneRenderEvent -= globeControl2_BeforeSceneRenderEvent; - double x = Convert.ToDouble(Utility.Query_Roads["定位"].ToString().Split(',')[0]); - double y = Convert.ToDouble(Utility.Query_Roads["定位"].ToString().Split(',')[1]); - double z = Convert.ToDouble(Utility.Query_Roads["定位"].ToString().Split(',')[2]); - jumpToCameraState(x, y, z); - /* globeControl1.Globe.FlyToPosition(new GSOPoint3d(120.610963, 31.188121, 50), EnumAltitudeMode.Absolute, -4, 50, 800); globeControl1.Globe.FlyToPointSpeed = 10000000; - * */ globeControl1.Globe.Action = EnumAction3D.SelectObject; globeControl1.Refresh(); @@ -7489,6 +7491,37 @@ } } /// + /// 基础工具 + /// + /// + /// + private void ribbonTabItem1_MouseDown(object sender, MouseEventArgs e) + { + try + { + + globeControl1.BeforeSceneRenderEvent -= globeControl1_BeforeSceneRenderEvent; + globeControl2.BeforeSceneRenderEvent -= globeControl2_BeforeSceneRenderEvent; + + globeControl1.Globe.Action = EnumAction3D.ActionNull; + dataGridViewX1.AutoSizeColumnsMode = DataGridViewAutoSizeColumnsMode.AllCells; + //zhanshi = false; + redSH = false; + splitContainer1.Panel2Collapsed = true; + panelOfTable.Visible = false; + legendSC.Visible = false; + legendSG.Visible = false; + ClearGZData(); + GSOLayer redLayer = globeControl1.Globe.Layers.GetLayerByCaption("红线"); + if (redLayer == null) return; + redLayer.Visible = false; + } + catch (Exception ex) + { + //MessageBox.Show("系统运行错误:" + ex.ToString(), "错误", MessageBoxButtons.OK, MessageBoxIcon.Error); + } + } + /// /// 一键审核 /// /// @@ -7497,6 +7530,7 @@ { try { + globeControl1.BeforeSceneRenderEvent -= globeControl1_BeforeSceneRenderEvent; globeControl2.BeforeSceneRenderEvent -= globeControl2_BeforeSceneRenderEvent; @@ -7518,32 +7552,7 @@ //MessageBox.Show("系统运行错误:" + ex.ToString(), "错误", MessageBoxButtons.OK, MessageBoxIcon.Error); } } - - void ResetRibbonTab() - { - try - { - globeControl1.BeforeSceneRenderEvent -= globeControl1_BeforeSceneRenderEvent; - globeControl2.BeforeSceneRenderEvent -= globeControl2_BeforeSceneRenderEvent; - - globeControl1.Globe.Action = EnumAction3D.ActionNull; - dataGridViewX1.AutoSizeColumnsMode = DataGridViewAutoSizeColumnsMode.AllCells; - //zhanshi = false; - redSH = false; - splitContainer1.Panel2Collapsed = true; - panelOfTable.Visible = false; - legendSC.Visible = false; - legendSG.Visible = false; - ClearGZData(); - GSOLayer redLayer = globeControl1.Globe.Layers.GetLayerByCaption("红线"); - if (redLayer == null) return; - redLayer.Visible = false; - } - catch (Exception ex) - { - LogHelper.WriteLog(typeof(MainFrm), ex); - } - } + /// /// 双屏对比 /// @@ -7553,8 +7562,8 @@ { try { - globeControl1.BeforeSceneRenderEvent += new BeforeSceneRenderEventHandler(globeControl1_BeforeSceneRenderEvent); - globeControl2.BeforeSceneRenderEvent += new BeforeSceneRenderEventHandler(globeControl2_BeforeSceneRenderEvent); + globeControl1.BeforeSceneRenderEvent += globeControl1_BeforeSceneRenderEvent; + globeControl2.BeforeSceneRenderEvent += globeControl2_BeforeSceneRenderEvent; globeControl1.Globe.Action = EnumAction3D.ActionNull; panelOfTable.Visible = false; @@ -7570,32 +7579,43 @@ GSOLayer redLayer = globeControl1.Globe.Layers.GetLayerByCaption("红线"); if (redLayer != null) - { redLayer.Visible = false; - } } catch (Exception ex) { - LogHelper.WriteLog(typeof(MainFrm), ex); + //MessageBox.Show("系统运行错误:" + ex.ToString(), "错误", MessageBoxButtons.OK, MessageBoxIcon.Error); } } /// - /// 基础工具 - /// - /// - /// - private void ribbonTabItem1_MouseDown(object sender, MouseEventArgs e) - { - ResetRibbonTab(); - } - /// /// 文档管理 /// /// /// private void ribbonTabItem4_MouseDown(object sender, MouseEventArgs e) { - ResetRibbonTab(); + try + { + + globeControl1.BeforeSceneRenderEvent -= globeControl1_BeforeSceneRenderEvent; + globeControl2.BeforeSceneRenderEvent -= globeControl2_BeforeSceneRenderEvent; + + globeControl1.Globe.Action = EnumAction3D.ActionNull; + panelOfTable.Visible = false; + //zhanshi = false; + redSH = false; + splitContainer1.Panel2Collapsed = true; + dataGridViewX1.AutoSizeColumnsMode = DataGridViewAutoSizeColumnsMode.AllCells; + legendSC.Visible = false; + legendSG.Visible = false; + ClearGZData(); + GSOLayer redLayer = globeControl1.Globe.Layers.GetLayerByCaption("红线"); + if (redLayer != null) + redLayer.Visible = false; + } + catch (Exception ex) + { + //MessageBox.Show("系统运行错误:" + ex.ToString(), "错误", MessageBoxButtons.OK, MessageBoxIcon.Error); + } } /// /// 基础管理 @@ -7604,7 +7624,29 @@ /// private void ribbonTabItem14_MouseDown(object sender, MouseEventArgs e) { - ResetRibbonTab(); + try + { + globeControl1.BeforeSceneRenderEvent -= globeControl1_BeforeSceneRenderEvent; + globeControl2.BeforeSceneRenderEvent -= globeControl2_BeforeSceneRenderEvent; + + globeControl1.Globe.Action = EnumAction3D.ActionNull; + panelOfTable.Visible = false; + //zhanshi = false; + redSH = false; + splitContainer1.Panel2Collapsed = true; + dataGridViewX1.AutoSizeColumnsMode = DataGridViewAutoSizeColumnsMode.AllCells; + legendSC.Visible = false; + legendSG.Visible = false; + ClearGZData(); + + GSOLayer redLayer = globeControl1.Globe.Layers.GetLayerByCaption("红线"); + if (redLayer != null) + redLayer.Visible = false; + } + catch (Exception ex) + { + //MessageBox.Show("系统运行错误:" + ex.ToString(), "错误", MessageBoxButtons.OK, MessageBoxIcon.Error); + } } /// /// 权限管理 @@ -7613,26 +7655,31 @@ /// private void ribbonTabItem2_MouseDown(object sender, MouseEventArgs e) { - ResetRibbonTab(); + try + { + globeControl1.BeforeSceneRenderEvent -= globeControl1_BeforeSceneRenderEvent; + globeControl2.BeforeSceneRenderEvent -= globeControl2_BeforeSceneRenderEvent; + + globeControl1.Globe.Action = EnumAction3D.ActionNull; + panelOfTable.Visible = false; + //zhanshi = false; + redSH = false; + splitContainer1.Panel2Collapsed = true; + dataGridViewX1.AutoSizeColumnsMode = DataGridViewAutoSizeColumnsMode.AllCells; + legendSC.Visible = false; + legendSG.Visible = false; + ClearGZData(); + + GSOLayer redLayer = globeControl1.Globe.Layers.GetLayerByCaption("红线"); + if (redLayer == null) return; + redLayer.Visible = false; + } + catch (Exception ex) + { + //MessageBox.Show("系统运行错误:" + ex.ToString(), "错误", MessageBoxButtons.OK, MessageBoxIcon.Error); + } } - /// - /// 管线定位 - /// - /// - /// - private void ribbonTabItem7_MouseDown(object sender, MouseEventArgs e) - { - ResetRibbonTab(); - } - /// - /// 标识器管理 - /// - /// - /// - private void ribbonTabItem5_MouseDown(object sender, MouseEventArgs e) - { - ResetRibbonTab(); - } + //GSOFeature dpFeatuer = null; /// /// 双屏分析，点击管段分析 @@ -8017,7 +8064,9 @@ private void btn_flag_Click(object sender, EventArgs e) { if (FrmFlagManagers.IS_OPEN) + { return; + } FrmFlagManagers frm = new FrmFlagManagers(globeControl1); frm.Show(this); } diff --git a/MainFrm.designer.cs b/MainFrm.designer.cs index e3dca41..73398c0 100644 --- a/MainFrm.designer.cs +++ b/MainFrm.designer.cs @@ -4,6 +4,7 @@ using DevComponents.DotNetBar; using DevComponents.DotNetBar.Controls; using DevComponents.Editors; +using System.Drawing; namespace Cyberpipe { @@ -89,6 +90,7 @@ this.sideBar1 = new DevComponents.DotNetBar.SideBar(); this.panelEx3 = new DevComponents.DotNetBar.PanelEx(); this.layerSensorTree = new System.Windows.Forms.TreeView(); + this.layerTree = new Cyberpipe.MyTreeView(); this.sideBarPanelItem3 = new DevComponents.DotNetBar.SideBarPanelItem(); this.controlContainerItem3 = new DevComponents.DotNetBar.ControlContainerItem(); this.sideBarPanelItem4 = new DevComponents.DotNetBar.SideBarPanelItem(); @@ -243,42 +245,18 @@ this.保存ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.定位ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.ribbonControl1 = new DevComponents.DotNetBar.RibbonControl(); - this.ribbonPanel6 = new DevComponents.DotNetBar.RibbonPanel(); - this.ribbonBar6 = new DevComponents.DotNetBar.RibbonBar(); - this.buttonItemSPSZ = new DevComponents.DotNetBar.ButtonItem(); - this.buttonItem8 = new DevComponents.DotNetBar.ButtonItem(); - this.buttonItemLocation = new DevComponents.DotNetBar.ButtonItem(); - this.sliderItem2 = new DevComponents.DotNetBar.SliderItem(); - this.buttonItemGBJC = new DevComponents.DotNetBar.ButtonItem(); - this.ribbonPanel5 = new DevComponents.DotNetBar.RibbonPanel(); - this.ribbonBar2 = new DevComponents.DotNetBar.RibbonBar(); - this.buttonItemHX1 = new DevComponents.DotNetBar.ButtonItem(); - this.buttonItemHX2 = new DevComponents.DotNetBar.ButtonItem(); - this.buttonItemDCTP = new DevComponents.DotNetBar.ButtonItem(); - this.sliderItem3 = new DevComponents.DotNetBar.SliderItem(); - this.ribbonPanel1 = new DevComponents.DotNetBar.RibbonPanel(); - this.ribbonBar21 = new DevComponents.DotNetBar.RibbonBar(); - this.buttonItem87 = new DevComponents.DotNetBar.ButtonItem(); - this.buttonItem88 = new DevComponents.DotNetBar.ButtonItem(); - this.buttonItem27 = new DevComponents.DotNetBar.ButtonItem(); - this.buttonItem91 = new DevComponents.DotNetBar.ButtonItem(); - this.buttonItem1 = new DevComponents.DotNetBar.ButtonItem(); - this.btnlegendSet = new DevComponents.DotNetBar.ButtonItem(); - this.buttonItem89 = new DevComponents.DotNetBar.ButtonItem(); - this.btnOutputJPG = new DevComponents.DotNetBar.ButtonItem(); - this.ribbonPanel12 = new DevComponents.DotNetBar.RibbonPanel(); - this.ribbonBar18 = new DevComponents.DotNetBar.RibbonBar(); - this.buttonItem133 = new DevComponents.DotNetBar.ButtonItem(); - this.ribbonBar13 = new DevComponents.DotNetBar.RibbonBar(); - this.buttonItem127 = new DevComponents.DotNetBar.ButtonItem(); - this.buttonItem128 = new DevComponents.DotNetBar.ButtonItem(); - this.sliderItem1 = new DevComponents.DotNetBar.SliderItem(); - this.buttonItem134 = new DevComponents.DotNetBar.ButtonItem(); - this.buttonItem130 = new DevComponents.DotNetBar.ButtonItem(); - this.btn_check_history = new DevComponents.DotNetBar.ButtonItem(); - this.ribbonPanel4 = new DevComponents.DotNetBar.RibbonPanel(); - this.ribbonBar1 = new DevComponents.DotNetBar.RibbonBar(); - this.btn_document_info = new DevComponents.DotNetBar.ButtonItem(); + this.ribbonPanel3 = new DevComponents.DotNetBar.RibbonPanel(); + this.ribbonBar4 = new DevComponents.DotNetBar.RibbonBar(); + this.btn_flag = new DevComponents.DotNetBar.ButtonItem(); + this.slider4ground = new DevComponents.DotNetBar.SliderItem(); + this.ribbonPanel7 = new DevComponents.DotNetBar.RibbonPanel(); + this.gxdw_ribbonbar = new DevComponents.DotNetBar.RibbonBar(); + this.buttonItem9 = new DevComponents.DotNetBar.ButtonItem(); + this.buttonItem10 = new DevComponents.DotNetBar.ButtonItem(); + this.buttonItem11 = new DevComponents.DotNetBar.ButtonItem(); + this.buttonItem12 = new DevComponents.DotNetBar.ButtonItem(); + this.buttonItem13 = new DevComponents.DotNetBar.ButtonItem(); + this.buttonItem14 = new DevComponents.DotNetBar.ButtonItem(); this.ribbonPanel15 = new DevComponents.DotNetBar.RibbonPanel(); this.ribbonBar20 = new DevComponents.DotNetBar.RibbonBar(); this.buttonItemSH = new DevComponents.DotNetBar.ButtonItem(); @@ -334,18 +312,6 @@ this.buttonItemXT4 = new DevComponents.DotNetBar.ButtonItem(); this.buttonItemXT4_1 = new DevComponents.DotNetBar.ButtonItem(); this.buttonItemXT4_2 = new DevComponents.DotNetBar.ButtonItem(); - this.ribbonPanel3 = new DevComponents.DotNetBar.RibbonPanel(); - this.ribbonBar4 = new DevComponents.DotNetBar.RibbonBar(); - this.btn_flag = new DevComponents.DotNetBar.ButtonItem(); - this.slider4ground = new DevComponents.DotNetBar.SliderItem(); - this.ribbonPanel7 = new DevComponents.DotNetBar.RibbonPanel(); - this.gxdw_ribbonbar = new DevComponents.DotNetBar.RibbonBar(); - this.buttonItem9 = new DevComponents.DotNetBar.ButtonItem(); - this.buttonItem10 = new DevComponents.DotNetBar.ButtonItem(); - this.buttonItem11 = new DevComponents.DotNetBar.ButtonItem(); - this.buttonItem12 = new DevComponents.DotNetBar.ButtonItem(); - this.buttonItem13 = new DevComponents.DotNetBar.ButtonItem(); - this.buttonItem14 = new DevComponents.DotNetBar.ButtonItem(); this.ribbonPanel2 = new DevComponents.DotNetBar.RibbonPanel(); this.ribbonBar3 = new DevComponents.DotNetBar.RibbonBar(); this.btn_user_info = new DevComponents.DotNetBar.ButtonItem(); @@ -355,6 +321,43 @@ this.btn_user_role = new DevComponents.DotNetBar.ButtonItem(); this.btn_password_edit = new DevComponents.DotNetBar.ButtonItem(); this.buttonItemPasswordReset = new DevComponents.DotNetBar.ButtonItem(); + this.ribbonPanel6 = new DevComponents.DotNetBar.RibbonPanel(); + this.ribbonBar6 = new DevComponents.DotNetBar.RibbonBar(); + this.buttonItemSPSZ = new DevComponents.DotNetBar.ButtonItem(); + this.buttonItem8 = new DevComponents.DotNetBar.ButtonItem(); + this.buttonItemLocation = new DevComponents.DotNetBar.ButtonItem(); + this.sliderItem2 = new DevComponents.DotNetBar.SliderItem(); + this.buttonItemGBJC = new DevComponents.DotNetBar.ButtonItem(); + this.ribbonPanel5 = new DevComponents.DotNetBar.RibbonPanel(); + this.ribbonBar2 = new DevComponents.DotNetBar.RibbonBar(); + this.buttonItemHX1 = new DevComponents.DotNetBar.ButtonItem(); + this.buttonItemHX2 = new DevComponents.DotNetBar.ButtonItem(); + this.buttonItemDCTP = new DevComponents.DotNetBar.ButtonItem(); + this.sliderItem3 = new DevComponents.DotNetBar.SliderItem(); + this.ribbonPanel1 = new DevComponents.DotNetBar.RibbonPanel(); + this.ribbonBar21 = new DevComponents.DotNetBar.RibbonBar(); + this.buttonItem87 = new DevComponents.DotNetBar.ButtonItem(); + this.buttonItem88 = new DevComponents.DotNetBar.ButtonItem(); + this.buttonItem27 = new DevComponents.DotNetBar.ButtonItem(); + this.buttonItem91 = new DevComponents.DotNetBar.ButtonItem(); + this.buttonItem1 = new DevComponents.DotNetBar.ButtonItem(); + this.btnlegendSet = new DevComponents.DotNetBar.ButtonItem(); + this.buttonItem89 = new DevComponents.DotNetBar.ButtonItem(); + this.btnOutputJPG = new DevComponents.DotNetBar.ButtonItem(); + this.ribbonPanel12 = new DevComponents.DotNetBar.RibbonPanel(); + this.ribbonBar18 = new DevComponents.DotNetBar.RibbonBar(); + this.buttonItem133 = new DevComponents.DotNetBar.ButtonItem(); + this.buttonItem132 = new DevComponents.DotNetBar.ButtonItem(); + this.ribbonBar13 = new DevComponents.DotNetBar.RibbonBar(); + this.buttonItem127 = new DevComponents.DotNetBar.ButtonItem(); + this.buttonItem128 = new DevComponents.DotNetBar.ButtonItem(); + this.sliderItem1 = new DevComponents.DotNetBar.SliderItem(); + this.buttonItem134 = new DevComponents.DotNetBar.ButtonItem(); + this.buttonItem130 = new DevComponents.DotNetBar.ButtonItem(); + this.btn_check_history = new DevComponents.DotNetBar.ButtonItem(); + this.ribbonPanel4 = new DevComponents.DotNetBar.RibbonPanel(); + this.ribbonBar1 = new DevComponents.DotNetBar.RibbonBar(); + this.btn_document_info = new DevComponents.DotNetBar.ButtonItem(); this.ribbonTabItem1 = new DevComponents.DotNetBar.RibbonTabItem(); this.ribbonTabItem11 = new DevComponents.DotNetBar.RibbonTabItem(); this.ribbonTabItem6 = new DevComponents.DotNetBar.RibbonTabItem(); @@ -516,7 +519,6 @@ this.labelX17 = new DevComponents.DotNetBar.LabelX(); this.panelEx4 = new DevComponents.DotNetBar.PanelEx(); this.pictureBox1 = new System.Windows.Forms.PictureBox(); - this.layerTree = new Cyberpipe.MyTreeView(); this.statusStrip1.SuspendLayout(); this.sideBar1.SuspendLayout(); this.panelEx3.SuspendLayout(); @@ -527,15 +529,15 @@ this.contextMenuStrip3.SuspendLayout(); this.contextMenuStripDeleteLayerNode.SuspendLayout(); this.ribbonControl1.SuspendLayout(); + this.ribbonPanel3.SuspendLayout(); + this.ribbonPanel7.SuspendLayout(); + this.ribbonPanel15.SuspendLayout(); + this.ribbonPanel2.SuspendLayout(); this.ribbonPanel6.SuspendLayout(); this.ribbonPanel5.SuspendLayout(); this.ribbonPanel1.SuspendLayout(); this.ribbonPanel12.SuspendLayout(); this.ribbonPanel4.SuspendLayout(); - this.ribbonPanel15.SuspendLayout(); - this.ribbonPanel3.SuspendLayout(); - this.ribbonPanel7.SuspendLayout(); - this.ribbonPanel2.SuspendLayout(); this.panelOfTable.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.dataGridViewX1)).BeginInit(); this.statusStrip2.SuspendLayout(); @@ -711,7 +713,8 @@ this.statusLabel.Name = "statusLabel"; this.statusLabel.Size = new System.Drawing.Size(1313, 17); this.statusLabel.Spring = true; - this.statusLabel.Text = " ©2014-2015 苏州航天系统工程有限公司 版权所有"; + this.statusLabel.Text = Utility.Copyright; +// this.statusLabel.Text = " ©2014-2015 苏州航天系统工程有限公司 版权所有"; // // toolStripDropDownButton1 // @@ -956,6 +959,18 @@ this.layerSensorTree.NodeMouseClick += new System.Windows.Forms.TreeNodeMouseClickEventHandler(this.layerMarkerTree_NodeMouseClick); this.layerSensorTree.NodeMouseDoubleClick += new System.Windows.Forms.TreeNodeMouseClickEventHandler(this.layerTree_NodeMouseDoubleClick); // + // layerTree + // + this.layerTree.CheckBoxes = true; + this.layerTree.ItemHeight = 18; + this.layerTree.Location = new System.Drawing.Point(30, 78); + this.layerTree.Name = "layerTree"; + this.layerTree.Size = new System.Drawing.Size(121, 97); + this.layerTree.TabIndex = 1; + this.layerTree.AfterCheck += new System.Windows.Forms.TreeViewEventHandler(this.layerTree_AfterCheck); + this.layerTree.NodeMouseClick += new System.Windows.Forms.TreeNodeMouseClickEventHandler(this.layerTree_NodeMouseClick); + this.layerTree.NodeMouseDoubleClick += new System.Windows.Forms.TreeNodeMouseClickEventHandler(this.layerTree_NodeMouseDoubleClick); + // // sideBarPanelItem3 // this.sideBarPanelItem3.FontBold = true; @@ -2150,13 +2165,13 @@ this.ribbonControl1.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.ribbonControl1.Controls.Add(this.ribbonPanel3); this.ribbonControl1.Controls.Add(this.ribbonPanel7); - this.ribbonControl1.Controls.Add(this.ribbonPanel2); this.ribbonControl1.Controls.Add(this.ribbonPanel15); - this.ribbonControl1.Controls.Add(this.ribbonPanel4); - this.ribbonControl1.Controls.Add(this.ribbonPanel1); + this.ribbonControl1.Controls.Add(this.ribbonPanel2); this.ribbonControl1.Controls.Add(this.ribbonPanel6); - this.ribbonControl1.Controls.Add(this.ribbonPanel12); this.ribbonControl1.Controls.Add(this.ribbonPanel5); + this.ribbonControl1.Controls.Add(this.ribbonPanel1); + this.ribbonControl1.Controls.Add(this.ribbonPanel12); + this.ribbonControl1.Controls.Add(this.ribbonPanel4); this.ribbonControl1.Dock = System.Windows.Forms.DockStyle.Top; this.ribbonControl1.ImeMode = System.Windows.Forms.ImeMode.NoControl; this.ribbonControl1.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { @@ -2200,609 +2215,216 @@ this.ribbonControl1.Text = "ribbonControl1"; this.ribbonControl1.UseCustomizeDialog = false; // - // ribbonPanel6 + // ribbonPanel3 // - this.ribbonPanel6.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.ribbonPanel6.Controls.Add(this.ribbonBar6); - this.ribbonPanel6.Dock = System.Windows.Forms.DockStyle.Fill; - this.ribbonPanel6.Location = new System.Drawing.Point(0, 0); - this.ribbonPanel6.Name = "ribbonPanel6"; - this.ribbonPanel6.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); - this.ribbonPanel6.Size = new System.Drawing.Size(1328, 95); + this.ribbonPanel3.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.ribbonPanel3.Controls.Add(this.ribbonBar4); + this.ribbonPanel3.Dock = System.Windows.Forms.DockStyle.Fill; + this.ribbonPanel3.Location = new System.Drawing.Point(0, 33); + this.ribbonPanel3.Name = "ribbonPanel3"; + this.ribbonPanel3.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); + this.ribbonPanel3.Size = new System.Drawing.Size(1328, 62); // // // - this.ribbonPanel6.Style.Class = ""; - this.ribbonPanel6.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonPanel3.Style.Class = ""; + this.ribbonPanel3.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; // // // - this.ribbonPanel6.StyleMouseDown.Class = ""; - this.ribbonPanel6.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonPanel3.StyleMouseDown.Class = ""; + this.ribbonPanel3.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; // // // - this.ribbonPanel6.StyleMouseOver.Class = ""; - this.ribbonPanel6.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonPanel6.TabIndex = 38; - this.ribbonPanel6.Visible = false; + this.ribbonPanel3.StyleMouseOver.Class = ""; + this.ribbonPanel3.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonPanel3.TabIndex = 40; // - // ribbonBar6 + // ribbonBar4 // - this.ribbonBar6.AutoOverflowEnabled = true; + this.ribbonBar4.AutoOverflowEnabled = true; // // // - this.ribbonBar6.BackgroundMouseOverStyle.Class = ""; - this.ribbonBar6.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar4.BackgroundMouseOverStyle.Class = ""; + this.ribbonBar4.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; // // // - this.ribbonBar6.BackgroundStyle.Class = ""; - this.ribbonBar6.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonBar6.ContainerControlProcessDialogKey = true; - this.ribbonBar6.Dock = System.Windows.Forms.DockStyle.Left; - this.ribbonBar6.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { - this.buttonItemSPSZ, - this.buttonItem8, - this.buttonItemLocation, - this.sliderItem2, - this.buttonItemGBJC}); - this.ribbonBar6.Location = new System.Drawing.Point(3, 0); - this.ribbonBar6.Name = "ribbonBar6"; - this.ribbonBar6.Size = new System.Drawing.Size(427, 92); - this.ribbonBar6.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.ribbonBar6.TabIndex = 0; + this.ribbonBar4.BackgroundStyle.Class = ""; + this.ribbonBar4.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar4.ContainerControlProcessDialogKey = true; + this.ribbonBar4.Dock = System.Windows.Forms.DockStyle.Left; + this.ribbonBar4.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { + this.btn_flag, + this.slider4ground}); + this.ribbonBar4.Location = new System.Drawing.Point(3, 0); + this.ribbonBar4.Name = "ribbonBar4"; + this.ribbonBar4.Size = new System.Drawing.Size(634, 59); + this.ribbonBar4.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.ribbonBar4.TabIndex = 0; // // // - this.ribbonBar6.TitleStyle.Class = ""; - this.ribbonBar6.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar4.TitleStyle.Class = ""; + this.ribbonBar4.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; // // // - this.ribbonBar6.TitleStyleMouseOver.Class = ""; - this.ribbonBar6.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonBar6.TitleVisible = false; + this.ribbonBar4.TitleStyleMouseOver.Class = ""; + this.ribbonBar4.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar4.TitleVisible = false; // - // buttonItemSPSZ + // btn_flag // - this.buttonItemSPSZ.Image = ((System.Drawing.Image)(resources.GetObject("buttonItemSPSZ.Image"))); - this.buttonItemSPSZ.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItemSPSZ.Name = "buttonItemSPSZ"; - this.buttonItemSPSZ.SubItemsExpandWidth = 14; - this.buttonItemSPSZ.Text = "双屏设置"; - this.buttonItemSPSZ.Click += new System.EventHandler(this.buttonItemSPSZ_Click); + this.btn_flag.Image = global::Cyberpipe.Properties.Resources._24x24icon_03_hover; + this.btn_flag.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.btn_flag.Name = "btn_flag"; + this.btn_flag.SubItemsExpandWidth = 14; + this.btn_flag.Text = "标识器管理"; + this.btn_flag.Click += new System.EventHandler(this.btn_flag_Click); // - // buttonItem8 + // slider4ground // - this.buttonItem8.Image = ((System.Drawing.Image)(resources.GetObject("buttonItem8.Image"))); - this.buttonItem8.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem8.Name = "buttonItem8"; - this.buttonItem8.SubItemsExpandWidth = 14; - this.buttonItem8.Text = "双屏分析"; - this.buttonItem8.Click += new System.EventHandler(this.buttonItem8_Click); + this.slider4ground.LabelPosition = DevComponents.DotNetBar.eSliderLabelPosition.Top; + this.slider4ground.LabelWidth = 50; + this.slider4ground.Name = "slider4ground"; + this.slider4ground.Text = "地面透明度"; + this.slider4ground.TextColor = System.Drawing.Color.Black; + this.slider4ground.Value = 0; + this.slider4ground.ValueChanged += new System.EventHandler(this.slider4ground_ValueChanged); // - // buttonItemLocation + // ribbonPanel7 // - this.buttonItemLocation.Image = ((System.Drawing.Image)(resources.GetObject("buttonItemLocation.Image"))); - this.buttonItemLocation.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItemLocation.Name = "buttonItemLocation"; - this.buttonItemLocation.SubItemsExpandWidth = 14; - this.buttonItemLocation.Text = "快速定位"; - this.buttonItemLocation.Click += new System.EventHandler(this.buttonItemLocation_Click); + this.ribbonPanel7.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.ribbonPanel7.Controls.Add(this.gxdw_ribbonbar); + this.ribbonPanel7.Dock = System.Windows.Forms.DockStyle.Fill; + this.ribbonPanel7.Location = new System.Drawing.Point(0, 33); + this.ribbonPanel7.Name = "ribbonPanel7"; + this.ribbonPanel7.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); + this.ribbonPanel7.Size = new System.Drawing.Size(1328, 62); // - // sliderItem2 // - this.sliderItem2.LabelPosition = DevComponents.DotNetBar.eSliderLabelPosition.Top; - this.sliderItem2.LabelWidth = 50; - this.sliderItem2.Name = "sliderItem2"; - this.sliderItem2.Text = "地面透明度"; - this.sliderItem2.TextColor = System.Drawing.Color.Black; - this.sliderItem2.Value = 0; - this.sliderItem2.ValueChanged += new System.EventHandler(this.sliderItem2_ValueChanged); // - // buttonItemGBJC + this.ribbonPanel7.Style.Class = ""; + this.ribbonPanel7.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; // - this.buttonItemGBJC.Image = ((System.Drawing.Image)(resources.GetObject("buttonItemGBJC.Image"))); - this.buttonItemGBJC.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItemGBJC.Name = "buttonItemGBJC"; - this.buttonItemGBJC.SubItemsExpandWidth = 14; - this.buttonItemGBJC.Text = "国标检测"; - this.buttonItemGBJC.Click += new System.EventHandler(this.buttonItemGBJC_Click); // - // ribbonPanel5 // - this.ribbonPanel5.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.ribbonPanel5.Controls.Add(this.ribbonBar2); - this.ribbonPanel5.Dock = System.Windows.Forms.DockStyle.Fill; - this.ribbonPanel5.Location = new System.Drawing.Point(0, 0); - this.ribbonPanel5.Name = "ribbonPanel5"; - this.ribbonPanel5.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); - this.ribbonPanel5.Size = new System.Drawing.Size(1328, 95); + this.ribbonPanel7.StyleMouseDown.Class = ""; + this.ribbonPanel7.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; // // // - this.ribbonPanel5.Style.Class = ""; - this.ribbonPanel5.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonPanel7.StyleMouseOver.Class = ""; + this.ribbonPanel7.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonPanel7.TabIndex = 41; + this.ribbonPanel7.Visible = false; // + // gxdw_ribbonbar // + this.gxdw_ribbonbar.AutoOverflowEnabled = true; // - this.ribbonPanel5.StyleMouseDown.Class = ""; - this.ribbonPanel5.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; // // + this.gxdw_ribbonbar.BackgroundMouseOverStyle.Class = ""; + this.gxdw_ribbonbar.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; // - this.ribbonPanel5.StyleMouseOver.Class = ""; - this.ribbonPanel5.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonPanel5.TabIndex = 37; - this.ribbonPanel5.Visible = false; // - // ribbonBar2 // - this.ribbonBar2.AutoOverflowEnabled = true; + this.gxdw_ribbonbar.BackgroundStyle.Class = ""; + this.gxdw_ribbonbar.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.gxdw_ribbonbar.ContainerControlProcessDialogKey = true; + this.gxdw_ribbonbar.Dock = System.Windows.Forms.DockStyle.Left; + this.gxdw_ribbonbar.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { + this.buttonItem9, + this.buttonItem10, + this.buttonItem11, + this.buttonItem12, + this.buttonItem13, + this.buttonItem14}); + this.gxdw_ribbonbar.Location = new System.Drawing.Point(3, 0); + this.gxdw_ribbonbar.Name = "gxdw_ribbonbar"; + this.gxdw_ribbonbar.Size = new System.Drawing.Size(564, 59); + this.gxdw_ribbonbar.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.gxdw_ribbonbar.TabIndex = 0; + this.gxdw_ribbonbar.Text = "ribbonBar5"; // // // - this.ribbonBar2.BackgroundMouseOverStyle.Class = ""; - this.ribbonBar2.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.gxdw_ribbonbar.TitleStyle.Class = ""; + this.gxdw_ribbonbar.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; // // // - this.ribbonBar2.BackgroundStyle.Class = ""; - this.ribbonBar2.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonBar2.ContainerControlProcessDialogKey = true; - this.ribbonBar2.Dock = System.Windows.Forms.DockStyle.Left; - this.ribbonBar2.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { - this.buttonItemHX1, - this.buttonItemHX2, - this.buttonItemDCTP, - this.sliderItem3}); - this.ribbonBar2.Location = new System.Drawing.Point(3, 0); - this.ribbonBar2.Name = "ribbonBar2"; - this.ribbonBar2.Size = new System.Drawing.Size(350, 92); - this.ribbonBar2.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.ribbonBar2.TabIndex = 0; + this.gxdw_ribbonbar.TitleStyleMouseOver.Class = ""; + this.gxdw_ribbonbar.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.gxdw_ribbonbar.TitleVisible = false; // + // buttonItem9 // + this.buttonItem9.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__76; + this.buttonItem9.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem9.Name = "buttonItem9"; + this.buttonItem9.SubItemsExpandWidth = 14; + this.buttonItem9.Text = "工单管理"; + this.buttonItem9.Click += new System.EventHandler(this.buttonItem9_Click); // - this.ribbonBar2.TitleStyle.Class = ""; - this.ribbonBar2.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // buttonItem10 // + this.buttonItem10.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__69; + this.buttonItem10.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem10.Name = "buttonItem10"; + this.buttonItem10.SubItemsExpandWidth = 14; + this.buttonItem10.Text = "在线任务"; + this.buttonItem10.Click += new System.EventHandler(this.buttonItem10_Click); // + // buttonItem11 // - this.ribbonBar2.TitleStyleMouseOver.Class = ""; - this.ribbonBar2.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonBar2.TitleVisible = false; + this.buttonItem11.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__72; + this.buttonItem11.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem11.Name = "buttonItem11"; + this.buttonItem11.SubItemsExpandWidth = 14; + this.buttonItem11.Text = "事件管理"; + this.buttonItem11.Click += new System.EventHandler(this.buttonItem11_Click); // - // buttonItemHX1 + // buttonItem12 // - this.buttonItemHX1.AutoExpandOnClick = true; - this.buttonItemHX1.Image = ((System.Drawing.Image)(resources.GetObject("buttonItemHX1.Image"))); - this.buttonItemHX1.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItemHX1.Name = "buttonItemHX1"; - this.buttonItemHX1.SubItemsExpandWidth = 14; - this.buttonItemHX1.Text = "导入红线"; - this.buttonItemHX1.Click += new System.EventHandler(this.buttonItemHX1_Click); + this.buttonItem12.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__34; + this.buttonItem12.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem12.Name = "buttonItem12"; + this.buttonItem12.SubItemsExpandWidth = 14; + this.buttonItem12.Text = "探测仪管理"; + this.buttonItem12.Click += new System.EventHandler(this.buttonItem12_Click); // - // buttonItemHX2 + // buttonItem13 // - this.buttonItemHX2.Image = ((System.Drawing.Image)(resources.GetObject("buttonItemHX2.Image"))); - this.buttonItemHX2.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItemHX2.Name = "buttonItemHX2"; - this.buttonItemHX2.SubItemsExpandWidth = 14; - this.buttonItemHX2.Text = "红线审核"; - this.buttonItemHX2.Click += new System.EventHandler(this.buttonItemHX2_Click); + this.buttonItem13.Image = global::Cyberpipe.Properties.Resources._24x24icon_13_hover; + this.buttonItem13.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem13.Name = "buttonItem13"; + this.buttonItem13.SubItemsExpandWidth = 14; + this.buttonItem13.Text = "巡检人员维护"; + this.buttonItem13.Click += new System.EventHandler(this.buttonItem13_Click); // - // buttonItemDCTP + // buttonItem14 // - this.buttonItemDCTP.Image = ((System.Drawing.Image)(resources.GetObject("buttonItemDCTP.Image"))); - this.buttonItemDCTP.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItemDCTP.Name = "buttonItemDCTP"; - this.buttonItemDCTP.SubItemsExpandWidth = 14; - this.buttonItemDCTP.Text = "导出图片"; - this.buttonItemDCTP.Click += new System.EventHandler(this.buttonItemDCTP_Click); - // - // sliderItem3 - // - this.sliderItem3.LabelPosition = DevComponents.DotNetBar.eSliderLabelPosition.Top; - this.sliderItem3.LabelWidth = 50; - this.sliderItem3.Name = "sliderItem3"; - this.sliderItem3.Text = "地面透明度"; - this.sliderItem3.TextColor = System.Drawing.Color.Black; - this.sliderItem3.Value = 0; - this.sliderItem3.ValueChanged += new System.EventHandler(this.sliderItem3_ValueChanged); - // - // ribbonPanel1 - // - this.ribbonPanel1.AutoSize = true; - this.ribbonPanel1.CanvasColor = System.Drawing.Color.Gray; - this.ribbonPanel1.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.ribbonPanel1.Controls.Add(this.ribbonBar21); - this.ribbonPanel1.Dock = System.Windows.Forms.DockStyle.Fill; - this.ribbonPanel1.Location = new System.Drawing.Point(0, 0); - this.ribbonPanel1.Name = "ribbonPanel1"; - this.ribbonPanel1.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); - this.ribbonPanel1.Size = new System.Drawing.Size(1328, 95); - // - // - // - this.ribbonPanel1.Style.Class = ""; - this.ribbonPanel1.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonPanel1.StyleMouseDown.Class = ""; - this.ribbonPanel1.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonPanel1.StyleMouseOver.Class = ""; - this.ribbonPanel1.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonPanel1.TabIndex = 1; - this.ribbonPanel1.Visible = false; - // - // ribbonBar21 - // - this.ribbonBar21.AutoOverflowEnabled = true; - this.ribbonBar21.BackColor = System.Drawing.Color.White; - // - // - // - this.ribbonBar21.BackgroundMouseOverStyle.Class = ""; - this.ribbonBar21.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonBar21.BackgroundStyle.Class = ""; - this.ribbonBar21.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonBar21.ContainerControlProcessDialogKey = true; - this.ribbonBar21.Dock = System.Windows.Forms.DockStyle.Left; - this.ribbonBar21.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { - this.buttonItem87, - this.buttonItem88, - this.buttonItem27, - this.sliderGroundTransSet1, - this.buttonItem91, - this.buttonItem1, - this.btnlegendSet, - this.buttonItem89, - this.btnOutputJPG}); - this.ribbonBar21.Location = new System.Drawing.Point(3, 0); - this.ribbonBar21.Name = "ribbonBar21"; - this.ribbonBar21.Size = new System.Drawing.Size(649, 92); - this.ribbonBar21.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.ribbonBar21.TabIndex = 2; - this.ribbonBar21.Text = "浏览模式"; - // - // - // - this.ribbonBar21.TitleStyle.Class = ""; - this.ribbonBar21.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonBar21.TitleStyleMouseOver.Class = ""; - this.ribbonBar21.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonBar21.TitleVisible = false; - // - // buttonItem87 - // - this.buttonItem87.Image = ((System.Drawing.Image)(resources.GetObject("buttonItem87.Image"))); - this.buttonItem87.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem87.Name = "buttonItem87"; - this.buttonItem87.SubItemsExpandWidth = 14; - this.buttonItem87.Text = "地上模式"; - this.buttonItem87.Click += new System.EventHandler(this.buttonItem87_Click); - // - // buttonItem88 - // - this.buttonItem88.Image = ((System.Drawing.Image)(resources.GetObject("buttonItem88.Image"))); - this.buttonItem88.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem88.Name = "buttonItem88"; - this.buttonItem88.SubItemsExpandWidth = 14; - this.buttonItem88.Text = "地下模式"; - this.buttonItem88.Click += new System.EventHandler(this.buttonItem88_Click); - // - // buttonItem27 - // - this.buttonItem27.Image = ((System.Drawing.Image)(resources.GetObject("buttonItem27.Image"))); - this.buttonItem27.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem27.Name = "buttonItem27"; - this.buttonItem27.SubItemsExpandWidth = 14; - this.buttonItem27.Text = "行走模式"; - this.buttonItem27.Click += new System.EventHandler(this.buttonItem27_Click); - // - // buttonItem91 - // - this.buttonItem91.ForeColor = System.Drawing.Color.Black; - this.buttonItem91.Image = ((System.Drawing.Image)(resources.GetObject("buttonItem91.Image"))); - this.buttonItem91.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem91.Name = "buttonItem91"; - this.buttonItem91.SubItemsExpandWidth = 14; - this.buttonItem91.Text = "快速定位"; - this.buttonItem91.Click += new System.EventHandler(this.buttonItem91_Click); - // - // buttonItem1 - // - this.buttonItem1.Image = ((System.Drawing.Image)(resources.GetObject("buttonItem1.Image"))); - this.buttonItem1.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem1.Name = "buttonItem1"; - this.buttonItem1.SubItemsExpandWidth = 14; - this.buttonItem1.Text = "图层管理"; - this.buttonItem1.Click += new System.EventHandler(this.buttonItem1_Click); - // - // btnlegendSet - // - this.btnlegendSet.Image = ((System.Drawing.Image)(resources.GetObject("btnlegendSet.Image"))); - this.btnlegendSet.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.btnlegendSet.Name = "btnlegendSet"; - this.btnlegendSet.SubItemsExpandWidth = 14; - this.btnlegendSet.Text = "图例"; - this.btnlegendSet.Click += new System.EventHandler(this.btnlegendSet_Click); - // - // buttonItem89 - // - this.buttonItem89.Image = ((System.Drawing.Image)(resources.GetObject("buttonItem89.Image"))); - this.buttonItem89.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem89.Name = "buttonItem89"; - this.buttonItem89.SubItemsExpandWidth = 14; - this.buttonItem89.Text = "全屏显示"; - this.buttonItem89.Click += new System.EventHandler(this.buttonItem89_Click); - // - // btnOutputJPG - // - this.btnOutputJPG.Image = ((System.Drawing.Image)(resources.GetObject("btnOutputJPG.Image"))); - this.btnOutputJPG.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.btnOutputJPG.Name = "btnOutputJPG"; - this.btnOutputJPG.SubItemsExpandWidth = 14; - this.btnOutputJPG.Text = "导出图片"; - this.btnOutputJPG.Click += new System.EventHandler(this.btnOutputJPG_Click); - // - // ribbonPanel12 - // - this.ribbonPanel12.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.ribbonPanel12.Controls.Add(this.ribbonBar18); - this.ribbonPanel12.Controls.Add(this.ribbonBar13); - this.ribbonPanel12.Dock = System.Windows.Forms.DockStyle.Fill; - this.ribbonPanel12.Location = new System.Drawing.Point(0, 0); - this.ribbonPanel12.Name = "ribbonPanel12"; - this.ribbonPanel12.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); - this.ribbonPanel12.Size = new System.Drawing.Size(1328, 95); - // - // - // - this.ribbonPanel12.Style.Class = ""; - this.ribbonPanel12.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonPanel12.StyleMouseDown.Class = ""; - this.ribbonPanel12.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonPanel12.StyleMouseOver.Class = ""; - this.ribbonPanel12.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonPanel12.TabIndex = 34; - this.ribbonPanel12.Visible = false; - // - // ribbonBar18 - // - this.ribbonBar18.AutoOverflowEnabled = true; - // - // - // - this.ribbonBar18.BackgroundMouseOverStyle.Class = ""; - this.ribbonBar18.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonBar18.BackgroundStyle.Class = ""; - this.ribbonBar18.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonBar18.ContainerControlProcessDialogKey = true; - this.ribbonBar18.Dock = System.Windows.Forms.DockStyle.Left; - this.ribbonBar18.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { - this.buttonItem133}); - this.ribbonBar18.Location = new System.Drawing.Point(531, 0); - this.ribbonBar18.Name = "ribbonBar18"; - this.ribbonBar18.Size = new System.Drawing.Size(129, 92); - this.ribbonBar18.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.ribbonBar18.TabIndex = 1; - // - // - // - this.ribbonBar18.TitleStyle.Class = ""; - this.ribbonBar18.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonBar18.TitleStyleMouseOver.Class = ""; - this.ribbonBar18.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonBar18.TitleVisible = false; - // - // buttonItem133 - // - this.buttonItem133.Image = ((System.Drawing.Image)(resources.GetObject("buttonItem133.Image"))); - this.buttonItem133.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem133.Name = "buttonItem133"; - this.buttonItem133.SubItemsExpandWidth = 14; - this.buttonItem133.Text = "审核入库"; - this.buttonItem133.Click += new System.EventHandler(this.buttonItem133_Click_1); - // - // ribbonBar13 - // - this.ribbonBar13.AutoOverflowEnabled = true; - // - // - // - this.ribbonBar13.BackgroundMouseOverStyle.Class = ""; - this.ribbonBar13.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonBar13.BackgroundStyle.Class = ""; - this.ribbonBar13.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonBar13.ContainerControlProcessDialogKey = true; - this.ribbonBar13.Dock = System.Windows.Forms.DockStyle.Left; - this.ribbonBar13.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { - this.buttonItem127, - this.buttonItem128, - this.sliderItem1, - this.buttonItem134, - this.buttonItem130, - this.btn_check_history}); - this.ribbonBar13.Location = new System.Drawing.Point(3, 0); - this.ribbonBar13.Name = "ribbonBar13"; - this.ribbonBar13.Size = new System.Drawing.Size(528, 92); - this.ribbonBar13.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.ribbonBar13.TabIndex = 0; - // - // - // - this.ribbonBar13.TitleStyle.Class = ""; - this.ribbonBar13.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonBar13.TitleStyleMouseOver.Class = ""; - this.ribbonBar13.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonBar13.TitleVisible = false; - // - // buttonItem127 - // - this.buttonItem127.Image = ((System.Drawing.Image)(resources.GetObject("buttonItem127.Image"))); - this.buttonItem127.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem127.Name = "buttonItem127"; - this.buttonItem127.SubItemsExpandWidth = 14; - this.buttonItem127.Text = "打开数据"; - this.buttonItem127.Click += new System.EventHandler(this.buttonItem127_Click_2); - // - // buttonItem128 - // - this.buttonItem128.Image = ((System.Drawing.Image)(resources.GetObject("buttonItem128.Image"))); - this.buttonItem128.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem128.Name = "buttonItem128"; - this.buttonItem128.SubItemsExpandWidth = 14; - this.buttonItem128.Text = "一键审核"; - this.buttonItem128.Click += new System.EventHandler(this.buttonItem128_Click); - // - // sliderItem1 - // - this.sliderItem1.LabelPosition = DevComponents.DotNetBar.eSliderLabelPosition.Top; - this.sliderItem1.LabelWidth = 50; - this.sliderItem1.Name = "sliderItem1"; - this.sliderItem1.Text = "地面透明度"; - this.sliderItem1.TextColor = System.Drawing.Color.Black; - this.sliderItem1.Value = 0; - this.sliderItem1.ValueChanged += new System.EventHandler(this.sliderItem1_ValueChanged); - // - // buttonItem134 - // - this.buttonItem134.Image = ((System.Drawing.Image)(resources.GetObject("buttonItem134.Image"))); - this.buttonItem134.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem134.Name = "buttonItem134"; - this.buttonItem134.SubItemsExpandWidth = 14; - this.buttonItem134.Text = "模拟设计修改"; - this.buttonItem134.Click += new System.EventHandler(this.buttonItem134_Click_1); - // - // buttonItem130 - // - this.buttonItem130.Image = ((System.Drawing.Image)(resources.GetObject("buttonItem130.Image"))); - this.buttonItem130.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem130.Name = "buttonItem130"; - this.buttonItem130.SubItemsExpandWidth = 14; - this.buttonItem130.Text = "导出审核图"; - this.buttonItem130.Click += new System.EventHandler(this.buttonItem130_Click_1); - // - // btn_check_history - // - this.btn_check_history.Image = ((System.Drawing.Image)(resources.GetObject("btn_check_history.Image"))); - this.btn_check_history.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.btn_check_history.Name = "btn_check_history"; - this.btn_check_history.SubItemsExpandWidth = 14; - this.btn_check_history.Text = "审核历史"; - this.btn_check_history.Click += new System.EventHandler(this.btn_check_history_Click); - // - // ribbonPanel4 - // - this.ribbonPanel4.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.ribbonPanel4.Controls.Add(this.ribbonBar1); - this.ribbonPanel4.Dock = System.Windows.Forms.DockStyle.Fill; - this.ribbonPanel4.Location = new System.Drawing.Point(0, 0); - this.ribbonPanel4.Name = "ribbonPanel4"; - this.ribbonPanel4.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); - this.ribbonPanel4.Size = new System.Drawing.Size(1328, 95); - // - // - // - this.ribbonPanel4.Style.Class = ""; - this.ribbonPanel4.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonPanel4.StyleMouseDown.Class = ""; - this.ribbonPanel4.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonPanel4.StyleMouseOver.Class = ""; - this.ribbonPanel4.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonPanel4.TabIndex = 36; - this.ribbonPanel4.Visible = false; - // - // ribbonBar1 - // - this.ribbonBar1.AutoOverflowEnabled = true; - // - // - // - this.ribbonBar1.BackgroundMouseOverStyle.Class = ""; - this.ribbonBar1.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonBar1.BackgroundStyle.Class = ""; - this.ribbonBar1.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonBar1.ContainerControlProcessDialogKey = true; - this.ribbonBar1.Dock = System.Windows.Forms.DockStyle.Left; - this.ribbonBar1.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { - this.btn_document_info}); - this.ribbonBar1.Location = new System.Drawing.Point(3, 0); - this.ribbonBar1.Name = "ribbonBar1"; - this.ribbonBar1.Size = new System.Drawing.Size(88, 92); - this.ribbonBar1.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.ribbonBar1.TabIndex = 0; - // - // - // - this.ribbonBar1.TitleStyle.Class = ""; - this.ribbonBar1.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonBar1.TitleStyleMouseOver.Class = ""; - this.ribbonBar1.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonBar1.TitleVisible = false; - // - // btn_document_info - // - this.btn_document_info.Image = ((System.Drawing.Image)(resources.GetObject("btn_document_info.Image"))); - this.btn_document_info.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.btn_document_info.Name = "btn_document_info"; - this.btn_document_info.SubItemsExpandWidth = 14; - this.btn_document_info.Text = "文档管理"; - this.btn_document_info.Click += new System.EventHandler(this.btn_document_info_Click); + this.buttonItem14.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__56; + this.buttonItem14.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem14.Name = "buttonItem14"; + this.buttonItem14.SubItemsExpandWidth = 14; + this.buttonItem14.Text = "导出施工图"; + this.buttonItem14.Click += new System.EventHandler(this.buttonItem14_Click); // // ribbonPanel15 // this.ribbonPanel15.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; this.ribbonPanel15.Controls.Add(this.ribbonBar20); this.ribbonPanel15.Dock = System.Windows.Forms.DockStyle.Fill; - this.ribbonPanel15.Location = new System.Drawing.Point(0, 0); + this.ribbonPanel15.Location = new System.Drawing.Point(0, 33); this.ribbonPanel15.Name = "ribbonPanel15"; this.ribbonPanel15.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); - this.ribbonPanel15.Size = new System.Drawing.Size(1328, 95); + this.ribbonPanel15.Size = new System.Drawing.Size(1328, 62); // // // @@ -2843,7 +2465,7 @@ this.buttonItemXTGL}); this.ribbonBar20.Location = new System.Drawing.Point(3, 0); this.ribbonBar20.Name = "ribbonBar20"; - this.ribbonBar20.Size = new System.Drawing.Size(283, 92); + this.ribbonBar20.Size = new System.Drawing.Size(283, 59); this.ribbonBar20.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; this.ribbonBar20.TabIndex = 0; // @@ -3274,216 +2896,15 @@ this.buttonItemXT4_2.Text = "人员修改"; this.buttonItemXT4_2.Click += new System.EventHandler(this.buttonItemXT4_2_Click); // - // ribbonPanel3 - // - this.ribbonPanel3.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.ribbonPanel3.Controls.Add(this.ribbonBar4); - this.ribbonPanel3.Dock = System.Windows.Forms.DockStyle.Fill; - this.ribbonPanel3.Location = new System.Drawing.Point(0, 33); - this.ribbonPanel3.Name = "ribbonPanel3"; - this.ribbonPanel3.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); - this.ribbonPanel3.Size = new System.Drawing.Size(1328, 62); - // - // - // - this.ribbonPanel3.Style.Class = ""; - this.ribbonPanel3.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonPanel3.StyleMouseDown.Class = ""; - this.ribbonPanel3.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonPanel3.StyleMouseOver.Class = ""; - this.ribbonPanel3.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonPanel3.TabIndex = 40; - // - // ribbonBar4 - // - this.ribbonBar4.AutoOverflowEnabled = true; - // - // - // - this.ribbonBar4.BackgroundMouseOverStyle.Class = ""; - this.ribbonBar4.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonBar4.BackgroundStyle.Class = ""; - this.ribbonBar4.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonBar4.ContainerControlProcessDialogKey = true; - this.ribbonBar4.Dock = System.Windows.Forms.DockStyle.Left; - this.ribbonBar4.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { - this.btn_flag, - this.slider4ground}); - this.ribbonBar4.Location = new System.Drawing.Point(3, 0); - this.ribbonBar4.Name = "ribbonBar4"; - this.ribbonBar4.Size = new System.Drawing.Size(321, 59); - this.ribbonBar4.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.ribbonBar4.TabIndex = 0; - // - // - // - this.ribbonBar4.TitleStyle.Class = ""; - this.ribbonBar4.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonBar4.TitleStyleMouseOver.Class = ""; - this.ribbonBar4.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonBar4.TitleVisible = false; - // - // btn_flag - // - this.btn_flag.Image = global::Cyberpipe.Properties.Resources._24x24icon_03_hover; - this.btn_flag.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.btn_flag.Name = "btn_flag"; - this.btn_flag.SubItemsExpandWidth = 14; - this.btn_flag.Text = "标识器管理"; - this.btn_flag.Click += new System.EventHandler(this.btn_flag_Click); - // - // slider4ground - // - this.slider4ground.LabelPosition = DevComponents.DotNetBar.eSliderLabelPosition.Top; - this.slider4ground.LabelWidth = 50; - this.slider4ground.Name = "slider4ground"; - this.slider4ground.Text = "地面透明度"; - this.slider4ground.TextColor = System.Drawing.Color.Black; - this.slider4ground.Value = 0; - this.slider4ground.ValueChanged += new System.EventHandler(this.slider4ground_ValueChanged); - // - // ribbonPanel7 - // - this.ribbonPanel7.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.ribbonPanel7.Controls.Add(this.gxdw_ribbonbar); - this.ribbonPanel7.Dock = System.Windows.Forms.DockStyle.Fill; - this.ribbonPanel7.Location = new System.Drawing.Point(0, 33); - this.ribbonPanel7.Name = "ribbonPanel7"; - this.ribbonPanel7.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); - this.ribbonPanel7.Size = new System.Drawing.Size(1328, 62); - // - // - // - this.ribbonPanel7.Style.Class = ""; - this.ribbonPanel7.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonPanel7.StyleMouseDown.Class = ""; - this.ribbonPanel7.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonPanel7.StyleMouseOver.Class = ""; - this.ribbonPanel7.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonPanel7.TabIndex = 41; - this.ribbonPanel7.Visible = false; - // - // gxdw_ribbonbar - // - this.gxdw_ribbonbar.AutoOverflowEnabled = true; - // - // - // - this.gxdw_ribbonbar.BackgroundMouseOverStyle.Class = ""; - this.gxdw_ribbonbar.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.gxdw_ribbonbar.BackgroundStyle.Class = ""; - this.gxdw_ribbonbar.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.gxdw_ribbonbar.ContainerControlProcessDialogKey = true; - this.gxdw_ribbonbar.Dock = System.Windows.Forms.DockStyle.Left; - this.gxdw_ribbonbar.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { - this.buttonItem9, - this.buttonItem10, - this.buttonItem11, - this.buttonItem12, - this.buttonItem13, - this.buttonItem14}); - this.gxdw_ribbonbar.Location = new System.Drawing.Point(3, 0); - this.gxdw_ribbonbar.Name = "gxdw_ribbonbar"; - this.gxdw_ribbonbar.Size = new System.Drawing.Size(522, 59); - this.gxdw_ribbonbar.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.gxdw_ribbonbar.TabIndex = 0; - this.gxdw_ribbonbar.Text = "ribbonBar5"; - // - // - // - this.gxdw_ribbonbar.TitleStyle.Class = ""; - this.gxdw_ribbonbar.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.gxdw_ribbonbar.TitleStyleMouseOver.Class = ""; - this.gxdw_ribbonbar.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.gxdw_ribbonbar.TitleVisible = false; - // - // buttonItem9 - // - this.buttonItem9.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__76; - this.buttonItem9.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem9.Name = "buttonItem9"; - this.buttonItem9.SubItemsExpandWidth = 14; - this.buttonItem9.Text = "工单管理"; - this.buttonItem9.Click += new System.EventHandler(this.buttonItem9_Click); - // - // buttonItem10 - // - this.buttonItem10.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__69; - this.buttonItem10.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem10.Name = "buttonItem10"; - this.buttonItem10.SubItemsExpandWidth = 14; - this.buttonItem10.Text = "在线任务"; - this.buttonItem10.Click += new System.EventHandler(this.buttonItem10_Click); - // - // buttonItem11 - // - this.buttonItem11.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__72; - this.buttonItem11.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem11.Name = "buttonItem11"; - this.buttonItem11.SubItemsExpandWidth = 14; - this.buttonItem11.Text = "事件管理"; - this.buttonItem11.Click += new System.EventHandler(this.buttonItem11_Click); - // - // buttonItem12 - // - this.buttonItem12.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__34; - this.buttonItem12.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem12.Name = "buttonItem12"; - this.buttonItem12.SubItemsExpandWidth = 14; - this.buttonItem12.Text = "探测仪管理"; - this.buttonItem12.Click += new System.EventHandler(this.buttonItem12_Click); - // - // buttonItem13 - // - this.buttonItem13.Image = global::Cyberpipe.Properties.Resources._24x24icon_13_hover; - this.buttonItem13.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem13.Name = "buttonItem13"; - this.buttonItem13.SubItemsExpandWidth = 14; - this.buttonItem13.Text = "巡检人员维护"; - this.buttonItem13.Click += new System.EventHandler(this.buttonItem13_Click); - // - // buttonItem14 - // - this.buttonItem14.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__56; - this.buttonItem14.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem14.Name = "buttonItem14"; - this.buttonItem14.SubItemsExpandWidth = 14; - this.buttonItem14.Text = "导出施工图"; - this.buttonItem14.Click += new System.EventHandler(this.buttonItem14_Click); - // // ribbonPanel2 // this.ribbonPanel2.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; this.ribbonPanel2.Controls.Add(this.ribbonBar3); this.ribbonPanel2.Dock = System.Windows.Forms.DockStyle.Fill; - this.ribbonPanel2.Location = new System.Drawing.Point(0, 33); + this.ribbonPanel2.Location = new System.Drawing.Point(0, 0); this.ribbonPanel2.Name = "ribbonPanel2"; this.ribbonPanel2.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); - this.ribbonPanel2.Size = new System.Drawing.Size(1328, 62); + this.ribbonPanel2.Size = new System.Drawing.Size(1328, 95); // // // @@ -3527,7 +2948,7 @@ this.buttonItemPasswordReset}); this.ribbonBar3.Location = new System.Drawing.Point(3, 0); this.ribbonBar3.Name = "ribbonBar3"; - this.ribbonBar3.Size = new System.Drawing.Size(551, 59); + this.ribbonBar3.Size = new System.Drawing.Size(551, 92); this.ribbonBar3.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; this.ribbonBar3.TabIndex = 1; // @@ -3567,6 +2988,7 @@ this.btn_resc_info.Name = "btn_resc_info"; this.btn_resc_info.SubItemsExpandWidth = 14; this.btn_resc_info.Text = "资源管理"; + this.btn_resc_info.Visible = false; this.btn_resc_info.Click += new System.EventHandler(this.btn_resc_info_Click); // // btn_role_resc @@ -3605,6 +3027,605 @@ this.buttonItemPasswordReset.Text = "重置密码"; this.buttonItemPasswordReset.Click += new System.EventHandler(this.buttonItemPasswordReset_Click); // + // ribbonPanel6 + // + this.ribbonPanel6.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.ribbonPanel6.Controls.Add(this.ribbonBar6); + this.ribbonPanel6.Dock = System.Windows.Forms.DockStyle.Fill; + this.ribbonPanel6.Location = new System.Drawing.Point(0, 0); + this.ribbonPanel6.Name = "ribbonPanel6"; + this.ribbonPanel6.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); + this.ribbonPanel6.Size = new System.Drawing.Size(1328, 95); + // + // + // + this.ribbonPanel6.Style.Class = ""; + this.ribbonPanel6.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonPanel6.StyleMouseDown.Class = ""; + this.ribbonPanel6.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonPanel6.StyleMouseOver.Class = ""; + this.ribbonPanel6.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonPanel6.TabIndex = 38; + this.ribbonPanel6.Visible = false; + // + // ribbonBar6 + // + this.ribbonBar6.AutoOverflowEnabled = true; + // + // + // + this.ribbonBar6.BackgroundMouseOverStyle.Class = ""; + this.ribbonBar6.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonBar6.BackgroundStyle.Class = ""; + this.ribbonBar6.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar6.ContainerControlProcessDialogKey = true; + this.ribbonBar6.Dock = System.Windows.Forms.DockStyle.Left; + this.ribbonBar6.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { + this.buttonItemSPSZ, + this.buttonItem8, + this.buttonItemLocation, + this.sliderItem2, + this.buttonItemGBJC}); + this.ribbonBar6.Location = new System.Drawing.Point(3, 0); + this.ribbonBar6.Name = "ribbonBar6"; + this.ribbonBar6.Size = new System.Drawing.Size(427, 92); + this.ribbonBar6.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.ribbonBar6.TabIndex = 0; + // + // + // + this.ribbonBar6.TitleStyle.Class = ""; + this.ribbonBar6.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonBar6.TitleStyleMouseOver.Class = ""; + this.ribbonBar6.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar6.TitleVisible = false; + // + // buttonItemSPSZ + // + this.buttonItemSPSZ.Image = ((System.Drawing.Image)(resources.GetObject("buttonItemSPSZ.Image"))); + this.buttonItemSPSZ.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItemSPSZ.Name = "buttonItemSPSZ"; + this.buttonItemSPSZ.SubItemsExpandWidth = 14; + this.buttonItemSPSZ.Text = "双屏设置"; + this.buttonItemSPSZ.Click += new System.EventHandler(this.buttonItemSPSZ_Click); + // + // buttonItem8 + // + this.buttonItem8.Image = ((System.Drawing.Image)(resources.GetObject("buttonItem8.Image"))); + this.buttonItem8.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem8.Name = "buttonItem8"; + this.buttonItem8.SubItemsExpandWidth = 14; + this.buttonItem8.Text = "双屏分析"; + this.buttonItem8.Click += new System.EventHandler(this.buttonItem8_Click); + // + // buttonItemLocation + // + this.buttonItemLocation.Image = ((System.Drawing.Image)(resources.GetObject("buttonItemLocation.Image"))); + this.buttonItemLocation.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItemLocation.Name = "buttonItemLocation"; + this.buttonItemLocation.SubItemsExpandWidth = 14; + this.buttonItemLocation.Text = "快速定位"; + this.buttonItemLocation.Click += new System.EventHandler(this.buttonItemLocation_Click); + // + // sliderItem2 + // + this.sliderItem2.LabelPosition = DevComponents.DotNetBar.eSliderLabelPosition.Top; + this.sliderItem2.LabelWidth = 50; + this.sliderItem2.Name = "sliderItem2"; + this.sliderItem2.Text = "地面透明度"; + this.sliderItem2.TextColor = System.Drawing.Color.Black; + this.sliderItem2.Value = 0; + this.sliderItem2.ValueChanged += new System.EventHandler(this.sliderItem2_ValueChanged); + // + // buttonItemGBJC + // + this.buttonItemGBJC.Image = ((System.Drawing.Image)(resources.GetObject("buttonItemGBJC.Image"))); + this.buttonItemGBJC.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItemGBJC.Name = "buttonItemGBJC"; + this.buttonItemGBJC.SubItemsExpandWidth = 14; + this.buttonItemGBJC.Text = "国标检测"; + this.buttonItemGBJC.Click += new System.EventHandler(this.buttonItemGBJC_Click); + // + // ribbonPanel5 + // + this.ribbonPanel5.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.ribbonPanel5.Controls.Add(this.ribbonBar2); + this.ribbonPanel5.Dock = System.Windows.Forms.DockStyle.Fill; + this.ribbonPanel5.Location = new System.Drawing.Point(0, 33); + this.ribbonPanel5.Name = "ribbonPanel5"; + this.ribbonPanel5.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); + this.ribbonPanel5.Size = new System.Drawing.Size(1328, 62); + // + // + // + this.ribbonPanel5.Style.Class = ""; + this.ribbonPanel5.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonPanel5.StyleMouseDown.Class = ""; + this.ribbonPanel5.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonPanel5.StyleMouseOver.Class = ""; + this.ribbonPanel5.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonPanel5.TabIndex = 37; + this.ribbonPanel5.Visible = false; + // + // ribbonBar2 + // + this.ribbonBar2.AutoOverflowEnabled = true; + // + // + // + this.ribbonBar2.BackgroundMouseOverStyle.Class = ""; + this.ribbonBar2.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonBar2.BackgroundStyle.Class = ""; + this.ribbonBar2.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar2.ContainerControlProcessDialogKey = true; + this.ribbonBar2.Dock = System.Windows.Forms.DockStyle.Left; + this.ribbonBar2.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { + this.buttonItemHX1, + this.buttonItemHX2, + this.buttonItemDCTP, + this.sliderItem3}); + this.ribbonBar2.Location = new System.Drawing.Point(3, 0); + this.ribbonBar2.Name = "ribbonBar2"; + this.ribbonBar2.Size = new System.Drawing.Size(350, 59); + this.ribbonBar2.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.ribbonBar2.TabIndex = 0; + // + // + // + this.ribbonBar2.TitleStyle.Class = ""; + this.ribbonBar2.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonBar2.TitleStyleMouseOver.Class = ""; + this.ribbonBar2.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar2.TitleVisible = false; + // + // buttonItemHX1 + // + this.buttonItemHX1.AutoExpandOnClick = true; + this.buttonItemHX1.Image = ((System.Drawing.Image)(resources.GetObject("buttonItemHX1.Image"))); + this.buttonItemHX1.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItemHX1.Name = "buttonItemHX1"; + this.buttonItemHX1.SubItemsExpandWidth = 14; + this.buttonItemHX1.Text = "导入红线"; + this.buttonItemHX1.Click += new System.EventHandler(this.buttonItemHX1_Click); + // + // buttonItemHX2 + // + this.buttonItemHX2.Image = ((System.Drawing.Image)(resources.GetObject("buttonItemHX2.Image"))); + this.buttonItemHX2.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItemHX2.Name = "buttonItemHX2"; + this.buttonItemHX2.SubItemsExpandWidth = 14; + this.buttonItemHX2.Text = "红线审核"; + this.buttonItemHX2.Click += new System.EventHandler(this.buttonItemHX2_Click); + // + // buttonItemDCTP + // + this.buttonItemDCTP.Image = ((System.Drawing.Image)(resources.GetObject("buttonItemDCTP.Image"))); + this.buttonItemDCTP.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItemDCTP.Name = "buttonItemDCTP"; + this.buttonItemDCTP.SubItemsExpandWidth = 14; + this.buttonItemDCTP.Text = "导出图片"; + this.buttonItemDCTP.Click += new System.EventHandler(this.buttonItemDCTP_Click); + // + // sliderItem3 + // + this.sliderItem3.LabelPosition = DevComponents.DotNetBar.eSliderLabelPosition.Top; + this.sliderItem3.LabelWidth = 50; + this.sliderItem3.Name = "sliderItem3"; + this.sliderItem3.Text = "地面透明度"; + this.sliderItem3.TextColor = System.Drawing.Color.Black; + this.sliderItem3.Value = 0; + this.sliderItem3.ValueChanged += new System.EventHandler(this.sliderItem3_ValueChanged); + // + // ribbonPanel1 + // + this.ribbonPanel1.AutoSize = true; + this.ribbonPanel1.CanvasColor = System.Drawing.Color.Gray; + this.ribbonPanel1.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.ribbonPanel1.Controls.Add(this.ribbonBar21); + this.ribbonPanel1.Dock = System.Windows.Forms.DockStyle.Fill; + this.ribbonPanel1.Location = new System.Drawing.Point(0, 33); + this.ribbonPanel1.Name = "ribbonPanel1"; + this.ribbonPanel1.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); + this.ribbonPanel1.Size = new System.Drawing.Size(1328, 62); + // + // + // + this.ribbonPanel1.Style.Class = ""; + this.ribbonPanel1.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonPanel1.StyleMouseDown.Class = ""; + this.ribbonPanel1.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonPanel1.StyleMouseOver.Class = ""; + this.ribbonPanel1.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonPanel1.TabIndex = 1; + this.ribbonPanel1.Visible = false; + // + // ribbonBar21 + // + this.ribbonBar21.AutoOverflowEnabled = true; + this.ribbonBar21.BackColor = System.Drawing.Color.White; + // + // + // + this.ribbonBar21.BackgroundMouseOverStyle.Class = ""; + this.ribbonBar21.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonBar21.BackgroundStyle.Class = ""; + this.ribbonBar21.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar21.ContainerControlProcessDialogKey = true; + this.ribbonBar21.Dock = System.Windows.Forms.DockStyle.Left; + this.ribbonBar21.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { + this.buttonItem87, + this.buttonItem88, + this.buttonItem27, + this.sliderGroundTransSet1, + this.buttonItem91, + this.buttonItem1, + this.btnlegendSet, + this.buttonItem89, + this.btnOutputJPG}); + this.ribbonBar21.Location = new System.Drawing.Point(3, 0); + this.ribbonBar21.Name = "ribbonBar21"; + this.ribbonBar21.Size = new System.Drawing.Size(649, 59); + this.ribbonBar21.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.ribbonBar21.TabIndex = 2; + this.ribbonBar21.Text = "浏览模式"; + // + // + // + this.ribbonBar21.TitleStyle.Class = ""; + this.ribbonBar21.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonBar21.TitleStyleMouseOver.Class = ""; + this.ribbonBar21.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar21.TitleVisible = false; + // + // buttonItem87 + // + this.buttonItem87.Image = ((System.Drawing.Image)(resources.GetObject("buttonItem87.Image"))); + this.buttonItem87.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem87.Name = "buttonItem87"; + this.buttonItem87.SubItemsExpandWidth = 14; + this.buttonItem87.Text = "地上模式"; + this.buttonItem87.Click += new System.EventHandler(this.buttonItem87_Click); + // + // buttonItem88 + // + this.buttonItem88.Image = ((System.Drawing.Image)(resources.GetObject("buttonItem88.Image"))); + this.buttonItem88.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem88.Name = "buttonItem88"; + this.buttonItem88.SubItemsExpandWidth = 14; + this.buttonItem88.Text = "地下模式"; + this.buttonItem88.Click += new System.EventHandler(this.buttonItem88_Click); + // + // buttonItem27 + // + this.buttonItem27.Image = ((System.Drawing.Image)(resources.GetObject("buttonItem27.Image"))); + this.buttonItem27.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem27.Name = "buttonItem27"; + this.buttonItem27.SubItemsExpandWidth = 14; + this.buttonItem27.Text = "行走模式"; + this.buttonItem27.Click += new System.EventHandler(this.buttonItem27_Click); + // + // buttonItem91 + // + this.buttonItem91.ForeColor = System.Drawing.Color.Black; + this.buttonItem91.Image = ((System.Drawing.Image)(resources.GetObject("buttonItem91.Image"))); + this.buttonItem91.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem91.Name = "buttonItem91"; + this.buttonItem91.SubItemsExpandWidth = 14; + this.buttonItem91.Text = "快速定位"; + this.buttonItem91.Click += new System.EventHandler(this.buttonItem91_Click); + // + // buttonItem1 + // + this.buttonItem1.Image = ((System.Drawing.Image)(resources.GetObject("buttonItem1.Image"))); + this.buttonItem1.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem1.Name = "buttonItem1"; + this.buttonItem1.SubItemsExpandWidth = 14; + this.buttonItem1.Text = "图层管理"; + this.buttonItem1.Click += new System.EventHandler(this.buttonItem1_Click); + // + // btnlegendSet + // + this.btnlegendSet.Image = ((System.Drawing.Image)(resources.GetObject("btnlegendSet.Image"))); + this.btnlegendSet.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.btnlegendSet.Name = "btnlegendSet"; + this.btnlegendSet.SubItemsExpandWidth = 14; + this.btnlegendSet.Text = "图例"; + this.btnlegendSet.Click += new System.EventHandler(this.btnlegendSet_Click); + // + // buttonItem89 + // + this.buttonItem89.Image = ((System.Drawing.Image)(resources.GetObject("buttonItem89.Image"))); + this.buttonItem89.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem89.Name = "buttonItem89"; + this.buttonItem89.SubItemsExpandWidth = 14; + this.buttonItem89.Text = "全屏显示"; + this.buttonItem89.Click += new System.EventHandler(this.buttonItem89_Click); + // + // btnOutputJPG + // + this.btnOutputJPG.Image = ((System.Drawing.Image)(resources.GetObject("btnOutputJPG.Image"))); + this.btnOutputJPG.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.btnOutputJPG.Name = "btnOutputJPG"; + this.btnOutputJPG.SubItemsExpandWidth = 14; + this.btnOutputJPG.Text = "导出图片"; + this.btnOutputJPG.Click += new System.EventHandler(this.btnOutputJPG_Click); + // + // ribbonPanel12 + // + this.ribbonPanel12.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.ribbonPanel12.Controls.Add(this.ribbonBar18); + this.ribbonPanel12.Controls.Add(this.ribbonBar13); + this.ribbonPanel12.Dock = System.Windows.Forms.DockStyle.Fill; + this.ribbonPanel12.Location = new System.Drawing.Point(0, 33); + this.ribbonPanel12.Name = "ribbonPanel12"; + this.ribbonPanel12.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); + this.ribbonPanel12.Size = new System.Drawing.Size(1328, 62); + // + // + // + this.ribbonPanel12.Style.Class = ""; + this.ribbonPanel12.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonPanel12.StyleMouseDown.Class = ""; + this.ribbonPanel12.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonPanel12.StyleMouseOver.Class = ""; + this.ribbonPanel12.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonPanel12.TabIndex = 34; + this.ribbonPanel12.Visible = false; + // + // ribbonBar18 + // + this.ribbonBar18.AutoOverflowEnabled = true; + // + // + // + this.ribbonBar18.BackgroundMouseOverStyle.Class = ""; + this.ribbonBar18.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonBar18.BackgroundStyle.Class = ""; + this.ribbonBar18.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar18.ContainerControlProcessDialogKey = true; + this.ribbonBar18.Dock = System.Windows.Forms.DockStyle.Left; + this.ribbonBar18.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { + this.buttonItem133, + this.buttonItem132}); + this.ribbonBar18.Location = new System.Drawing.Point(508, 0); + this.ribbonBar18.Name = "ribbonBar18"; + this.ribbonBar18.Size = new System.Drawing.Size(75, 59); + this.ribbonBar18.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.ribbonBar18.TabIndex = 1; + // + // + // + this.ribbonBar18.TitleStyle.Class = ""; + this.ribbonBar18.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonBar18.TitleStyleMouseOver.Class = ""; + this.ribbonBar18.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar18.TitleVisible = false; + // + // buttonItem133 + // + this.buttonItem133.Image = ((System.Drawing.Image)(resources.GetObject("buttonItem133.Image"))); + this.buttonItem133.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem133.Name = "buttonItem133"; + this.buttonItem133.SubItemsExpandWidth = 14; + this.buttonItem133.Text = "审核入库"; + this.buttonItem133.Click += new System.EventHandler(this.buttonItem133_Click_1); + // + // buttonItem132 + // + this.buttonItem132.Name = "buttonItem132"; + // + // ribbonBar13 + // + this.ribbonBar13.AutoOverflowEnabled = true; + // + // + // + this.ribbonBar13.BackgroundMouseOverStyle.Class = ""; + this.ribbonBar13.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonBar13.BackgroundStyle.Class = ""; + this.ribbonBar13.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar13.ContainerControlProcessDialogKey = true; + this.ribbonBar13.Dock = System.Windows.Forms.DockStyle.Left; + this.ribbonBar13.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { + this.buttonItem127, + this.buttonItem128, + this.sliderItem1, + this.buttonItem134, + this.buttonItem130, + this.btn_check_history}); + this.ribbonBar13.Location = new System.Drawing.Point(3, 0); + this.ribbonBar13.Name = "ribbonBar13"; + this.ribbonBar13.Size = new System.Drawing.Size(505, 59); + this.ribbonBar13.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.ribbonBar13.TabIndex = 0; + // + // + // + this.ribbonBar13.TitleStyle.Class = ""; + this.ribbonBar13.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonBar13.TitleStyleMouseOver.Class = ""; + this.ribbonBar13.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar13.TitleVisible = false; + // + // buttonItem127 + // + this.buttonItem127.Image = ((System.Drawing.Image)(resources.GetObject("buttonItem127.Image"))); + this.buttonItem127.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem127.Name = "buttonItem127"; + this.buttonItem127.SubItemsExpandWidth = 14; + this.buttonItem127.Text = "打开数据"; + this.buttonItem127.Click += new System.EventHandler(this.buttonItem127_Click_2); + // + // buttonItem128 + // + this.buttonItem128.Image = ((System.Drawing.Image)(resources.GetObject("buttonItem128.Image"))); + this.buttonItem128.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem128.Name = "buttonItem128"; + this.buttonItem128.SubItemsExpandWidth = 14; + this.buttonItem128.Text = "一键审核"; + this.buttonItem128.Click += new System.EventHandler(this.buttonItem128_Click); + // + // sliderItem1 + // + this.sliderItem1.LabelPosition = DevComponents.DotNetBar.eSliderLabelPosition.Top; + this.sliderItem1.LabelWidth = 50; + this.sliderItem1.Name = "sliderItem1"; + this.sliderItem1.Text = "地面透明度"; + this.sliderItem1.TextColor = System.Drawing.Color.Black; + this.sliderItem1.Value = 0; + this.sliderItem1.ValueChanged += new System.EventHandler(this.sliderItem1_ValueChanged); + // + // buttonItem134 + // + this.buttonItem134.Image = ((System.Drawing.Image)(resources.GetObject("buttonItem134.Image"))); + this.buttonItem134.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem134.Name = "buttonItem134"; + this.buttonItem134.SubItemsExpandWidth = 14; + this.buttonItem134.Text = "模拟设计修改"; + this.buttonItem134.Click += new System.EventHandler(this.buttonItem134_Click_1); + // + // buttonItem130 + // + this.buttonItem130.Image = ((System.Drawing.Image)(resources.GetObject("buttonItem130.Image"))); + this.buttonItem130.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem130.Name = "buttonItem130"; + this.buttonItem130.SubItemsExpandWidth = 14; + this.buttonItem130.Text = "导出审核图"; + this.buttonItem130.Click += new System.EventHandler(this.buttonItem130_Click_1); + // + // btn_check_history + // + this.btn_check_history.Image = ((System.Drawing.Image)(resources.GetObject("btn_check_history.Image"))); + this.btn_check_history.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.btn_check_history.Name = "btn_check_history"; + this.btn_check_history.SubItemsExpandWidth = 14; + this.btn_check_history.Text = "审核历史"; + this.btn_check_history.Click += new System.EventHandler(this.btn_check_history_Click); + // + // ribbonPanel4 + // + this.ribbonPanel4.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.ribbonPanel4.Controls.Add(this.ribbonBar1); + this.ribbonPanel4.Dock = System.Windows.Forms.DockStyle.Fill; + this.ribbonPanel4.Location = new System.Drawing.Point(0, 33); + this.ribbonPanel4.Name = "ribbonPanel4"; + this.ribbonPanel4.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); + this.ribbonPanel4.Size = new System.Drawing.Size(1328, 62); + // + // + // + this.ribbonPanel4.Style.Class = ""; + this.ribbonPanel4.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonPanel4.StyleMouseDown.Class = ""; + this.ribbonPanel4.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonPanel4.StyleMouseOver.Class = ""; + this.ribbonPanel4.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonPanel4.TabIndex = 36; + this.ribbonPanel4.Visible = false; + // + // ribbonBar1 + // + this.ribbonBar1.AutoOverflowEnabled = true; + // + // + // + this.ribbonBar1.BackgroundMouseOverStyle.Class = ""; + this.ribbonBar1.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonBar1.BackgroundStyle.Class = ""; + this.ribbonBar1.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar1.ContainerControlProcessDialogKey = true; + this.ribbonBar1.Dock = System.Windows.Forms.DockStyle.Left; + this.ribbonBar1.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { + this.btn_document_info}); + this.ribbonBar1.Location = new System.Drawing.Point(3, 0); + this.ribbonBar1.Name = "ribbonBar1"; + this.ribbonBar1.Size = new System.Drawing.Size(88, 59); + this.ribbonBar1.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.ribbonBar1.TabIndex = 0; + // + // + // + this.ribbonBar1.TitleStyle.Class = ""; + this.ribbonBar1.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonBar1.TitleStyleMouseOver.Class = ""; + this.ribbonBar1.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar1.TitleVisible = false; + // + // btn_document_info + // + this.btn_document_info.Image = ((System.Drawing.Image)(resources.GetObject("btn_document_info.Image"))); + this.btn_document_info.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.btn_document_info.Name = "btn_document_info"; + this.btn_document_info.SubItemsExpandWidth = 14; + this.btn_document_info.Text = "文档管理"; + this.btn_document_info.Click += new System.EventHandler(this.btn_document_info_Click); + // // ribbonTabItem1 // this.ribbonTabItem1.ButtonStyle = DevComponents.DotNetBar.eButtonStyle.ImageAndText; @@ -3673,7 +3694,6 @@ this.ribbonTabItem7.Name = "ribbonTabItem7"; this.ribbonTabItem7.Panel = this.ribbonPanel7; this.ribbonTabItem7.Text = "管线定位"; - this.ribbonTabItem7.MouseDown += new System.Windows.Forms.MouseEventHandler(this.ribbonTabItem7_MouseDown); // // ribbonTabItem5 // @@ -3684,7 +3704,6 @@ this.ribbonTabItem5.Name = "ribbonTabItem5"; this.ribbonTabItem5.Panel = this.ribbonPanel3; this.ribbonTabItem5.Text = "标识器管理"; - this.ribbonTabItem5.MouseDown += new System.Windows.Forms.MouseEventHandler(this.ribbonTabItem5_MouseDown); // // ribbonTabItem2 // @@ -4451,7 +4470,7 @@ this.dataGridViewX2.ReadOnly = true; this.dataGridViewX2.RowHeadersVisible = false; this.dataGridViewX2.RowTemplate.Height = 23; - this.dataGridViewX2.Size = new System.Drawing.Size(31081, 92); + this.dataGridViewX2.Size = new System.Drawing.Size(31378, 92); this.dataGridViewX2.TabIndex = 11; // // dataGridViewTextBoxColumn10 @@ -4545,7 +4564,7 @@ this.dataGridViewX3.ReadOnly = true; this.dataGridViewX3.RowHeadersVisible = false; this.dataGridViewX3.RowTemplate.Height = 23; - this.dataGridViewX3.Size = new System.Drawing.Size(31080, 127); + this.dataGridViewX3.Size = new System.Drawing.Size(31377, 127); this.dataGridViewX3.TabIndex = 5; this.dataGridViewX3.MouseDoubleClick += new System.Windows.Forms.MouseEventHandler(this.dataGridViewX3_MouseDoubleClick); // @@ -5722,7 +5741,8 @@ // pictureBox1 // this.pictureBox1.Dock = System.Windows.Forms.DockStyle.Top; - this.pictureBox1.Image = ((System.Drawing.Image)(resources.GetObject("pictureBox1.Image"))); +// this.pictureBox1.Image = ((System.Drawing.Image)(resources.GetObject("pictureBox1.Image"))); + this.pictureBox1.Image = Image.FromFile(Application.StartupPath + Utility.TitleImagePath); this.pictureBox1.Location = new System.Drawing.Point(0, 0); this.pictureBox1.Margin = new System.Windows.Forms.Padding(0); this.pictureBox1.Name = "pictureBox1"; @@ -5732,18 +5752,6 @@ this.pictureBox1.TabStop = false; this.pictureBox1.Paint += new System.Windows.Forms.PaintEventHandler(this.pictureBox1_Paint); // - // layerTree - // - this.layerTree.CheckBoxes = true; - this.layerTree.ItemHeight = 18; - this.layerTree.Location = new System.Drawing.Point(30, 78); - this.layerTree.Name = "layerTree"; - this.layerTree.Size = new System.Drawing.Size(121, 97); - this.layerTree.TabIndex = 1; - this.layerTree.AfterCheck += new System.Windows.Forms.TreeViewEventHandler(this.layerTree_AfterCheck); - this.layerTree.NodeMouseClick += new System.Windows.Forms.TreeNodeMouseClickEventHandler(this.layerTree_NodeMouseClick); - this.layerTree.NodeMouseDoubleClick += new System.Windows.Forms.TreeNodeMouseClickEventHandler(this.layerTree_NodeMouseDoubleClick); - // // MainFrm // this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Inherit; @@ -5770,7 +5778,8 @@ this.KeyPreview = true; this.Name = "MainFrm"; this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen; - this.Text = "智慧太湖新城管网规划分析系统6.0"; +// this.Text = "智慧太湖新城管网规划分析系统6.0"; + this.Text = Utility.SysnameVersion; this.WindowState = System.Windows.Forms.FormWindowState.Maximized; this.FormClosing += new System.Windows.Forms.FormClosingEventHandler(this.MainFrm_FormClosing); this.Load += new System.EventHandler(this.MainFrm_Load); @@ -5787,15 +5796,15 @@ this.contextMenuStripDeleteLayerNode.ResumeLayout(false); this.ribbonControl1.ResumeLayout(false); this.ribbonControl1.PerformLayout(); + this.ribbonPanel3.ResumeLayout(false); + this.ribbonPanel7.ResumeLayout(false); + this.ribbonPanel15.ResumeLayout(false); + this.ribbonPanel2.ResumeLayout(false); this.ribbonPanel6.ResumeLayout(false); this.ribbonPanel5.ResumeLayout(false); this.ribbonPanel1.ResumeLayout(false); this.ribbonPanel12.ResumeLayout(false); this.ribbonPanel4.ResumeLayout(false); - this.ribbonPanel15.ResumeLayout(false); - this.ribbonPanel3.ResumeLayout(false); - this.ribbonPanel7.ResumeLayout(false); - this.ribbonPanel2.ResumeLayout(false); this.panelOfTable.ResumeLayout(false); this.panelOfTable.PerformLayout(); ((System.ComponentModel.ISupportInitialize)(this.dataGridViewX1)).EndInit(); @@ -5955,6 +5964,7 @@ private RibbonTabItem ribbonTabItem11; private ButtonItem buttonItem130; private RibbonBar ribbonBar18; + private ButtonItem buttonItem132; private SliderItem sliderItem1; private ButtonItem buttonItem133; private ButtonItem buttonItem134; diff --git a/MainFrm.resx b/MainFrm.resx index 9f9bba4..ce490c1 100644 --- a/MainFrm.resx +++ b/MainFrm.resx @@ -351,6 +351,146 @@ 766, 54 + + + iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 + YQUAAAAZdEVYdFNvZnR3YXJlAEFkb2JlIEltYWdlUmVhZHlxyWU8AAADZmlUWHRYTUw6Y29tLmFkb2Jl + LnhtcAAAAAAAPD94cGFja2V0IGJlZ2luPSLvu78iIGlkPSJXNU0wTXBDZWhpSHpyZVN6TlRjemtjOWQi + Pz4gPHg6eG1wbWV0YSB4bWxuczp4PSJhZG9iZTpuczptZXRhLyIgeDp4bXB0az0iQWRvYmUgWE1QIENv + cmUgNS4zLWMwMTEgNjYuMTQ1NjYxLCAyMDEyLzAyLzA2LTE0OjU2OjI3ICAgICAgICAiPiA8cmRmOlJE + RiB4bWxuczpyZGY9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkvMDIvMjItcmRmLXN5bnRheC1ucyMiPiA8 + cmRmOkRlc2NyaXB0aW9uIHJkZjphYm91dD0iIiB4bWxuczp4bXBNTT0iaHR0cDovL25zLmFkb2JlLmNv + bS94YXAvMS4wL21tLyIgeG1sbnM6c3RSZWY9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlw + ZS9SZXNvdXJjZVJlZiMiIHhtbG5zOnhtcD0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wLyIgeG1w + TU06T3JpZ2luYWxEb2N1bWVudElEPSJ4bXAuZGlkOjYzQTM5NEY4Mjg0OUU0MTE5NDBEQTc4ODZEQzk5 + N0NGIiB4bXBNTTpEb2N1bWVudElEPSJ4bXAuZGlkOjEwQ0IxNzBBNEM1QzExRTRBNkNGQzRBMjhDQzI0 + MkY4IiB4bXBNTTpJbnN0YW5jZUlEPSJ4bXAuaWlkOjEwQ0IxNzA5NEM1QzExRTRBNkNGQzRBMjhDQzI0 + MkY4IiB4bXA6Q3JlYXRvclRvb2w9IkFkb2JlIFBob3Rvc2hvcCBDUzYgKFdpbmRvd3MpIj4gPHhtcE1N + OkRlcml2ZWRGcm9tIHN0UmVmOmluc3RhbmNlSUQ9InhtcC5paWQ6NTEzMDNDMjA1QjRDRTQxMTg4NERE + MUVBOEQ4QTgyNTUiIHN0UmVmOmRvY3VtZW50SUQ9InhtcC5kaWQ6NjNBMzk0RjgyODQ5RTQxMTk0MERB + Nzg4NkRDOTk3Q0YiLz4gPC9yZGY6RGVzY3JpcHRpb24+IDwvcmRmOlJERj4gPC94OnhtcG1ldGE+IDw/ + eHBhY2tldCBlbmQ9InIiPz43wa2/AAAFaUlEQVRIS6WUC0xTVxzGKy0UkSmlFGjBFilSkNpSaAWRh63y + sIiAArKs4spLRLQoiEJlSMGoMCc6CBOnYHzMOHUqqOhEHOqCbjNu6kCd6KYje5mZ6KbObd/OuVL3cEzj + /skv997/+b7v39PTW9aj3/BM+OKxPEIZoW/gyrOuPbP+GvRPSNBQQqXYLwSW1etw7cYt5kqfaZ+uD8QM + Xg8f/f4UxGhHMHv4qlG6vAb9394G6T+BPpdV1oCuUx3VD8Q9XT8//PUJRMghlLhLg1C41IK+r/pB+oNC + 16mO6qmP+gdi/6y793+hwTYEk9uoQOSaStHzxQ2Q/nND9XMKy0D9NIfmDcSzaLhI4KXE7LwinLtwGXfu + PXhhqJ/m0DyS62EdUGWpqcf3P97DD3d++t/QnKraBjpghXWAiC+WN0ZNScOe1mP45vbdF2ZvWwdoDs/D + b6ejs6ecxHPoAG/l+Fhkzy+FyCcY0YkG7D/yAW5+d+e5oXrqo36aQ/McnNyjyAAuHWA05pfgzPlehhyT + mflV6FOMaDt2Ctf7bw8KXac6qqc+a4Zx3hLwRLJCZgcJjcPIEPkyIZmeX1SB7vOX0dn9KQy5jw8r8eVc + HOrsxidXP0d9hxlzd4QgeYMzEt7kQVvOR0pFFNpOHmd81E9znIS+dSTc1foVGWfNKUZjyy6Ex6SQl0cD + 09IVxHAFh0+cReqr+QjK8ERqEw+VHWOwoycSR/v1OHwzDlsvhcNCeqkbedAYxQiPm87kZOQVw0nkW0QG + 2DFnIA+JRm3DFpzr/RKNW3ZDE5UAsX8ocizZiFs7DEUHvPFunw4Hb05B+y09jn49lYHe0x5doxqqLVlf + DJrnyB+pIQNs6QAhf6R8tZu3CqpwPdZu2I6PLl3HwnV5iHv9JVSeUOKdqzq81xeDvddiYG73R0aLEIZm + IRa1jUbjxQnYRHa17YqW0VJPwHT3LocRbirrDiymspXo6L6AgiXV8JSNQ2i6GpNWOqK4U4n1n0Vge68W + 9ecmIKnBBSqDCIp4P2RWGDB/QxqS6l1QcToIld3BqDobgsXEQ73+Se5HrGcgdJEokGzIx66DXXi7dRvC + yx2Q2RqApR+GoPbjCag8pUZ6sxjqWRKEldljRr07ZjaKmHt5qpBZKzkeiIJ2BbIPKmA8MIbJUC/ghrM0 + RfYsDtdhqJNIVulK/ku0BQokbfZGZrsKBR3BmEsMOfvl0FY7o7ypDPo1brCcGc+QUCdExabXEFsjQO4B + ObL2BSBlqx8SWwibvBE0334nK3Ael+yEbIW81DZszlhZ2oieuAYvpO5VIHGzP9J2+CN9pz/CzDwExMox + eZUbFnZpkEc+gLZagJjMWOiqXZDVqmC0+kZf6Nb4IHKFCPIsu92sgCw7BlJswjBJLCdenmuPyFUS6Gp9 + oG/yRdJWGSKqhYjKDgLRImK5ACGlzsy9d/zwXn2DBMZDSkZLPaHlnpBncyGO5kxj+Rps/wYdJE2xzfOb + zcU4sye0b0gRu3E0Ypt8ELTICRFGNcShUgjHuZyWxNu2096sdiXS9o1ltNQjyyDhes4SkuXEGpXC+Ve8 + kjlzpDPtoCkVQrdOihgyIHmXP6LryGEX86Ba6ISJNR7IeF+JV8gAfbOM0XoTj8dktpmEOxM4rJHTBscz + njNNnMiBagEfU98ajRnbZMg7GojCk2oGU1cw5nUGw7BHAZWJD6oVhLFzSDCPCacljGP/J7xAm6Hu0ew6 + STIXkcvckN7ig8XHVCjvUiNvdwAmW0Twms6FayS7meM4REoihxPoeT4u10nsZ0LKhhdsIxZEsVcLtOyL + pHffVcd+IJjI7uGHsRscJEPURMMn2FMtNTwuFusPrjFl48ji7nIAAAAASUVORK5CYII= + + + + + iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 + YQUAAAAZdEVYdFNvZnR3YXJlAEFkb2JlIEltYWdlUmVhZHlxyWU8AAADZmlUWHRYTUw6Y29tLmFkb2Jl + LnhtcAAAAAAAPD94cGFja2V0IGJlZ2luPSLvu78iIGlkPSJXNU0wTXBDZWhpSHpyZVN6TlRjemtjOWQi + Pz4gPHg6eG1wbWV0YSB4bWxuczp4PSJhZG9iZTpuczptZXRhLyIgeDp4bXB0az0iQWRvYmUgWE1QIENv + cmUgNS4zLWMwMTEgNjYuMTQ1NjYxLCAyMDEyLzAyLzA2LTE0OjU2OjI3ICAgICAgICAiPiA8cmRmOlJE + RiB4bWxuczpyZGY9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkvMDIvMjItcmRmLXN5bnRheC1ucyMiPiA8 + cmRmOkRlc2NyaXB0aW9uIHJkZjphYm91dD0iIiB4bWxuczp4bXBNTT0iaHR0cDovL25zLmFkb2JlLmNv + bS94YXAvMS4wL21tLyIgeG1sbnM6c3RSZWY9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlw + ZS9SZXNvdXJjZVJlZiMiIHhtbG5zOnhtcD0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wLyIgeG1w + TU06T3JpZ2luYWxEb2N1bWVudElEPSJ4bXAuZGlkOjYzQTM5NEY4Mjg0OUU0MTE5NDBEQTc4ODZEQzk5 + N0NGIiB4bXBNTTpEb2N1bWVudElEPSJ4bXAuZGlkOkUyMTg3NjEyNDlEODExRTQ4NjNGQjM2Mzk1QkNB + RkQwIiB4bXBNTTpJbnN0YW5jZUlEPSJ4bXAuaWlkOkUyMTg3NjExNDlEODExRTQ4NjNGQjM2Mzk1QkNB + RkQwIiB4bXA6Q3JlYXRvclRvb2w9IkFkb2JlIFBob3Rvc2hvcCBDUzYgKFdpbmRvd3MpIj4gPHhtcE1N + OkRlcml2ZWRGcm9tIHN0UmVmOmluc3RhbmNlSUQ9InhtcC5paWQ6NkJCNTE0NDlEODQ5RTQxMUE0QzNB + MjdEOTJBQzc3QkMiIHN0UmVmOmRvY3VtZW50SUQ9InhtcC5kaWQ6NjNBMzk0RjgyODQ5RTQxMTk0MERB + Nzg4NkRDOTk3Q0YiLz4gPC9yZGY6RGVzY3JpcHRpb24+IDwvcmRmOlJERj4gPC94OnhtcG1ldGE+IDw/ + eHBhY2tldCBlbmQ9InIiPz5e5MstAAADiUlEQVRIS+2UW0yTdxjGcePwtYyVVpAUCi1tv9ImrVbxhAei + kjGphAgFT4jzEJ0gGuJhDk0sml0sglmWmC1hqHNKWwI4srgNh3phpjg1O1yIN5DMbFHQZUu42O76+D4f + 3Fl6Z7ILn+SXvH3f533++X/98iUBeKW81v9Uwx1G1+1240EhfKfdeE/4U3qTAqaZZO/2aeN9IXLrY+Ph + wVOZHll9YyohgYZOGS4JsYdXVDy+NQ8Tvy3BP6OlmPyjDP9OBDRYs8cZPfRy5/uQISIRqcIsLSye+j7I + wN+PluOvhyWY+NmL8fsOjP9kxdN7BRh/YJHfFjy5m48nd4ThQjy968bEgwV49usicFciTEKKFhZPXXv1 + eHxtLsYGPBjttwsWjF0xY+ybOfj9uylYs8cZPfQS7kpEnqDTwuLp9GYlfKZeifUfzcb1j/Iw/IkNv3Q6 + MfKVC6O9bg3W7HFGD73cORlMG5AIizDzAaVtunD5ESXWfNSEY/tNCO00oG1zOkJBBSeqUjVYh6R3Qmat + zSY0Hjah7IASW7hPuSoRvIGihcVTSauCppvFODRUjJZvPWgaKMTuXgt2RHOxLTwHDd3EjPfCudgesWJX + jxM7eryo7/Ni8SGFj8gp6LWwePLvS0Og043A5y5UdtkQOJeLivM5ePf8bJSfM04zG2u7chDoysW6Thsq + zqpY0+GAvymNB/gEgxYWT64tKdGihpSYv8WEpSEzVp0pwDuf2SVQReCiS4M1e5zRQy937NXJ1yRirjDz + AVmVJyNZa9+PObauh7ptKdR6FY6N2SisTYe1OlmDNXtqvRNqwxLYt1TCVLY1ZijZOSQRbuEtLSyeTOXH + sfLDH1EauoFFx6/Cd6Qf7pYI1ObLsO+9iMLdF+DccwEuqd2Nl+Br6sbCxiiKd/XBuPogH1HiAzJXHMC8 + YA98td1wb4rCuaEH1roo8oMR5JGaMPIFa10Ejtowiuouw1vzJTwVXyBz+X4ekPgRZfgbohkLtsfMy47B + tqYdakUnPFUM6YUv+LUGa/Y4o8e8rBXcSffWDkpE4j9ZpEvNmb9KsZV16BzrBnVq1YjeVf1MX1Tzn74o + iCmkdq1/LrNHOkfgB6Vg9afJRrVOdv2ClRkMmklvCnyPs4V8ge81v5RegddnCGHNHmf00JslcJcZCcWv + IU1pAhcyhLcFXj1zGtbscUYPvdyZ+Uv6Wi8rKekFBjoX2627by8AAAAASUVORK5CYII= + + + + + iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 + YQUAAAAZdEVYdFNvZnR3YXJlAEFkb2JlIEltYWdlUmVhZHlxyWU8AAADZmlUWHRYTUw6Y29tLmFkb2Jl + LnhtcAAAAAAAPD94cGFja2V0IGJlZ2luPSLvu78iIGlkPSJXNU0wTXBDZWhpSHpyZVN6TlRjemtjOWQi + Pz4gPHg6eG1wbWV0YSB4bWxuczp4PSJhZG9iZTpuczptZXRhLyIgeDp4bXB0az0iQWRvYmUgWE1QIENv + cmUgNS4zLWMwMTEgNjYuMTQ1NjYxLCAyMDEyLzAyLzA2LTE0OjU2OjI3ICAgICAgICAiPiA8cmRmOlJE + RiB4bWxuczpyZGY9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkvMDIvMjItcmRmLXN5bnRheC1ucyMiPiA8 + cmRmOkRlc2NyaXB0aW9uIHJkZjphYm91dD0iIiB4bWxuczp4bXBNTT0iaHR0cDovL25zLmFkb2JlLmNv + bS94YXAvMS4wL21tLyIgeG1sbnM6c3RSZWY9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlw + ZS9SZXNvdXJjZVJlZiMiIHhtbG5zOnhtcD0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wLyIgeG1w + TU06T3JpZ2luYWxEb2N1bWVudElEPSJ4bXAuZGlkOjYzQTM5NEY4Mjg0OUU0MTE5NDBEQTc4ODZEQzk5 + N0NGIiB4bXBNTTpEb2N1bWVudElEPSJ4bXAuZGlkOkE2Q0VGMDE2NDlEQTExRTQ4NTlCQTI3NTMyOEY5 + NEU2IiB4bXBNTTpJbnN0YW5jZUlEPSJ4bXAuaWlkOkE2Q0VGMDE1NDlEQTExRTQ4NTlCQTI3NTMyOEY5 + NEU2IiB4bXA6Q3JlYXRvclRvb2w9IkFkb2JlIFBob3Rvc2hvcCBDUzYgKFdpbmRvd3MpIj4gPHhtcE1N + OkRlcml2ZWRGcm9tIHN0UmVmOmluc3RhbmNlSUQ9InhtcC5paWQ6NjA1MjM3NzFEOTQ5RTQxMUE0QzNB + MjdEOTJBQzc3QkMiIHN0UmVmOmRvY3VtZW50SUQ9InhtcC5kaWQ6NjNBMzk0RjgyODQ5RTQxMTk0MERB + Nzg4NkRDOTk3Q0YiLz4gPC9yZGY6RGVzY3JpcHRpb24+IDwvcmRmOlJERj4gPC94OnhtcG1ldGE+IDw/ + eHBhY2tldCBlbmQ9InIiPz6UH16BAAABrElEQVRIS63N70tTURzH8fsnKSGCCEIQCBKISMq2iILCgQOL + JUxQAoVKdMGQuwgWFepsMGjFZCMuorsIJV4WFatpvzdr1ZAFsaIHn8559v1eDsI91wevJ/ee7/tjbMRH + fAFwJOWRF6oopTzyQhWlVEdBwRbgUhICAnuvilKGtXDGzW6WV/CvbjE/xTfxr+R6q4xSxtP5YTf8rVn4 + s5dG+809Rv5zvVVGKaNwfYgyBfhksoH83CCF9seiL7LBBnLXTlP4/W4dza0ZLS0nCdlgA9npAQq/qk/Q + sKa0NJ8nIBtsIBPrp9CqPMJBYVLLj+04ZIMNrF49ReHwVRafH1/R8m3zJmSDDdy/fJJC88Ua3mcjWurW + LGSDDaQifRS+O8uopsNaPhVnIBts4E64l0Jj5y4qDy5q+ZCPQTbYgHmph8LXZ0m8TJ3Xsp+LQjbYQOJC + N4XadgLl22e1vM1OQDbYwK1zXRS+lBbhmEHsLgU8kTeVh+OQDTawEDpB2U4mitfpMS22GYJssIH5QCcV + FGwBmuRtkA3cGO3whcZUlEdeqKKU8sgLVZRSfjw+MP4DJ2GPpDR9OIsAAAAASUVORK5CYII= + + + + + iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 + YQUAAAAZdEVYdFNvZnR3YXJlAEFkb2JlIEltYWdlUmVhZHlxyWU8AAADZmlUWHRYTUw6Y29tLmFkb2Jl + LnhtcAAAAAAAPD94cGFja2V0IGJlZ2luPSLvu78iIGlkPSJXNU0wTXBDZWhpSHpyZVN6TlRjemtjOWQi + Pz4gPHg6eG1wbWV0YSB4bWxuczp4PSJhZG9iZTpuczptZXRhLyIgeDp4bXB0az0iQWRvYmUgWE1QIENv + cmUgNS4zLWMwMTEgNjYuMTQ1NjYxLCAyMDEyLzAyLzA2LTE0OjU2OjI3ICAgICAgICAiPiA8cmRmOlJE + RiB4bWxuczpyZGY9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkvMDIvMjItcmRmLXN5bnRheC1ucyMiPiA8 + cmRmOkRlc2NyaXB0aW9uIHJkZjphYm91dD0iIiB4bWxuczp4bXBNTT0iaHR0cDovL25zLmFkb2JlLmNv + bS94YXAvMS4wL21tLyIgeG1sbnM6c3RSZWY9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlw + ZS9SZXNvdXJjZVJlZiMiIHhtbG5zOnhtcD0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wLyIgeG1w + TU06T3JpZ2luYWxEb2N1bWVudElEPSJ4bXAuZGlkOjYzQTM5NEY4Mjg0OUU0MTE5NDBEQTc4ODZEQzk5 + N0NGIiB4bXBNTTpEb2N1bWVudElEPSJ4bXAuZGlkOjJGRTU5OEQ1NDlEQjExRTRBRUVDOTkyMjQ5NzEw + REUwIiB4bXBNTTpJbnN0YW5jZUlEPSJ4bXAuaWlkOjJGRTU5OEQ0NDlEQjExRTRBRUVDOTkyMjQ5NzEw + REUwIiB4bXA6Q3JlYXRvclRvb2w9IkFkb2JlIFBob3Rvc2hvcCBDUzYgKFdpbmRvd3MpIj4gPHhtcE1N + OkRlcml2ZWRGcm9tIHN0UmVmOmluc3RhbmNlSUQ9InhtcC5paWQ6MTY0MkI1RjlEQTQ5RTQxMUE0QzNB + MjdEOTJBQzc3QkMiIHN0UmVmOmRvY3VtZW50SUQ9InhtcC5kaWQ6NjNBMzk0RjgyODQ5RTQxMTk0MERB + Nzg4NkRDOTk3Q0YiLz4gPC9yZGY6RGVzY3JpcHRpb24+IDwvcmRmOlJERj4gPC94OnhtcG1ldGE+IDw/ + eHBhY2tldCBlbmQ9InIiPz6B5sF9AAACe0lEQVRIS7WVb2jMcRzHL7UHanF/Mts5prE/1li3kAfu5Ak7 + 5IHNobBkSC2UIuGJkrrSWRvTmHQWK8U1T8jqUtYwkZpaGjV/Js6to5YwfXze39+fu/v23f36hXe9us+f + 7/v9rd/dr3MQ0X/F4Zm3+K9QhWajNNlBFZqN0mQHS6lMdrCUyqSgimllUsy4XmOmp+QRDllQWbygjjq6 + uimZStOX8a+ixox3pXrM1JLCDAqYJmY7c669M0bff07mcLbtEl9QE8k6V6BH5ooXMsHZZX7ae+AY7W45 + SrPm19LbsSR9m/iRA2bYGefggVePzUgKBzeu9sQpmZ4QcG/WMtk7eLjv0WMz0kOz+TX6MUXvP6cFeNbD + bz6YvQFm2Bk9PPByZO6jksLB5KvRTzTyLikIrG2ktsvXzd4g2hGjYP1ms4eHvb850qkl65LCQW/ntVs0 + 9HpMcPx0K1X4V1Ff/3NzhnphbVDsjBk8Lm/VE44s0ZJ1KS4Ie8uXUvPBE7Tn0ElCzTMqrV5BO/cfEaDG + TD5X6PFFONLygsTF7jj1vxihyPkYNTS1iFrFxm37KHIhJmp43L7qZxzp0pJ1SeHhQGgLJQaH6fb9R1QX + 2EB3Ek9FryLe95j8K9eLT/TB0FZcskOP1iRdkIh23aR7Ay9pzaZddKY9Jup8nIpeoXXhZlHD655b85Bj + p2npLOmCML+dD/iTZhaX3+UvbRB1PpzeygFnSUUvatecRUMzisoOc+x0LZ3FixxYhQyK1cxyZhkTYhqY + RgnM6hmcwVl4ljDI0KS4AC+Kmyli8Jv2MF7GNwXY4QzOwgNv5mWTL7CLpVQmO1hKZbKDpVR/1P8OcvwB + lh7gOXXZq9sAAAAASUVORK5CYII= + + iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 @@ -598,147 +738,7 @@ 1BGxz38BvCwLsyQ3iHgAAAAASUVORK5CYII= - - - iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAZdEVYdFNvZnR3YXJlAEFkb2JlIEltYWdlUmVhZHlxyWU8AAADZmlUWHRYTUw6Y29tLmFkb2Jl - LnhtcAAAAAAAPD94cGFja2V0IGJlZ2luPSLvu78iIGlkPSJXNU0wTXBDZWhpSHpyZVN6TlRjemtjOWQi - Pz4gPHg6eG1wbWV0YSB4bWxuczp4PSJhZG9iZTpuczptZXRhLyIgeDp4bXB0az0iQWRvYmUgWE1QIENv - cmUgNS4zLWMwMTEgNjYuMTQ1NjYxLCAyMDEyLzAyLzA2LTE0OjU2OjI3ICAgICAgICAiPiA8cmRmOlJE - RiB4bWxuczpyZGY9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkvMDIvMjItcmRmLXN5bnRheC1ucyMiPiA8 - cmRmOkRlc2NyaXB0aW9uIHJkZjphYm91dD0iIiB4bWxuczp4bXBNTT0iaHR0cDovL25zLmFkb2JlLmNv - bS94YXAvMS4wL21tLyIgeG1sbnM6c3RSZWY9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlw - ZS9SZXNvdXJjZVJlZiMiIHhtbG5zOnhtcD0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wLyIgeG1w - TU06T3JpZ2luYWxEb2N1bWVudElEPSJ4bXAuZGlkOjYzQTM5NEY4Mjg0OUU0MTE5NDBEQTc4ODZEQzk5 - N0NGIiB4bXBNTTpEb2N1bWVudElEPSJ4bXAuZGlkOjEwQ0IxNzBBNEM1QzExRTRBNkNGQzRBMjhDQzI0 - MkY4IiB4bXBNTTpJbnN0YW5jZUlEPSJ4bXAuaWlkOjEwQ0IxNzA5NEM1QzExRTRBNkNGQzRBMjhDQzI0 - MkY4IiB4bXA6Q3JlYXRvclRvb2w9IkFkb2JlIFBob3Rvc2hvcCBDUzYgKFdpbmRvd3MpIj4gPHhtcE1N - OkRlcml2ZWRGcm9tIHN0UmVmOmluc3RhbmNlSUQ9InhtcC5paWQ6NTEzMDNDMjA1QjRDRTQxMTg4NERE - MUVBOEQ4QTgyNTUiIHN0UmVmOmRvY3VtZW50SUQ9InhtcC5kaWQ6NjNBMzk0RjgyODQ5RTQxMTk0MERB - Nzg4NkRDOTk3Q0YiLz4gPC9yZGY6RGVzY3JpcHRpb24+IDwvcmRmOlJERj4gPC94OnhtcG1ldGE+IDw/ - eHBhY2tldCBlbmQ9InIiPz43wa2/AAAFaUlEQVRIS6WUC0xTVxzGKy0UkSmlFGjBFilSkNpSaAWRh63y - sIiAArKs4spLRLQoiEJlSMGoMCc6CBOnYHzMOHUqqOhEHOqCbjNu6kCd6KYje5mZ6KbObd/OuVL3cEzj - /skv997/+b7v39PTW9aj3/BM+OKxPEIZoW/gyrOuPbP+GvRPSNBQQqXYLwSW1etw7cYt5kqfaZ+uD8QM - Xg8f/f4UxGhHMHv4qlG6vAb9394G6T+BPpdV1oCuUx3VD8Q9XT8//PUJRMghlLhLg1C41IK+r/pB+oNC - 16mO6qmP+gdi/6y793+hwTYEk9uoQOSaStHzxQ2Q/nND9XMKy0D9NIfmDcSzaLhI4KXE7LwinLtwGXfu - PXhhqJ/m0DyS62EdUGWpqcf3P97DD3d++t/QnKraBjpghXWAiC+WN0ZNScOe1mP45vbdF2ZvWwdoDs/D - b6ejs6ecxHPoAG/l+Fhkzy+FyCcY0YkG7D/yAW5+d+e5oXrqo36aQ/McnNyjyAAuHWA05pfgzPlehhyT - mflV6FOMaDt2Ctf7bw8KXac6qqc+a4Zx3hLwRLJCZgcJjcPIEPkyIZmeX1SB7vOX0dn9KQy5jw8r8eVc - HOrsxidXP0d9hxlzd4QgeYMzEt7kQVvOR0pFFNpOHmd81E9znIS+dSTc1foVGWfNKUZjyy6Ex6SQl0cD - 09IVxHAFh0+cReqr+QjK8ERqEw+VHWOwoycSR/v1OHwzDlsvhcNCeqkbedAYxQiPm87kZOQVw0nkW0QG - 2DFnIA+JRm3DFpzr/RKNW3ZDE5UAsX8ocizZiFs7DEUHvPFunw4Hb05B+y09jn49lYHe0x5doxqqLVlf - DJrnyB+pIQNs6QAhf6R8tZu3CqpwPdZu2I6PLl3HwnV5iHv9JVSeUOKdqzq81xeDvddiYG73R0aLEIZm - IRa1jUbjxQnYRHa17YqW0VJPwHT3LocRbirrDiymspXo6L6AgiXV8JSNQ2i6GpNWOqK4U4n1n0Vge68W - 9ecmIKnBBSqDCIp4P2RWGDB/QxqS6l1QcToIld3BqDobgsXEQ73+Se5HrGcgdJEokGzIx66DXXi7dRvC - yx2Q2RqApR+GoPbjCag8pUZ6sxjqWRKEldljRr07ZjaKmHt5qpBZKzkeiIJ2BbIPKmA8MIbJUC/ghrM0 - RfYsDtdhqJNIVulK/ku0BQokbfZGZrsKBR3BmEsMOfvl0FY7o7ypDPo1brCcGc+QUCdExabXEFsjQO4B - ObL2BSBlqx8SWwibvBE0334nK3Ael+yEbIW81DZszlhZ2oieuAYvpO5VIHGzP9J2+CN9pz/CzDwExMox - eZUbFnZpkEc+gLZagJjMWOiqXZDVqmC0+kZf6Nb4IHKFCPIsu92sgCw7BlJswjBJLCdenmuPyFUS6Gp9 - oG/yRdJWGSKqhYjKDgLRImK5ACGlzsy9d/zwXn2DBMZDSkZLPaHlnpBncyGO5kxj+Rps/wYdJE2xzfOb - zcU4sye0b0gRu3E0Ypt8ELTICRFGNcShUgjHuZyWxNu2096sdiXS9o1ltNQjyyDhes4SkuXEGpXC+Ve8 - kjlzpDPtoCkVQrdOihgyIHmXP6LryGEX86Ba6ISJNR7IeF+JV8gAfbOM0XoTj8dktpmEOxM4rJHTBscz - njNNnMiBagEfU98ajRnbZMg7GojCk2oGU1cw5nUGw7BHAZWJD6oVhLFzSDCPCacljGP/J7xAm6Hu0ew6 - STIXkcvckN7ig8XHVCjvUiNvdwAmW0Twms6FayS7meM4REoihxPoeT4u10nsZ0LKhhdsIxZEsVcLtOyL - pHffVcd+IJjI7uGHsRscJEPURMMn2FMtNTwuFusPrjFl48ji7nIAAAAASUVORK5CYII= - - - - - iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAZdEVYdFNvZnR3YXJlAEFkb2JlIEltYWdlUmVhZHlxyWU8AAADZmlUWHRYTUw6Y29tLmFkb2Jl - LnhtcAAAAAAAPD94cGFja2V0IGJlZ2luPSLvu78iIGlkPSJXNU0wTXBDZWhpSHpyZVN6TlRjemtjOWQi - Pz4gPHg6eG1wbWV0YSB4bWxuczp4PSJhZG9iZTpuczptZXRhLyIgeDp4bXB0az0iQWRvYmUgWE1QIENv - cmUgNS4zLWMwMTEgNjYuMTQ1NjYxLCAyMDEyLzAyLzA2LTE0OjU2OjI3ICAgICAgICAiPiA8cmRmOlJE - RiB4bWxuczpyZGY9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkvMDIvMjItcmRmLXN5bnRheC1ucyMiPiA8 - cmRmOkRlc2NyaXB0aW9uIHJkZjphYm91dD0iIiB4bWxuczp4bXBNTT0iaHR0cDovL25zLmFkb2JlLmNv - bS94YXAvMS4wL21tLyIgeG1sbnM6c3RSZWY9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlw - ZS9SZXNvdXJjZVJlZiMiIHhtbG5zOnhtcD0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wLyIgeG1w - TU06T3JpZ2luYWxEb2N1bWVudElEPSJ4bXAuZGlkOjYzQTM5NEY4Mjg0OUU0MTE5NDBEQTc4ODZEQzk5 - N0NGIiB4bXBNTTpEb2N1bWVudElEPSJ4bXAuZGlkOkUyMTg3NjEyNDlEODExRTQ4NjNGQjM2Mzk1QkNB - RkQwIiB4bXBNTTpJbnN0YW5jZUlEPSJ4bXAuaWlkOkUyMTg3NjExNDlEODExRTQ4NjNGQjM2Mzk1QkNB - RkQwIiB4bXA6Q3JlYXRvclRvb2w9IkFkb2JlIFBob3Rvc2hvcCBDUzYgKFdpbmRvd3MpIj4gPHhtcE1N - OkRlcml2ZWRGcm9tIHN0UmVmOmluc3RhbmNlSUQ9InhtcC5paWQ6NkJCNTE0NDlEODQ5RTQxMUE0QzNB - MjdEOTJBQzc3QkMiIHN0UmVmOmRvY3VtZW50SUQ9InhtcC5kaWQ6NjNBMzk0RjgyODQ5RTQxMTk0MERB - Nzg4NkRDOTk3Q0YiLz4gPC9yZGY6RGVzY3JpcHRpb24+IDwvcmRmOlJERj4gPC94OnhtcG1ldGE+IDw/ - eHBhY2tldCBlbmQ9InIiPz5e5MstAAADiUlEQVRIS+2UW0yTdxjGcePwtYyVVpAUCi1tv9ImrVbxhAei - kjGphAgFT4jzEJ0gGuJhDk0sml0sglmWmC1hqHNKWwI4srgNh3phpjg1O1yIN5DMbFHQZUu42O76+D4f - 3Fl6Z7ILn+SXvH3f533++X/98iUBeKW81v9Uwx1G1+1240EhfKfdeE/4U3qTAqaZZO/2aeN9IXLrY+Ph - wVOZHll9YyohgYZOGS4JsYdXVDy+NQ8Tvy3BP6OlmPyjDP9OBDRYs8cZPfRy5/uQISIRqcIsLSye+j7I - wN+PluOvhyWY+NmL8fsOjP9kxdN7BRh/YJHfFjy5m48nd4ThQjy968bEgwV49usicFciTEKKFhZPXXv1 - eHxtLsYGPBjttwsWjF0xY+ybOfj9uylYs8cZPfQS7kpEnqDTwuLp9GYlfKZeifUfzcb1j/Iw/IkNv3Q6 - MfKVC6O9bg3W7HFGD73cORlMG5AIizDzAaVtunD5ESXWfNSEY/tNCO00oG1zOkJBBSeqUjVYh6R3Qmat - zSY0Hjah7IASW7hPuSoRvIGihcVTSauCppvFODRUjJZvPWgaKMTuXgt2RHOxLTwHDd3EjPfCudgesWJX - jxM7eryo7/Ni8SGFj8gp6LWwePLvS0Og043A5y5UdtkQOJeLivM5ePf8bJSfM04zG2u7chDoysW6Thsq - zqpY0+GAvymNB/gEgxYWT64tKdGihpSYv8WEpSEzVp0pwDuf2SVQReCiS4M1e5zRQy937NXJ1yRirjDz - AVmVJyNZa9+PObauh7ptKdR6FY6N2SisTYe1OlmDNXtqvRNqwxLYt1TCVLY1ZijZOSQRbuEtLSyeTOXH - sfLDH1EauoFFx6/Cd6Qf7pYI1ObLsO+9iMLdF+DccwEuqd2Nl+Br6sbCxiiKd/XBuPogH1HiAzJXHMC8 - YA98td1wb4rCuaEH1roo8oMR5JGaMPIFa10Ejtowiuouw1vzJTwVXyBz+X4ekPgRZfgbohkLtsfMy47B - tqYdakUnPFUM6YUv+LUGa/Y4o8e8rBXcSffWDkpE4j9ZpEvNmb9KsZV16BzrBnVq1YjeVf1MX1Tzn74o - iCmkdq1/LrNHOkfgB6Vg9afJRrVOdv2ClRkMmklvCnyPs4V8ge81v5RegddnCGHNHmf00JslcJcZCcWv - IU1pAhcyhLcFXj1zGtbscUYPvdyZ+Uv6Wi8rKekFBjoX2627by8AAAAASUVORK5CYII= - - - - - iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAZdEVYdFNvZnR3YXJlAEFkb2JlIEltYWdlUmVhZHlxyWU8AAADZmlUWHRYTUw6Y29tLmFkb2Jl - LnhtcAAAAAAAPD94cGFja2V0IGJlZ2luPSLvu78iIGlkPSJXNU0wTXBDZWhpSHpyZVN6TlRjemtjOWQi - Pz4gPHg6eG1wbWV0YSB4bWxuczp4PSJhZG9iZTpuczptZXRhLyIgeDp4bXB0az0iQWRvYmUgWE1QIENv - cmUgNS4zLWMwMTEgNjYuMTQ1NjYxLCAyMDEyLzAyLzA2LTE0OjU2OjI3ICAgICAgICAiPiA8cmRmOlJE - RiB4bWxuczpyZGY9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkvMDIvMjItcmRmLXN5bnRheC1ucyMiPiA8 - cmRmOkRlc2NyaXB0aW9uIHJkZjphYm91dD0iIiB4bWxuczp4bXBNTT0iaHR0cDovL25zLmFkb2JlLmNv - bS94YXAvMS4wL21tLyIgeG1sbnM6c3RSZWY9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlw - ZS9SZXNvdXJjZVJlZiMiIHhtbG5zOnhtcD0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wLyIgeG1w - TU06T3JpZ2luYWxEb2N1bWVudElEPSJ4bXAuZGlkOjYzQTM5NEY4Mjg0OUU0MTE5NDBEQTc4ODZEQzk5 - N0NGIiB4bXBNTTpEb2N1bWVudElEPSJ4bXAuZGlkOkE2Q0VGMDE2NDlEQTExRTQ4NTlCQTI3NTMyOEY5 - NEU2IiB4bXBNTTpJbnN0YW5jZUlEPSJ4bXAuaWlkOkE2Q0VGMDE1NDlEQTExRTQ4NTlCQTI3NTMyOEY5 - NEU2IiB4bXA6Q3JlYXRvclRvb2w9IkFkb2JlIFBob3Rvc2hvcCBDUzYgKFdpbmRvd3MpIj4gPHhtcE1N - OkRlcml2ZWRGcm9tIHN0UmVmOmluc3RhbmNlSUQ9InhtcC5paWQ6NjA1MjM3NzFEOTQ5RTQxMUE0QzNB - MjdEOTJBQzc3QkMiIHN0UmVmOmRvY3VtZW50SUQ9InhtcC5kaWQ6NjNBMzk0RjgyODQ5RTQxMTk0MERB - Nzg4NkRDOTk3Q0YiLz4gPC9yZGY6RGVzY3JpcHRpb24+IDwvcmRmOlJERj4gPC94OnhtcG1ldGE+IDw/ - eHBhY2tldCBlbmQ9InIiPz6UH16BAAABrElEQVRIS63N70tTURzH8fsnKSGCCEIQCBKISMq2iILCgQOL - JUxQAoVKdMGQuwgWFepsMGjFZCMuorsIJV4WFatpvzdr1ZAFsaIHn8559v1eDsI91wevJ/ee7/tjbMRH - fAFwJOWRF6oopTzyQhWlVEdBwRbgUhICAnuvilKGtXDGzW6WV/CvbjE/xTfxr+R6q4xSxtP5YTf8rVn4 - s5dG+809Rv5zvVVGKaNwfYgyBfhksoH83CCF9seiL7LBBnLXTlP4/W4dza0ZLS0nCdlgA9npAQq/qk/Q - sKa0NJ8nIBtsIBPrp9CqPMJBYVLLj+04ZIMNrF49ReHwVRafH1/R8m3zJmSDDdy/fJJC88Ua3mcjWurW - LGSDDaQifRS+O8uopsNaPhVnIBts4E64l0Jj5y4qDy5q+ZCPQTbYgHmph8LXZ0m8TJ3Xsp+LQjbYQOJC - N4XadgLl22e1vM1OQDbYwK1zXRS+lBbhmEHsLgU8kTeVh+OQDTawEDpB2U4mitfpMS22GYJssIH5QCcV - FGwBmuRtkA3cGO3whcZUlEdeqKKU8sgLVZRSfjw+MP4DJ2GPpDR9OIsAAAAASUVORK5CYII= - - - - - iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAZdEVYdFNvZnR3YXJlAEFkb2JlIEltYWdlUmVhZHlxyWU8AAADZmlUWHRYTUw6Y29tLmFkb2Jl - LnhtcAAAAAAAPD94cGFja2V0IGJlZ2luPSLvu78iIGlkPSJXNU0wTXBDZWhpSHpyZVN6TlRjemtjOWQi - Pz4gPHg6eG1wbWV0YSB4bWxuczp4PSJhZG9iZTpuczptZXRhLyIgeDp4bXB0az0iQWRvYmUgWE1QIENv - cmUgNS4zLWMwMTEgNjYuMTQ1NjYxLCAyMDEyLzAyLzA2LTE0OjU2OjI3ICAgICAgICAiPiA8cmRmOlJE - RiB4bWxuczpyZGY9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkvMDIvMjItcmRmLXN5bnRheC1ucyMiPiA8 - cmRmOkRlc2NyaXB0aW9uIHJkZjphYm91dD0iIiB4bWxuczp4bXBNTT0iaHR0cDovL25zLmFkb2JlLmNv - bS94YXAvMS4wL21tLyIgeG1sbnM6c3RSZWY9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlw - ZS9SZXNvdXJjZVJlZiMiIHhtbG5zOnhtcD0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wLyIgeG1w - TU06T3JpZ2luYWxEb2N1bWVudElEPSJ4bXAuZGlkOjYzQTM5NEY4Mjg0OUU0MTE5NDBEQTc4ODZEQzk5 - N0NGIiB4bXBNTTpEb2N1bWVudElEPSJ4bXAuZGlkOjJGRTU5OEQ1NDlEQjExRTRBRUVDOTkyMjQ5NzEw - REUwIiB4bXBNTTpJbnN0YW5jZUlEPSJ4bXAuaWlkOjJGRTU5OEQ0NDlEQjExRTRBRUVDOTkyMjQ5NzEw - REUwIiB4bXA6Q3JlYXRvclRvb2w9IkFkb2JlIFBob3Rvc2hvcCBDUzYgKFdpbmRvd3MpIj4gPHhtcE1N - OkRlcml2ZWRGcm9tIHN0UmVmOmluc3RhbmNlSUQ9InhtcC5paWQ6MTY0MkI1RjlEQTQ5RTQxMUE0QzNB - MjdEOTJBQzc3QkMiIHN0UmVmOmRvY3VtZW50SUQ9InhtcC5kaWQ6NjNBMzk0RjgyODQ5RTQxMTk0MERB - Nzg4NkRDOTk3Q0YiLz4gPC9yZGY6RGVzY3JpcHRpb24+IDwvcmRmOlJERj4gPC94OnhtcG1ldGE+IDw/ - eHBhY2tldCBlbmQ9InIiPz6B5sF9AAACe0lEQVRIS7WVb2jMcRzHL7UHanF/Mts5prE/1li3kAfu5Ak7 - 5IHNobBkSC2UIuGJkrrSWRvTmHQWK8U1T8jqUtYwkZpaGjV/Js6to5YwfXze39+fu/v23f36hXe9us+f - 7/v9rd/dr3MQ0X/F4Zm3+K9QhWajNNlBFZqN0mQHS6lMdrCUyqSgimllUsy4XmOmp+QRDllQWbygjjq6 - uimZStOX8a+ixox3pXrM1JLCDAqYJmY7c669M0bff07mcLbtEl9QE8k6V6BH5ooXMsHZZX7ae+AY7W45 - SrPm19LbsSR9m/iRA2bYGefggVePzUgKBzeu9sQpmZ4QcG/WMtk7eLjv0WMz0kOz+TX6MUXvP6cFeNbD - bz6YvQFm2Bk9PPByZO6jksLB5KvRTzTyLikIrG2ktsvXzd4g2hGjYP1ms4eHvb850qkl65LCQW/ntVs0 - 9HpMcPx0K1X4V1Ff/3NzhnphbVDsjBk8Lm/VE44s0ZJ1KS4Ie8uXUvPBE7Tn0ElCzTMqrV5BO/cfEaDG - TD5X6PFFONLygsTF7jj1vxihyPkYNTS1iFrFxm37KHIhJmp43L7qZxzp0pJ1SeHhQGgLJQaH6fb9R1QX - 2EB3Ek9FryLe95j8K9eLT/TB0FZcskOP1iRdkIh23aR7Ay9pzaZddKY9Jup8nIpeoXXhZlHD655b85Bj - p2npLOmCML+dD/iTZhaX3+UvbRB1PpzeygFnSUUvatecRUMzisoOc+x0LZ3FixxYhQyK1cxyZhkTYhqY - RgnM6hmcwVl4ljDI0KS4AC+Kmyli8Jv2MF7GNwXY4QzOwgNv5mWTL7CLpVQmO1hKZbKDpVR/1P8OcvwB - lh7gOXXZq9sAAAAASUVORK5CYII= - - - + iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 YQUAAAAZdEVYdFNvZnR3YXJlAEFkb2JlIEltYWdlUmVhZHlxyWU8AAADZmlUWHRYTUw6Y29tLmFkb2Jl @@ -750,26 +750,244 @@ bS94YXAvMS4wL21tLyIgeG1sbnM6c3RSZWY9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlw ZS9SZXNvdXJjZVJlZiMiIHhtbG5zOnhtcD0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wLyIgeG1w TU06T3JpZ2luYWxEb2N1bWVudElEPSJ4bXAuZGlkOjJGQzkyMzc0Rjk0OUU0MTE5NjNCQjRENDMzQjlC - MUM4IiB4bXBNTTpEb2N1bWVudElEPSJ4bXAuZGlkOjJERjY3MEZENEQyMzExRTRCNDlGQUMwMzk0OTAw - Qzc4IiB4bXBNTTpJbnN0YW5jZUlEPSJ4bXAuaWlkOjJERjY3MEZDNEQyMzExRTRCNDlGQUMwMzk0OTAw - Qzc4IiB4bXA6Q3JlYXRvclRvb2w9IkFkb2JlIFBob3Rvc2hvcCBDUzYgKFdpbmRvd3MpIj4gPHhtcE1N - OkRlcml2ZWRGcm9tIHN0UmVmOmluc3RhbmNlSUQ9InhtcC5paWQ6NjhGOUEyRDEyMTRERTQxMUIzNkJE + MUM4IiB4bXBNTTpEb2N1bWVudElEPSJ4bXAuZGlkOjlDMzFEOUI4NEFBRjExRTQ4OTA5OUYwQ0QzM0Q2 + NEI4IiB4bXBNTTpJbnN0YW5jZUlEPSJ4bXAuaWlkOjlDMzFEOUI3NEFBRjExRTQ4OTA5OUYwQ0QzM0Q2 + NEI4IiB4bXA6Q3JlYXRvclRvb2w9IkFkb2JlIFBob3Rvc2hvcCBDUzYgKFdpbmRvd3MpIj4gPHhtcE1N + OkRlcml2ZWRGcm9tIHN0UmVmOmluc3RhbmNlSUQ9InhtcC5paWQ6MDk5Mzk2NTZBRjRBRTQxMTk3NEFD + QUFFQjRCMzVENkUiIHN0UmVmOmRvY3VtZW50SUQ9InhtcC5kaWQ6MkZDOTIzNzRGOTQ5RTQxMTk2M0JC + NEQ0MzNCOUIxQzgiLz4gPC9yZGY6RGVzY3JpcHRpb24+IDwvcmRmOlJERj4gPC94OnhtcG1ldGE+IDw/ + eHBhY2tldCBlbmQ9InIiPz73sIMwAAADIElEQVRIS7WVa0iTYRTH56Uiysvm3TkvpLl5DRIvQYWVWl+6 + iNEVg0yhQqloQZHkLT+Y0YdAs75IpEUhzERZoZhsRpZlS7soblotsRwoxhqWeTrnYZtv+u7NsB74cZ5z + zv89/z17HzYRAPxXeIv/EpFXcOyi4BvKhfehv4FvKBfeh+ayqIUDlIgBgT8whpRYoT2fhgvNVJKBQT9s + hB8/QZDPpnEIjEhg0J5Pw4Vm0mwygG9T06BSqQQhTUhUMoRGpyxYT7OZwfhXC6jVakFIYzNYqN5uMGKa + BI1GIwhpghXJaJJi13d0dEB2bj74hsWzSDlXbzfQG02g0+kEIU2wIomdovzKdVifngnFFytBeb4cLN+n + WaSc6hfKKqB/eHTWoHfwExgMBkFII5MnQUD4WlAWloO26wVs35MDmifPmQFFyqlO/aKKqlmDp31DYDKZ + BCGNTJ4IPqHx8LJvACbNUw7p6e2HuJQMNIhhBuaHj3vBYrEI0tb1BoIiE9kJ9h7Oh7EJM+g/jEJuwVlY + s24ri5RTnfo5BedAIoueIYPumvomuHzjzm9cq2uCq7UNUH2rEarr7kNd0yP26Y+eKoSWtk4wfpmAg7kn + ITY5DUorq1g8cOQEqze3aplOEhRtJoMcL1mMTixV9IgD5a/tSBVDYql8AKOBQLEJtTP08gY/jjFiktKg + 5FIV21Ok3NazvmR2AvrFkCAJyGYk1comZAuHDM/AyLvHThfBveZ26NOPwI59eey7LsbhFCmnOvVJ5+Ef + rrYZLEU8EZ85+HLwW7ZCLMVTFWdkHoLut+/hgbYHaE9XN31XNsupTrWV3jKVs+uS3cyAD0cLe331jW3Q + qRt0CPUlQVHDKI+fN9iGo4W90uNnyuA2vvRtWTlQgxeg/dk7FimnOvU9/CNqUe47b7ANRwt7AfjpKvAK + Gt18Qur35ymhRfsKKLr5hN7EyzDq7humWrrcfSfKxbz/QlwcLDck1snZJdUzYHUDmk57+K1qdXJyzsL6 + RmQD9ZmObygXB8sVIRO6fXQB4hC6eRQppzr1XXmHclnAckFomLc1Um5dItEvhZ97MQXP9N0AAAAASUVO + RK5CYII= + + + + + iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 + YQUAAAAZdEVYdFNvZnR3YXJlAEFkb2JlIEltYWdlUmVhZHlxyWU8AAADZmlUWHRYTUw6Y29tLmFkb2Jl + LnhtcAAAAAAAPD94cGFja2V0IGJlZ2luPSLvu78iIGlkPSJXNU0wTXBDZWhpSHpyZVN6TlRjemtjOWQi + Pz4gPHg6eG1wbWV0YSB4bWxuczp4PSJhZG9iZTpuczptZXRhLyIgeDp4bXB0az0iQWRvYmUgWE1QIENv + cmUgNS4zLWMwMTEgNjYuMTQ1NjYxLCAyMDEyLzAyLzA2LTE0OjU2OjI3ICAgICAgICAiPiA8cmRmOlJE + RiB4bWxuczpyZGY9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkvMDIvMjItcmRmLXN5bnRheC1ucyMiPiA8 + cmRmOkRlc2NyaXB0aW9uIHJkZjphYm91dD0iIiB4bWxuczp4bXBNTT0iaHR0cDovL25zLmFkb2JlLmNv + bS94YXAvMS4wL21tLyIgeG1sbnM6c3RSZWY9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlw + ZS9SZXNvdXJjZVJlZiMiIHhtbG5zOnhtcD0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wLyIgeG1w + TU06T3JpZ2luYWxEb2N1bWVudElEPSJ4bXAuZGlkOjJGQzkyMzc0Rjk0OUU0MTE5NjNCQjRENDMzQjlC + MUM4IiB4bXBNTTpEb2N1bWVudElEPSJ4bXAuZGlkOjhDMTdBQjRENEFBRTExRTQ4QjQyODY0MDNBNTJE + NzNCIiB4bXBNTTpJbnN0YW5jZUlEPSJ4bXAuaWlkOjhDMTdBQjRDNEFBRTExRTQ4QjQyODY0MDNBNTJE + NzNCIiB4bXA6Q3JlYXRvclRvb2w9IkFkb2JlIFBob3Rvc2hvcCBDUzYgKFdpbmRvd3MpIj4gPHhtcE1N + OkRlcml2ZWRGcm9tIHN0UmVmOmluc3RhbmNlSUQ9InhtcC5paWQ6NUQyMjc4QTlBQjRBRTQxMTk3NEFD + QUFFQjRCMzVENkUiIHN0UmVmOmRvY3VtZW50SUQ9InhtcC5kaWQ6MkZDOTIzNzRGOTQ5RTQxMTk2M0JC + NEQ0MzNCOUIxQzgiLz4gPC9yZGY6RGVzY3JpcHRpb24+IDwvcmRmOlJERj4gPC94OnhtcG1ldGE+IDw/ + eHBhY2tldCBlbmQ9InIiPz4eHsDfAAAB00lEQVRIS7XVWytEURQH8HniTTNHLs0NCXNcXjTN5dH9g/gM + 3jx590QhFDJS0gyTGmpqaqJIMW4hzlAoOaWISS7LWifntI3ddnTGrl92e/57/We/DBsA/CvuYSHZSr0t + lvCGsriX/oI3lMW9lM/SwgF9SEHwizs08IX2vAyLZvZRgXJ+cQWv7yB0q96Ds86voT0vw6KZNJsK4Pnl + DWKxmBBlqhpDUN0UNp2n2VrB/WMOEomEEGX0ArN5o+BGfYB0Oi1EGa8cwpKw6bxRcH6lQiaTEaKMVw5q + rzCbNwr2z65BURQhynh8Qe0VZvNGwdZBFlRVFaKMxxfQXmE2rxc8rW3sQy6XE0puHoG7IaC9YnV9j5th + pbZPqOCDCrbH5uIwOD7/zWgkDkNTizAyuwQjkWWIxFNQWduqmVxI/MiPz6/A8HTUuDMTTYLkbrqhgt5S + T3PG4ZJ3HE7focElZx0u3yn+VQiG1ZLymmm7s74f88f42S6bl9zyJZ6d6Xckd+Mt5ieogH4xJORHHajt + SzvqZPSgECpHZSiA2DztuxBlad+NgnpBEbIjusiiYboKRF+kGFHegUR5ImkFv7G0eAPzWVq8gfksLd5/ + oULiHhYS97BwwPYJlSCUgVubViQAAAAASUVORK5CYII= + + + + + iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 + YQUAAAAZdEVYdFNvZnR3YXJlAEFkb2JlIEltYWdlUmVhZHlxyWU8AAADZmlUWHRYTUw6Y29tLmFkb2Jl + LnhtcAAAAAAAPD94cGFja2V0IGJlZ2luPSLvu78iIGlkPSJXNU0wTXBDZWhpSHpyZVN6TlRjemtjOWQi + Pz4gPHg6eG1wbWV0YSB4bWxuczp4PSJhZG9iZTpuczptZXRhLyIgeDp4bXB0az0iQWRvYmUgWE1QIENv + cmUgNS4zLWMwMTEgNjYuMTQ1NjYxLCAyMDEyLzAyLzA2LTE0OjU2OjI3ICAgICAgICAiPiA8cmRmOlJE + RiB4bWxuczpyZGY9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkvMDIvMjItcmRmLXN5bnRheC1ucyMiPiA8 + cmRmOkRlc2NyaXB0aW9uIHJkZjphYm91dD0iIiB4bWxuczp4bXBNTT0iaHR0cDovL25zLmFkb2JlLmNv + bS94YXAvMS4wL21tLyIgeG1sbnM6c3RSZWY9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlw + ZS9SZXNvdXJjZVJlZiMiIHhtbG5zOnhtcD0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wLyIgeG1w + TU06T3JpZ2luYWxEb2N1bWVudElEPSJ4bXAuZGlkOjJGQzkyMzc0Rjk0OUU0MTE5NjNCQjRENDMzQjlC + MUM4IiB4bXBNTTpEb2N1bWVudElEPSJ4bXAuZGlkOjJEMDQyOEZBNEFEMjExRTRBN0MxRDBCNzJGRUND + MDEzIiB4bXBNTTpJbnN0YW5jZUlEPSJ4bXAuaWlkOjJEMDQyOEY5NEFEMjExRTRBN0MxRDBCNzJGRUND + MDEzIiB4bXA6Q3JlYXRvclRvb2w9IkFkb2JlIFBob3Rvc2hvcCBDUzYgKFdpbmRvd3MpIj4gPHhtcE1N + OkRlcml2ZWRGcm9tIHN0UmVmOmluc3RhbmNlSUQ9InhtcC5paWQ6QkRDRkI1RDVEMTRBRTQxMTk3NEFD + QUFFQjRCMzVENkUiIHN0UmVmOmRvY3VtZW50SUQ9InhtcC5kaWQ6MkZDOTIzNzRGOTQ5RTQxMTk2M0JC + NEQ0MzNCOUIxQzgiLz4gPC9yZGY6RGVzY3JpcHRpb24+IDwvcmRmOlJERj4gPC94OnhtcG1ldGE+IDw/ + eHBhY2tldCBlbmQ9InIiPz59jfe3AAAEbUlEQVRIS8WTeUybZRzHF48/pnFOuQRajkFLgQFb5iRLNJr4 + l/EPgsniUI4xZDAY1zyxwApsMJyIME61rByl3DfoYGBrgbWUY06FcZSCha4rQ8jYxkqPr2/fvkv8o2Sg + S/wkT970eb6/T5/39z7Prv8dt/Oql4mR4HZJ3ccoXFxhVCzB9DT9JueJdSq6c1wzVZFupepVzxu34XVj + CaEDi1jX6hF8ZQoeokl4iBVwzV9YdU1XRlIl28eVo8phCdXwGltEeOUsro6psaHVwcSDh5volc4iOO8X + 7KuVwb1hEi7J8myq9PEQO//I85oafr0KtEpUpNSETm+AwWDAvfv3YTQaybnm/t/AyO6Ga+UonJOnIijF + 1hA9tWI2qle9RxcI+RIpmZpTIfBULhIyyqHVahHPKcN70TmYnFFCp9OhqXcc9KwW0DOHVl3YU1aUyjJu + F1SpfhO3EM6bMMsVt+D8Zhz2HIpC4oU6bG5uIu4cD3tfTwAjIBNypQYbGxsISquBU34PaDHiVEplGXee + SuIjVaBv3Lz7gJg8vHg4FlZvc+ATVoLipiHsD8qCXWAO7IPK8MG5FjLXKboOeoYADkldUkplGWb7vOb4 + 4BzxIXXQE/1m59WDXdgBvxPfwz6UC4eQUth/WIBDZ2qQXj+K7IYRImeE5s5fOFrcDPvPapcJzVNmmwVY + VxWG9U09uau1tTVymPpc0iYFLew7OEUJ4BwtALfvJpl5xMrKCu6s3cUrn5YbCM1us80CrJZZVWjXr7j3 + 4CE0y8v4IrcaH+cK4Bv+DRyPl8ApphYuia3wZ3eCUzOA1PIfcVuzjHnlIgK/vgy7mHzTG+w12yzA5E53 + edYPo1c2i/X1dQTEfwvbwDQ4hhXg8OcN4P48Df+UTrgkNIAeW4Hg3Hbo9Xq0iGSgs4ls5CUhoXnObLOA + S8pkhG/bdZzgDZJnffT3GXieLAA9XgB2/RjZjuQqMWhxfBw824H55XWyhcfy+HDNqoB1SH4Codn6G7iw + p3d78EaVPlXX0CaZgkqlgly1gpCiK0htHCH/IL6oFcEF3ZjT3CUvXqv0DzDSS0FPq1a/8EbYS5Rqa+if + SAJ8KoeNR7gitEsnoVQqSbGOkJmYX1ggxaY70SabwIGMUrjn8I3WIXnBRPnWu/8nDnE9Sd7cAaP/ZSES + 6/rRKJRArpiHXC7HzekZNIukiCyrhW9mGZgXa4w2kUVnibJnzdXbxP5URzyDO4QjxGl5i9uNpMZeKP5U + IrywAq9yCnGAOGGMonbYxpVnEPGdyR9BO/MTj8kfgXeNFPt5IngVtoF1kQ9WcTs8qgfgmNreQMS21xZL + 0E6Ln6ef75tg8sfgXT8O77oReAkkYNXJ4PRV/4ztyfo9VPTf4xjdf9CpQKzdxxuGe6UMbhXEmc8V6mze + r3qNivx3HGN7UmglQ6CVDMIxXwybo5UcaunJQD8te9rhyx4JrWwItlGNUut3y5+hlp4cDhFCpl14k9jq + nR+Y1NTjIe7NlmMnWKoHsOtvjWYcKpheqFQAAAAASUVORK5CYII= + + + + + iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 + YQUAAAAZdEVYdFNvZnR3YXJlAEFkb2JlIEltYWdlUmVhZHlxyWU8AAADZmlUWHRYTUw6Y29tLmFkb2Jl + LnhtcAAAAAAAPD94cGFja2V0IGJlZ2luPSLvu78iIGlkPSJXNU0wTXBDZWhpSHpyZVN6TlRjemtjOWQi + Pz4gPHg6eG1wbWV0YSB4bWxuczp4PSJhZG9iZTpuczptZXRhLyIgeDp4bXB0az0iQWRvYmUgWE1QIENv + cmUgNS4zLWMwMTEgNjYuMTQ1NjYxLCAyMDEyLzAyLzA2LTE0OjU2OjI3ICAgICAgICAiPiA8cmRmOlJE + RiB4bWxuczpyZGY9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkvMDIvMjItcmRmLXN5bnRheC1ucyMiPiA8 + cmRmOkRlc2NyaXB0aW9uIHJkZjphYm91dD0iIiB4bWxuczp4bXBNTT0iaHR0cDovL25zLmFkb2JlLmNv + bS94YXAvMS4wL21tLyIgeG1sbnM6c3RSZWY9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlw + ZS9SZXNvdXJjZVJlZiMiIHhtbG5zOnhtcD0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wLyIgeG1w + TU06T3JpZ2luYWxEb2N1bWVudElEPSJ4bXAuZGlkOjJGQzkyMzc0Rjk0OUU0MTE5NjNCQjRENDMzQjlC + MUM4IiB4bXBNTTpEb2N1bWVudElEPSJ4bXAuZGlkOjJERTg4QTFENEQyMjExRTRBODEyODk0M0RBMTc5 + Qjg3IiB4bXBNTTpJbnN0YW5jZUlEPSJ4bXAuaWlkOjJERTg4QTFDNEQyMjExRTRBODEyODk0M0RBMTc5 + Qjg3IiB4bXA6Q3JlYXRvclRvb2w9IkFkb2JlIFBob3Rvc2hvcCBDUzYgKFdpbmRvd3MpIj4gPHhtcE1N + OkRlcml2ZWRGcm9tIHN0UmVmOmluc3RhbmNlSUQ9InhtcC5paWQ6NjJGOUEyRDEyMTRERTQxMUIzNkJE NUVDQjU5MzE1NjIiIHN0UmVmOmRvY3VtZW50SUQ9InhtcC5kaWQ6MkZDOTIzNzRGOTQ5RTQxMTk2M0JC NEQ0MzNCOUIxQzgiLz4gPC9yZGY6RGVzY3JpcHRpb24+IDwvcmRmOlJERj4gPC94OnhtcG1ldGE+IDw/ - eHBhY2tldCBlbmQ9InIiPz6GKmpFAAAC+UlEQVRIS63T20vTYRzH8Yforj/Ei24UiSgKIygKi8oyxZQo - cvNYeXaesmzqPGu2POd0ulSsnIdaurTSTJ3O6UxTPGya5vCQx5AuPn39RbHop7nZxQt+z3ie93e/Z4w1 - p7nsCoBt8R6yBF/UHPv+Wb0rfFFzm99CRIwEW1gnqXzxTXxRc0ydctm4OlID2sxrw6iCtiwItC+A2P/D - frLnjwGNSZdMq6N1WOvLwFpP4l/WdRlY6Jaio9Ab7QXba8sVoDHZGdT8PYS9THDqMGnLsKpNw0qXGCua - BO55VZdNQ6U/DRRibVCGb+N1pH5bukoRqHmDHOIG1N8/X2F4I8WyNhtf2+9hqSsZxqZ4upbb6HsSZLHO - Im90ym6hNVcIaktYTexZyUelGEvaHMy/jcFiZxo0xX5Y7ivGcn8JkVmA9uvlWBmqwpJeAWovs+poR99O - eRgWtQWYVUdgrj0FH+i+F3XF3NoappZYGJrEoLaOVYpOOTY/FGJB+xjTqnDMtMTTAC/Ma/Ix/TLUKl9e - x0JfFQpql7PykBP7lWIXzPeUYLIhHCPKCLr/AMy2ZsKoDLTKdNNdvM8TgNpRTBZwfJ885CTmaIChPhwa - mS+GnkdhqjEWY9X+VplqvIMXEhdQ24mZeuSs0N/BNNWWj4k6EdSZHhhXxWH0aSCGFd4c4Tk7zk7XBlUM - FKLToK4Nm+0qYnneRzqGGiSYaIiiyZdhVCdgqFSIwRJPjucZW85O1pvnRmvDkO9zFNTdy2Y6HjGp4HCF - 5kk4xhoiURd/EROv4tBfeM0qAyUC9Mp9QM0+7o829T6LZV0/mNycS6+nFKFWfAGj9ZHozfGwil7miZYH - 7qCmghsw+S6VpV894KuUuKFbfhNNqa749CwY3dm0toK+VABl3HlQM5obYHybwFLc7W1y/Y5BlX6FfgNn - DNcEY0DhZZX+MiGKbh0DNR24AYYWMSfJzc6GZBApwS5skIzNODcg0dV2V36FtsJ7yBJ8UXO8hyzBFzXH - ++H/A/YDv9/V87iOlrYAAAAASUVORK5CYII= + eHBhY2tldCBlbmQ9InIiPz6wJF34AAACl0lEQVRIS62Vy08TURSH73/QhQtXVnBhxEcMiUkhbEg0hB1R + Q1i68C8wIW5cEqMLN7ho2Ji4YiEhWq0prYUhfULbadN3obTaChobtZEUsFY9nnPS6WM6HYowyZf87j33 + nG/amaai9geOBYA+4pTxihmBE8DcTQB4J8em/9IwSQyagmrtL+z9rMFmvnhkKvtV7tcVHPz6DVsftulA + AckdhUg8zf19eoLKAd597iMLMItewfOxUDTN/bqCH3tVSG8VWIBZ9AoJApEk9+sKvu/uQ2IjzwJkGtH8 + OrTwy3Hu77vIAnV9mgWlcgWiqRwLjAMmkOMbPbNTKnN/JJntqJGEBZ++7oKcyLLgLN4JrU8Cms2C4pcy + BKKZumCI18temQ/8DzSLZlBmQX7nG/jCKdpgAa0driCtY5iFHuqHSjNoFtaags1iCdzBBG+QgNY2aZ0F + mIUe6osENAtrTUEq/7kDq9PHAszU5yYoq9f1i9cUSCD5ozxDEeTsrhAoONwyxLLb8MrhYQFmZYCHsnpd + v3hNgQROb5hnKIK29944MAThTBEWbS4WYBZ6qC/sKSy5ZJ6BGUQg8b4Bbhjod4AZXlhXWdBa10LrIVul + AM9ggS+aa6AIMMO8ZYUO0KeyIOMtZyaQpXpNi4LFucYzMINwhbMNcMNw5oIJMMNKIA0LNg88mZuH/ssj + dPgBMnN+cBRmny1wrRtSMMMzWCCFMg0UAeY2Fh0+GL5xG8Zu3oHXUrCj3g0WONdTbeBm21/o1N17gPtg + 98Xh3VoS3qzKMDI22agfglnY/Uld8NDc/ZlZwAwvl4Ngun6LGh8rdfVDViNs3rguOOzq6XOD8PDpc7g2 + OkHDH7XWtYa2It66Y4eCQ8cRfpvUNa2hTUD8A6JMaBvCyTdJAAAAAElFTkSuQmCC + + + + + iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 + YQUAAAAZdEVYdFNvZnR3YXJlAEFkb2JlIEltYWdlUmVhZHlxyWU8AAADZmlUWHRYTUw6Y29tLmFkb2Jl + LnhtcAAAAAAAPD94cGFja2V0IGJlZ2luPSLvu78iIGlkPSJXNU0wTXBDZWhpSHpyZVN6TlRjemtjOWQi + Pz4gPHg6eG1wbWV0YSB4bWxuczp4PSJhZG9iZTpuczptZXRhLyIgeDp4bXB0az0iQWRvYmUgWE1QIENv + cmUgNS4zLWMwMTEgNjYuMTQ1NjYxLCAyMDEyLzAyLzA2LTE0OjU2OjI3ICAgICAgICAiPiA8cmRmOlJE + RiB4bWxuczpyZGY9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkvMDIvMjItcmRmLXN5bnRheC1ucyMiPiA8 + cmRmOkRlc2NyaXB0aW9uIHJkZjphYm91dD0iIiB4bWxuczp4bXBNTT0iaHR0cDovL25zLmFkb2JlLmNv + bS94YXAvMS4wL21tLyIgeG1sbnM6c3RSZWY9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlw + ZS9SZXNvdXJjZVJlZiMiIHhtbG5zOnhtcD0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wLyIgeG1w + TU06T3JpZ2luYWxEb2N1bWVudElEPSJ4bXAuZGlkOjJGQzkyMzc0Rjk0OUU0MTE5NjNCQjRENDMzQjlC + MUM4IiB4bXBNTTpEb2N1bWVudElEPSJ4bXAuZGlkOkUzNzJDMjE3NEFENjExRTRCNjE0OEVEQzI4MEM0 + RTZDIiB4bXBNTTpJbnN0YW5jZUlEPSJ4bXAuaWlkOkUzNzJDMjE2NEFENjExRTRCNjE0OEVEQzI4MEM0 + RTZDIiB4bXA6Q3JlYXRvclRvb2w9IkFkb2JlIFBob3Rvc2hvcCBDUzYgKFdpbmRvd3MpIj4gPHhtcE1N + OkRlcml2ZWRGcm9tIHN0UmVmOmluc3RhbmNlSUQ9InhtcC5paWQ6RkI3NUQ0QkNENDRBRTQxMTk3NEFD + QUFFQjRCMzVENkUiIHN0UmVmOmRvY3VtZW50SUQ9InhtcC5kaWQ6MkZDOTIzNzRGOTQ5RTQxMTk2M0JC + NEQ0MzNCOUIxQzgiLz4gPC9yZGY6RGVzY3JpcHRpb24+IDwvcmRmOlJERj4gPC94OnhtcG1ldGE+IDw/ + eHBhY2tldCBlbmQ9InIiPz6PyaLfAAADMElEQVRIS6VUXUiTYRT+vi3Tzd+ps23+3KRigtiPkolEQReG + UYTkhWatpWlWGkRdddfdSPImqUAJjSIT00oxLJIk0cR+tFSyzDJtgaMkDEPkdM7ZPvm2vS6jBx6es3Pe + 8zzvtm+TohLS/ov+AACStLgEQuJyLRJWYK1yzh/+FgCoQrpnfM4fOGBhcUlIMkEVkma4H4i1y2kFcMD8 + wqKQZILKZqTqmlTAWrfvMjhgbv63Dwm0hLWQohn1eNEbzrlfPiTQAtZCKjP1GXdAIC+r4XD+9CGBFrDm + RVJ1re6pZ0GyHHMvIawauYVNCFPfvvuQQAtYC6meKXU0amNsaGN/ZR60xIf9aIgN3cpGE9OzZCZ85nEm + pGiWlLABmuJCnUOXrNB7chdct4TUo32ANDbp4NuielDpqWfePdaPX6GrohSK4uLhlCEo96YlZLbOFHzH + oJXjMSBcGn4/zQGovEDqXXtzeTb+BTrKj0J3+Q54djYP7EZdTU2MPjFSK8eieQR9QtLg6GcOQPWgqKeQ + ZyOfoK30CDw+lg2Ot3Z4VLoNqo269mCNHIa2WjYn9A1PcAAqU6m9VV3TF9psOwwPS3JgZugCdNoyocwU + jU+RlImWBpezGz0vxzkA1YOiHvPFO7Ca1kGHLQtmXp2HdutmqN+/F6JiU+h3kOpyVeHJwBgHoLIpqajm + 189HoaG4CNqsGTA1UAWth9Lg6r490PygGyLjUikgzuWqQlffCAegelDdUwLqigqhpXgjTPYeh+bCFCg2 + RkEk3vxuVz/P0c43oLP3DQegLhspNalSFxiNcLswHT48LYNbBUlQk7ebzenmyhm08w1o7xmiAP6hRZiT + 70eYkzpctUuJWdHmwWs74+F1Uz7cyE+E4ohQB5mHm9a3GywpTXzektyKduIAIsKI3ISkL4rIdYle05C9 + VrZVBmvtl7eboUyv7V4jSQdwRn8FdI72iErtCUxnIuifkJ5hUqUOq9Jr7OeCNU6bTpNVqtMcDJSldOwn + KnOk+jypJ5QANRWc0cs5SEelXr54QidfwVYAMoiHq4W/gNM6OaNCJ+diaUIqN/43+Atwg27t+9ZXBUn6 + A2MdqQeVc5pWAAAAAElFTkSuQmCC + + + + + iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAIAAABvFaqvAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 + YQUAAAAZdEVYdFNvZnR3YXJlAEFkb2JlIEltYWdlUmVhZHlxyWU8AAADZmlUWHRYTUw6Y29tLmFkb2Jl + LnhtcAAAAAAAPD94cGFja2V0IGJlZ2luPSLvu78iIGlkPSJXNU0wTXBDZWhpSHpyZVN6TlRjemtjOWQi + Pz4gPHg6eG1wbWV0YSB4bWxuczp4PSJhZG9iZTpuczptZXRhLyIgeDp4bXB0az0iQWRvYmUgWE1QIENv + cmUgNS4zLWMwMTEgNjYuMTQ1NjYxLCAyMDEyLzAyLzA2LTE0OjU2OjI3ICAgICAgICAiPiA8cmRmOlJE + RiB4bWxuczpyZGY9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkvMDIvMjItcmRmLXN5bnRheC1ucyMiPiA8 + cmRmOkRlc2NyaXB0aW9uIHJkZjphYm91dD0iIiB4bWxuczp4bXBNTT0iaHR0cDovL25zLmFkb2JlLmNv + bS94YXAvMS4wL21tLyIgeG1sbnM6c3RSZWY9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlw + ZS9SZXNvdXJjZVJlZiMiIHhtbG5zOnhtcD0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wLyIgeG1w + TU06T3JpZ2luYWxEb2N1bWVudElEPSJ4bXAuZGlkOjJGQzkyMzc0Rjk0OUU0MTE5NjNCQjRENDMzQjlC + MUM4IiB4bXBNTTpEb2N1bWVudElEPSJ4bXAuZGlkOjUzQzNGNDI5NEQyQzExRTQ4QkE1QUNCMEVDRDZF + MDVEIiB4bXBNTTpJbnN0YW5jZUlEPSJ4bXAuaWlkOjUzQzNGNDI4NEQyQzExRTQ4QkE1QUNCMEVDRDZF + MDVEIiB4bXA6Q3JlYXRvclRvb2w9IkFkb2JlIFBob3Rvc2hvcCBDUzYgKFdpbmRvd3MpIj4gPHhtcE1N + OkRlcml2ZWRGcm9tIHN0UmVmOmluc3RhbmNlSUQ9InhtcC5paWQ6RkI1NUY4OTYyQTRERTQxMUIzNkJE + NUVDQjU5MzE1NjIiIHN0UmVmOmRvY3VtZW50SUQ9InhtcC5kaWQ6MkZDOTIzNzRGOTQ5RTQxMTk2M0JC + NEQ0MzNCOUIxQzgiLz4gPC9yZGY6RGVzY3JpcHRpb24+IDwvcmRmOlJERj4gPC94OnhtcG1ldGE+IDw/ + eHBhY2tldCBlbmQ9InIiPz6IsaOmAAADF0lEQVQ4T62U/UuTURTH+0nICqRI1ERMMyNQe8N0ChqBwQhN + yvwhEgJjVCqJ/qCibZo6tzQ339h6Nre5prapUzc1XzItX1ilzuWMLLVAen+xf6DTuTxjdxsFVj58ebjc + c+7nnud7z3228DbpIaDFH/CfoqCn72DIDvNfPDM2KAqyr8PcJxqY+QBTb8kkjocXQTsKigGwfqYJHqIg + 1OxHGHvlWPx4hXB1YyA3g4CBhqst+piEnrDA3rA95vBAY1x8d7lq/DVZwm5PQZNvoKYdypSgHgbVEIh1 + cLOZzOCbSSsyRQRba6uWtcpVLbPcwlglInNUCJNWWKqABqMLCGvGlfpJELaQ/V1Vd1lujAhe0chtUrH5 + ZExnmJ85MdomEa+qZMbIEF2BHGunILSjdZwYgTt4gJqjjj0Rltml1Zq9AeL0Mn71Wn2mtDU80MIvsFTw + O+KPIoWC8BNYRIUaqrRQroJKjQOk9N+xLBF2pXJFKfnsDGYa8gS6xOO2whyMuoHaHpGzZ/pBM0IMrtXD + nT4HqNHXe0lYoogMFeQP4jbSDkCPTUyXmnNoPutSo+9WN5DEQDyeWCWnhqm4p7Oimt3b54rzmmKPVHKz + 0Xg0AU1pz87VJp+yXOfd9t3mBmLXsGrsJhSsDtF4iOWxKdpzyQNnuRW7vEUp13obFG05OVUBPtO5V1Sn + k5q4SX8ENfWA6C7xHsP981Bb2sf38ZKd4JhSuXUJHPHhg/WJnAeZFw0Xzt/w8erRtLmBnB/CSmaC599I + 2PYVRl+CXigu3R9SfCC0Pf1MZ1oqvqvjogX7gtRFJfb1n24g7GblfQcFP2fkBYm5anxqQcbLKgzyK/Df + WRTkV5+RMTg84ZrgAOHo4ZIDVNdJw67CpsVLZ5gifj97Typlq2ZFQXj8LKh5EHpnaIar8N+Al5l9Y9Vs + T7OiIAzjqaMsa6QJnBkeWvgOHdPkAuIV67PSeQpCYYZplsZ+KyyWLRyFF8D553EDbURY770J0rrYJbda + SYE4iWb9NcgpRKDrOMAWwYP6d5BTaC52zyaAWDlAm/DweL8AX9zXukfxHsIAAAAASUVORK5CYII= + + + + + iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 + YQUAAAAZdEVYdFNvZnR3YXJlAEFkb2JlIEltYWdlUmVhZHlxyWU8AAADZmlUWHRYTUw6Y29tLmFkb2Jl + LnhtcAAAAAAAPD94cGFja2V0IGJlZ2luPSLvu78iIGlkPSJXNU0wTXBDZWhpSHpyZVN6TlRjemtjOWQi + Pz4gPHg6eG1wbWV0YSB4bWxuczp4PSJhZG9iZTpuczptZXRhLyIgeDp4bXB0az0iQWRvYmUgWE1QIENv + cmUgNS4zLWMwMTEgNjYuMTQ1NjYxLCAyMDEyLzAyLzA2LTE0OjU2OjI3ICAgICAgICAiPiA8cmRmOlJE + RiB4bWxuczpyZGY9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkvMDIvMjItcmRmLXN5bnRheC1ucyMiPiA8 + cmRmOkRlc2NyaXB0aW9uIHJkZjphYm91dD0iIiB4bWxuczp4bXBNTT0iaHR0cDovL25zLmFkb2JlLmNv + bS94YXAvMS4wL21tLyIgeG1sbnM6c3RSZWY9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlw + ZS9SZXNvdXJjZVJlZiMiIHhtbG5zOnhtcD0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wLyIgeG1w + TU06T3JpZ2luYWxEb2N1bWVudElEPSJ4bXAuZGlkOjJGQzkyMzc0Rjk0OUU0MTE5NjNCQjRENDMzQjlC + MUM4IiB4bXBNTTpEb2N1bWVudElEPSJ4bXAuZGlkOkVENUYwQThBNEQyOTExRTQ5QzUzQzdFMkFGQkQy + NTA1IiB4bXBNTTpJbnN0YW5jZUlEPSJ4bXAuaWlkOkVENUYwQTg5NEQyOTExRTQ5QzUzQzdFMkFGQkQy + NTA1IiB4bXA6Q3JlYXRvclRvb2w9IkFkb2JlIFBob3Rvc2hvcCBDUzYgKFdpbmRvd3MpIj4gPHhtcE1N + OkRlcml2ZWRGcm9tIHN0UmVmOmluc3RhbmNlSUQ9InhtcC5paWQ6MkRGNkEzOUYyOTRERTQxMUIzNkJE + NUVDQjU5MzE1NjIiIHN0UmVmOmRvY3VtZW50SUQ9InhtcC5kaWQ6MkZDOTIzNzRGOTQ5RTQxMTk2M0JC + NEQ0MzNCOUIxQzgiLz4gPC9yZGY6RGVzY3JpcHRpb24+IDwvcmRmOlJERj4gPC94OnhtcG1ldGE+IDw/ + eHBhY2tldCBlbmQ9InIiPz6npMy1AAAGEUlEQVRIS7WVeVDUZRjHf7Ase8ECu+wl4LIXcqyyHC783AWW + 5QaRFTHkMi9SQvE+UhLzwk0BUcQSgQBBgcYDzStMSzOPcpqcmo5pmqk/+rOapqb+iG/PbzfFcSz/6pn5 + zPN739/7fp/nvZn/3TSLjj+XJy2/RaItPCT5vaBd8m1+q2Qku1lcrcvki+iXr7fFU6ZZeOx5KDU1b7jU + 1Z2bVPMPWNMbRXrXkWAc+ywVLbcS8fKwFjlu8VdpW0XzSc6f8PEIPzJ19dFnU3WEJdHL9P3X9O1nkdB8 + CQrX7i3mKn9zfqsUq29ZsPfjRBx5aMO2cTMy94gm7FuF7XyJTwDJTo5GVdHxNALVgsPd5Ceye+9g8b0f + UXbjB8RtH4Msd+MeXS7f6twjxbILZiy7pEHDtTBsvG7BqivTUXpsClLWCbtJNpDwBlGVH3ySIFV520eW + nedRcf0HVJGwbeRrOHs/h2n1CGRZDe7wND/W1hiI8sEYlJ4KRcVpJcrfVqByNBILhqLh3KeA+UXBOpL2 + jkRZduARPGXZ/vH4pnMou/gd7INfIPn4QyQc/RSOzk9hrBtEiKPerUn1Y5PXBaDojWlwdgUjr0+G/H4Z + cnpCUNJrQNZ+LeLrBD/LYnixFEDAKFz7vJQ0r49dO4zikS8x8/ADxLd9jIT2B5ix/z7SX78Pw+K3EJy2 + wq1M4rEz6sRwthgw82Ag2KNS2I5JPZ4rZx00ImGNHIZSfisFkDGhxbs5AkKLd/3kaLkDlgTjXrsNc/Md + mPfeQeyOD2HbcRu6yi4E2Wrd8ngeG71IBPtePWa4JUhsD0DykQAkHQqApUWCFLcGyZvDoZ/P/5oCTGXk + hU2MvGB7rbGmG47dd2Fa+x6iX/kAMa/eQvS2m4jaeAPspvcROb8TQexid3CcL2usFCJjnwE5nQYU9RhR + PGDC7D4TCrqMyDqkR9oePbRz/SZEKh8rI8vdyshyXhmzLD8DS/1VGOquwtgw7glkXH0Nhvp3kbL2GrSl + hyC11ril03xZfbkQKZuVsDeq4NihRtYuDbJ2auBoUsO2TQXrJiWMlWIExflWMiHOjRzfJy0bg776HCKX + vANd7WXol1/xeN3Si7A2XIXW1YbAxAq3UO0zPTSd1yG38bplLK//vxBrffKY4PQ1HH9aKk8jonQUUyvO + Qlt9HtqaCx4/tXIMyXWXMXXOAQTEv+D2zCvDhBBTCN1zCGOCZq3k+DXO1YcpRYOY4hpF2LzTCCs74/VE + 3IvnEVd1EhGFblBbWot6BKXWQZq64tlYa2+TuJwQM9KU5cRL35hyOxCe2w913hA0hcPQFI16KRzxEFtO + a1Q9htSVN5C+5S5x7x/uIm3DR7CvuomUReOImt1FU7nwEolHECImMGkJE5i46EJkejNM+X1QOPqhzBqC + KvskVDmnJuHKT/K4bgjKzBMItXcjJv84NOwWiKPndJK40TOCgPgaRmIur1dZ1yM6txvyWT0ITR+AImOQ + gg39N1ybDBJP60PorC5My3oTwQm18FdNryBxbq0EJL6AEUTYZBTkF0NGKyKdvZDb3qJOAxSIOqcP/jtp + JyC3D1BSvYgp6EN4aiNlP/cTEk4gFASPEUeXkWd8RaY5jcrEBkTn9UCT4Q3gzfBfRvJE9rrsfpicHSRe + NsFXmJeSXhTBXXY+jMjk8uArVkpExuKb6pkbYJ7L7Ria37xTUBeMeCkcncRTN0z/TyLKNYy4khNQJq2G + IMLBXdUWQkXwCYYR6md7IPP1k8WEC3UFDzSpG2BZeAZJtXQWFpyls3HOC50JzkdQnbFqDInLLiC2rBcq + 6xoSzzzP+NDVwDBaQkx4XzahNv8xZH48sVotCHeOUnnCWNJG18Q4UjddB7vlfbBbPwC7+YannLTyIrS5 + OyHU5v3hr07poL7JBHe4Jh8bzgQROY8h46IKCAVfbi73D3PcpfoJlX0VtEVN0JXsQlj2ZoRaaynj7N/8 + NfZLPLFmHrXnpiWSCCL8iMl32T/M6YGMq+R+covD7QADwfoIgqt4QVGtfvIZJ4lRv5CY4zypbjfjy+eE + M4l4gtuSwYSQ4DS4EZAew/wNiCYQJlvQU3cAAAAASUVORK5CYII= @@ -1054,142 +1272,6 @@ R2K5fxKLWbbp/7Dc0CBY8Q+pPmOq0VkzzQAAAABJRU5ErkJggg== - - - iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAZdEVYdFNvZnR3YXJlAEFkb2JlIEltYWdlUmVhZHlxyWU8AAADZmlUWHRYTUw6Y29tLmFkb2Jl - LnhtcAAAAAAAPD94cGFja2V0IGJlZ2luPSLvu78iIGlkPSJXNU0wTXBDZWhpSHpyZVN6TlRjemtjOWQi - Pz4gPHg6eG1wbWV0YSB4bWxuczp4PSJhZG9iZTpuczptZXRhLyIgeDp4bXB0az0iQWRvYmUgWE1QIENv - cmUgNS4zLWMwMTEgNjYuMTQ1NjYxLCAyMDEyLzAyLzA2LTE0OjU2OjI3ICAgICAgICAiPiA8cmRmOlJE - RiB4bWxuczpyZGY9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkvMDIvMjItcmRmLXN5bnRheC1ucyMiPiA8 - cmRmOkRlc2NyaXB0aW9uIHJkZjphYm91dD0iIiB4bWxuczp4bXBNTT0iaHR0cDovL25zLmFkb2JlLmNv - bS94YXAvMS4wL21tLyIgeG1sbnM6c3RSZWY9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlw - ZS9SZXNvdXJjZVJlZiMiIHhtbG5zOnhtcD0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wLyIgeG1w - TU06T3JpZ2luYWxEb2N1bWVudElEPSJ4bXAuZGlkOjJGQzkyMzc0Rjk0OUU0MTE5NjNCQjRENDMzQjlC - MUM4IiB4bXBNTTpEb2N1bWVudElEPSJ4bXAuZGlkOjlDMzFEOUI4NEFBRjExRTQ4OTA5OUYwQ0QzM0Q2 - NEI4IiB4bXBNTTpJbnN0YW5jZUlEPSJ4bXAuaWlkOjlDMzFEOUI3NEFBRjExRTQ4OTA5OUYwQ0QzM0Q2 - NEI4IiB4bXA6Q3JlYXRvclRvb2w9IkFkb2JlIFBob3Rvc2hvcCBDUzYgKFdpbmRvd3MpIj4gPHhtcE1N - OkRlcml2ZWRGcm9tIHN0UmVmOmluc3RhbmNlSUQ9InhtcC5paWQ6MDk5Mzk2NTZBRjRBRTQxMTk3NEFD - QUFFQjRCMzVENkUiIHN0UmVmOmRvY3VtZW50SUQ9InhtcC5kaWQ6MkZDOTIzNzRGOTQ5RTQxMTk2M0JC - NEQ0MzNCOUIxQzgiLz4gPC9yZGY6RGVzY3JpcHRpb24+IDwvcmRmOlJERj4gPC94OnhtcG1ldGE+IDw/ - eHBhY2tldCBlbmQ9InIiPz73sIMwAAADIElEQVRIS7WVa0iTYRTH56Uiysvm3TkvpLl5DRIvQYWVWl+6 - iNEVg0yhQqloQZHkLT+Y0YdAs75IpEUhzERZoZhsRpZlS7soblotsRwoxhqWeTrnYZtv+u7NsB74cZ5z - zv89/z17HzYRAPxXeIv/EpFXcOyi4BvKhfehv4FvKBfeh+ayqIUDlIgBgT8whpRYoT2fhgvNVJKBQT9s - hB8/QZDPpnEIjEhg0J5Pw4Vm0mwygG9T06BSqQQhTUhUMoRGpyxYT7OZwfhXC6jVakFIYzNYqN5uMGKa - BI1GIwhpghXJaJJi13d0dEB2bj74hsWzSDlXbzfQG02g0+kEIU2wIomdovzKdVifngnFFytBeb4cLN+n - WaSc6hfKKqB/eHTWoHfwExgMBkFII5MnQUD4WlAWloO26wVs35MDmifPmQFFyqlO/aKKqlmDp31DYDKZ - BCGNTJ4IPqHx8LJvACbNUw7p6e2HuJQMNIhhBuaHj3vBYrEI0tb1BoIiE9kJ9h7Oh7EJM+g/jEJuwVlY - s24ri5RTnfo5BedAIoueIYPumvomuHzjzm9cq2uCq7UNUH2rEarr7kNd0yP26Y+eKoSWtk4wfpmAg7kn - ITY5DUorq1g8cOQEqze3aplOEhRtJoMcL1mMTixV9IgD5a/tSBVDYql8AKOBQLEJtTP08gY/jjFiktKg - 5FIV21Ok3NazvmR2AvrFkCAJyGYk1comZAuHDM/AyLvHThfBveZ26NOPwI59eey7LsbhFCmnOvVJ5+Ef - rrYZLEU8EZ85+HLwW7ZCLMVTFWdkHoLut+/hgbYHaE9XN31XNsupTrWV3jKVs+uS3cyAD0cLe331jW3Q - qRt0CPUlQVHDKI+fN9iGo4W90uNnyuA2vvRtWTlQgxeg/dk7FimnOvU9/CNqUe47b7ANRwt7AfjpKvAK - Gt18Qur35ymhRfsKKLr5hN7EyzDq7humWrrcfSfKxbz/QlwcLDck1snZJdUzYHUDmk57+K1qdXJyzsL6 - RmQD9ZmObygXB8sVIRO6fXQB4hC6eRQppzr1XXmHclnAckFomLc1Um5dItEvhZ97MQXP9N0AAAAASUVO - RK5CYII= - - - - - iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAZdEVYdFNvZnR3YXJlAEFkb2JlIEltYWdlUmVhZHlxyWU8AAADZmlUWHRYTUw6Y29tLmFkb2Jl - LnhtcAAAAAAAPD94cGFja2V0IGJlZ2luPSLvu78iIGlkPSJXNU0wTXBDZWhpSHpyZVN6TlRjemtjOWQi - Pz4gPHg6eG1wbWV0YSB4bWxuczp4PSJhZG9iZTpuczptZXRhLyIgeDp4bXB0az0iQWRvYmUgWE1QIENv - cmUgNS4zLWMwMTEgNjYuMTQ1NjYxLCAyMDEyLzAyLzA2LTE0OjU2OjI3ICAgICAgICAiPiA8cmRmOlJE - RiB4bWxuczpyZGY9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkvMDIvMjItcmRmLXN5bnRheC1ucyMiPiA8 - cmRmOkRlc2NyaXB0aW9uIHJkZjphYm91dD0iIiB4bWxuczp4bXBNTT0iaHR0cDovL25zLmFkb2JlLmNv - bS94YXAvMS4wL21tLyIgeG1sbnM6c3RSZWY9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlw - ZS9SZXNvdXJjZVJlZiMiIHhtbG5zOnhtcD0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wLyIgeG1w - TU06T3JpZ2luYWxEb2N1bWVudElEPSJ4bXAuZGlkOjJGQzkyMzc0Rjk0OUU0MTE5NjNCQjRENDMzQjlC - MUM4IiB4bXBNTTpEb2N1bWVudElEPSJ4bXAuZGlkOjhDMTdBQjRENEFBRTExRTQ4QjQyODY0MDNBNTJE - NzNCIiB4bXBNTTpJbnN0YW5jZUlEPSJ4bXAuaWlkOjhDMTdBQjRDNEFBRTExRTQ4QjQyODY0MDNBNTJE - NzNCIiB4bXA6Q3JlYXRvclRvb2w9IkFkb2JlIFBob3Rvc2hvcCBDUzYgKFdpbmRvd3MpIj4gPHhtcE1N - OkRlcml2ZWRGcm9tIHN0UmVmOmluc3RhbmNlSUQ9InhtcC5paWQ6NUQyMjc4QTlBQjRBRTQxMTk3NEFD - QUFFQjRCMzVENkUiIHN0UmVmOmRvY3VtZW50SUQ9InhtcC5kaWQ6MkZDOTIzNzRGOTQ5RTQxMTk2M0JC - NEQ0MzNCOUIxQzgiLz4gPC9yZGY6RGVzY3JpcHRpb24+IDwvcmRmOlJERj4gPC94OnhtcG1ldGE+IDw/ - eHBhY2tldCBlbmQ9InIiPz4eHsDfAAAB00lEQVRIS7XVWytEURQH8HniTTNHLs0NCXNcXjTN5dH9g/gM - 3jx590QhFDJS0gyTGmpqaqJIMW4hzlAoOaWISS7LWifntI3ddnTGrl92e/57/We/DBsA/CvuYSHZSr0t - lvCGsriX/oI3lMW9lM/SwgF9SEHwizs08IX2vAyLZvZRgXJ+cQWv7yB0q96Ds86voT0vw6KZNJsK4Pnl - DWKxmBBlqhpDUN0UNp2n2VrB/WMOEomEEGX0ArN5o+BGfYB0Oi1EGa8cwpKw6bxRcH6lQiaTEaKMVw5q - rzCbNwr2z65BURQhynh8Qe0VZvNGwdZBFlRVFaKMxxfQXmE2rxc8rW3sQy6XE0puHoG7IaC9YnV9j5th - pbZPqOCDCrbH5uIwOD7/zWgkDkNTizAyuwQjkWWIxFNQWduqmVxI/MiPz6/A8HTUuDMTTYLkbrqhgt5S - T3PG4ZJ3HE7focElZx0u3yn+VQiG1ZLymmm7s74f88f42S6bl9zyJZ6d6Xckd+Mt5ieogH4xJORHHajt - SzvqZPSgECpHZSiA2DztuxBlad+NgnpBEbIjusiiYboKRF+kGFHegUR5ImkFv7G0eAPzWVq8gfksLd5/ - oULiHhYS97BwwPYJlSCUgVubViQAAAAASUVORK5CYII= - - - - - iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAZdEVYdFNvZnR3YXJlAEFkb2JlIEltYWdlUmVhZHlxyWU8AAADZmlUWHRYTUw6Y29tLmFkb2Jl - LnhtcAAAAAAAPD94cGFja2V0IGJlZ2luPSLvu78iIGlkPSJXNU0wTXBDZWhpSHpyZVN6TlRjemtjOWQi - Pz4gPHg6eG1wbWV0YSB4bWxuczp4PSJhZG9iZTpuczptZXRhLyIgeDp4bXB0az0iQWRvYmUgWE1QIENv - cmUgNS4zLWMwMTEgNjYuMTQ1NjYxLCAyMDEyLzAyLzA2LTE0OjU2OjI3ICAgICAgICAiPiA8cmRmOlJE - RiB4bWxuczpyZGY9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkvMDIvMjItcmRmLXN5bnRheC1ucyMiPiA8 - cmRmOkRlc2NyaXB0aW9uIHJkZjphYm91dD0iIiB4bWxuczp4bXBNTT0iaHR0cDovL25zLmFkb2JlLmNv - bS94YXAvMS4wL21tLyIgeG1sbnM6c3RSZWY9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlw - ZS9SZXNvdXJjZVJlZiMiIHhtbG5zOnhtcD0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wLyIgeG1w - TU06T3JpZ2luYWxEb2N1bWVudElEPSJ4bXAuZGlkOjJGQzkyMzc0Rjk0OUU0MTE5NjNCQjRENDMzQjlC - MUM4IiB4bXBNTTpEb2N1bWVudElEPSJ4bXAuZGlkOjJEMDQyOEZBNEFEMjExRTRBN0MxRDBCNzJGRUND - MDEzIiB4bXBNTTpJbnN0YW5jZUlEPSJ4bXAuaWlkOjJEMDQyOEY5NEFEMjExRTRBN0MxRDBCNzJGRUND - MDEzIiB4bXA6Q3JlYXRvclRvb2w9IkFkb2JlIFBob3Rvc2hvcCBDUzYgKFdpbmRvd3MpIj4gPHhtcE1N - OkRlcml2ZWRGcm9tIHN0UmVmOmluc3RhbmNlSUQ9InhtcC5paWQ6QkRDRkI1RDVEMTRBRTQxMTk3NEFD - QUFFQjRCMzVENkUiIHN0UmVmOmRvY3VtZW50SUQ9InhtcC5kaWQ6MkZDOTIzNzRGOTQ5RTQxMTk2M0JC - NEQ0MzNCOUIxQzgiLz4gPC9yZGY6RGVzY3JpcHRpb24+IDwvcmRmOlJERj4gPC94OnhtcG1ldGE+IDw/ - eHBhY2tldCBlbmQ9InIiPz59jfe3AAAEbUlEQVRIS8WTeUybZRzHF48/pnFOuQRajkFLgQFb5iRLNJr4 - l/EPgsniUI4xZDAY1zyxwApsMJyIME61rByl3DfoYGBrgbWUY06FcZSCha4rQ8jYxkqPr2/fvkv8o2Sg - S/wkT970eb6/T5/39z7Prv8dt/Oql4mR4HZJ3ccoXFxhVCzB9DT9JueJdSq6c1wzVZFupepVzxu34XVj - CaEDi1jX6hF8ZQoeokl4iBVwzV9YdU1XRlIl28eVo8phCdXwGltEeOUsro6psaHVwcSDh5volc4iOO8X - 7KuVwb1hEi7J8myq9PEQO//I85oafr0KtEpUpNSETm+AwWDAvfv3YTQaybnm/t/AyO6Ga+UonJOnIijF - 1hA9tWI2qle9RxcI+RIpmZpTIfBULhIyyqHVahHPKcN70TmYnFFCp9OhqXcc9KwW0DOHVl3YU1aUyjJu - F1SpfhO3EM6bMMsVt+D8Zhz2HIpC4oU6bG5uIu4cD3tfTwAjIBNypQYbGxsISquBU34PaDHiVEplGXee - SuIjVaBv3Lz7gJg8vHg4FlZvc+ATVoLipiHsD8qCXWAO7IPK8MG5FjLXKboOeoYADkldUkplGWb7vOb4 - 4BzxIXXQE/1m59WDXdgBvxPfwz6UC4eQUth/WIBDZ2qQXj+K7IYRImeE5s5fOFrcDPvPapcJzVNmmwVY - VxWG9U09uau1tTVymPpc0iYFLew7OEUJ4BwtALfvJpl5xMrKCu6s3cUrn5YbCM1us80CrJZZVWjXr7j3 - 4CE0y8v4IrcaH+cK4Bv+DRyPl8ApphYuia3wZ3eCUzOA1PIfcVuzjHnlIgK/vgy7mHzTG+w12yzA5E53 - edYPo1c2i/X1dQTEfwvbwDQ4hhXg8OcN4P48Df+UTrgkNIAeW4Hg3Hbo9Xq0iGSgs4ls5CUhoXnObLOA - S8pkhG/bdZzgDZJnffT3GXieLAA9XgB2/RjZjuQqMWhxfBw824H55XWyhcfy+HDNqoB1SH4Codn6G7iw - p3d78EaVPlXX0CaZgkqlgly1gpCiK0htHCH/IL6oFcEF3ZjT3CUvXqv0DzDSS0FPq1a/8EbYS5Rqa+if - SAJ8KoeNR7gitEsnoVQqSbGOkJmYX1ggxaY70SabwIGMUrjn8I3WIXnBRPnWu/8nDnE9Sd7cAaP/ZSES - 6/rRKJRArpiHXC7HzekZNIukiCyrhW9mGZgXa4w2kUVnibJnzdXbxP5URzyDO4QjxGl5i9uNpMZeKP5U - IrywAq9yCnGAOGGMonbYxpVnEPGdyR9BO/MTj8kfgXeNFPt5IngVtoF1kQ9WcTs8qgfgmNreQMS21xZL - 0E6Ln6ef75tg8sfgXT8O77oReAkkYNXJ4PRV/4ztyfo9VPTf4xjdf9CpQKzdxxuGe6UMbhXEmc8V6mze - r3qNivx3HGN7UmglQ6CVDMIxXwybo5UcaunJQD8te9rhyx4JrWwItlGNUut3y5+hlp4cDhFCpl14k9jq - nR+Y1NTjIe7NlmMnWKoHsOtvjWYcKpheqFQAAAAASUVORK5CYII= - - - - - iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAZdEVYdFNvZnR3YXJlAEFkb2JlIEltYWdlUmVhZHlxyWU8AAADZmlUWHRYTUw6Y29tLmFkb2Jl - LnhtcAAAAAAAPD94cGFja2V0IGJlZ2luPSLvu78iIGlkPSJXNU0wTXBDZWhpSHpyZVN6TlRjemtjOWQi - Pz4gPHg6eG1wbWV0YSB4bWxuczp4PSJhZG9iZTpuczptZXRhLyIgeDp4bXB0az0iQWRvYmUgWE1QIENv - cmUgNS4zLWMwMTEgNjYuMTQ1NjYxLCAyMDEyLzAyLzA2LTE0OjU2OjI3ICAgICAgICAiPiA8cmRmOlJE - RiB4bWxuczpyZGY9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkvMDIvMjItcmRmLXN5bnRheC1ucyMiPiA8 - cmRmOkRlc2NyaXB0aW9uIHJkZjphYm91dD0iIiB4bWxuczp4bXBNTT0iaHR0cDovL25zLmFkb2JlLmNv - bS94YXAvMS4wL21tLyIgeG1sbnM6c3RSZWY9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlw - ZS9SZXNvdXJjZVJlZiMiIHhtbG5zOnhtcD0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wLyIgeG1w - TU06T3JpZ2luYWxEb2N1bWVudElEPSJ4bXAuZGlkOjJGQzkyMzc0Rjk0OUU0MTE5NjNCQjRENDMzQjlC - MUM4IiB4bXBNTTpEb2N1bWVudElEPSJ4bXAuZGlkOjJERTg4QTFENEQyMjExRTRBODEyODk0M0RBMTc5 - Qjg3IiB4bXBNTTpJbnN0YW5jZUlEPSJ4bXAuaWlkOjJERTg4QTFDNEQyMjExRTRBODEyODk0M0RBMTc5 - Qjg3IiB4bXA6Q3JlYXRvclRvb2w9IkFkb2JlIFBob3Rvc2hvcCBDUzYgKFdpbmRvd3MpIj4gPHhtcE1N - OkRlcml2ZWRGcm9tIHN0UmVmOmluc3RhbmNlSUQ9InhtcC5paWQ6NjJGOUEyRDEyMTRERTQxMUIzNkJE - NUVDQjU5MzE1NjIiIHN0UmVmOmRvY3VtZW50SUQ9InhtcC5kaWQ6MkZDOTIzNzRGOTQ5RTQxMTk2M0JC - NEQ0MzNCOUIxQzgiLz4gPC9yZGY6RGVzY3JpcHRpb24+IDwvcmRmOlJERj4gPC94OnhtcG1ldGE+IDw/ - eHBhY2tldCBlbmQ9InIiPz6wJF34AAACl0lEQVRIS62Vy08TURSH73/QhQtXVnBhxEcMiUkhbEg0hB1R - Q1i68C8wIW5cEqMLN7ho2Ji4YiEhWq0prYUhfULbadN3obTaChobtZEUsFY9nnPS6WM6HYowyZf87j33 - nG/amaai9geOBYA+4pTxihmBE8DcTQB4J8em/9IwSQyagmrtL+z9rMFmvnhkKvtV7tcVHPz6DVsftulA - AckdhUg8zf19eoLKAd597iMLMItewfOxUDTN/bqCH3tVSG8VWIBZ9AoJApEk9+sKvu/uQ2IjzwJkGtH8 - OrTwy3Hu77vIAnV9mgWlcgWiqRwLjAMmkOMbPbNTKnN/JJntqJGEBZ++7oKcyLLgLN4JrU8Cms2C4pcy - BKKZumCI18temQ/8DzSLZlBmQX7nG/jCKdpgAa0driCtY5iFHuqHSjNoFtaags1iCdzBBG+QgNY2aZ0F - mIUe6osENAtrTUEq/7kDq9PHAszU5yYoq9f1i9cUSCD5ozxDEeTsrhAoONwyxLLb8MrhYQFmZYCHsnpd - v3hNgQROb5hnKIK29944MAThTBEWbS4WYBZ6qC/sKSy5ZJ6BGUQg8b4Bbhjod4AZXlhXWdBa10LrIVul - AM9ggS+aa6AIMMO8ZYUO0KeyIOMtZyaQpXpNi4LFucYzMINwhbMNcMNw5oIJMMNKIA0LNg88mZuH/ssj - dPgBMnN+cBRmny1wrRtSMMMzWCCFMg0UAeY2Fh0+GL5xG8Zu3oHXUrCj3g0WONdTbeBm21/o1N17gPtg - 98Xh3VoS3qzKMDI22agfglnY/Uld8NDc/ZlZwAwvl4Ngun6LGh8rdfVDViNs3rguOOzq6XOD8PDpc7g2 - OkHDH7XWtYa2It66Y4eCQ8cRfpvUNa2hTUD8A6JMaBvCyTdJAAAAAElFTkSuQmCC - - iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 @@ -1403,7 +1485,7 @@ AAAASUVORK5CYII= - + iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 YQUAAAAZdEVYdFNvZnR3YXJlAEFkb2JlIEltYWdlUmVhZHlxyWU8AAADZmlUWHRYTUw6Y29tLmFkb2Jl @@ -1415,108 +1497,26 @@ bS94YXAvMS4wL21tLyIgeG1sbnM6c3RSZWY9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlw ZS9SZXNvdXJjZVJlZiMiIHhtbG5zOnhtcD0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wLyIgeG1w TU06T3JpZ2luYWxEb2N1bWVudElEPSJ4bXAuZGlkOjJGQzkyMzc0Rjk0OUU0MTE5NjNCQjRENDMzQjlC - MUM4IiB4bXBNTTpEb2N1bWVudElEPSJ4bXAuZGlkOkUzNzJDMjE3NEFENjExRTRCNjE0OEVEQzI4MEM0 - RTZDIiB4bXBNTTpJbnN0YW5jZUlEPSJ4bXAuaWlkOkUzNzJDMjE2NEFENjExRTRCNjE0OEVEQzI4MEM0 - RTZDIiB4bXA6Q3JlYXRvclRvb2w9IkFkb2JlIFBob3Rvc2hvcCBDUzYgKFdpbmRvd3MpIj4gPHhtcE1N - OkRlcml2ZWRGcm9tIHN0UmVmOmluc3RhbmNlSUQ9InhtcC5paWQ6RkI3NUQ0QkNENDRBRTQxMTk3NEFD - QUFFQjRCMzVENkUiIHN0UmVmOmRvY3VtZW50SUQ9InhtcC5kaWQ6MkZDOTIzNzRGOTQ5RTQxMTk2M0JC - NEQ0MzNCOUIxQzgiLz4gPC9yZGY6RGVzY3JpcHRpb24+IDwvcmRmOlJERj4gPC94OnhtcG1ldGE+IDw/ - eHBhY2tldCBlbmQ9InIiPz6PyaLfAAADMElEQVRIS6VUXUiTYRT+vi3Tzd+ps23+3KRigtiPkolEQReG - UYTkhWatpWlWGkRdddfdSPImqUAJjSIT00oxLJIk0cR+tFSyzDJtgaMkDEPkdM7ZPvm2vS6jBx6es3Pe - 8zzvtm+TohLS/ov+AACStLgEQuJyLRJWYK1yzh/+FgCoQrpnfM4fOGBhcUlIMkEVkma4H4i1y2kFcMD8 - wqKQZILKZqTqmlTAWrfvMjhgbv63Dwm0hLWQohn1eNEbzrlfPiTQAtZCKjP1GXdAIC+r4XD+9CGBFrDm - RVJ1re6pZ0GyHHMvIawauYVNCFPfvvuQQAtYC6meKXU0amNsaGN/ZR60xIf9aIgN3cpGE9OzZCZ85nEm - pGiWlLABmuJCnUOXrNB7chdct4TUo32ANDbp4NuielDpqWfePdaPX6GrohSK4uLhlCEo96YlZLbOFHzH - oJXjMSBcGn4/zQGovEDqXXtzeTb+BTrKj0J3+Q54djYP7EZdTU2MPjFSK8eieQR9QtLg6GcOQPWgqKeQ - ZyOfoK30CDw+lg2Ot3Z4VLoNqo269mCNHIa2WjYn9A1PcAAqU6m9VV3TF9psOwwPS3JgZugCdNoyocwU - jU+RlImWBpezGz0vxzkA1YOiHvPFO7Ca1kGHLQtmXp2HdutmqN+/F6JiU+h3kOpyVeHJwBgHoLIpqajm - 189HoaG4CNqsGTA1UAWth9Lg6r490PygGyLjUikgzuWqQlffCAegelDdUwLqigqhpXgjTPYeh+bCFCg2 - RkEk3vxuVz/P0c43oLP3DQegLhspNalSFxiNcLswHT48LYNbBUlQk7ebzenmyhm08w1o7xmiAP6hRZiT - 70eYkzpctUuJWdHmwWs74+F1Uz7cyE+E4ohQB5mHm9a3GywpTXzektyKduIAIsKI3ISkL4rIdYle05C9 - VrZVBmvtl7eboUyv7V4jSQdwRn8FdI72iErtCUxnIuifkJ5hUqUOq9Jr7OeCNU6bTpNVqtMcDJSldOwn - KnOk+jypJ5QANRWc0cs5SEelXr54QidfwVYAMoiHq4W/gNM6OaNCJ+diaUIqN/43+Atwg27t+9ZXBUn6 - A2MdqQeVc5pWAAAAAElFTkSuQmCC - - - - - iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAIAAABvFaqvAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAZdEVYdFNvZnR3YXJlAEFkb2JlIEltYWdlUmVhZHlxyWU8AAADZmlUWHRYTUw6Y29tLmFkb2Jl - LnhtcAAAAAAAPD94cGFja2V0IGJlZ2luPSLvu78iIGlkPSJXNU0wTXBDZWhpSHpyZVN6TlRjemtjOWQi - Pz4gPHg6eG1wbWV0YSB4bWxuczp4PSJhZG9iZTpuczptZXRhLyIgeDp4bXB0az0iQWRvYmUgWE1QIENv - cmUgNS4zLWMwMTEgNjYuMTQ1NjYxLCAyMDEyLzAyLzA2LTE0OjU2OjI3ICAgICAgICAiPiA8cmRmOlJE - RiB4bWxuczpyZGY9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkvMDIvMjItcmRmLXN5bnRheC1ucyMiPiA8 - cmRmOkRlc2NyaXB0aW9uIHJkZjphYm91dD0iIiB4bWxuczp4bXBNTT0iaHR0cDovL25zLmFkb2JlLmNv - bS94YXAvMS4wL21tLyIgeG1sbnM6c3RSZWY9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlw - ZS9SZXNvdXJjZVJlZiMiIHhtbG5zOnhtcD0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wLyIgeG1w - TU06T3JpZ2luYWxEb2N1bWVudElEPSJ4bXAuZGlkOjJGQzkyMzc0Rjk0OUU0MTE5NjNCQjRENDMzQjlC - MUM4IiB4bXBNTTpEb2N1bWVudElEPSJ4bXAuZGlkOjUzQzNGNDI5NEQyQzExRTQ4QkE1QUNCMEVDRDZF - MDVEIiB4bXBNTTpJbnN0YW5jZUlEPSJ4bXAuaWlkOjUzQzNGNDI4NEQyQzExRTQ4QkE1QUNCMEVDRDZF - MDVEIiB4bXA6Q3JlYXRvclRvb2w9IkFkb2JlIFBob3Rvc2hvcCBDUzYgKFdpbmRvd3MpIj4gPHhtcE1N - OkRlcml2ZWRGcm9tIHN0UmVmOmluc3RhbmNlSUQ9InhtcC5paWQ6RkI1NUY4OTYyQTRERTQxMUIzNkJE + MUM4IiB4bXBNTTpEb2N1bWVudElEPSJ4bXAuZGlkOjJERjY3MEZENEQyMzExRTRCNDlGQUMwMzk0OTAw + Qzc4IiB4bXBNTTpJbnN0YW5jZUlEPSJ4bXAuaWlkOjJERjY3MEZDNEQyMzExRTRCNDlGQUMwMzk0OTAw + Qzc4IiB4bXA6Q3JlYXRvclRvb2w9IkFkb2JlIFBob3Rvc2hvcCBDUzYgKFdpbmRvd3MpIj4gPHhtcE1N + OkRlcml2ZWRGcm9tIHN0UmVmOmluc3RhbmNlSUQ9InhtcC5paWQ6NjhGOUEyRDEyMTRERTQxMUIzNkJE NUVDQjU5MzE1NjIiIHN0UmVmOmRvY3VtZW50SUQ9InhtcC5kaWQ6MkZDOTIzNzRGOTQ5RTQxMTk2M0JC NEQ0MzNCOUIxQzgiLz4gPC9yZGY6RGVzY3JpcHRpb24+IDwvcmRmOlJERj4gPC94OnhtcG1ldGE+IDw/ - eHBhY2tldCBlbmQ9InIiPz6IsaOmAAADF0lEQVQ4T62U/UuTURTH+0nICqRI1ERMMyNQe8N0ChqBwQhN - yvwhEgJjVCqJ/qCibZo6tzQ339h6Nre5prapUzc1XzItX1ilzuWMLLVAen+xf6DTuTxjdxsFVj58ebjc - c+7nnud7z3228DbpIaDFH/CfoqCn72DIDvNfPDM2KAqyr8PcJxqY+QBTb8kkjocXQTsKigGwfqYJHqIg - 1OxHGHvlWPx4hXB1YyA3g4CBhqst+piEnrDA3rA95vBAY1x8d7lq/DVZwm5PQZNvoKYdypSgHgbVEIh1 - cLOZzOCbSSsyRQRba6uWtcpVLbPcwlglInNUCJNWWKqABqMLCGvGlfpJELaQ/V1Vd1lujAhe0chtUrH5 - ZExnmJ85MdomEa+qZMbIEF2BHGunILSjdZwYgTt4gJqjjj0Rltml1Zq9AeL0Mn71Wn2mtDU80MIvsFTw - O+KPIoWC8BNYRIUaqrRQroJKjQOk9N+xLBF2pXJFKfnsDGYa8gS6xOO2whyMuoHaHpGzZ/pBM0IMrtXD - nT4HqNHXe0lYoogMFeQP4jbSDkCPTUyXmnNoPutSo+9WN5DEQDyeWCWnhqm4p7Oimt3b54rzmmKPVHKz - 0Xg0AU1pz87VJp+yXOfd9t3mBmLXsGrsJhSsDtF4iOWxKdpzyQNnuRW7vEUp13obFG05OVUBPtO5V1Sn - k5q4SX8ENfWA6C7xHsP981Bb2sf38ZKd4JhSuXUJHPHhg/WJnAeZFw0Xzt/w8erRtLmBnB/CSmaC599I - 2PYVRl+CXigu3R9SfCC0Pf1MZ1oqvqvjogX7gtRFJfb1n24g7GblfQcFP2fkBYm5anxqQcbLKgzyK/Df - WRTkV5+RMTg84ZrgAOHo4ZIDVNdJw67CpsVLZ5gifj97Typlq2ZFQXj8LKh5EHpnaIar8N+Al5l9Y9Vs - T7OiIAzjqaMsa6QJnBkeWvgOHdPkAuIV67PSeQpCYYZplsZ+KyyWLRyFF8D553EDbURY770J0rrYJbda - SYE4iWb9NcgpRKDrOMAWwYP6d5BTaC52zyaAWDlAm/DweL8AX9zXukfxHsIAAAAASUVORK5CYII= - - - - - iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAZdEVYdFNvZnR3YXJlAEFkb2JlIEltYWdlUmVhZHlxyWU8AAADZmlUWHRYTUw6Y29tLmFkb2Jl - LnhtcAAAAAAAPD94cGFja2V0IGJlZ2luPSLvu78iIGlkPSJXNU0wTXBDZWhpSHpyZVN6TlRjemtjOWQi - Pz4gPHg6eG1wbWV0YSB4bWxuczp4PSJhZG9iZTpuczptZXRhLyIgeDp4bXB0az0iQWRvYmUgWE1QIENv - cmUgNS4zLWMwMTEgNjYuMTQ1NjYxLCAyMDEyLzAyLzA2LTE0OjU2OjI3ICAgICAgICAiPiA8cmRmOlJE - RiB4bWxuczpyZGY9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkvMDIvMjItcmRmLXN5bnRheC1ucyMiPiA8 - cmRmOkRlc2NyaXB0aW9uIHJkZjphYm91dD0iIiB4bWxuczp4bXBNTT0iaHR0cDovL25zLmFkb2JlLmNv - bS94YXAvMS4wL21tLyIgeG1sbnM6c3RSZWY9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlw - ZS9SZXNvdXJjZVJlZiMiIHhtbG5zOnhtcD0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wLyIgeG1w - TU06T3JpZ2luYWxEb2N1bWVudElEPSJ4bXAuZGlkOjJGQzkyMzc0Rjk0OUU0MTE5NjNCQjRENDMzQjlC - MUM4IiB4bXBNTTpEb2N1bWVudElEPSJ4bXAuZGlkOkVENUYwQThBNEQyOTExRTQ5QzUzQzdFMkFGQkQy - NTA1IiB4bXBNTTpJbnN0YW5jZUlEPSJ4bXAuaWlkOkVENUYwQTg5NEQyOTExRTQ5QzUzQzdFMkFGQkQy - NTA1IiB4bXA6Q3JlYXRvclRvb2w9IkFkb2JlIFBob3Rvc2hvcCBDUzYgKFdpbmRvd3MpIj4gPHhtcE1N - OkRlcml2ZWRGcm9tIHN0UmVmOmluc3RhbmNlSUQ9InhtcC5paWQ6MkRGNkEzOUYyOTRERTQxMUIzNkJE - NUVDQjU5MzE1NjIiIHN0UmVmOmRvY3VtZW50SUQ9InhtcC5kaWQ6MkZDOTIzNzRGOTQ5RTQxMTk2M0JC - NEQ0MzNCOUIxQzgiLz4gPC9yZGY6RGVzY3JpcHRpb24+IDwvcmRmOlJERj4gPC94OnhtcG1ldGE+IDw/ - eHBhY2tldCBlbmQ9InIiPz6npMy1AAAGEUlEQVRIS7WVeVDUZRjHf7Ase8ECu+wl4LIXcqyyHC783AWW - 5QaRFTHkMi9SQvE+UhLzwk0BUcQSgQBBgcYDzStMSzOPcpqcmo5pmqk/+rOapqb+iG/PbzfFcSz/6pn5 - zPN739/7fp/nvZn/3TSLjj+XJy2/RaItPCT5vaBd8m1+q2Qku1lcrcvki+iXr7fFU6ZZeOx5KDU1b7jU - 1Z2bVPMPWNMbRXrXkWAc+ywVLbcS8fKwFjlu8VdpW0XzSc6f8PEIPzJ19dFnU3WEJdHL9P3X9O1nkdB8 - CQrX7i3mKn9zfqsUq29ZsPfjRBx5aMO2cTMy94gm7FuF7XyJTwDJTo5GVdHxNALVgsPd5Ceye+9g8b0f - UXbjB8RtH4Msd+MeXS7f6twjxbILZiy7pEHDtTBsvG7BqivTUXpsClLWCbtJNpDwBlGVH3ySIFV520eW - nedRcf0HVJGwbeRrOHs/h2n1CGRZDe7wND/W1hiI8sEYlJ4KRcVpJcrfVqByNBILhqLh3KeA+UXBOpL2 - jkRZduARPGXZ/vH4pnMou/gd7INfIPn4QyQc/RSOzk9hrBtEiKPerUn1Y5PXBaDojWlwdgUjr0+G/H4Z - cnpCUNJrQNZ+LeLrBD/LYnixFEDAKFz7vJQ0r49dO4zikS8x8/ADxLd9jIT2B5ix/z7SX78Pw+K3EJy2 - wq1M4rEz6sRwthgw82Ag2KNS2I5JPZ4rZx00ImGNHIZSfisFkDGhxbs5AkKLd/3kaLkDlgTjXrsNc/Md - mPfeQeyOD2HbcRu6yi4E2Wrd8ngeG71IBPtePWa4JUhsD0DykQAkHQqApUWCFLcGyZvDoZ/P/5oCTGXk - hU2MvGB7rbGmG47dd2Fa+x6iX/kAMa/eQvS2m4jaeAPspvcROb8TQexid3CcL2usFCJjnwE5nQYU9RhR - PGDC7D4TCrqMyDqkR9oePbRz/SZEKh8rI8vdyshyXhmzLD8DS/1VGOquwtgw7glkXH0Nhvp3kbL2GrSl - hyC11ril03xZfbkQKZuVsDeq4NihRtYuDbJ2auBoUsO2TQXrJiWMlWIExflWMiHOjRzfJy0bg776HCKX - vANd7WXol1/xeN3Si7A2XIXW1YbAxAq3UO0zPTSd1yG38bplLK//vxBrffKY4PQ1HH9aKk8jonQUUyvO - Qlt9HtqaCx4/tXIMyXWXMXXOAQTEv+D2zCvDhBBTCN1zCGOCZq3k+DXO1YcpRYOY4hpF2LzTCCs74/VE - 3IvnEVd1EhGFblBbWot6BKXWQZq64tlYa2+TuJwQM9KU5cRL35hyOxCe2w913hA0hcPQFI16KRzxEFtO - a1Q9htSVN5C+5S5x7x/uIm3DR7CvuomUReOImt1FU7nwEolHECImMGkJE5i46EJkejNM+X1QOPqhzBqC - KvskVDmnJuHKT/K4bgjKzBMItXcjJv84NOwWiKPndJK40TOCgPgaRmIur1dZ1yM6txvyWT0ITR+AImOQ - gg39N1ybDBJP60PorC5My3oTwQm18FdNryBxbq0EJL6AEUTYZBTkF0NGKyKdvZDb3qJOAxSIOqcP/jtp - JyC3D1BSvYgp6EN4aiNlP/cTEk4gFASPEUeXkWd8RaY5jcrEBkTn9UCT4Q3gzfBfRvJE9rrsfpicHSRe - NsFXmJeSXhTBXXY+jMjk8uArVkpExuKb6pkbYJ7L7Ria37xTUBeMeCkcncRTN0z/TyLKNYy4khNQJq2G - IMLBXdUWQkXwCYYR6md7IPP1k8WEC3UFDzSpG2BZeAZJtXQWFpyls3HOC50JzkdQnbFqDInLLiC2rBcq - 6xoSzzzP+NDVwDBaQkx4XzahNv8xZH48sVotCHeOUnnCWNJG18Q4UjddB7vlfbBbPwC7+YannLTyIrS5 - OyHU5v3hr07poL7JBHe4Jh8bzgQROY8h46IKCAVfbi73D3PcpfoJlX0VtEVN0JXsQlj2ZoRaaynj7N/8 - NfZLPLFmHrXnpiWSCCL8iMl32T/M6YGMq+R+covD7QADwfoIgqt4QVGtfvIZJ4lRv5CY4zypbjfjy+eE - M4l4gtuSwYSQ4DS4EZAew/wNiCYQJlvQU3cAAAAASUVORK5CYII= + eHBhY2tldCBlbmQ9InIiPz6GKmpFAAAC+UlEQVRIS63T20vTYRzH8Yforj/Ei24UiSgKIygKi8oyxZQo + cvNYeXaesmzqPGu2POd0ulSsnIdaurTSTJ3O6UxTPGya5vCQx5AuPn39RbHop7nZxQt+z3ie93e/Z4w1 + p7nsCoBt8R6yBF/UHPv+Wb0rfFFzm99CRIwEW1gnqXzxTXxRc0ydctm4OlID2sxrw6iCtiwItC+A2P/D + frLnjwGNSZdMq6N1WOvLwFpP4l/WdRlY6Jaio9Ab7QXba8sVoDHZGdT8PYS9THDqMGnLsKpNw0qXGCua + BO55VZdNQ6U/DRRibVCGb+N1pH5bukoRqHmDHOIG1N8/X2F4I8WyNhtf2+9hqSsZxqZ4upbb6HsSZLHO + Im90ym6hNVcIaktYTexZyUelGEvaHMy/jcFiZxo0xX5Y7ivGcn8JkVmA9uvlWBmqwpJeAWovs+poR99O + eRgWtQWYVUdgrj0FH+i+F3XF3NoappZYGJrEoLaOVYpOOTY/FGJB+xjTqnDMtMTTAC/Ma/Ix/TLUKl9e + x0JfFQpql7PykBP7lWIXzPeUYLIhHCPKCLr/AMy2ZsKoDLTKdNNdvM8TgNpRTBZwfJ885CTmaIChPhwa + mS+GnkdhqjEWY9X+VplqvIMXEhdQ24mZeuSs0N/BNNWWj4k6EdSZHhhXxWH0aSCGFd4c4Tk7zk7XBlUM + FKLToK4Nm+0qYnneRzqGGiSYaIiiyZdhVCdgqFSIwRJPjucZW85O1pvnRmvDkO9zFNTdy2Y6HjGp4HCF + 5kk4xhoiURd/EROv4tBfeM0qAyUC9Mp9QM0+7o829T6LZV0/mNycS6+nFKFWfAGj9ZHozfGwil7miZYH + 7qCmghsw+S6VpV894KuUuKFbfhNNqa749CwY3dm0toK+VABl3HlQM5obYHybwFLc7W1y/Y5BlX6FfgNn + DNcEY0DhZZX+MiGKbh0DNR24AYYWMSfJzc6GZBApwS5skIzNODcg0dV2V36FtsJ7yBJ8UXO8hyzBFzXH + ++H/A/YDv9/V87iOlrYAAAAASUVORK5CYII= @@ -3164,9 +3164,6 @@ 864, 17 - - 864, 17 - iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 diff --git a/Program.cs b/Program.cs index e38f7b8..a76d0d4 100644 --- a/Program.cs +++ b/Program.cs @@ -16,14 +16,14 @@ [STAThread] static void Main() { - ValidateInfo validateInfo = ValidateConfig.LoadConfig(); + ValidateConfig.LoadConfig(); string localConfigPath = Application.StartupPath + "/Config.xml"; //获取程序及版本信息 string currentVersionCode = Assembly.GetExecutingAssembly().GetName().Version.ToString(); //获取文件版本信息 FileVersionInfo.GetVersionInfo(Application.ExecutablePath); - + Utility.SysInfoConfig(); string configUrl = getProgramUrl(localConfigPath, "configurl"); if (configUrl != "") { diff --git a/TreeUtils.cs b/TreeUtils.cs index 1f055b5..ad39643 100644 --- a/TreeUtils.cs +++ b/TreeUtils.cs @@ -19,7 +19,7 @@ public static void InitLayerTree(GSOGlobeControl gsoGlobeControl, TreeView treeView, string viewDatasrc) { // treeView.Nodes.Clear(); - LayerConfig layerConfig = Utility.layerConfig;//layertree所在的配置文件 + LayerConfig layerConfig = Utility.LayerConfig;//layertree所在的配置文件 List datasrcs = layerConfig.datasrcs; foreach (DataSrc datasrc in datasrcs) { diff --git a/FeatureStatisticsService.cs b/FeatureStatisticsService.cs index 331ee47..b127fe3 100644 --- a/FeatureStatisticsService.cs +++ b/FeatureStatisticsService.cs @@ -190,7 +190,7 @@ List result = new List(); //layer.Name是表名 - string[] accessStrs = Utility.getAccStrsByLayer(layer.Name); + string[] accessStrs = FeatureTools.GetAccStrsByLayer(layer.Name); foreach (string accssname in accessStrs) { diff --git a/FeatureTools.cs b/FeatureTools.cs index be4b469..3c08f34 100644 --- a/FeatureTools.cs +++ b/FeatureTools.cs @@ -1,5 +1,6 @@ using System; using System.Collections.Generic; +using System.Data; using System.Linq; using System.Text; using System.Windows.Forms; @@ -43,7 +44,7 @@ } feature.Delete();//地球上删除该feature string sql = "delete from " + layerName + " where LSSYS_ID =" + feature.ID + " and (编号 is null or substr(编号,length(编号)-2)='TMP')"; - OledbHelper.sqlExecuteNonQuery(sql);//目前无法取到LSSYS_ID，所以这个判断条件不太合适，会导致把该类所有新建的都删除了 + OledbHelper.sqlExecuteNonQuery(sql); } catch (Exception) { @@ -106,5 +107,46 @@ } return value; } + + /// + /// 根据附属物图层名字得到里面含有的附属物 + /// + /// + /// + public static string[] GetAccStrsByLayer(string layername) + { + string[] accStrs = null; + string sql = "select 附属物名称 from " + layername + " group by 附属物名称"; + DataSet dataset = OledbHelper.getDataSet(sql, layername); + if (dataset == null) return null; + accStrs = new string[dataset.Tables[0].Rows.Count]; + for (int i = 0; i < dataset.Tables[0].Rows.Count; i++) + { + accStrs[i] = dataset.Tables[0].Rows[i][0].ToString(); + } + return accStrs; + } + + /// + /// 删除内存图层中指定名称的feature + /// + /// + /// + public static void RemoveFeatureFromName(GSOGlobeControl globeControl1, string featureName) + { + GSOFeatures features = globeControl1.Globe.MemoryLayer.GetFeatureByName(featureName, true); + if (features != null) + { + for (int i = features.Length - 1; i >= 0; i--) + { + GSOFeature feature = features[i]; + if (feature != null) + { + globeControl1.Globe.MemoryLayer.RemoveFeatureByID(feature.ID); + } + } + } + globeControl1.Refresh(); + } } } diff --git a/Forms/FrmPipelineModelDataBase.cs b/Forms/FrmPipelineModelDataBase.cs index b577fd8..bc1e479 100644 --- a/Forms/FrmPipelineModelDataBase.cs +++ b/Forms/FrmPipelineModelDataBase.cs @@ -149,7 +149,7 @@ catch (Exception ex) { LogError.PublishError(ex); - LogHelper.WriteLog(typeof(FrmPipelineModelDB), ex.Message); + LogHelper.Error(ex.Message); } } diff --git a/FrmAccessoriesSensor.cs b/FrmAccessoriesSensor.cs index 98aa1cf..542f19a 100644 --- a/FrmAccessoriesSensor.cs +++ b/FrmAccessoriesSensor.cs @@ -240,7 +240,7 @@ { if (clbPipeLine.CheckedItems.Count > 0) { - Utility.RemoveFeatureFromName(globeControl1, "trackPolygon"); + FeatureTools.RemoveFeatureFromName(globeControl1, "trackPolygon"); globeControl1.Globe.Action = EnumAction3D.TrackPolygon; globeControl1.TrackPolygonEndEvent += globeControl1_TrackPolygonEndEvent; } @@ -259,7 +259,7 @@ private void FrmAccessoriesgather_FormClosing(object sender, FormClosingEventArgs e) { frm = null; - Utility.RemoveFeatureFromName(globeControl1, "trackPolygon"); + FeatureTools.RemoveFeatureFromName(globeControl1, "trackPolygon"); globeControl1.Globe.Action = EnumAction3D.ActionNull; globeControl1.TrackPolygonEndEvent -= globeControl1_TrackPolygonEndEvent; } diff --git a/FrmAccessoriesgather.cs b/FrmAccessoriesgather.cs index e1d176e..c36273b 100644 --- a/FrmAccessoriesgather.cs +++ b/FrmAccessoriesgather.cs @@ -118,7 +118,7 @@ { if (clbPipeLine2.Text!="") { - Utility.RemoveFeatureFromName(globeControl1, "trackPolygon"); + FeatureTools.RemoveFeatureFromName(globeControl1, "trackPolygon"); globeControl1.Globe.Action = EnumAction3D.TrackPolygon; globeControl1.Globe.TrackPolygonTool.TrackMode = EnumTrackMode.SpaceTrack; globeControl1.TrackPolygonEndEvent += globeControl1_TrackPolygonEndEvent; @@ -295,7 +295,7 @@ private void FrmAccessoriesgather_FormClosing(object sender, FormClosingEventArgs e) { frm = null; - Utility.RemoveFeatureFromName(globeControl1, "trackPolygon"); + FeatureTools.RemoveFeatureFromName(globeControl1, "trackPolygon"); globeControl1.TrackPolygonEndEvent -= globeControl1_TrackPolygonEndEvent; globeControl1.Globe.Action = EnumAction3D.ActionNull; diff --git a/FrmAddWellShp.cs b/FrmAddWellShp.cs index 7983349..78d8946 100644 --- a/FrmAddWellShp.cs +++ b/FrmAddWellShp.cs @@ -100,7 +100,7 @@ catch (Exception ex) { LogError.PublishError(ex); - LogHelper.WriteLog(typeof(FrmAddWellShp), ex.Message); + LogHelper.Error(ex.Message); } } diff --git a/FrmBSQStatis.cs b/FrmBSQStatis.cs index 5b05926..b5e581d 100644 --- a/FrmBSQStatis.cs +++ b/FrmBSQStatis.cs @@ -97,7 +97,7 @@ } catch (Exception ex) { - LogHelper.WriteLog(typeof(FrmBSQStatis),ex.Message); + LogHelper.Error(ex.Message); } return typeAndCount; } @@ -108,7 +108,7 @@ GSOLayer layer = globeControl1.Globe.Layers.GetLayerByCaption("标识器"); GSOFeatures bsqFs = FeatureStatisticsService.GetLayerFeatures(polygon, layer); if (bsqFs == null || bsqFs.Length <= 0) { - LogHelper.WriteLog(typeof(FrmBSQStatis),"标识器图层下的Feature为空"); + LogHelper.Error("标识器图层下的Feature为空!"); return null; } diff --git a/FrmBasicQuery.cs b/FrmBasicQuery.cs index baeeade..cc8d3ff 100644 --- a/FrmBasicQuery.cs +++ b/FrmBasicQuery.cs @@ -224,7 +224,7 @@ } catch(Exception ex) { - LogHelper.WriteLog(typeof(FrmBasicQuery), ex.Message); + LogHelper.Error(ex.Message); } } else diff --git a/FrmCodingQuery.cs b/FrmCodingQuery.cs index f1ac322..d4ec095 100644 --- a/FrmCodingQuery.cs +++ b/FrmCodingQuery.cs @@ -82,7 +82,7 @@ } catch (Exception ex) { - LogHelper.WriteLog(typeof(FrmCodingQuery), ex.Message); ; + LogHelper.Error(ex.Message); } } diff --git a/FrmDiameterQuery.cs b/FrmDiameterQuery.cs index e7b3657..75d7949 100644 --- a/FrmDiameterQuery.cs +++ b/FrmDiameterQuery.cs @@ -150,7 +150,7 @@ catch (Exception ex) { //LogError.PublishError(ex); - LogHelper.WriteLog(typeof(FrmDiameterQuery), ex.Message); + LogHelper.Error(ex.Message); MessageBox.Show("请输入正确的管径范围！"); return; } diff --git a/FrmFittingQuery.cs b/FrmFittingQuery.cs index 12f6007..8645011 100644 --- a/FrmFittingQuery.cs +++ b/FrmFittingQuery.cs @@ -69,7 +69,7 @@ } catch (Exception ex) { - LogHelper.WriteLog(typeof(FrmFittingQuery), ex.Message); + LogHelper.Error(ex.Message); } } /// diff --git a/FrmKeywordQuery.cs b/FrmKeywordQuery.cs index 405524f..ede0a93 100644 --- a/FrmKeywordQuery.cs +++ b/FrmKeywordQuery.cs @@ -87,7 +87,7 @@ } catch (Exception ex) { - LogHelper.WriteLog(typeof(FrmKeywordQuery), ex.Message); + LogHelper.Error(ex.Message); } } diff --git a/FrmLogin.cs b/FrmLogin.cs index 1172c23..6fbaed9 100644 --- a/FrmLogin.cs +++ b/FrmLogin.cs @@ -2,6 +2,8 @@ using System.Data; using System.Data.OracleClient; using System.IO; +using System.Net; +using System.Text; using System.Windows.Forms; using System.Xml; using DevComponents.DotNetBar; @@ -10,16 +12,15 @@ { public partial class FrmLogin : Office2007Form { + + //登录界面 -- 配置文件的路径 + public static string filename = Application.StartupPath + "\\login.xml"; + + public FrmLogin() { InitializeComponent(); } - public string rolename = "浏览"; - public string username = ""; - public string department = ""; - - //登录界面 -- 配置文件的路径 - public static string filename = Application.StartupPath + "\\login.xml"; /// /// 登录按钮事件处理 /// @@ -28,9 +29,10 @@ private void button1_Click(object sender, EventArgs e) { bool result = ValidateUser(); +// bool result =ValidateFromUrl();//从平台获取用户角色信息，判断是否能登陆成功 if (result) { - username = txtUser.Text.Trim(); + WriteXml(); Utility.userName = txtUser.Text.Trim(); DialogResult = DialogResult.OK; Close(); @@ -43,80 +45,6 @@ } } /// - /// 关闭按钮事件处理 - /// - /// - /// - private void button2_Click(object sender, EventArgs e) - { - Close(); - } - /// - /// 验证端口号 - /// - /// - //private bool ValiPort() - //{ - // Ping p = new Ping();//创建Ping对象p - // PingReply pr = p.Send(Utility.localicenseserverip);//向指定IP或者主机名的计算机发送ICMP协议的ping数据包 - // if (pr.Status == IPStatus.Success)//如果ping成功 - // { - // try - // { - // TcpClient tcpc = new TcpClient(Utility.localicenseserverip, Utility.localicenseserverport);//对IP地址为"192.168.0.105"的计算机的1500端口提出连接申请 - // tcpc.Close(); - // return true; - // } - // catch (Exception ex) - // { - // LogError.PublishError(ex); - // MessageBox.Show("端口连接错误！" + ex.Message); - // return false; - // } - // } - // else - // { - // int times = 0;//重新连接次数; - // int count = 2;//设置尝试次数 - // while (times < count) - // { - // //Thread.Sleep(1000);//等待时间(方便测试的话，你可以改为1000) - // pr = p.Send(Utility.localicenseserverip); - - // if (pr.Status == IPStatus.Success) - // { - // try - // { - // TcpClient tcpc = new TcpClient(Utility.localicenseserverip, Utility.localicenseserverport);//对IP地址为"192.168.0.105"的计算机的1500端口提出连接申请 - // tcpc.Close(); - // return true; - // } - // catch (Exception ex) - // { - // LogError.PublishError(ex); - // MessageBox.Show("端口连接错误！" + ex.Message); - // return false; - // } - // } - // else - // { - // times++; - // if (times < count) - // { - // continue; - // } - // else - // { - // MessageBox.Show("重新尝试连接失败"); - // return false; - // } - // } - - // } - // return false; - // } - //} - /// /// 验证用户名、密码 /// /// @@ -126,24 +54,64 @@ string sql = "select * from casic_userinfotest where USERNAME='" + txtUser.Text.Trim() + "' and PASSWORD='" + passWord + "' and sysname='GHFX' "; DataTable dt = OledbHelper.QueryTable(sql); - if (dt != null && dt.Rows.Count > 0) + if (dt == null || dt.Rows.Count <= 0) return false; + if (String.IsNullOrEmpty(dt.Rows[0]["rid"].ToString())) return true; + sql = "select gid from casic_userroletest where id=" + dt.Rows[0]["rid"] + " and sysname='GHFX' "; + using (OracleDataReader reader = OracleUtils.ExecuteReader(OracleUtils.ConnectionString, CommandType.Text, sql)) { - WriteXML(); - if (!String.IsNullOrEmpty(dt.Rows[0]["rid"].ToString())) + while (reader.Read()) { - sql = "select gid from casic_userroletest where id=" + dt.Rows[0]["rid"] + " and sysname='GHFX' "; - using (OracleDataReader reader = OracleUtils.ExecuteReader(OracleUtils.ConnectionString, CommandType.Text, sql)) - { - while (reader.Read()) - { - Utility.userRole = reader[0].ToString(); - break; - } - } + Utility.userRole = reader[0].ToString(); + LogHelper.Debug("测试一下"); + break; } - return true; } - return false; + return true; + } + + + + private bool ValidateFromUrl() + { + string user = txtUser.Text.Trim(); + string pwd = textBoxPassWord.Text.Trim(); + //做成配置的 + string roleserver = Utility.RoleServer; + if (roleserver == null || roleserver.Trim().Equals("")) + { + MessageBox.Show("请在Config.xml中配置roleurl！"); + return false; + } + HttpWebRequest request = + WebRequest.Create(roleserver+"/rs/authority/user?username=" + user + "&password=" + pwd + "&appId=21") as HttpWebRequest; + if (request == null) return false; + using (HttpWebResponse response = request.GetResponse() as HttpWebResponse) + { + try + { + if (response == null || response.GetResponseStream() == null) return false; + StreamReader reader = new StreamReader(response.GetResponseStream()); + string[] result = reader.ReadToEnd().Split(','); + //解析result + if (result.Length < 5) return false; + StringBuilder userRole = new StringBuilder(""); + for (int i = 4; i < result.Length; i++) + { + string[] tmpStrings = result[i].Split('_'); + if (tmpStrings.Length < 2) continue; + userRole.Append(tmpStrings[1].Trim() + ","); + } + if (userRole.Length < 3) return false; + userRole.Remove(userRole.Length - 3, 3); + // MessageBox.Show(userRole.ToString()); + Utility.userRole = userRole.ToString(); + return Utility.userRole != null && !Utility.userRole.Equals("null"); + } + catch (Exception e) + { + return false; + } + } } private void FrmLogin_Load(object sender, EventArgs e) @@ -153,74 +121,56 @@ StartPosition = FormStartPosition.CenterScreen; - ReadXML(); + ReadXml(); } /// /// 读取上一次登录的用户名和密码 /// - private void ReadXML() + private void ReadXml() { - if (File.Exists(filename)) + if (!File.Exists(filename)) return; + //初始化XML文档操作类 + XmlDocument myDoc = new XmlDocument(); { - if (!File.Exists(filename)) + //加载XML文件 + try { + myDoc.Load(filename); + } + catch (Exception e) + { + LogError.PublishError(e); return; } - - //初始化XML文档操作类 - XmlDocument myDoc = new XmlDocument(); + //搜索指定的节点 + XmlNode serverRootNode = myDoc.SelectSingleNode("Params"); + XmlNodeList nodes = null; + if (serverRootNode != null) { - //加载XML文件 - try + nodes = serverRootNode.ChildNodes; + } + if (nodes == null) return; + foreach (XmlNode xn in nodes) + { + if (xn.Name.Equals("username")) { - myDoc.Load(filename); + txtUser.Text = xn.InnerText.Trim(); } - catch (Exception e) + else if (xn.Name.Equals("password")) { - LogError.PublishError(e); - return; + textBoxPassWord.Text = xn.InnerText.Trim(); } - //搜索指定的节点 - XmlNode serverRootNode = myDoc.SelectSingleNode("Params"); - XmlNodeList nodes = null; - if (serverRootNode != null) + else if (xn.Name.Equals("isremember")) { - nodes = serverRootNode.ChildNodes; - } - if (nodes != null) - { - foreach (XmlNode xn in nodes) - { - if (xn.Name == "username") - { - txtUser.Text = xn.InnerText.Trim(); - } - else if (xn.Name == "password") - { - textBoxPassWord.Text = xn.InnerText.Trim(); - } - else if (xn.Name == "isremember") - { - if (xn.InnerText.Trim() == "true") - { - checkBoxXRememberPassword.Checked = true; - } - else if (xn.InnerText.Trim() == "false") - { - checkBoxXRememberPassword.Checked = false; - } - } - } - + checkBoxXRememberPassword.Checked = xn.InnerText.Trim().Equals("true"); } } } - } /// /// 记录登录的用户名和密码 /// - private void WriteXML() + private void WriteXml() { if (!File.Exists(filename)) { @@ -252,31 +202,17 @@ foreach (XmlNode xn in nodes) { XmlElement xe = (XmlElement)xn; - if (xe.Name == "username") + if (xe.Name.Equals("username")) { xe.InnerText = txtUser.Text.Trim(); } - else if (xe.Name == "password") + else if (xe.Name.Equals("password")) { - if (checkBoxXRememberPassword.Checked) - { - xe.InnerText = textBoxPassWord.Text.Trim(); - } - else - { - xe.InnerText = ""; - } + xe.InnerText = checkBoxXRememberPassword.Checked ? textBoxPassWord.Text.Trim() : ""; } - else if (xe.Name == "isremember") + else if (xe.Name.Equals("isremember")) { - if (checkBoxXRememberPassword.Checked) - { - xe.InnerText = "true"; - } - else - { - xe.InnerText = "false"; - } + xe.InnerText = checkBoxXRememberPassword.Checked ? "true" : "false"; } } } diff --git a/FrmMaterialSel.cs b/FrmMaterialSel.cs index 8645ab3..d23f385 100644 --- a/FrmMaterialSel.cs +++ b/FrmMaterialSel.cs @@ -157,7 +157,7 @@ } catch (Exception ex) { - LogHelper.WriteLog(typeof(FrmMaterialSel), ex.Message); + LogHelper.Error(ex.Message); } } diff --git a/FrmMetadataStat.cs b/FrmMetadataStat.cs index c3c1359..96029a6 100644 --- a/FrmMetadataStat.cs +++ b/FrmMetadataStat.cs @@ -96,7 +96,7 @@ //统计有多少个图层 private int statistLayer() { - List datasrcs = Utility.layerConfig.datasrcs; + List datasrcs = Utility.LayerConfig.datasrcs; return datasrcs.SelectMany(datasrc => datasrc.layertypes).Sum(layerType => layerType.layers.Count); } diff --git a/FrmpipeDeepstatis.cs b/FrmpipeDeepstatis.cs index 6a5c895..8d915a9 100644 --- a/FrmpipeDeepstatis.cs +++ b/FrmpipeDeepstatis.cs @@ -2,6 +2,7 @@ using System.Collections.Generic; using System.Diagnostics; using System.IO; +using System.Reflection; using System.Text; using System.Windows.Forms; using System.Windows.Forms.DataVisualization.Charting; @@ -320,7 +321,7 @@ MessageBox.Show("请添加分段"); return; } - Utility.RemoveFeatureFromName(globeControl1, "trackPolygon"); + FeatureTools.RemoveFeatureFromName(globeControl1, "trackPolygon"); globeControl1.Globe.Action = EnumAction3D.TrackPolygon; globeControl1.Globe.TrackPolygonTool.TrackMode = EnumTrackMode.SpaceTrack; globeControl1.TrackPolygonEndEvent += globeControl1_TrackPolygonEndEvent; @@ -408,12 +409,11 @@ TextBox control; private void dataGridViewX2_EditingControlShowing(object sender, DataGridViewEditingControlShowingEventArgs e) { - if (e.Control.GetType().BaseType.Name == "TextBox") - { - control = new TextBox(); - control = (TextBox)e.Control; - control.KeyPress += control_KeyPress; - } + MemberInfo memberInfo = e.Control.GetType().BaseType; + if (memberInfo != null && !memberInfo.Name.Equals("TextBox")) return; + control = new TextBox(); + control = (TextBox)e.Control; + control.KeyPress += control_KeyPress; } /// /// 键盘按键按下事件处理 @@ -423,28 +423,24 @@ void control_KeyPress(object sender, KeyPressEventArgs e) { TextBox text = sender as TextBox; + if (text == null) return; if ((e.KeyChar < 48 || e.KeyChar > 57) && (e.KeyChar != 8) && e.KeyChar != 46) { e.Handled = true; } - if (e.KeyChar == 46) //小数点 + if (e.KeyChar != 46) return; + if (text.Text.Length <= 0) + e.Handled = true; //小数点不能在第一位 + else //处理不规则的小数点 { - if (text.Text.Length <= 0) - e.Handled = true; //小数点不能在第一位 - else //处理不规则的小数点 + float f; + float oldf; + bool b1 = false, b2 = false; + b1 = float.TryParse(text.Text, out oldf); + b2 = float.TryParse(text.Text + e.KeyChar, out f); + if (!b2) { - float f; - float oldf; - bool b1 = false, b2 = false; - b1 = float.TryParse(text.Text, out oldf); - b2 = float.TryParse(text.Text + e.KeyChar, out f); - if (b2 == false) - { - if (b1) - e.Handled = true; - else - e.Handled = false; - } + e.Handled = b1; } } } @@ -457,7 +453,7 @@ { frm = null; - Utility.RemoveFeatureFromName(globeControl1, "trackPolygon"); + FeatureTools.RemoveFeatureFromName(globeControl1, "trackPolygon"); globeControl1.TrackPolygonEndEvent -= globeControl1_TrackPolygonEndEvent; globeControl1.Globe.Action = EnumAction3D.ActionNull; diff --git a/FrmpipeDiametergather.cs b/FrmpipeDiametergather.cs index a9d96fa..c09aaf1 100644 --- a/FrmpipeDiametergather.cs +++ b/FrmpipeDiametergather.cs @@ -154,7 +154,7 @@ MessageBox.Show("请选择图层！"); return; } - Utility.RemoveFeatureFromName(globeControl1, "trackPolygon"); + FeatureTools.RemoveFeatureFromName(globeControl1, "trackPolygon"); globeControl1.Globe.Action = EnumAction3D.TrackPolygon; globeControl1.Globe.TrackPolygonTool.TrackMode = EnumTrackMode.SpaceTrack; globeControl1.TrackPolygonEndEvent += globeControl1_TrackPolygonEndEvent; @@ -392,7 +392,7 @@ private void FrmpipeDiametergather_FormClosing(object sender, FormClosingEventArgs e) { frm = null; - Utility.RemoveFeatureFromName(globeControl1, "trackPolygon"); + FeatureTools.RemoveFeatureFromName(globeControl1, "trackPolygon"); globeControl1.TrackPolygonEndEvent -= globeControl1_TrackPolygonEndEvent; globeControl1.Globe.Action = EnumAction3D.ActionNull; diff --git a/FrmpipeMaterialGather.cs b/FrmpipeMaterialGather.cs index 44e7f24..5ca8144 100644 --- a/FrmpipeMaterialGather.cs +++ b/FrmpipeMaterialGather.cs @@ -58,10 +58,9 @@ for (int i = 0; i < pipeLayerNames.Count; i++) { clbPipeLine.Items.Add(pipeLayerNames[i]); - GSOLayer layer = globeControl1.Globe.Layers.GetLayerByCaption(pipeLayerNames[i]); - if (layer.Dataset == null || !layer.Dataset.IsFeatureDataset || layer.Type != EnumLayerType.FeatureLayer) continue; + GSOLayer layer = globeControl1.Globe.Layers.GetLayerByCaption(pipeLayerNames[i]); + if (layer == null || layer.Dataset == null || !layer.Dataset.IsFeatureDataset || layer.Type != EnumLayerType.FeatureLayer) continue; - string name = layer.Name; GSOFeatureLayer flayer = layer as GSOFeatureLayer; GSOFeatures feats = flayer.GetAllFeatures(); @@ -205,7 +204,7 @@ { chart1.Series.Add(clbPipeLine.CheckedItems[i].ToString()); GSOLayer layer = globeControl1.Globe.Layers.GetLayerByCaption(clbPipeLine.CheckedItems[i].ToString()); - if (layer != null && layer is GSOFeatureLayer) + if (layer is GSOFeatureLayer) { GSOFeatureLayer flayer = layer as GSOFeatureLayer; GSOFeatures features = flayer.GetAllFeatures(); @@ -240,10 +239,9 @@ labeStyleAxisX.Enabled = true; chart1.ChartAreas["ChartArea1"].AxisX.LabelStyle = labeStyleAxisX; - Dictionary dic1 = new Dictionary(); for (int j = 0; j < chart1.Series.Count; j++) { - dic1 = new Dictionary(); + Dictionary dic1 = new Dictionary(); foreach (string key in dic.Keys) { if (key.Contains(chart1.Series[j].Name)) @@ -304,7 +302,7 @@ MessageBox.Show("请选择材质类型！"); return; } - Utility.RemoveFeatureFromName(globeControl1, "trackPolygon"); + FeatureTools.RemoveFeatureFromName(globeControl1, "trackPolygon"); globeControl1.Globe.Action = EnumAction3D.TrackPolygon; globeControl1.Globe.TrackPolygonTool.TrackMode = EnumTrackMode.SpaceTrack; globeControl1.TrackPolygonEndEvent += globeControl1_TrackPolygonEndEvent; @@ -318,7 +316,7 @@ private void FrmpipeMaterialGather_FormClosing(object sender, FormClosingEventArgs e) { frm = null; - Utility.RemoveFeatureFromName(globeControl1, "trackPolygon"); + FeatureTools.RemoveFeatureFromName(globeControl1, "trackPolygon"); globeControl1.TrackPolygonEndEvent -= globeControl1_TrackPolygonEndEvent; globeControl1.Globe.Action = EnumAction3D.ActionNull; diff --git a/Frmpipediameterstatis.cs b/Frmpipediameterstatis.cs index 4fb25a8..631a996 100644 --- a/Frmpipediameterstatis.cs +++ b/Frmpipediameterstatis.cs @@ -202,8 +202,8 @@ } catch (Exception ex) { - LogHelper.WriteLog(typeof(Frmpipediameterstatis), ex.Message); //MessageBox.Show(ex.Message); + LogHelper.Error(ex.Message); LogError.PublishError(ex); } } @@ -372,7 +372,7 @@ MessageBox.Show("请添加分段！"); return; } - Utility.RemoveFeatureFromName(globeControl1, "trackPolygon"); + FeatureTools.RemoveFeatureFromName(globeControl1, "trackPolygon"); globeControl1.Globe.Action = EnumAction3D.TrackPolygon; globeControl1.Globe.TrackPolygonTool.TrackMode = EnumTrackMode.SpaceTrack; globeControl1.TrackPolygonEndEvent += globeControl1_TrackPolygonEndEvent; @@ -422,7 +422,7 @@ globeControl1.Globe.Action = EnumAction3D.ActionNull; globeControl1.TrackPolygonEndEvent -= globeControl1_TrackPolygonEndEvent; - Utility.RemoveFeatureFromName(globeControl1, "trackPolygon"); + FeatureTools.RemoveFeatureFromName(globeControl1, "trackPolygon"); globeControl1.Globe.MemoryLayer.RemoveAllFeature(); } diff --git a/LineBuilder.cs b/LineBuilder.cs index 33a216c..b6a8516 100644 --- a/LineBuilder.cs +++ b/LineBuilder.cs @@ -43,8 +43,8 @@ GSOGeoPolyline3D lineeee = f.Geometry as GSOGeoPolyline3D; if (lineeee == null || lineeee.GetSpaceLength(true, 6378137) == 0) { - LogHelper.WriteLog(typeof(LineBuilder), "出现数据无法入库:"+f.ID); - continue; //TODO LIST:判断是否会出现部署数据无法入库情况,Log2Net + LogHelper.Error("出现数据无法入库:" + f.ID); + continue; } GSOFeature newFeature = newFeatureSet.CreateFeature(); diff --git a/LogHelper.cs b/LogHelper.cs index 9ef5f27..04573cf 100644 --- a/LogHelper.cs +++ b/LogHelper.cs @@ -1,4 +1,5 @@ using System; +using System.Diagnostics; using log4net; using log4net.Config; @@ -7,35 +8,82 @@ { public class LogHelper { - /// - /// 输出日志到Log4Net - /// - /// - /// - #region static void WriteLog(Type t, Exception ex) - public static void WriteLog(Type t, Exception ex) + private static ILog _logdebug = log4net.LogManager.GetLogger("logdebug"); + private static ILog _loginfo = log4net.LogManager.GetLogger("loginfo"); + private static ILog _logwarn = log4net.LogManager.GetLogger("logwarn"); + private static ILog _logerror = log4net.LogManager.GetLogger("logerror"); + private static ILog _logfatal = log4net.LogManager.GetLogger("logfatal"); + + public static void Debug(string msg) { - ILog log = log4net.LogManager.GetLogger(t); - log.Error("Error", ex); + StackFrame sf = new StackFrame(1); + msg = string.Format("{0}.{1}:{2}", sf.GetMethod().ReflectedType.FullName, sf.GetMethod().Name, msg); + _logdebug.Debug(msg); + } + public static void Debug(string msg, Exception e) + { + StackFrame sf = new StackFrame(1); + msg = string.Format("{0}.{1}:{2}", sf.GetMethod().ReflectedType.FullName, sf.GetMethod().Name, msg); + _logdebug.Debug(msg, e); } - #endregion - /// - /// 输出日志到Log4Net - /// - /// - /// - #region static void WriteLog(Type t, string msg) - - public static void WriteLog(Type t, string msg) + public static void Info(string msg) { - ILog log = log4net.LogManager.GetLogger(t); - log.Error(msg); + StackFrame sf = new StackFrame(1); + msg = string.Format("{0}.{1}:{2}", sf.GetMethod().ReflectedType.FullName, sf.GetMethod().Name, msg); + _loginfo.Info(msg); + } + public static void Info(string msg, Exception e) + { + StackFrame sf = new StackFrame(1); + msg = string.Format("{0}.{1}:{2}", sf.GetMethod().ReflectedType.FullName, sf.GetMethod().Name, msg); + _loginfo.Info(msg, e); } - #endregion + + public static void Warn(string msg) + { + StackFrame sf = new StackFrame(1); + msg = string.Format("{0}.{1}:{2}", sf.GetMethod().ReflectedType.FullName, sf.GetMethod().Name, msg); + _logwarn.Warn(msg); + } + public static void Warn(string msg, Exception e) + { + StackFrame sf = new StackFrame(1); + msg = string.Format("{0}.{1}:{2}", sf.GetMethod().ReflectedType.FullName, sf.GetMethod().Name, msg); + _logwarn.Warn(msg, e); + } + + + public static void Error(string msg) + { + StackFrame sf = new StackFrame(1); + msg = string.Format("{0}.{1}:{2}", sf.GetMethod().ReflectedType.FullName, sf.GetMethod().Name, msg); + _logerror.Error(msg); + } + public static void Error(string msg, Exception e) + { + StackFrame sf = new StackFrame(1); + msg = string.Format("{0}.{1}:{2}", sf.GetMethod().ReflectedType.FullName, sf.GetMethod().Name, msg); + _logerror.Error(msg, e); + } + + + public static void Fatal(string msg) + { + StackFrame sf = new StackFrame(1); + msg = string.Format("{0}.{1}:{2}", sf.GetMethod().ReflectedType.FullName, sf.GetMethod().Name, msg); + _logfatal.Fatal(msg); + } + public static void Fatal(string msg, Exception e) + { + StackFrame sf = new StackFrame(1); + msg = string.Format("{0}.{1}:{2}", sf.GetMethod().ReflectedType.FullName, sf.GetMethod().Name, msg); + _logfatal.Fatal(msg, e); + } + } diff --git a/MainFrm.cs b/MainFrm.cs index 43de664..51f362a 100644 --- a/MainFrm.cs +++ b/MainFrm.cs @@ -18,7 +18,6 @@ using GeoScene.Data; using GeoScene.Engine; using GeoScene.Globe; -using Timer = System.Windows.Forms.Timer; using ToolTip = System.Windows.Forms.ToolTip; namespace Cyberpipe @@ -163,6 +162,7 @@ /// private void AddGZ() { + lendendGZ50 = new GSOHudButton(); lendendGZ50.SetImage(Application.StartupPath + "/Resource/管纵/50.png"); lendendGZ50.SetOffset(0, 0); @@ -1294,18 +1294,19 @@ private void MainFrm_Load(object sender, EventArgs e) { + layerTree.Nodes.Add("正在加载，请稍后……");//树状图加载在图层加载之后，故增加提示 initGlobalControl(); - //initGlobalMap(); - //initLayerTree(); initMarkerTree(); initLayout(); loadData(); - double x = Convert.ToDouble(Utility.Query_Roads["定位"].ToString().Split(',')[0]); - double y = Convert.ToDouble(Utility.Query_Roads["定位"].ToString().Split(',')[1]); - double z = Convert.ToDouble(Utility.Query_Roads["定位"].ToString().Split(',')[2]); + + double x = Convert.ToDouble(Utility.Query_Roads["绿岛"].ToString().Split(',')[0]); + double y = Convert.ToDouble(Utility.Query_Roads["绿岛"].ToString().Split(',')[1]); + double z = Convert.ToDouble(Utility.Query_Roads["绿岛"].ToString().Split(',')[2]); jumpToCameraState(x, y, z); + } #endregion @@ -1315,11 +1316,17 @@ if (e.Layer == null || !e.Layer.Caption.Equals(Utility.roadLayerName)) return; foreach (TreeNode layerTreeNode in layerTree.Nodes) { - foreach (TreeNode node in layerTreeNode.Nodes) + for (int i=0;i dt, DataGridView dataGridView) @@ -7330,7 +7337,7 @@ } catch (Exception ex) { - LogHelper.WriteLog(typeof(MainFrm), ex); + LogHelper.Debug("", ex); } } } @@ -7362,7 +7369,7 @@ GSOLayer layer = globeControl1.Globe.Layers.Add(strDataPath); if (layer == null) {//wxl - LogHelper.WriteLog(typeof(MainFrm), "buttonItemHX1_Click操作中，" + strDataPath + "的layer为空"); + LogHelper.Error("buttonItemHX1_Click操作中，" + strDataPath + "的layer为空"); continue; } GSOFeatures redFeatures = layer.GetAllFeatures(); @@ -7457,17 +7464,12 @@ { try { + globeControl1.BeforeSceneRenderEvent -= globeControl1_BeforeSceneRenderEvent; globeControl2.BeforeSceneRenderEvent -= globeControl2_BeforeSceneRenderEvent; - double x = Convert.ToDouble(Utility.Query_Roads["定位"].ToString().Split(',')[0]); - double y = Convert.ToDouble(Utility.Query_Roads["定位"].ToString().Split(',')[1]); - double z = Convert.ToDouble(Utility.Query_Roads["定位"].ToString().Split(',')[2]); - jumpToCameraState(x, y, z); - /* globeControl1.Globe.FlyToPosition(new GSOPoint3d(120.610963, 31.188121, 50), EnumAltitudeMode.Absolute, -4, 50, 800); globeControl1.Globe.FlyToPointSpeed = 10000000; - * */ globeControl1.Globe.Action = EnumAction3D.SelectObject; globeControl1.Refresh(); @@ -7489,6 +7491,37 @@ } } /// + /// 基础工具 + /// + /// + /// + private void ribbonTabItem1_MouseDown(object sender, MouseEventArgs e) + { + try + { + + globeControl1.BeforeSceneRenderEvent -= globeControl1_BeforeSceneRenderEvent; + globeControl2.BeforeSceneRenderEvent -= globeControl2_BeforeSceneRenderEvent; + + globeControl1.Globe.Action = EnumAction3D.ActionNull; + dataGridViewX1.AutoSizeColumnsMode = DataGridViewAutoSizeColumnsMode.AllCells; + //zhanshi = false; + redSH = false; + splitContainer1.Panel2Collapsed = true; + panelOfTable.Visible = false; + legendSC.Visible = false; + legendSG.Visible = false; + ClearGZData(); + GSOLayer redLayer = globeControl1.Globe.Layers.GetLayerByCaption("红线"); + if (redLayer == null) return; + redLayer.Visible = false; + } + catch (Exception ex) + { + //MessageBox.Show("系统运行错误:" + ex.ToString(), "错误", MessageBoxButtons.OK, MessageBoxIcon.Error); + } + } + /// /// 一键审核 /// /// @@ -7497,6 +7530,7 @@ { try { + globeControl1.BeforeSceneRenderEvent -= globeControl1_BeforeSceneRenderEvent; globeControl2.BeforeSceneRenderEvent -= globeControl2_BeforeSceneRenderEvent; @@ -7518,32 +7552,7 @@ //MessageBox.Show("系统运行错误:" + ex.ToString(), "错误", MessageBoxButtons.OK, MessageBoxIcon.Error); } } - - void ResetRibbonTab() - { - try - { - globeControl1.BeforeSceneRenderEvent -= globeControl1_BeforeSceneRenderEvent; - globeControl2.BeforeSceneRenderEvent -= globeControl2_BeforeSceneRenderEvent; - - globeControl1.Globe.Action = EnumAction3D.ActionNull; - dataGridViewX1.AutoSizeColumnsMode = DataGridViewAutoSizeColumnsMode.AllCells; - //zhanshi = false; - redSH = false; - splitContainer1.Panel2Collapsed = true; - panelOfTable.Visible = false; - legendSC.Visible = false; - legendSG.Visible = false; - ClearGZData(); - GSOLayer redLayer = globeControl1.Globe.Layers.GetLayerByCaption("红线"); - if (redLayer == null) return; - redLayer.Visible = false; - } - catch (Exception ex) - { - LogHelper.WriteLog(typeof(MainFrm), ex); - } - } + /// /// 双屏对比 /// @@ -7553,8 +7562,8 @@ { try { - globeControl1.BeforeSceneRenderEvent += new BeforeSceneRenderEventHandler(globeControl1_BeforeSceneRenderEvent); - globeControl2.BeforeSceneRenderEvent += new BeforeSceneRenderEventHandler(globeControl2_BeforeSceneRenderEvent); + globeControl1.BeforeSceneRenderEvent += globeControl1_BeforeSceneRenderEvent; + globeControl2.BeforeSceneRenderEvent += globeControl2_BeforeSceneRenderEvent; globeControl1.Globe.Action = EnumAction3D.ActionNull; panelOfTable.Visible = false; @@ -7570,32 +7579,43 @@ GSOLayer redLayer = globeControl1.Globe.Layers.GetLayerByCaption("红线"); if (redLayer != null) - { redLayer.Visible = false; - } } catch (Exception ex) { - LogHelper.WriteLog(typeof(MainFrm), ex); + //MessageBox.Show("系统运行错误:" + ex.ToString(), "错误", MessageBoxButtons.OK, MessageBoxIcon.Error); } } /// - /// 基础工具 - /// - /// - /// - private void ribbonTabItem1_MouseDown(object sender, MouseEventArgs e) - { - ResetRibbonTab(); - } - /// /// 文档管理 /// /// /// private void ribbonTabItem4_MouseDown(object sender, MouseEventArgs e) { - ResetRibbonTab(); + try + { + + globeControl1.BeforeSceneRenderEvent -= globeControl1_BeforeSceneRenderEvent; + globeControl2.BeforeSceneRenderEvent -= globeControl2_BeforeSceneRenderEvent; + + globeControl1.Globe.Action = EnumAction3D.ActionNull; + panelOfTable.Visible = false; + //zhanshi = false; + redSH = false; + splitContainer1.Panel2Collapsed = true; + dataGridViewX1.AutoSizeColumnsMode = DataGridViewAutoSizeColumnsMode.AllCells; + legendSC.Visible = false; + legendSG.Visible = false; + ClearGZData(); + GSOLayer redLayer = globeControl1.Globe.Layers.GetLayerByCaption("红线"); + if (redLayer != null) + redLayer.Visible = false; + } + catch (Exception ex) + { + //MessageBox.Show("系统运行错误:" + ex.ToString(), "错误", MessageBoxButtons.OK, MessageBoxIcon.Error); + } } /// /// 基础管理 @@ -7604,7 +7624,29 @@ /// private void ribbonTabItem14_MouseDown(object sender, MouseEventArgs e) { - ResetRibbonTab(); + try + { + globeControl1.BeforeSceneRenderEvent -= globeControl1_BeforeSceneRenderEvent; + globeControl2.BeforeSceneRenderEvent -= globeControl2_BeforeSceneRenderEvent; + + globeControl1.Globe.Action = EnumAction3D.ActionNull; + panelOfTable.Visible = false; + //zhanshi = false; + redSH = false; + splitContainer1.Panel2Collapsed = true; + dataGridViewX1.AutoSizeColumnsMode = DataGridViewAutoSizeColumnsMode.AllCells; + legendSC.Visible = false; + legendSG.Visible = false; + ClearGZData(); + + GSOLayer redLayer = globeControl1.Globe.Layers.GetLayerByCaption("红线"); + if (redLayer != null) + redLayer.Visible = false; + } + catch (Exception ex) + { + //MessageBox.Show("系统运行错误:" + ex.ToString(), "错误", MessageBoxButtons.OK, MessageBoxIcon.Error); + } } /// /// 权限管理 @@ -7613,26 +7655,31 @@ /// private void ribbonTabItem2_MouseDown(object sender, MouseEventArgs e) { - ResetRibbonTab(); + try + { + globeControl1.BeforeSceneRenderEvent -= globeControl1_BeforeSceneRenderEvent; + globeControl2.BeforeSceneRenderEvent -= globeControl2_BeforeSceneRenderEvent; + + globeControl1.Globe.Action = EnumAction3D.ActionNull; + panelOfTable.Visible = false; + //zhanshi = false; + redSH = false; + splitContainer1.Panel2Collapsed = true; + dataGridViewX1.AutoSizeColumnsMode = DataGridViewAutoSizeColumnsMode.AllCells; + legendSC.Visible = false; + legendSG.Visible = false; + ClearGZData(); + + GSOLayer redLayer = globeControl1.Globe.Layers.GetLayerByCaption("红线"); + if (redLayer == null) return; + redLayer.Visible = false; + } + catch (Exception ex) + { + //MessageBox.Show("系统运行错误:" + ex.ToString(), "错误", MessageBoxButtons.OK, MessageBoxIcon.Error); + } } - /// - /// 管线定位 - /// - /// - /// - private void ribbonTabItem7_MouseDown(object sender, MouseEventArgs e) - { - ResetRibbonTab(); - } - /// - /// 标识器管理 - /// - /// - /// - private void ribbonTabItem5_MouseDown(object sender, MouseEventArgs e) - { - ResetRibbonTab(); - } + //GSOFeature dpFeatuer = null; /// /// 双屏分析，点击管段分析 @@ -8017,7 +8064,9 @@ private void btn_flag_Click(object sender, EventArgs e) { if (FrmFlagManagers.IS_OPEN) + { return; + } FrmFlagManagers frm = new FrmFlagManagers(globeControl1); frm.Show(this); } diff --git a/MainFrm.designer.cs b/MainFrm.designer.cs index e3dca41..73398c0 100644 --- a/MainFrm.designer.cs +++ b/MainFrm.designer.cs @@ -4,6 +4,7 @@ using DevComponents.DotNetBar; using DevComponents.DotNetBar.Controls; using DevComponents.Editors; +using System.Drawing; namespace Cyberpipe { @@ -89,6 +90,7 @@ this.sideBar1 = new DevComponents.DotNetBar.SideBar(); this.panelEx3 = new DevComponents.DotNetBar.PanelEx(); this.layerSensorTree = new System.Windows.Forms.TreeView(); + this.layerTree = new Cyberpipe.MyTreeView(); this.sideBarPanelItem3 = new DevComponents.DotNetBar.SideBarPanelItem(); this.controlContainerItem3 = new DevComponents.DotNetBar.ControlContainerItem(); this.sideBarPanelItem4 = new DevComponents.DotNetBar.SideBarPanelItem(); @@ -243,42 +245,18 @@ this.保存ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.定位ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.ribbonControl1 = new DevComponents.DotNetBar.RibbonControl(); - this.ribbonPanel6 = new DevComponents.DotNetBar.RibbonPanel(); - this.ribbonBar6 = new DevComponents.DotNetBar.RibbonBar(); - this.buttonItemSPSZ = new DevComponents.DotNetBar.ButtonItem(); - this.buttonItem8 = new DevComponents.DotNetBar.ButtonItem(); - this.buttonItemLocation = new DevComponents.DotNetBar.ButtonItem(); - this.sliderItem2 = new DevComponents.DotNetBar.SliderItem(); - this.buttonItemGBJC = new DevComponents.DotNetBar.ButtonItem(); - this.ribbonPanel5 = new DevComponents.DotNetBar.RibbonPanel(); - this.ribbonBar2 = new DevComponents.DotNetBar.RibbonBar(); - this.buttonItemHX1 = new DevComponents.DotNetBar.ButtonItem(); - this.buttonItemHX2 = new DevComponents.DotNetBar.ButtonItem(); - this.buttonItemDCTP = new DevComponents.DotNetBar.ButtonItem(); - this.sliderItem3 = new DevComponents.DotNetBar.SliderItem(); - this.ribbonPanel1 = new DevComponents.DotNetBar.RibbonPanel(); - this.ribbonBar21 = new DevComponents.DotNetBar.RibbonBar(); - this.buttonItem87 = new DevComponents.DotNetBar.ButtonItem(); - this.buttonItem88 = new DevComponents.DotNetBar.ButtonItem(); - this.buttonItem27 = new DevComponents.DotNetBar.ButtonItem(); - this.buttonItem91 = new DevComponents.DotNetBar.ButtonItem(); - this.buttonItem1 = new DevComponents.DotNetBar.ButtonItem(); - this.btnlegendSet = new DevComponents.DotNetBar.ButtonItem(); - this.buttonItem89 = new DevComponents.DotNetBar.ButtonItem(); - this.btnOutputJPG = new DevComponents.DotNetBar.ButtonItem(); - this.ribbonPanel12 = new DevComponents.DotNetBar.RibbonPanel(); - this.ribbonBar18 = new DevComponents.DotNetBar.RibbonBar(); - this.buttonItem133 = new DevComponents.DotNetBar.ButtonItem(); - this.ribbonBar13 = new DevComponents.DotNetBar.RibbonBar(); - this.buttonItem127 = new DevComponents.DotNetBar.ButtonItem(); - this.buttonItem128 = new DevComponents.DotNetBar.ButtonItem(); - this.sliderItem1 = new DevComponents.DotNetBar.SliderItem(); - this.buttonItem134 = new DevComponents.DotNetBar.ButtonItem(); - this.buttonItem130 = new DevComponents.DotNetBar.ButtonItem(); - this.btn_check_history = new DevComponents.DotNetBar.ButtonItem(); - this.ribbonPanel4 = new DevComponents.DotNetBar.RibbonPanel(); - this.ribbonBar1 = new DevComponents.DotNetBar.RibbonBar(); - this.btn_document_info = new DevComponents.DotNetBar.ButtonItem(); + this.ribbonPanel3 = new DevComponents.DotNetBar.RibbonPanel(); + this.ribbonBar4 = new DevComponents.DotNetBar.RibbonBar(); + this.btn_flag = new DevComponents.DotNetBar.ButtonItem(); + this.slider4ground = new DevComponents.DotNetBar.SliderItem(); + this.ribbonPanel7 = new DevComponents.DotNetBar.RibbonPanel(); + this.gxdw_ribbonbar = new DevComponents.DotNetBar.RibbonBar(); + this.buttonItem9 = new DevComponents.DotNetBar.ButtonItem(); + this.buttonItem10 = new DevComponents.DotNetBar.ButtonItem(); + this.buttonItem11 = new DevComponents.DotNetBar.ButtonItem(); + this.buttonItem12 = new DevComponents.DotNetBar.ButtonItem(); + this.buttonItem13 = new DevComponents.DotNetBar.ButtonItem(); + this.buttonItem14 = new DevComponents.DotNetBar.ButtonItem(); this.ribbonPanel15 = new DevComponents.DotNetBar.RibbonPanel(); this.ribbonBar20 = new DevComponents.DotNetBar.RibbonBar(); this.buttonItemSH = new DevComponents.DotNetBar.ButtonItem(); @@ -334,18 +312,6 @@ this.buttonItemXT4 = new DevComponents.DotNetBar.ButtonItem(); this.buttonItemXT4_1 = new DevComponents.DotNetBar.ButtonItem(); this.buttonItemXT4_2 = new DevComponents.DotNetBar.ButtonItem(); - this.ribbonPanel3 = new DevComponents.DotNetBar.RibbonPanel(); - this.ribbonBar4 = new DevComponents.DotNetBar.RibbonBar(); - this.btn_flag = new DevComponents.DotNetBar.ButtonItem(); - this.slider4ground = new DevComponents.DotNetBar.SliderItem(); - this.ribbonPanel7 = new DevComponents.DotNetBar.RibbonPanel(); - this.gxdw_ribbonbar = new DevComponents.DotNetBar.RibbonBar(); - this.buttonItem9 = new DevComponents.DotNetBar.ButtonItem(); - this.buttonItem10 = new DevComponents.DotNetBar.ButtonItem(); - this.buttonItem11 = new DevComponents.DotNetBar.ButtonItem(); - this.buttonItem12 = new DevComponents.DotNetBar.ButtonItem(); - this.buttonItem13 = new DevComponents.DotNetBar.ButtonItem(); - this.buttonItem14 = new DevComponents.DotNetBar.ButtonItem(); this.ribbonPanel2 = new DevComponents.DotNetBar.RibbonPanel(); this.ribbonBar3 = new DevComponents.DotNetBar.RibbonBar(); this.btn_user_info = new DevComponents.DotNetBar.ButtonItem(); @@ -355,6 +321,43 @@ this.btn_user_role = new DevComponents.DotNetBar.ButtonItem(); this.btn_password_edit = new DevComponents.DotNetBar.ButtonItem(); this.buttonItemPasswordReset = new DevComponents.DotNetBar.ButtonItem(); + this.ribbonPanel6 = new DevComponents.DotNetBar.RibbonPanel(); + this.ribbonBar6 = new DevComponents.DotNetBar.RibbonBar(); + this.buttonItemSPSZ = new DevComponents.DotNetBar.ButtonItem(); + this.buttonItem8 = new DevComponents.DotNetBar.ButtonItem(); + this.buttonItemLocation = new DevComponents.DotNetBar.ButtonItem(); + this.sliderItem2 = new DevComponents.DotNetBar.SliderItem(); + this.buttonItemGBJC = new DevComponents.DotNetBar.ButtonItem(); + this.ribbonPanel5 = new DevComponents.DotNetBar.RibbonPanel(); + this.ribbonBar2 = new DevComponents.DotNetBar.RibbonBar(); + this.buttonItemHX1 = new DevComponents.DotNetBar.ButtonItem(); + this.buttonItemHX2 = new DevComponents.DotNetBar.ButtonItem(); + this.buttonItemDCTP = new DevComponents.DotNetBar.ButtonItem(); + this.sliderItem3 = new DevComponents.DotNetBar.SliderItem(); + this.ribbonPanel1 = new DevComponents.DotNetBar.RibbonPanel(); + this.ribbonBar21 = new DevComponents.DotNetBar.RibbonBar(); + this.buttonItem87 = new DevComponents.DotNetBar.ButtonItem(); + this.buttonItem88 = new DevComponents.DotNetBar.ButtonItem(); + this.buttonItem27 = new DevComponents.DotNetBar.ButtonItem(); + this.buttonItem91 = new DevComponents.DotNetBar.ButtonItem(); + this.buttonItem1 = new DevComponents.DotNetBar.ButtonItem(); + this.btnlegendSet = new DevComponents.DotNetBar.ButtonItem(); + this.buttonItem89 = new DevComponents.DotNetBar.ButtonItem(); + this.btnOutputJPG = new DevComponents.DotNetBar.ButtonItem(); + this.ribbonPanel12 = new DevComponents.DotNetBar.RibbonPanel(); + this.ribbonBar18 = new DevComponents.DotNetBar.RibbonBar(); + this.buttonItem133 = new DevComponents.DotNetBar.ButtonItem(); + this.buttonItem132 = new DevComponents.DotNetBar.ButtonItem(); + this.ribbonBar13 = new DevComponents.DotNetBar.RibbonBar(); + this.buttonItem127 = new DevComponents.DotNetBar.ButtonItem(); + this.buttonItem128 = new DevComponents.DotNetBar.ButtonItem(); + this.sliderItem1 = new DevComponents.DotNetBar.SliderItem(); + this.buttonItem134 = new DevComponents.DotNetBar.ButtonItem(); + this.buttonItem130 = new DevComponents.DotNetBar.ButtonItem(); + this.btn_check_history = new DevComponents.DotNetBar.ButtonItem(); + this.ribbonPanel4 = new DevComponents.DotNetBar.RibbonPanel(); + this.ribbonBar1 = new DevComponents.DotNetBar.RibbonBar(); + this.btn_document_info = new DevComponents.DotNetBar.ButtonItem(); this.ribbonTabItem1 = new DevComponents.DotNetBar.RibbonTabItem(); this.ribbonTabItem11 = new DevComponents.DotNetBar.RibbonTabItem(); this.ribbonTabItem6 = new DevComponents.DotNetBar.RibbonTabItem(); @@ -516,7 +519,6 @@ this.labelX17 = new DevComponents.DotNetBar.LabelX(); this.panelEx4 = new DevComponents.DotNetBar.PanelEx(); this.pictureBox1 = new System.Windows.Forms.PictureBox(); - this.layerTree = new Cyberpipe.MyTreeView(); this.statusStrip1.SuspendLayout(); this.sideBar1.SuspendLayout(); this.panelEx3.SuspendLayout(); @@ -527,15 +529,15 @@ this.contextMenuStrip3.SuspendLayout(); this.contextMenuStripDeleteLayerNode.SuspendLayout(); this.ribbonControl1.SuspendLayout(); + this.ribbonPanel3.SuspendLayout(); + this.ribbonPanel7.SuspendLayout(); + this.ribbonPanel15.SuspendLayout(); + this.ribbonPanel2.SuspendLayout(); this.ribbonPanel6.SuspendLayout(); this.ribbonPanel5.SuspendLayout(); this.ribbonPanel1.SuspendLayout(); this.ribbonPanel12.SuspendLayout(); this.ribbonPanel4.SuspendLayout(); - this.ribbonPanel15.SuspendLayout(); - this.ribbonPanel3.SuspendLayout(); - this.ribbonPanel7.SuspendLayout(); - this.ribbonPanel2.SuspendLayout(); this.panelOfTable.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.dataGridViewX1)).BeginInit(); this.statusStrip2.SuspendLayout(); @@ -711,7 +713,8 @@ this.statusLabel.Name = "statusLabel"; this.statusLabel.Size = new System.Drawing.Size(1313, 17); this.statusLabel.Spring = true; - this.statusLabel.Text = " ©2014-2015 苏州航天系统工程有限公司 版权所有"; + this.statusLabel.Text = Utility.Copyright; +// this.statusLabel.Text = " ©2014-2015 苏州航天系统工程有限公司 版权所有"; // // toolStripDropDownButton1 // @@ -956,6 +959,18 @@ this.layerSensorTree.NodeMouseClick += new System.Windows.Forms.TreeNodeMouseClickEventHandler(this.layerMarkerTree_NodeMouseClick); this.layerSensorTree.NodeMouseDoubleClick += new System.Windows.Forms.TreeNodeMouseClickEventHandler(this.layerTree_NodeMouseDoubleClick); // + // layerTree + // + this.layerTree.CheckBoxes = true; + this.layerTree.ItemHeight = 18; + this.layerTree.Location = new System.Drawing.Point(30, 78); + this.layerTree.Name = "layerTree"; + this.layerTree.Size = new System.Drawing.Size(121, 97); + this.layerTree.TabIndex = 1; + this.layerTree.AfterCheck += new System.Windows.Forms.TreeViewEventHandler(this.layerTree_AfterCheck); + this.layerTree.NodeMouseClick += new System.Windows.Forms.TreeNodeMouseClickEventHandler(this.layerTree_NodeMouseClick); + this.layerTree.NodeMouseDoubleClick += new System.Windows.Forms.TreeNodeMouseClickEventHandler(this.layerTree_NodeMouseDoubleClick); + // // sideBarPanelItem3 // this.sideBarPanelItem3.FontBold = true; @@ -2150,13 +2165,13 @@ this.ribbonControl1.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.ribbonControl1.Controls.Add(this.ribbonPanel3); this.ribbonControl1.Controls.Add(this.ribbonPanel7); - this.ribbonControl1.Controls.Add(this.ribbonPanel2); this.ribbonControl1.Controls.Add(this.ribbonPanel15); - this.ribbonControl1.Controls.Add(this.ribbonPanel4); - this.ribbonControl1.Controls.Add(this.ribbonPanel1); + this.ribbonControl1.Controls.Add(this.ribbonPanel2); this.ribbonControl1.Controls.Add(this.ribbonPanel6); - this.ribbonControl1.Controls.Add(this.ribbonPanel12); this.ribbonControl1.Controls.Add(this.ribbonPanel5); + this.ribbonControl1.Controls.Add(this.ribbonPanel1); + this.ribbonControl1.Controls.Add(this.ribbonPanel12); + this.ribbonControl1.Controls.Add(this.ribbonPanel4); this.ribbonControl1.Dock = System.Windows.Forms.DockStyle.Top; this.ribbonControl1.ImeMode = System.Windows.Forms.ImeMode.NoControl; this.ribbonControl1.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { @@ -2200,609 +2215,216 @@ this.ribbonControl1.Text = "ribbonControl1"; this.ribbonControl1.UseCustomizeDialog = false; // - // ribbonPanel6 + // ribbonPanel3 // - this.ribbonPanel6.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.ribbonPanel6.Controls.Add(this.ribbonBar6); - this.ribbonPanel6.Dock = System.Windows.Forms.DockStyle.Fill; - this.ribbonPanel6.Location = new System.Drawing.Point(0, 0); - this.ribbonPanel6.Name = "ribbonPanel6"; - this.ribbonPanel6.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); - this.ribbonPanel6.Size = new System.Drawing.Size(1328, 95); + this.ribbonPanel3.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.ribbonPanel3.Controls.Add(this.ribbonBar4); + this.ribbonPanel3.Dock = System.Windows.Forms.DockStyle.Fill; + this.ribbonPanel3.Location = new System.Drawing.Point(0, 33); + this.ribbonPanel3.Name = "ribbonPanel3"; + this.ribbonPanel3.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); + this.ribbonPanel3.Size = new System.Drawing.Size(1328, 62); // // // - this.ribbonPanel6.Style.Class = ""; - this.ribbonPanel6.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonPanel3.Style.Class = ""; + this.ribbonPanel3.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; // // // - this.ribbonPanel6.StyleMouseDown.Class = ""; - this.ribbonPanel6.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonPanel3.StyleMouseDown.Class = ""; + this.ribbonPanel3.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; // // // - this.ribbonPanel6.StyleMouseOver.Class = ""; - this.ribbonPanel6.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonPanel6.TabIndex = 38; - this.ribbonPanel6.Visible = false; + this.ribbonPanel3.StyleMouseOver.Class = ""; + this.ribbonPanel3.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonPanel3.TabIndex = 40; // - // ribbonBar6 + // ribbonBar4 // - this.ribbonBar6.AutoOverflowEnabled = true; + this.ribbonBar4.AutoOverflowEnabled = true; // // // - this.ribbonBar6.BackgroundMouseOverStyle.Class = ""; - this.ribbonBar6.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar4.BackgroundMouseOverStyle.Class = ""; + this.ribbonBar4.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; // // // - this.ribbonBar6.BackgroundStyle.Class = ""; - this.ribbonBar6.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonBar6.ContainerControlProcessDialogKey = true; - this.ribbonBar6.Dock = System.Windows.Forms.DockStyle.Left; - this.ribbonBar6.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { - this.buttonItemSPSZ, - this.buttonItem8, - this.buttonItemLocation, - this.sliderItem2, - this.buttonItemGBJC}); - this.ribbonBar6.Location = new System.Drawing.Point(3, 0); - this.ribbonBar6.Name = "ribbonBar6"; - this.ribbonBar6.Size = new System.Drawing.Size(427, 92); - this.ribbonBar6.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.ribbonBar6.TabIndex = 0; + this.ribbonBar4.BackgroundStyle.Class = ""; + this.ribbonBar4.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar4.ContainerControlProcessDialogKey = true; + this.ribbonBar4.Dock = System.Windows.Forms.DockStyle.Left; + this.ribbonBar4.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { + this.btn_flag, + this.slider4ground}); + this.ribbonBar4.Location = new System.Drawing.Point(3, 0); + this.ribbonBar4.Name = "ribbonBar4"; + this.ribbonBar4.Size = new System.Drawing.Size(634, 59); + this.ribbonBar4.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.ribbonBar4.TabIndex = 0; // // // - this.ribbonBar6.TitleStyle.Class = ""; - this.ribbonBar6.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar4.TitleStyle.Class = ""; + this.ribbonBar4.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; // // // - this.ribbonBar6.TitleStyleMouseOver.Class = ""; - this.ribbonBar6.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonBar6.TitleVisible = false; + this.ribbonBar4.TitleStyleMouseOver.Class = ""; + this.ribbonBar4.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar4.TitleVisible = false; // - // buttonItemSPSZ + // btn_flag // - this.buttonItemSPSZ.Image = ((System.Drawing.Image)(resources.GetObject("buttonItemSPSZ.Image"))); - this.buttonItemSPSZ.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItemSPSZ.Name = "buttonItemSPSZ"; - this.buttonItemSPSZ.SubItemsExpandWidth = 14; - this.buttonItemSPSZ.Text = "双屏设置"; - this.buttonItemSPSZ.Click += new System.EventHandler(this.buttonItemSPSZ_Click); + this.btn_flag.Image = global::Cyberpipe.Properties.Resources._24x24icon_03_hover; + this.btn_flag.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.btn_flag.Name = "btn_flag"; + this.btn_flag.SubItemsExpandWidth = 14; + this.btn_flag.Text = "标识器管理"; + this.btn_flag.Click += new System.EventHandler(this.btn_flag_Click); // - // buttonItem8 + // slider4ground // - this.buttonItem8.Image = ((System.Drawing.Image)(resources.GetObject("buttonItem8.Image"))); - this.buttonItem8.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem8.Name = "buttonItem8"; - this.buttonItem8.SubItemsExpandWidth = 14; - this.buttonItem8.Text = "双屏分析"; - this.buttonItem8.Click += new System.EventHandler(this.buttonItem8_Click); + this.slider4ground.LabelPosition = DevComponents.DotNetBar.eSliderLabelPosition.Top; + this.slider4ground.LabelWidth = 50; + this.slider4ground.Name = "slider4ground"; + this.slider4ground.Text = "地面透明度"; + this.slider4ground.TextColor = System.Drawing.Color.Black; + this.slider4ground.Value = 0; + this.slider4ground.ValueChanged += new System.EventHandler(this.slider4ground_ValueChanged); // - // buttonItemLocation + // ribbonPanel7 // - this.buttonItemLocation.Image = ((System.Drawing.Image)(resources.GetObject("buttonItemLocation.Image"))); - this.buttonItemLocation.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItemLocation.Name = "buttonItemLocation"; - this.buttonItemLocation.SubItemsExpandWidth = 14; - this.buttonItemLocation.Text = "快速定位"; - this.buttonItemLocation.Click += new System.EventHandler(this.buttonItemLocation_Click); + this.ribbonPanel7.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.ribbonPanel7.Controls.Add(this.gxdw_ribbonbar); + this.ribbonPanel7.Dock = System.Windows.Forms.DockStyle.Fill; + this.ribbonPanel7.Location = new System.Drawing.Point(0, 33); + this.ribbonPanel7.Name = "ribbonPanel7"; + this.ribbonPanel7.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); + this.ribbonPanel7.Size = new System.Drawing.Size(1328, 62); // - // sliderItem2 // - this.sliderItem2.LabelPosition = DevComponents.DotNetBar.eSliderLabelPosition.Top; - this.sliderItem2.LabelWidth = 50; - this.sliderItem2.Name = "sliderItem2"; - this.sliderItem2.Text = "地面透明度"; - this.sliderItem2.TextColor = System.Drawing.Color.Black; - this.sliderItem2.Value = 0; - this.sliderItem2.ValueChanged += new System.EventHandler(this.sliderItem2_ValueChanged); // - // buttonItemGBJC + this.ribbonPanel7.Style.Class = ""; + this.ribbonPanel7.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; // - this.buttonItemGBJC.Image = ((System.Drawing.Image)(resources.GetObject("buttonItemGBJC.Image"))); - this.buttonItemGBJC.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItemGBJC.Name = "buttonItemGBJC"; - this.buttonItemGBJC.SubItemsExpandWidth = 14; - this.buttonItemGBJC.Text = "国标检测"; - this.buttonItemGBJC.Click += new System.EventHandler(this.buttonItemGBJC_Click); // - // ribbonPanel5 // - this.ribbonPanel5.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.ribbonPanel5.Controls.Add(this.ribbonBar2); - this.ribbonPanel5.Dock = System.Windows.Forms.DockStyle.Fill; - this.ribbonPanel5.Location = new System.Drawing.Point(0, 0); - this.ribbonPanel5.Name = "ribbonPanel5"; - this.ribbonPanel5.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); - this.ribbonPanel5.Size = new System.Drawing.Size(1328, 95); + this.ribbonPanel7.StyleMouseDown.Class = ""; + this.ribbonPanel7.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; // // // - this.ribbonPanel5.Style.Class = ""; - this.ribbonPanel5.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonPanel7.StyleMouseOver.Class = ""; + this.ribbonPanel7.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonPanel7.TabIndex = 41; + this.ribbonPanel7.Visible = false; // + // gxdw_ribbonbar // + this.gxdw_ribbonbar.AutoOverflowEnabled = true; // - this.ribbonPanel5.StyleMouseDown.Class = ""; - this.ribbonPanel5.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; // // + this.gxdw_ribbonbar.BackgroundMouseOverStyle.Class = ""; + this.gxdw_ribbonbar.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; // - this.ribbonPanel5.StyleMouseOver.Class = ""; - this.ribbonPanel5.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonPanel5.TabIndex = 37; - this.ribbonPanel5.Visible = false; // - // ribbonBar2 // - this.ribbonBar2.AutoOverflowEnabled = true; + this.gxdw_ribbonbar.BackgroundStyle.Class = ""; + this.gxdw_ribbonbar.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.gxdw_ribbonbar.ContainerControlProcessDialogKey = true; + this.gxdw_ribbonbar.Dock = System.Windows.Forms.DockStyle.Left; + this.gxdw_ribbonbar.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { + this.buttonItem9, + this.buttonItem10, + this.buttonItem11, + this.buttonItem12, + this.buttonItem13, + this.buttonItem14}); + this.gxdw_ribbonbar.Location = new System.Drawing.Point(3, 0); + this.gxdw_ribbonbar.Name = "gxdw_ribbonbar"; + this.gxdw_ribbonbar.Size = new System.Drawing.Size(564, 59); + this.gxdw_ribbonbar.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.gxdw_ribbonbar.TabIndex = 0; + this.gxdw_ribbonbar.Text = "ribbonBar5"; // // // - this.ribbonBar2.BackgroundMouseOverStyle.Class = ""; - this.ribbonBar2.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.gxdw_ribbonbar.TitleStyle.Class = ""; + this.gxdw_ribbonbar.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; // // // - this.ribbonBar2.BackgroundStyle.Class = ""; - this.ribbonBar2.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonBar2.ContainerControlProcessDialogKey = true; - this.ribbonBar2.Dock = System.Windows.Forms.DockStyle.Left; - this.ribbonBar2.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { - this.buttonItemHX1, - this.buttonItemHX2, - this.buttonItemDCTP, - this.sliderItem3}); - this.ribbonBar2.Location = new System.Drawing.Point(3, 0); - this.ribbonBar2.Name = "ribbonBar2"; - this.ribbonBar2.Size = new System.Drawing.Size(350, 92); - this.ribbonBar2.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.ribbonBar2.TabIndex = 0; + this.gxdw_ribbonbar.TitleStyleMouseOver.Class = ""; + this.gxdw_ribbonbar.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.gxdw_ribbonbar.TitleVisible = false; // + // buttonItem9 // + this.buttonItem9.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__76; + this.buttonItem9.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem9.Name = "buttonItem9"; + this.buttonItem9.SubItemsExpandWidth = 14; + this.buttonItem9.Text = "工单管理"; + this.buttonItem9.Click += new System.EventHandler(this.buttonItem9_Click); // - this.ribbonBar2.TitleStyle.Class = ""; - this.ribbonBar2.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // buttonItem10 // + this.buttonItem10.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__69; + this.buttonItem10.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem10.Name = "buttonItem10"; + this.buttonItem10.SubItemsExpandWidth = 14; + this.buttonItem10.Text = "在线任务"; + this.buttonItem10.Click += new System.EventHandler(this.buttonItem10_Click); // + // buttonItem11 // - this.ribbonBar2.TitleStyleMouseOver.Class = ""; - this.ribbonBar2.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonBar2.TitleVisible = false; + this.buttonItem11.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__72; + this.buttonItem11.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem11.Name = "buttonItem11"; + this.buttonItem11.SubItemsExpandWidth = 14; + this.buttonItem11.Text = "事件管理"; + this.buttonItem11.Click += new System.EventHandler(this.buttonItem11_Click); // - // buttonItemHX1 + // buttonItem12 // - this.buttonItemHX1.AutoExpandOnClick = true; - this.buttonItemHX1.Image = ((System.Drawing.Image)(resources.GetObject("buttonItemHX1.Image"))); - this.buttonItemHX1.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItemHX1.Name = "buttonItemHX1"; - this.buttonItemHX1.SubItemsExpandWidth = 14; - this.buttonItemHX1.Text = "导入红线"; - this.buttonItemHX1.Click += new System.EventHandler(this.buttonItemHX1_Click); + this.buttonItem12.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__34; + this.buttonItem12.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem12.Name = "buttonItem12"; + this.buttonItem12.SubItemsExpandWidth = 14; + this.buttonItem12.Text = "探测仪管理"; + this.buttonItem12.Click += new System.EventHandler(this.buttonItem12_Click); // - // buttonItemHX2 + // buttonItem13 // - this.buttonItemHX2.Image = ((System.Drawing.Image)(resources.GetObject("buttonItemHX2.Image"))); - this.buttonItemHX2.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItemHX2.Name = "buttonItemHX2"; - this.buttonItemHX2.SubItemsExpandWidth = 14; - this.buttonItemHX2.Text = "红线审核"; - this.buttonItemHX2.Click += new System.EventHandler(this.buttonItemHX2_Click); + this.buttonItem13.Image = global::Cyberpipe.Properties.Resources._24x24icon_13_hover; + this.buttonItem13.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem13.Name = "buttonItem13"; + this.buttonItem13.SubItemsExpandWidth = 14; + this.buttonItem13.Text = "巡检人员维护"; + this.buttonItem13.Click += new System.EventHandler(this.buttonItem13_Click); // - // buttonItemDCTP + // buttonItem14 // - this.buttonItemDCTP.Image = ((System.Drawing.Image)(resources.GetObject("buttonItemDCTP.Image"))); - this.buttonItemDCTP.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItemDCTP.Name = "buttonItemDCTP"; - this.buttonItemDCTP.SubItemsExpandWidth = 14; - this.buttonItemDCTP.Text = "导出图片"; - this.buttonItemDCTP.Click += new System.EventHandler(this.buttonItemDCTP_Click); - // - // sliderItem3 - // - this.sliderItem3.LabelPosition = DevComponents.DotNetBar.eSliderLabelPosition.Top; - this.sliderItem3.LabelWidth = 50; - this.sliderItem3.Name = "sliderItem3"; - this.sliderItem3.Text = "地面透明度"; - this.sliderItem3.TextColor = System.Drawing.Color.Black; - this.sliderItem3.Value = 0; - this.sliderItem3.ValueChanged += new System.EventHandler(this.sliderItem3_ValueChanged); - // - // ribbonPanel1 - // - this.ribbonPanel1.AutoSize = true; - this.ribbonPanel1.CanvasColor = System.Drawing.Color.Gray; - this.ribbonPanel1.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.ribbonPanel1.Controls.Add(this.ribbonBar21); - this.ribbonPanel1.Dock = System.Windows.Forms.DockStyle.Fill; - this.ribbonPanel1.Location = new System.Drawing.Point(0, 0); - this.ribbonPanel1.Name = "ribbonPanel1"; - this.ribbonPanel1.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); - this.ribbonPanel1.Size = new System.Drawing.Size(1328, 95); - // - // - // - this.ribbonPanel1.Style.Class = ""; - this.ribbonPanel1.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonPanel1.StyleMouseDown.Class = ""; - this.ribbonPanel1.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonPanel1.StyleMouseOver.Class = ""; - this.ribbonPanel1.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonPanel1.TabIndex = 1; - this.ribbonPanel1.Visible = false; - // - // ribbonBar21 - // - this.ribbonBar21.AutoOverflowEnabled = true; - this.ribbonBar21.BackColor = System.Drawing.Color.White; - // - // - // - this.ribbonBar21.BackgroundMouseOverStyle.Class = ""; - this.ribbonBar21.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonBar21.BackgroundStyle.Class = ""; - this.ribbonBar21.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonBar21.ContainerControlProcessDialogKey = true; - this.ribbonBar21.Dock = System.Windows.Forms.DockStyle.Left; - this.ribbonBar21.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { - this.buttonItem87, - this.buttonItem88, - this.buttonItem27, - this.sliderGroundTransSet1, - this.buttonItem91, - this.buttonItem1, - this.btnlegendSet, - this.buttonItem89, - this.btnOutputJPG}); - this.ribbonBar21.Location = new System.Drawing.Point(3, 0); - this.ribbonBar21.Name = "ribbonBar21"; - this.ribbonBar21.Size = new System.Drawing.Size(649, 92); - this.ribbonBar21.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.ribbonBar21.TabIndex = 2; - this.ribbonBar21.Text = "浏览模式"; - // - // - // - this.ribbonBar21.TitleStyle.Class = ""; - this.ribbonBar21.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonBar21.TitleStyleMouseOver.Class = ""; - this.ribbonBar21.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonBar21.TitleVisible = false; - // - // buttonItem87 - // - this.buttonItem87.Image = ((System.Drawing.Image)(resources.GetObject("buttonItem87.Image"))); - this.buttonItem87.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem87.Name = "buttonItem87"; - this.buttonItem87.SubItemsExpandWidth = 14; - this.buttonItem87.Text = "地上模式"; - this.buttonItem87.Click += new System.EventHandler(this.buttonItem87_Click); - // - // buttonItem88 - // - this.buttonItem88.Image = ((System.Drawing.Image)(resources.GetObject("buttonItem88.Image"))); - this.buttonItem88.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem88.Name = "buttonItem88"; - this.buttonItem88.SubItemsExpandWidth = 14; - this.buttonItem88.Text = "地下模式"; - this.buttonItem88.Click += new System.EventHandler(this.buttonItem88_Click); - // - // buttonItem27 - // - this.buttonItem27.Image = ((System.Drawing.Image)(resources.GetObject("buttonItem27.Image"))); - this.buttonItem27.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem27.Name = "buttonItem27"; - this.buttonItem27.SubItemsExpandWidth = 14; - this.buttonItem27.Text = "行走模式"; - this.buttonItem27.Click += new System.EventHandler(this.buttonItem27_Click); - // - // buttonItem91 - // - this.buttonItem91.ForeColor = System.Drawing.Color.Black; - this.buttonItem91.Image = ((System.Drawing.Image)(resources.GetObject("buttonItem91.Image"))); - this.buttonItem91.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem91.Name = "buttonItem91"; - this.buttonItem91.SubItemsExpandWidth = 14; - this.buttonItem91.Text = "快速定位"; - this.buttonItem91.Click += new System.EventHandler(this.buttonItem91_Click); - // - // buttonItem1 - // - this.buttonItem1.Image = ((System.Drawing.Image)(resources.GetObject("buttonItem1.Image"))); - this.buttonItem1.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem1.Name = "buttonItem1"; - this.buttonItem1.SubItemsExpandWidth = 14; - this.buttonItem1.Text = "图层管理"; - this.buttonItem1.Click += new System.EventHandler(this.buttonItem1_Click); - // - // btnlegendSet - // - this.btnlegendSet.Image = ((System.Drawing.Image)(resources.GetObject("btnlegendSet.Image"))); - this.btnlegendSet.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.btnlegendSet.Name = "btnlegendSet"; - this.btnlegendSet.SubItemsExpandWidth = 14; - this.btnlegendSet.Text = "图例"; - this.btnlegendSet.Click += new System.EventHandler(this.btnlegendSet_Click); - // - // buttonItem89 - // - this.buttonItem89.Image = ((System.Drawing.Image)(resources.GetObject("buttonItem89.Image"))); - this.buttonItem89.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem89.Name = "buttonItem89"; - this.buttonItem89.SubItemsExpandWidth = 14; - this.buttonItem89.Text = "全屏显示"; - this.buttonItem89.Click += new System.EventHandler(this.buttonItem89_Click); - // - // btnOutputJPG - // - this.btnOutputJPG.Image = ((System.Drawing.Image)(resources.GetObject("btnOutputJPG.Image"))); - this.btnOutputJPG.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.btnOutputJPG.Name = "btnOutputJPG"; - this.btnOutputJPG.SubItemsExpandWidth = 14; - this.btnOutputJPG.Text = "导出图片"; - this.btnOutputJPG.Click += new System.EventHandler(this.btnOutputJPG_Click); - // - // ribbonPanel12 - // - this.ribbonPanel12.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.ribbonPanel12.Controls.Add(this.ribbonBar18); - this.ribbonPanel12.Controls.Add(this.ribbonBar13); - this.ribbonPanel12.Dock = System.Windows.Forms.DockStyle.Fill; - this.ribbonPanel12.Location = new System.Drawing.Point(0, 0); - this.ribbonPanel12.Name = "ribbonPanel12"; - this.ribbonPanel12.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); - this.ribbonPanel12.Size = new System.Drawing.Size(1328, 95); - // - // - // - this.ribbonPanel12.Style.Class = ""; - this.ribbonPanel12.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonPanel12.StyleMouseDown.Class = ""; - this.ribbonPanel12.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonPanel12.StyleMouseOver.Class = ""; - this.ribbonPanel12.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonPanel12.TabIndex = 34; - this.ribbonPanel12.Visible = false; - // - // ribbonBar18 - // - this.ribbonBar18.AutoOverflowEnabled = true; - // - // - // - this.ribbonBar18.BackgroundMouseOverStyle.Class = ""; - this.ribbonBar18.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonBar18.BackgroundStyle.Class = ""; - this.ribbonBar18.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonBar18.ContainerControlProcessDialogKey = true; - this.ribbonBar18.Dock = System.Windows.Forms.DockStyle.Left; - this.ribbonBar18.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { - this.buttonItem133}); - this.ribbonBar18.Location = new System.Drawing.Point(531, 0); - this.ribbonBar18.Name = "ribbonBar18"; - this.ribbonBar18.Size = new System.Drawing.Size(129, 92); - this.ribbonBar18.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.ribbonBar18.TabIndex = 1; - // - // - // - this.ribbonBar18.TitleStyle.Class = ""; - this.ribbonBar18.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonBar18.TitleStyleMouseOver.Class = ""; - this.ribbonBar18.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonBar18.TitleVisible = false; - // - // buttonItem133 - // - this.buttonItem133.Image = ((System.Drawing.Image)(resources.GetObject("buttonItem133.Image"))); - this.buttonItem133.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem133.Name = "buttonItem133"; - this.buttonItem133.SubItemsExpandWidth = 14; - this.buttonItem133.Text = "审核入库"; - this.buttonItem133.Click += new System.EventHandler(this.buttonItem133_Click_1); - // - // ribbonBar13 - // - this.ribbonBar13.AutoOverflowEnabled = true; - // - // - // - this.ribbonBar13.BackgroundMouseOverStyle.Class = ""; - this.ribbonBar13.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonBar13.BackgroundStyle.Class = ""; - this.ribbonBar13.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonBar13.ContainerControlProcessDialogKey = true; - this.ribbonBar13.Dock = System.Windows.Forms.DockStyle.Left; - this.ribbonBar13.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { - this.buttonItem127, - this.buttonItem128, - this.sliderItem1, - this.buttonItem134, - this.buttonItem130, - this.btn_check_history}); - this.ribbonBar13.Location = new System.Drawing.Point(3, 0); - this.ribbonBar13.Name = "ribbonBar13"; - this.ribbonBar13.Size = new System.Drawing.Size(528, 92); - this.ribbonBar13.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.ribbonBar13.TabIndex = 0; - // - // - // - this.ribbonBar13.TitleStyle.Class = ""; - this.ribbonBar13.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonBar13.TitleStyleMouseOver.Class = ""; - this.ribbonBar13.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonBar13.TitleVisible = false; - // - // buttonItem127 - // - this.buttonItem127.Image = ((System.Drawing.Image)(resources.GetObject("buttonItem127.Image"))); - this.buttonItem127.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem127.Name = "buttonItem127"; - this.buttonItem127.SubItemsExpandWidth = 14; - this.buttonItem127.Text = "打开数据"; - this.buttonItem127.Click += new System.EventHandler(this.buttonItem127_Click_2); - // - // buttonItem128 - // - this.buttonItem128.Image = ((System.Drawing.Image)(resources.GetObject("buttonItem128.Image"))); - this.buttonItem128.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem128.Name = "buttonItem128"; - this.buttonItem128.SubItemsExpandWidth = 14; - this.buttonItem128.Text = "一键审核"; - this.buttonItem128.Click += new System.EventHandler(this.buttonItem128_Click); - // - // sliderItem1 - // - this.sliderItem1.LabelPosition = DevComponents.DotNetBar.eSliderLabelPosition.Top; - this.sliderItem1.LabelWidth = 50; - this.sliderItem1.Name = "sliderItem1"; - this.sliderItem1.Text = "地面透明度"; - this.sliderItem1.TextColor = System.Drawing.Color.Black; - this.sliderItem1.Value = 0; - this.sliderItem1.ValueChanged += new System.EventHandler(this.sliderItem1_ValueChanged); - // - // buttonItem134 - // - this.buttonItem134.Image = ((System.Drawing.Image)(resources.GetObject("buttonItem134.Image"))); - this.buttonItem134.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem134.Name = "buttonItem134"; - this.buttonItem134.SubItemsExpandWidth = 14; - this.buttonItem134.Text = "模拟设计修改"; - this.buttonItem134.Click += new System.EventHandler(this.buttonItem134_Click_1); - // - // buttonItem130 - // - this.buttonItem130.Image = ((System.Drawing.Image)(resources.GetObject("buttonItem130.Image"))); - this.buttonItem130.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem130.Name = "buttonItem130"; - this.buttonItem130.SubItemsExpandWidth = 14; - this.buttonItem130.Text = "导出审核图"; - this.buttonItem130.Click += new System.EventHandler(this.buttonItem130_Click_1); - // - // btn_check_history - // - this.btn_check_history.Image = ((System.Drawing.Image)(resources.GetObject("btn_check_history.Image"))); - this.btn_check_history.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.btn_check_history.Name = "btn_check_history"; - this.btn_check_history.SubItemsExpandWidth = 14; - this.btn_check_history.Text = "审核历史"; - this.btn_check_history.Click += new System.EventHandler(this.btn_check_history_Click); - // - // ribbonPanel4 - // - this.ribbonPanel4.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.ribbonPanel4.Controls.Add(this.ribbonBar1); - this.ribbonPanel4.Dock = System.Windows.Forms.DockStyle.Fill; - this.ribbonPanel4.Location = new System.Drawing.Point(0, 0); - this.ribbonPanel4.Name = "ribbonPanel4"; - this.ribbonPanel4.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); - this.ribbonPanel4.Size = new System.Drawing.Size(1328, 95); - // - // - // - this.ribbonPanel4.Style.Class = ""; - this.ribbonPanel4.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonPanel4.StyleMouseDown.Class = ""; - this.ribbonPanel4.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonPanel4.StyleMouseOver.Class = ""; - this.ribbonPanel4.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonPanel4.TabIndex = 36; - this.ribbonPanel4.Visible = false; - // - // ribbonBar1 - // - this.ribbonBar1.AutoOverflowEnabled = true; - // - // - // - this.ribbonBar1.BackgroundMouseOverStyle.Class = ""; - this.ribbonBar1.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonBar1.BackgroundStyle.Class = ""; - this.ribbonBar1.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonBar1.ContainerControlProcessDialogKey = true; - this.ribbonBar1.Dock = System.Windows.Forms.DockStyle.Left; - this.ribbonBar1.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { - this.btn_document_info}); - this.ribbonBar1.Location = new System.Drawing.Point(3, 0); - this.ribbonBar1.Name = "ribbonBar1"; - this.ribbonBar1.Size = new System.Drawing.Size(88, 92); - this.ribbonBar1.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.ribbonBar1.TabIndex = 0; - // - // - // - this.ribbonBar1.TitleStyle.Class = ""; - this.ribbonBar1.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonBar1.TitleStyleMouseOver.Class = ""; - this.ribbonBar1.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonBar1.TitleVisible = false; - // - // btn_document_info - // - this.btn_document_info.Image = ((System.Drawing.Image)(resources.GetObject("btn_document_info.Image"))); - this.btn_document_info.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.btn_document_info.Name = "btn_document_info"; - this.btn_document_info.SubItemsExpandWidth = 14; - this.btn_document_info.Text = "文档管理"; - this.btn_document_info.Click += new System.EventHandler(this.btn_document_info_Click); + this.buttonItem14.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__56; + this.buttonItem14.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem14.Name = "buttonItem14"; + this.buttonItem14.SubItemsExpandWidth = 14; + this.buttonItem14.Text = "导出施工图"; + this.buttonItem14.Click += new System.EventHandler(this.buttonItem14_Click); // // ribbonPanel15 // this.ribbonPanel15.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; this.ribbonPanel15.Controls.Add(this.ribbonBar20); this.ribbonPanel15.Dock = System.Windows.Forms.DockStyle.Fill; - this.ribbonPanel15.Location = new System.Drawing.Point(0, 0); + this.ribbonPanel15.Location = new System.Drawing.Point(0, 33); this.ribbonPanel15.Name = "ribbonPanel15"; this.ribbonPanel15.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); - this.ribbonPanel15.Size = new System.Drawing.Size(1328, 95); + this.ribbonPanel15.Size = new System.Drawing.Size(1328, 62); // // // @@ -2843,7 +2465,7 @@ this.buttonItemXTGL}); this.ribbonBar20.Location = new System.Drawing.Point(3, 0); this.ribbonBar20.Name = "ribbonBar20"; - this.ribbonBar20.Size = new System.Drawing.Size(283, 92); + this.ribbonBar20.Size = new System.Drawing.Size(283, 59); this.ribbonBar20.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; this.ribbonBar20.TabIndex = 0; // @@ -3274,216 +2896,15 @@ this.buttonItemXT4_2.Text = "人员修改"; this.buttonItemXT4_2.Click += new System.EventHandler(this.buttonItemXT4_2_Click); // - // ribbonPanel3 - // - this.ribbonPanel3.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.ribbonPanel3.Controls.Add(this.ribbonBar4); - this.ribbonPanel3.Dock = System.Windows.Forms.DockStyle.Fill; - this.ribbonPanel3.Location = new System.Drawing.Point(0, 33); - this.ribbonPanel3.Name = "ribbonPanel3"; - this.ribbonPanel3.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); - this.ribbonPanel3.Size = new System.Drawing.Size(1328, 62); - // - // - // - this.ribbonPanel3.Style.Class = ""; - this.ribbonPanel3.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonPanel3.StyleMouseDown.Class = ""; - this.ribbonPanel3.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonPanel3.StyleMouseOver.Class = ""; - this.ribbonPanel3.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonPanel3.TabIndex = 40; - // - // ribbonBar4 - // - this.ribbonBar4.AutoOverflowEnabled = true; - // - // - // - this.ribbonBar4.BackgroundMouseOverStyle.Class = ""; - this.ribbonBar4.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonBar4.BackgroundStyle.Class = ""; - this.ribbonBar4.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonBar4.ContainerControlProcessDialogKey = true; - this.ribbonBar4.Dock = System.Windows.Forms.DockStyle.Left; - this.ribbonBar4.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { - this.btn_flag, - this.slider4ground}); - this.ribbonBar4.Location = new System.Drawing.Point(3, 0); - this.ribbonBar4.Name = "ribbonBar4"; - this.ribbonBar4.Size = new System.Drawing.Size(321, 59); - this.ribbonBar4.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.ribbonBar4.TabIndex = 0; - // - // - // - this.ribbonBar4.TitleStyle.Class = ""; - this.ribbonBar4.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonBar4.TitleStyleMouseOver.Class = ""; - this.ribbonBar4.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonBar4.TitleVisible = false; - // - // btn_flag - // - this.btn_flag.Image = global::Cyberpipe.Properties.Resources._24x24icon_03_hover; - this.btn_flag.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.btn_flag.Name = "btn_flag"; - this.btn_flag.SubItemsExpandWidth = 14; - this.btn_flag.Text = "标识器管理"; - this.btn_flag.Click += new System.EventHandler(this.btn_flag_Click); - // - // slider4ground - // - this.slider4ground.LabelPosition = DevComponents.DotNetBar.eSliderLabelPosition.Top; - this.slider4ground.LabelWidth = 50; - this.slider4ground.Name = "slider4ground"; - this.slider4ground.Text = "地面透明度"; - this.slider4ground.TextColor = System.Drawing.Color.Black; - this.slider4ground.Value = 0; - this.slider4ground.ValueChanged += new System.EventHandler(this.slider4ground_ValueChanged); - // - // ribbonPanel7 - // - this.ribbonPanel7.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.ribbonPanel7.Controls.Add(this.gxdw_ribbonbar); - this.ribbonPanel7.Dock = System.Windows.Forms.DockStyle.Fill; - this.ribbonPanel7.Location = new System.Drawing.Point(0, 33); - this.ribbonPanel7.Name = "ribbonPanel7"; - this.ribbonPanel7.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); - this.ribbonPanel7.Size = new System.Drawing.Size(1328, 62); - // - // - // - this.ribbonPanel7.Style.Class = ""; - this.ribbonPanel7.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonPanel7.StyleMouseDown.Class = ""; - this.ribbonPanel7.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonPanel7.StyleMouseOver.Class = ""; - this.ribbonPanel7.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonPanel7.TabIndex = 41; - this.ribbonPanel7.Visible = false; - // - // gxdw_ribbonbar - // - this.gxdw_ribbonbar.AutoOverflowEnabled = true; - // - // - // - this.gxdw_ribbonbar.BackgroundMouseOverStyle.Class = ""; - this.gxdw_ribbonbar.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.gxdw_ribbonbar.BackgroundStyle.Class = ""; - this.gxdw_ribbonbar.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.gxdw_ribbonbar.ContainerControlProcessDialogKey = true; - this.gxdw_ribbonbar.Dock = System.Windows.Forms.DockStyle.Left; - this.gxdw_ribbonbar.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { - this.buttonItem9, - this.buttonItem10, - this.buttonItem11, - this.buttonItem12, - this.buttonItem13, - this.buttonItem14}); - this.gxdw_ribbonbar.Location = new System.Drawing.Point(3, 0); - this.gxdw_ribbonbar.Name = "gxdw_ribbonbar"; - this.gxdw_ribbonbar.Size = new System.Drawing.Size(522, 59); - this.gxdw_ribbonbar.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.gxdw_ribbonbar.TabIndex = 0; - this.gxdw_ribbonbar.Text = "ribbonBar5"; - // - // - // - this.gxdw_ribbonbar.TitleStyle.Class = ""; - this.gxdw_ribbonbar.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.gxdw_ribbonbar.TitleStyleMouseOver.Class = ""; - this.gxdw_ribbonbar.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.gxdw_ribbonbar.TitleVisible = false; - // - // buttonItem9 - // - this.buttonItem9.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__76; - this.buttonItem9.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem9.Name = "buttonItem9"; - this.buttonItem9.SubItemsExpandWidth = 14; - this.buttonItem9.Text = "工单管理"; - this.buttonItem9.Click += new System.EventHandler(this.buttonItem9_Click); - // - // buttonItem10 - // - this.buttonItem10.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__69; - this.buttonItem10.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem10.Name = "buttonItem10"; - this.buttonItem10.SubItemsExpandWidth = 14; - this.buttonItem10.Text = "在线任务"; - this.buttonItem10.Click += new System.EventHandler(this.buttonItem10_Click); - // - // buttonItem11 - // - this.buttonItem11.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__72; - this.buttonItem11.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem11.Name = "buttonItem11"; - this.buttonItem11.SubItemsExpandWidth = 14; - this.buttonItem11.Text = "事件管理"; - this.buttonItem11.Click += new System.EventHandler(this.buttonItem11_Click); - // - // buttonItem12 - // - this.buttonItem12.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__34; - this.buttonItem12.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem12.Name = "buttonItem12"; - this.buttonItem12.SubItemsExpandWidth = 14; - this.buttonItem12.Text = "探测仪管理"; - this.buttonItem12.Click += new System.EventHandler(this.buttonItem12_Click); - // - // buttonItem13 - // - this.buttonItem13.Image = global::Cyberpipe.Properties.Resources._24x24icon_13_hover; - this.buttonItem13.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem13.Name = "buttonItem13"; - this.buttonItem13.SubItemsExpandWidth = 14; - this.buttonItem13.Text = "巡检人员维护"; - this.buttonItem13.Click += new System.EventHandler(this.buttonItem13_Click); - // - // buttonItem14 - // - this.buttonItem14.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__56; - this.buttonItem14.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem14.Name = "buttonItem14"; - this.buttonItem14.SubItemsExpandWidth = 14; - this.buttonItem14.Text = "导出施工图"; - this.buttonItem14.Click += new System.EventHandler(this.buttonItem14_Click); - // // ribbonPanel2 // this.ribbonPanel2.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; this.ribbonPanel2.Controls.Add(this.ribbonBar3); this.ribbonPanel2.Dock = System.Windows.Forms.DockStyle.Fill; - this.ribbonPanel2.Location = new System.Drawing.Point(0, 33); + this.ribbonPanel2.Location = new System.Drawing.Point(0, 0); this.ribbonPanel2.Name = "ribbonPanel2"; this.ribbonPanel2.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); - this.ribbonPanel2.Size = new System.Drawing.Size(1328, 62); + this.ribbonPanel2.Size = new System.Drawing.Size(1328, 95); // // // @@ -3527,7 +2948,7 @@ this.buttonItemPasswordReset}); this.ribbonBar3.Location = new System.Drawing.Point(3, 0); this.ribbonBar3.Name = "ribbonBar3"; - this.ribbonBar3.Size = new System.Drawing.Size(551, 59); + this.ribbonBar3.Size = new System.Drawing.Size(551, 92); this.ribbonBar3.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; this.ribbonBar3.TabIndex = 1; // @@ -3567,6 +2988,7 @@ this.btn_resc_info.Name = "btn_resc_info"; this.btn_resc_info.SubItemsExpandWidth = 14; this.btn_resc_info.Text = "资源管理"; + this.btn_resc_info.Visible = false; this.btn_resc_info.Click += new System.EventHandler(this.btn_resc_info_Click); // // btn_role_resc @@ -3605,6 +3027,605 @@ this.buttonItemPasswordReset.Text = "重置密码"; this.buttonItemPasswordReset.Click += new System.EventHandler(this.buttonItemPasswordReset_Click); // + // ribbonPanel6 + // + this.ribbonPanel6.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.ribbonPanel6.Controls.Add(this.ribbonBar6); + this.ribbonPanel6.Dock = System.Windows.Forms.DockStyle.Fill; + this.ribbonPanel6.Location = new System.Drawing.Point(0, 0); + this.ribbonPanel6.Name = "ribbonPanel6"; + this.ribbonPanel6.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); + this.ribbonPanel6.Size = new System.Drawing.Size(1328, 95); + // + // + // + this.ribbonPanel6.Style.Class = ""; + this.ribbonPanel6.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonPanel6.StyleMouseDown.Class = ""; + this.ribbonPanel6.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonPanel6.StyleMouseOver.Class = ""; + this.ribbonPanel6.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonPanel6.TabIndex = 38; + this.ribbonPanel6.Visible = false; + // + // ribbonBar6 + // + this.ribbonBar6.AutoOverflowEnabled = true; + // + // + // + this.ribbonBar6.BackgroundMouseOverStyle.Class = ""; + this.ribbonBar6.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonBar6.BackgroundStyle.Class = ""; + this.ribbonBar6.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar6.ContainerControlProcessDialogKey = true; + this.ribbonBar6.Dock = System.Windows.Forms.DockStyle.Left; + this.ribbonBar6.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { + this.buttonItemSPSZ, + this.buttonItem8, + this.buttonItemLocation, + this.sliderItem2, + this.buttonItemGBJC}); + this.ribbonBar6.Location = new System.Drawing.Point(3, 0); + this.ribbonBar6.Name = "ribbonBar6"; + this.ribbonBar6.Size = new System.Drawing.Size(427, 92); + this.ribbonBar6.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.ribbonBar6.TabIndex = 0; + // + // + // + this.ribbonBar6.TitleStyle.Class = ""; + this.ribbonBar6.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonBar6.TitleStyleMouseOver.Class = ""; + this.ribbonBar6.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar6.TitleVisible = false; + // + // buttonItemSPSZ + // + this.buttonItemSPSZ.Image = ((System.Drawing.Image)(resources.GetObject("buttonItemSPSZ.Image"))); + this.buttonItemSPSZ.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItemSPSZ.Name = "buttonItemSPSZ"; + this.buttonItemSPSZ.SubItemsExpandWidth = 14; + this.buttonItemSPSZ.Text = "双屏设置"; + this.buttonItemSPSZ.Click += new System.EventHandler(this.buttonItemSPSZ_Click); + // + // buttonItem8 + // + this.buttonItem8.Image = ((System.Drawing.Image)(resources.GetObject("buttonItem8.Image"))); + this.buttonItem8.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem8.Name = "buttonItem8"; + this.buttonItem8.SubItemsExpandWidth = 14; + this.buttonItem8.Text = "双屏分析"; + this.buttonItem8.Click += new System.EventHandler(this.buttonItem8_Click); + // + // buttonItemLocation + // + this.buttonItemLocation.Image = ((System.Drawing.Image)(resources.GetObject("buttonItemLocation.Image"))); + this.buttonItemLocation.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItemLocation.Name = "buttonItemLocation"; + this.buttonItemLocation.SubItemsExpandWidth = 14; + this.buttonItemLocation.Text = "快速定位"; + this.buttonItemLocation.Click += new System.EventHandler(this.buttonItemLocation_Click); + // + // sliderItem2 + // + this.sliderItem2.LabelPosition = DevComponents.DotNetBar.eSliderLabelPosition.Top; + this.sliderItem2.LabelWidth = 50; + this.sliderItem2.Name = "sliderItem2"; + this.sliderItem2.Text = "地面透明度"; + this.sliderItem2.TextColor = System.Drawing.Color.Black; + this.sliderItem2.Value = 0; + this.sliderItem2.ValueChanged += new System.EventHandler(this.sliderItem2_ValueChanged); + // + // buttonItemGBJC + // + this.buttonItemGBJC.Image = ((System.Drawing.Image)(resources.GetObject("buttonItemGBJC.Image"))); + this.buttonItemGBJC.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItemGBJC.Name = "buttonItemGBJC"; + this.buttonItemGBJC.SubItemsExpandWidth = 14; + this.buttonItemGBJC.Text = "国标检测"; + this.buttonItemGBJC.Click += new System.EventHandler(this.buttonItemGBJC_Click); + // + // ribbonPanel5 + // + this.ribbonPanel5.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.ribbonPanel5.Controls.Add(this.ribbonBar2); + this.ribbonPanel5.Dock = System.Windows.Forms.DockStyle.Fill; + this.ribbonPanel5.Location = new System.Drawing.Point(0, 33); + this.ribbonPanel5.Name = "ribbonPanel5"; + this.ribbonPanel5.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); + this.ribbonPanel5.Size = new System.Drawing.Size(1328, 62); + // + // + // + this.ribbonPanel5.Style.Class = ""; + this.ribbonPanel5.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonPanel5.StyleMouseDown.Class = ""; + this.ribbonPanel5.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonPanel5.StyleMouseOver.Class = ""; + this.ribbonPanel5.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonPanel5.TabIndex = 37; + this.ribbonPanel5.Visible = false; + // + // ribbonBar2 + // + this.ribbonBar2.AutoOverflowEnabled = true; + // + // + // + this.ribbonBar2.BackgroundMouseOverStyle.Class = ""; + this.ribbonBar2.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonBar2.BackgroundStyle.Class = ""; + this.ribbonBar2.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar2.ContainerControlProcessDialogKey = true; + this.ribbonBar2.Dock = System.Windows.Forms.DockStyle.Left; + this.ribbonBar2.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { + this.buttonItemHX1, + this.buttonItemHX2, + this.buttonItemDCTP, + this.sliderItem3}); + this.ribbonBar2.Location = new System.Drawing.Point(3, 0); + this.ribbonBar2.Name = "ribbonBar2"; + this.ribbonBar2.Size = new System.Drawing.Size(350, 59); + this.ribbonBar2.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.ribbonBar2.TabIndex = 0; + // + // + // + this.ribbonBar2.TitleStyle.Class = ""; + this.ribbonBar2.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonBar2.TitleStyleMouseOver.Class = ""; + this.ribbonBar2.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar2.TitleVisible = false; + // + // buttonItemHX1 + // + this.buttonItemHX1.AutoExpandOnClick = true; + this.buttonItemHX1.Image = ((System.Drawing.Image)(resources.GetObject("buttonItemHX1.Image"))); + this.buttonItemHX1.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItemHX1.Name = "buttonItemHX1"; + this.buttonItemHX1.SubItemsExpandWidth = 14; + this.buttonItemHX1.Text = "导入红线"; + this.buttonItemHX1.Click += new System.EventHandler(this.buttonItemHX1_Click); + // + // buttonItemHX2 + // + this.buttonItemHX2.Image = ((System.Drawing.Image)(resources.GetObject("buttonItemHX2.Image"))); + this.buttonItemHX2.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItemHX2.Name = "buttonItemHX2"; + this.buttonItemHX2.SubItemsExpandWidth = 14; + this.buttonItemHX2.Text = "红线审核"; + this.buttonItemHX2.Click += new System.EventHandler(this.buttonItemHX2_Click); + // + // buttonItemDCTP + // + this.buttonItemDCTP.Image = ((System.Drawing.Image)(resources.GetObject("buttonItemDCTP.Image"))); + this.buttonItemDCTP.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItemDCTP.Name = "buttonItemDCTP"; + this.buttonItemDCTP.SubItemsExpandWidth = 14; + this.buttonItemDCTP.Text = "导出图片"; + this.buttonItemDCTP.Click += new System.EventHandler(this.buttonItemDCTP_Click); + // + // sliderItem3 + // + this.sliderItem3.LabelPosition = DevComponents.DotNetBar.eSliderLabelPosition.Top; + this.sliderItem3.LabelWidth = 50; + this.sliderItem3.Name = "sliderItem3"; + this.sliderItem3.Text = "地面透明度"; + this.sliderItem3.TextColor = System.Drawing.Color.Black; + this.sliderItem3.Value = 0; + this.sliderItem3.ValueChanged += new System.EventHandler(this.sliderItem3_ValueChanged); + // + // ribbonPanel1 + // + this.ribbonPanel1.AutoSize = true; + this.ribbonPanel1.CanvasColor = System.Drawing.Color.Gray; + this.ribbonPanel1.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.ribbonPanel1.Controls.Add(this.ribbonBar21); + this.ribbonPanel1.Dock = System.Windows.Forms.DockStyle.Fill; + this.ribbonPanel1.Location = new System.Drawing.Point(0, 33); + this.ribbonPanel1.Name = "ribbonPanel1"; + this.ribbonPanel1.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); + this.ribbonPanel1.Size = new System.Drawing.Size(1328, 62); + // + // + // + this.ribbonPanel1.Style.Class = ""; + this.ribbonPanel1.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonPanel1.StyleMouseDown.Class = ""; + this.ribbonPanel1.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonPanel1.StyleMouseOver.Class = ""; + this.ribbonPanel1.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonPanel1.TabIndex = 1; + this.ribbonPanel1.Visible = false; + // + // ribbonBar21 + // + this.ribbonBar21.AutoOverflowEnabled = true; + this.ribbonBar21.BackColor = System.Drawing.Color.White; + // + // + // + this.ribbonBar21.BackgroundMouseOverStyle.Class = ""; + this.ribbonBar21.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonBar21.BackgroundStyle.Class = ""; + this.ribbonBar21.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar21.ContainerControlProcessDialogKey = true; + this.ribbonBar21.Dock = System.Windows.Forms.DockStyle.Left; + this.ribbonBar21.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { + this.buttonItem87, + this.buttonItem88, + this.buttonItem27, + this.sliderGroundTransSet1, + this.buttonItem91, + this.buttonItem1, + this.btnlegendSet, + this.buttonItem89, + this.btnOutputJPG}); + this.ribbonBar21.Location = new System.Drawing.Point(3, 0); + this.ribbonBar21.Name = "ribbonBar21"; + this.ribbonBar21.Size = new System.Drawing.Size(649, 59); + this.ribbonBar21.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.ribbonBar21.TabIndex = 2; + this.ribbonBar21.Text = "浏览模式"; + // + // + // + this.ribbonBar21.TitleStyle.Class = ""; + this.ribbonBar21.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonBar21.TitleStyleMouseOver.Class = ""; + this.ribbonBar21.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar21.TitleVisible = false; + // + // buttonItem87 + // + this.buttonItem87.Image = ((System.Drawing.Image)(resources.GetObject("buttonItem87.Image"))); + this.buttonItem87.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem87.Name = "buttonItem87"; + this.buttonItem87.SubItemsExpandWidth = 14; + this.buttonItem87.Text = "地上模式"; + this.buttonItem87.Click += new System.EventHandler(this.buttonItem87_Click); + // + // buttonItem88 + // + this.buttonItem88.Image = ((System.Drawing.Image)(resources.GetObject("buttonItem88.Image"))); + this.buttonItem88.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem88.Name = "buttonItem88"; + this.buttonItem88.SubItemsExpandWidth = 14; + this.buttonItem88.Text = "地下模式"; + this.buttonItem88.Click += new System.EventHandler(this.buttonItem88_Click); + // + // buttonItem27 + // + this.buttonItem27.Image = ((System.Drawing.Image)(resources.GetObject("buttonItem27.Image"))); + this.buttonItem27.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem27.Name = "buttonItem27"; + this.buttonItem27.SubItemsExpandWidth = 14; + this.buttonItem27.Text = "行走模式"; + this.buttonItem27.Click += new System.EventHandler(this.buttonItem27_Click); + // + // buttonItem91 + // + this.buttonItem91.ForeColor = System.Drawing.Color.Black; + this.buttonItem91.Image = ((System.Drawing.Image)(resources.GetObject("buttonItem91.Image"))); + this.buttonItem91.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem91.Name = "buttonItem91"; + this.buttonItem91.SubItemsExpandWidth = 14; + this.buttonItem91.Text = "快速定位"; + this.buttonItem91.Click += new System.EventHandler(this.buttonItem91_Click); + // + // buttonItem1 + // + this.buttonItem1.Image = ((System.Drawing.Image)(resources.GetObject("buttonItem1.Image"))); + this.buttonItem1.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem1.Name = "buttonItem1"; + this.buttonItem1.SubItemsExpandWidth = 14; + this.buttonItem1.Text = "图层管理"; + this.buttonItem1.Click += new System.EventHandler(this.buttonItem1_Click); + // + // btnlegendSet + // + this.btnlegendSet.Image = ((System.Drawing.Image)(resources.GetObject("btnlegendSet.Image"))); + this.btnlegendSet.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.btnlegendSet.Name = "btnlegendSet"; + this.btnlegendSet.SubItemsExpandWidth = 14; + this.btnlegendSet.Text = "图例"; + this.btnlegendSet.Click += new System.EventHandler(this.btnlegendSet_Click); + // + // buttonItem89 + // + this.buttonItem89.Image = ((System.Drawing.Image)(resources.GetObject("buttonItem89.Image"))); + this.buttonItem89.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem89.Name = "buttonItem89"; + this.buttonItem89.SubItemsExpandWidth = 14; + this.buttonItem89.Text = "全屏显示"; + this.buttonItem89.Click += new System.EventHandler(this.buttonItem89_Click); + // + // btnOutputJPG + // + this.btnOutputJPG.Image = ((System.Drawing.Image)(resources.GetObject("btnOutputJPG.Image"))); + this.btnOutputJPG.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.btnOutputJPG.Name = "btnOutputJPG"; + this.btnOutputJPG.SubItemsExpandWidth = 14; + this.btnOutputJPG.Text = "导出图片"; + this.btnOutputJPG.Click += new System.EventHandler(this.btnOutputJPG_Click); + // + // ribbonPanel12 + // + this.ribbonPanel12.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.ribbonPanel12.Controls.Add(this.ribbonBar18); + this.ribbonPanel12.Controls.Add(this.ribbonBar13); + this.ribbonPanel12.Dock = System.Windows.Forms.DockStyle.Fill; + this.ribbonPanel12.Location = new System.Drawing.Point(0, 33); + this.ribbonPanel12.Name = "ribbonPanel12"; + this.ribbonPanel12.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); + this.ribbonPanel12.Size = new System.Drawing.Size(1328, 62); + // + // + // + this.ribbonPanel12.Style.Class = ""; + this.ribbonPanel12.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonPanel12.StyleMouseDown.Class = ""; + this.ribbonPanel12.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonPanel12.StyleMouseOver.Class = ""; + this.ribbonPanel12.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonPanel12.TabIndex = 34; + this.ribbonPanel12.Visible = false; + // + // ribbonBar18 + // + this.ribbonBar18.AutoOverflowEnabled = true; + // + // + // + this.ribbonBar18.BackgroundMouseOverStyle.Class = ""; + this.ribbonBar18.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonBar18.BackgroundStyle.Class = ""; + this.ribbonBar18.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar18.ContainerControlProcessDialogKey = true; + this.ribbonBar18.Dock = System.Windows.Forms.DockStyle.Left; + this.ribbonBar18.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { + this.buttonItem133, + this.buttonItem132}); + this.ribbonBar18.Location = new System.Drawing.Point(508, 0); + this.ribbonBar18.Name = "ribbonBar18"; + this.ribbonBar18.Size = new System.Drawing.Size(75, 59); + this.ribbonBar18.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.ribbonBar18.TabIndex = 1; + // + // + // + this.ribbonBar18.TitleStyle.Class = ""; + this.ribbonBar18.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonBar18.TitleStyleMouseOver.Class = ""; + this.ribbonBar18.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar18.TitleVisible = false; + // + // buttonItem133 + // + this.buttonItem133.Image = ((System.Drawing.Image)(resources.GetObject("buttonItem133.Image"))); + this.buttonItem133.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem133.Name = "buttonItem133"; + this.buttonItem133.SubItemsExpandWidth = 14; + this.buttonItem133.Text = "审核入库"; + this.buttonItem133.Click += new System.EventHandler(this.buttonItem133_Click_1); + // + // buttonItem132 + // + this.buttonItem132.Name = "buttonItem132"; + // + // ribbonBar13 + // + this.ribbonBar13.AutoOverflowEnabled = true; + // + // + // + this.ribbonBar13.BackgroundMouseOverStyle.Class = ""; + this.ribbonBar13.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonBar13.BackgroundStyle.Class = ""; + this.ribbonBar13.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar13.ContainerControlProcessDialogKey = true; + this.ribbonBar13.Dock = System.Windows.Forms.DockStyle.Left; + this.ribbonBar13.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { + this.buttonItem127, + this.buttonItem128, + this.sliderItem1, + this.buttonItem134, + this.buttonItem130, + this.btn_check_history}); + this.ribbonBar13.Location = new System.Drawing.Point(3, 0); + this.ribbonBar13.Name = "ribbonBar13"; + this.ribbonBar13.Size = new System.Drawing.Size(505, 59); + this.ribbonBar13.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.ribbonBar13.TabIndex = 0; + // + // + // + this.ribbonBar13.TitleStyle.Class = ""; + this.ribbonBar13.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonBar13.TitleStyleMouseOver.Class = ""; + this.ribbonBar13.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar13.TitleVisible = false; + // + // buttonItem127 + // + this.buttonItem127.Image = ((System.Drawing.Image)(resources.GetObject("buttonItem127.Image"))); + this.buttonItem127.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem127.Name = "buttonItem127"; + this.buttonItem127.SubItemsExpandWidth = 14; + this.buttonItem127.Text = "打开数据"; + this.buttonItem127.Click += new System.EventHandler(this.buttonItem127_Click_2); + // + // buttonItem128 + // + this.buttonItem128.Image = ((System.Drawing.Image)(resources.GetObject("buttonItem128.Image"))); + this.buttonItem128.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem128.Name = "buttonItem128"; + this.buttonItem128.SubItemsExpandWidth = 14; + this.buttonItem128.Text = "一键审核"; + this.buttonItem128.Click += new System.EventHandler(this.buttonItem128_Click); + // + // sliderItem1 + // + this.sliderItem1.LabelPosition = DevComponents.DotNetBar.eSliderLabelPosition.Top; + this.sliderItem1.LabelWidth = 50; + this.sliderItem1.Name = "sliderItem1"; + this.sliderItem1.Text = "地面透明度"; + this.sliderItem1.TextColor = System.Drawing.Color.Black; + this.sliderItem1.Value = 0; + this.sliderItem1.ValueChanged += new System.EventHandler(this.sliderItem1_ValueChanged); + // + // buttonItem134 + // + this.buttonItem134.Image = ((System.Drawing.Image)(resources.GetObject("buttonItem134.Image"))); + this.buttonItem134.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem134.Name = "buttonItem134"; + this.buttonItem134.SubItemsExpandWidth = 14; + this.buttonItem134.Text = "模拟设计修改"; + this.buttonItem134.Click += new System.EventHandler(this.buttonItem134_Click_1); + // + // buttonItem130 + // + this.buttonItem130.Image = ((System.Drawing.Image)(resources.GetObject("buttonItem130.Image"))); + this.buttonItem130.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem130.Name = "buttonItem130"; + this.buttonItem130.SubItemsExpandWidth = 14; + this.buttonItem130.Text = "导出审核图"; + this.buttonItem130.Click += new System.EventHandler(this.buttonItem130_Click_1); + // + // btn_check_history + // + this.btn_check_history.Image = ((System.Drawing.Image)(resources.GetObject("btn_check_history.Image"))); + this.btn_check_history.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.btn_check_history.Name = "btn_check_history"; + this.btn_check_history.SubItemsExpandWidth = 14; + this.btn_check_history.Text = "审核历史"; + this.btn_check_history.Click += new System.EventHandler(this.btn_check_history_Click); + // + // ribbonPanel4 + // + this.ribbonPanel4.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.ribbonPanel4.Controls.Add(this.ribbonBar1); + this.ribbonPanel4.Dock = System.Windows.Forms.DockStyle.Fill; + this.ribbonPanel4.Location = new System.Drawing.Point(0, 33); + this.ribbonPanel4.Name = "ribbonPanel4"; + this.ribbonPanel4.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); + this.ribbonPanel4.Size = new System.Drawing.Size(1328, 62); + // + // + // + this.ribbonPanel4.Style.Class = ""; + this.ribbonPanel4.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonPanel4.StyleMouseDown.Class = ""; + this.ribbonPanel4.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonPanel4.StyleMouseOver.Class = ""; + this.ribbonPanel4.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonPanel4.TabIndex = 36; + this.ribbonPanel4.Visible = false; + // + // ribbonBar1 + // + this.ribbonBar1.AutoOverflowEnabled = true; + // + // + // + this.ribbonBar1.BackgroundMouseOverStyle.Class = ""; + this.ribbonBar1.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonBar1.BackgroundStyle.Class = ""; + this.ribbonBar1.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar1.ContainerControlProcessDialogKey = true; + this.ribbonBar1.Dock = System.Windows.Forms.DockStyle.Left; + this.ribbonBar1.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { + this.btn_document_info}); + this.ribbonBar1.Location = new System.Drawing.Point(3, 0); + this.ribbonBar1.Name = "ribbonBar1"; + this.ribbonBar1.Size = new System.Drawing.Size(88, 59); + this.ribbonBar1.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.ribbonBar1.TabIndex = 0; + // + // + // + this.ribbonBar1.TitleStyle.Class = ""; + this.ribbonBar1.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonBar1.TitleStyleMouseOver.Class = ""; + this.ribbonBar1.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar1.TitleVisible = false; + // + // btn_document_info + // + this.btn_document_info.Image = ((System.Drawing.Image)(resources.GetObject("btn_document_info.Image"))); + this.btn_document_info.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.btn_document_info.Name = "btn_document_info"; + this.btn_document_info.SubItemsExpandWidth = 14; + this.btn_document_info.Text = "文档管理"; + this.btn_document_info.Click += new System.EventHandler(this.btn_document_info_Click); + // // ribbonTabItem1 // this.ribbonTabItem1.ButtonStyle = DevComponents.DotNetBar.eButtonStyle.ImageAndText; @@ -3673,7 +3694,6 @@ this.ribbonTabItem7.Name = "ribbonTabItem7"; this.ribbonTabItem7.Panel = this.ribbonPanel7; this.ribbonTabItem7.Text = "管线定位"; - this.ribbonTabItem7.MouseDown += new System.Windows.Forms.MouseEventHandler(this.ribbonTabItem7_MouseDown); // // ribbonTabItem5 // @@ -3684,7 +3704,6 @@ this.ribbonTabItem5.Name = "ribbonTabItem5"; this.ribbonTabItem5.Panel = this.ribbonPanel3; this.ribbonTabItem5.Text = "标识器管理"; - this.ribbonTabItem5.MouseDown += new System.Windows.Forms.MouseEventHandler(this.ribbonTabItem5_MouseDown); // // ribbonTabItem2 // @@ -4451,7 +4470,7 @@ this.dataGridViewX2.ReadOnly = true; this.dataGridViewX2.RowHeadersVisible = false; this.dataGridViewX2.RowTemplate.Height = 23; - this.dataGridViewX2.Size = new System.Drawing.Size(31081, 92); + this.dataGridViewX2.Size = new System.Drawing.Size(31378, 92); this.dataGridViewX2.TabIndex = 11; // // dataGridViewTextBoxColumn10 @@ -4545,7 +4564,7 @@ this.dataGridViewX3.ReadOnly = true; this.dataGridViewX3.RowHeadersVisible = false; this.dataGridViewX3.RowTemplate.Height = 23; - this.dataGridViewX3.Size = new System.Drawing.Size(31080, 127); + this.dataGridViewX3.Size = new System.Drawing.Size(31377, 127); this.dataGridViewX3.TabIndex = 5; this.dataGridViewX3.MouseDoubleClick += new System.Windows.Forms.MouseEventHandler(this.dataGridViewX3_MouseDoubleClick); // @@ -5722,7 +5741,8 @@ // pictureBox1 // this.pictureBox1.Dock = System.Windows.Forms.DockStyle.Top; - this.pictureBox1.Image = ((System.Drawing.Image)(resources.GetObject("pictureBox1.Image"))); +// this.pictureBox1.Image = ((System.Drawing.Image)(resources.GetObject("pictureBox1.Image"))); + this.pictureBox1.Image = Image.FromFile(Application.StartupPath + Utility.TitleImagePath); this.pictureBox1.Location = new System.Drawing.Point(0, 0); this.pictureBox1.Margin = new System.Windows.Forms.Padding(0); this.pictureBox1.Name = "pictureBox1"; @@ -5732,18 +5752,6 @@ this.pictureBox1.TabStop = false; this.pictureBox1.Paint += new System.Windows.Forms.PaintEventHandler(this.pictureBox1_Paint); // - // layerTree - // - this.layerTree.CheckBoxes = true; - this.layerTree.ItemHeight = 18; - this.layerTree.Location = new System.Drawing.Point(30, 78); - this.layerTree.Name = "layerTree"; - this.layerTree.Size = new System.Drawing.Size(121, 97); - this.layerTree.TabIndex = 1; - this.layerTree.AfterCheck += new System.Windows.Forms.TreeViewEventHandler(this.layerTree_AfterCheck); - this.layerTree.NodeMouseClick += new System.Windows.Forms.TreeNodeMouseClickEventHandler(this.layerTree_NodeMouseClick); - this.layerTree.NodeMouseDoubleClick += new System.Windows.Forms.TreeNodeMouseClickEventHandler(this.layerTree_NodeMouseDoubleClick); - // // MainFrm // this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Inherit; @@ -5770,7 +5778,8 @@ this.KeyPreview = true; this.Name = "MainFrm"; this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen; - this.Text = "智慧太湖新城管网规划分析系统6.0"; +// this.Text = "智慧太湖新城管网规划分析系统6.0"; + this.Text = Utility.SysnameVersion; this.WindowState = System.Windows.Forms.FormWindowState.Maximized; this.FormClosing += new System.Windows.Forms.FormClosingEventHandler(this.MainFrm_FormClosing); this.Load += new System.EventHandler(this.MainFrm_Load); @@ -5787,15 +5796,15 @@ this.contextMenuStripDeleteLayerNode.ResumeLayout(false); this.ribbonControl1.ResumeLayout(false); this.ribbonControl1.PerformLayout(); + this.ribbonPanel3.ResumeLayout(false); + this.ribbonPanel7.ResumeLayout(false); + this.ribbonPanel15.ResumeLayout(false); + this.ribbonPanel2.ResumeLayout(false); this.ribbonPanel6.ResumeLayout(false); this.ribbonPanel5.ResumeLayout(false); this.ribbonPanel1.ResumeLayout(false); this.ribbonPanel12.ResumeLayout(false); this.ribbonPanel4.ResumeLayout(false); - this.ribbonPanel15.ResumeLayout(false); - this.ribbonPanel3.ResumeLayout(false); - this.ribbonPanel7.ResumeLayout(false); - this.ribbonPanel2.ResumeLayout(false); this.panelOfTable.ResumeLayout(false); this.panelOfTable.PerformLayout(); ((System.ComponentModel.ISupportInitialize)(this.dataGridViewX1)).EndInit(); @@ -5955,6 +5964,7 @@ private RibbonTabItem ribbonTabItem11; private ButtonItem buttonItem130; private RibbonBar ribbonBar18; + private ButtonItem buttonItem132; private SliderItem sliderItem1; private ButtonItem buttonItem133; private ButtonItem buttonItem134; diff --git a/MainFrm.resx b/MainFrm.resx index 9f9bba4..ce490c1 100644 --- a/MainFrm.resx +++ b/MainFrm.resx @@ -351,6 +351,146 @@ 766, 54 + + + iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 + YQUAAAAZdEVYdFNvZnR3YXJlAEFkb2JlIEltYWdlUmVhZHlxyWU8AAADZmlUWHRYTUw6Y29tLmFkb2Jl + LnhtcAAAAAAAPD94cGFja2V0IGJlZ2luPSLvu78iIGlkPSJXNU0wTXBDZWhpSHpyZVN6TlRjemtjOWQi + Pz4gPHg6eG1wbWV0YSB4bWxuczp4PSJhZG9iZTpuczptZXRhLyIgeDp4bXB0az0iQWRvYmUgWE1QIENv + cmUgNS4zLWMwMTEgNjYuMTQ1NjYxLCAyMDEyLzAyLzA2LTE0OjU2OjI3ICAgICAgICAiPiA8cmRmOlJE + RiB4bWxuczpyZGY9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkvMDIvMjItcmRmLXN5bnRheC1ucyMiPiA8 + cmRmOkRlc2NyaXB0aW9uIHJkZjphYm91dD0iIiB4bWxuczp4bXBNTT0iaHR0cDovL25zLmFkb2JlLmNv + bS94YXAvMS4wL21tLyIgeG1sbnM6c3RSZWY9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlw + ZS9SZXNvdXJjZVJlZiMiIHhtbG5zOnhtcD0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wLyIgeG1w + TU06T3JpZ2luYWxEb2N1bWVudElEPSJ4bXAuZGlkOjYzQTM5NEY4Mjg0OUU0MTE5NDBEQTc4ODZEQzk5 + N0NGIiB4bXBNTTpEb2N1bWVudElEPSJ4bXAuZGlkOjEwQ0IxNzBBNEM1QzExRTRBNkNGQzRBMjhDQzI0 + MkY4IiB4bXBNTTpJbnN0YW5jZUlEPSJ4bXAuaWlkOjEwQ0IxNzA5NEM1QzExRTRBNkNGQzRBMjhDQzI0 + MkY4IiB4bXA6Q3JlYXRvclRvb2w9IkFkb2JlIFBob3Rvc2hvcCBDUzYgKFdpbmRvd3MpIj4gPHhtcE1N + OkRlcml2ZWRGcm9tIHN0UmVmOmluc3RhbmNlSUQ9InhtcC5paWQ6NTEzMDNDMjA1QjRDRTQxMTg4NERE + MUVBOEQ4QTgyNTUiIHN0UmVmOmRvY3VtZW50SUQ9InhtcC5kaWQ6NjNBMzk0RjgyODQ5RTQxMTk0MERB + Nzg4NkRDOTk3Q0YiLz4gPC9yZGY6RGVzY3JpcHRpb24+IDwvcmRmOlJERj4gPC94OnhtcG1ldGE+IDw/ + eHBhY2tldCBlbmQ9InIiPz43wa2/AAAFaUlEQVRIS6WUC0xTVxzGKy0UkSmlFGjBFilSkNpSaAWRh63y + sIiAArKs4spLRLQoiEJlSMGoMCc6CBOnYHzMOHUqqOhEHOqCbjNu6kCd6KYje5mZ6KbObd/OuVL3cEzj + /skv997/+b7v39PTW9aj3/BM+OKxPEIZoW/gyrOuPbP+GvRPSNBQQqXYLwSW1etw7cYt5kqfaZ+uD8QM + Xg8f/f4UxGhHMHv4qlG6vAb9394G6T+BPpdV1oCuUx3VD8Q9XT8//PUJRMghlLhLg1C41IK+r/pB+oNC + 16mO6qmP+gdi/6y793+hwTYEk9uoQOSaStHzxQ2Q/nND9XMKy0D9NIfmDcSzaLhI4KXE7LwinLtwGXfu + PXhhqJ/m0DyS62EdUGWpqcf3P97DD3d++t/QnKraBjpghXWAiC+WN0ZNScOe1mP45vbdF2ZvWwdoDs/D + b6ejs6ecxHPoAG/l+Fhkzy+FyCcY0YkG7D/yAW5+d+e5oXrqo36aQ/McnNyjyAAuHWA05pfgzPlehhyT + mflV6FOMaDt2Ctf7bw8KXac6qqc+a4Zx3hLwRLJCZgcJjcPIEPkyIZmeX1SB7vOX0dn9KQy5jw8r8eVc + HOrsxidXP0d9hxlzd4QgeYMzEt7kQVvOR0pFFNpOHmd81E9znIS+dSTc1foVGWfNKUZjyy6Ex6SQl0cD + 09IVxHAFh0+cReqr+QjK8ERqEw+VHWOwoycSR/v1OHwzDlsvhcNCeqkbedAYxQiPm87kZOQVw0nkW0QG + 2DFnIA+JRm3DFpzr/RKNW3ZDE5UAsX8ocizZiFs7DEUHvPFunw4Hb05B+y09jn49lYHe0x5doxqqLVlf + DJrnyB+pIQNs6QAhf6R8tZu3CqpwPdZu2I6PLl3HwnV5iHv9JVSeUOKdqzq81xeDvddiYG73R0aLEIZm + IRa1jUbjxQnYRHa17YqW0VJPwHT3LocRbirrDiymspXo6L6AgiXV8JSNQ2i6GpNWOqK4U4n1n0Vge68W + 9ecmIKnBBSqDCIp4P2RWGDB/QxqS6l1QcToIld3BqDobgsXEQ73+Se5HrGcgdJEokGzIx66DXXi7dRvC + yx2Q2RqApR+GoPbjCag8pUZ6sxjqWRKEldljRr07ZjaKmHt5qpBZKzkeiIJ2BbIPKmA8MIbJUC/ghrM0 + RfYsDtdhqJNIVulK/ku0BQokbfZGZrsKBR3BmEsMOfvl0FY7o7ypDPo1brCcGc+QUCdExabXEFsjQO4B + ObL2BSBlqx8SWwibvBE0334nK3Ael+yEbIW81DZszlhZ2oieuAYvpO5VIHGzP9J2+CN9pz/CzDwExMox + eZUbFnZpkEc+gLZagJjMWOiqXZDVqmC0+kZf6Nb4IHKFCPIsu92sgCw7BlJswjBJLCdenmuPyFUS6Gp9 + oG/yRdJWGSKqhYjKDgLRImK5ACGlzsy9d/zwXn2DBMZDSkZLPaHlnpBncyGO5kxj+Rps/wYdJE2xzfOb + zcU4sye0b0gRu3E0Ypt8ELTICRFGNcShUgjHuZyWxNu2096sdiXS9o1ltNQjyyDhes4SkuXEGpXC+Ve8 + kjlzpDPtoCkVQrdOihgyIHmXP6LryGEX86Ba6ISJNR7IeF+JV8gAfbOM0XoTj8dktpmEOxM4rJHTBscz + njNNnMiBagEfU98ajRnbZMg7GojCk2oGU1cw5nUGw7BHAZWJD6oVhLFzSDCPCacljGP/J7xAm6Hu0ew6 + STIXkcvckN7ig8XHVCjvUiNvdwAmW0Twms6FayS7meM4REoihxPoeT4u10nsZ0LKhhdsIxZEsVcLtOyL + pHffVcd+IJjI7uGHsRscJEPURMMn2FMtNTwuFusPrjFl48ji7nIAAAAASUVORK5CYII= + + + + + iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 + YQUAAAAZdEVYdFNvZnR3YXJlAEFkb2JlIEltYWdlUmVhZHlxyWU8AAADZmlUWHRYTUw6Y29tLmFkb2Jl + LnhtcAAAAAAAPD94cGFja2V0IGJlZ2luPSLvu78iIGlkPSJXNU0wTXBDZWhpSHpyZVN6TlRjemtjOWQi + Pz4gPHg6eG1wbWV0YSB4bWxuczp4PSJhZG9iZTpuczptZXRhLyIgeDp4bXB0az0iQWRvYmUgWE1QIENv + cmUgNS4zLWMwMTEgNjYuMTQ1NjYxLCAyMDEyLzAyLzA2LTE0OjU2OjI3ICAgICAgICAiPiA8cmRmOlJE + RiB4bWxuczpyZGY9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkvMDIvMjItcmRmLXN5bnRheC1ucyMiPiA8 + cmRmOkRlc2NyaXB0aW9uIHJkZjphYm91dD0iIiB4bWxuczp4bXBNTT0iaHR0cDovL25zLmFkb2JlLmNv + bS94YXAvMS4wL21tLyIgeG1sbnM6c3RSZWY9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlw + ZS9SZXNvdXJjZVJlZiMiIHhtbG5zOnhtcD0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wLyIgeG1w + TU06T3JpZ2luYWxEb2N1bWVudElEPSJ4bXAuZGlkOjYzQTM5NEY4Mjg0OUU0MTE5NDBEQTc4ODZEQzk5 + N0NGIiB4bXBNTTpEb2N1bWVudElEPSJ4bXAuZGlkOkUyMTg3NjEyNDlEODExRTQ4NjNGQjM2Mzk1QkNB + RkQwIiB4bXBNTTpJbnN0YW5jZUlEPSJ4bXAuaWlkOkUyMTg3NjExNDlEODExRTQ4NjNGQjM2Mzk1QkNB + RkQwIiB4bXA6Q3JlYXRvclRvb2w9IkFkb2JlIFBob3Rvc2hvcCBDUzYgKFdpbmRvd3MpIj4gPHhtcE1N + OkRlcml2ZWRGcm9tIHN0UmVmOmluc3RhbmNlSUQ9InhtcC5paWQ6NkJCNTE0NDlEODQ5RTQxMUE0QzNB + MjdEOTJBQzc3QkMiIHN0UmVmOmRvY3VtZW50SUQ9InhtcC5kaWQ6NjNBMzk0RjgyODQ5RTQxMTk0MERB + Nzg4NkRDOTk3Q0YiLz4gPC9yZGY6RGVzY3JpcHRpb24+IDwvcmRmOlJERj4gPC94OnhtcG1ldGE+IDw/ + eHBhY2tldCBlbmQ9InIiPz5e5MstAAADiUlEQVRIS+2UW0yTdxjGcePwtYyVVpAUCi1tv9ImrVbxhAei + kjGphAgFT4jzEJ0gGuJhDk0sml0sglmWmC1hqHNKWwI4srgNh3phpjg1O1yIN5DMbFHQZUu42O76+D4f + 3Fl6Z7ILn+SXvH3f533++X/98iUBeKW81v9Uwx1G1+1240EhfKfdeE/4U3qTAqaZZO/2aeN9IXLrY+Ph + wVOZHll9YyohgYZOGS4JsYdXVDy+NQ8Tvy3BP6OlmPyjDP9OBDRYs8cZPfRy5/uQISIRqcIsLSye+j7I + wN+PluOvhyWY+NmL8fsOjP9kxdN7BRh/YJHfFjy5m48nd4ThQjy968bEgwV49usicFciTEKKFhZPXXv1 + eHxtLsYGPBjttwsWjF0xY+ybOfj9uylYs8cZPfQS7kpEnqDTwuLp9GYlfKZeifUfzcb1j/Iw/IkNv3Q6 + MfKVC6O9bg3W7HFGD73cORlMG5AIizDzAaVtunD5ESXWfNSEY/tNCO00oG1zOkJBBSeqUjVYh6R3Qmat + zSY0Hjah7IASW7hPuSoRvIGihcVTSauCppvFODRUjJZvPWgaKMTuXgt2RHOxLTwHDd3EjPfCudgesWJX + jxM7eryo7/Ni8SGFj8gp6LWwePLvS0Og043A5y5UdtkQOJeLivM5ePf8bJSfM04zG2u7chDoysW6Thsq + zqpY0+GAvymNB/gEgxYWT64tKdGihpSYv8WEpSEzVp0pwDuf2SVQReCiS4M1e5zRQy937NXJ1yRirjDz + AVmVJyNZa9+PObauh7ptKdR6FY6N2SisTYe1OlmDNXtqvRNqwxLYt1TCVLY1ZijZOSQRbuEtLSyeTOXH + sfLDH1EauoFFx6/Cd6Qf7pYI1ObLsO+9iMLdF+DccwEuqd2Nl+Br6sbCxiiKd/XBuPogH1HiAzJXHMC8 + YA98td1wb4rCuaEH1roo8oMR5JGaMPIFa10Ejtowiuouw1vzJTwVXyBz+X4ekPgRZfgbohkLtsfMy47B + tqYdakUnPFUM6YUv+LUGa/Y4o8e8rBXcSffWDkpE4j9ZpEvNmb9KsZV16BzrBnVq1YjeVf1MX1Tzn74o + iCmkdq1/LrNHOkfgB6Vg9afJRrVOdv2ClRkMmklvCnyPs4V8ge81v5RegddnCGHNHmf00JslcJcZCcWv + IU1pAhcyhLcFXj1zGtbscUYPvdyZ+Uv6Wi8rKekFBjoX2627by8AAAAASUVORK5CYII= + + + + + iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 + YQUAAAAZdEVYdFNvZnR3YXJlAEFkb2JlIEltYWdlUmVhZHlxyWU8AAADZmlUWHRYTUw6Y29tLmFkb2Jl + LnhtcAAAAAAAPD94cGFja2V0IGJlZ2luPSLvu78iIGlkPSJXNU0wTXBDZWhpSHpyZVN6TlRjemtjOWQi + Pz4gPHg6eG1wbWV0YSB4bWxuczp4PSJhZG9iZTpuczptZXRhLyIgeDp4bXB0az0iQWRvYmUgWE1QIENv + cmUgNS4zLWMwMTEgNjYuMTQ1NjYxLCAyMDEyLzAyLzA2LTE0OjU2OjI3ICAgICAgICAiPiA8cmRmOlJE + RiB4bWxuczpyZGY9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkvMDIvMjItcmRmLXN5bnRheC1ucyMiPiA8 + cmRmOkRlc2NyaXB0aW9uIHJkZjphYm91dD0iIiB4bWxuczp4bXBNTT0iaHR0cDovL25zLmFkb2JlLmNv + bS94YXAvMS4wL21tLyIgeG1sbnM6c3RSZWY9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlw + ZS9SZXNvdXJjZVJlZiMiIHhtbG5zOnhtcD0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wLyIgeG1w + TU06T3JpZ2luYWxEb2N1bWVudElEPSJ4bXAuZGlkOjYzQTM5NEY4Mjg0OUU0MTE5NDBEQTc4ODZEQzk5 + N0NGIiB4bXBNTTpEb2N1bWVudElEPSJ4bXAuZGlkOkE2Q0VGMDE2NDlEQTExRTQ4NTlCQTI3NTMyOEY5 + NEU2IiB4bXBNTTpJbnN0YW5jZUlEPSJ4bXAuaWlkOkE2Q0VGMDE1NDlEQTExRTQ4NTlCQTI3NTMyOEY5 + NEU2IiB4bXA6Q3JlYXRvclRvb2w9IkFkb2JlIFBob3Rvc2hvcCBDUzYgKFdpbmRvd3MpIj4gPHhtcE1N + OkRlcml2ZWRGcm9tIHN0UmVmOmluc3RhbmNlSUQ9InhtcC5paWQ6NjA1MjM3NzFEOTQ5RTQxMUE0QzNB + MjdEOTJBQzc3QkMiIHN0UmVmOmRvY3VtZW50SUQ9InhtcC5kaWQ6NjNBMzk0RjgyODQ5RTQxMTk0MERB + Nzg4NkRDOTk3Q0YiLz4gPC9yZGY6RGVzY3JpcHRpb24+IDwvcmRmOlJERj4gPC94OnhtcG1ldGE+IDw/ + eHBhY2tldCBlbmQ9InIiPz6UH16BAAABrElEQVRIS63N70tTURzH8fsnKSGCCEIQCBKISMq2iILCgQOL + JUxQAoVKdMGQuwgWFepsMGjFZCMuorsIJV4WFatpvzdr1ZAFsaIHn8559v1eDsI91wevJ/ee7/tjbMRH + fAFwJOWRF6oopTzyQhWlVEdBwRbgUhICAnuvilKGtXDGzW6WV/CvbjE/xTfxr+R6q4xSxtP5YTf8rVn4 + s5dG+809Rv5zvVVGKaNwfYgyBfhksoH83CCF9seiL7LBBnLXTlP4/W4dza0ZLS0nCdlgA9npAQq/qk/Q + sKa0NJ8nIBtsIBPrp9CqPMJBYVLLj+04ZIMNrF49ReHwVRafH1/R8m3zJmSDDdy/fJJC88Ua3mcjWurW + LGSDDaQifRS+O8uopsNaPhVnIBts4E64l0Jj5y4qDy5q+ZCPQTbYgHmph8LXZ0m8TJ3Xsp+LQjbYQOJC + N4XadgLl22e1vM1OQDbYwK1zXRS+lBbhmEHsLgU8kTeVh+OQDTawEDpB2U4mitfpMS22GYJssIH5QCcV + FGwBmuRtkA3cGO3whcZUlEdeqKKU8sgLVZRSfjw+MP4DJ2GPpDR9OIsAAAAASUVORK5CYII= + + + + + iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 + YQUAAAAZdEVYdFNvZnR3YXJlAEFkb2JlIEltYWdlUmVhZHlxyWU8AAADZmlUWHRYTUw6Y29tLmFkb2Jl + LnhtcAAAAAAAPD94cGFja2V0IGJlZ2luPSLvu78iIGlkPSJXNU0wTXBDZWhpSHpyZVN6TlRjemtjOWQi + Pz4gPHg6eG1wbWV0YSB4bWxuczp4PSJhZG9iZTpuczptZXRhLyIgeDp4bXB0az0iQWRvYmUgWE1QIENv + cmUgNS4zLWMwMTEgNjYuMTQ1NjYxLCAyMDEyLzAyLzA2LTE0OjU2OjI3ICAgICAgICAiPiA8cmRmOlJE + RiB4bWxuczpyZGY9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkvMDIvMjItcmRmLXN5bnRheC1ucyMiPiA8 + cmRmOkRlc2NyaXB0aW9uIHJkZjphYm91dD0iIiB4bWxuczp4bXBNTT0iaHR0cDovL25zLmFkb2JlLmNv + bS94YXAvMS4wL21tLyIgeG1sbnM6c3RSZWY9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlw + ZS9SZXNvdXJjZVJlZiMiIHhtbG5zOnhtcD0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wLyIgeG1w + TU06T3JpZ2luYWxEb2N1bWVudElEPSJ4bXAuZGlkOjYzQTM5NEY4Mjg0OUU0MTE5NDBEQTc4ODZEQzk5 + N0NGIiB4bXBNTTpEb2N1bWVudElEPSJ4bXAuZGlkOjJGRTU5OEQ1NDlEQjExRTRBRUVDOTkyMjQ5NzEw + REUwIiB4bXBNTTpJbnN0YW5jZUlEPSJ4bXAuaWlkOjJGRTU5OEQ0NDlEQjExRTRBRUVDOTkyMjQ5NzEw + REUwIiB4bXA6Q3JlYXRvclRvb2w9IkFkb2JlIFBob3Rvc2hvcCBDUzYgKFdpbmRvd3MpIj4gPHhtcE1N + OkRlcml2ZWRGcm9tIHN0UmVmOmluc3RhbmNlSUQ9InhtcC5paWQ6MTY0MkI1RjlEQTQ5RTQxMUE0QzNB + MjdEOTJBQzc3QkMiIHN0UmVmOmRvY3VtZW50SUQ9InhtcC5kaWQ6NjNBMzk0RjgyODQ5RTQxMTk0MERB + Nzg4NkRDOTk3Q0YiLz4gPC9yZGY6RGVzY3JpcHRpb24+IDwvcmRmOlJERj4gPC94OnhtcG1ldGE+IDw/ + eHBhY2tldCBlbmQ9InIiPz6B5sF9AAACe0lEQVRIS7WVb2jMcRzHL7UHanF/Mts5prE/1li3kAfu5Ak7 + 5IHNobBkSC2UIuGJkrrSWRvTmHQWK8U1T8jqUtYwkZpaGjV/Js6to5YwfXze39+fu/v23f36hXe9us+f + 7/v9rd/dr3MQ0X/F4Zm3+K9QhWajNNlBFZqN0mQHS6lMdrCUyqSgimllUsy4XmOmp+QRDllQWbygjjq6 + uimZStOX8a+ixox3pXrM1JLCDAqYJmY7c669M0bff07mcLbtEl9QE8k6V6BH5ooXMsHZZX7ae+AY7W45 + SrPm19LbsSR9m/iRA2bYGefggVePzUgKBzeu9sQpmZ4QcG/WMtk7eLjv0WMz0kOz+TX6MUXvP6cFeNbD + bz6YvQFm2Bk9PPByZO6jksLB5KvRTzTyLikIrG2ktsvXzd4g2hGjYP1ms4eHvb850qkl65LCQW/ntVs0 + 9HpMcPx0K1X4V1Ff/3NzhnphbVDsjBk8Lm/VE44s0ZJ1KS4Ie8uXUvPBE7Tn0ElCzTMqrV5BO/cfEaDG + TD5X6PFFONLygsTF7jj1vxihyPkYNTS1iFrFxm37KHIhJmp43L7qZxzp0pJ1SeHhQGgLJQaH6fb9R1QX + 2EB3Ek9FryLe95j8K9eLT/TB0FZcskOP1iRdkIh23aR7Ay9pzaZddKY9Jup8nIpeoXXhZlHD655b85Bj + p2npLOmCML+dD/iTZhaX3+UvbRB1PpzeygFnSUUvatecRUMzisoOc+x0LZ3FixxYhQyK1cxyZhkTYhqY + RgnM6hmcwVl4ljDI0KS4AC+Kmyli8Jv2MF7GNwXY4QzOwgNv5mWTL7CLpVQmO1hKZbKDpVR/1P8OcvwB + lh7gOXXZq9sAAAAASUVORK5CYII= + + iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 @@ -598,147 +738,7 @@ 1BGxz38BvCwLsyQ3iHgAAAAASUVORK5CYII= - - - iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAZdEVYdFNvZnR3YXJlAEFkb2JlIEltYWdlUmVhZHlxyWU8AAADZmlUWHRYTUw6Y29tLmFkb2Jl - LnhtcAAAAAAAPD94cGFja2V0IGJlZ2luPSLvu78iIGlkPSJXNU0wTXBDZWhpSHpyZVN6TlRjemtjOWQi - Pz4gPHg6eG1wbWV0YSB4bWxuczp4PSJhZG9iZTpuczptZXRhLyIgeDp4bXB0az0iQWRvYmUgWE1QIENv - cmUgNS4zLWMwMTEgNjYuMTQ1NjYxLCAyMDEyLzAyLzA2LTE0OjU2OjI3ICAgICAgICAiPiA8cmRmOlJE - RiB4bWxuczpyZGY9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkvMDIvMjItcmRmLXN5bnRheC1ucyMiPiA8 - cmRmOkRlc2NyaXB0aW9uIHJkZjphYm91dD0iIiB4bWxuczp4bXBNTT0iaHR0cDovL25zLmFkb2JlLmNv - bS94YXAvMS4wL21tLyIgeG1sbnM6c3RSZWY9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlw - ZS9SZXNvdXJjZVJlZiMiIHhtbG5zOnhtcD0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wLyIgeG1w - TU06T3JpZ2luYWxEb2N1bWVudElEPSJ4bXAuZGlkOjYzQTM5NEY4Mjg0OUU0MTE5NDBEQTc4ODZEQzk5 - N0NGIiB4bXBNTTpEb2N1bWVudElEPSJ4bXAuZGlkOjEwQ0IxNzBBNEM1QzExRTRBNkNGQzRBMjhDQzI0 - MkY4IiB4bXBNTTpJbnN0YW5jZUlEPSJ4bXAuaWlkOjEwQ0IxNzA5NEM1QzExRTRBNkNGQzRBMjhDQzI0 - MkY4IiB4bXA6Q3JlYXRvclRvb2w9IkFkb2JlIFBob3Rvc2hvcCBDUzYgKFdpbmRvd3MpIj4gPHhtcE1N - OkRlcml2ZWRGcm9tIHN0UmVmOmluc3RhbmNlSUQ9InhtcC5paWQ6NTEzMDNDMjA1QjRDRTQxMTg4NERE - MUVBOEQ4QTgyNTUiIHN0UmVmOmRvY3VtZW50SUQ9InhtcC5kaWQ6NjNBMzk0RjgyODQ5RTQxMTk0MERB - Nzg4NkRDOTk3Q0YiLz4gPC9yZGY6RGVzY3JpcHRpb24+IDwvcmRmOlJERj4gPC94OnhtcG1ldGE+IDw/ - eHBhY2tldCBlbmQ9InIiPz43wa2/AAAFaUlEQVRIS6WUC0xTVxzGKy0UkSmlFGjBFilSkNpSaAWRh63y - sIiAArKs4spLRLQoiEJlSMGoMCc6CBOnYHzMOHUqqOhEHOqCbjNu6kCd6KYje5mZ6KbObd/OuVL3cEzj - /skv997/+b7v39PTW9aj3/BM+OKxPEIZoW/gyrOuPbP+GvRPSNBQQqXYLwSW1etw7cYt5kqfaZ+uD8QM - Xg8f/f4UxGhHMHv4qlG6vAb9394G6T+BPpdV1oCuUx3VD8Q9XT8//PUJRMghlLhLg1C41IK+r/pB+oNC - 16mO6qmP+gdi/6y793+hwTYEk9uoQOSaStHzxQ2Q/nND9XMKy0D9NIfmDcSzaLhI4KXE7LwinLtwGXfu - PXhhqJ/m0DyS62EdUGWpqcf3P97DD3d++t/QnKraBjpghXWAiC+WN0ZNScOe1mP45vbdF2ZvWwdoDs/D - b6ejs6ecxHPoAG/l+Fhkzy+FyCcY0YkG7D/yAW5+d+e5oXrqo36aQ/McnNyjyAAuHWA05pfgzPlehhyT - mflV6FOMaDt2Ctf7bw8KXac6qqc+a4Zx3hLwRLJCZgcJjcPIEPkyIZmeX1SB7vOX0dn9KQy5jw8r8eVc - HOrsxidXP0d9hxlzd4QgeYMzEt7kQVvOR0pFFNpOHmd81E9znIS+dSTc1foVGWfNKUZjyy6Ex6SQl0cD - 09IVxHAFh0+cReqr+QjK8ERqEw+VHWOwoycSR/v1OHwzDlsvhcNCeqkbedAYxQiPm87kZOQVw0nkW0QG - 2DFnIA+JRm3DFpzr/RKNW3ZDE5UAsX8ocizZiFs7DEUHvPFunw4Hb05B+y09jn49lYHe0x5doxqqLVlf - DJrnyB+pIQNs6QAhf6R8tZu3CqpwPdZu2I6PLl3HwnV5iHv9JVSeUOKdqzq81xeDvddiYG73R0aLEIZm - IRa1jUbjxQnYRHa17YqW0VJPwHT3LocRbirrDiymspXo6L6AgiXV8JSNQ2i6GpNWOqK4U4n1n0Vge68W - 9ecmIKnBBSqDCIp4P2RWGDB/QxqS6l1QcToIld3BqDobgsXEQ73+Se5HrGcgdJEokGzIx66DXXi7dRvC - yx2Q2RqApR+GoPbjCag8pUZ6sxjqWRKEldljRr07ZjaKmHt5qpBZKzkeiIJ2BbIPKmA8MIbJUC/ghrM0 - RfYsDtdhqJNIVulK/ku0BQokbfZGZrsKBR3BmEsMOfvl0FY7o7ypDPo1brCcGc+QUCdExabXEFsjQO4B - ObL2BSBlqx8SWwibvBE0334nK3Ael+yEbIW81DZszlhZ2oieuAYvpO5VIHGzP9J2+CN9pz/CzDwExMox - eZUbFnZpkEc+gLZagJjMWOiqXZDVqmC0+kZf6Nb4IHKFCPIsu92sgCw7BlJswjBJLCdenmuPyFUS6Gp9 - oG/yRdJWGSKqhYjKDgLRImK5ACGlzsy9d/zwXn2DBMZDSkZLPaHlnpBncyGO5kxj+Rps/wYdJE2xzfOb - zcU4sye0b0gRu3E0Ypt8ELTICRFGNcShUgjHuZyWxNu2096sdiXS9o1ltNQjyyDhes4SkuXEGpXC+Ve8 - kjlzpDPtoCkVQrdOihgyIHmXP6LryGEX86Ba6ISJNR7IeF+JV8gAfbOM0XoTj8dktpmEOxM4rJHTBscz - njNNnMiBagEfU98ajRnbZMg7GojCk2oGU1cw5nUGw7BHAZWJD6oVhLFzSDCPCacljGP/J7xAm6Hu0ew6 - STIXkcvckN7ig8XHVCjvUiNvdwAmW0Twms6FayS7meM4REoihxPoeT4u10nsZ0LKhhdsIxZEsVcLtOyL - pHffVcd+IJjI7uGHsRscJEPURMMn2FMtNTwuFusPrjFl48ji7nIAAAAASUVORK5CYII= - - - - - iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAZdEVYdFNvZnR3YXJlAEFkb2JlIEltYWdlUmVhZHlxyWU8AAADZmlUWHRYTUw6Y29tLmFkb2Jl - LnhtcAAAAAAAPD94cGFja2V0IGJlZ2luPSLvu78iIGlkPSJXNU0wTXBDZWhpSHpyZVN6TlRjemtjOWQi - Pz4gPHg6eG1wbWV0YSB4bWxuczp4PSJhZG9iZTpuczptZXRhLyIgeDp4bXB0az0iQWRvYmUgWE1QIENv - cmUgNS4zLWMwMTEgNjYuMTQ1NjYxLCAyMDEyLzAyLzA2LTE0OjU2OjI3ICAgICAgICAiPiA8cmRmOlJE - RiB4bWxuczpyZGY9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkvMDIvMjItcmRmLXN5bnRheC1ucyMiPiA8 - cmRmOkRlc2NyaXB0aW9uIHJkZjphYm91dD0iIiB4bWxuczp4bXBNTT0iaHR0cDovL25zLmFkb2JlLmNv - bS94YXAvMS4wL21tLyIgeG1sbnM6c3RSZWY9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlw - ZS9SZXNvdXJjZVJlZiMiIHhtbG5zOnhtcD0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wLyIgeG1w - TU06T3JpZ2luYWxEb2N1bWVudElEPSJ4bXAuZGlkOjYzQTM5NEY4Mjg0OUU0MTE5NDBEQTc4ODZEQzk5 - N0NGIiB4bXBNTTpEb2N1bWVudElEPSJ4bXAuZGlkOkUyMTg3NjEyNDlEODExRTQ4NjNGQjM2Mzk1QkNB - RkQwIiB4bXBNTTpJbnN0YW5jZUlEPSJ4bXAuaWlkOkUyMTg3NjExNDlEODExRTQ4NjNGQjM2Mzk1QkNB - RkQwIiB4bXA6Q3JlYXRvclRvb2w9IkFkb2JlIFBob3Rvc2hvcCBDUzYgKFdpbmRvd3MpIj4gPHhtcE1N - OkRlcml2ZWRGcm9tIHN0UmVmOmluc3RhbmNlSUQ9InhtcC5paWQ6NkJCNTE0NDlEODQ5RTQxMUE0QzNB - MjdEOTJBQzc3QkMiIHN0UmVmOmRvY3VtZW50SUQ9InhtcC5kaWQ6NjNBMzk0RjgyODQ5RTQxMTk0MERB - Nzg4NkRDOTk3Q0YiLz4gPC9yZGY6RGVzY3JpcHRpb24+IDwvcmRmOlJERj4gPC94OnhtcG1ldGE+IDw/ - eHBhY2tldCBlbmQ9InIiPz5e5MstAAADiUlEQVRIS+2UW0yTdxjGcePwtYyVVpAUCi1tv9ImrVbxhAei - kjGphAgFT4jzEJ0gGuJhDk0sml0sglmWmC1hqHNKWwI4srgNh3phpjg1O1yIN5DMbFHQZUu42O76+D4f - 3Fl6Z7ILn+SXvH3f533++X/98iUBeKW81v9Uwx1G1+1240EhfKfdeE/4U3qTAqaZZO/2aeN9IXLrY+Ph - wVOZHll9YyohgYZOGS4JsYdXVDy+NQ8Tvy3BP6OlmPyjDP9OBDRYs8cZPfRy5/uQISIRqcIsLSye+j7I - wN+PluOvhyWY+NmL8fsOjP9kxdN7BRh/YJHfFjy5m48nd4ThQjy968bEgwV49usicFciTEKKFhZPXXv1 - eHxtLsYGPBjttwsWjF0xY+ybOfj9uylYs8cZPfQS7kpEnqDTwuLp9GYlfKZeifUfzcb1j/Iw/IkNv3Q6 - MfKVC6O9bg3W7HFGD73cORlMG5AIizDzAaVtunD5ESXWfNSEY/tNCO00oG1zOkJBBSeqUjVYh6R3Qmat - zSY0Hjah7IASW7hPuSoRvIGihcVTSauCppvFODRUjJZvPWgaKMTuXgt2RHOxLTwHDd3EjPfCudgesWJX - jxM7eryo7/Ni8SGFj8gp6LWwePLvS0Og043A5y5UdtkQOJeLivM5ePf8bJSfM04zG2u7chDoysW6Thsq - zqpY0+GAvymNB/gEgxYWT64tKdGihpSYv8WEpSEzVp0pwDuf2SVQReCiS4M1e5zRQy937NXJ1yRirjDz - AVmVJyNZa9+PObauh7ptKdR6FY6N2SisTYe1OlmDNXtqvRNqwxLYt1TCVLY1ZijZOSQRbuEtLSyeTOXH - sfLDH1EauoFFx6/Cd6Qf7pYI1ObLsO+9iMLdF+DccwEuqd2Nl+Br6sbCxiiKd/XBuPogH1HiAzJXHMC8 - YA98td1wb4rCuaEH1roo8oMR5JGaMPIFa10Ejtowiuouw1vzJTwVXyBz+X4ekPgRZfgbohkLtsfMy47B - tqYdakUnPFUM6YUv+LUGa/Y4o8e8rBXcSffWDkpE4j9ZpEvNmb9KsZV16BzrBnVq1YjeVf1MX1Tzn74o - iCmkdq1/LrNHOkfgB6Vg9afJRrVOdv2ClRkMmklvCnyPs4V8ge81v5RegddnCGHNHmf00JslcJcZCcWv - IU1pAhcyhLcFXj1zGtbscUYPvdyZ+Uv6Wi8rKekFBjoX2627by8AAAAASUVORK5CYII= - - - - - iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAZdEVYdFNvZnR3YXJlAEFkb2JlIEltYWdlUmVhZHlxyWU8AAADZmlUWHRYTUw6Y29tLmFkb2Jl - LnhtcAAAAAAAPD94cGFja2V0IGJlZ2luPSLvu78iIGlkPSJXNU0wTXBDZWhpSHpyZVN6TlRjemtjOWQi - Pz4gPHg6eG1wbWV0YSB4bWxuczp4PSJhZG9iZTpuczptZXRhLyIgeDp4bXB0az0iQWRvYmUgWE1QIENv - cmUgNS4zLWMwMTEgNjYuMTQ1NjYxLCAyMDEyLzAyLzA2LTE0OjU2OjI3ICAgICAgICAiPiA8cmRmOlJE - RiB4bWxuczpyZGY9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkvMDIvMjItcmRmLXN5bnRheC1ucyMiPiA8 - cmRmOkRlc2NyaXB0aW9uIHJkZjphYm91dD0iIiB4bWxuczp4bXBNTT0iaHR0cDovL25zLmFkb2JlLmNv - bS94YXAvMS4wL21tLyIgeG1sbnM6c3RSZWY9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlw - ZS9SZXNvdXJjZVJlZiMiIHhtbG5zOnhtcD0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wLyIgeG1w - TU06T3JpZ2luYWxEb2N1bWVudElEPSJ4bXAuZGlkOjYzQTM5NEY4Mjg0OUU0MTE5NDBEQTc4ODZEQzk5 - N0NGIiB4bXBNTTpEb2N1bWVudElEPSJ4bXAuZGlkOkE2Q0VGMDE2NDlEQTExRTQ4NTlCQTI3NTMyOEY5 - NEU2IiB4bXBNTTpJbnN0YW5jZUlEPSJ4bXAuaWlkOkE2Q0VGMDE1NDlEQTExRTQ4NTlCQTI3NTMyOEY5 - NEU2IiB4bXA6Q3JlYXRvclRvb2w9IkFkb2JlIFBob3Rvc2hvcCBDUzYgKFdpbmRvd3MpIj4gPHhtcE1N - OkRlcml2ZWRGcm9tIHN0UmVmOmluc3RhbmNlSUQ9InhtcC5paWQ6NjA1MjM3NzFEOTQ5RTQxMUE0QzNB - MjdEOTJBQzc3QkMiIHN0UmVmOmRvY3VtZW50SUQ9InhtcC5kaWQ6NjNBMzk0RjgyODQ5RTQxMTk0MERB - Nzg4NkRDOTk3Q0YiLz4gPC9yZGY6RGVzY3JpcHRpb24+IDwvcmRmOlJERj4gPC94OnhtcG1ldGE+IDw/ - eHBhY2tldCBlbmQ9InIiPz6UH16BAAABrElEQVRIS63N70tTURzH8fsnKSGCCEIQCBKISMq2iILCgQOL - JUxQAoVKdMGQuwgWFepsMGjFZCMuorsIJV4WFatpvzdr1ZAFsaIHn8559v1eDsI91wevJ/ee7/tjbMRH - fAFwJOWRF6oopTzyQhWlVEdBwRbgUhICAnuvilKGtXDGzW6WV/CvbjE/xTfxr+R6q4xSxtP5YTf8rVn4 - s5dG+809Rv5zvVVGKaNwfYgyBfhksoH83CCF9seiL7LBBnLXTlP4/W4dza0ZLS0nCdlgA9npAQq/qk/Q - sKa0NJ8nIBtsIBPrp9CqPMJBYVLLj+04ZIMNrF49ReHwVRafH1/R8m3zJmSDDdy/fJJC88Ua3mcjWurW - LGSDDaQifRS+O8uopsNaPhVnIBts4E64l0Jj5y4qDy5q+ZCPQTbYgHmph8LXZ0m8TJ3Xsp+LQjbYQOJC - N4XadgLl22e1vM1OQDbYwK1zXRS+lBbhmEHsLgU8kTeVh+OQDTawEDpB2U4mitfpMS22GYJssIH5QCcV - FGwBmuRtkA3cGO3whcZUlEdeqKKU8sgLVZRSfjw+MP4DJ2GPpDR9OIsAAAAASUVORK5CYII= - - - - - iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAZdEVYdFNvZnR3YXJlAEFkb2JlIEltYWdlUmVhZHlxyWU8AAADZmlUWHRYTUw6Y29tLmFkb2Jl - LnhtcAAAAAAAPD94cGFja2V0IGJlZ2luPSLvu78iIGlkPSJXNU0wTXBDZWhpSHpyZVN6TlRjemtjOWQi - Pz4gPHg6eG1wbWV0YSB4bWxuczp4PSJhZG9iZTpuczptZXRhLyIgeDp4bXB0az0iQWRvYmUgWE1QIENv - cmUgNS4zLWMwMTEgNjYuMTQ1NjYxLCAyMDEyLzAyLzA2LTE0OjU2OjI3ICAgICAgICAiPiA8cmRmOlJE - RiB4bWxuczpyZGY9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkvMDIvMjItcmRmLXN5bnRheC1ucyMiPiA8 - cmRmOkRlc2NyaXB0aW9uIHJkZjphYm91dD0iIiB4bWxuczp4bXBNTT0iaHR0cDovL25zLmFkb2JlLmNv - bS94YXAvMS4wL21tLyIgeG1sbnM6c3RSZWY9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlw - ZS9SZXNvdXJjZVJlZiMiIHhtbG5zOnhtcD0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wLyIgeG1w - TU06T3JpZ2luYWxEb2N1bWVudElEPSJ4bXAuZGlkOjYzQTM5NEY4Mjg0OUU0MTE5NDBEQTc4ODZEQzk5 - N0NGIiB4bXBNTTpEb2N1bWVudElEPSJ4bXAuZGlkOjJGRTU5OEQ1NDlEQjExRTRBRUVDOTkyMjQ5NzEw - REUwIiB4bXBNTTpJbnN0YW5jZUlEPSJ4bXAuaWlkOjJGRTU5OEQ0NDlEQjExRTRBRUVDOTkyMjQ5NzEw - REUwIiB4bXA6Q3JlYXRvclRvb2w9IkFkb2JlIFBob3Rvc2hvcCBDUzYgKFdpbmRvd3MpIj4gPHhtcE1N - OkRlcml2ZWRGcm9tIHN0UmVmOmluc3RhbmNlSUQ9InhtcC5paWQ6MTY0MkI1RjlEQTQ5RTQxMUE0QzNB - MjdEOTJBQzc3QkMiIHN0UmVmOmRvY3VtZW50SUQ9InhtcC5kaWQ6NjNBMzk0RjgyODQ5RTQxMTk0MERB - Nzg4NkRDOTk3Q0YiLz4gPC9yZGY6RGVzY3JpcHRpb24+IDwvcmRmOlJERj4gPC94OnhtcG1ldGE+IDw/ - eHBhY2tldCBlbmQ9InIiPz6B5sF9AAACe0lEQVRIS7WVb2jMcRzHL7UHanF/Mts5prE/1li3kAfu5Ak7 - 5IHNobBkSC2UIuGJkrrSWRvTmHQWK8U1T8jqUtYwkZpaGjV/Js6to5YwfXze39+fu/v23f36hXe9us+f - 7/v9rd/dr3MQ0X/F4Zm3+K9QhWajNNlBFZqN0mQHS6lMdrCUyqSgimllUsy4XmOmp+QRDllQWbygjjq6 - uimZStOX8a+ixox3pXrM1JLCDAqYJmY7c669M0bff07mcLbtEl9QE8k6V6BH5ooXMsHZZX7ae+AY7W45 - SrPm19LbsSR9m/iRA2bYGefggVePzUgKBzeu9sQpmZ4QcG/WMtk7eLjv0WMz0kOz+TX6MUXvP6cFeNbD - bz6YvQFm2Bk9PPByZO6jksLB5KvRTzTyLikIrG2ktsvXzd4g2hGjYP1ms4eHvb850qkl65LCQW/ntVs0 - 9HpMcPx0K1X4V1Ff/3NzhnphbVDsjBk8Lm/VE44s0ZJ1KS4Ie8uXUvPBE7Tn0ElCzTMqrV5BO/cfEaDG - TD5X6PFFONLygsTF7jj1vxihyPkYNTS1iFrFxm37KHIhJmp43L7qZxzp0pJ1SeHhQGgLJQaH6fb9R1QX - 2EB3Ek9FryLe95j8K9eLT/TB0FZcskOP1iRdkIh23aR7Ay9pzaZddKY9Jup8nIpeoXXhZlHD655b85Bj - p2npLOmCML+dD/iTZhaX3+UvbRB1PpzeygFnSUUvatecRUMzisoOc+x0LZ3FixxYhQyK1cxyZhkTYhqY - RgnM6hmcwVl4ljDI0KS4AC+Kmyli8Jv2MF7GNwXY4QzOwgNv5mWTL7CLpVQmO1hKZbKDpVR/1P8OcvwB - lh7gOXXZq9sAAAAASUVORK5CYII= - - - + iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 YQUAAAAZdEVYdFNvZnR3YXJlAEFkb2JlIEltYWdlUmVhZHlxyWU8AAADZmlUWHRYTUw6Y29tLmFkb2Jl @@ -750,26 +750,244 @@ bS94YXAvMS4wL21tLyIgeG1sbnM6c3RSZWY9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlw ZS9SZXNvdXJjZVJlZiMiIHhtbG5zOnhtcD0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wLyIgeG1w TU06T3JpZ2luYWxEb2N1bWVudElEPSJ4bXAuZGlkOjJGQzkyMzc0Rjk0OUU0MTE5NjNCQjRENDMzQjlC - MUM4IiB4bXBNTTpEb2N1bWVudElEPSJ4bXAuZGlkOjJERjY3MEZENEQyMzExRTRCNDlGQUMwMzk0OTAw - Qzc4IiB4bXBNTTpJbnN0YW5jZUlEPSJ4bXAuaWlkOjJERjY3MEZDNEQyMzExRTRCNDlGQUMwMzk0OTAw - Qzc4IiB4bXA6Q3JlYXRvclRvb2w9IkFkb2JlIFBob3Rvc2hvcCBDUzYgKFdpbmRvd3MpIj4gPHhtcE1N - OkRlcml2ZWRGcm9tIHN0UmVmOmluc3RhbmNlSUQ9InhtcC5paWQ6NjhGOUEyRDEyMTRERTQxMUIzNkJE + MUM4IiB4bXBNTTpEb2N1bWVudElEPSJ4bXAuZGlkOjlDMzFEOUI4NEFBRjExRTQ4OTA5OUYwQ0QzM0Q2 + NEI4IiB4bXBNTTpJbnN0YW5jZUlEPSJ4bXAuaWlkOjlDMzFEOUI3NEFBRjExRTQ4OTA5OUYwQ0QzM0Q2 + NEI4IiB4bXA6Q3JlYXRvclRvb2w9IkFkb2JlIFBob3Rvc2hvcCBDUzYgKFdpbmRvd3MpIj4gPHhtcE1N + OkRlcml2ZWRGcm9tIHN0UmVmOmluc3RhbmNlSUQ9InhtcC5paWQ6MDk5Mzk2NTZBRjRBRTQxMTk3NEFD + QUFFQjRCMzVENkUiIHN0UmVmOmRvY3VtZW50SUQ9InhtcC5kaWQ6MkZDOTIzNzRGOTQ5RTQxMTk2M0JC + NEQ0MzNCOUIxQzgiLz4gPC9yZGY6RGVzY3JpcHRpb24+IDwvcmRmOlJERj4gPC94OnhtcG1ldGE+IDw/ + eHBhY2tldCBlbmQ9InIiPz73sIMwAAADIElEQVRIS7WVa0iTYRTH56Uiysvm3TkvpLl5DRIvQYWVWl+6 + iNEVg0yhQqloQZHkLT+Y0YdAs75IpEUhzERZoZhsRpZlS7soblotsRwoxhqWeTrnYZtv+u7NsB74cZ5z + zv89/z17HzYRAPxXeIv/EpFXcOyi4BvKhfehv4FvKBfeh+ayqIUDlIgBgT8whpRYoT2fhgvNVJKBQT9s + hB8/QZDPpnEIjEhg0J5Pw4Vm0mwygG9T06BSqQQhTUhUMoRGpyxYT7OZwfhXC6jVakFIYzNYqN5uMGKa + BI1GIwhpghXJaJJi13d0dEB2bj74hsWzSDlXbzfQG02g0+kEIU2wIomdovzKdVifngnFFytBeb4cLN+n + WaSc6hfKKqB/eHTWoHfwExgMBkFII5MnQUD4WlAWloO26wVs35MDmifPmQFFyqlO/aKKqlmDp31DYDKZ + BCGNTJ4IPqHx8LJvACbNUw7p6e2HuJQMNIhhBuaHj3vBYrEI0tb1BoIiE9kJ9h7Oh7EJM+g/jEJuwVlY + s24ri5RTnfo5BedAIoueIYPumvomuHzjzm9cq2uCq7UNUH2rEarr7kNd0yP26Y+eKoSWtk4wfpmAg7kn + ITY5DUorq1g8cOQEqze3aplOEhRtJoMcL1mMTixV9IgD5a/tSBVDYql8AKOBQLEJtTP08gY/jjFiktKg + 5FIV21Ok3NazvmR2AvrFkCAJyGYk1comZAuHDM/AyLvHThfBveZ26NOPwI59eey7LsbhFCmnOvVJ5+Ef + rrYZLEU8EZ85+HLwW7ZCLMVTFWdkHoLut+/hgbYHaE9XN31XNsupTrWV3jKVs+uS3cyAD0cLe331jW3Q + qRt0CPUlQVHDKI+fN9iGo4W90uNnyuA2vvRtWTlQgxeg/dk7FimnOvU9/CNqUe47b7ANRwt7AfjpKvAK + Gt18Qur35ymhRfsKKLr5hN7EyzDq7humWrrcfSfKxbz/QlwcLDck1snZJdUzYHUDmk57+K1qdXJyzsL6 + RmQD9ZmObygXB8sVIRO6fXQB4hC6eRQppzr1XXmHclnAckFomLc1Um5dItEvhZ97MQXP9N0AAAAASUVO + RK5CYII= + + + + + iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 + YQUAAAAZdEVYdFNvZnR3YXJlAEFkb2JlIEltYWdlUmVhZHlxyWU8AAADZmlUWHRYTUw6Y29tLmFkb2Jl + LnhtcAAAAAAAPD94cGFja2V0IGJlZ2luPSLvu78iIGlkPSJXNU0wTXBDZWhpSHpyZVN6TlRjemtjOWQi + Pz4gPHg6eG1wbWV0YSB4bWxuczp4PSJhZG9iZTpuczptZXRhLyIgeDp4bXB0az0iQWRvYmUgWE1QIENv + cmUgNS4zLWMwMTEgNjYuMTQ1NjYxLCAyMDEyLzAyLzA2LTE0OjU2OjI3ICAgICAgICAiPiA8cmRmOlJE + RiB4bWxuczpyZGY9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkvMDIvMjItcmRmLXN5bnRheC1ucyMiPiA8 + cmRmOkRlc2NyaXB0aW9uIHJkZjphYm91dD0iIiB4bWxuczp4bXBNTT0iaHR0cDovL25zLmFkb2JlLmNv + bS94YXAvMS4wL21tLyIgeG1sbnM6c3RSZWY9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlw + ZS9SZXNvdXJjZVJlZiMiIHhtbG5zOnhtcD0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wLyIgeG1w + TU06T3JpZ2luYWxEb2N1bWVudElEPSJ4bXAuZGlkOjJGQzkyMzc0Rjk0OUU0MTE5NjNCQjRENDMzQjlC + MUM4IiB4bXBNTTpEb2N1bWVudElEPSJ4bXAuZGlkOjhDMTdBQjRENEFBRTExRTQ4QjQyODY0MDNBNTJE + NzNCIiB4bXBNTTpJbnN0YW5jZUlEPSJ4bXAuaWlkOjhDMTdBQjRDNEFBRTExRTQ4QjQyODY0MDNBNTJE + NzNCIiB4bXA6Q3JlYXRvclRvb2w9IkFkb2JlIFBob3Rvc2hvcCBDUzYgKFdpbmRvd3MpIj4gPHhtcE1N + OkRlcml2ZWRGcm9tIHN0UmVmOmluc3RhbmNlSUQ9InhtcC5paWQ6NUQyMjc4QTlBQjRBRTQxMTk3NEFD + QUFFQjRCMzVENkUiIHN0UmVmOmRvY3VtZW50SUQ9InhtcC5kaWQ6MkZDOTIzNzRGOTQ5RTQxMTk2M0JC + NEQ0MzNCOUIxQzgiLz4gPC9yZGY6RGVzY3JpcHRpb24+IDwvcmRmOlJERj4gPC94OnhtcG1ldGE+IDw/ + eHBhY2tldCBlbmQ9InIiPz4eHsDfAAAB00lEQVRIS7XVWytEURQH8HniTTNHLs0NCXNcXjTN5dH9g/gM + 3jx590QhFDJS0gyTGmpqaqJIMW4hzlAoOaWISS7LWifntI3ddnTGrl92e/57/We/DBsA/CvuYSHZSr0t + lvCGsriX/oI3lMW9lM/SwgF9SEHwizs08IX2vAyLZvZRgXJ+cQWv7yB0q96Ds86voT0vw6KZNJsK4Pnl + DWKxmBBlqhpDUN0UNp2n2VrB/WMOEomEEGX0ArN5o+BGfYB0Oi1EGa8cwpKw6bxRcH6lQiaTEaKMVw5q + rzCbNwr2z65BURQhynh8Qe0VZvNGwdZBFlRVFaKMxxfQXmE2rxc8rW3sQy6XE0puHoG7IaC9YnV9j5th + pbZPqOCDCrbH5uIwOD7/zWgkDkNTizAyuwQjkWWIxFNQWduqmVxI/MiPz6/A8HTUuDMTTYLkbrqhgt5S + T3PG4ZJ3HE7focElZx0u3yn+VQiG1ZLymmm7s74f88f42S6bl9zyJZ6d6Xckd+Mt5ieogH4xJORHHajt + SzvqZPSgECpHZSiA2DztuxBlad+NgnpBEbIjusiiYboKRF+kGFHegUR5ImkFv7G0eAPzWVq8gfksLd5/ + oULiHhYS97BwwPYJlSCUgVubViQAAAAASUVORK5CYII= + + + + + iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 + YQUAAAAZdEVYdFNvZnR3YXJlAEFkb2JlIEltYWdlUmVhZHlxyWU8AAADZmlUWHRYTUw6Y29tLmFkb2Jl + LnhtcAAAAAAAPD94cGFja2V0IGJlZ2luPSLvu78iIGlkPSJXNU0wTXBDZWhpSHpyZVN6TlRjemtjOWQi + Pz4gPHg6eG1wbWV0YSB4bWxuczp4PSJhZG9iZTpuczptZXRhLyIgeDp4bXB0az0iQWRvYmUgWE1QIENv + cmUgNS4zLWMwMTEgNjYuMTQ1NjYxLCAyMDEyLzAyLzA2LTE0OjU2OjI3ICAgICAgICAiPiA8cmRmOlJE + RiB4bWxuczpyZGY9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkvMDIvMjItcmRmLXN5bnRheC1ucyMiPiA8 + cmRmOkRlc2NyaXB0aW9uIHJkZjphYm91dD0iIiB4bWxuczp4bXBNTT0iaHR0cDovL25zLmFkb2JlLmNv + bS94YXAvMS4wL21tLyIgeG1sbnM6c3RSZWY9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlw + ZS9SZXNvdXJjZVJlZiMiIHhtbG5zOnhtcD0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wLyIgeG1w + TU06T3JpZ2luYWxEb2N1bWVudElEPSJ4bXAuZGlkOjJGQzkyMzc0Rjk0OUU0MTE5NjNCQjRENDMzQjlC + MUM4IiB4bXBNTTpEb2N1bWVudElEPSJ4bXAuZGlkOjJEMDQyOEZBNEFEMjExRTRBN0MxRDBCNzJGRUND + MDEzIiB4bXBNTTpJbnN0YW5jZUlEPSJ4bXAuaWlkOjJEMDQyOEY5NEFEMjExRTRBN0MxRDBCNzJGRUND + MDEzIiB4bXA6Q3JlYXRvclRvb2w9IkFkb2JlIFBob3Rvc2hvcCBDUzYgKFdpbmRvd3MpIj4gPHhtcE1N + OkRlcml2ZWRGcm9tIHN0UmVmOmluc3RhbmNlSUQ9InhtcC5paWQ6QkRDRkI1RDVEMTRBRTQxMTk3NEFD + QUFFQjRCMzVENkUiIHN0UmVmOmRvY3VtZW50SUQ9InhtcC5kaWQ6MkZDOTIzNzRGOTQ5RTQxMTk2M0JC + NEQ0MzNCOUIxQzgiLz4gPC9yZGY6RGVzY3JpcHRpb24+IDwvcmRmOlJERj4gPC94OnhtcG1ldGE+IDw/ + eHBhY2tldCBlbmQ9InIiPz59jfe3AAAEbUlEQVRIS8WTeUybZRzHF48/pnFOuQRajkFLgQFb5iRLNJr4 + l/EPgsniUI4xZDAY1zyxwApsMJyIME61rByl3DfoYGBrgbWUY06FcZSCha4rQ8jYxkqPr2/fvkv8o2Sg + S/wkT970eb6/T5/39z7Prv8dt/Oql4mR4HZJ3ccoXFxhVCzB9DT9JueJdSq6c1wzVZFupepVzxu34XVj + CaEDi1jX6hF8ZQoeokl4iBVwzV9YdU1XRlIl28eVo8phCdXwGltEeOUsro6psaHVwcSDh5volc4iOO8X + 7KuVwb1hEi7J8myq9PEQO//I85oafr0KtEpUpNSETm+AwWDAvfv3YTQaybnm/t/AyO6Ga+UonJOnIijF + 1hA9tWI2qle9RxcI+RIpmZpTIfBULhIyyqHVahHPKcN70TmYnFFCp9OhqXcc9KwW0DOHVl3YU1aUyjJu + F1SpfhO3EM6bMMsVt+D8Zhz2HIpC4oU6bG5uIu4cD3tfTwAjIBNypQYbGxsISquBU34PaDHiVEplGXee + SuIjVaBv3Lz7gJg8vHg4FlZvc+ATVoLipiHsD8qCXWAO7IPK8MG5FjLXKboOeoYADkldUkplGWb7vOb4 + 4BzxIXXQE/1m59WDXdgBvxPfwz6UC4eQUth/WIBDZ2qQXj+K7IYRImeE5s5fOFrcDPvPapcJzVNmmwVY + VxWG9U09uau1tTVymPpc0iYFLew7OEUJ4BwtALfvJpl5xMrKCu6s3cUrn5YbCM1us80CrJZZVWjXr7j3 + 4CE0y8v4IrcaH+cK4Bv+DRyPl8ApphYuia3wZ3eCUzOA1PIfcVuzjHnlIgK/vgy7mHzTG+w12yzA5E53 + edYPo1c2i/X1dQTEfwvbwDQ4hhXg8OcN4P48Df+UTrgkNIAeW4Hg3Hbo9Xq0iGSgs4ls5CUhoXnObLOA + S8pkhG/bdZzgDZJnffT3GXieLAA9XgB2/RjZjuQqMWhxfBw824H55XWyhcfy+HDNqoB1SH4Codn6G7iw + p3d78EaVPlXX0CaZgkqlgly1gpCiK0htHCH/IL6oFcEF3ZjT3CUvXqv0DzDSS0FPq1a/8EbYS5Rqa+if + SAJ8KoeNR7gitEsnoVQqSbGOkJmYX1ggxaY70SabwIGMUrjn8I3WIXnBRPnWu/8nDnE9Sd7cAaP/ZSES + 6/rRKJRArpiHXC7HzekZNIukiCyrhW9mGZgXa4w2kUVnibJnzdXbxP5URzyDO4QjxGl5i9uNpMZeKP5U + IrywAq9yCnGAOGGMonbYxpVnEPGdyR9BO/MTj8kfgXeNFPt5IngVtoF1kQ9WcTs8qgfgmNreQMS21xZL + 0E6Ln6ef75tg8sfgXT8O77oReAkkYNXJ4PRV/4ztyfo9VPTf4xjdf9CpQKzdxxuGe6UMbhXEmc8V6mze + r3qNivx3HGN7UmglQ6CVDMIxXwybo5UcaunJQD8te9rhyx4JrWwItlGNUut3y5+hlp4cDhFCpl14k9jq + nR+Y1NTjIe7NlmMnWKoHsOtvjWYcKpheqFQAAAAASUVORK5CYII= + + + + + iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 + YQUAAAAZdEVYdFNvZnR3YXJlAEFkb2JlIEltYWdlUmVhZHlxyWU8AAADZmlUWHRYTUw6Y29tLmFkb2Jl + LnhtcAAAAAAAPD94cGFja2V0IGJlZ2luPSLvu78iIGlkPSJXNU0wTXBDZWhpSHpyZVN6TlRjemtjOWQi + Pz4gPHg6eG1wbWV0YSB4bWxuczp4PSJhZG9iZTpuczptZXRhLyIgeDp4bXB0az0iQWRvYmUgWE1QIENv + cmUgNS4zLWMwMTEgNjYuMTQ1NjYxLCAyMDEyLzAyLzA2LTE0OjU2OjI3ICAgICAgICAiPiA8cmRmOlJE + RiB4bWxuczpyZGY9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkvMDIvMjItcmRmLXN5bnRheC1ucyMiPiA8 + cmRmOkRlc2NyaXB0aW9uIHJkZjphYm91dD0iIiB4bWxuczp4bXBNTT0iaHR0cDovL25zLmFkb2JlLmNv + bS94YXAvMS4wL21tLyIgeG1sbnM6c3RSZWY9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlw + ZS9SZXNvdXJjZVJlZiMiIHhtbG5zOnhtcD0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wLyIgeG1w + TU06T3JpZ2luYWxEb2N1bWVudElEPSJ4bXAuZGlkOjJGQzkyMzc0Rjk0OUU0MTE5NjNCQjRENDMzQjlC + MUM4IiB4bXBNTTpEb2N1bWVudElEPSJ4bXAuZGlkOjJERTg4QTFENEQyMjExRTRBODEyODk0M0RBMTc5 + Qjg3IiB4bXBNTTpJbnN0YW5jZUlEPSJ4bXAuaWlkOjJERTg4QTFDNEQyMjExRTRBODEyODk0M0RBMTc5 + Qjg3IiB4bXA6Q3JlYXRvclRvb2w9IkFkb2JlIFBob3Rvc2hvcCBDUzYgKFdpbmRvd3MpIj4gPHhtcE1N + OkRlcml2ZWRGcm9tIHN0UmVmOmluc3RhbmNlSUQ9InhtcC5paWQ6NjJGOUEyRDEyMTRERTQxMUIzNkJE NUVDQjU5MzE1NjIiIHN0UmVmOmRvY3VtZW50SUQ9InhtcC5kaWQ6MkZDOTIzNzRGOTQ5RTQxMTk2M0JC NEQ0MzNCOUIxQzgiLz4gPC9yZGY6RGVzY3JpcHRpb24+IDwvcmRmOlJERj4gPC94OnhtcG1ldGE+IDw/ - eHBhY2tldCBlbmQ9InIiPz6GKmpFAAAC+UlEQVRIS63T20vTYRzH8Yforj/Ei24UiSgKIygKi8oyxZQo - cvNYeXaesmzqPGu2POd0ulSsnIdaurTSTJ3O6UxTPGya5vCQx5AuPn39RbHop7nZxQt+z3ie93e/Z4w1 - p7nsCoBt8R6yBF/UHPv+Wb0rfFFzm99CRIwEW1gnqXzxTXxRc0ydctm4OlID2sxrw6iCtiwItC+A2P/D - frLnjwGNSZdMq6N1WOvLwFpP4l/WdRlY6Jaio9Ab7QXba8sVoDHZGdT8PYS9THDqMGnLsKpNw0qXGCua - BO55VZdNQ6U/DRRibVCGb+N1pH5bukoRqHmDHOIG1N8/X2F4I8WyNhtf2+9hqSsZxqZ4upbb6HsSZLHO - Im90ym6hNVcIaktYTexZyUelGEvaHMy/jcFiZxo0xX5Y7ivGcn8JkVmA9uvlWBmqwpJeAWovs+poR99O - eRgWtQWYVUdgrj0FH+i+F3XF3NoappZYGJrEoLaOVYpOOTY/FGJB+xjTqnDMtMTTAC/Ma/Ix/TLUKl9e - x0JfFQpql7PykBP7lWIXzPeUYLIhHCPKCLr/AMy2ZsKoDLTKdNNdvM8TgNpRTBZwfJ885CTmaIChPhwa - mS+GnkdhqjEWY9X+VplqvIMXEhdQ24mZeuSs0N/BNNWWj4k6EdSZHhhXxWH0aSCGFd4c4Tk7zk7XBlUM - FKLToK4Nm+0qYnneRzqGGiSYaIiiyZdhVCdgqFSIwRJPjucZW85O1pvnRmvDkO9zFNTdy2Y6HjGp4HCF - 5kk4xhoiURd/EROv4tBfeM0qAyUC9Mp9QM0+7o829T6LZV0/mNycS6+nFKFWfAGj9ZHozfGwil7miZYH - 7qCmghsw+S6VpV894KuUuKFbfhNNqa749CwY3dm0toK+VABl3HlQM5obYHybwFLc7W1y/Y5BlX6FfgNn - DNcEY0DhZZX+MiGKbh0DNR24AYYWMSfJzc6GZBApwS5skIzNODcg0dV2V36FtsJ7yBJ8UXO8hyzBFzXH - ++H/A/YDv9/V87iOlrYAAAAASUVORK5CYII= + eHBhY2tldCBlbmQ9InIiPz6wJF34AAACl0lEQVRIS62Vy08TURSH73/QhQtXVnBhxEcMiUkhbEg0hB1R + Q1i68C8wIW5cEqMLN7ho2Ji4YiEhWq0prYUhfULbadN3obTaChobtZEUsFY9nnPS6WM6HYowyZf87j33 + nG/amaai9geOBYA+4pTxihmBE8DcTQB4J8em/9IwSQyagmrtL+z9rMFmvnhkKvtV7tcVHPz6DVsftulA + AckdhUg8zf19eoLKAd597iMLMItewfOxUDTN/bqCH3tVSG8VWIBZ9AoJApEk9+sKvu/uQ2IjzwJkGtH8 + OrTwy3Hu77vIAnV9mgWlcgWiqRwLjAMmkOMbPbNTKnN/JJntqJGEBZ++7oKcyLLgLN4JrU8Cms2C4pcy + BKKZumCI18temQ/8DzSLZlBmQX7nG/jCKdpgAa0driCtY5iFHuqHSjNoFtaags1iCdzBBG+QgNY2aZ0F + mIUe6osENAtrTUEq/7kDq9PHAszU5yYoq9f1i9cUSCD5ozxDEeTsrhAoONwyxLLb8MrhYQFmZYCHsnpd + v3hNgQROb5hnKIK29944MAThTBEWbS4WYBZ6qC/sKSy5ZJ6BGUQg8b4Bbhjod4AZXlhXWdBa10LrIVul + AM9ggS+aa6AIMMO8ZYUO0KeyIOMtZyaQpXpNi4LFucYzMINwhbMNcMNw5oIJMMNKIA0LNg88mZuH/ssj + dPgBMnN+cBRmny1wrRtSMMMzWCCFMg0UAeY2Fh0+GL5xG8Zu3oHXUrCj3g0WONdTbeBm21/o1N17gPtg + 98Xh3VoS3qzKMDI22agfglnY/Uld8NDc/ZlZwAwvl4Ngun6LGh8rdfVDViNs3rguOOzq6XOD8PDpc7g2 + OkHDH7XWtYa2It66Y4eCQ8cRfpvUNa2hTUD8A6JMaBvCyTdJAAAAAElFTkSuQmCC + + + + + iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 + YQUAAAAZdEVYdFNvZnR3YXJlAEFkb2JlIEltYWdlUmVhZHlxyWU8AAADZmlUWHRYTUw6Y29tLmFkb2Jl + LnhtcAAAAAAAPD94cGFja2V0IGJlZ2luPSLvu78iIGlkPSJXNU0wTXBDZWhpSHpyZVN6TlRjemtjOWQi + Pz4gPHg6eG1wbWV0YSB4bWxuczp4PSJhZG9iZTpuczptZXRhLyIgeDp4bXB0az0iQWRvYmUgWE1QIENv + cmUgNS4zLWMwMTEgNjYuMTQ1NjYxLCAyMDEyLzAyLzA2LTE0OjU2OjI3ICAgICAgICAiPiA8cmRmOlJE + RiB4bWxuczpyZGY9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkvMDIvMjItcmRmLXN5bnRheC1ucyMiPiA8 + cmRmOkRlc2NyaXB0aW9uIHJkZjphYm91dD0iIiB4bWxuczp4bXBNTT0iaHR0cDovL25zLmFkb2JlLmNv + bS94YXAvMS4wL21tLyIgeG1sbnM6c3RSZWY9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlw + ZS9SZXNvdXJjZVJlZiMiIHhtbG5zOnhtcD0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wLyIgeG1w + TU06T3JpZ2luYWxEb2N1bWVudElEPSJ4bXAuZGlkOjJGQzkyMzc0Rjk0OUU0MTE5NjNCQjRENDMzQjlC + MUM4IiB4bXBNTTpEb2N1bWVudElEPSJ4bXAuZGlkOkUzNzJDMjE3NEFENjExRTRCNjE0OEVEQzI4MEM0 + RTZDIiB4bXBNTTpJbnN0YW5jZUlEPSJ4bXAuaWlkOkUzNzJDMjE2NEFENjExRTRCNjE0OEVEQzI4MEM0 + RTZDIiB4bXA6Q3JlYXRvclRvb2w9IkFkb2JlIFBob3Rvc2hvcCBDUzYgKFdpbmRvd3MpIj4gPHhtcE1N + OkRlcml2ZWRGcm9tIHN0UmVmOmluc3RhbmNlSUQ9InhtcC5paWQ6RkI3NUQ0QkNENDRBRTQxMTk3NEFD + QUFFQjRCMzVENkUiIHN0UmVmOmRvY3VtZW50SUQ9InhtcC5kaWQ6MkZDOTIzNzRGOTQ5RTQxMTk2M0JC + NEQ0MzNCOUIxQzgiLz4gPC9yZGY6RGVzY3JpcHRpb24+IDwvcmRmOlJERj4gPC94OnhtcG1ldGE+IDw/ + eHBhY2tldCBlbmQ9InIiPz6PyaLfAAADMElEQVRIS6VUXUiTYRT+vi3Tzd+ps23+3KRigtiPkolEQReG + UYTkhWatpWlWGkRdddfdSPImqUAJjSIT00oxLJIk0cR+tFSyzDJtgaMkDEPkdM7ZPvm2vS6jBx6es3Pe + 8zzvtm+TohLS/ov+AACStLgEQuJyLRJWYK1yzh/+FgCoQrpnfM4fOGBhcUlIMkEVkma4H4i1y2kFcMD8 + wqKQZILKZqTqmlTAWrfvMjhgbv63Dwm0hLWQohn1eNEbzrlfPiTQAtZCKjP1GXdAIC+r4XD+9CGBFrDm + RVJ1re6pZ0GyHHMvIawauYVNCFPfvvuQQAtYC6meKXU0amNsaGN/ZR60xIf9aIgN3cpGE9OzZCZ85nEm + pGiWlLABmuJCnUOXrNB7chdct4TUo32ANDbp4NuielDpqWfePdaPX6GrohSK4uLhlCEo96YlZLbOFHzH + oJXjMSBcGn4/zQGovEDqXXtzeTb+BTrKj0J3+Q54djYP7EZdTU2MPjFSK8eieQR9QtLg6GcOQPWgqKeQ + ZyOfoK30CDw+lg2Ot3Z4VLoNqo269mCNHIa2WjYn9A1PcAAqU6m9VV3TF9psOwwPS3JgZugCdNoyocwU + jU+RlImWBpezGz0vxzkA1YOiHvPFO7Ca1kGHLQtmXp2HdutmqN+/F6JiU+h3kOpyVeHJwBgHoLIpqajm + 189HoaG4CNqsGTA1UAWth9Lg6r490PygGyLjUikgzuWqQlffCAegelDdUwLqigqhpXgjTPYeh+bCFCg2 + RkEk3vxuVz/P0c43oLP3DQegLhspNalSFxiNcLswHT48LYNbBUlQk7ebzenmyhm08w1o7xmiAP6hRZiT + 70eYkzpctUuJWdHmwWs74+F1Uz7cyE+E4ohQB5mHm9a3GywpTXzektyKduIAIsKI3ISkL4rIdYle05C9 + VrZVBmvtl7eboUyv7V4jSQdwRn8FdI72iErtCUxnIuifkJ5hUqUOq9Jr7OeCNU6bTpNVqtMcDJSldOwn + KnOk+jypJ5QANRWc0cs5SEelXr54QidfwVYAMoiHq4W/gNM6OaNCJ+diaUIqN/43+Atwg27t+9ZXBUn6 + A2MdqQeVc5pWAAAAAElFTkSuQmCC + + + + + iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAIAAABvFaqvAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 + YQUAAAAZdEVYdFNvZnR3YXJlAEFkb2JlIEltYWdlUmVhZHlxyWU8AAADZmlUWHRYTUw6Y29tLmFkb2Jl + LnhtcAAAAAAAPD94cGFja2V0IGJlZ2luPSLvu78iIGlkPSJXNU0wTXBDZWhpSHpyZVN6TlRjemtjOWQi + Pz4gPHg6eG1wbWV0YSB4bWxuczp4PSJhZG9iZTpuczptZXRhLyIgeDp4bXB0az0iQWRvYmUgWE1QIENv + cmUgNS4zLWMwMTEgNjYuMTQ1NjYxLCAyMDEyLzAyLzA2LTE0OjU2OjI3ICAgICAgICAiPiA8cmRmOlJE + RiB4bWxuczpyZGY9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkvMDIvMjItcmRmLXN5bnRheC1ucyMiPiA8 + cmRmOkRlc2NyaXB0aW9uIHJkZjphYm91dD0iIiB4bWxuczp4bXBNTT0iaHR0cDovL25zLmFkb2JlLmNv + bS94YXAvMS4wL21tLyIgeG1sbnM6c3RSZWY9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlw + ZS9SZXNvdXJjZVJlZiMiIHhtbG5zOnhtcD0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wLyIgeG1w + TU06T3JpZ2luYWxEb2N1bWVudElEPSJ4bXAuZGlkOjJGQzkyMzc0Rjk0OUU0MTE5NjNCQjRENDMzQjlC + MUM4IiB4bXBNTTpEb2N1bWVudElEPSJ4bXAuZGlkOjUzQzNGNDI5NEQyQzExRTQ4QkE1QUNCMEVDRDZF + MDVEIiB4bXBNTTpJbnN0YW5jZUlEPSJ4bXAuaWlkOjUzQzNGNDI4NEQyQzExRTQ4QkE1QUNCMEVDRDZF + MDVEIiB4bXA6Q3JlYXRvclRvb2w9IkFkb2JlIFBob3Rvc2hvcCBDUzYgKFdpbmRvd3MpIj4gPHhtcE1N + OkRlcml2ZWRGcm9tIHN0UmVmOmluc3RhbmNlSUQ9InhtcC5paWQ6RkI1NUY4OTYyQTRERTQxMUIzNkJE + NUVDQjU5MzE1NjIiIHN0UmVmOmRvY3VtZW50SUQ9InhtcC5kaWQ6MkZDOTIzNzRGOTQ5RTQxMTk2M0JC + NEQ0MzNCOUIxQzgiLz4gPC9yZGY6RGVzY3JpcHRpb24+IDwvcmRmOlJERj4gPC94OnhtcG1ldGE+IDw/ + eHBhY2tldCBlbmQ9InIiPz6IsaOmAAADF0lEQVQ4T62U/UuTURTH+0nICqRI1ERMMyNQe8N0ChqBwQhN + yvwhEgJjVCqJ/qCibZo6tzQ339h6Nre5prapUzc1XzItX1ilzuWMLLVAen+xf6DTuTxjdxsFVj58ebjc + c+7nnud7z3228DbpIaDFH/CfoqCn72DIDvNfPDM2KAqyr8PcJxqY+QBTb8kkjocXQTsKigGwfqYJHqIg + 1OxHGHvlWPx4hXB1YyA3g4CBhqst+piEnrDA3rA95vBAY1x8d7lq/DVZwm5PQZNvoKYdypSgHgbVEIh1 + cLOZzOCbSSsyRQRba6uWtcpVLbPcwlglInNUCJNWWKqABqMLCGvGlfpJELaQ/V1Vd1lujAhe0chtUrH5 + ZExnmJ85MdomEa+qZMbIEF2BHGunILSjdZwYgTt4gJqjjj0Rltml1Zq9AeL0Mn71Wn2mtDU80MIvsFTw + O+KPIoWC8BNYRIUaqrRQroJKjQOk9N+xLBF2pXJFKfnsDGYa8gS6xOO2whyMuoHaHpGzZ/pBM0IMrtXD + nT4HqNHXe0lYoogMFeQP4jbSDkCPTUyXmnNoPutSo+9WN5DEQDyeWCWnhqm4p7Oimt3b54rzmmKPVHKz + 0Xg0AU1pz87VJp+yXOfd9t3mBmLXsGrsJhSsDtF4iOWxKdpzyQNnuRW7vEUp13obFG05OVUBPtO5V1Sn + k5q4SX8ENfWA6C7xHsP981Bb2sf38ZKd4JhSuXUJHPHhg/WJnAeZFw0Xzt/w8erRtLmBnB/CSmaC599I + 2PYVRl+CXigu3R9SfCC0Pf1MZ1oqvqvjogX7gtRFJfb1n24g7GblfQcFP2fkBYm5anxqQcbLKgzyK/Df + WRTkV5+RMTg84ZrgAOHo4ZIDVNdJw67CpsVLZ5gifj97Typlq2ZFQXj8LKh5EHpnaIar8N+Al5l9Y9Vs + T7OiIAzjqaMsa6QJnBkeWvgOHdPkAuIV67PSeQpCYYZplsZ+KyyWLRyFF8D553EDbURY770J0rrYJbda + SYE4iWb9NcgpRKDrOMAWwYP6d5BTaC52zyaAWDlAm/DweL8AX9zXukfxHsIAAAAASUVORK5CYII= + + + + + iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 + YQUAAAAZdEVYdFNvZnR3YXJlAEFkb2JlIEltYWdlUmVhZHlxyWU8AAADZmlUWHRYTUw6Y29tLmFkb2Jl + LnhtcAAAAAAAPD94cGFja2V0IGJlZ2luPSLvu78iIGlkPSJXNU0wTXBDZWhpSHpyZVN6TlRjemtjOWQi + Pz4gPHg6eG1wbWV0YSB4bWxuczp4PSJhZG9iZTpuczptZXRhLyIgeDp4bXB0az0iQWRvYmUgWE1QIENv + cmUgNS4zLWMwMTEgNjYuMTQ1NjYxLCAyMDEyLzAyLzA2LTE0OjU2OjI3ICAgICAgICAiPiA8cmRmOlJE + RiB4bWxuczpyZGY9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkvMDIvMjItcmRmLXN5bnRheC1ucyMiPiA8 + cmRmOkRlc2NyaXB0aW9uIHJkZjphYm91dD0iIiB4bWxuczp4bXBNTT0iaHR0cDovL25zLmFkb2JlLmNv + bS94YXAvMS4wL21tLyIgeG1sbnM6c3RSZWY9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlw + ZS9SZXNvdXJjZVJlZiMiIHhtbG5zOnhtcD0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wLyIgeG1w + TU06T3JpZ2luYWxEb2N1bWVudElEPSJ4bXAuZGlkOjJGQzkyMzc0Rjk0OUU0MTE5NjNCQjRENDMzQjlC + MUM4IiB4bXBNTTpEb2N1bWVudElEPSJ4bXAuZGlkOkVENUYwQThBNEQyOTExRTQ5QzUzQzdFMkFGQkQy + NTA1IiB4bXBNTTpJbnN0YW5jZUlEPSJ4bXAuaWlkOkVENUYwQTg5NEQyOTExRTQ5QzUzQzdFMkFGQkQy + NTA1IiB4bXA6Q3JlYXRvclRvb2w9IkFkb2JlIFBob3Rvc2hvcCBDUzYgKFdpbmRvd3MpIj4gPHhtcE1N + OkRlcml2ZWRGcm9tIHN0UmVmOmluc3RhbmNlSUQ9InhtcC5paWQ6MkRGNkEzOUYyOTRERTQxMUIzNkJE + NUVDQjU5MzE1NjIiIHN0UmVmOmRvY3VtZW50SUQ9InhtcC5kaWQ6MkZDOTIzNzRGOTQ5RTQxMTk2M0JC + NEQ0MzNCOUIxQzgiLz4gPC9yZGY6RGVzY3JpcHRpb24+IDwvcmRmOlJERj4gPC94OnhtcG1ldGE+IDw/ + eHBhY2tldCBlbmQ9InIiPz6npMy1AAAGEUlEQVRIS7WVeVDUZRjHf7Ase8ECu+wl4LIXcqyyHC783AWW + 5QaRFTHkMi9SQvE+UhLzwk0BUcQSgQBBgcYDzStMSzOPcpqcmo5pmqk/+rOapqb+iG/PbzfFcSz/6pn5 + zPN739/7fp/nvZn/3TSLjj+XJy2/RaItPCT5vaBd8m1+q2Qku1lcrcvki+iXr7fFU6ZZeOx5KDU1b7jU + 1Z2bVPMPWNMbRXrXkWAc+ywVLbcS8fKwFjlu8VdpW0XzSc6f8PEIPzJ19dFnU3WEJdHL9P3X9O1nkdB8 + CQrX7i3mKn9zfqsUq29ZsPfjRBx5aMO2cTMy94gm7FuF7XyJTwDJTo5GVdHxNALVgsPd5Ceye+9g8b0f + UXbjB8RtH4Msd+MeXS7f6twjxbILZiy7pEHDtTBsvG7BqivTUXpsClLWCbtJNpDwBlGVH3ySIFV520eW + nedRcf0HVJGwbeRrOHs/h2n1CGRZDe7wND/W1hiI8sEYlJ4KRcVpJcrfVqByNBILhqLh3KeA+UXBOpL2 + jkRZduARPGXZ/vH4pnMou/gd7INfIPn4QyQc/RSOzk9hrBtEiKPerUn1Y5PXBaDojWlwdgUjr0+G/H4Z + cnpCUNJrQNZ+LeLrBD/LYnixFEDAKFz7vJQ0r49dO4zikS8x8/ADxLd9jIT2B5ix/z7SX78Pw+K3EJy2 + wq1M4rEz6sRwthgw82Ag2KNS2I5JPZ4rZx00ImGNHIZSfisFkDGhxbs5AkKLd/3kaLkDlgTjXrsNc/Md + mPfeQeyOD2HbcRu6yi4E2Wrd8ngeG71IBPtePWa4JUhsD0DykQAkHQqApUWCFLcGyZvDoZ/P/5oCTGXk + hU2MvGB7rbGmG47dd2Fa+x6iX/kAMa/eQvS2m4jaeAPspvcROb8TQexid3CcL2usFCJjnwE5nQYU9RhR + PGDC7D4TCrqMyDqkR9oePbRz/SZEKh8rI8vdyshyXhmzLD8DS/1VGOquwtgw7glkXH0Nhvp3kbL2GrSl + hyC11ril03xZfbkQKZuVsDeq4NihRtYuDbJ2auBoUsO2TQXrJiWMlWIExflWMiHOjRzfJy0bg776HCKX + vANd7WXol1/xeN3Si7A2XIXW1YbAxAq3UO0zPTSd1yG38bplLK//vxBrffKY4PQ1HH9aKk8jonQUUyvO + Qlt9HtqaCx4/tXIMyXWXMXXOAQTEv+D2zCvDhBBTCN1zCGOCZq3k+DXO1YcpRYOY4hpF2LzTCCs74/VE + 3IvnEVd1EhGFblBbWot6BKXWQZq64tlYa2+TuJwQM9KU5cRL35hyOxCe2w913hA0hcPQFI16KRzxEFtO + a1Q9htSVN5C+5S5x7x/uIm3DR7CvuomUReOImt1FU7nwEolHECImMGkJE5i46EJkejNM+X1QOPqhzBqC + KvskVDmnJuHKT/K4bgjKzBMItXcjJv84NOwWiKPndJK40TOCgPgaRmIur1dZ1yM6txvyWT0ITR+AImOQ + gg39N1ybDBJP60PorC5My3oTwQm18FdNryBxbq0EJL6AEUTYZBTkF0NGKyKdvZDb3qJOAxSIOqcP/jtp + JyC3D1BSvYgp6EN4aiNlP/cTEk4gFASPEUeXkWd8RaY5jcrEBkTn9UCT4Q3gzfBfRvJE9rrsfpicHSRe + NsFXmJeSXhTBXXY+jMjk8uArVkpExuKb6pkbYJ7L7Ria37xTUBeMeCkcncRTN0z/TyLKNYy4khNQJq2G + IMLBXdUWQkXwCYYR6md7IPP1k8WEC3UFDzSpG2BZeAZJtXQWFpyls3HOC50JzkdQnbFqDInLLiC2rBcq + 6xoSzzzP+NDVwDBaQkx4XzahNv8xZH48sVotCHeOUnnCWNJG18Q4UjddB7vlfbBbPwC7+YannLTyIrS5 + OyHU5v3hr07poL7JBHe4Jh8bzgQROY8h46IKCAVfbi73D3PcpfoJlX0VtEVN0JXsQlj2ZoRaaynj7N/8 + NfZLPLFmHrXnpiWSCCL8iMl32T/M6YGMq+R+covD7QADwfoIgqt4QVGtfvIZJ4lRv5CY4zypbjfjy+eE + M4l4gtuSwYSQ4DS4EZAew/wNiCYQJlvQU3cAAAAASUVORK5CYII= @@ -1054,142 +1272,6 @@ R2K5fxKLWbbp/7Dc0CBY8Q+pPmOq0VkzzQAAAABJRU5ErkJggg== - - - iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAZdEVYdFNvZnR3YXJlAEFkb2JlIEltYWdlUmVhZHlxyWU8AAADZmlUWHRYTUw6Y29tLmFkb2Jl - LnhtcAAAAAAAPD94cGFja2V0IGJlZ2luPSLvu78iIGlkPSJXNU0wTXBDZWhpSHpyZVN6TlRjemtjOWQi - Pz4gPHg6eG1wbWV0YSB4bWxuczp4PSJhZG9iZTpuczptZXRhLyIgeDp4bXB0az0iQWRvYmUgWE1QIENv - cmUgNS4zLWMwMTEgNjYuMTQ1NjYxLCAyMDEyLzAyLzA2LTE0OjU2OjI3ICAgICAgICAiPiA8cmRmOlJE - RiB4bWxuczpyZGY9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkvMDIvMjItcmRmLXN5bnRheC1ucyMiPiA8 - cmRmOkRlc2NyaXB0aW9uIHJkZjphYm91dD0iIiB4bWxuczp4bXBNTT0iaHR0cDovL25zLmFkb2JlLmNv - bS94YXAvMS4wL21tLyIgeG1sbnM6c3RSZWY9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlw - ZS9SZXNvdXJjZVJlZiMiIHhtbG5zOnhtcD0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wLyIgeG1w - TU06T3JpZ2luYWxEb2N1bWVudElEPSJ4bXAuZGlkOjJGQzkyMzc0Rjk0OUU0MTE5NjNCQjRENDMzQjlC - MUM4IiB4bXBNTTpEb2N1bWVudElEPSJ4bXAuZGlkOjlDMzFEOUI4NEFBRjExRTQ4OTA5OUYwQ0QzM0Q2 - NEI4IiB4bXBNTTpJbnN0YW5jZUlEPSJ4bXAuaWlkOjlDMzFEOUI3NEFBRjExRTQ4OTA5OUYwQ0QzM0Q2 - NEI4IiB4bXA6Q3JlYXRvclRvb2w9IkFkb2JlIFBob3Rvc2hvcCBDUzYgKFdpbmRvd3MpIj4gPHhtcE1N - OkRlcml2ZWRGcm9tIHN0UmVmOmluc3RhbmNlSUQ9InhtcC5paWQ6MDk5Mzk2NTZBRjRBRTQxMTk3NEFD - QUFFQjRCMzVENkUiIHN0UmVmOmRvY3VtZW50SUQ9InhtcC5kaWQ6MkZDOTIzNzRGOTQ5RTQxMTk2M0JC - NEQ0MzNCOUIxQzgiLz4gPC9yZGY6RGVzY3JpcHRpb24+IDwvcmRmOlJERj4gPC94OnhtcG1ldGE+IDw/ - eHBhY2tldCBlbmQ9InIiPz73sIMwAAADIElEQVRIS7WVa0iTYRTH56Uiysvm3TkvpLl5DRIvQYWVWl+6 - iNEVg0yhQqloQZHkLT+Y0YdAs75IpEUhzERZoZhsRpZlS7soblotsRwoxhqWeTrnYZtv+u7NsB74cZ5z - zv89/z17HzYRAPxXeIv/EpFXcOyi4BvKhfehv4FvKBfeh+ayqIUDlIgBgT8whpRYoT2fhgvNVJKBQT9s - hB8/QZDPpnEIjEhg0J5Pw4Vm0mwygG9T06BSqQQhTUhUMoRGpyxYT7OZwfhXC6jVakFIYzNYqN5uMGKa - BI1GIwhpghXJaJJi13d0dEB2bj74hsWzSDlXbzfQG02g0+kEIU2wIomdovzKdVifngnFFytBeb4cLN+n - WaSc6hfKKqB/eHTWoHfwExgMBkFII5MnQUD4WlAWloO26wVs35MDmifPmQFFyqlO/aKKqlmDp31DYDKZ - BCGNTJ4IPqHx8LJvACbNUw7p6e2HuJQMNIhhBuaHj3vBYrEI0tb1BoIiE9kJ9h7Oh7EJM+g/jEJuwVlY - s24ri5RTnfo5BedAIoueIYPumvomuHzjzm9cq2uCq7UNUH2rEarr7kNd0yP26Y+eKoSWtk4wfpmAg7kn - ITY5DUorq1g8cOQEqze3aplOEhRtJoMcL1mMTixV9IgD5a/tSBVDYql8AKOBQLEJtTP08gY/jjFiktKg - 5FIV21Ok3NazvmR2AvrFkCAJyGYk1comZAuHDM/AyLvHThfBveZ26NOPwI59eey7LsbhFCmnOvVJ5+Ef - rrYZLEU8EZ85+HLwW7ZCLMVTFWdkHoLut+/hgbYHaE9XN31XNsupTrWV3jKVs+uS3cyAD0cLe331jW3Q - qRt0CPUlQVHDKI+fN9iGo4W90uNnyuA2vvRtWTlQgxeg/dk7FimnOvU9/CNqUe47b7ANRwt7AfjpKvAK - Gt18Qur35ymhRfsKKLr5hN7EyzDq7humWrrcfSfKxbz/QlwcLDck1snZJdUzYHUDmk57+K1qdXJyzsL6 - RmQD9ZmObygXB8sVIRO6fXQB4hC6eRQppzr1XXmHclnAckFomLc1Um5dItEvhZ97MQXP9N0AAAAASUVO - RK5CYII= - - - - - iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAZdEVYdFNvZnR3YXJlAEFkb2JlIEltYWdlUmVhZHlxyWU8AAADZmlUWHRYTUw6Y29tLmFkb2Jl - LnhtcAAAAAAAPD94cGFja2V0IGJlZ2luPSLvu78iIGlkPSJXNU0wTXBDZWhpSHpyZVN6TlRjemtjOWQi - Pz4gPHg6eG1wbWV0YSB4bWxuczp4PSJhZG9iZTpuczptZXRhLyIgeDp4bXB0az0iQWRvYmUgWE1QIENv - cmUgNS4zLWMwMTEgNjYuMTQ1NjYxLCAyMDEyLzAyLzA2LTE0OjU2OjI3ICAgICAgICAiPiA8cmRmOlJE - RiB4bWxuczpyZGY9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkvMDIvMjItcmRmLXN5bnRheC1ucyMiPiA8 - cmRmOkRlc2NyaXB0aW9uIHJkZjphYm91dD0iIiB4bWxuczp4bXBNTT0iaHR0cDovL25zLmFkb2JlLmNv - bS94YXAvMS4wL21tLyIgeG1sbnM6c3RSZWY9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlw - ZS9SZXNvdXJjZVJlZiMiIHhtbG5zOnhtcD0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wLyIgeG1w - TU06T3JpZ2luYWxEb2N1bWVudElEPSJ4bXAuZGlkOjJGQzkyMzc0Rjk0OUU0MTE5NjNCQjRENDMzQjlC - MUM4IiB4bXBNTTpEb2N1bWVudElEPSJ4bXAuZGlkOjhDMTdBQjRENEFBRTExRTQ4QjQyODY0MDNBNTJE - NzNCIiB4bXBNTTpJbnN0YW5jZUlEPSJ4bXAuaWlkOjhDMTdBQjRDNEFBRTExRTQ4QjQyODY0MDNBNTJE - NzNCIiB4bXA6Q3JlYXRvclRvb2w9IkFkb2JlIFBob3Rvc2hvcCBDUzYgKFdpbmRvd3MpIj4gPHhtcE1N - OkRlcml2ZWRGcm9tIHN0UmVmOmluc3RhbmNlSUQ9InhtcC5paWQ6NUQyMjc4QTlBQjRBRTQxMTk3NEFD - QUFFQjRCMzVENkUiIHN0UmVmOmRvY3VtZW50SUQ9InhtcC5kaWQ6MkZDOTIzNzRGOTQ5RTQxMTk2M0JC - NEQ0MzNCOUIxQzgiLz4gPC9yZGY6RGVzY3JpcHRpb24+IDwvcmRmOlJERj4gPC94OnhtcG1ldGE+IDw/ - eHBhY2tldCBlbmQ9InIiPz4eHsDfAAAB00lEQVRIS7XVWytEURQH8HniTTNHLs0NCXNcXjTN5dH9g/gM - 3jx590QhFDJS0gyTGmpqaqJIMW4hzlAoOaWISS7LWifntI3ddnTGrl92e/57/We/DBsA/CvuYSHZSr0t - lvCGsriX/oI3lMW9lM/SwgF9SEHwizs08IX2vAyLZvZRgXJ+cQWv7yB0q96Ds86voT0vw6KZNJsK4Pnl - DWKxmBBlqhpDUN0UNp2n2VrB/WMOEomEEGX0ArN5o+BGfYB0Oi1EGa8cwpKw6bxRcH6lQiaTEaKMVw5q - rzCbNwr2z65BURQhynh8Qe0VZvNGwdZBFlRVFaKMxxfQXmE2rxc8rW3sQy6XE0puHoG7IaC9YnV9j5th - pbZPqOCDCrbH5uIwOD7/zWgkDkNTizAyuwQjkWWIxFNQWduqmVxI/MiPz6/A8HTUuDMTTYLkbrqhgt5S - T3PG4ZJ3HE7focElZx0u3yn+VQiG1ZLymmm7s74f88f42S6bl9zyJZ6d6Xckd+Mt5ieogH4xJORHHajt - SzvqZPSgECpHZSiA2DztuxBlad+NgnpBEbIjusiiYboKRF+kGFHegUR5ImkFv7G0eAPzWVq8gfksLd5/ - oULiHhYS97BwwPYJlSCUgVubViQAAAAASUVORK5CYII= - - - - - iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAZdEVYdFNvZnR3YXJlAEFkb2JlIEltYWdlUmVhZHlxyWU8AAADZmlUWHRYTUw6Y29tLmFkb2Jl - LnhtcAAAAAAAPD94cGFja2V0IGJlZ2luPSLvu78iIGlkPSJXNU0wTXBDZWhpSHpyZVN6TlRjemtjOWQi - Pz4gPHg6eG1wbWV0YSB4bWxuczp4PSJhZG9iZTpuczptZXRhLyIgeDp4bXB0az0iQWRvYmUgWE1QIENv - cmUgNS4zLWMwMTEgNjYuMTQ1NjYxLCAyMDEyLzAyLzA2LTE0OjU2OjI3ICAgICAgICAiPiA8cmRmOlJE - RiB4bWxuczpyZGY9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkvMDIvMjItcmRmLXN5bnRheC1ucyMiPiA8 - cmRmOkRlc2NyaXB0aW9uIHJkZjphYm91dD0iIiB4bWxuczp4bXBNTT0iaHR0cDovL25zLmFkb2JlLmNv - bS94YXAvMS4wL21tLyIgeG1sbnM6c3RSZWY9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlw - ZS9SZXNvdXJjZVJlZiMiIHhtbG5zOnhtcD0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wLyIgeG1w - TU06T3JpZ2luYWxEb2N1bWVudElEPSJ4bXAuZGlkOjJGQzkyMzc0Rjk0OUU0MTE5NjNCQjRENDMzQjlC - MUM4IiB4bXBNTTpEb2N1bWVudElEPSJ4bXAuZGlkOjJEMDQyOEZBNEFEMjExRTRBN0MxRDBCNzJGRUND - MDEzIiB4bXBNTTpJbnN0YW5jZUlEPSJ4bXAuaWlkOjJEMDQyOEY5NEFEMjExRTRBN0MxRDBCNzJGRUND - MDEzIiB4bXA6Q3JlYXRvclRvb2w9IkFkb2JlIFBob3Rvc2hvcCBDUzYgKFdpbmRvd3MpIj4gPHhtcE1N - OkRlcml2ZWRGcm9tIHN0UmVmOmluc3RhbmNlSUQ9InhtcC5paWQ6QkRDRkI1RDVEMTRBRTQxMTk3NEFD - QUFFQjRCMzVENkUiIHN0UmVmOmRvY3VtZW50SUQ9InhtcC5kaWQ6MkZDOTIzNzRGOTQ5RTQxMTk2M0JC - NEQ0MzNCOUIxQzgiLz4gPC9yZGY6RGVzY3JpcHRpb24+IDwvcmRmOlJERj4gPC94OnhtcG1ldGE+IDw/ - eHBhY2tldCBlbmQ9InIiPz59jfe3AAAEbUlEQVRIS8WTeUybZRzHF48/pnFOuQRajkFLgQFb5iRLNJr4 - l/EPgsniUI4xZDAY1zyxwApsMJyIME61rByl3DfoYGBrgbWUY06FcZSCha4rQ8jYxkqPr2/fvkv8o2Sg - S/wkT970eb6/T5/39z7Prv8dt/Oql4mR4HZJ3ccoXFxhVCzB9DT9JueJdSq6c1wzVZFupepVzxu34XVj - CaEDi1jX6hF8ZQoeokl4iBVwzV9YdU1XRlIl28eVo8phCdXwGltEeOUsro6psaHVwcSDh5volc4iOO8X - 7KuVwb1hEi7J8myq9PEQO//I85oafr0KtEpUpNSETm+AwWDAvfv3YTQaybnm/t/AyO6Ga+UonJOnIijF - 1hA9tWI2qle9RxcI+RIpmZpTIfBULhIyyqHVahHPKcN70TmYnFFCp9OhqXcc9KwW0DOHVl3YU1aUyjJu - F1SpfhO3EM6bMMsVt+D8Zhz2HIpC4oU6bG5uIu4cD3tfTwAjIBNypQYbGxsISquBU34PaDHiVEplGXee - SuIjVaBv3Lz7gJg8vHg4FlZvc+ATVoLipiHsD8qCXWAO7IPK8MG5FjLXKboOeoYADkldUkplGWb7vOb4 - 4BzxIXXQE/1m59WDXdgBvxPfwz6UC4eQUth/WIBDZ2qQXj+K7IYRImeE5s5fOFrcDPvPapcJzVNmmwVY - VxWG9U09uau1tTVymPpc0iYFLew7OEUJ4BwtALfvJpl5xMrKCu6s3cUrn5YbCM1us80CrJZZVWjXr7j3 - 4CE0y8v4IrcaH+cK4Bv+DRyPl8ApphYuia3wZ3eCUzOA1PIfcVuzjHnlIgK/vgy7mHzTG+w12yzA5E53 - edYPo1c2i/X1dQTEfwvbwDQ4hhXg8OcN4P48Df+UTrgkNIAeW4Hg3Hbo9Xq0iGSgs4ls5CUhoXnObLOA - S8pkhG/bdZzgDZJnffT3GXieLAA9XgB2/RjZjuQqMWhxfBw824H55XWyhcfy+HDNqoB1SH4Codn6G7iw - p3d78EaVPlXX0CaZgkqlgly1gpCiK0htHCH/IL6oFcEF3ZjT3CUvXqv0DzDSS0FPq1a/8EbYS5Rqa+if - SAJ8KoeNR7gitEsnoVQqSbGOkJmYX1ggxaY70SabwIGMUrjn8I3WIXnBRPnWu/8nDnE9Sd7cAaP/ZSES - 6/rRKJRArpiHXC7HzekZNIukiCyrhW9mGZgXa4w2kUVnibJnzdXbxP5URzyDO4QjxGl5i9uNpMZeKP5U - IrywAq9yCnGAOGGMonbYxpVnEPGdyR9BO/MTj8kfgXeNFPt5IngVtoF1kQ9WcTs8qgfgmNreQMS21xZL - 0E6Ln6ef75tg8sfgXT8O77oReAkkYNXJ4PRV/4ztyfo9VPTf4xjdf9CpQKzdxxuGe6UMbhXEmc8V6mze - r3qNivx3HGN7UmglQ6CVDMIxXwybo5UcaunJQD8te9rhyx4JrWwItlGNUut3y5+hlp4cDhFCpl14k9jq - nR+Y1NTjIe7NlmMnWKoHsOtvjWYcKpheqFQAAAAASUVORK5CYII= - - - - - iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAZdEVYdFNvZnR3YXJlAEFkb2JlIEltYWdlUmVhZHlxyWU8AAADZmlUWHRYTUw6Y29tLmFkb2Jl - LnhtcAAAAAAAPD94cGFja2V0IGJlZ2luPSLvu78iIGlkPSJXNU0wTXBDZWhpSHpyZVN6TlRjemtjOWQi - Pz4gPHg6eG1wbWV0YSB4bWxuczp4PSJhZG9iZTpuczptZXRhLyIgeDp4bXB0az0iQWRvYmUgWE1QIENv - cmUgNS4zLWMwMTEgNjYuMTQ1NjYxLCAyMDEyLzAyLzA2LTE0OjU2OjI3ICAgICAgICAiPiA8cmRmOlJE - RiB4bWxuczpyZGY9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkvMDIvMjItcmRmLXN5bnRheC1ucyMiPiA8 - cmRmOkRlc2NyaXB0aW9uIHJkZjphYm91dD0iIiB4bWxuczp4bXBNTT0iaHR0cDovL25zLmFkb2JlLmNv - bS94YXAvMS4wL21tLyIgeG1sbnM6c3RSZWY9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlw - ZS9SZXNvdXJjZVJlZiMiIHhtbG5zOnhtcD0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wLyIgeG1w - TU06T3JpZ2luYWxEb2N1bWVudElEPSJ4bXAuZGlkOjJGQzkyMzc0Rjk0OUU0MTE5NjNCQjRENDMzQjlC - MUM4IiB4bXBNTTpEb2N1bWVudElEPSJ4bXAuZGlkOjJERTg4QTFENEQyMjExRTRBODEyODk0M0RBMTc5 - Qjg3IiB4bXBNTTpJbnN0YW5jZUlEPSJ4bXAuaWlkOjJERTg4QTFDNEQyMjExRTRBODEyODk0M0RBMTc5 - Qjg3IiB4bXA6Q3JlYXRvclRvb2w9IkFkb2JlIFBob3Rvc2hvcCBDUzYgKFdpbmRvd3MpIj4gPHhtcE1N - OkRlcml2ZWRGcm9tIHN0UmVmOmluc3RhbmNlSUQ9InhtcC5paWQ6NjJGOUEyRDEyMTRERTQxMUIzNkJE - NUVDQjU5MzE1NjIiIHN0UmVmOmRvY3VtZW50SUQ9InhtcC5kaWQ6MkZDOTIzNzRGOTQ5RTQxMTk2M0JC - NEQ0MzNCOUIxQzgiLz4gPC9yZGY6RGVzY3JpcHRpb24+IDwvcmRmOlJERj4gPC94OnhtcG1ldGE+IDw/ - eHBhY2tldCBlbmQ9InIiPz6wJF34AAACl0lEQVRIS62Vy08TURSH73/QhQtXVnBhxEcMiUkhbEg0hB1R - Q1i68C8wIW5cEqMLN7ho2Ji4YiEhWq0prYUhfULbadN3obTaChobtZEUsFY9nnPS6WM6HYowyZf87j33 - nG/amaai9geOBYA+4pTxihmBE8DcTQB4J8em/9IwSQyagmrtL+z9rMFmvnhkKvtV7tcVHPz6DVsftulA - AckdhUg8zf19eoLKAd597iMLMItewfOxUDTN/bqCH3tVSG8VWIBZ9AoJApEk9+sKvu/uQ2IjzwJkGtH8 - OrTwy3Hu77vIAnV9mgWlcgWiqRwLjAMmkOMbPbNTKnN/JJntqJGEBZ++7oKcyLLgLN4JrU8Cms2C4pcy - BKKZumCI18temQ/8DzSLZlBmQX7nG/jCKdpgAa0driCtY5iFHuqHSjNoFtaags1iCdzBBG+QgNY2aZ0F - mIUe6osENAtrTUEq/7kDq9PHAszU5yYoq9f1i9cUSCD5ozxDEeTsrhAoONwyxLLb8MrhYQFmZYCHsnpd - v3hNgQROb5hnKIK29944MAThTBEWbS4WYBZ6qC/sKSy5ZJ6BGUQg8b4Bbhjod4AZXlhXWdBa10LrIVul - AM9ggS+aa6AIMMO8ZYUO0KeyIOMtZyaQpXpNi4LFucYzMINwhbMNcMNw5oIJMMNKIA0LNg88mZuH/ssj - dPgBMnN+cBRmny1wrRtSMMMzWCCFMg0UAeY2Fh0+GL5xG8Zu3oHXUrCj3g0WONdTbeBm21/o1N17gPtg - 98Xh3VoS3qzKMDI22agfglnY/Uld8NDc/ZlZwAwvl4Ngun6LGh8rdfVDViNs3rguOOzq6XOD8PDpc7g2 - OkHDH7XWtYa2It66Y4eCQ8cRfpvUNa2hTUD8A6JMaBvCyTdJAAAAAElFTkSuQmCC - - iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 @@ -1403,7 +1485,7 @@ AAAASUVORK5CYII= - + iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 YQUAAAAZdEVYdFNvZnR3YXJlAEFkb2JlIEltYWdlUmVhZHlxyWU8AAADZmlUWHRYTUw6Y29tLmFkb2Jl @@ -1415,108 +1497,26 @@ bS94YXAvMS4wL21tLyIgeG1sbnM6c3RSZWY9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlw ZS9SZXNvdXJjZVJlZiMiIHhtbG5zOnhtcD0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wLyIgeG1w TU06T3JpZ2luYWxEb2N1bWVudElEPSJ4bXAuZGlkOjJGQzkyMzc0Rjk0OUU0MTE5NjNCQjRENDMzQjlC - MUM4IiB4bXBNTTpEb2N1bWVudElEPSJ4bXAuZGlkOkUzNzJDMjE3NEFENjExRTRCNjE0OEVEQzI4MEM0 - RTZDIiB4bXBNTTpJbnN0YW5jZUlEPSJ4bXAuaWlkOkUzNzJDMjE2NEFENjExRTRCNjE0OEVEQzI4MEM0 - RTZDIiB4bXA6Q3JlYXRvclRvb2w9IkFkb2JlIFBob3Rvc2hvcCBDUzYgKFdpbmRvd3MpIj4gPHhtcE1N - OkRlcml2ZWRGcm9tIHN0UmVmOmluc3RhbmNlSUQ9InhtcC5paWQ6RkI3NUQ0QkNENDRBRTQxMTk3NEFD - QUFFQjRCMzVENkUiIHN0UmVmOmRvY3VtZW50SUQ9InhtcC5kaWQ6MkZDOTIzNzRGOTQ5RTQxMTk2M0JC - NEQ0MzNCOUIxQzgiLz4gPC9yZGY6RGVzY3JpcHRpb24+IDwvcmRmOlJERj4gPC94OnhtcG1ldGE+IDw/ - eHBhY2tldCBlbmQ9InIiPz6PyaLfAAADMElEQVRIS6VUXUiTYRT+vi3Tzd+ps23+3KRigtiPkolEQReG - UYTkhWatpWlWGkRdddfdSPImqUAJjSIT00oxLJIk0cR+tFSyzDJtgaMkDEPkdM7ZPvm2vS6jBx6es3Pe - 8zzvtm+TohLS/ov+AACStLgEQuJyLRJWYK1yzh/+FgCoQrpnfM4fOGBhcUlIMkEVkma4H4i1y2kFcMD8 - wqKQZILKZqTqmlTAWrfvMjhgbv63Dwm0hLWQohn1eNEbzrlfPiTQAtZCKjP1GXdAIC+r4XD+9CGBFrDm - RVJ1re6pZ0GyHHMvIawauYVNCFPfvvuQQAtYC6meKXU0amNsaGN/ZR60xIf9aIgN3cpGE9OzZCZ85nEm - pGiWlLABmuJCnUOXrNB7chdct4TUo32ANDbp4NuielDpqWfePdaPX6GrohSK4uLhlCEo96YlZLbOFHzH - oJXjMSBcGn4/zQGovEDqXXtzeTb+BTrKj0J3+Q54djYP7EZdTU2MPjFSK8eieQR9QtLg6GcOQPWgqKeQ - ZyOfoK30CDw+lg2Ot3Z4VLoNqo269mCNHIa2WjYn9A1PcAAqU6m9VV3TF9psOwwPS3JgZugCdNoyocwU - jU+RlImWBpezGz0vxzkA1YOiHvPFO7Ca1kGHLQtmXp2HdutmqN+/F6JiU+h3kOpyVeHJwBgHoLIpqajm - 189HoaG4CNqsGTA1UAWth9Lg6r490PygGyLjUikgzuWqQlffCAegelDdUwLqigqhpXgjTPYeh+bCFCg2 - RkEk3vxuVz/P0c43oLP3DQegLhspNalSFxiNcLswHT48LYNbBUlQk7ebzenmyhm08w1o7xmiAP6hRZiT - 70eYkzpctUuJWdHmwWs74+F1Uz7cyE+E4ohQB5mHm9a3GywpTXzektyKduIAIsKI3ISkL4rIdYle05C9 - VrZVBmvtl7eboUyv7V4jSQdwRn8FdI72iErtCUxnIuifkJ5hUqUOq9Jr7OeCNU6bTpNVqtMcDJSldOwn - KnOk+jypJ5QANRWc0cs5SEelXr54QidfwVYAMoiHq4W/gNM6OaNCJ+diaUIqN/43+Atwg27t+9ZXBUn6 - A2MdqQeVc5pWAAAAAElFTkSuQmCC - - - - - iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAIAAABvFaqvAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAZdEVYdFNvZnR3YXJlAEFkb2JlIEltYWdlUmVhZHlxyWU8AAADZmlUWHRYTUw6Y29tLmFkb2Jl - LnhtcAAAAAAAPD94cGFja2V0IGJlZ2luPSLvu78iIGlkPSJXNU0wTXBDZWhpSHpyZVN6TlRjemtjOWQi - Pz4gPHg6eG1wbWV0YSB4bWxuczp4PSJhZG9iZTpuczptZXRhLyIgeDp4bXB0az0iQWRvYmUgWE1QIENv - cmUgNS4zLWMwMTEgNjYuMTQ1NjYxLCAyMDEyLzAyLzA2LTE0OjU2OjI3ICAgICAgICAiPiA8cmRmOlJE - RiB4bWxuczpyZGY9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkvMDIvMjItcmRmLXN5bnRheC1ucyMiPiA8 - cmRmOkRlc2NyaXB0aW9uIHJkZjphYm91dD0iIiB4bWxuczp4bXBNTT0iaHR0cDovL25zLmFkb2JlLmNv - bS94YXAvMS4wL21tLyIgeG1sbnM6c3RSZWY9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlw - ZS9SZXNvdXJjZVJlZiMiIHhtbG5zOnhtcD0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wLyIgeG1w - TU06T3JpZ2luYWxEb2N1bWVudElEPSJ4bXAuZGlkOjJGQzkyMzc0Rjk0OUU0MTE5NjNCQjRENDMzQjlC - MUM4IiB4bXBNTTpEb2N1bWVudElEPSJ4bXAuZGlkOjUzQzNGNDI5NEQyQzExRTQ4QkE1QUNCMEVDRDZF - MDVEIiB4bXBNTTpJbnN0YW5jZUlEPSJ4bXAuaWlkOjUzQzNGNDI4NEQyQzExRTQ4QkE1QUNCMEVDRDZF - MDVEIiB4bXA6Q3JlYXRvclRvb2w9IkFkb2JlIFBob3Rvc2hvcCBDUzYgKFdpbmRvd3MpIj4gPHhtcE1N - OkRlcml2ZWRGcm9tIHN0UmVmOmluc3RhbmNlSUQ9InhtcC5paWQ6RkI1NUY4OTYyQTRERTQxMUIzNkJE + MUM4IiB4bXBNTTpEb2N1bWVudElEPSJ4bXAuZGlkOjJERjY3MEZENEQyMzExRTRCNDlGQUMwMzk0OTAw + Qzc4IiB4bXBNTTpJbnN0YW5jZUlEPSJ4bXAuaWlkOjJERjY3MEZDNEQyMzExRTRCNDlGQUMwMzk0OTAw + Qzc4IiB4bXA6Q3JlYXRvclRvb2w9IkFkb2JlIFBob3Rvc2hvcCBDUzYgKFdpbmRvd3MpIj4gPHhtcE1N + OkRlcml2ZWRGcm9tIHN0UmVmOmluc3RhbmNlSUQ9InhtcC5paWQ6NjhGOUEyRDEyMTRERTQxMUIzNkJE NUVDQjU5MzE1NjIiIHN0UmVmOmRvY3VtZW50SUQ9InhtcC5kaWQ6MkZDOTIzNzRGOTQ5RTQxMTk2M0JC NEQ0MzNCOUIxQzgiLz4gPC9yZGY6RGVzY3JpcHRpb24+IDwvcmRmOlJERj4gPC94OnhtcG1ldGE+IDw/ - eHBhY2tldCBlbmQ9InIiPz6IsaOmAAADF0lEQVQ4T62U/UuTURTH+0nICqRI1ERMMyNQe8N0ChqBwQhN - yvwhEgJjVCqJ/qCibZo6tzQ339h6Nre5prapUzc1XzItX1ilzuWMLLVAen+xf6DTuTxjdxsFVj58ebjc - c+7nnud7z3228DbpIaDFH/CfoqCn72DIDvNfPDM2KAqyr8PcJxqY+QBTb8kkjocXQTsKigGwfqYJHqIg - 1OxHGHvlWPx4hXB1YyA3g4CBhqst+piEnrDA3rA95vBAY1x8d7lq/DVZwm5PQZNvoKYdypSgHgbVEIh1 - cLOZzOCbSSsyRQRba6uWtcpVLbPcwlglInNUCJNWWKqABqMLCGvGlfpJELaQ/V1Vd1lujAhe0chtUrH5 - ZExnmJ85MdomEa+qZMbIEF2BHGunILSjdZwYgTt4gJqjjj0Rltml1Zq9AeL0Mn71Wn2mtDU80MIvsFTw - O+KPIoWC8BNYRIUaqrRQroJKjQOk9N+xLBF2pXJFKfnsDGYa8gS6xOO2whyMuoHaHpGzZ/pBM0IMrtXD - nT4HqNHXe0lYoogMFeQP4jbSDkCPTUyXmnNoPutSo+9WN5DEQDyeWCWnhqm4p7Oimt3b54rzmmKPVHKz - 0Xg0AU1pz87VJp+yXOfd9t3mBmLXsGrsJhSsDtF4iOWxKdpzyQNnuRW7vEUp13obFG05OVUBPtO5V1Sn - k5q4SX8ENfWA6C7xHsP981Bb2sf38ZKd4JhSuXUJHPHhg/WJnAeZFw0Xzt/w8erRtLmBnB/CSmaC599I - 2PYVRl+CXigu3R9SfCC0Pf1MZ1oqvqvjogX7gtRFJfb1n24g7GblfQcFP2fkBYm5anxqQcbLKgzyK/Df - WRTkV5+RMTg84ZrgAOHo4ZIDVNdJw67CpsVLZ5gifj97Typlq2ZFQXj8LKh5EHpnaIar8N+Al5l9Y9Vs - T7OiIAzjqaMsa6QJnBkeWvgOHdPkAuIV67PSeQpCYYZplsZ+KyyWLRyFF8D553EDbURY770J0rrYJbda - SYE4iWb9NcgpRKDrOMAWwYP6d5BTaC52zyaAWDlAm/DweL8AX9zXukfxHsIAAAAASUVORK5CYII= - - - - - iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAZdEVYdFNvZnR3YXJlAEFkb2JlIEltYWdlUmVhZHlxyWU8AAADZmlUWHRYTUw6Y29tLmFkb2Jl - LnhtcAAAAAAAPD94cGFja2V0IGJlZ2luPSLvu78iIGlkPSJXNU0wTXBDZWhpSHpyZVN6TlRjemtjOWQi - Pz4gPHg6eG1wbWV0YSB4bWxuczp4PSJhZG9iZTpuczptZXRhLyIgeDp4bXB0az0iQWRvYmUgWE1QIENv - cmUgNS4zLWMwMTEgNjYuMTQ1NjYxLCAyMDEyLzAyLzA2LTE0OjU2OjI3ICAgICAgICAiPiA8cmRmOlJE - RiB4bWxuczpyZGY9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkvMDIvMjItcmRmLXN5bnRheC1ucyMiPiA8 - cmRmOkRlc2NyaXB0aW9uIHJkZjphYm91dD0iIiB4bWxuczp4bXBNTT0iaHR0cDovL25zLmFkb2JlLmNv - bS94YXAvMS4wL21tLyIgeG1sbnM6c3RSZWY9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlw - ZS9SZXNvdXJjZVJlZiMiIHhtbG5zOnhtcD0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wLyIgeG1w - TU06T3JpZ2luYWxEb2N1bWVudElEPSJ4bXAuZGlkOjJGQzkyMzc0Rjk0OUU0MTE5NjNCQjRENDMzQjlC - MUM4IiB4bXBNTTpEb2N1bWVudElEPSJ4bXAuZGlkOkVENUYwQThBNEQyOTExRTQ5QzUzQzdFMkFGQkQy - NTA1IiB4bXBNTTpJbnN0YW5jZUlEPSJ4bXAuaWlkOkVENUYwQTg5NEQyOTExRTQ5QzUzQzdFMkFGQkQy - NTA1IiB4bXA6Q3JlYXRvclRvb2w9IkFkb2JlIFBob3Rvc2hvcCBDUzYgKFdpbmRvd3MpIj4gPHhtcE1N - OkRlcml2ZWRGcm9tIHN0UmVmOmluc3RhbmNlSUQ9InhtcC5paWQ6MkRGNkEzOUYyOTRERTQxMUIzNkJE - NUVDQjU5MzE1NjIiIHN0UmVmOmRvY3VtZW50SUQ9InhtcC5kaWQ6MkZDOTIzNzRGOTQ5RTQxMTk2M0JC - NEQ0MzNCOUIxQzgiLz4gPC9yZGY6RGVzY3JpcHRpb24+IDwvcmRmOlJERj4gPC94OnhtcG1ldGE+IDw/ - eHBhY2tldCBlbmQ9InIiPz6npMy1AAAGEUlEQVRIS7WVeVDUZRjHf7Ase8ECu+wl4LIXcqyyHC783AWW - 5QaRFTHkMi9SQvE+UhLzwk0BUcQSgQBBgcYDzStMSzOPcpqcmo5pmqk/+rOapqb+iG/PbzfFcSz/6pn5 - zPN739/7fp/nvZn/3TSLjj+XJy2/RaItPCT5vaBd8m1+q2Qku1lcrcvki+iXr7fFU6ZZeOx5KDU1b7jU - 1Z2bVPMPWNMbRXrXkWAc+ywVLbcS8fKwFjlu8VdpW0XzSc6f8PEIPzJ19dFnU3WEJdHL9P3X9O1nkdB8 - CQrX7i3mKn9zfqsUq29ZsPfjRBx5aMO2cTMy94gm7FuF7XyJTwDJTo5GVdHxNALVgsPd5Ceye+9g8b0f - UXbjB8RtH4Msd+MeXS7f6twjxbILZiy7pEHDtTBsvG7BqivTUXpsClLWCbtJNpDwBlGVH3ySIFV520eW - nedRcf0HVJGwbeRrOHs/h2n1CGRZDe7wND/W1hiI8sEYlJ4KRcVpJcrfVqByNBILhqLh3KeA+UXBOpL2 - jkRZduARPGXZ/vH4pnMou/gd7INfIPn4QyQc/RSOzk9hrBtEiKPerUn1Y5PXBaDojWlwdgUjr0+G/H4Z - cnpCUNJrQNZ+LeLrBD/LYnixFEDAKFz7vJQ0r49dO4zikS8x8/ADxLd9jIT2B5ix/z7SX78Pw+K3EJy2 - wq1M4rEz6sRwthgw82Ag2KNS2I5JPZ4rZx00ImGNHIZSfisFkDGhxbs5AkKLd/3kaLkDlgTjXrsNc/Md - mPfeQeyOD2HbcRu6yi4E2Wrd8ngeG71IBPtePWa4JUhsD0DykQAkHQqApUWCFLcGyZvDoZ/P/5oCTGXk - hU2MvGB7rbGmG47dd2Fa+x6iX/kAMa/eQvS2m4jaeAPspvcROb8TQexid3CcL2usFCJjnwE5nQYU9RhR - PGDC7D4TCrqMyDqkR9oePbRz/SZEKh8rI8vdyshyXhmzLD8DS/1VGOquwtgw7glkXH0Nhvp3kbL2GrSl - hyC11ril03xZfbkQKZuVsDeq4NihRtYuDbJ2auBoUsO2TQXrJiWMlWIExflWMiHOjRzfJy0bg776HCKX - vANd7WXol1/xeN3Si7A2XIXW1YbAxAq3UO0zPTSd1yG38bplLK//vxBrffKY4PQ1HH9aKk8jonQUUyvO - Qlt9HtqaCx4/tXIMyXWXMXXOAQTEv+D2zCvDhBBTCN1zCGOCZq3k+DXO1YcpRYOY4hpF2LzTCCs74/VE - 3IvnEVd1EhGFblBbWot6BKXWQZq64tlYa2+TuJwQM9KU5cRL35hyOxCe2w913hA0hcPQFI16KRzxEFtO - a1Q9htSVN5C+5S5x7x/uIm3DR7CvuomUReOImt1FU7nwEolHECImMGkJE5i46EJkejNM+X1QOPqhzBqC - KvskVDmnJuHKT/K4bgjKzBMItXcjJv84NOwWiKPndJK40TOCgPgaRmIur1dZ1yM6txvyWT0ITR+AImOQ - gg39N1ybDBJP60PorC5My3oTwQm18FdNryBxbq0EJL6AEUTYZBTkF0NGKyKdvZDb3qJOAxSIOqcP/jtp - JyC3D1BSvYgp6EN4aiNlP/cTEk4gFASPEUeXkWd8RaY5jcrEBkTn9UCT4Q3gzfBfRvJE9rrsfpicHSRe - NsFXmJeSXhTBXXY+jMjk8uArVkpExuKb6pkbYJ7L7Ria37xTUBeMeCkcncRTN0z/TyLKNYy4khNQJq2G - IMLBXdUWQkXwCYYR6md7IPP1k8WEC3UFDzSpG2BZeAZJtXQWFpyls3HOC50JzkdQnbFqDInLLiC2rBcq - 6xoSzzzP+NDVwDBaQkx4XzahNv8xZH48sVotCHeOUnnCWNJG18Q4UjddB7vlfbBbPwC7+YannLTyIrS5 - OyHU5v3hr07poL7JBHe4Jh8bzgQROY8h46IKCAVfbi73D3PcpfoJlX0VtEVN0JXsQlj2ZoRaaynj7N/8 - NfZLPLFmHrXnpiWSCCL8iMl32T/M6YGMq+R+covD7QADwfoIgqt4QVGtfvIZJ4lRv5CY4zypbjfjy+eE - M4l4gtuSwYSQ4DS4EZAew/wNiCYQJlvQU3cAAAAASUVORK5CYII= + eHBhY2tldCBlbmQ9InIiPz6GKmpFAAAC+UlEQVRIS63T20vTYRzH8Yforj/Ei24UiSgKIygKi8oyxZQo + cvNYeXaesmzqPGu2POd0ulSsnIdaurTSTJ3O6UxTPGya5vCQx5AuPn39RbHop7nZxQt+z3ie93e/Z4w1 + p7nsCoBt8R6yBF/UHPv+Wb0rfFFzm99CRIwEW1gnqXzxTXxRc0ydctm4OlID2sxrw6iCtiwItC+A2P/D + frLnjwGNSZdMq6N1WOvLwFpP4l/WdRlY6Jaio9Ab7QXba8sVoDHZGdT8PYS9THDqMGnLsKpNw0qXGCua + BO55VZdNQ6U/DRRibVCGb+N1pH5bukoRqHmDHOIG1N8/X2F4I8WyNhtf2+9hqSsZxqZ4upbb6HsSZLHO + Im90ym6hNVcIaktYTexZyUelGEvaHMy/jcFiZxo0xX5Y7ivGcn8JkVmA9uvlWBmqwpJeAWovs+poR99O + eRgWtQWYVUdgrj0FH+i+F3XF3NoappZYGJrEoLaOVYpOOTY/FGJB+xjTqnDMtMTTAC/Ma/Ix/TLUKl9e + x0JfFQpql7PykBP7lWIXzPeUYLIhHCPKCLr/AMy2ZsKoDLTKdNNdvM8TgNpRTBZwfJ885CTmaIChPhwa + mS+GnkdhqjEWY9X+VplqvIMXEhdQ24mZeuSs0N/BNNWWj4k6EdSZHhhXxWH0aSCGFd4c4Tk7zk7XBlUM + FKLToK4Nm+0qYnneRzqGGiSYaIiiyZdhVCdgqFSIwRJPjucZW85O1pvnRmvDkO9zFNTdy2Y6HjGp4HCF + 5kk4xhoiURd/EROv4tBfeM0qAyUC9Mp9QM0+7o829T6LZV0/mNycS6+nFKFWfAGj9ZHozfGwil7miZYH + 7qCmghsw+S6VpV894KuUuKFbfhNNqa749CwY3dm0toK+VABl3HlQM5obYHybwFLc7W1y/Y5BlX6FfgNn + DNcEY0DhZZX+MiGKbh0DNR24AYYWMSfJzc6GZBApwS5skIzNODcg0dV2V36FtsJ7yBJ8UXO8hyzBFzXH + ++H/A/YDv9/V87iOlrYAAAAASUVORK5CYII= @@ -3164,9 +3164,6 @@ 864, 17 - - 864, 17 - iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 diff --git a/Program.cs b/Program.cs index e38f7b8..a76d0d4 100644 --- a/Program.cs +++ b/Program.cs @@ -16,14 +16,14 @@ [STAThread] static void Main() { - ValidateInfo validateInfo = ValidateConfig.LoadConfig(); + ValidateConfig.LoadConfig(); string localConfigPath = Application.StartupPath + "/Config.xml"; //获取程序及版本信息 string currentVersionCode = Assembly.GetExecutingAssembly().GetName().Version.ToString(); //获取文件版本信息 FileVersionInfo.GetVersionInfo(Application.ExecutablePath); - + Utility.SysInfoConfig(); string configUrl = getProgramUrl(localConfigPath, "configurl"); if (configUrl != "") { diff --git a/TreeUtils.cs b/TreeUtils.cs index 1f055b5..ad39643 100644 --- a/TreeUtils.cs +++ b/TreeUtils.cs @@ -19,7 +19,7 @@ public static void InitLayerTree(GSOGlobeControl gsoGlobeControl, TreeView treeView, string viewDatasrc) { // treeView.Nodes.Clear(); - LayerConfig layerConfig = Utility.layerConfig;//layertree所在的配置文件 + LayerConfig layerConfig = Utility.LayerConfig;//layertree所在的配置文件 List datasrcs = layerConfig.datasrcs; foreach (DataSrc datasrc in datasrcs) { diff --git a/Utility.cs b/Utility.cs index c03e405..ab947a3 100644 --- a/Utility.cs +++ b/Utility.cs @@ -20,7 +20,7 @@ public static string dbdatabase; public static string userID; - public static Hashtable Pipe_QueryFields; +// public static Hashtable Pipe_QueryFields; public static string DBPassword; public static string DBServer; public static string DBBackUp; @@ -38,7 +38,7 @@ public static List listPipelineType; public static string PicRootURL; public static string PicDefaultURL; - public static double dFlyAboveLine = 2; +// public static double dFlyAboveLine = 2; public static string userName; public static string projectStr; public static string userRole; @@ -85,12 +85,17 @@ public static List pipefittingLayerNames = new List();//管件图层名称 public static List sgPipeLayersNames = new List();//施工管线图层名称 -// public static Dictionary dictionaryNetLayerNameAndCaption = new Dictionary(); - public static HashSet layerNameSet = new HashSet(); + public static HashSet layerNameSet = new HashSet();//记录有哪些图层要显示 public static string roadLayerName = ""; #endregion wxl - public static LayerConfig layerConfig; + public static LayerConfig LayerConfig; + + public static string RoleServer; + public static string TitleImagePath; + public static string SysnameVersion; + public static string Copyright; + public static void SetBallons(GSOBalloon featureTooltip, GSOBalloonEx balloonEx) { featureTooltip.CacheFilePath = Application.StartupPath + "/GeoScene/Globe/Temp"; @@ -188,25 +193,6 @@ } return s.ToString(); } - public static GSOFeatures Table2Features(DataTable table, string currentQueryLayer, GSOGlobeControl globeControl1) - { - GSOFeatures features = new GSOFeatures(); - for (int i = 0; i < table.Rows.Count; i++) - { - DataRow row = table.Rows[i]; - - string featureName = row["编号"].ToString(); - featureName = featureName.Trim(); - GSOLayer layer = globeControl1.Globe.Layers.GetLayerByCaption(currentQueryLayer); - GSOFeatures tempfeatures = layer.GetFeatureByName(featureName, false); - if (tempfeatures.Length > 0) - { - features.Add(tempfeatures[0]); - } - } - return features; - } - //程序启动的时候读取配置文件 public static void SetParams() @@ -358,8 +344,8 @@ #region wxl 从layerconfig.xml中读取 - layerConfig = XmlTools.DeserializeFromXml(layerConfigFile); - List dataSrcs = layerConfig.datasrcs; + LayerConfig = XmlTools.DeserializeFromXml(layerConfigFile); + List dataSrcs = LayerConfig.datasrcs; foreach (var dataSrc in dataSrcs) { @@ -598,76 +584,49 @@ #endregion } - /* - //判断网络是否连接 - public static bool isNetworkConnectionSuccess(string ipAdress) + /// + /// 获取Config.xml配置文件中的roleurl配置，并返回 + /// + /// 请求综合信息平台的服务地址 + public static void SysInfoConfig() { - //return true; - if (ipAdress == null) - { - return false; - } - if (ipAdress.Contains("\\")) - { - ipAdress = ipAdress.Substring(0, ipAdress.LastIndexOf('\\')); - } - if (ipAdress.Trim() == "localhost" || ipAdress.Trim() == "127.0.0.1" || ipAdress.Trim() == Dns.GetHostName()) - { - return true; - } - Ping ping = new Ping(); + if (!File.Exists(filename)) return; + + XmlTextReader xmlReader = new XmlTextReader(filename); try { - PingReply pr = ping.Send(ipAdress.Trim(), 3000); - if (pr.Status == IPStatus.Success) + while (xmlReader.Read()) { - return true; + if (xmlReader.Name.Equals("roleurl")) + { + RoleServer = xmlReader.ReadElementString(); + } + else if (xmlReader.Name.Equals("titleimgpath")) + { + TitleImagePath = xmlReader.ReadElementString(); + } + else if (xmlReader.Name.Equals("sysname")) + { + SysnameVersion = xmlReader.ReadElementString(); + } + else if (xmlReader.Name.Equals("copyright")) + { + Copyright = xmlReader.ReadElementString(); + } } - else - { - return false; - } + } catch (Exception ex) { - LogError.PublishError(ex); - return false; + + LogHelper.Error("在config.xml配置文件中读取roleurl时出错"); } - } - */ - - - //TODO LIST:下面两个方法移到featueTools.cs中 - //根据附属物图层名字得到里面含有的附属物 - public static string[] getAccStrsByLayer(string layername) - { - string[] accStrs = null; - string sql = "select 附属物名称 from " + layername + " group by 附属物名称"; - DataSet dataset = OledbHelper.getDataSet(sql, layername); - if (dataset == null) return null; - accStrs = new string[dataset.Tables[0].Rows.Count]; - for (int i = 0; i < dataset.Tables[0].Rows.Count; i++) + finally { - accStrs[i] = dataset.Tables[0].Rows[i][0].ToString(); + xmlReader.Close(); } - return accStrs; } - //删除内存图层中指定名称的feature - public static void RemoveFeatureFromName(GSOGlobeControl globeControl1, string featureName) - { - GSOFeatures features = globeControl1.Globe.MemoryLayer.GetFeatureByName(featureName, true); - if (features != null) - { - for (int i = features.Length - 1; i >= 0; i--) - { - GSOFeature feature = features[i]; - if (feature != null) - { - globeControl1.Globe.MemoryLayer.RemoveFeatureByID(feature.ID); - } - } - } - globeControl1.Refresh(); - } + + } } diff --git a/FeatureStatisticsService.cs b/FeatureStatisticsService.cs index 331ee47..b127fe3 100644 --- a/FeatureStatisticsService.cs +++ b/FeatureStatisticsService.cs @@ -190,7 +190,7 @@ List result = new List(); //layer.Name是表名 - string[] accessStrs = Utility.getAccStrsByLayer(layer.Name); + string[] accessStrs = FeatureTools.GetAccStrsByLayer(layer.Name); foreach (string accssname in accessStrs) { diff --git a/FeatureTools.cs b/FeatureTools.cs index be4b469..3c08f34 100644 --- a/FeatureTools.cs +++ b/FeatureTools.cs @@ -1,5 +1,6 @@ using System; using System.Collections.Generic; +using System.Data; using System.Linq; using System.Text; using System.Windows.Forms; @@ -43,7 +44,7 @@ } feature.Delete();//地球上删除该feature string sql = "delete from " + layerName + " where LSSYS_ID =" + feature.ID + " and (编号 is null or substr(编号,length(编号)-2)='TMP')"; - OledbHelper.sqlExecuteNonQuery(sql);//目前无法取到LSSYS_ID，所以这个判断条件不太合适，会导致把该类所有新建的都删除了 + OledbHelper.sqlExecuteNonQuery(sql); } catch (Exception) { @@ -106,5 +107,46 @@ } return value; } + + /// + /// 根据附属物图层名字得到里面含有的附属物 + /// + /// + /// + public static string[] GetAccStrsByLayer(string layername) + { + string[] accStrs = null; + string sql = "select 附属物名称 from " + layername + " group by 附属物名称"; + DataSet dataset = OledbHelper.getDataSet(sql, layername); + if (dataset == null) return null; + accStrs = new string[dataset.Tables[0].Rows.Count]; + for (int i = 0; i < dataset.Tables[0].Rows.Count; i++) + { + accStrs[i] = dataset.Tables[0].Rows[i][0].ToString(); + } + return accStrs; + } + + /// + /// 删除内存图层中指定名称的feature + /// + /// + /// + public static void RemoveFeatureFromName(GSOGlobeControl globeControl1, string featureName) + { + GSOFeatures features = globeControl1.Globe.MemoryLayer.GetFeatureByName(featureName, true); + if (features != null) + { + for (int i = features.Length - 1; i >= 0; i--) + { + GSOFeature feature = features[i]; + if (feature != null) + { + globeControl1.Globe.MemoryLayer.RemoveFeatureByID(feature.ID); + } + } + } + globeControl1.Refresh(); + } } } diff --git a/Forms/FrmPipelineModelDataBase.cs b/Forms/FrmPipelineModelDataBase.cs index b577fd8..bc1e479 100644 --- a/Forms/FrmPipelineModelDataBase.cs +++ b/Forms/FrmPipelineModelDataBase.cs @@ -149,7 +149,7 @@ catch (Exception ex) { LogError.PublishError(ex); - LogHelper.WriteLog(typeof(FrmPipelineModelDB), ex.Message); + LogHelper.Error(ex.Message); } } diff --git a/FrmAccessoriesSensor.cs b/FrmAccessoriesSensor.cs index 98aa1cf..542f19a 100644 --- a/FrmAccessoriesSensor.cs +++ b/FrmAccessoriesSensor.cs @@ -240,7 +240,7 @@ { if (clbPipeLine.CheckedItems.Count > 0) { - Utility.RemoveFeatureFromName(globeControl1, "trackPolygon"); + FeatureTools.RemoveFeatureFromName(globeControl1, "trackPolygon"); globeControl1.Globe.Action = EnumAction3D.TrackPolygon; globeControl1.TrackPolygonEndEvent += globeControl1_TrackPolygonEndEvent; } @@ -259,7 +259,7 @@ private void FrmAccessoriesgather_FormClosing(object sender, FormClosingEventArgs e) { frm = null; - Utility.RemoveFeatureFromName(globeControl1, "trackPolygon"); + FeatureTools.RemoveFeatureFromName(globeControl1, "trackPolygon"); globeControl1.Globe.Action = EnumAction3D.ActionNull; globeControl1.TrackPolygonEndEvent -= globeControl1_TrackPolygonEndEvent; } diff --git a/FrmAccessoriesgather.cs b/FrmAccessoriesgather.cs index e1d176e..c36273b 100644 --- a/FrmAccessoriesgather.cs +++ b/FrmAccessoriesgather.cs @@ -118,7 +118,7 @@ { if (clbPipeLine2.Text!="") { - Utility.RemoveFeatureFromName(globeControl1, "trackPolygon"); + FeatureTools.RemoveFeatureFromName(globeControl1, "trackPolygon"); globeControl1.Globe.Action = EnumAction3D.TrackPolygon; globeControl1.Globe.TrackPolygonTool.TrackMode = EnumTrackMode.SpaceTrack; globeControl1.TrackPolygonEndEvent += globeControl1_TrackPolygonEndEvent; @@ -295,7 +295,7 @@ private void FrmAccessoriesgather_FormClosing(object sender, FormClosingEventArgs e) { frm = null; - Utility.RemoveFeatureFromName(globeControl1, "trackPolygon"); + FeatureTools.RemoveFeatureFromName(globeControl1, "trackPolygon"); globeControl1.TrackPolygonEndEvent -= globeControl1_TrackPolygonEndEvent; globeControl1.Globe.Action = EnumAction3D.ActionNull; diff --git a/FrmAddWellShp.cs b/FrmAddWellShp.cs index 7983349..78d8946 100644 --- a/FrmAddWellShp.cs +++ b/FrmAddWellShp.cs @@ -100,7 +100,7 @@ catch (Exception ex) { LogError.PublishError(ex); - LogHelper.WriteLog(typeof(FrmAddWellShp), ex.Message); + LogHelper.Error(ex.Message); } } diff --git a/FrmBSQStatis.cs b/FrmBSQStatis.cs index 5b05926..b5e581d 100644 --- a/FrmBSQStatis.cs +++ b/FrmBSQStatis.cs @@ -97,7 +97,7 @@ } catch (Exception ex) { - LogHelper.WriteLog(typeof(FrmBSQStatis),ex.Message); + LogHelper.Error(ex.Message); } return typeAndCount; } @@ -108,7 +108,7 @@ GSOLayer layer = globeControl1.Globe.Layers.GetLayerByCaption("标识器"); GSOFeatures bsqFs = FeatureStatisticsService.GetLayerFeatures(polygon, layer); if (bsqFs == null || bsqFs.Length <= 0) { - LogHelper.WriteLog(typeof(FrmBSQStatis),"标识器图层下的Feature为空"); + LogHelper.Error("标识器图层下的Feature为空!"); return null; } diff --git a/FrmBasicQuery.cs b/FrmBasicQuery.cs index baeeade..cc8d3ff 100644 --- a/FrmBasicQuery.cs +++ b/FrmBasicQuery.cs @@ -224,7 +224,7 @@ } catch(Exception ex) { - LogHelper.WriteLog(typeof(FrmBasicQuery), ex.Message); + LogHelper.Error(ex.Message); } } else diff --git a/FrmCodingQuery.cs b/FrmCodingQuery.cs index f1ac322..d4ec095 100644 --- a/FrmCodingQuery.cs +++ b/FrmCodingQuery.cs @@ -82,7 +82,7 @@ } catch (Exception ex) { - LogHelper.WriteLog(typeof(FrmCodingQuery), ex.Message); ; + LogHelper.Error(ex.Message); } } diff --git a/FrmDiameterQuery.cs b/FrmDiameterQuery.cs index e7b3657..75d7949 100644 --- a/FrmDiameterQuery.cs +++ b/FrmDiameterQuery.cs @@ -150,7 +150,7 @@ catch (Exception ex) { //LogError.PublishError(ex); - LogHelper.WriteLog(typeof(FrmDiameterQuery), ex.Message); + LogHelper.Error(ex.Message); MessageBox.Show("请输入正确的管径范围！"); return; } diff --git a/FrmFittingQuery.cs b/FrmFittingQuery.cs index 12f6007..8645011 100644 --- a/FrmFittingQuery.cs +++ b/FrmFittingQuery.cs @@ -69,7 +69,7 @@ } catch (Exception ex) { - LogHelper.WriteLog(typeof(FrmFittingQuery), ex.Message); + LogHelper.Error(ex.Message); } } /// diff --git a/FrmKeywordQuery.cs b/FrmKeywordQuery.cs index 405524f..ede0a93 100644 --- a/FrmKeywordQuery.cs +++ b/FrmKeywordQuery.cs @@ -87,7 +87,7 @@ } catch (Exception ex) { - LogHelper.WriteLog(typeof(FrmKeywordQuery), ex.Message); + LogHelper.Error(ex.Message); } } diff --git a/FrmLogin.cs b/FrmLogin.cs index 1172c23..6fbaed9 100644 --- a/FrmLogin.cs +++ b/FrmLogin.cs @@ -2,6 +2,8 @@ using System.Data; using System.Data.OracleClient; using System.IO; +using System.Net; +using System.Text; using System.Windows.Forms; using System.Xml; using DevComponents.DotNetBar; @@ -10,16 +12,15 @@ { public partial class FrmLogin : Office2007Form { + + //登录界面 -- 配置文件的路径 + public static string filename = Application.StartupPath + "\\login.xml"; + + public FrmLogin() { InitializeComponent(); } - public string rolename = "浏览"; - public string username = ""; - public string department = ""; - - //登录界面 -- 配置文件的路径 - public static string filename = Application.StartupPath + "\\login.xml"; /// /// 登录按钮事件处理 /// @@ -28,9 +29,10 @@ private void button1_Click(object sender, EventArgs e) { bool result = ValidateUser(); +// bool result =ValidateFromUrl();//从平台获取用户角色信息，判断是否能登陆成功 if (result) { - username = txtUser.Text.Trim(); + WriteXml(); Utility.userName = txtUser.Text.Trim(); DialogResult = DialogResult.OK; Close(); @@ -43,80 +45,6 @@ } } /// - /// 关闭按钮事件处理 - /// - /// - /// - private void button2_Click(object sender, EventArgs e) - { - Close(); - } - /// - /// 验证端口号 - /// - /// - //private bool ValiPort() - //{ - // Ping p = new Ping();//创建Ping对象p - // PingReply pr = p.Send(Utility.localicenseserverip);//向指定IP或者主机名的计算机发送ICMP协议的ping数据包 - // if (pr.Status == IPStatus.Success)//如果ping成功 - // { - // try - // { - // TcpClient tcpc = new TcpClient(Utility.localicenseserverip, Utility.localicenseserverport);//对IP地址为"192.168.0.105"的计算机的1500端口提出连接申请 - // tcpc.Close(); - // return true; - // } - // catch (Exception ex) - // { - // LogError.PublishError(ex); - // MessageBox.Show("端口连接错误！" + ex.Message); - // return false; - // } - // } - // else - // { - // int times = 0;//重新连接次数; - // int count = 2;//设置尝试次数 - // while (times < count) - // { - // //Thread.Sleep(1000);//等待时间(方便测试的话，你可以改为1000) - // pr = p.Send(Utility.localicenseserverip); - - // if (pr.Status == IPStatus.Success) - // { - // try - // { - // TcpClient tcpc = new TcpClient(Utility.localicenseserverip, Utility.localicenseserverport);//对IP地址为"192.168.0.105"的计算机的1500端口提出连接申请 - // tcpc.Close(); - // return true; - // } - // catch (Exception ex) - // { - // LogError.PublishError(ex); - // MessageBox.Show("端口连接错误！" + ex.Message); - // return false; - // } - // } - // else - // { - // times++; - // if (times < count) - // { - // continue; - // } - // else - // { - // MessageBox.Show("重新尝试连接失败"); - // return false; - // } - // } - - // } - // return false; - // } - //} - /// /// 验证用户名、密码 /// /// @@ -126,24 +54,64 @@ string sql = "select * from casic_userinfotest where USERNAME='" + txtUser.Text.Trim() + "' and PASSWORD='" + passWord + "' and sysname='GHFX' "; DataTable dt = OledbHelper.QueryTable(sql); - if (dt != null && dt.Rows.Count > 0) + if (dt == null || dt.Rows.Count <= 0) return false; + if (String.IsNullOrEmpty(dt.Rows[0]["rid"].ToString())) return true; + sql = "select gid from casic_userroletest where id=" + dt.Rows[0]["rid"] + " and sysname='GHFX' "; + using (OracleDataReader reader = OracleUtils.ExecuteReader(OracleUtils.ConnectionString, CommandType.Text, sql)) { - WriteXML(); - if (!String.IsNullOrEmpty(dt.Rows[0]["rid"].ToString())) + while (reader.Read()) { - sql = "select gid from casic_userroletest where id=" + dt.Rows[0]["rid"] + " and sysname='GHFX' "; - using (OracleDataReader reader = OracleUtils.ExecuteReader(OracleUtils.ConnectionString, CommandType.Text, sql)) - { - while (reader.Read()) - { - Utility.userRole = reader[0].ToString(); - break; - } - } + Utility.userRole = reader[0].ToString(); + LogHelper.Debug("测试一下"); + break; } - return true; } - return false; + return true; + } + + + + private bool ValidateFromUrl() + { + string user = txtUser.Text.Trim(); + string pwd = textBoxPassWord.Text.Trim(); + //做成配置的 + string roleserver = Utility.RoleServer; + if (roleserver == null || roleserver.Trim().Equals("")) + { + MessageBox.Show("请在Config.xml中配置roleurl！"); + return false; + } + HttpWebRequest request = + WebRequest.Create(roleserver+"/rs/authority/user?username=" + user + "&password=" + pwd + "&appId=21") as HttpWebRequest; + if (request == null) return false; + using (HttpWebResponse response = request.GetResponse() as HttpWebResponse) + { + try + { + if (response == null || response.GetResponseStream() == null) return false; + StreamReader reader = new StreamReader(response.GetResponseStream()); + string[] result = reader.ReadToEnd().Split(','); + //解析result + if (result.Length < 5) return false; + StringBuilder userRole = new StringBuilder(""); + for (int i = 4; i < result.Length; i++) + { + string[] tmpStrings = result[i].Split('_'); + if (tmpStrings.Length < 2) continue; + userRole.Append(tmpStrings[1].Trim() + ","); + } + if (userRole.Length < 3) return false; + userRole.Remove(userRole.Length - 3, 3); + // MessageBox.Show(userRole.ToString()); + Utility.userRole = userRole.ToString(); + return Utility.userRole != null && !Utility.userRole.Equals("null"); + } + catch (Exception e) + { + return false; + } + } } private void FrmLogin_Load(object sender, EventArgs e) @@ -153,74 +121,56 @@ StartPosition = FormStartPosition.CenterScreen; - ReadXML(); + ReadXml(); } /// /// 读取上一次登录的用户名和密码 /// - private void ReadXML() + private void ReadXml() { - if (File.Exists(filename)) + if (!File.Exists(filename)) return; + //初始化XML文档操作类 + XmlDocument myDoc = new XmlDocument(); { - if (!File.Exists(filename)) + //加载XML文件 + try { + myDoc.Load(filename); + } + catch (Exception e) + { + LogError.PublishError(e); return; } - - //初始化XML文档操作类 - XmlDocument myDoc = new XmlDocument(); + //搜索指定的节点 + XmlNode serverRootNode = myDoc.SelectSingleNode("Params"); + XmlNodeList nodes = null; + if (serverRootNode != null) { - //加载XML文件 - try + nodes = serverRootNode.ChildNodes; + } + if (nodes == null) return; + foreach (XmlNode xn in nodes) + { + if (xn.Name.Equals("username")) { - myDoc.Load(filename); + txtUser.Text = xn.InnerText.Trim(); } - catch (Exception e) + else if (xn.Name.Equals("password")) { - LogError.PublishError(e); - return; + textBoxPassWord.Text = xn.InnerText.Trim(); } - //搜索指定的节点 - XmlNode serverRootNode = myDoc.SelectSingleNode("Params"); - XmlNodeList nodes = null; - if (serverRootNode != null) + else if (xn.Name.Equals("isremember")) { - nodes = serverRootNode.ChildNodes; - } - if (nodes != null) - { - foreach (XmlNode xn in nodes) - { - if (xn.Name == "username") - { - txtUser.Text = xn.InnerText.Trim(); - } - else if (xn.Name == "password") - { - textBoxPassWord.Text = xn.InnerText.Trim(); - } - else if (xn.Name == "isremember") - { - if (xn.InnerText.Trim() == "true") - { - checkBoxXRememberPassword.Checked = true; - } - else if (xn.InnerText.Trim() == "false") - { - checkBoxXRememberPassword.Checked = false; - } - } - } - + checkBoxXRememberPassword.Checked = xn.InnerText.Trim().Equals("true"); } } } - } /// /// 记录登录的用户名和密码 /// - private void WriteXML() + private void WriteXml() { if (!File.Exists(filename)) { @@ -252,31 +202,17 @@ foreach (XmlNode xn in nodes) { XmlElement xe = (XmlElement)xn; - if (xe.Name == "username") + if (xe.Name.Equals("username")) { xe.InnerText = txtUser.Text.Trim(); } - else if (xe.Name == "password") + else if (xe.Name.Equals("password")) { - if (checkBoxXRememberPassword.Checked) - { - xe.InnerText = textBoxPassWord.Text.Trim(); - } - else - { - xe.InnerText = ""; - } + xe.InnerText = checkBoxXRememberPassword.Checked ? textBoxPassWord.Text.Trim() : ""; } - else if (xe.Name == "isremember") + else if (xe.Name.Equals("isremember")) { - if (checkBoxXRememberPassword.Checked) - { - xe.InnerText = "true"; - } - else - { - xe.InnerText = "false"; - } + xe.InnerText = checkBoxXRememberPassword.Checked ? "true" : "false"; } } } diff --git a/FrmMaterialSel.cs b/FrmMaterialSel.cs index 8645ab3..d23f385 100644 --- a/FrmMaterialSel.cs +++ b/FrmMaterialSel.cs @@ -157,7 +157,7 @@ } catch (Exception ex) { - LogHelper.WriteLog(typeof(FrmMaterialSel), ex.Message); + LogHelper.Error(ex.Message); } } diff --git a/FrmMetadataStat.cs b/FrmMetadataStat.cs index c3c1359..96029a6 100644 --- a/FrmMetadataStat.cs +++ b/FrmMetadataStat.cs @@ -96,7 +96,7 @@ //统计有多少个图层 private int statistLayer() { - List datasrcs = Utility.layerConfig.datasrcs; + List datasrcs = Utility.LayerConfig.datasrcs; return datasrcs.SelectMany(datasrc => datasrc.layertypes).Sum(layerType => layerType.layers.Count); } diff --git a/FrmpipeDeepstatis.cs b/FrmpipeDeepstatis.cs index 6a5c895..8d915a9 100644 --- a/FrmpipeDeepstatis.cs +++ b/FrmpipeDeepstatis.cs @@ -2,6 +2,7 @@ using System.Collections.Generic; using System.Diagnostics; using System.IO; +using System.Reflection; using System.Text; using System.Windows.Forms; using System.Windows.Forms.DataVisualization.Charting; @@ -320,7 +321,7 @@ MessageBox.Show("请添加分段"); return; } - Utility.RemoveFeatureFromName(globeControl1, "trackPolygon"); + FeatureTools.RemoveFeatureFromName(globeControl1, "trackPolygon"); globeControl1.Globe.Action = EnumAction3D.TrackPolygon; globeControl1.Globe.TrackPolygonTool.TrackMode = EnumTrackMode.SpaceTrack; globeControl1.TrackPolygonEndEvent += globeControl1_TrackPolygonEndEvent; @@ -408,12 +409,11 @@ TextBox control; private void dataGridViewX2_EditingControlShowing(object sender, DataGridViewEditingControlShowingEventArgs e) { - if (e.Control.GetType().BaseType.Name == "TextBox") - { - control = new TextBox(); - control = (TextBox)e.Control; - control.KeyPress += control_KeyPress; - } + MemberInfo memberInfo = e.Control.GetType().BaseType; + if (memberInfo != null && !memberInfo.Name.Equals("TextBox")) return; + control = new TextBox(); + control = (TextBox)e.Control; + control.KeyPress += control_KeyPress; } /// /// 键盘按键按下事件处理 @@ -423,28 +423,24 @@ void control_KeyPress(object sender, KeyPressEventArgs e) { TextBox text = sender as TextBox; + if (text == null) return; if ((e.KeyChar < 48 || e.KeyChar > 57) && (e.KeyChar != 8) && e.KeyChar != 46) { e.Handled = true; } - if (e.KeyChar == 46) //小数点 + if (e.KeyChar != 46) return; + if (text.Text.Length <= 0) + e.Handled = true; //小数点不能在第一位 + else //处理不规则的小数点 { - if (text.Text.Length <= 0) - e.Handled = true; //小数点不能在第一位 - else //处理不规则的小数点 + float f; + float oldf; + bool b1 = false, b2 = false; + b1 = float.TryParse(text.Text, out oldf); + b2 = float.TryParse(text.Text + e.KeyChar, out f); + if (!b2) { - float f; - float oldf; - bool b1 = false, b2 = false; - b1 = float.TryParse(text.Text, out oldf); - b2 = float.TryParse(text.Text + e.KeyChar, out f); - if (b2 == false) - { - if (b1) - e.Handled = true; - else - e.Handled = false; - } + e.Handled = b1; } } } @@ -457,7 +453,7 @@ { frm = null; - Utility.RemoveFeatureFromName(globeControl1, "trackPolygon"); + FeatureTools.RemoveFeatureFromName(globeControl1, "trackPolygon"); globeControl1.TrackPolygonEndEvent -= globeControl1_TrackPolygonEndEvent; globeControl1.Globe.Action = EnumAction3D.ActionNull; diff --git a/FrmpipeDiametergather.cs b/FrmpipeDiametergather.cs index a9d96fa..c09aaf1 100644 --- a/FrmpipeDiametergather.cs +++ b/FrmpipeDiametergather.cs @@ -154,7 +154,7 @@ MessageBox.Show("请选择图层！"); return; } - Utility.RemoveFeatureFromName(globeControl1, "trackPolygon"); + FeatureTools.RemoveFeatureFromName(globeControl1, "trackPolygon"); globeControl1.Globe.Action = EnumAction3D.TrackPolygon; globeControl1.Globe.TrackPolygonTool.TrackMode = EnumTrackMode.SpaceTrack; globeControl1.TrackPolygonEndEvent += globeControl1_TrackPolygonEndEvent; @@ -392,7 +392,7 @@ private void FrmpipeDiametergather_FormClosing(object sender, FormClosingEventArgs e) { frm = null; - Utility.RemoveFeatureFromName(globeControl1, "trackPolygon"); + FeatureTools.RemoveFeatureFromName(globeControl1, "trackPolygon"); globeControl1.TrackPolygonEndEvent -= globeControl1_TrackPolygonEndEvent; globeControl1.Globe.Action = EnumAction3D.ActionNull; diff --git a/FrmpipeMaterialGather.cs b/FrmpipeMaterialGather.cs index 44e7f24..5ca8144 100644 --- a/FrmpipeMaterialGather.cs +++ b/FrmpipeMaterialGather.cs @@ -58,10 +58,9 @@ for (int i = 0; i < pipeLayerNames.Count; i++) { clbPipeLine.Items.Add(pipeLayerNames[i]); - GSOLayer layer = globeControl1.Globe.Layers.GetLayerByCaption(pipeLayerNames[i]); - if (layer.Dataset == null || !layer.Dataset.IsFeatureDataset || layer.Type != EnumLayerType.FeatureLayer) continue; + GSOLayer layer = globeControl1.Globe.Layers.GetLayerByCaption(pipeLayerNames[i]); + if (layer == null || layer.Dataset == null || !layer.Dataset.IsFeatureDataset || layer.Type != EnumLayerType.FeatureLayer) continue; - string name = layer.Name; GSOFeatureLayer flayer = layer as GSOFeatureLayer; GSOFeatures feats = flayer.GetAllFeatures(); @@ -205,7 +204,7 @@ { chart1.Series.Add(clbPipeLine.CheckedItems[i].ToString()); GSOLayer layer = globeControl1.Globe.Layers.GetLayerByCaption(clbPipeLine.CheckedItems[i].ToString()); - if (layer != null && layer is GSOFeatureLayer) + if (layer is GSOFeatureLayer) { GSOFeatureLayer flayer = layer as GSOFeatureLayer; GSOFeatures features = flayer.GetAllFeatures(); @@ -240,10 +239,9 @@ labeStyleAxisX.Enabled = true; chart1.ChartAreas["ChartArea1"].AxisX.LabelStyle = labeStyleAxisX; - Dictionary dic1 = new Dictionary(); for (int j = 0; j < chart1.Series.Count; j++) { - dic1 = new Dictionary(); + Dictionary dic1 = new Dictionary(); foreach (string key in dic.Keys) { if (key.Contains(chart1.Series[j].Name)) @@ -304,7 +302,7 @@ MessageBox.Show("请选择材质类型！"); return; } - Utility.RemoveFeatureFromName(globeControl1, "trackPolygon"); + FeatureTools.RemoveFeatureFromName(globeControl1, "trackPolygon"); globeControl1.Globe.Action = EnumAction3D.TrackPolygon; globeControl1.Globe.TrackPolygonTool.TrackMode = EnumTrackMode.SpaceTrack; globeControl1.TrackPolygonEndEvent += globeControl1_TrackPolygonEndEvent; @@ -318,7 +316,7 @@ private void FrmpipeMaterialGather_FormClosing(object sender, FormClosingEventArgs e) { frm = null; - Utility.RemoveFeatureFromName(globeControl1, "trackPolygon"); + FeatureTools.RemoveFeatureFromName(globeControl1, "trackPolygon"); globeControl1.TrackPolygonEndEvent -= globeControl1_TrackPolygonEndEvent; globeControl1.Globe.Action = EnumAction3D.ActionNull; diff --git a/Frmpipediameterstatis.cs b/Frmpipediameterstatis.cs index 4fb25a8..631a996 100644 --- a/Frmpipediameterstatis.cs +++ b/Frmpipediameterstatis.cs @@ -202,8 +202,8 @@ } catch (Exception ex) { - LogHelper.WriteLog(typeof(Frmpipediameterstatis), ex.Message); //MessageBox.Show(ex.Message); + LogHelper.Error(ex.Message); LogError.PublishError(ex); } } @@ -372,7 +372,7 @@ MessageBox.Show("请添加分段！"); return; } - Utility.RemoveFeatureFromName(globeControl1, "trackPolygon"); + FeatureTools.RemoveFeatureFromName(globeControl1, "trackPolygon"); globeControl1.Globe.Action = EnumAction3D.TrackPolygon; globeControl1.Globe.TrackPolygonTool.TrackMode = EnumTrackMode.SpaceTrack; globeControl1.TrackPolygonEndEvent += globeControl1_TrackPolygonEndEvent; @@ -422,7 +422,7 @@ globeControl1.Globe.Action = EnumAction3D.ActionNull; globeControl1.TrackPolygonEndEvent -= globeControl1_TrackPolygonEndEvent; - Utility.RemoveFeatureFromName(globeControl1, "trackPolygon"); + FeatureTools.RemoveFeatureFromName(globeControl1, "trackPolygon"); globeControl1.Globe.MemoryLayer.RemoveAllFeature(); } diff --git a/LineBuilder.cs b/LineBuilder.cs index 33a216c..b6a8516 100644 --- a/LineBuilder.cs +++ b/LineBuilder.cs @@ -43,8 +43,8 @@ GSOGeoPolyline3D lineeee = f.Geometry as GSOGeoPolyline3D; if (lineeee == null || lineeee.GetSpaceLength(true, 6378137) == 0) { - LogHelper.WriteLog(typeof(LineBuilder), "出现数据无法入库:"+f.ID); - continue; //TODO LIST:判断是否会出现部署数据无法入库情况,Log2Net + LogHelper.Error("出现数据无法入库:" + f.ID); + continue; } GSOFeature newFeature = newFeatureSet.CreateFeature(); diff --git a/LogHelper.cs b/LogHelper.cs index 9ef5f27..04573cf 100644 --- a/LogHelper.cs +++ b/LogHelper.cs @@ -1,4 +1,5 @@ using System; +using System.Diagnostics; using log4net; using log4net.Config; @@ -7,35 +8,82 @@ { public class LogHelper { - /// - /// 输出日志到Log4Net - /// - /// - /// - #region static void WriteLog(Type t, Exception ex) - public static void WriteLog(Type t, Exception ex) + private static ILog _logdebug = log4net.LogManager.GetLogger("logdebug"); + private static ILog _loginfo = log4net.LogManager.GetLogger("loginfo"); + private static ILog _logwarn = log4net.LogManager.GetLogger("logwarn"); + private static ILog _logerror = log4net.LogManager.GetLogger("logerror"); + private static ILog _logfatal = log4net.LogManager.GetLogger("logfatal"); + + public static void Debug(string msg) { - ILog log = log4net.LogManager.GetLogger(t); - log.Error("Error", ex); + StackFrame sf = new StackFrame(1); + msg = string.Format("{0}.{1}:{2}", sf.GetMethod().ReflectedType.FullName, sf.GetMethod().Name, msg); + _logdebug.Debug(msg); + } + public static void Debug(string msg, Exception e) + { + StackFrame sf = new StackFrame(1); + msg = string.Format("{0}.{1}:{2}", sf.GetMethod().ReflectedType.FullName, sf.GetMethod().Name, msg); + _logdebug.Debug(msg, e); } - #endregion - /// - /// 输出日志到Log4Net - /// - /// - /// - #region static void WriteLog(Type t, string msg) - - public static void WriteLog(Type t, string msg) + public static void Info(string msg) { - ILog log = log4net.LogManager.GetLogger(t); - log.Error(msg); + StackFrame sf = new StackFrame(1); + msg = string.Format("{0}.{1}:{2}", sf.GetMethod().ReflectedType.FullName, sf.GetMethod().Name, msg); + _loginfo.Info(msg); + } + public static void Info(string msg, Exception e) + { + StackFrame sf = new StackFrame(1); + msg = string.Format("{0}.{1}:{2}", sf.GetMethod().ReflectedType.FullName, sf.GetMethod().Name, msg); + _loginfo.Info(msg, e); } - #endregion + + public static void Warn(string msg) + { + StackFrame sf = new StackFrame(1); + msg = string.Format("{0}.{1}:{2}", sf.GetMethod().ReflectedType.FullName, sf.GetMethod().Name, msg); + _logwarn.Warn(msg); + } + public static void Warn(string msg, Exception e) + { + StackFrame sf = new StackFrame(1); + msg = string.Format("{0}.{1}:{2}", sf.GetMethod().ReflectedType.FullName, sf.GetMethod().Name, msg); + _logwarn.Warn(msg, e); + } + + + public static void Error(string msg) + { + StackFrame sf = new StackFrame(1); + msg = string.Format("{0}.{1}:{2}", sf.GetMethod().ReflectedType.FullName, sf.GetMethod().Name, msg); + _logerror.Error(msg); + } + public static void Error(string msg, Exception e) + { + StackFrame sf = new StackFrame(1); + msg = string.Format("{0}.{1}:{2}", sf.GetMethod().ReflectedType.FullName, sf.GetMethod().Name, msg); + _logerror.Error(msg, e); + } + + + public static void Fatal(string msg) + { + StackFrame sf = new StackFrame(1); + msg = string.Format("{0}.{1}:{2}", sf.GetMethod().ReflectedType.FullName, sf.GetMethod().Name, msg); + _logfatal.Fatal(msg); + } + public static void Fatal(string msg, Exception e) + { + StackFrame sf = new StackFrame(1); + msg = string.Format("{0}.{1}:{2}", sf.GetMethod().ReflectedType.FullName, sf.GetMethod().Name, msg); + _logfatal.Fatal(msg, e); + } + } diff --git a/MainFrm.cs b/MainFrm.cs index 43de664..51f362a 100644 --- a/MainFrm.cs +++ b/MainFrm.cs @@ -18,7 +18,6 @@ using GeoScene.Data; using GeoScene.Engine; using GeoScene.Globe; -using Timer = System.Windows.Forms.Timer; using ToolTip = System.Windows.Forms.ToolTip; namespace Cyberpipe @@ -163,6 +162,7 @@ /// private void AddGZ() { + lendendGZ50 = new GSOHudButton(); lendendGZ50.SetImage(Application.StartupPath + "/Resource/管纵/50.png"); lendendGZ50.SetOffset(0, 0); @@ -1294,18 +1294,19 @@ private void MainFrm_Load(object sender, EventArgs e) { + layerTree.Nodes.Add("正在加载，请稍后……");//树状图加载在图层加载之后，故增加提示 initGlobalControl(); - //initGlobalMap(); - //initLayerTree(); initMarkerTree(); initLayout(); loadData(); - double x = Convert.ToDouble(Utility.Query_Roads["定位"].ToString().Split(',')[0]); - double y = Convert.ToDouble(Utility.Query_Roads["定位"].ToString().Split(',')[1]); - double z = Convert.ToDouble(Utility.Query_Roads["定位"].ToString().Split(',')[2]); + + double x = Convert.ToDouble(Utility.Query_Roads["绿岛"].ToString().Split(',')[0]); + double y = Convert.ToDouble(Utility.Query_Roads["绿岛"].ToString().Split(',')[1]); + double z = Convert.ToDouble(Utility.Query_Roads["绿岛"].ToString().Split(',')[2]); jumpToCameraState(x, y, z); + } #endregion @@ -1315,11 +1316,17 @@ if (e.Layer == null || !e.Layer.Caption.Equals(Utility.roadLayerName)) return; foreach (TreeNode layerTreeNode in layerTree.Nodes) { - foreach (TreeNode node in layerTreeNode.Nodes) + for (int i=0;i dt, DataGridView dataGridView) @@ -7330,7 +7337,7 @@ } catch (Exception ex) { - LogHelper.WriteLog(typeof(MainFrm), ex); + LogHelper.Debug("", ex); } } } @@ -7362,7 +7369,7 @@ GSOLayer layer = globeControl1.Globe.Layers.Add(strDataPath); if (layer == null) {//wxl - LogHelper.WriteLog(typeof(MainFrm), "buttonItemHX1_Click操作中，" + strDataPath + "的layer为空"); + LogHelper.Error("buttonItemHX1_Click操作中，" + strDataPath + "的layer为空"); continue; } GSOFeatures redFeatures = layer.GetAllFeatures(); @@ -7457,17 +7464,12 @@ { try { + globeControl1.BeforeSceneRenderEvent -= globeControl1_BeforeSceneRenderEvent; globeControl2.BeforeSceneRenderEvent -= globeControl2_BeforeSceneRenderEvent; - double x = Convert.ToDouble(Utility.Query_Roads["定位"].ToString().Split(',')[0]); - double y = Convert.ToDouble(Utility.Query_Roads["定位"].ToString().Split(',')[1]); - double z = Convert.ToDouble(Utility.Query_Roads["定位"].ToString().Split(',')[2]); - jumpToCameraState(x, y, z); - /* globeControl1.Globe.FlyToPosition(new GSOPoint3d(120.610963, 31.188121, 50), EnumAltitudeMode.Absolute, -4, 50, 800); globeControl1.Globe.FlyToPointSpeed = 10000000; - * */ globeControl1.Globe.Action = EnumAction3D.SelectObject; globeControl1.Refresh(); @@ -7489,6 +7491,37 @@ } } /// + /// 基础工具 + /// + /// + /// + private void ribbonTabItem1_MouseDown(object sender, MouseEventArgs e) + { + try + { + + globeControl1.BeforeSceneRenderEvent -= globeControl1_BeforeSceneRenderEvent; + globeControl2.BeforeSceneRenderEvent -= globeControl2_BeforeSceneRenderEvent; + + globeControl1.Globe.Action = EnumAction3D.ActionNull; + dataGridViewX1.AutoSizeColumnsMode = DataGridViewAutoSizeColumnsMode.AllCells; + //zhanshi = false; + redSH = false; + splitContainer1.Panel2Collapsed = true; + panelOfTable.Visible = false; + legendSC.Visible = false; + legendSG.Visible = false; + ClearGZData(); + GSOLayer redLayer = globeControl1.Globe.Layers.GetLayerByCaption("红线"); + if (redLayer == null) return; + redLayer.Visible = false; + } + catch (Exception ex) + { + //MessageBox.Show("系统运行错误:" + ex.ToString(), "错误", MessageBoxButtons.OK, MessageBoxIcon.Error); + } + } + /// /// 一键审核 /// /// @@ -7497,6 +7530,7 @@ { try { + globeControl1.BeforeSceneRenderEvent -= globeControl1_BeforeSceneRenderEvent; globeControl2.BeforeSceneRenderEvent -= globeControl2_BeforeSceneRenderEvent; @@ -7518,32 +7552,7 @@ //MessageBox.Show("系统运行错误:" + ex.ToString(), "错误", MessageBoxButtons.OK, MessageBoxIcon.Error); } } - - void ResetRibbonTab() - { - try - { - globeControl1.BeforeSceneRenderEvent -= globeControl1_BeforeSceneRenderEvent; - globeControl2.BeforeSceneRenderEvent -= globeControl2_BeforeSceneRenderEvent; - - globeControl1.Globe.Action = EnumAction3D.ActionNull; - dataGridViewX1.AutoSizeColumnsMode = DataGridViewAutoSizeColumnsMode.AllCells; - //zhanshi = false; - redSH = false; - splitContainer1.Panel2Collapsed = true; - panelOfTable.Visible = false; - legendSC.Visible = false; - legendSG.Visible = false; - ClearGZData(); - GSOLayer redLayer = globeControl1.Globe.Layers.GetLayerByCaption("红线"); - if (redLayer == null) return; - redLayer.Visible = false; - } - catch (Exception ex) - { - LogHelper.WriteLog(typeof(MainFrm), ex); - } - } + /// /// 双屏对比 /// @@ -7553,8 +7562,8 @@ { try { - globeControl1.BeforeSceneRenderEvent += new BeforeSceneRenderEventHandler(globeControl1_BeforeSceneRenderEvent); - globeControl2.BeforeSceneRenderEvent += new BeforeSceneRenderEventHandler(globeControl2_BeforeSceneRenderEvent); + globeControl1.BeforeSceneRenderEvent += globeControl1_BeforeSceneRenderEvent; + globeControl2.BeforeSceneRenderEvent += globeControl2_BeforeSceneRenderEvent; globeControl1.Globe.Action = EnumAction3D.ActionNull; panelOfTable.Visible = false; @@ -7570,32 +7579,43 @@ GSOLayer redLayer = globeControl1.Globe.Layers.GetLayerByCaption("红线"); if (redLayer != null) - { redLayer.Visible = false; - } } catch (Exception ex) { - LogHelper.WriteLog(typeof(MainFrm), ex); + //MessageBox.Show("系统运行错误:" + ex.ToString(), "错误", MessageBoxButtons.OK, MessageBoxIcon.Error); } } /// - /// 基础工具 - /// - /// - /// - private void ribbonTabItem1_MouseDown(object sender, MouseEventArgs e) - { - ResetRibbonTab(); - } - /// /// 文档管理 /// /// /// private void ribbonTabItem4_MouseDown(object sender, MouseEventArgs e) { - ResetRibbonTab(); + try + { + + globeControl1.BeforeSceneRenderEvent -= globeControl1_BeforeSceneRenderEvent; + globeControl2.BeforeSceneRenderEvent -= globeControl2_BeforeSceneRenderEvent; + + globeControl1.Globe.Action = EnumAction3D.ActionNull; + panelOfTable.Visible = false; + //zhanshi = false; + redSH = false; + splitContainer1.Panel2Collapsed = true; + dataGridViewX1.AutoSizeColumnsMode = DataGridViewAutoSizeColumnsMode.AllCells; + legendSC.Visible = false; + legendSG.Visible = false; + ClearGZData(); + GSOLayer redLayer = globeControl1.Globe.Layers.GetLayerByCaption("红线"); + if (redLayer != null) + redLayer.Visible = false; + } + catch (Exception ex) + { + //MessageBox.Show("系统运行错误:" + ex.ToString(), "错误", MessageBoxButtons.OK, MessageBoxIcon.Error); + } } /// /// 基础管理 @@ -7604,7 +7624,29 @@ /// private void ribbonTabItem14_MouseDown(object sender, MouseEventArgs e) { - ResetRibbonTab(); + try + { + globeControl1.BeforeSceneRenderEvent -= globeControl1_BeforeSceneRenderEvent; + globeControl2.BeforeSceneRenderEvent -= globeControl2_BeforeSceneRenderEvent; + + globeControl1.Globe.Action = EnumAction3D.ActionNull; + panelOfTable.Visible = false; + //zhanshi = false; + redSH = false; + splitContainer1.Panel2Collapsed = true; + dataGridViewX1.AutoSizeColumnsMode = DataGridViewAutoSizeColumnsMode.AllCells; + legendSC.Visible = false; + legendSG.Visible = false; + ClearGZData(); + + GSOLayer redLayer = globeControl1.Globe.Layers.GetLayerByCaption("红线"); + if (redLayer != null) + redLayer.Visible = false; + } + catch (Exception ex) + { + //MessageBox.Show("系统运行错误:" + ex.ToString(), "错误", MessageBoxButtons.OK, MessageBoxIcon.Error); + } } /// /// 权限管理 @@ -7613,26 +7655,31 @@ /// private void ribbonTabItem2_MouseDown(object sender, MouseEventArgs e) { - ResetRibbonTab(); + try + { + globeControl1.BeforeSceneRenderEvent -= globeControl1_BeforeSceneRenderEvent; + globeControl2.BeforeSceneRenderEvent -= globeControl2_BeforeSceneRenderEvent; + + globeControl1.Globe.Action = EnumAction3D.ActionNull; + panelOfTable.Visible = false; + //zhanshi = false; + redSH = false; + splitContainer1.Panel2Collapsed = true; + dataGridViewX1.AutoSizeColumnsMode = DataGridViewAutoSizeColumnsMode.AllCells; + legendSC.Visible = false; + legendSG.Visible = false; + ClearGZData(); + + GSOLayer redLayer = globeControl1.Globe.Layers.GetLayerByCaption("红线"); + if (redLayer == null) return; + redLayer.Visible = false; + } + catch (Exception ex) + { + //MessageBox.Show("系统运行错误:" + ex.ToString(), "错误", MessageBoxButtons.OK, MessageBoxIcon.Error); + } } - /// - /// 管线定位 - /// - /// - /// - private void ribbonTabItem7_MouseDown(object sender, MouseEventArgs e) - { - ResetRibbonTab(); - } - /// - /// 标识器管理 - /// - /// - /// - private void ribbonTabItem5_MouseDown(object sender, MouseEventArgs e) - { - ResetRibbonTab(); - } + //GSOFeature dpFeatuer = null; /// /// 双屏分析，点击管段分析 @@ -8017,7 +8064,9 @@ private void btn_flag_Click(object sender, EventArgs e) { if (FrmFlagManagers.IS_OPEN) + { return; + } FrmFlagManagers frm = new FrmFlagManagers(globeControl1); frm.Show(this); } diff --git a/MainFrm.designer.cs b/MainFrm.designer.cs index e3dca41..73398c0 100644 --- a/MainFrm.designer.cs +++ b/MainFrm.designer.cs @@ -4,6 +4,7 @@ using DevComponents.DotNetBar; using DevComponents.DotNetBar.Controls; using DevComponents.Editors; +using System.Drawing; namespace Cyberpipe { @@ -89,6 +90,7 @@ this.sideBar1 = new DevComponents.DotNetBar.SideBar(); this.panelEx3 = new DevComponents.DotNetBar.PanelEx(); this.layerSensorTree = new System.Windows.Forms.TreeView(); + this.layerTree = new Cyberpipe.MyTreeView(); this.sideBarPanelItem3 = new DevComponents.DotNetBar.SideBarPanelItem(); this.controlContainerItem3 = new DevComponents.DotNetBar.ControlContainerItem(); this.sideBarPanelItem4 = new DevComponents.DotNetBar.SideBarPanelItem(); @@ -243,42 +245,18 @@ this.保存ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.定位ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.ribbonControl1 = new DevComponents.DotNetBar.RibbonControl(); - this.ribbonPanel6 = new DevComponents.DotNetBar.RibbonPanel(); - this.ribbonBar6 = new DevComponents.DotNetBar.RibbonBar(); - this.buttonItemSPSZ = new DevComponents.DotNetBar.ButtonItem(); - this.buttonItem8 = new DevComponents.DotNetBar.ButtonItem(); - this.buttonItemLocation = new DevComponents.DotNetBar.ButtonItem(); - this.sliderItem2 = new DevComponents.DotNetBar.SliderItem(); - this.buttonItemGBJC = new DevComponents.DotNetBar.ButtonItem(); - this.ribbonPanel5 = new DevComponents.DotNetBar.RibbonPanel(); - this.ribbonBar2 = new DevComponents.DotNetBar.RibbonBar(); - this.buttonItemHX1 = new DevComponents.DotNetBar.ButtonItem(); - this.buttonItemHX2 = new DevComponents.DotNetBar.ButtonItem(); - this.buttonItemDCTP = new DevComponents.DotNetBar.ButtonItem(); - this.sliderItem3 = new DevComponents.DotNetBar.SliderItem(); - this.ribbonPanel1 = new DevComponents.DotNetBar.RibbonPanel(); - this.ribbonBar21 = new DevComponents.DotNetBar.RibbonBar(); - this.buttonItem87 = new DevComponents.DotNetBar.ButtonItem(); - this.buttonItem88 = new DevComponents.DotNetBar.ButtonItem(); - this.buttonItem27 = new DevComponents.DotNetBar.ButtonItem(); - this.buttonItem91 = new DevComponents.DotNetBar.ButtonItem(); - this.buttonItem1 = new DevComponents.DotNetBar.ButtonItem(); - this.btnlegendSet = new DevComponents.DotNetBar.ButtonItem(); - this.buttonItem89 = new DevComponents.DotNetBar.ButtonItem(); - this.btnOutputJPG = new DevComponents.DotNetBar.ButtonItem(); - this.ribbonPanel12 = new DevComponents.DotNetBar.RibbonPanel(); - this.ribbonBar18 = new DevComponents.DotNetBar.RibbonBar(); - this.buttonItem133 = new DevComponents.DotNetBar.ButtonItem(); - this.ribbonBar13 = new DevComponents.DotNetBar.RibbonBar(); - this.buttonItem127 = new DevComponents.DotNetBar.ButtonItem(); - this.buttonItem128 = new DevComponents.DotNetBar.ButtonItem(); - this.sliderItem1 = new DevComponents.DotNetBar.SliderItem(); - this.buttonItem134 = new DevComponents.DotNetBar.ButtonItem(); - this.buttonItem130 = new DevComponents.DotNetBar.ButtonItem(); - this.btn_check_history = new DevComponents.DotNetBar.ButtonItem(); - this.ribbonPanel4 = new DevComponents.DotNetBar.RibbonPanel(); - this.ribbonBar1 = new DevComponents.DotNetBar.RibbonBar(); - this.btn_document_info = new DevComponents.DotNetBar.ButtonItem(); + this.ribbonPanel3 = new DevComponents.DotNetBar.RibbonPanel(); + this.ribbonBar4 = new DevComponents.DotNetBar.RibbonBar(); + this.btn_flag = new DevComponents.DotNetBar.ButtonItem(); + this.slider4ground = new DevComponents.DotNetBar.SliderItem(); + this.ribbonPanel7 = new DevComponents.DotNetBar.RibbonPanel(); + this.gxdw_ribbonbar = new DevComponents.DotNetBar.RibbonBar(); + this.buttonItem9 = new DevComponents.DotNetBar.ButtonItem(); + this.buttonItem10 = new DevComponents.DotNetBar.ButtonItem(); + this.buttonItem11 = new DevComponents.DotNetBar.ButtonItem(); + this.buttonItem12 = new DevComponents.DotNetBar.ButtonItem(); + this.buttonItem13 = new DevComponents.DotNetBar.ButtonItem(); + this.buttonItem14 = new DevComponents.DotNetBar.ButtonItem(); this.ribbonPanel15 = new DevComponents.DotNetBar.RibbonPanel(); this.ribbonBar20 = new DevComponents.DotNetBar.RibbonBar(); this.buttonItemSH = new DevComponents.DotNetBar.ButtonItem(); @@ -334,18 +312,6 @@ this.buttonItemXT4 = new DevComponents.DotNetBar.ButtonItem(); this.buttonItemXT4_1 = new DevComponents.DotNetBar.ButtonItem(); this.buttonItemXT4_2 = new DevComponents.DotNetBar.ButtonItem(); - this.ribbonPanel3 = new DevComponents.DotNetBar.RibbonPanel(); - this.ribbonBar4 = new DevComponents.DotNetBar.RibbonBar(); - this.btn_flag = new DevComponents.DotNetBar.ButtonItem(); - this.slider4ground = new DevComponents.DotNetBar.SliderItem(); - this.ribbonPanel7 = new DevComponents.DotNetBar.RibbonPanel(); - this.gxdw_ribbonbar = new DevComponents.DotNetBar.RibbonBar(); - this.buttonItem9 = new DevComponents.DotNetBar.ButtonItem(); - this.buttonItem10 = new DevComponents.DotNetBar.ButtonItem(); - this.buttonItem11 = new DevComponents.DotNetBar.ButtonItem(); - this.buttonItem12 = new DevComponents.DotNetBar.ButtonItem(); - this.buttonItem13 = new DevComponents.DotNetBar.ButtonItem(); - this.buttonItem14 = new DevComponents.DotNetBar.ButtonItem(); this.ribbonPanel2 = new DevComponents.DotNetBar.RibbonPanel(); this.ribbonBar3 = new DevComponents.DotNetBar.RibbonBar(); this.btn_user_info = new DevComponents.DotNetBar.ButtonItem(); @@ -355,6 +321,43 @@ this.btn_user_role = new DevComponents.DotNetBar.ButtonItem(); this.btn_password_edit = new DevComponents.DotNetBar.ButtonItem(); this.buttonItemPasswordReset = new DevComponents.DotNetBar.ButtonItem(); + this.ribbonPanel6 = new DevComponents.DotNetBar.RibbonPanel(); + this.ribbonBar6 = new DevComponents.DotNetBar.RibbonBar(); + this.buttonItemSPSZ = new DevComponents.DotNetBar.ButtonItem(); + this.buttonItem8 = new DevComponents.DotNetBar.ButtonItem(); + this.buttonItemLocation = new DevComponents.DotNetBar.ButtonItem(); + this.sliderItem2 = new DevComponents.DotNetBar.SliderItem(); + this.buttonItemGBJC = new DevComponents.DotNetBar.ButtonItem(); + this.ribbonPanel5 = new DevComponents.DotNetBar.RibbonPanel(); + this.ribbonBar2 = new DevComponents.DotNetBar.RibbonBar(); + this.buttonItemHX1 = new DevComponents.DotNetBar.ButtonItem(); + this.buttonItemHX2 = new DevComponents.DotNetBar.ButtonItem(); + this.buttonItemDCTP = new DevComponents.DotNetBar.ButtonItem(); + this.sliderItem3 = new DevComponents.DotNetBar.SliderItem(); + this.ribbonPanel1 = new DevComponents.DotNetBar.RibbonPanel(); + this.ribbonBar21 = new DevComponents.DotNetBar.RibbonBar(); + this.buttonItem87 = new DevComponents.DotNetBar.ButtonItem(); + this.buttonItem88 = new DevComponents.DotNetBar.ButtonItem(); + this.buttonItem27 = new DevComponents.DotNetBar.ButtonItem(); + this.buttonItem91 = new DevComponents.DotNetBar.ButtonItem(); + this.buttonItem1 = new DevComponents.DotNetBar.ButtonItem(); + this.btnlegendSet = new DevComponents.DotNetBar.ButtonItem(); + this.buttonItem89 = new DevComponents.DotNetBar.ButtonItem(); + this.btnOutputJPG = new DevComponents.DotNetBar.ButtonItem(); + this.ribbonPanel12 = new DevComponents.DotNetBar.RibbonPanel(); + this.ribbonBar18 = new DevComponents.DotNetBar.RibbonBar(); + this.buttonItem133 = new DevComponents.DotNetBar.ButtonItem(); + this.buttonItem132 = new DevComponents.DotNetBar.ButtonItem(); + this.ribbonBar13 = new DevComponents.DotNetBar.RibbonBar(); + this.buttonItem127 = new DevComponents.DotNetBar.ButtonItem(); + this.buttonItem128 = new DevComponents.DotNetBar.ButtonItem(); + this.sliderItem1 = new DevComponents.DotNetBar.SliderItem(); + this.buttonItem134 = new DevComponents.DotNetBar.ButtonItem(); + this.buttonItem130 = new DevComponents.DotNetBar.ButtonItem(); + this.btn_check_history = new DevComponents.DotNetBar.ButtonItem(); + this.ribbonPanel4 = new DevComponents.DotNetBar.RibbonPanel(); + this.ribbonBar1 = new DevComponents.DotNetBar.RibbonBar(); + this.btn_document_info = new DevComponents.DotNetBar.ButtonItem(); this.ribbonTabItem1 = new DevComponents.DotNetBar.RibbonTabItem(); this.ribbonTabItem11 = new DevComponents.DotNetBar.RibbonTabItem(); this.ribbonTabItem6 = new DevComponents.DotNetBar.RibbonTabItem(); @@ -516,7 +519,6 @@ this.labelX17 = new DevComponents.DotNetBar.LabelX(); this.panelEx4 = new DevComponents.DotNetBar.PanelEx(); this.pictureBox1 = new System.Windows.Forms.PictureBox(); - this.layerTree = new Cyberpipe.MyTreeView(); this.statusStrip1.SuspendLayout(); this.sideBar1.SuspendLayout(); this.panelEx3.SuspendLayout(); @@ -527,15 +529,15 @@ this.contextMenuStrip3.SuspendLayout(); this.contextMenuStripDeleteLayerNode.SuspendLayout(); this.ribbonControl1.SuspendLayout(); + this.ribbonPanel3.SuspendLayout(); + this.ribbonPanel7.SuspendLayout(); + this.ribbonPanel15.SuspendLayout(); + this.ribbonPanel2.SuspendLayout(); this.ribbonPanel6.SuspendLayout(); this.ribbonPanel5.SuspendLayout(); this.ribbonPanel1.SuspendLayout(); this.ribbonPanel12.SuspendLayout(); this.ribbonPanel4.SuspendLayout(); - this.ribbonPanel15.SuspendLayout(); - this.ribbonPanel3.SuspendLayout(); - this.ribbonPanel7.SuspendLayout(); - this.ribbonPanel2.SuspendLayout(); this.panelOfTable.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.dataGridViewX1)).BeginInit(); this.statusStrip2.SuspendLayout(); @@ -711,7 +713,8 @@ this.statusLabel.Name = "statusLabel"; this.statusLabel.Size = new System.Drawing.Size(1313, 17); this.statusLabel.Spring = true; - this.statusLabel.Text = " ©2014-2015 苏州航天系统工程有限公司 版权所有"; + this.statusLabel.Text = Utility.Copyright; +// this.statusLabel.Text = " ©2014-2015 苏州航天系统工程有限公司 版权所有"; // // toolStripDropDownButton1 // @@ -956,6 +959,18 @@ this.layerSensorTree.NodeMouseClick += new System.Windows.Forms.TreeNodeMouseClickEventHandler(this.layerMarkerTree_NodeMouseClick); this.layerSensorTree.NodeMouseDoubleClick += new System.Windows.Forms.TreeNodeMouseClickEventHandler(this.layerTree_NodeMouseDoubleClick); // + // layerTree + // + this.layerTree.CheckBoxes = true; + this.layerTree.ItemHeight = 18; + this.layerTree.Location = new System.Drawing.Point(30, 78); + this.layerTree.Name = "layerTree"; + this.layerTree.Size = new System.Drawing.Size(121, 97); + this.layerTree.TabIndex = 1; + this.layerTree.AfterCheck += new System.Windows.Forms.TreeViewEventHandler(this.layerTree_AfterCheck); + this.layerTree.NodeMouseClick += new System.Windows.Forms.TreeNodeMouseClickEventHandler(this.layerTree_NodeMouseClick); + this.layerTree.NodeMouseDoubleClick += new System.Windows.Forms.TreeNodeMouseClickEventHandler(this.layerTree_NodeMouseDoubleClick); + // // sideBarPanelItem3 // this.sideBarPanelItem3.FontBold = true; @@ -2150,13 +2165,13 @@ this.ribbonControl1.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.ribbonControl1.Controls.Add(this.ribbonPanel3); this.ribbonControl1.Controls.Add(this.ribbonPanel7); - this.ribbonControl1.Controls.Add(this.ribbonPanel2); this.ribbonControl1.Controls.Add(this.ribbonPanel15); - this.ribbonControl1.Controls.Add(this.ribbonPanel4); - this.ribbonControl1.Controls.Add(this.ribbonPanel1); + this.ribbonControl1.Controls.Add(this.ribbonPanel2); this.ribbonControl1.Controls.Add(this.ribbonPanel6); - this.ribbonControl1.Controls.Add(this.ribbonPanel12); this.ribbonControl1.Controls.Add(this.ribbonPanel5); + this.ribbonControl1.Controls.Add(this.ribbonPanel1); + this.ribbonControl1.Controls.Add(this.ribbonPanel12); + this.ribbonControl1.Controls.Add(this.ribbonPanel4); this.ribbonControl1.Dock = System.Windows.Forms.DockStyle.Top; this.ribbonControl1.ImeMode = System.Windows.Forms.ImeMode.NoControl; this.ribbonControl1.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { @@ -2200,609 +2215,216 @@ this.ribbonControl1.Text = "ribbonControl1"; this.ribbonControl1.UseCustomizeDialog = false; // - // ribbonPanel6 + // ribbonPanel3 // - this.ribbonPanel6.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.ribbonPanel6.Controls.Add(this.ribbonBar6); - this.ribbonPanel6.Dock = System.Windows.Forms.DockStyle.Fill; - this.ribbonPanel6.Location = new System.Drawing.Point(0, 0); - this.ribbonPanel6.Name = "ribbonPanel6"; - this.ribbonPanel6.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); - this.ribbonPanel6.Size = new System.Drawing.Size(1328, 95); + this.ribbonPanel3.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.ribbonPanel3.Controls.Add(this.ribbonBar4); + this.ribbonPanel3.Dock = System.Windows.Forms.DockStyle.Fill; + this.ribbonPanel3.Location = new System.Drawing.Point(0, 33); + this.ribbonPanel3.Name = "ribbonPanel3"; + this.ribbonPanel3.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); + this.ribbonPanel3.Size = new System.Drawing.Size(1328, 62); // // // - this.ribbonPanel6.Style.Class = ""; - this.ribbonPanel6.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonPanel3.Style.Class = ""; + this.ribbonPanel3.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; // // // - this.ribbonPanel6.StyleMouseDown.Class = ""; - this.ribbonPanel6.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonPanel3.StyleMouseDown.Class = ""; + this.ribbonPanel3.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; // // // - this.ribbonPanel6.StyleMouseOver.Class = ""; - this.ribbonPanel6.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonPanel6.TabIndex = 38; - this.ribbonPanel6.Visible = false; + this.ribbonPanel3.StyleMouseOver.Class = ""; + this.ribbonPanel3.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonPanel3.TabIndex = 40; // - // ribbonBar6 + // ribbonBar4 // - this.ribbonBar6.AutoOverflowEnabled = true; + this.ribbonBar4.AutoOverflowEnabled = true; // // // - this.ribbonBar6.BackgroundMouseOverStyle.Class = ""; - this.ribbonBar6.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar4.BackgroundMouseOverStyle.Class = ""; + this.ribbonBar4.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; // // // - this.ribbonBar6.BackgroundStyle.Class = ""; - this.ribbonBar6.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonBar6.ContainerControlProcessDialogKey = true; - this.ribbonBar6.Dock = System.Windows.Forms.DockStyle.Left; - this.ribbonBar6.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { - this.buttonItemSPSZ, - this.buttonItem8, - this.buttonItemLocation, - this.sliderItem2, - this.buttonItemGBJC}); - this.ribbonBar6.Location = new System.Drawing.Point(3, 0); - this.ribbonBar6.Name = "ribbonBar6"; - this.ribbonBar6.Size = new System.Drawing.Size(427, 92); - this.ribbonBar6.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.ribbonBar6.TabIndex = 0; + this.ribbonBar4.BackgroundStyle.Class = ""; + this.ribbonBar4.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar4.ContainerControlProcessDialogKey = true; + this.ribbonBar4.Dock = System.Windows.Forms.DockStyle.Left; + this.ribbonBar4.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { + this.btn_flag, + this.slider4ground}); + this.ribbonBar4.Location = new System.Drawing.Point(3, 0); + this.ribbonBar4.Name = "ribbonBar4"; + this.ribbonBar4.Size = new System.Drawing.Size(634, 59); + this.ribbonBar4.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.ribbonBar4.TabIndex = 0; // // // - this.ribbonBar6.TitleStyle.Class = ""; - this.ribbonBar6.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar4.TitleStyle.Class = ""; + this.ribbonBar4.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; // // // - this.ribbonBar6.TitleStyleMouseOver.Class = ""; - this.ribbonBar6.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonBar6.TitleVisible = false; + this.ribbonBar4.TitleStyleMouseOver.Class = ""; + this.ribbonBar4.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar4.TitleVisible = false; // - // buttonItemSPSZ + // btn_flag // - this.buttonItemSPSZ.Image = ((System.Drawing.Image)(resources.GetObject("buttonItemSPSZ.Image"))); - this.buttonItemSPSZ.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItemSPSZ.Name = "buttonItemSPSZ"; - this.buttonItemSPSZ.SubItemsExpandWidth = 14; - this.buttonItemSPSZ.Text = "双屏设置"; - this.buttonItemSPSZ.Click += new System.EventHandler(this.buttonItemSPSZ_Click); + this.btn_flag.Image = global::Cyberpipe.Properties.Resources._24x24icon_03_hover; + this.btn_flag.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.btn_flag.Name = "btn_flag"; + this.btn_flag.SubItemsExpandWidth = 14; + this.btn_flag.Text = "标识器管理"; + this.btn_flag.Click += new System.EventHandler(this.btn_flag_Click); // - // buttonItem8 + // slider4ground // - this.buttonItem8.Image = ((System.Drawing.Image)(resources.GetObject("buttonItem8.Image"))); - this.buttonItem8.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem8.Name = "buttonItem8"; - this.buttonItem8.SubItemsExpandWidth = 14; - this.buttonItem8.Text = "双屏分析"; - this.buttonItem8.Click += new System.EventHandler(this.buttonItem8_Click); + this.slider4ground.LabelPosition = DevComponents.DotNetBar.eSliderLabelPosition.Top; + this.slider4ground.LabelWidth = 50; + this.slider4ground.Name = "slider4ground"; + this.slider4ground.Text = "地面透明度"; + this.slider4ground.TextColor = System.Drawing.Color.Black; + this.slider4ground.Value = 0; + this.slider4ground.ValueChanged += new System.EventHandler(this.slider4ground_ValueChanged); // - // buttonItemLocation + // ribbonPanel7 // - this.buttonItemLocation.Image = ((System.Drawing.Image)(resources.GetObject("buttonItemLocation.Image"))); - this.buttonItemLocation.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItemLocation.Name = "buttonItemLocation"; - this.buttonItemLocation.SubItemsExpandWidth = 14; - this.buttonItemLocation.Text = "快速定位"; - this.buttonItemLocation.Click += new System.EventHandler(this.buttonItemLocation_Click); + this.ribbonPanel7.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.ribbonPanel7.Controls.Add(this.gxdw_ribbonbar); + this.ribbonPanel7.Dock = System.Windows.Forms.DockStyle.Fill; + this.ribbonPanel7.Location = new System.Drawing.Point(0, 33); + this.ribbonPanel7.Name = "ribbonPanel7"; + this.ribbonPanel7.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); + this.ribbonPanel7.Size = new System.Drawing.Size(1328, 62); // - // sliderItem2 // - this.sliderItem2.LabelPosition = DevComponents.DotNetBar.eSliderLabelPosition.Top; - this.sliderItem2.LabelWidth = 50; - this.sliderItem2.Name = "sliderItem2"; - this.sliderItem2.Text = "地面透明度"; - this.sliderItem2.TextColor = System.Drawing.Color.Black; - this.sliderItem2.Value = 0; - this.sliderItem2.ValueChanged += new System.EventHandler(this.sliderItem2_ValueChanged); // - // buttonItemGBJC + this.ribbonPanel7.Style.Class = ""; + this.ribbonPanel7.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; // - this.buttonItemGBJC.Image = ((System.Drawing.Image)(resources.GetObject("buttonItemGBJC.Image"))); - this.buttonItemGBJC.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItemGBJC.Name = "buttonItemGBJC"; - this.buttonItemGBJC.SubItemsExpandWidth = 14; - this.buttonItemGBJC.Text = "国标检测"; - this.buttonItemGBJC.Click += new System.EventHandler(this.buttonItemGBJC_Click); // - // ribbonPanel5 // - this.ribbonPanel5.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.ribbonPanel5.Controls.Add(this.ribbonBar2); - this.ribbonPanel5.Dock = System.Windows.Forms.DockStyle.Fill; - this.ribbonPanel5.Location = new System.Drawing.Point(0, 0); - this.ribbonPanel5.Name = "ribbonPanel5"; - this.ribbonPanel5.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); - this.ribbonPanel5.Size = new System.Drawing.Size(1328, 95); + this.ribbonPanel7.StyleMouseDown.Class = ""; + this.ribbonPanel7.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; // // // - this.ribbonPanel5.Style.Class = ""; - this.ribbonPanel5.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonPanel7.StyleMouseOver.Class = ""; + this.ribbonPanel7.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonPanel7.TabIndex = 41; + this.ribbonPanel7.Visible = false; // + // gxdw_ribbonbar // + this.gxdw_ribbonbar.AutoOverflowEnabled = true; // - this.ribbonPanel5.StyleMouseDown.Class = ""; - this.ribbonPanel5.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; // // + this.gxdw_ribbonbar.BackgroundMouseOverStyle.Class = ""; + this.gxdw_ribbonbar.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; // - this.ribbonPanel5.StyleMouseOver.Class = ""; - this.ribbonPanel5.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonPanel5.TabIndex = 37; - this.ribbonPanel5.Visible = false; // - // ribbonBar2 // - this.ribbonBar2.AutoOverflowEnabled = true; + this.gxdw_ribbonbar.BackgroundStyle.Class = ""; + this.gxdw_ribbonbar.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.gxdw_ribbonbar.ContainerControlProcessDialogKey = true; + this.gxdw_ribbonbar.Dock = System.Windows.Forms.DockStyle.Left; + this.gxdw_ribbonbar.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { + this.buttonItem9, + this.buttonItem10, + this.buttonItem11, + this.buttonItem12, + this.buttonItem13, + this.buttonItem14}); + this.gxdw_ribbonbar.Location = new System.Drawing.Point(3, 0); + this.gxdw_ribbonbar.Name = "gxdw_ribbonbar"; + this.gxdw_ribbonbar.Size = new System.Drawing.Size(564, 59); + this.gxdw_ribbonbar.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.gxdw_ribbonbar.TabIndex = 0; + this.gxdw_ribbonbar.Text = "ribbonBar5"; // // // - this.ribbonBar2.BackgroundMouseOverStyle.Class = ""; - this.ribbonBar2.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.gxdw_ribbonbar.TitleStyle.Class = ""; + this.gxdw_ribbonbar.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; // // // - this.ribbonBar2.BackgroundStyle.Class = ""; - this.ribbonBar2.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonBar2.ContainerControlProcessDialogKey = true; - this.ribbonBar2.Dock = System.Windows.Forms.DockStyle.Left; - this.ribbonBar2.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { - this.buttonItemHX1, - this.buttonItemHX2, - this.buttonItemDCTP, - this.sliderItem3}); - this.ribbonBar2.Location = new System.Drawing.Point(3, 0); - this.ribbonBar2.Name = "ribbonBar2"; - this.ribbonBar2.Size = new System.Drawing.Size(350, 92); - this.ribbonBar2.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.ribbonBar2.TabIndex = 0; + this.gxdw_ribbonbar.TitleStyleMouseOver.Class = ""; + this.gxdw_ribbonbar.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.gxdw_ribbonbar.TitleVisible = false; // + // buttonItem9 // + this.buttonItem9.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__76; + this.buttonItem9.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem9.Name = "buttonItem9"; + this.buttonItem9.SubItemsExpandWidth = 14; + this.buttonItem9.Text = "工单管理"; + this.buttonItem9.Click += new System.EventHandler(this.buttonItem9_Click); // - this.ribbonBar2.TitleStyle.Class = ""; - this.ribbonBar2.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // buttonItem10 // + this.buttonItem10.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__69; + this.buttonItem10.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem10.Name = "buttonItem10"; + this.buttonItem10.SubItemsExpandWidth = 14; + this.buttonItem10.Text = "在线任务"; + this.buttonItem10.Click += new System.EventHandler(this.buttonItem10_Click); // + // buttonItem11 // - this.ribbonBar2.TitleStyleMouseOver.Class = ""; - this.ribbonBar2.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonBar2.TitleVisible = false; + this.buttonItem11.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__72; + this.buttonItem11.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem11.Name = "buttonItem11"; + this.buttonItem11.SubItemsExpandWidth = 14; + this.buttonItem11.Text = "事件管理"; + this.buttonItem11.Click += new System.EventHandler(this.buttonItem11_Click); // - // buttonItemHX1 + // buttonItem12 // - this.buttonItemHX1.AutoExpandOnClick = true; - this.buttonItemHX1.Image = ((System.Drawing.Image)(resources.GetObject("buttonItemHX1.Image"))); - this.buttonItemHX1.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItemHX1.Name = "buttonItemHX1"; - this.buttonItemHX1.SubItemsExpandWidth = 14; - this.buttonItemHX1.Text = "导入红线"; - this.buttonItemHX1.Click += new System.EventHandler(this.buttonItemHX1_Click); + this.buttonItem12.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__34; + this.buttonItem12.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem12.Name = "buttonItem12"; + this.buttonItem12.SubItemsExpandWidth = 14; + this.buttonItem12.Text = "探测仪管理"; + this.buttonItem12.Click += new System.EventHandler(this.buttonItem12_Click); // - // buttonItemHX2 + // buttonItem13 // - this.buttonItemHX2.Image = ((System.Drawing.Image)(resources.GetObject("buttonItemHX2.Image"))); - this.buttonItemHX2.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItemHX2.Name = "buttonItemHX2"; - this.buttonItemHX2.SubItemsExpandWidth = 14; - this.buttonItemHX2.Text = "红线审核"; - this.buttonItemHX2.Click += new System.EventHandler(this.buttonItemHX2_Click); + this.buttonItem13.Image = global::Cyberpipe.Properties.Resources._24x24icon_13_hover; + this.buttonItem13.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem13.Name = "buttonItem13"; + this.buttonItem13.SubItemsExpandWidth = 14; + this.buttonItem13.Text = "巡检人员维护"; + this.buttonItem13.Click += new System.EventHandler(this.buttonItem13_Click); // - // buttonItemDCTP + // buttonItem14 // - this.buttonItemDCTP.Image = ((System.Drawing.Image)(resources.GetObject("buttonItemDCTP.Image"))); - this.buttonItemDCTP.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItemDCTP.Name = "buttonItemDCTP"; - this.buttonItemDCTP.SubItemsExpandWidth = 14; - this.buttonItemDCTP.Text = "导出图片"; - this.buttonItemDCTP.Click += new System.EventHandler(this.buttonItemDCTP_Click); - // - // sliderItem3 - // - this.sliderItem3.LabelPosition = DevComponents.DotNetBar.eSliderLabelPosition.Top; - this.sliderItem3.LabelWidth = 50; - this.sliderItem3.Name = "sliderItem3"; - this.sliderItem3.Text = "地面透明度"; - this.sliderItem3.TextColor = System.Drawing.Color.Black; - this.sliderItem3.Value = 0; - this.sliderItem3.ValueChanged += new System.EventHandler(this.sliderItem3_ValueChanged); - // - // ribbonPanel1 - // - this.ribbonPanel1.AutoSize = true; - this.ribbonPanel1.CanvasColor = System.Drawing.Color.Gray; - this.ribbonPanel1.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.ribbonPanel1.Controls.Add(this.ribbonBar21); - this.ribbonPanel1.Dock = System.Windows.Forms.DockStyle.Fill; - this.ribbonPanel1.Location = new System.Drawing.Point(0, 0); - this.ribbonPanel1.Name = "ribbonPanel1"; - this.ribbonPanel1.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); - this.ribbonPanel1.Size = new System.Drawing.Size(1328, 95); - // - // - // - this.ribbonPanel1.Style.Class = ""; - this.ribbonPanel1.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonPanel1.StyleMouseDown.Class = ""; - this.ribbonPanel1.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonPanel1.StyleMouseOver.Class = ""; - this.ribbonPanel1.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonPanel1.TabIndex = 1; - this.ribbonPanel1.Visible = false; - // - // ribbonBar21 - // - this.ribbonBar21.AutoOverflowEnabled = true; - this.ribbonBar21.BackColor = System.Drawing.Color.White; - // - // - // - this.ribbonBar21.BackgroundMouseOverStyle.Class = ""; - this.ribbonBar21.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonBar21.BackgroundStyle.Class = ""; - this.ribbonBar21.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonBar21.ContainerControlProcessDialogKey = true; - this.ribbonBar21.Dock = System.Windows.Forms.DockStyle.Left; - this.ribbonBar21.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { - this.buttonItem87, - this.buttonItem88, - this.buttonItem27, - this.sliderGroundTransSet1, - this.buttonItem91, - this.buttonItem1, - this.btnlegendSet, - this.buttonItem89, - this.btnOutputJPG}); - this.ribbonBar21.Location = new System.Drawing.Point(3, 0); - this.ribbonBar21.Name = "ribbonBar21"; - this.ribbonBar21.Size = new System.Drawing.Size(649, 92); - this.ribbonBar21.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.ribbonBar21.TabIndex = 2; - this.ribbonBar21.Text = "浏览模式"; - // - // - // - this.ribbonBar21.TitleStyle.Class = ""; - this.ribbonBar21.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonBar21.TitleStyleMouseOver.Class = ""; - this.ribbonBar21.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonBar21.TitleVisible = false; - // - // buttonItem87 - // - this.buttonItem87.Image = ((System.Drawing.Image)(resources.GetObject("buttonItem87.Image"))); - this.buttonItem87.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem87.Name = "buttonItem87"; - this.buttonItem87.SubItemsExpandWidth = 14; - this.buttonItem87.Text = "地上模式"; - this.buttonItem87.Click += new System.EventHandler(this.buttonItem87_Click); - // - // buttonItem88 - // - this.buttonItem88.Image = ((System.Drawing.Image)(resources.GetObject("buttonItem88.Image"))); - this.buttonItem88.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem88.Name = "buttonItem88"; - this.buttonItem88.SubItemsExpandWidth = 14; - this.buttonItem88.Text = "地下模式"; - this.buttonItem88.Click += new System.EventHandler(this.buttonItem88_Click); - // - // buttonItem27 - // - this.buttonItem27.Image = ((System.Drawing.Image)(resources.GetObject("buttonItem27.Image"))); - this.buttonItem27.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem27.Name = "buttonItem27"; - this.buttonItem27.SubItemsExpandWidth = 14; - this.buttonItem27.Text = "行走模式"; - this.buttonItem27.Click += new System.EventHandler(this.buttonItem27_Click); - // - // buttonItem91 - // - this.buttonItem91.ForeColor = System.Drawing.Color.Black; - this.buttonItem91.Image = ((System.Drawing.Image)(resources.GetObject("buttonItem91.Image"))); - this.buttonItem91.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem91.Name = "buttonItem91"; - this.buttonItem91.SubItemsExpandWidth = 14; - this.buttonItem91.Text = "快速定位"; - this.buttonItem91.Click += new System.EventHandler(this.buttonItem91_Click); - // - // buttonItem1 - // - this.buttonItem1.Image = ((System.Drawing.Image)(resources.GetObject("buttonItem1.Image"))); - this.buttonItem1.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem1.Name = "buttonItem1"; - this.buttonItem1.SubItemsExpandWidth = 14; - this.buttonItem1.Text = "图层管理"; - this.buttonItem1.Click += new System.EventHandler(this.buttonItem1_Click); - // - // btnlegendSet - // - this.btnlegendSet.Image = ((System.Drawing.Image)(resources.GetObject("btnlegendSet.Image"))); - this.btnlegendSet.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.btnlegendSet.Name = "btnlegendSet"; - this.btnlegendSet.SubItemsExpandWidth = 14; - this.btnlegendSet.Text = "图例"; - this.btnlegendSet.Click += new System.EventHandler(this.btnlegendSet_Click); - // - // buttonItem89 - // - this.buttonItem89.Image = ((System.Drawing.Image)(resources.GetObject("buttonItem89.Image"))); - this.buttonItem89.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem89.Name = "buttonItem89"; - this.buttonItem89.SubItemsExpandWidth = 14; - this.buttonItem89.Text = "全屏显示"; - this.buttonItem89.Click += new System.EventHandler(this.buttonItem89_Click); - // - // btnOutputJPG - // - this.btnOutputJPG.Image = ((System.Drawing.Image)(resources.GetObject("btnOutputJPG.Image"))); - this.btnOutputJPG.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.btnOutputJPG.Name = "btnOutputJPG"; - this.btnOutputJPG.SubItemsExpandWidth = 14; - this.btnOutputJPG.Text = "导出图片"; - this.btnOutputJPG.Click += new System.EventHandler(this.btnOutputJPG_Click); - // - // ribbonPanel12 - // - this.ribbonPanel12.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.ribbonPanel12.Controls.Add(this.ribbonBar18); - this.ribbonPanel12.Controls.Add(this.ribbonBar13); - this.ribbonPanel12.Dock = System.Windows.Forms.DockStyle.Fill; - this.ribbonPanel12.Location = new System.Drawing.Point(0, 0); - this.ribbonPanel12.Name = "ribbonPanel12"; - this.ribbonPanel12.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); - this.ribbonPanel12.Size = new System.Drawing.Size(1328, 95); - // - // - // - this.ribbonPanel12.Style.Class = ""; - this.ribbonPanel12.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonPanel12.StyleMouseDown.Class = ""; - this.ribbonPanel12.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonPanel12.StyleMouseOver.Class = ""; - this.ribbonPanel12.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonPanel12.TabIndex = 34; - this.ribbonPanel12.Visible = false; - // - // ribbonBar18 - // - this.ribbonBar18.AutoOverflowEnabled = true; - // - // - // - this.ribbonBar18.BackgroundMouseOverStyle.Class = ""; - this.ribbonBar18.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonBar18.BackgroundStyle.Class = ""; - this.ribbonBar18.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonBar18.ContainerControlProcessDialogKey = true; - this.ribbonBar18.Dock = System.Windows.Forms.DockStyle.Left; - this.ribbonBar18.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { - this.buttonItem133}); - this.ribbonBar18.Location = new System.Drawing.Point(531, 0); - this.ribbonBar18.Name = "ribbonBar18"; - this.ribbonBar18.Size = new System.Drawing.Size(129, 92); - this.ribbonBar18.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.ribbonBar18.TabIndex = 1; - // - // - // - this.ribbonBar18.TitleStyle.Class = ""; - this.ribbonBar18.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonBar18.TitleStyleMouseOver.Class = ""; - this.ribbonBar18.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonBar18.TitleVisible = false; - // - // buttonItem133 - // - this.buttonItem133.Image = ((System.Drawing.Image)(resources.GetObject("buttonItem133.Image"))); - this.buttonItem133.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem133.Name = "buttonItem133"; - this.buttonItem133.SubItemsExpandWidth = 14; - this.buttonItem133.Text = "审核入库"; - this.buttonItem133.Click += new System.EventHandler(this.buttonItem133_Click_1); - // - // ribbonBar13 - // - this.ribbonBar13.AutoOverflowEnabled = true; - // - // - // - this.ribbonBar13.BackgroundMouseOverStyle.Class = ""; - this.ribbonBar13.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonBar13.BackgroundStyle.Class = ""; - this.ribbonBar13.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonBar13.ContainerControlProcessDialogKey = true; - this.ribbonBar13.Dock = System.Windows.Forms.DockStyle.Left; - this.ribbonBar13.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { - this.buttonItem127, - this.buttonItem128, - this.sliderItem1, - this.buttonItem134, - this.buttonItem130, - this.btn_check_history}); - this.ribbonBar13.Location = new System.Drawing.Point(3, 0); - this.ribbonBar13.Name = "ribbonBar13"; - this.ribbonBar13.Size = new System.Drawing.Size(528, 92); - this.ribbonBar13.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.ribbonBar13.TabIndex = 0; - // - // - // - this.ribbonBar13.TitleStyle.Class = ""; - this.ribbonBar13.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonBar13.TitleStyleMouseOver.Class = ""; - this.ribbonBar13.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonBar13.TitleVisible = false; - // - // buttonItem127 - // - this.buttonItem127.Image = ((System.Drawing.Image)(resources.GetObject("buttonItem127.Image"))); - this.buttonItem127.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem127.Name = "buttonItem127"; - this.buttonItem127.SubItemsExpandWidth = 14; - this.buttonItem127.Text = "打开数据"; - this.buttonItem127.Click += new System.EventHandler(this.buttonItem127_Click_2); - // - // buttonItem128 - // - this.buttonItem128.Image = ((System.Drawing.Image)(resources.GetObject("buttonItem128.Image"))); - this.buttonItem128.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem128.Name = "buttonItem128"; - this.buttonItem128.SubItemsExpandWidth = 14; - this.buttonItem128.Text = "一键审核"; - this.buttonItem128.Click += new System.EventHandler(this.buttonItem128_Click); - // - // sliderItem1 - // - this.sliderItem1.LabelPosition = DevComponents.DotNetBar.eSliderLabelPosition.Top; - this.sliderItem1.LabelWidth = 50; - this.sliderItem1.Name = "sliderItem1"; - this.sliderItem1.Text = "地面透明度"; - this.sliderItem1.TextColor = System.Drawing.Color.Black; - this.sliderItem1.Value = 0; - this.sliderItem1.ValueChanged += new System.EventHandler(this.sliderItem1_ValueChanged); - // - // buttonItem134 - // - this.buttonItem134.Image = ((System.Drawing.Image)(resources.GetObject("buttonItem134.Image"))); - this.buttonItem134.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem134.Name = "buttonItem134"; - this.buttonItem134.SubItemsExpandWidth = 14; - this.buttonItem134.Text = "模拟设计修改"; - this.buttonItem134.Click += new System.EventHandler(this.buttonItem134_Click_1); - // - // buttonItem130 - // - this.buttonItem130.Image = ((System.Drawing.Image)(resources.GetObject("buttonItem130.Image"))); - this.buttonItem130.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem130.Name = "buttonItem130"; - this.buttonItem130.SubItemsExpandWidth = 14; - this.buttonItem130.Text = "导出审核图"; - this.buttonItem130.Click += new System.EventHandler(this.buttonItem130_Click_1); - // - // btn_check_history - // - this.btn_check_history.Image = ((System.Drawing.Image)(resources.GetObject("btn_check_history.Image"))); - this.btn_check_history.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.btn_check_history.Name = "btn_check_history"; - this.btn_check_history.SubItemsExpandWidth = 14; - this.btn_check_history.Text = "审核历史"; - this.btn_check_history.Click += new System.EventHandler(this.btn_check_history_Click); - // - // ribbonPanel4 - // - this.ribbonPanel4.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.ribbonPanel4.Controls.Add(this.ribbonBar1); - this.ribbonPanel4.Dock = System.Windows.Forms.DockStyle.Fill; - this.ribbonPanel4.Location = new System.Drawing.Point(0, 0); - this.ribbonPanel4.Name = "ribbonPanel4"; - this.ribbonPanel4.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); - this.ribbonPanel4.Size = new System.Drawing.Size(1328, 95); - // - // - // - this.ribbonPanel4.Style.Class = ""; - this.ribbonPanel4.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonPanel4.StyleMouseDown.Class = ""; - this.ribbonPanel4.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonPanel4.StyleMouseOver.Class = ""; - this.ribbonPanel4.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonPanel4.TabIndex = 36; - this.ribbonPanel4.Visible = false; - // - // ribbonBar1 - // - this.ribbonBar1.AutoOverflowEnabled = true; - // - // - // - this.ribbonBar1.BackgroundMouseOverStyle.Class = ""; - this.ribbonBar1.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonBar1.BackgroundStyle.Class = ""; - this.ribbonBar1.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonBar1.ContainerControlProcessDialogKey = true; - this.ribbonBar1.Dock = System.Windows.Forms.DockStyle.Left; - this.ribbonBar1.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { - this.btn_document_info}); - this.ribbonBar1.Location = new System.Drawing.Point(3, 0); - this.ribbonBar1.Name = "ribbonBar1"; - this.ribbonBar1.Size = new System.Drawing.Size(88, 92); - this.ribbonBar1.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.ribbonBar1.TabIndex = 0; - // - // - // - this.ribbonBar1.TitleStyle.Class = ""; - this.ribbonBar1.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonBar1.TitleStyleMouseOver.Class = ""; - this.ribbonBar1.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonBar1.TitleVisible = false; - // - // btn_document_info - // - this.btn_document_info.Image = ((System.Drawing.Image)(resources.GetObject("btn_document_info.Image"))); - this.btn_document_info.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.btn_document_info.Name = "btn_document_info"; - this.btn_document_info.SubItemsExpandWidth = 14; - this.btn_document_info.Text = "文档管理"; - this.btn_document_info.Click += new System.EventHandler(this.btn_document_info_Click); + this.buttonItem14.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__56; + this.buttonItem14.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem14.Name = "buttonItem14"; + this.buttonItem14.SubItemsExpandWidth = 14; + this.buttonItem14.Text = "导出施工图"; + this.buttonItem14.Click += new System.EventHandler(this.buttonItem14_Click); // // ribbonPanel15 // this.ribbonPanel15.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; this.ribbonPanel15.Controls.Add(this.ribbonBar20); this.ribbonPanel15.Dock = System.Windows.Forms.DockStyle.Fill; - this.ribbonPanel15.Location = new System.Drawing.Point(0, 0); + this.ribbonPanel15.Location = new System.Drawing.Point(0, 33); this.ribbonPanel15.Name = "ribbonPanel15"; this.ribbonPanel15.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); - this.ribbonPanel15.Size = new System.Drawing.Size(1328, 95); + this.ribbonPanel15.Size = new System.Drawing.Size(1328, 62); // // // @@ -2843,7 +2465,7 @@ this.buttonItemXTGL}); this.ribbonBar20.Location = new System.Drawing.Point(3, 0); this.ribbonBar20.Name = "ribbonBar20"; - this.ribbonBar20.Size = new System.Drawing.Size(283, 92); + this.ribbonBar20.Size = new System.Drawing.Size(283, 59); this.ribbonBar20.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; this.ribbonBar20.TabIndex = 0; // @@ -3274,216 +2896,15 @@ this.buttonItemXT4_2.Text = "人员修改"; this.buttonItemXT4_2.Click += new System.EventHandler(this.buttonItemXT4_2_Click); // - // ribbonPanel3 - // - this.ribbonPanel3.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.ribbonPanel3.Controls.Add(this.ribbonBar4); - this.ribbonPanel3.Dock = System.Windows.Forms.DockStyle.Fill; - this.ribbonPanel3.Location = new System.Drawing.Point(0, 33); - this.ribbonPanel3.Name = "ribbonPanel3"; - this.ribbonPanel3.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); - this.ribbonPanel3.Size = new System.Drawing.Size(1328, 62); - // - // - // - this.ribbonPanel3.Style.Class = ""; - this.ribbonPanel3.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonPanel3.StyleMouseDown.Class = ""; - this.ribbonPanel3.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonPanel3.StyleMouseOver.Class = ""; - this.ribbonPanel3.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonPanel3.TabIndex = 40; - // - // ribbonBar4 - // - this.ribbonBar4.AutoOverflowEnabled = true; - // - // - // - this.ribbonBar4.BackgroundMouseOverStyle.Class = ""; - this.ribbonBar4.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonBar4.BackgroundStyle.Class = ""; - this.ribbonBar4.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonBar4.ContainerControlProcessDialogKey = true; - this.ribbonBar4.Dock = System.Windows.Forms.DockStyle.Left; - this.ribbonBar4.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { - this.btn_flag, - this.slider4ground}); - this.ribbonBar4.Location = new System.Drawing.Point(3, 0); - this.ribbonBar4.Name = "ribbonBar4"; - this.ribbonBar4.Size = new System.Drawing.Size(321, 59); - this.ribbonBar4.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.ribbonBar4.TabIndex = 0; - // - // - // - this.ribbonBar4.TitleStyle.Class = ""; - this.ribbonBar4.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonBar4.TitleStyleMouseOver.Class = ""; - this.ribbonBar4.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonBar4.TitleVisible = false; - // - // btn_flag - // - this.btn_flag.Image = global::Cyberpipe.Properties.Resources._24x24icon_03_hover; - this.btn_flag.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.btn_flag.Name = "btn_flag"; - this.btn_flag.SubItemsExpandWidth = 14; - this.btn_flag.Text = "标识器管理"; - this.btn_flag.Click += new System.EventHandler(this.btn_flag_Click); - // - // slider4ground - // - this.slider4ground.LabelPosition = DevComponents.DotNetBar.eSliderLabelPosition.Top; - this.slider4ground.LabelWidth = 50; - this.slider4ground.Name = "slider4ground"; - this.slider4ground.Text = "地面透明度"; - this.slider4ground.TextColor = System.Drawing.Color.Black; - this.slider4ground.Value = 0; - this.slider4ground.ValueChanged += new System.EventHandler(this.slider4ground_ValueChanged); - // - // ribbonPanel7 - // - this.ribbonPanel7.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.ribbonPanel7.Controls.Add(this.gxdw_ribbonbar); - this.ribbonPanel7.Dock = System.Windows.Forms.DockStyle.Fill; - this.ribbonPanel7.Location = new System.Drawing.Point(0, 33); - this.ribbonPanel7.Name = "ribbonPanel7"; - this.ribbonPanel7.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); - this.ribbonPanel7.Size = new System.Drawing.Size(1328, 62); - // - // - // - this.ribbonPanel7.Style.Class = ""; - this.ribbonPanel7.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonPanel7.StyleMouseDown.Class = ""; - this.ribbonPanel7.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonPanel7.StyleMouseOver.Class = ""; - this.ribbonPanel7.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonPanel7.TabIndex = 41; - this.ribbonPanel7.Visible = false; - // - // gxdw_ribbonbar - // - this.gxdw_ribbonbar.AutoOverflowEnabled = true; - // - // - // - this.gxdw_ribbonbar.BackgroundMouseOverStyle.Class = ""; - this.gxdw_ribbonbar.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.gxdw_ribbonbar.BackgroundStyle.Class = ""; - this.gxdw_ribbonbar.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.gxdw_ribbonbar.ContainerControlProcessDialogKey = true; - this.gxdw_ribbonbar.Dock = System.Windows.Forms.DockStyle.Left; - this.gxdw_ribbonbar.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { - this.buttonItem9, - this.buttonItem10, - this.buttonItem11, - this.buttonItem12, - this.buttonItem13, - this.buttonItem14}); - this.gxdw_ribbonbar.Location = new System.Drawing.Point(3, 0); - this.gxdw_ribbonbar.Name = "gxdw_ribbonbar"; - this.gxdw_ribbonbar.Size = new System.Drawing.Size(522, 59); - this.gxdw_ribbonbar.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.gxdw_ribbonbar.TabIndex = 0; - this.gxdw_ribbonbar.Text = "ribbonBar5"; - // - // - // - this.gxdw_ribbonbar.TitleStyle.Class = ""; - this.gxdw_ribbonbar.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.gxdw_ribbonbar.TitleStyleMouseOver.Class = ""; - this.gxdw_ribbonbar.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.gxdw_ribbonbar.TitleVisible = false; - // - // buttonItem9 - // - this.buttonItem9.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__76; - this.buttonItem9.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem9.Name = "buttonItem9"; - this.buttonItem9.SubItemsExpandWidth = 14; - this.buttonItem9.Text = "工单管理"; - this.buttonItem9.Click += new System.EventHandler(this.buttonItem9_Click); - // - // buttonItem10 - // - this.buttonItem10.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__69; - this.buttonItem10.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem10.Name = "buttonItem10"; - this.buttonItem10.SubItemsExpandWidth = 14; - this.buttonItem10.Text = "在线任务"; - this.buttonItem10.Click += new System.EventHandler(this.buttonItem10_Click); - // - // buttonItem11 - // - this.buttonItem11.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__72; - this.buttonItem11.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem11.Name = "buttonItem11"; - this.buttonItem11.SubItemsExpandWidth = 14; - this.buttonItem11.Text = "事件管理"; - this.buttonItem11.Click += new System.EventHandler(this.buttonItem11_Click); - // - // buttonItem12 - // - this.buttonItem12.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__34; - this.buttonItem12.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem12.Name = "buttonItem12"; - this.buttonItem12.SubItemsExpandWidth = 14; - this.buttonItem12.Text = "探测仪管理"; - this.buttonItem12.Click += new System.EventHandler(this.buttonItem12_Click); - // - // buttonItem13 - // - this.buttonItem13.Image = global::Cyberpipe.Properties.Resources._24x24icon_13_hover; - this.buttonItem13.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem13.Name = "buttonItem13"; - this.buttonItem13.SubItemsExpandWidth = 14; - this.buttonItem13.Text = "巡检人员维护"; - this.buttonItem13.Click += new System.EventHandler(this.buttonItem13_Click); - // - // buttonItem14 - // - this.buttonItem14.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__56; - this.buttonItem14.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem14.Name = "buttonItem14"; - this.buttonItem14.SubItemsExpandWidth = 14; - this.buttonItem14.Text = "导出施工图"; - this.buttonItem14.Click += new System.EventHandler(this.buttonItem14_Click); - // // ribbonPanel2 // this.ribbonPanel2.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; this.ribbonPanel2.Controls.Add(this.ribbonBar3); this.ribbonPanel2.Dock = System.Windows.Forms.DockStyle.Fill; - this.ribbonPanel2.Location = new System.Drawing.Point(0, 33); + this.ribbonPanel2.Location = new System.Drawing.Point(0, 0); this.ribbonPanel2.Name = "ribbonPanel2"; this.ribbonPanel2.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); - this.ribbonPanel2.Size = new System.Drawing.Size(1328, 62); + this.ribbonPanel2.Size = new System.Drawing.Size(1328, 95); // // // @@ -3527,7 +2948,7 @@ this.buttonItemPasswordReset}); this.ribbonBar3.Location = new System.Drawing.Point(3, 0); this.ribbonBar3.Name = "ribbonBar3"; - this.ribbonBar3.Size = new System.Drawing.Size(551, 59); + this.ribbonBar3.Size = new System.Drawing.Size(551, 92); this.ribbonBar3.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; this.ribbonBar3.TabIndex = 1; // @@ -3567,6 +2988,7 @@ this.btn_resc_info.Name = "btn_resc_info"; this.btn_resc_info.SubItemsExpandWidth = 14; this.btn_resc_info.Text = "资源管理"; + this.btn_resc_info.Visible = false; this.btn_resc_info.Click += new System.EventHandler(this.btn_resc_info_Click); // // btn_role_resc @@ -3605,6 +3027,605 @@ this.buttonItemPasswordReset.Text = "重置密码"; this.buttonItemPasswordReset.Click += new System.EventHandler(this.buttonItemPasswordReset_Click); // + // ribbonPanel6 + // + this.ribbonPanel6.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.ribbonPanel6.Controls.Add(this.ribbonBar6); + this.ribbonPanel6.Dock = System.Windows.Forms.DockStyle.Fill; + this.ribbonPanel6.Location = new System.Drawing.Point(0, 0); + this.ribbonPanel6.Name = "ribbonPanel6"; + this.ribbonPanel6.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); + this.ribbonPanel6.Size = new System.Drawing.Size(1328, 95); + // + // + // + this.ribbonPanel6.Style.Class = ""; + this.ribbonPanel6.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonPanel6.StyleMouseDown.Class = ""; + this.ribbonPanel6.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonPanel6.StyleMouseOver.Class = ""; + this.ribbonPanel6.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonPanel6.TabIndex = 38; + this.ribbonPanel6.Visible = false; + // + // ribbonBar6 + // + this.ribbonBar6.AutoOverflowEnabled = true; + // + // + // + this.ribbonBar6.BackgroundMouseOverStyle.Class = ""; + this.ribbonBar6.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonBar6.BackgroundStyle.Class = ""; + this.ribbonBar6.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar6.ContainerControlProcessDialogKey = true; + this.ribbonBar6.Dock = System.Windows.Forms.DockStyle.Left; + this.ribbonBar6.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { + this.buttonItemSPSZ, + this.buttonItem8, + this.buttonItemLocation, + this.sliderItem2, + this.buttonItemGBJC}); + this.ribbonBar6.Location = new System.Drawing.Point(3, 0); + this.ribbonBar6.Name = "ribbonBar6"; + this.ribbonBar6.Size = new System.Drawing.Size(427, 92); + this.ribbonBar6.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.ribbonBar6.TabIndex = 0; + // + // + // + this.ribbonBar6.TitleStyle.Class = ""; + this.ribbonBar6.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonBar6.TitleStyleMouseOver.Class = ""; + this.ribbonBar6.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar6.TitleVisible = false; + // + // buttonItemSPSZ + // + this.buttonItemSPSZ.Image = ((System.Drawing.Image)(resources.GetObject("buttonItemSPSZ.Image"))); + this.buttonItemSPSZ.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItemSPSZ.Name = "buttonItemSPSZ"; + this.buttonItemSPSZ.SubItemsExpandWidth = 14; + this.buttonItemSPSZ.Text = "双屏设置"; + this.buttonItemSPSZ.Click += new System.EventHandler(this.buttonItemSPSZ_Click); + // + // buttonItem8 + // + this.buttonItem8.Image = ((System.Drawing.Image)(resources.GetObject("buttonItem8.Image"))); + this.buttonItem8.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem8.Name = "buttonItem8"; + this.buttonItem8.SubItemsExpandWidth = 14; + this.buttonItem8.Text = "双屏分析"; + this.buttonItem8.Click += new System.EventHandler(this.buttonItem8_Click); + // + // buttonItemLocation + // + this.buttonItemLocation.Image = ((System.Drawing.Image)(resources.GetObject("buttonItemLocation.Image"))); + this.buttonItemLocation.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItemLocation.Name = "buttonItemLocation"; + this.buttonItemLocation.SubItemsExpandWidth = 14; + this.buttonItemLocation.Text = "快速定位"; + this.buttonItemLocation.Click += new System.EventHandler(this.buttonItemLocation_Click); + // + // sliderItem2 + // + this.sliderItem2.LabelPosition = DevComponents.DotNetBar.eSliderLabelPosition.Top; + this.sliderItem2.LabelWidth = 50; + this.sliderItem2.Name = "sliderItem2"; + this.sliderItem2.Text = "地面透明度"; + this.sliderItem2.TextColor = System.Drawing.Color.Black; + this.sliderItem2.Value = 0; + this.sliderItem2.ValueChanged += new System.EventHandler(this.sliderItem2_ValueChanged); + // + // buttonItemGBJC + // + this.buttonItemGBJC.Image = ((System.Drawing.Image)(resources.GetObject("buttonItemGBJC.Image"))); + this.buttonItemGBJC.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItemGBJC.Name = "buttonItemGBJC"; + this.buttonItemGBJC.SubItemsExpandWidth = 14; + this.buttonItemGBJC.Text = "国标检测"; + this.buttonItemGBJC.Click += new System.EventHandler(this.buttonItemGBJC_Click); + // + // ribbonPanel5 + // + this.ribbonPanel5.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.ribbonPanel5.Controls.Add(this.ribbonBar2); + this.ribbonPanel5.Dock = System.Windows.Forms.DockStyle.Fill; + this.ribbonPanel5.Location = new System.Drawing.Point(0, 33); + this.ribbonPanel5.Name = "ribbonPanel5"; + this.ribbonPanel5.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); + this.ribbonPanel5.Size = new System.Drawing.Size(1328, 62); + // + // + // + this.ribbonPanel5.Style.Class = ""; + this.ribbonPanel5.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonPanel5.StyleMouseDown.Class = ""; + this.ribbonPanel5.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonPanel5.StyleMouseOver.Class = ""; + this.ribbonPanel5.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonPanel5.TabIndex = 37; + this.ribbonPanel5.Visible = false; + // + // ribbonBar2 + // + this.ribbonBar2.AutoOverflowEnabled = true; + // + // + // + this.ribbonBar2.BackgroundMouseOverStyle.Class = ""; + this.ribbonBar2.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonBar2.BackgroundStyle.Class = ""; + this.ribbonBar2.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar2.ContainerControlProcessDialogKey = true; + this.ribbonBar2.Dock = System.Windows.Forms.DockStyle.Left; + this.ribbonBar2.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { + this.buttonItemHX1, + this.buttonItemHX2, + this.buttonItemDCTP, + this.sliderItem3}); + this.ribbonBar2.Location = new System.Drawing.Point(3, 0); + this.ribbonBar2.Name = "ribbonBar2"; + this.ribbonBar2.Size = new System.Drawing.Size(350, 59); + this.ribbonBar2.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.ribbonBar2.TabIndex = 0; + // + // + // + this.ribbonBar2.TitleStyle.Class = ""; + this.ribbonBar2.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonBar2.TitleStyleMouseOver.Class = ""; + this.ribbonBar2.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar2.TitleVisible = false; + // + // buttonItemHX1 + // + this.buttonItemHX1.AutoExpandOnClick = true; + this.buttonItemHX1.Image = ((System.Drawing.Image)(resources.GetObject("buttonItemHX1.Image"))); + this.buttonItemHX1.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItemHX1.Name = "buttonItemHX1"; + this.buttonItemHX1.SubItemsExpandWidth = 14; + this.buttonItemHX1.Text = "导入红线"; + this.buttonItemHX1.Click += new System.EventHandler(this.buttonItemHX1_Click); + // + // buttonItemHX2 + // + this.buttonItemHX2.Image = ((System.Drawing.Image)(resources.GetObject("buttonItemHX2.Image"))); + this.buttonItemHX2.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItemHX2.Name = "buttonItemHX2"; + this.buttonItemHX2.SubItemsExpandWidth = 14; + this.buttonItemHX2.Text = "红线审核"; + this.buttonItemHX2.Click += new System.EventHandler(this.buttonItemHX2_Click); + // + // buttonItemDCTP + // + this.buttonItemDCTP.Image = ((System.Drawing.Image)(resources.GetObject("buttonItemDCTP.Image"))); + this.buttonItemDCTP.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItemDCTP.Name = "buttonItemDCTP"; + this.buttonItemDCTP.SubItemsExpandWidth = 14; + this.buttonItemDCTP.Text = "导出图片"; + this.buttonItemDCTP.Click += new System.EventHandler(this.buttonItemDCTP_Click); + // + // sliderItem3 + // + this.sliderItem3.LabelPosition = DevComponents.DotNetBar.eSliderLabelPosition.Top; + this.sliderItem3.LabelWidth = 50; + this.sliderItem3.Name = "sliderItem3"; + this.sliderItem3.Text = "地面透明度"; + this.sliderItem3.TextColor = System.Drawing.Color.Black; + this.sliderItem3.Value = 0; + this.sliderItem3.ValueChanged += new System.EventHandler(this.sliderItem3_ValueChanged); + // + // ribbonPanel1 + // + this.ribbonPanel1.AutoSize = true; + this.ribbonPanel1.CanvasColor = System.Drawing.Color.Gray; + this.ribbonPanel1.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.ribbonPanel1.Controls.Add(this.ribbonBar21); + this.ribbonPanel1.Dock = System.Windows.Forms.DockStyle.Fill; + this.ribbonPanel1.Location = new System.Drawing.Point(0, 33); + this.ribbonPanel1.Name = "ribbonPanel1"; + this.ribbonPanel1.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); + this.ribbonPanel1.Size = new System.Drawing.Size(1328, 62); + // + // + // + this.ribbonPanel1.Style.Class = ""; + this.ribbonPanel1.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonPanel1.StyleMouseDown.Class = ""; + this.ribbonPanel1.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonPanel1.StyleMouseOver.Class = ""; + this.ribbonPanel1.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonPanel1.TabIndex = 1; + this.ribbonPanel1.Visible = false; + // + // ribbonBar21 + // + this.ribbonBar21.AutoOverflowEnabled = true; + this.ribbonBar21.BackColor = System.Drawing.Color.White; + // + // + // + this.ribbonBar21.BackgroundMouseOverStyle.Class = ""; + this.ribbonBar21.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonBar21.BackgroundStyle.Class = ""; + this.ribbonBar21.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar21.ContainerControlProcessDialogKey = true; + this.ribbonBar21.Dock = System.Windows.Forms.DockStyle.Left; + this.ribbonBar21.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { + this.buttonItem87, + this.buttonItem88, + this.buttonItem27, + this.sliderGroundTransSet1, + this.buttonItem91, + this.buttonItem1, + this.btnlegendSet, + this.buttonItem89, + this.btnOutputJPG}); + this.ribbonBar21.Location = new System.Drawing.Point(3, 0); + this.ribbonBar21.Name = "ribbonBar21"; + this.ribbonBar21.Size = new System.Drawing.Size(649, 59); + this.ribbonBar21.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.ribbonBar21.TabIndex = 2; + this.ribbonBar21.Text = "浏览模式"; + // + // + // + this.ribbonBar21.TitleStyle.Class = ""; + this.ribbonBar21.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonBar21.TitleStyleMouseOver.Class = ""; + this.ribbonBar21.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar21.TitleVisible = false; + // + // buttonItem87 + // + this.buttonItem87.Image = ((System.Drawing.Image)(resources.GetObject("buttonItem87.Image"))); + this.buttonItem87.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem87.Name = "buttonItem87"; + this.buttonItem87.SubItemsExpandWidth = 14; + this.buttonItem87.Text = "地上模式"; + this.buttonItem87.Click += new System.EventHandler(this.buttonItem87_Click); + // + // buttonItem88 + // + this.buttonItem88.Image = ((System.Drawing.Image)(resources.GetObject("buttonItem88.Image"))); + this.buttonItem88.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem88.Name = "buttonItem88"; + this.buttonItem88.SubItemsExpandWidth = 14; + this.buttonItem88.Text = "地下模式"; + this.buttonItem88.Click += new System.EventHandler(this.buttonItem88_Click); + // + // buttonItem27 + // + this.buttonItem27.Image = ((System.Drawing.Image)(resources.GetObject("buttonItem27.Image"))); + this.buttonItem27.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem27.Name = "buttonItem27"; + this.buttonItem27.SubItemsExpandWidth = 14; + this.buttonItem27.Text = "行走模式"; + this.buttonItem27.Click += new System.EventHandler(this.buttonItem27_Click); + // + // buttonItem91 + // + this.buttonItem91.ForeColor = System.Drawing.Color.Black; + this.buttonItem91.Image = ((System.Drawing.Image)(resources.GetObject("buttonItem91.Image"))); + this.buttonItem91.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem91.Name = "buttonItem91"; + this.buttonItem91.SubItemsExpandWidth = 14; + this.buttonItem91.Text = "快速定位"; + this.buttonItem91.Click += new System.EventHandler(this.buttonItem91_Click); + // + // buttonItem1 + // + this.buttonItem1.Image = ((System.Drawing.Image)(resources.GetObject("buttonItem1.Image"))); + this.buttonItem1.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem1.Name = "buttonItem1"; + this.buttonItem1.SubItemsExpandWidth = 14; + this.buttonItem1.Text = "图层管理"; + this.buttonItem1.Click += new System.EventHandler(this.buttonItem1_Click); + // + // btnlegendSet + // + this.btnlegendSet.Image = ((System.Drawing.Image)(resources.GetObject("btnlegendSet.Image"))); + this.btnlegendSet.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.btnlegendSet.Name = "btnlegendSet"; + this.btnlegendSet.SubItemsExpandWidth = 14; + this.btnlegendSet.Text = "图例"; + this.btnlegendSet.Click += new System.EventHandler(this.btnlegendSet_Click); + // + // buttonItem89 + // + this.buttonItem89.Image = ((System.Drawing.Image)(resources.GetObject("buttonItem89.Image"))); + this.buttonItem89.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem89.Name = "buttonItem89"; + this.buttonItem89.SubItemsExpandWidth = 14; + this.buttonItem89.Text = "全屏显示"; + this.buttonItem89.Click += new System.EventHandler(this.buttonItem89_Click); + // + // btnOutputJPG + // + this.btnOutputJPG.Image = ((System.Drawing.Image)(resources.GetObject("btnOutputJPG.Image"))); + this.btnOutputJPG.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.btnOutputJPG.Name = "btnOutputJPG"; + this.btnOutputJPG.SubItemsExpandWidth = 14; + this.btnOutputJPG.Text = "导出图片"; + this.btnOutputJPG.Click += new System.EventHandler(this.btnOutputJPG_Click); + // + // ribbonPanel12 + // + this.ribbonPanel12.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.ribbonPanel12.Controls.Add(this.ribbonBar18); + this.ribbonPanel12.Controls.Add(this.ribbonBar13); + this.ribbonPanel12.Dock = System.Windows.Forms.DockStyle.Fill; + this.ribbonPanel12.Location = new System.Drawing.Point(0, 33); + this.ribbonPanel12.Name = "ribbonPanel12"; + this.ribbonPanel12.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); + this.ribbonPanel12.Size = new System.Drawing.Size(1328, 62); + // + // + // + this.ribbonPanel12.Style.Class = ""; + this.ribbonPanel12.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonPanel12.StyleMouseDown.Class = ""; + this.ribbonPanel12.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonPanel12.StyleMouseOver.Class = ""; + this.ribbonPanel12.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonPanel12.TabIndex = 34; + this.ribbonPanel12.Visible = false; + // + // ribbonBar18 + // + this.ribbonBar18.AutoOverflowEnabled = true; + // + // + // + this.ribbonBar18.BackgroundMouseOverStyle.Class = ""; + this.ribbonBar18.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonBar18.BackgroundStyle.Class = ""; + this.ribbonBar18.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar18.ContainerControlProcessDialogKey = true; + this.ribbonBar18.Dock = System.Windows.Forms.DockStyle.Left; + this.ribbonBar18.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { + this.buttonItem133, + this.buttonItem132}); + this.ribbonBar18.Location = new System.Drawing.Point(508, 0); + this.ribbonBar18.Name = "ribbonBar18"; + this.ribbonBar18.Size = new System.Drawing.Size(75, 59); + this.ribbonBar18.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.ribbonBar18.TabIndex = 1; + // + // + // + this.ribbonBar18.TitleStyle.Class = ""; + this.ribbonBar18.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonBar18.TitleStyleMouseOver.Class = ""; + this.ribbonBar18.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar18.TitleVisible = false; + // + // buttonItem133 + // + this.buttonItem133.Image = ((System.Drawing.Image)(resources.GetObject("buttonItem133.Image"))); + this.buttonItem133.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem133.Name = "buttonItem133"; + this.buttonItem133.SubItemsExpandWidth = 14; + this.buttonItem133.Text = "审核入库"; + this.buttonItem133.Click += new System.EventHandler(this.buttonItem133_Click_1); + // + // buttonItem132 + // + this.buttonItem132.Name = "buttonItem132"; + // + // ribbonBar13 + // + this.ribbonBar13.AutoOverflowEnabled = true; + // + // + // + this.ribbonBar13.BackgroundMouseOverStyle.Class = ""; + this.ribbonBar13.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonBar13.BackgroundStyle.Class = ""; + this.ribbonBar13.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar13.ContainerControlProcessDialogKey = true; + this.ribbonBar13.Dock = System.Windows.Forms.DockStyle.Left; + this.ribbonBar13.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { + this.buttonItem127, + this.buttonItem128, + this.sliderItem1, + this.buttonItem134, + this.buttonItem130, + this.btn_check_history}); + this.ribbonBar13.Location = new System.Drawing.Point(3, 0); + this.ribbonBar13.Name = "ribbonBar13"; + this.ribbonBar13.Size = new System.Drawing.Size(505, 59); + this.ribbonBar13.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.ribbonBar13.TabIndex = 0; + // + // + // + this.ribbonBar13.TitleStyle.Class = ""; + this.ribbonBar13.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonBar13.TitleStyleMouseOver.Class = ""; + this.ribbonBar13.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar13.TitleVisible = false; + // + // buttonItem127 + // + this.buttonItem127.Image = ((System.Drawing.Image)(resources.GetObject("buttonItem127.Image"))); + this.buttonItem127.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem127.Name = "buttonItem127"; + this.buttonItem127.SubItemsExpandWidth = 14; + this.buttonItem127.Text = "打开数据"; + this.buttonItem127.Click += new System.EventHandler(this.buttonItem127_Click_2); + // + // buttonItem128 + // + this.buttonItem128.Image = ((System.Drawing.Image)(resources.GetObject("buttonItem128.Image"))); + this.buttonItem128.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem128.Name = "buttonItem128"; + this.buttonItem128.SubItemsExpandWidth = 14; + this.buttonItem128.Text = "一键审核"; + this.buttonItem128.Click += new System.EventHandler(this.buttonItem128_Click); + // + // sliderItem1 + // + this.sliderItem1.LabelPosition = DevComponents.DotNetBar.eSliderLabelPosition.Top; + this.sliderItem1.LabelWidth = 50; + this.sliderItem1.Name = "sliderItem1"; + this.sliderItem1.Text = "地面透明度"; + this.sliderItem1.TextColor = System.Drawing.Color.Black; + this.sliderItem1.Value = 0; + this.sliderItem1.ValueChanged += new System.EventHandler(this.sliderItem1_ValueChanged); + // + // buttonItem134 + // + this.buttonItem134.Image = ((System.Drawing.Image)(resources.GetObject("buttonItem134.Image"))); + this.buttonItem134.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem134.Name = "buttonItem134"; + this.buttonItem134.SubItemsExpandWidth = 14; + this.buttonItem134.Text = "模拟设计修改"; + this.buttonItem134.Click += new System.EventHandler(this.buttonItem134_Click_1); + // + // buttonItem130 + // + this.buttonItem130.Image = ((System.Drawing.Image)(resources.GetObject("buttonItem130.Image"))); + this.buttonItem130.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem130.Name = "buttonItem130"; + this.buttonItem130.SubItemsExpandWidth = 14; + this.buttonItem130.Text = "导出审核图"; + this.buttonItem130.Click += new System.EventHandler(this.buttonItem130_Click_1); + // + // btn_check_history + // + this.btn_check_history.Image = ((System.Drawing.Image)(resources.GetObject("btn_check_history.Image"))); + this.btn_check_history.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.btn_check_history.Name = "btn_check_history"; + this.btn_check_history.SubItemsExpandWidth = 14; + this.btn_check_history.Text = "审核历史"; + this.btn_check_history.Click += new System.EventHandler(this.btn_check_history_Click); + // + // ribbonPanel4 + // + this.ribbonPanel4.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.ribbonPanel4.Controls.Add(this.ribbonBar1); + this.ribbonPanel4.Dock = System.Windows.Forms.DockStyle.Fill; + this.ribbonPanel4.Location = new System.Drawing.Point(0, 33); + this.ribbonPanel4.Name = "ribbonPanel4"; + this.ribbonPanel4.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); + this.ribbonPanel4.Size = new System.Drawing.Size(1328, 62); + // + // + // + this.ribbonPanel4.Style.Class = ""; + this.ribbonPanel4.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonPanel4.StyleMouseDown.Class = ""; + this.ribbonPanel4.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonPanel4.StyleMouseOver.Class = ""; + this.ribbonPanel4.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonPanel4.TabIndex = 36; + this.ribbonPanel4.Visible = false; + // + // ribbonBar1 + // + this.ribbonBar1.AutoOverflowEnabled = true; + // + // + // + this.ribbonBar1.BackgroundMouseOverStyle.Class = ""; + this.ribbonBar1.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonBar1.BackgroundStyle.Class = ""; + this.ribbonBar1.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar1.ContainerControlProcessDialogKey = true; + this.ribbonBar1.Dock = System.Windows.Forms.DockStyle.Left; + this.ribbonBar1.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { + this.btn_document_info}); + this.ribbonBar1.Location = new System.Drawing.Point(3, 0); + this.ribbonBar1.Name = "ribbonBar1"; + this.ribbonBar1.Size = new System.Drawing.Size(88, 59); + this.ribbonBar1.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.ribbonBar1.TabIndex = 0; + // + // + // + this.ribbonBar1.TitleStyle.Class = ""; + this.ribbonBar1.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonBar1.TitleStyleMouseOver.Class = ""; + this.ribbonBar1.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar1.TitleVisible = false; + // + // btn_document_info + // + this.btn_document_info.Image = ((System.Drawing.Image)(resources.GetObject("btn_document_info.Image"))); + this.btn_document_info.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.btn_document_info.Name = "btn_document_info"; + this.btn_document_info.SubItemsExpandWidth = 14; + this.btn_document_info.Text = "文档管理"; + this.btn_document_info.Click += new System.EventHandler(this.btn_document_info_Click); + // // ribbonTabItem1 // this.ribbonTabItem1.ButtonStyle = DevComponents.DotNetBar.eButtonStyle.ImageAndText; @@ -3673,7 +3694,6 @@ this.ribbonTabItem7.Name = "ribbonTabItem7"; this.ribbonTabItem7.Panel = this.ribbonPanel7; this.ribbonTabItem7.Text = "管线定位"; - this.ribbonTabItem7.MouseDown += new System.Windows.Forms.MouseEventHandler(this.ribbonTabItem7_MouseDown); // // ribbonTabItem5 // @@ -3684,7 +3704,6 @@ this.ribbonTabItem5.Name = "ribbonTabItem5"; this.ribbonTabItem5.Panel = this.ribbonPanel3; this.ribbonTabItem5.Text = "标识器管理"; - this.ribbonTabItem5.MouseDown += new System.Windows.Forms.MouseEventHandler(this.ribbonTabItem5_MouseDown); // // ribbonTabItem2 // @@ -4451,7 +4470,7 @@ this.dataGridViewX2.ReadOnly = true; this.dataGridViewX2.RowHeadersVisible = false; this.dataGridViewX2.RowTemplate.Height = 23; - this.dataGridViewX2.Size = new System.Drawing.Size(31081, 92); + this.dataGridViewX2.Size = new System.Drawing.Size(31378, 92); this.dataGridViewX2.TabIndex = 11; // // dataGridViewTextBoxColumn10 @@ -4545,7 +4564,7 @@ this.dataGridViewX3.ReadOnly = true; this.dataGridViewX3.RowHeadersVisible = false; this.dataGridViewX3.RowTemplate.Height = 23; - this.dataGridViewX3.Size = new System.Drawing.Size(31080, 127); + this.dataGridViewX3.Size = new System.Drawing.Size(31377, 127); this.dataGridViewX3.TabIndex = 5; this.dataGridViewX3.MouseDoubleClick += new System.Windows.Forms.MouseEventHandler(this.dataGridViewX3_MouseDoubleClick); // @@ -5722,7 +5741,8 @@ // pictureBox1 // this.pictureBox1.Dock = System.Windows.Forms.DockStyle.Top; - this.pictureBox1.Image = ((System.Drawing.Image)(resources.GetObject("pictureBox1.Image"))); +// this.pictureBox1.Image = ((System.Drawing.Image)(resources.GetObject("pictureBox1.Image"))); + this.pictureBox1.Image = Image.FromFile(Application.StartupPath + Utility.TitleImagePath); this.pictureBox1.Location = new System.Drawing.Point(0, 0); this.pictureBox1.Margin = new System.Windows.Forms.Padding(0); this.pictureBox1.Name = "pictureBox1"; @@ -5732,18 +5752,6 @@ this.pictureBox1.TabStop = false; this.pictureBox1.Paint += new System.Windows.Forms.PaintEventHandler(this.pictureBox1_Paint); // - // layerTree - // - this.layerTree.CheckBoxes = true; - this.layerTree.ItemHeight = 18; - this.layerTree.Location = new System.Drawing.Point(30, 78); - this.layerTree.Name = "layerTree"; - this.layerTree.Size = new System.Drawing.Size(121, 97); - this.layerTree.TabIndex = 1; - this.layerTree.AfterCheck += new System.Windows.Forms.TreeViewEventHandler(this.layerTree_AfterCheck); - this.layerTree.NodeMouseClick += new System.Windows.Forms.TreeNodeMouseClickEventHandler(this.layerTree_NodeMouseClick); - this.layerTree.NodeMouseDoubleClick += new System.Windows.Forms.TreeNodeMouseClickEventHandler(this.layerTree_NodeMouseDoubleClick); - // // MainFrm // this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Inherit; @@ -5770,7 +5778,8 @@ this.KeyPreview = true; this.Name = "MainFrm"; this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen; - this.Text = "智慧太湖新城管网规划分析系统6.0"; +// this.Text = "智慧太湖新城管网规划分析系统6.0"; + this.Text = Utility.SysnameVersion; this.WindowState = System.Windows.Forms.FormWindowState.Maximized; this.FormClosing += new System.Windows.Forms.FormClosingEventHandler(this.MainFrm_FormClosing); this.Load += new System.EventHandler(this.MainFrm_Load); @@ -5787,15 +5796,15 @@ this.contextMenuStripDeleteLayerNode.ResumeLayout(false); this.ribbonControl1.ResumeLayout(false); this.ribbonControl1.PerformLayout(); + this.ribbonPanel3.ResumeLayout(false); + this.ribbonPanel7.ResumeLayout(false); + this.ribbonPanel15.ResumeLayout(false); + this.ribbonPanel2.ResumeLayout(false); this.ribbonPanel6.ResumeLayout(false); this.ribbonPanel5.ResumeLayout(false); this.ribbonPanel1.ResumeLayout(false); this.ribbonPanel12.ResumeLayout(false); this.ribbonPanel4.ResumeLayout(false); - this.ribbonPanel15.ResumeLayout(false); - this.ribbonPanel3.ResumeLayout(false); - this.ribbonPanel7.ResumeLayout(false); - this.ribbonPanel2.ResumeLayout(false); this.panelOfTable.ResumeLayout(false); this.panelOfTable.PerformLayout(); ((System.ComponentModel.ISupportInitialize)(this.dataGridViewX1)).EndInit(); @@ -5955,6 +5964,7 @@ private RibbonTabItem ribbonTabItem11; private ButtonItem buttonItem130; private RibbonBar ribbonBar18; + private ButtonItem buttonItem132; private SliderItem sliderItem1; private ButtonItem buttonItem133; private ButtonItem buttonItem134; diff --git a/MainFrm.resx b/MainFrm.resx index 9f9bba4..ce490c1 100644 --- a/MainFrm.resx +++ b/MainFrm.resx @@ -351,6 +351,146 @@ 766, 54 + + + iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 + YQUAAAAZdEVYdFNvZnR3YXJlAEFkb2JlIEltYWdlUmVhZHlxyWU8AAADZmlUWHRYTUw6Y29tLmFkb2Jl + LnhtcAAAAAAAPD94cGFja2V0IGJlZ2luPSLvu78iIGlkPSJXNU0wTXBDZWhpSHpyZVN6TlRjemtjOWQi + Pz4gPHg6eG1wbWV0YSB4bWxuczp4PSJhZG9iZTpuczptZXRhLyIgeDp4bXB0az0iQWRvYmUgWE1QIENv + cmUgNS4zLWMwMTEgNjYuMTQ1NjYxLCAyMDEyLzAyLzA2LTE0OjU2OjI3ICAgICAgICAiPiA8cmRmOlJE + RiB4bWxuczpyZGY9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkvMDIvMjItcmRmLXN5bnRheC1ucyMiPiA8 + cmRmOkRlc2NyaXB0aW9uIHJkZjphYm91dD0iIiB4bWxuczp4bXBNTT0iaHR0cDovL25zLmFkb2JlLmNv + bS94YXAvMS4wL21tLyIgeG1sbnM6c3RSZWY9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlw + ZS9SZXNvdXJjZVJlZiMiIHhtbG5zOnhtcD0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wLyIgeG1w + TU06T3JpZ2luYWxEb2N1bWVudElEPSJ4bXAuZGlkOjYzQTM5NEY4Mjg0OUU0MTE5NDBEQTc4ODZEQzk5 + N0NGIiB4bXBNTTpEb2N1bWVudElEPSJ4bXAuZGlkOjEwQ0IxNzBBNEM1QzExRTRBNkNGQzRBMjhDQzI0 + MkY4IiB4bXBNTTpJbnN0YW5jZUlEPSJ4bXAuaWlkOjEwQ0IxNzA5NEM1QzExRTRBNkNGQzRBMjhDQzI0 + MkY4IiB4bXA6Q3JlYXRvclRvb2w9IkFkb2JlIFBob3Rvc2hvcCBDUzYgKFdpbmRvd3MpIj4gPHhtcE1N + OkRlcml2ZWRGcm9tIHN0UmVmOmluc3RhbmNlSUQ9InhtcC5paWQ6NTEzMDNDMjA1QjRDRTQxMTg4NERE + MUVBOEQ4QTgyNTUiIHN0UmVmOmRvY3VtZW50SUQ9InhtcC5kaWQ6NjNBMzk0RjgyODQ5RTQxMTk0MERB + Nzg4NkRDOTk3Q0YiLz4gPC9yZGY6RGVzY3JpcHRpb24+IDwvcmRmOlJERj4gPC94OnhtcG1ldGE+IDw/ + eHBhY2tldCBlbmQ9InIiPz43wa2/AAAFaUlEQVRIS6WUC0xTVxzGKy0UkSmlFGjBFilSkNpSaAWRh63y + sIiAArKs4spLRLQoiEJlSMGoMCc6CBOnYHzMOHUqqOhEHOqCbjNu6kCd6KYje5mZ6KbObd/OuVL3cEzj + /skv997/+b7v39PTW9aj3/BM+OKxPEIZoW/gyrOuPbP+GvRPSNBQQqXYLwSW1etw7cYt5kqfaZ+uD8QM + Xg8f/f4UxGhHMHv4qlG6vAb9394G6T+BPpdV1oCuUx3VD8Q9XT8//PUJRMghlLhLg1C41IK+r/pB+oNC + 16mO6qmP+gdi/6y793+hwTYEk9uoQOSaStHzxQ2Q/nND9XMKy0D9NIfmDcSzaLhI4KXE7LwinLtwGXfu + PXhhqJ/m0DyS62EdUGWpqcf3P97DD3d++t/QnKraBjpghXWAiC+WN0ZNScOe1mP45vbdF2ZvWwdoDs/D + b6ejs6ecxHPoAG/l+Fhkzy+FyCcY0YkG7D/yAW5+d+e5oXrqo36aQ/McnNyjyAAuHWA05pfgzPlehhyT + mflV6FOMaDt2Ctf7bw8KXac6qqc+a4Zx3hLwRLJCZgcJjcPIEPkyIZmeX1SB7vOX0dn9KQy5jw8r8eVc + HOrsxidXP0d9hxlzd4QgeYMzEt7kQVvOR0pFFNpOHmd81E9znIS+dSTc1foVGWfNKUZjyy6Ex6SQl0cD + 09IVxHAFh0+cReqr+QjK8ERqEw+VHWOwoycSR/v1OHwzDlsvhcNCeqkbedAYxQiPm87kZOQVw0nkW0QG + 2DFnIA+JRm3DFpzr/RKNW3ZDE5UAsX8ocizZiFs7DEUHvPFunw4Hb05B+y09jn49lYHe0x5doxqqLVlf + DJrnyB+pIQNs6QAhf6R8tZu3CqpwPdZu2I6PLl3HwnV5iHv9JVSeUOKdqzq81xeDvddiYG73R0aLEIZm + IRa1jUbjxQnYRHa17YqW0VJPwHT3LocRbirrDiymspXo6L6AgiXV8JSNQ2i6GpNWOqK4U4n1n0Vge68W + 9ecmIKnBBSqDCIp4P2RWGDB/QxqS6l1QcToIld3BqDobgsXEQ73+Se5HrGcgdJEokGzIx66DXXi7dRvC + yx2Q2RqApR+GoPbjCag8pUZ6sxjqWRKEldljRr07ZjaKmHt5qpBZKzkeiIJ2BbIPKmA8MIbJUC/ghrM0 + RfYsDtdhqJNIVulK/ku0BQokbfZGZrsKBR3BmEsMOfvl0FY7o7ypDPo1brCcGc+QUCdExabXEFsjQO4B + ObL2BSBlqx8SWwibvBE0334nK3Ael+yEbIW81DZszlhZ2oieuAYvpO5VIHGzP9J2+CN9pz/CzDwExMox + eZUbFnZpkEc+gLZagJjMWOiqXZDVqmC0+kZf6Nb4IHKFCPIsu92sgCw7BlJswjBJLCdenmuPyFUS6Gp9 + oG/yRdJWGSKqhYjKDgLRImK5ACGlzsy9d/zwXn2DBMZDSkZLPaHlnpBncyGO5kxj+Rps/wYdJE2xzfOb + zcU4sye0b0gRu3E0Ypt8ELTICRFGNcShUgjHuZyWxNu2096sdiXS9o1ltNQjyyDhes4SkuXEGpXC+Ve8 + kjlzpDPtoCkVQrdOihgyIHmXP6LryGEX86Ba6ISJNR7IeF+JV8gAfbOM0XoTj8dktpmEOxM4rJHTBscz + njNNnMiBagEfU98ajRnbZMg7GojCk2oGU1cw5nUGw7BHAZWJD6oVhLFzSDCPCacljGP/J7xAm6Hu0ew6 + STIXkcvckN7ig8XHVCjvUiNvdwAmW0Twms6FayS7meM4REoihxPoeT4u10nsZ0LKhhdsIxZEsVcLtOyL + pHffVcd+IJjI7uGHsRscJEPURMMn2FMtNTwuFusPrjFl48ji7nIAAAAASUVORK5CYII= + + + + + iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 + YQUAAAAZdEVYdFNvZnR3YXJlAEFkb2JlIEltYWdlUmVhZHlxyWU8AAADZmlUWHRYTUw6Y29tLmFkb2Jl + LnhtcAAAAAAAPD94cGFja2V0IGJlZ2luPSLvu78iIGlkPSJXNU0wTXBDZWhpSHpyZVN6TlRjemtjOWQi + Pz4gPHg6eG1wbWV0YSB4bWxuczp4PSJhZG9iZTpuczptZXRhLyIgeDp4bXB0az0iQWRvYmUgWE1QIENv + cmUgNS4zLWMwMTEgNjYuMTQ1NjYxLCAyMDEyLzAyLzA2LTE0OjU2OjI3ICAgICAgICAiPiA8cmRmOlJE + RiB4bWxuczpyZGY9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkvMDIvMjItcmRmLXN5bnRheC1ucyMiPiA8 + cmRmOkRlc2NyaXB0aW9uIHJkZjphYm91dD0iIiB4bWxuczp4bXBNTT0iaHR0cDovL25zLmFkb2JlLmNv + bS94YXAvMS4wL21tLyIgeG1sbnM6c3RSZWY9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlw + ZS9SZXNvdXJjZVJlZiMiIHhtbG5zOnhtcD0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wLyIgeG1w + TU06T3JpZ2luYWxEb2N1bWVudElEPSJ4bXAuZGlkOjYzQTM5NEY4Mjg0OUU0MTE5NDBEQTc4ODZEQzk5 + N0NGIiB4bXBNTTpEb2N1bWVudElEPSJ4bXAuZGlkOkUyMTg3NjEyNDlEODExRTQ4NjNGQjM2Mzk1QkNB + RkQwIiB4bXBNTTpJbnN0YW5jZUlEPSJ4bXAuaWlkOkUyMTg3NjExNDlEODExRTQ4NjNGQjM2Mzk1QkNB + RkQwIiB4bXA6Q3JlYXRvclRvb2w9IkFkb2JlIFBob3Rvc2hvcCBDUzYgKFdpbmRvd3MpIj4gPHhtcE1N + OkRlcml2ZWRGcm9tIHN0UmVmOmluc3RhbmNlSUQ9InhtcC5paWQ6NkJCNTE0NDlEODQ5RTQxMUE0QzNB + MjdEOTJBQzc3QkMiIHN0UmVmOmRvY3VtZW50SUQ9InhtcC5kaWQ6NjNBMzk0RjgyODQ5RTQxMTk0MERB + Nzg4NkRDOTk3Q0YiLz4gPC9yZGY6RGVzY3JpcHRpb24+IDwvcmRmOlJERj4gPC94OnhtcG1ldGE+IDw/ + eHBhY2tldCBlbmQ9InIiPz5e5MstAAADiUlEQVRIS+2UW0yTdxjGcePwtYyVVpAUCi1tv9ImrVbxhAei + kjGphAgFT4jzEJ0gGuJhDk0sml0sglmWmC1hqHNKWwI4srgNh3phpjg1O1yIN5DMbFHQZUu42O76+D4f + 3Fl6Z7ILn+SXvH3f533++X/98iUBeKW81v9Uwx1G1+1240EhfKfdeE/4U3qTAqaZZO/2aeN9IXLrY+Ph + wVOZHll9YyohgYZOGS4JsYdXVDy+NQ8Tvy3BP6OlmPyjDP9OBDRYs8cZPfRy5/uQISIRqcIsLSye+j7I + wN+PluOvhyWY+NmL8fsOjP9kxdN7BRh/YJHfFjy5m48nd4ThQjy968bEgwV49usicFciTEKKFhZPXXv1 + eHxtLsYGPBjttwsWjF0xY+ybOfj9uylYs8cZPfQS7kpEnqDTwuLp9GYlfKZeifUfzcb1j/Iw/IkNv3Q6 + MfKVC6O9bg3W7HFGD73cORlMG5AIizDzAaVtunD5ESXWfNSEY/tNCO00oG1zOkJBBSeqUjVYh6R3Qmat + zSY0Hjah7IASW7hPuSoRvIGihcVTSauCppvFODRUjJZvPWgaKMTuXgt2RHOxLTwHDd3EjPfCudgesWJX + jxM7eryo7/Ni8SGFj8gp6LWwePLvS0Og043A5y5UdtkQOJeLivM5ePf8bJSfM04zG2u7chDoysW6Thsq + zqpY0+GAvymNB/gEgxYWT64tKdGihpSYv8WEpSEzVp0pwDuf2SVQReCiS4M1e5zRQy937NXJ1yRirjDz + AVmVJyNZa9+PObauh7ptKdR6FY6N2SisTYe1OlmDNXtqvRNqwxLYt1TCVLY1ZijZOSQRbuEtLSyeTOXH + sfLDH1EauoFFx6/Cd6Qf7pYI1ObLsO+9iMLdF+DccwEuqd2Nl+Br6sbCxiiKd/XBuPogH1HiAzJXHMC8 + YA98td1wb4rCuaEH1roo8oMR5JGaMPIFa10Ejtowiuouw1vzJTwVXyBz+X4ekPgRZfgbohkLtsfMy47B + tqYdakUnPFUM6YUv+LUGa/Y4o8e8rBXcSffWDkpE4j9ZpEvNmb9KsZV16BzrBnVq1YjeVf1MX1Tzn74o + iCmkdq1/LrNHOkfgB6Vg9afJRrVOdv2ClRkMmklvCnyPs4V8ge81v5RegddnCGHNHmf00JslcJcZCcWv + IU1pAhcyhLcFXj1zGtbscUYPvdyZ+Uv6Wi8rKekFBjoX2627by8AAAAASUVORK5CYII= + + + + + iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 + YQUAAAAZdEVYdFNvZnR3YXJlAEFkb2JlIEltYWdlUmVhZHlxyWU8AAADZmlUWHRYTUw6Y29tLmFkb2Jl + LnhtcAAAAAAAPD94cGFja2V0IGJlZ2luPSLvu78iIGlkPSJXNU0wTXBDZWhpSHpyZVN6TlRjemtjOWQi + Pz4gPHg6eG1wbWV0YSB4bWxuczp4PSJhZG9iZTpuczptZXRhLyIgeDp4bXB0az0iQWRvYmUgWE1QIENv + cmUgNS4zLWMwMTEgNjYuMTQ1NjYxLCAyMDEyLzAyLzA2LTE0OjU2OjI3ICAgICAgICAiPiA8cmRmOlJE + RiB4bWxuczpyZGY9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkvMDIvMjItcmRmLXN5bnRheC1ucyMiPiA8 + cmRmOkRlc2NyaXB0aW9uIHJkZjphYm91dD0iIiB4bWxuczp4bXBNTT0iaHR0cDovL25zLmFkb2JlLmNv + bS94YXAvMS4wL21tLyIgeG1sbnM6c3RSZWY9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlw + ZS9SZXNvdXJjZVJlZiMiIHhtbG5zOnhtcD0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wLyIgeG1w + TU06T3JpZ2luYWxEb2N1bWVudElEPSJ4bXAuZGlkOjYzQTM5NEY4Mjg0OUU0MTE5NDBEQTc4ODZEQzk5 + N0NGIiB4bXBNTTpEb2N1bWVudElEPSJ4bXAuZGlkOkE2Q0VGMDE2NDlEQTExRTQ4NTlCQTI3NTMyOEY5 + NEU2IiB4bXBNTTpJbnN0YW5jZUlEPSJ4bXAuaWlkOkE2Q0VGMDE1NDlEQTExRTQ4NTlCQTI3NTMyOEY5 + NEU2IiB4bXA6Q3JlYXRvclRvb2w9IkFkb2JlIFBob3Rvc2hvcCBDUzYgKFdpbmRvd3MpIj4gPHhtcE1N + OkRlcml2ZWRGcm9tIHN0UmVmOmluc3RhbmNlSUQ9InhtcC5paWQ6NjA1MjM3NzFEOTQ5RTQxMUE0QzNB + MjdEOTJBQzc3QkMiIHN0UmVmOmRvY3VtZW50SUQ9InhtcC5kaWQ6NjNBMzk0RjgyODQ5RTQxMTk0MERB + Nzg4NkRDOTk3Q0YiLz4gPC9yZGY6RGVzY3JpcHRpb24+IDwvcmRmOlJERj4gPC94OnhtcG1ldGE+IDw/ + eHBhY2tldCBlbmQ9InIiPz6UH16BAAABrElEQVRIS63N70tTURzH8fsnKSGCCEIQCBKISMq2iILCgQOL + JUxQAoVKdMGQuwgWFepsMGjFZCMuorsIJV4WFatpvzdr1ZAFsaIHn8559v1eDsI91wevJ/ee7/tjbMRH + fAFwJOWRF6oopTzyQhWlVEdBwRbgUhICAnuvilKGtXDGzW6WV/CvbjE/xTfxr+R6q4xSxtP5YTf8rVn4 + s5dG+809Rv5zvVVGKaNwfYgyBfhksoH83CCF9seiL7LBBnLXTlP4/W4dza0ZLS0nCdlgA9npAQq/qk/Q + sKa0NJ8nIBtsIBPrp9CqPMJBYVLLj+04ZIMNrF49ReHwVRafH1/R8m3zJmSDDdy/fJJC88Ua3mcjWurW + LGSDDaQifRS+O8uopsNaPhVnIBts4E64l0Jj5y4qDy5q+ZCPQTbYgHmph8LXZ0m8TJ3Xsp+LQjbYQOJC + N4XadgLl22e1vM1OQDbYwK1zXRS+lBbhmEHsLgU8kTeVh+OQDTawEDpB2U4mitfpMS22GYJssIH5QCcV + FGwBmuRtkA3cGO3whcZUlEdeqKKU8sgLVZRSfjw+MP4DJ2GPpDR9OIsAAAAASUVORK5CYII= + + + + + iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 + YQUAAAAZdEVYdFNvZnR3YXJlAEFkb2JlIEltYWdlUmVhZHlxyWU8AAADZmlUWHRYTUw6Y29tLmFkb2Jl + LnhtcAAAAAAAPD94cGFja2V0IGJlZ2luPSLvu78iIGlkPSJXNU0wTXBDZWhpSHpyZVN6TlRjemtjOWQi + Pz4gPHg6eG1wbWV0YSB4bWxuczp4PSJhZG9iZTpuczptZXRhLyIgeDp4bXB0az0iQWRvYmUgWE1QIENv + cmUgNS4zLWMwMTEgNjYuMTQ1NjYxLCAyMDEyLzAyLzA2LTE0OjU2OjI3ICAgICAgICAiPiA8cmRmOlJE + RiB4bWxuczpyZGY9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkvMDIvMjItcmRmLXN5bnRheC1ucyMiPiA8 + cmRmOkRlc2NyaXB0aW9uIHJkZjphYm91dD0iIiB4bWxuczp4bXBNTT0iaHR0cDovL25zLmFkb2JlLmNv + bS94YXAvMS4wL21tLyIgeG1sbnM6c3RSZWY9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlw + ZS9SZXNvdXJjZVJlZiMiIHhtbG5zOnhtcD0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wLyIgeG1w + TU06T3JpZ2luYWxEb2N1bWVudElEPSJ4bXAuZGlkOjYzQTM5NEY4Mjg0OUU0MTE5NDBEQTc4ODZEQzk5 + N0NGIiB4bXBNTTpEb2N1bWVudElEPSJ4bXAuZGlkOjJGRTU5OEQ1NDlEQjExRTRBRUVDOTkyMjQ5NzEw + REUwIiB4bXBNTTpJbnN0YW5jZUlEPSJ4bXAuaWlkOjJGRTU5OEQ0NDlEQjExRTRBRUVDOTkyMjQ5NzEw + REUwIiB4bXA6Q3JlYXRvclRvb2w9IkFkb2JlIFBob3Rvc2hvcCBDUzYgKFdpbmRvd3MpIj4gPHhtcE1N + OkRlcml2ZWRGcm9tIHN0UmVmOmluc3RhbmNlSUQ9InhtcC5paWQ6MTY0MkI1RjlEQTQ5RTQxMUE0QzNB + MjdEOTJBQzc3QkMiIHN0UmVmOmRvY3VtZW50SUQ9InhtcC5kaWQ6NjNBMzk0RjgyODQ5RTQxMTk0MERB + Nzg4NkRDOTk3Q0YiLz4gPC9yZGY6RGVzY3JpcHRpb24+IDwvcmRmOlJERj4gPC94OnhtcG1ldGE+IDw/ + eHBhY2tldCBlbmQ9InIiPz6B5sF9AAACe0lEQVRIS7WVb2jMcRzHL7UHanF/Mts5prE/1li3kAfu5Ak7 + 5IHNobBkSC2UIuGJkrrSWRvTmHQWK8U1T8jqUtYwkZpaGjV/Js6to5YwfXze39+fu/v23f36hXe9us+f + 7/v9rd/dr3MQ0X/F4Zm3+K9QhWajNNlBFZqN0mQHS6lMdrCUyqSgimllUsy4XmOmp+QRDllQWbygjjq6 + uimZStOX8a+ixox3pXrM1JLCDAqYJmY7c669M0bff07mcLbtEl9QE8k6V6BH5ooXMsHZZX7ae+AY7W45 + SrPm19LbsSR9m/iRA2bYGefggVePzUgKBzeu9sQpmZ4QcG/WMtk7eLjv0WMz0kOz+TX6MUXvP6cFeNbD + bz6YvQFm2Bk9PPByZO6jksLB5KvRTzTyLikIrG2ktsvXzd4g2hGjYP1ms4eHvb850qkl65LCQW/ntVs0 + 9HpMcPx0K1X4V1Ff/3NzhnphbVDsjBk8Lm/VE44s0ZJ1KS4Ie8uXUvPBE7Tn0ElCzTMqrV5BO/cfEaDG + TD5X6PFFONLygsTF7jj1vxihyPkYNTS1iFrFxm37KHIhJmp43L7qZxzp0pJ1SeHhQGgLJQaH6fb9R1QX + 2EB3Ek9FryLe95j8K9eLT/TB0FZcskOP1iRdkIh23aR7Ay9pzaZddKY9Jup8nIpeoXXhZlHD655b85Bj + p2npLOmCML+dD/iTZhaX3+UvbRB1PpzeygFnSUUvatecRUMzisoOc+x0LZ3FixxYhQyK1cxyZhkTYhqY + RgnM6hmcwVl4ljDI0KS4AC+Kmyli8Jv2MF7GNwXY4QzOwgNv5mWTL7CLpVQmO1hKZbKDpVR/1P8OcvwB + lh7gOXXZq9sAAAAASUVORK5CYII= + + iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 @@ -598,147 +738,7 @@ 1BGxz38BvCwLsyQ3iHgAAAAASUVORK5CYII= - - - iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAZdEVYdFNvZnR3YXJlAEFkb2JlIEltYWdlUmVhZHlxyWU8AAADZmlUWHRYTUw6Y29tLmFkb2Jl - LnhtcAAAAAAAPD94cGFja2V0IGJlZ2luPSLvu78iIGlkPSJXNU0wTXBDZWhpSHpyZVN6TlRjemtjOWQi - Pz4gPHg6eG1wbWV0YSB4bWxuczp4PSJhZG9iZTpuczptZXRhLyIgeDp4bXB0az0iQWRvYmUgWE1QIENv - cmUgNS4zLWMwMTEgNjYuMTQ1NjYxLCAyMDEyLzAyLzA2LTE0OjU2OjI3ICAgICAgICAiPiA8cmRmOlJE - RiB4bWxuczpyZGY9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkvMDIvMjItcmRmLXN5bnRheC1ucyMiPiA8 - cmRmOkRlc2NyaXB0aW9uIHJkZjphYm91dD0iIiB4bWxuczp4bXBNTT0iaHR0cDovL25zLmFkb2JlLmNv - bS94YXAvMS4wL21tLyIgeG1sbnM6c3RSZWY9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlw - ZS9SZXNvdXJjZVJlZiMiIHhtbG5zOnhtcD0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wLyIgeG1w - TU06T3JpZ2luYWxEb2N1bWVudElEPSJ4bXAuZGlkOjYzQTM5NEY4Mjg0OUU0MTE5NDBEQTc4ODZEQzk5 - N0NGIiB4bXBNTTpEb2N1bWVudElEPSJ4bXAuZGlkOjEwQ0IxNzBBNEM1QzExRTRBNkNGQzRBMjhDQzI0 - MkY4IiB4bXBNTTpJbnN0YW5jZUlEPSJ4bXAuaWlkOjEwQ0IxNzA5NEM1QzExRTRBNkNGQzRBMjhDQzI0 - MkY4IiB4bXA6Q3JlYXRvclRvb2w9IkFkb2JlIFBob3Rvc2hvcCBDUzYgKFdpbmRvd3MpIj4gPHhtcE1N - OkRlcml2ZWRGcm9tIHN0UmVmOmluc3RhbmNlSUQ9InhtcC5paWQ6NTEzMDNDMjA1QjRDRTQxMTg4NERE - MUVBOEQ4QTgyNTUiIHN0UmVmOmRvY3VtZW50SUQ9InhtcC5kaWQ6NjNBMzk0RjgyODQ5RTQxMTk0MERB - Nzg4NkRDOTk3Q0YiLz4gPC9yZGY6RGVzY3JpcHRpb24+IDwvcmRmOlJERj4gPC94OnhtcG1ldGE+IDw/ - eHBhY2tldCBlbmQ9InIiPz43wa2/AAAFaUlEQVRIS6WUC0xTVxzGKy0UkSmlFGjBFilSkNpSaAWRh63y - sIiAArKs4spLRLQoiEJlSMGoMCc6CBOnYHzMOHUqqOhEHOqCbjNu6kCd6KYje5mZ6KbObd/OuVL3cEzj - /skv997/+b7v39PTW9aj3/BM+OKxPEIZoW/gyrOuPbP+GvRPSNBQQqXYLwSW1etw7cYt5kqfaZ+uD8QM - Xg8f/f4UxGhHMHv4qlG6vAb9394G6T+BPpdV1oCuUx3VD8Q9XT8//PUJRMghlLhLg1C41IK+r/pB+oNC - 16mO6qmP+gdi/6y793+hwTYEk9uoQOSaStHzxQ2Q/nND9XMKy0D9NIfmDcSzaLhI4KXE7LwinLtwGXfu - PXhhqJ/m0DyS62EdUGWpqcf3P97DD3d++t/QnKraBjpghXWAiC+WN0ZNScOe1mP45vbdF2ZvWwdoDs/D - b6ejs6ecxHPoAG/l+Fhkzy+FyCcY0YkG7D/yAW5+d+e5oXrqo36aQ/McnNyjyAAuHWA05pfgzPlehhyT - mflV6FOMaDt2Ctf7bw8KXac6qqc+a4Zx3hLwRLJCZgcJjcPIEPkyIZmeX1SB7vOX0dn9KQy5jw8r8eVc - HOrsxidXP0d9hxlzd4QgeYMzEt7kQVvOR0pFFNpOHmd81E9znIS+dSTc1foVGWfNKUZjyy6Ex6SQl0cD - 09IVxHAFh0+cReqr+QjK8ERqEw+VHWOwoycSR/v1OHwzDlsvhcNCeqkbedAYxQiPm87kZOQVw0nkW0QG - 2DFnIA+JRm3DFpzr/RKNW3ZDE5UAsX8ocizZiFs7DEUHvPFunw4Hb05B+y09jn49lYHe0x5doxqqLVlf - DJrnyB+pIQNs6QAhf6R8tZu3CqpwPdZu2I6PLl3HwnV5iHv9JVSeUOKdqzq81xeDvddiYG73R0aLEIZm - IRa1jUbjxQnYRHa17YqW0VJPwHT3LocRbirrDiymspXo6L6AgiXV8JSNQ2i6GpNWOqK4U4n1n0Vge68W - 9ecmIKnBBSqDCIp4P2RWGDB/QxqS6l1QcToIld3BqDobgsXEQ73+Se5HrGcgdJEokGzIx66DXXi7dRvC - yx2Q2RqApR+GoPbjCag8pUZ6sxjqWRKEldljRr07ZjaKmHt5qpBZKzkeiIJ2BbIPKmA8MIbJUC/ghrM0 - RfYsDtdhqJNIVulK/ku0BQokbfZGZrsKBR3BmEsMOfvl0FY7o7ypDPo1brCcGc+QUCdExabXEFsjQO4B - ObL2BSBlqx8SWwibvBE0334nK3Ael+yEbIW81DZszlhZ2oieuAYvpO5VIHGzP9J2+CN9pz/CzDwExMox - eZUbFnZpkEc+gLZagJjMWOiqXZDVqmC0+kZf6Nb4IHKFCPIsu92sgCw7BlJswjBJLCdenmuPyFUS6Gp9 - oG/yRdJWGSKqhYjKDgLRImK5ACGlzsy9d/zwXn2DBMZDSkZLPaHlnpBncyGO5kxj+Rps/wYdJE2xzfOb - zcU4sye0b0gRu3E0Ypt8ELTICRFGNcShUgjHuZyWxNu2096sdiXS9o1ltNQjyyDhes4SkuXEGpXC+Ve8 - kjlzpDPtoCkVQrdOihgyIHmXP6LryGEX86Ba6ISJNR7IeF+JV8gAfbOM0XoTj8dktpmEOxM4rJHTBscz - njNNnMiBagEfU98ajRnbZMg7GojCk2oGU1cw5nUGw7BHAZWJD6oVhLFzSDCPCacljGP/J7xAm6Hu0ew6 - STIXkcvckN7ig8XHVCjvUiNvdwAmW0Twms6FayS7meM4REoihxPoeT4u10nsZ0LKhhdsIxZEsVcLtOyL - pHffVcd+IJjI7uGHsRscJEPURMMn2FMtNTwuFusPrjFl48ji7nIAAAAASUVORK5CYII= - - - - - iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAZdEVYdFNvZnR3YXJlAEFkb2JlIEltYWdlUmVhZHlxyWU8AAADZmlUWHRYTUw6Y29tLmFkb2Jl - LnhtcAAAAAAAPD94cGFja2V0IGJlZ2luPSLvu78iIGlkPSJXNU0wTXBDZWhpSHpyZVN6TlRjemtjOWQi - Pz4gPHg6eG1wbWV0YSB4bWxuczp4PSJhZG9iZTpuczptZXRhLyIgeDp4bXB0az0iQWRvYmUgWE1QIENv - cmUgNS4zLWMwMTEgNjYuMTQ1NjYxLCAyMDEyLzAyLzA2LTE0OjU2OjI3ICAgICAgICAiPiA8cmRmOlJE - RiB4bWxuczpyZGY9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkvMDIvMjItcmRmLXN5bnRheC1ucyMiPiA8 - cmRmOkRlc2NyaXB0aW9uIHJkZjphYm91dD0iIiB4bWxuczp4bXBNTT0iaHR0cDovL25zLmFkb2JlLmNv - bS94YXAvMS4wL21tLyIgeG1sbnM6c3RSZWY9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlw - ZS9SZXNvdXJjZVJlZiMiIHhtbG5zOnhtcD0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wLyIgeG1w - TU06T3JpZ2luYWxEb2N1bWVudElEPSJ4bXAuZGlkOjYzQTM5NEY4Mjg0OUU0MTE5NDBEQTc4ODZEQzk5 - N0NGIiB4bXBNTTpEb2N1bWVudElEPSJ4bXAuZGlkOkUyMTg3NjEyNDlEODExRTQ4NjNGQjM2Mzk1QkNB - RkQwIiB4bXBNTTpJbnN0YW5jZUlEPSJ4bXAuaWlkOkUyMTg3NjExNDlEODExRTQ4NjNGQjM2Mzk1QkNB - RkQwIiB4bXA6Q3JlYXRvclRvb2w9IkFkb2JlIFBob3Rvc2hvcCBDUzYgKFdpbmRvd3MpIj4gPHhtcE1N - OkRlcml2ZWRGcm9tIHN0UmVmOmluc3RhbmNlSUQ9InhtcC5paWQ6NkJCNTE0NDlEODQ5RTQxMUE0QzNB - MjdEOTJBQzc3QkMiIHN0UmVmOmRvY3VtZW50SUQ9InhtcC5kaWQ6NjNBMzk0RjgyODQ5RTQxMTk0MERB - Nzg4NkRDOTk3Q0YiLz4gPC9yZGY6RGVzY3JpcHRpb24+IDwvcmRmOlJERj4gPC94OnhtcG1ldGE+IDw/ - eHBhY2tldCBlbmQ9InIiPz5e5MstAAADiUlEQVRIS+2UW0yTdxjGcePwtYyVVpAUCi1tv9ImrVbxhAei - kjGphAgFT4jzEJ0gGuJhDk0sml0sglmWmC1hqHNKWwI4srgNh3phpjg1O1yIN5DMbFHQZUu42O76+D4f - 3Fl6Z7ILn+SXvH3f533++X/98iUBeKW81v9Uwx1G1+1240EhfKfdeE/4U3qTAqaZZO/2aeN9IXLrY+Ph - wVOZHll9YyohgYZOGS4JsYdXVDy+NQ8Tvy3BP6OlmPyjDP9OBDRYs8cZPfRy5/uQISIRqcIsLSye+j7I - wN+PluOvhyWY+NmL8fsOjP9kxdN7BRh/YJHfFjy5m48nd4ThQjy968bEgwV49usicFciTEKKFhZPXXv1 - eHxtLsYGPBjttwsWjF0xY+ybOfj9uylYs8cZPfQS7kpEnqDTwuLp9GYlfKZeifUfzcb1j/Iw/IkNv3Q6 - MfKVC6O9bg3W7HFGD73cORlMG5AIizDzAaVtunD5ESXWfNSEY/tNCO00oG1zOkJBBSeqUjVYh6R3Qmat - zSY0Hjah7IASW7hPuSoRvIGihcVTSauCppvFODRUjJZvPWgaKMTuXgt2RHOxLTwHDd3EjPfCudgesWJX - jxM7eryo7/Ni8SGFj8gp6LWwePLvS0Og043A5y5UdtkQOJeLivM5ePf8bJSfM04zG2u7chDoysW6Thsq - zqpY0+GAvymNB/gEgxYWT64tKdGihpSYv8WEpSEzVp0pwDuf2SVQReCiS4M1e5zRQy937NXJ1yRirjDz - AVmVJyNZa9+PObauh7ptKdR6FY6N2SisTYe1OlmDNXtqvRNqwxLYt1TCVLY1ZijZOSQRbuEtLSyeTOXH - sfLDH1EauoFFx6/Cd6Qf7pYI1ObLsO+9iMLdF+DccwEuqd2Nl+Br6sbCxiiKd/XBuPogH1HiAzJXHMC8 - YA98td1wb4rCuaEH1roo8oMR5JGaMPIFa10Ejtowiuouw1vzJTwVXyBz+X4ekPgRZfgbohkLtsfMy47B - tqYdakUnPFUM6YUv+LUGa/Y4o8e8rBXcSffWDkpE4j9ZpEvNmb9KsZV16BzrBnVq1YjeVf1MX1Tzn74o - iCmkdq1/LrNHOkfgB6Vg9afJRrVOdv2ClRkMmklvCnyPs4V8ge81v5RegddnCGHNHmf00JslcJcZCcWv - IU1pAhcyhLcFXj1zGtbscUYPvdyZ+Uv6Wi8rKekFBjoX2627by8AAAAASUVORK5CYII= - - - - - iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAZdEVYdFNvZnR3YXJlAEFkb2JlIEltYWdlUmVhZHlxyWU8AAADZmlUWHRYTUw6Y29tLmFkb2Jl - LnhtcAAAAAAAPD94cGFja2V0IGJlZ2luPSLvu78iIGlkPSJXNU0wTXBDZWhpSHpyZVN6TlRjemtjOWQi - Pz4gPHg6eG1wbWV0YSB4bWxuczp4PSJhZG9iZTpuczptZXRhLyIgeDp4bXB0az0iQWRvYmUgWE1QIENv - cmUgNS4zLWMwMTEgNjYuMTQ1NjYxLCAyMDEyLzAyLzA2LTE0OjU2OjI3ICAgICAgICAiPiA8cmRmOlJE - RiB4bWxuczpyZGY9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkvMDIvMjItcmRmLXN5bnRheC1ucyMiPiA8 - cmRmOkRlc2NyaXB0aW9uIHJkZjphYm91dD0iIiB4bWxuczp4bXBNTT0iaHR0cDovL25zLmFkb2JlLmNv - bS94YXAvMS4wL21tLyIgeG1sbnM6c3RSZWY9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlw - ZS9SZXNvdXJjZVJlZiMiIHhtbG5zOnhtcD0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wLyIgeG1w - TU06T3JpZ2luYWxEb2N1bWVudElEPSJ4bXAuZGlkOjYzQTM5NEY4Mjg0OUU0MTE5NDBEQTc4ODZEQzk5 - N0NGIiB4bXBNTTpEb2N1bWVudElEPSJ4bXAuZGlkOkE2Q0VGMDE2NDlEQTExRTQ4NTlCQTI3NTMyOEY5 - NEU2IiB4bXBNTTpJbnN0YW5jZUlEPSJ4bXAuaWlkOkE2Q0VGMDE1NDlEQTExRTQ4NTlCQTI3NTMyOEY5 - NEU2IiB4bXA6Q3JlYXRvclRvb2w9IkFkb2JlIFBob3Rvc2hvcCBDUzYgKFdpbmRvd3MpIj4gPHhtcE1N - OkRlcml2ZWRGcm9tIHN0UmVmOmluc3RhbmNlSUQ9InhtcC5paWQ6NjA1MjM3NzFEOTQ5RTQxMUE0QzNB - MjdEOTJBQzc3QkMiIHN0UmVmOmRvY3VtZW50SUQ9InhtcC5kaWQ6NjNBMzk0RjgyODQ5RTQxMTk0MERB - Nzg4NkRDOTk3Q0YiLz4gPC9yZGY6RGVzY3JpcHRpb24+IDwvcmRmOlJERj4gPC94OnhtcG1ldGE+IDw/ - eHBhY2tldCBlbmQ9InIiPz6UH16BAAABrElEQVRIS63N70tTURzH8fsnKSGCCEIQCBKISMq2iILCgQOL - JUxQAoVKdMGQuwgWFepsMGjFZCMuorsIJV4WFatpvzdr1ZAFsaIHn8559v1eDsI91wevJ/ee7/tjbMRH - fAFwJOWRF6oopTzyQhWlVEdBwRbgUhICAnuvilKGtXDGzW6WV/CvbjE/xTfxr+R6q4xSxtP5YTf8rVn4 - s5dG+809Rv5zvVVGKaNwfYgyBfhksoH83CCF9seiL7LBBnLXTlP4/W4dza0ZLS0nCdlgA9npAQq/qk/Q - sKa0NJ8nIBtsIBPrp9CqPMJBYVLLj+04ZIMNrF49ReHwVRafH1/R8m3zJmSDDdy/fJJC88Ua3mcjWurW - LGSDDaQifRS+O8uopsNaPhVnIBts4E64l0Jj5y4qDy5q+ZCPQTbYgHmph8LXZ0m8TJ3Xsp+LQjbYQOJC - N4XadgLl22e1vM1OQDbYwK1zXRS+lBbhmEHsLgU8kTeVh+OQDTawEDpB2U4mitfpMS22GYJssIH5QCcV - FGwBmuRtkA3cGO3whcZUlEdeqKKU8sgLVZRSfjw+MP4DJ2GPpDR9OIsAAAAASUVORK5CYII= - - - - - iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAZdEVYdFNvZnR3YXJlAEFkb2JlIEltYWdlUmVhZHlxyWU8AAADZmlUWHRYTUw6Y29tLmFkb2Jl - LnhtcAAAAAAAPD94cGFja2V0IGJlZ2luPSLvu78iIGlkPSJXNU0wTXBDZWhpSHpyZVN6TlRjemtjOWQi - Pz4gPHg6eG1wbWV0YSB4bWxuczp4PSJhZG9iZTpuczptZXRhLyIgeDp4bXB0az0iQWRvYmUgWE1QIENv - cmUgNS4zLWMwMTEgNjYuMTQ1NjYxLCAyMDEyLzAyLzA2LTE0OjU2OjI3ICAgICAgICAiPiA8cmRmOlJE - RiB4bWxuczpyZGY9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkvMDIvMjItcmRmLXN5bnRheC1ucyMiPiA8 - cmRmOkRlc2NyaXB0aW9uIHJkZjphYm91dD0iIiB4bWxuczp4bXBNTT0iaHR0cDovL25zLmFkb2JlLmNv - bS94YXAvMS4wL21tLyIgeG1sbnM6c3RSZWY9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlw - ZS9SZXNvdXJjZVJlZiMiIHhtbG5zOnhtcD0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wLyIgeG1w - TU06T3JpZ2luYWxEb2N1bWVudElEPSJ4bXAuZGlkOjYzQTM5NEY4Mjg0OUU0MTE5NDBEQTc4ODZEQzk5 - N0NGIiB4bXBNTTpEb2N1bWVudElEPSJ4bXAuZGlkOjJGRTU5OEQ1NDlEQjExRTRBRUVDOTkyMjQ5NzEw - REUwIiB4bXBNTTpJbnN0YW5jZUlEPSJ4bXAuaWlkOjJGRTU5OEQ0NDlEQjExRTRBRUVDOTkyMjQ5NzEw - REUwIiB4bXA6Q3JlYXRvclRvb2w9IkFkb2JlIFBob3Rvc2hvcCBDUzYgKFdpbmRvd3MpIj4gPHhtcE1N - OkRlcml2ZWRGcm9tIHN0UmVmOmluc3RhbmNlSUQ9InhtcC5paWQ6MTY0MkI1RjlEQTQ5RTQxMUE0QzNB - MjdEOTJBQzc3QkMiIHN0UmVmOmRvY3VtZW50SUQ9InhtcC5kaWQ6NjNBMzk0RjgyODQ5RTQxMTk0MERB - Nzg4NkRDOTk3Q0YiLz4gPC9yZGY6RGVzY3JpcHRpb24+IDwvcmRmOlJERj4gPC94OnhtcG1ldGE+IDw/ - eHBhY2tldCBlbmQ9InIiPz6B5sF9AAACe0lEQVRIS7WVb2jMcRzHL7UHanF/Mts5prE/1li3kAfu5Ak7 - 5IHNobBkSC2UIuGJkrrSWRvTmHQWK8U1T8jqUtYwkZpaGjV/Js6to5YwfXze39+fu/v23f36hXe9us+f - 7/v9rd/dr3MQ0X/F4Zm3+K9QhWajNNlBFZqN0mQHS6lMdrCUyqSgimllUsy4XmOmp+QRDllQWbygjjq6 - uimZStOX8a+ixox3pXrM1JLCDAqYJmY7c669M0bff07mcLbtEl9QE8k6V6BH5ooXMsHZZX7ae+AY7W45 - SrPm19LbsSR9m/iRA2bYGefggVePzUgKBzeu9sQpmZ4QcG/WMtk7eLjv0WMz0kOz+TX6MUXvP6cFeNbD - bz6YvQFm2Bk9PPByZO6jksLB5KvRTzTyLikIrG2ktsvXzd4g2hGjYP1ms4eHvb850qkl65LCQW/ntVs0 - 9HpMcPx0K1X4V1Ff/3NzhnphbVDsjBk8Lm/VE44s0ZJ1KS4Ie8uXUvPBE7Tn0ElCzTMqrV5BO/cfEaDG - TD5X6PFFONLygsTF7jj1vxihyPkYNTS1iFrFxm37KHIhJmp43L7qZxzp0pJ1SeHhQGgLJQaH6fb9R1QX - 2EB3Ek9FryLe95j8K9eLT/TB0FZcskOP1iRdkIh23aR7Ay9pzaZddKY9Jup8nIpeoXXhZlHD655b85Bj - p2npLOmCML+dD/iTZhaX3+UvbRB1PpzeygFnSUUvatecRUMzisoOc+x0LZ3FixxYhQyK1cxyZhkTYhqY - RgnM6hmcwVl4ljDI0KS4AC+Kmyli8Jv2MF7GNwXY4QzOwgNv5mWTL7CLpVQmO1hKZbKDpVR/1P8OcvwB - lh7gOXXZq9sAAAAASUVORK5CYII= - - - + iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 YQUAAAAZdEVYdFNvZnR3YXJlAEFkb2JlIEltYWdlUmVhZHlxyWU8AAADZmlUWHRYTUw6Y29tLmFkb2Jl @@ -750,26 +750,244 @@ bS94YXAvMS4wL21tLyIgeG1sbnM6c3RSZWY9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlw ZS9SZXNvdXJjZVJlZiMiIHhtbG5zOnhtcD0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wLyIgeG1w TU06T3JpZ2luYWxEb2N1bWVudElEPSJ4bXAuZGlkOjJGQzkyMzc0Rjk0OUU0MTE5NjNCQjRENDMzQjlC - MUM4IiB4bXBNTTpEb2N1bWVudElEPSJ4bXAuZGlkOjJERjY3MEZENEQyMzExRTRCNDlGQUMwMzk0OTAw - Qzc4IiB4bXBNTTpJbnN0YW5jZUlEPSJ4bXAuaWlkOjJERjY3MEZDNEQyMzExRTRCNDlGQUMwMzk0OTAw - Qzc4IiB4bXA6Q3JlYXRvclRvb2w9IkFkb2JlIFBob3Rvc2hvcCBDUzYgKFdpbmRvd3MpIj4gPHhtcE1N - OkRlcml2ZWRGcm9tIHN0UmVmOmluc3RhbmNlSUQ9InhtcC5paWQ6NjhGOUEyRDEyMTRERTQxMUIzNkJE + MUM4IiB4bXBNTTpEb2N1bWVudElEPSJ4bXAuZGlkOjlDMzFEOUI4NEFBRjExRTQ4OTA5OUYwQ0QzM0Q2 + NEI4IiB4bXBNTTpJbnN0YW5jZUlEPSJ4bXAuaWlkOjlDMzFEOUI3NEFBRjExRTQ4OTA5OUYwQ0QzM0Q2 + NEI4IiB4bXA6Q3JlYXRvclRvb2w9IkFkb2JlIFBob3Rvc2hvcCBDUzYgKFdpbmRvd3MpIj4gPHhtcE1N + OkRlcml2ZWRGcm9tIHN0UmVmOmluc3RhbmNlSUQ9InhtcC5paWQ6MDk5Mzk2NTZBRjRBRTQxMTk3NEFD + QUFFQjRCMzVENkUiIHN0UmVmOmRvY3VtZW50SUQ9InhtcC5kaWQ6MkZDOTIzNzRGOTQ5RTQxMTk2M0JC + NEQ0MzNCOUIxQzgiLz4gPC9yZGY6RGVzY3JpcHRpb24+IDwvcmRmOlJERj4gPC94OnhtcG1ldGE+IDw/ + eHBhY2tldCBlbmQ9InIiPz73sIMwAAADIElEQVRIS7WVa0iTYRTH56Uiysvm3TkvpLl5DRIvQYWVWl+6 + iNEVg0yhQqloQZHkLT+Y0YdAs75IpEUhzERZoZhsRpZlS7soblotsRwoxhqWeTrnYZtv+u7NsB74cZ5z + zv89/z17HzYRAPxXeIv/EpFXcOyi4BvKhfehv4FvKBfeh+ayqIUDlIgBgT8whpRYoT2fhgvNVJKBQT9s + hB8/QZDPpnEIjEhg0J5Pw4Vm0mwygG9T06BSqQQhTUhUMoRGpyxYT7OZwfhXC6jVakFIYzNYqN5uMGKa + BI1GIwhpghXJaJJi13d0dEB2bj74hsWzSDlXbzfQG02g0+kEIU2wIomdovzKdVifngnFFytBeb4cLN+n + WaSc6hfKKqB/eHTWoHfwExgMBkFII5MnQUD4WlAWloO26wVs35MDmifPmQFFyqlO/aKKqlmDp31DYDKZ + BCGNTJ4IPqHx8LJvACbNUw7p6e2HuJQMNIhhBuaHj3vBYrEI0tb1BoIiE9kJ9h7Oh7EJM+g/jEJuwVlY + s24ri5RTnfo5BedAIoueIYPumvomuHzjzm9cq2uCq7UNUH2rEarr7kNd0yP26Y+eKoSWtk4wfpmAg7kn + ITY5DUorq1g8cOQEqze3aplOEhRtJoMcL1mMTixV9IgD5a/tSBVDYql8AKOBQLEJtTP08gY/jjFiktKg + 5FIV21Ok3NazvmR2AvrFkCAJyGYk1comZAuHDM/AyLvHThfBveZ26NOPwI59eey7LsbhFCmnOvVJ5+Ef + rrYZLEU8EZ85+HLwW7ZCLMVTFWdkHoLut+/hgbYHaE9XN31XNsupTrWV3jKVs+uS3cyAD0cLe331jW3Q + qRt0CPUlQVHDKI+fN9iGo4W90uNnyuA2vvRtWTlQgxeg/dk7FimnOvU9/CNqUe47b7ANRwt7AfjpKvAK + Gt18Qur35ymhRfsKKLr5hN7EyzDq7humWrrcfSfKxbz/QlwcLDck1snZJdUzYHUDmk57+K1qdXJyzsL6 + RmQD9ZmObygXB8sVIRO6fXQB4hC6eRQppzr1XXmHclnAckFomLc1Um5dItEvhZ97MQXP9N0AAAAASUVO + RK5CYII= + + + + + iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 + YQUAAAAZdEVYdFNvZnR3YXJlAEFkb2JlIEltYWdlUmVhZHlxyWU8AAADZmlUWHRYTUw6Y29tLmFkb2Jl + LnhtcAAAAAAAPD94cGFja2V0IGJlZ2luPSLvu78iIGlkPSJXNU0wTXBDZWhpSHpyZVN6TlRjemtjOWQi + Pz4gPHg6eG1wbWV0YSB4bWxuczp4PSJhZG9iZTpuczptZXRhLyIgeDp4bXB0az0iQWRvYmUgWE1QIENv + cmUgNS4zLWMwMTEgNjYuMTQ1NjYxLCAyMDEyLzAyLzA2LTE0OjU2OjI3ICAgICAgICAiPiA8cmRmOlJE + RiB4bWxuczpyZGY9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkvMDIvMjItcmRmLXN5bnRheC1ucyMiPiA8 + cmRmOkRlc2NyaXB0aW9uIHJkZjphYm91dD0iIiB4bWxuczp4bXBNTT0iaHR0cDovL25zLmFkb2JlLmNv + bS94YXAvMS4wL21tLyIgeG1sbnM6c3RSZWY9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlw + ZS9SZXNvdXJjZVJlZiMiIHhtbG5zOnhtcD0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wLyIgeG1w + TU06T3JpZ2luYWxEb2N1bWVudElEPSJ4bXAuZGlkOjJGQzkyMzc0Rjk0OUU0MTE5NjNCQjRENDMzQjlC + MUM4IiB4bXBNTTpEb2N1bWVudElEPSJ4bXAuZGlkOjhDMTdBQjRENEFBRTExRTQ4QjQyODY0MDNBNTJE + NzNCIiB4bXBNTTpJbnN0YW5jZUlEPSJ4bXAuaWlkOjhDMTdBQjRDNEFBRTExRTQ4QjQyODY0MDNBNTJE + NzNCIiB4bXA6Q3JlYXRvclRvb2w9IkFkb2JlIFBob3Rvc2hvcCBDUzYgKFdpbmRvd3MpIj4gPHhtcE1N + OkRlcml2ZWRGcm9tIHN0UmVmOmluc3RhbmNlSUQ9InhtcC5paWQ6NUQyMjc4QTlBQjRBRTQxMTk3NEFD + QUFFQjRCMzVENkUiIHN0UmVmOmRvY3VtZW50SUQ9InhtcC5kaWQ6MkZDOTIzNzRGOTQ5RTQxMTk2M0JC + NEQ0MzNCOUIxQzgiLz4gPC9yZGY6RGVzY3JpcHRpb24+IDwvcmRmOlJERj4gPC94OnhtcG1ldGE+IDw/ + eHBhY2tldCBlbmQ9InIiPz4eHsDfAAAB00lEQVRIS7XVWytEURQH8HniTTNHLs0NCXNcXjTN5dH9g/gM + 3jx590QhFDJS0gyTGmpqaqJIMW4hzlAoOaWISS7LWifntI3ddnTGrl92e/57/We/DBsA/CvuYSHZSr0t + lvCGsriX/oI3lMW9lM/SwgF9SEHwizs08IX2vAyLZvZRgXJ+cQWv7yB0q96Ds86voT0vw6KZNJsK4Pnl + DWKxmBBlqhpDUN0UNp2n2VrB/WMOEomEEGX0ArN5o+BGfYB0Oi1EGa8cwpKw6bxRcH6lQiaTEaKMVw5q + rzCbNwr2z65BURQhynh8Qe0VZvNGwdZBFlRVFaKMxxfQXmE2rxc8rW3sQy6XE0puHoG7IaC9YnV9j5th + pbZPqOCDCrbH5uIwOD7/zWgkDkNTizAyuwQjkWWIxFNQWduqmVxI/MiPz6/A8HTUuDMTTYLkbrqhgt5S + T3PG4ZJ3HE7focElZx0u3yn+VQiG1ZLymmm7s74f88f42S6bl9zyJZ6d6Xckd+Mt5ieogH4xJORHHajt + SzvqZPSgECpHZSiA2DztuxBlad+NgnpBEbIjusiiYboKRF+kGFHegUR5ImkFv7G0eAPzWVq8gfksLd5/ + oULiHhYS97BwwPYJlSCUgVubViQAAAAASUVORK5CYII= + + + + + iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 + YQUAAAAZdEVYdFNvZnR3YXJlAEFkb2JlIEltYWdlUmVhZHlxyWU8AAADZmlUWHRYTUw6Y29tLmFkb2Jl + LnhtcAAAAAAAPD94cGFja2V0IGJlZ2luPSLvu78iIGlkPSJXNU0wTXBDZWhpSHpyZVN6TlRjemtjOWQi + Pz4gPHg6eG1wbWV0YSB4bWxuczp4PSJhZG9iZTpuczptZXRhLyIgeDp4bXB0az0iQWRvYmUgWE1QIENv + cmUgNS4zLWMwMTEgNjYuMTQ1NjYxLCAyMDEyLzAyLzA2LTE0OjU2OjI3ICAgICAgICAiPiA8cmRmOlJE + RiB4bWxuczpyZGY9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkvMDIvMjItcmRmLXN5bnRheC1ucyMiPiA8 + cmRmOkRlc2NyaXB0aW9uIHJkZjphYm91dD0iIiB4bWxuczp4bXBNTT0iaHR0cDovL25zLmFkb2JlLmNv + bS94YXAvMS4wL21tLyIgeG1sbnM6c3RSZWY9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlw + ZS9SZXNvdXJjZVJlZiMiIHhtbG5zOnhtcD0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wLyIgeG1w + TU06T3JpZ2luYWxEb2N1bWVudElEPSJ4bXAuZGlkOjJGQzkyMzc0Rjk0OUU0MTE5NjNCQjRENDMzQjlC + MUM4IiB4bXBNTTpEb2N1bWVudElEPSJ4bXAuZGlkOjJEMDQyOEZBNEFEMjExRTRBN0MxRDBCNzJGRUND + MDEzIiB4bXBNTTpJbnN0YW5jZUlEPSJ4bXAuaWlkOjJEMDQyOEY5NEFEMjExRTRBN0MxRDBCNzJGRUND + MDEzIiB4bXA6Q3JlYXRvclRvb2w9IkFkb2JlIFBob3Rvc2hvcCBDUzYgKFdpbmRvd3MpIj4gPHhtcE1N + OkRlcml2ZWRGcm9tIHN0UmVmOmluc3RhbmNlSUQ9InhtcC5paWQ6QkRDRkI1RDVEMTRBRTQxMTk3NEFD + QUFFQjRCMzVENkUiIHN0UmVmOmRvY3VtZW50SUQ9InhtcC5kaWQ6MkZDOTIzNzRGOTQ5RTQxMTk2M0JC + NEQ0MzNCOUIxQzgiLz4gPC9yZGY6RGVzY3JpcHRpb24+IDwvcmRmOlJERj4gPC94OnhtcG1ldGE+IDw/ + eHBhY2tldCBlbmQ9InIiPz59jfe3AAAEbUlEQVRIS8WTeUybZRzHF48/pnFOuQRajkFLgQFb5iRLNJr4 + l/EPgsniUI4xZDAY1zyxwApsMJyIME61rByl3DfoYGBrgbWUY06FcZSCha4rQ8jYxkqPr2/fvkv8o2Sg + S/wkT970eb6/T5/39z7Prv8dt/Oql4mR4HZJ3ccoXFxhVCzB9DT9JueJdSq6c1wzVZFupepVzxu34XVj + CaEDi1jX6hF8ZQoeokl4iBVwzV9YdU1XRlIl28eVo8phCdXwGltEeOUsro6psaHVwcSDh5volc4iOO8X + 7KuVwb1hEi7J8myq9PEQO//I85oafr0KtEpUpNSETm+AwWDAvfv3YTQaybnm/t/AyO6Ga+UonJOnIijF + 1hA9tWI2qle9RxcI+RIpmZpTIfBULhIyyqHVahHPKcN70TmYnFFCp9OhqXcc9KwW0DOHVl3YU1aUyjJu + F1SpfhO3EM6bMMsVt+D8Zhz2HIpC4oU6bG5uIu4cD3tfTwAjIBNypQYbGxsISquBU34PaDHiVEplGXee + SuIjVaBv3Lz7gJg8vHg4FlZvc+ATVoLipiHsD8qCXWAO7IPK8MG5FjLXKboOeoYADkldUkplGWb7vOb4 + 4BzxIXXQE/1m59WDXdgBvxPfwz6UC4eQUth/WIBDZ2qQXj+K7IYRImeE5s5fOFrcDPvPapcJzVNmmwVY + VxWG9U09uau1tTVymPpc0iYFLew7OEUJ4BwtALfvJpl5xMrKCu6s3cUrn5YbCM1us80CrJZZVWjXr7j3 + 4CE0y8v4IrcaH+cK4Bv+DRyPl8ApphYuia3wZ3eCUzOA1PIfcVuzjHnlIgK/vgy7mHzTG+w12yzA5E53 + edYPo1c2i/X1dQTEfwvbwDQ4hhXg8OcN4P48Df+UTrgkNIAeW4Hg3Hbo9Xq0iGSgs4ls5CUhoXnObLOA + S8pkhG/bdZzgDZJnffT3GXieLAA9XgB2/RjZjuQqMWhxfBw824H55XWyhcfy+HDNqoB1SH4Codn6G7iw + p3d78EaVPlXX0CaZgkqlgly1gpCiK0htHCH/IL6oFcEF3ZjT3CUvXqv0DzDSS0FPq1a/8EbYS5Rqa+if + SAJ8KoeNR7gitEsnoVQqSbGOkJmYX1ggxaY70SabwIGMUrjn8I3WIXnBRPnWu/8nDnE9Sd7cAaP/ZSES + 6/rRKJRArpiHXC7HzekZNIukiCyrhW9mGZgXa4w2kUVnibJnzdXbxP5URzyDO4QjxGl5i9uNpMZeKP5U + IrywAq9yCnGAOGGMonbYxpVnEPGdyR9BO/MTj8kfgXeNFPt5IngVtoF1kQ9WcTs8qgfgmNreQMS21xZL + 0E6Ln6ef75tg8sfgXT8O77oReAkkYNXJ4PRV/4ztyfo9VPTf4xjdf9CpQKzdxxuGe6UMbhXEmc8V6mze + r3qNivx3HGN7UmglQ6CVDMIxXwybo5UcaunJQD8te9rhyx4JrWwItlGNUut3y5+hlp4cDhFCpl14k9jq + nR+Y1NTjIe7NlmMnWKoHsOtvjWYcKpheqFQAAAAASUVORK5CYII= + + + + + iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 + YQUAAAAZdEVYdFNvZnR3YXJlAEFkb2JlIEltYWdlUmVhZHlxyWU8AAADZmlUWHRYTUw6Y29tLmFkb2Jl + LnhtcAAAAAAAPD94cGFja2V0IGJlZ2luPSLvu78iIGlkPSJXNU0wTXBDZWhpSHpyZVN6TlRjemtjOWQi + Pz4gPHg6eG1wbWV0YSB4bWxuczp4PSJhZG9iZTpuczptZXRhLyIgeDp4bXB0az0iQWRvYmUgWE1QIENv + cmUgNS4zLWMwMTEgNjYuMTQ1NjYxLCAyMDEyLzAyLzA2LTE0OjU2OjI3ICAgICAgICAiPiA8cmRmOlJE + RiB4bWxuczpyZGY9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkvMDIvMjItcmRmLXN5bnRheC1ucyMiPiA8 + cmRmOkRlc2NyaXB0aW9uIHJkZjphYm91dD0iIiB4bWxuczp4bXBNTT0iaHR0cDovL25zLmFkb2JlLmNv + bS94YXAvMS4wL21tLyIgeG1sbnM6c3RSZWY9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlw + ZS9SZXNvdXJjZVJlZiMiIHhtbG5zOnhtcD0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wLyIgeG1w + TU06T3JpZ2luYWxEb2N1bWVudElEPSJ4bXAuZGlkOjJGQzkyMzc0Rjk0OUU0MTE5NjNCQjRENDMzQjlC + MUM4IiB4bXBNTTpEb2N1bWVudElEPSJ4bXAuZGlkOjJERTg4QTFENEQyMjExRTRBODEyODk0M0RBMTc5 + Qjg3IiB4bXBNTTpJbnN0YW5jZUlEPSJ4bXAuaWlkOjJERTg4QTFDNEQyMjExRTRBODEyODk0M0RBMTc5 + Qjg3IiB4bXA6Q3JlYXRvclRvb2w9IkFkb2JlIFBob3Rvc2hvcCBDUzYgKFdpbmRvd3MpIj4gPHhtcE1N + OkRlcml2ZWRGcm9tIHN0UmVmOmluc3RhbmNlSUQ9InhtcC5paWQ6NjJGOUEyRDEyMTRERTQxMUIzNkJE NUVDQjU5MzE1NjIiIHN0UmVmOmRvY3VtZW50SUQ9InhtcC5kaWQ6MkZDOTIzNzRGOTQ5RTQxMTk2M0JC NEQ0MzNCOUIxQzgiLz4gPC9yZGY6RGVzY3JpcHRpb24+IDwvcmRmOlJERj4gPC94OnhtcG1ldGE+IDw/ - eHBhY2tldCBlbmQ9InIiPz6GKmpFAAAC+UlEQVRIS63T20vTYRzH8Yforj/Ei24UiSgKIygKi8oyxZQo - cvNYeXaesmzqPGu2POd0ulSsnIdaurTSTJ3O6UxTPGya5vCQx5AuPn39RbHop7nZxQt+z3ie93e/Z4w1 - p7nsCoBt8R6yBF/UHPv+Wb0rfFFzm99CRIwEW1gnqXzxTXxRc0ydctm4OlID2sxrw6iCtiwItC+A2P/D - frLnjwGNSZdMq6N1WOvLwFpP4l/WdRlY6Jaio9Ab7QXba8sVoDHZGdT8PYS9THDqMGnLsKpNw0qXGCua - BO55VZdNQ6U/DRRibVCGb+N1pH5bukoRqHmDHOIG1N8/X2F4I8WyNhtf2+9hqSsZxqZ4upbb6HsSZLHO - Im90ym6hNVcIaktYTexZyUelGEvaHMy/jcFiZxo0xX5Y7ivGcn8JkVmA9uvlWBmqwpJeAWovs+poR99O - eRgWtQWYVUdgrj0FH+i+F3XF3NoappZYGJrEoLaOVYpOOTY/FGJB+xjTqnDMtMTTAC/Ma/Ix/TLUKl9e - x0JfFQpql7PykBP7lWIXzPeUYLIhHCPKCLr/AMy2ZsKoDLTKdNNdvM8TgNpRTBZwfJ885CTmaIChPhwa - mS+GnkdhqjEWY9X+VplqvIMXEhdQ24mZeuSs0N/BNNWWj4k6EdSZHhhXxWH0aSCGFd4c4Tk7zk7XBlUM - FKLToK4Nm+0qYnneRzqGGiSYaIiiyZdhVCdgqFSIwRJPjucZW85O1pvnRmvDkO9zFNTdy2Y6HjGp4HCF - 5kk4xhoiURd/EROv4tBfeM0qAyUC9Mp9QM0+7o829T6LZV0/mNycS6+nFKFWfAGj9ZHozfGwil7miZYH - 7qCmghsw+S6VpV894KuUuKFbfhNNqa749CwY3dm0toK+VABl3HlQM5obYHybwFLc7W1y/Y5BlX6FfgNn - DNcEY0DhZZX+MiGKbh0DNR24AYYWMSfJzc6GZBApwS5skIzNODcg0dV2V36FtsJ7yBJ8UXO8hyzBFzXH - ++H/A/YDv9/V87iOlrYAAAAASUVORK5CYII= + eHBhY2tldCBlbmQ9InIiPz6wJF34AAACl0lEQVRIS62Vy08TURSH73/QhQtXVnBhxEcMiUkhbEg0hB1R + Q1i68C8wIW5cEqMLN7ho2Ji4YiEhWq0prYUhfULbadN3obTaChobtZEUsFY9nnPS6WM6HYowyZf87j33 + nG/amaai9geOBYA+4pTxihmBE8DcTQB4J8em/9IwSQyagmrtL+z9rMFmvnhkKvtV7tcVHPz6DVsftulA + AckdhUg8zf19eoLKAd597iMLMItewfOxUDTN/bqCH3tVSG8VWIBZ9AoJApEk9+sKvu/uQ2IjzwJkGtH8 + OrTwy3Hu77vIAnV9mgWlcgWiqRwLjAMmkOMbPbNTKnN/JJntqJGEBZ++7oKcyLLgLN4JrU8Cms2C4pcy + BKKZumCI18temQ/8DzSLZlBmQX7nG/jCKdpgAa0driCtY5iFHuqHSjNoFtaags1iCdzBBG+QgNY2aZ0F + mIUe6osENAtrTUEq/7kDq9PHAszU5yYoq9f1i9cUSCD5ozxDEeTsrhAoONwyxLLb8MrhYQFmZYCHsnpd + v3hNgQROb5hnKIK29944MAThTBEWbS4WYBZ6qC/sKSy5ZJ6BGUQg8b4Bbhjod4AZXlhXWdBa10LrIVul + AM9ggS+aa6AIMMO8ZYUO0KeyIOMtZyaQpXpNi4LFucYzMINwhbMNcMNw5oIJMMNKIA0LNg88mZuH/ssj + dPgBMnN+cBRmny1wrRtSMMMzWCCFMg0UAeY2Fh0+GL5xG8Zu3oHXUrCj3g0WONdTbeBm21/o1N17gPtg + 98Xh3VoS3qzKMDI22agfglnY/Uld8NDc/ZlZwAwvl4Ngun6LGh8rdfVDViNs3rguOOzq6XOD8PDpc7g2 + OkHDH7XWtYa2It66Y4eCQ8cRfpvUNa2hTUD8A6JMaBvCyTdJAAAAAElFTkSuQmCC + + + + + iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 + YQUAAAAZdEVYdFNvZnR3YXJlAEFkb2JlIEltYWdlUmVhZHlxyWU8AAADZmlUWHRYTUw6Y29tLmFkb2Jl + LnhtcAAAAAAAPD94cGFja2V0IGJlZ2luPSLvu78iIGlkPSJXNU0wTXBDZWhpSHpyZVN6TlRjemtjOWQi + Pz4gPHg6eG1wbWV0YSB4bWxuczp4PSJhZG9iZTpuczptZXRhLyIgeDp4bXB0az0iQWRvYmUgWE1QIENv + cmUgNS4zLWMwMTEgNjYuMTQ1NjYxLCAyMDEyLzAyLzA2LTE0OjU2OjI3ICAgICAgICAiPiA8cmRmOlJE + RiB4bWxuczpyZGY9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkvMDIvMjItcmRmLXN5bnRheC1ucyMiPiA8 + cmRmOkRlc2NyaXB0aW9uIHJkZjphYm91dD0iIiB4bWxuczp4bXBNTT0iaHR0cDovL25zLmFkb2JlLmNv + bS94YXAvMS4wL21tLyIgeG1sbnM6c3RSZWY9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlw + ZS9SZXNvdXJjZVJlZiMiIHhtbG5zOnhtcD0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wLyIgeG1w + TU06T3JpZ2luYWxEb2N1bWVudElEPSJ4bXAuZGlkOjJGQzkyMzc0Rjk0OUU0MTE5NjNCQjRENDMzQjlC + MUM4IiB4bXBNTTpEb2N1bWVudElEPSJ4bXAuZGlkOkUzNzJDMjE3NEFENjExRTRCNjE0OEVEQzI4MEM0 + RTZDIiB4bXBNTTpJbnN0YW5jZUlEPSJ4bXAuaWlkOkUzNzJDMjE2NEFENjExRTRCNjE0OEVEQzI4MEM0 + RTZDIiB4bXA6Q3JlYXRvclRvb2w9IkFkb2JlIFBob3Rvc2hvcCBDUzYgKFdpbmRvd3MpIj4gPHhtcE1N + OkRlcml2ZWRGcm9tIHN0UmVmOmluc3RhbmNlSUQ9InhtcC5paWQ6RkI3NUQ0QkNENDRBRTQxMTk3NEFD + QUFFQjRCMzVENkUiIHN0UmVmOmRvY3VtZW50SUQ9InhtcC5kaWQ6MkZDOTIzNzRGOTQ5RTQxMTk2M0JC + NEQ0MzNCOUIxQzgiLz4gPC9yZGY6RGVzY3JpcHRpb24+IDwvcmRmOlJERj4gPC94OnhtcG1ldGE+IDw/ + eHBhY2tldCBlbmQ9InIiPz6PyaLfAAADMElEQVRIS6VUXUiTYRT+vi3Tzd+ps23+3KRigtiPkolEQReG + UYTkhWatpWlWGkRdddfdSPImqUAJjSIT00oxLJIk0cR+tFSyzDJtgaMkDEPkdM7ZPvm2vS6jBx6es3Pe + 8zzvtm+TohLS/ov+AACStLgEQuJyLRJWYK1yzh/+FgCoQrpnfM4fOGBhcUlIMkEVkma4H4i1y2kFcMD8 + wqKQZILKZqTqmlTAWrfvMjhgbv63Dwm0hLWQohn1eNEbzrlfPiTQAtZCKjP1GXdAIC+r4XD+9CGBFrDm + RVJ1re6pZ0GyHHMvIawauYVNCFPfvvuQQAtYC6meKXU0amNsaGN/ZR60xIf9aIgN3cpGE9OzZCZ85nEm + pGiWlLABmuJCnUOXrNB7chdct4TUo32ANDbp4NuielDpqWfePdaPX6GrohSK4uLhlCEo96YlZLbOFHzH + oJXjMSBcGn4/zQGovEDqXXtzeTb+BTrKj0J3+Q54djYP7EZdTU2MPjFSK8eieQR9QtLg6GcOQPWgqKeQ + ZyOfoK30CDw+lg2Ot3Z4VLoNqo269mCNHIa2WjYn9A1PcAAqU6m9VV3TF9psOwwPS3JgZugCdNoyocwU + jU+RlImWBpezGz0vxzkA1YOiHvPFO7Ca1kGHLQtmXp2HdutmqN+/F6JiU+h3kOpyVeHJwBgHoLIpqajm + 189HoaG4CNqsGTA1UAWth9Lg6r490PygGyLjUikgzuWqQlffCAegelDdUwLqigqhpXgjTPYeh+bCFCg2 + RkEk3vxuVz/P0c43oLP3DQegLhspNalSFxiNcLswHT48LYNbBUlQk7ebzenmyhm08w1o7xmiAP6hRZiT + 70eYkzpctUuJWdHmwWs74+F1Uz7cyE+E4ohQB5mHm9a3GywpTXzektyKduIAIsKI3ISkL4rIdYle05C9 + VrZVBmvtl7eboUyv7V4jSQdwRn8FdI72iErtCUxnIuifkJ5hUqUOq9Jr7OeCNU6bTpNVqtMcDJSldOwn + KnOk+jypJ5QANRWc0cs5SEelXr54QidfwVYAMoiHq4W/gNM6OaNCJ+diaUIqN/43+Atwg27t+9ZXBUn6 + A2MdqQeVc5pWAAAAAElFTkSuQmCC + + + + + iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAIAAABvFaqvAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 + YQUAAAAZdEVYdFNvZnR3YXJlAEFkb2JlIEltYWdlUmVhZHlxyWU8AAADZmlUWHRYTUw6Y29tLmFkb2Jl + LnhtcAAAAAAAPD94cGFja2V0IGJlZ2luPSLvu78iIGlkPSJXNU0wTXBDZWhpSHpyZVN6TlRjemtjOWQi + Pz4gPHg6eG1wbWV0YSB4bWxuczp4PSJhZG9iZTpuczptZXRhLyIgeDp4bXB0az0iQWRvYmUgWE1QIENv + cmUgNS4zLWMwMTEgNjYuMTQ1NjYxLCAyMDEyLzAyLzA2LTE0OjU2OjI3ICAgICAgICAiPiA8cmRmOlJE + RiB4bWxuczpyZGY9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkvMDIvMjItcmRmLXN5bnRheC1ucyMiPiA8 + cmRmOkRlc2NyaXB0aW9uIHJkZjphYm91dD0iIiB4bWxuczp4bXBNTT0iaHR0cDovL25zLmFkb2JlLmNv + bS94YXAvMS4wL21tLyIgeG1sbnM6c3RSZWY9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlw + ZS9SZXNvdXJjZVJlZiMiIHhtbG5zOnhtcD0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wLyIgeG1w + TU06T3JpZ2luYWxEb2N1bWVudElEPSJ4bXAuZGlkOjJGQzkyMzc0Rjk0OUU0MTE5NjNCQjRENDMzQjlC + MUM4IiB4bXBNTTpEb2N1bWVudElEPSJ4bXAuZGlkOjUzQzNGNDI5NEQyQzExRTQ4QkE1QUNCMEVDRDZF + MDVEIiB4bXBNTTpJbnN0YW5jZUlEPSJ4bXAuaWlkOjUzQzNGNDI4NEQyQzExRTQ4QkE1QUNCMEVDRDZF + MDVEIiB4bXA6Q3JlYXRvclRvb2w9IkFkb2JlIFBob3Rvc2hvcCBDUzYgKFdpbmRvd3MpIj4gPHhtcE1N + OkRlcml2ZWRGcm9tIHN0UmVmOmluc3RhbmNlSUQ9InhtcC5paWQ6RkI1NUY4OTYyQTRERTQxMUIzNkJE + NUVDQjU5MzE1NjIiIHN0UmVmOmRvY3VtZW50SUQ9InhtcC5kaWQ6MkZDOTIzNzRGOTQ5RTQxMTk2M0JC + NEQ0MzNCOUIxQzgiLz4gPC9yZGY6RGVzY3JpcHRpb24+IDwvcmRmOlJERj4gPC94OnhtcG1ldGE+IDw/ + eHBhY2tldCBlbmQ9InIiPz6IsaOmAAADF0lEQVQ4T62U/UuTURTH+0nICqRI1ERMMyNQe8N0ChqBwQhN + yvwhEgJjVCqJ/qCibZo6tzQ339h6Nre5prapUzc1XzItX1ilzuWMLLVAen+xf6DTuTxjdxsFVj58ebjc + c+7nnud7z3228DbpIaDFH/CfoqCn72DIDvNfPDM2KAqyr8PcJxqY+QBTb8kkjocXQTsKigGwfqYJHqIg + 1OxHGHvlWPx4hXB1YyA3g4CBhqst+piEnrDA3rA95vBAY1x8d7lq/DVZwm5PQZNvoKYdypSgHgbVEIh1 + cLOZzOCbSSsyRQRba6uWtcpVLbPcwlglInNUCJNWWKqABqMLCGvGlfpJELaQ/V1Vd1lujAhe0chtUrH5 + ZExnmJ85MdomEa+qZMbIEF2BHGunILSjdZwYgTt4gJqjjj0Rltml1Zq9AeL0Mn71Wn2mtDU80MIvsFTw + O+KPIoWC8BNYRIUaqrRQroJKjQOk9N+xLBF2pXJFKfnsDGYa8gS6xOO2whyMuoHaHpGzZ/pBM0IMrtXD + nT4HqNHXe0lYoogMFeQP4jbSDkCPTUyXmnNoPutSo+9WN5DEQDyeWCWnhqm4p7Oimt3b54rzmmKPVHKz + 0Xg0AU1pz87VJp+yXOfd9t3mBmLXsGrsJhSsDtF4iOWxKdpzyQNnuRW7vEUp13obFG05OVUBPtO5V1Sn + k5q4SX8ENfWA6C7xHsP981Bb2sf38ZKd4JhSuXUJHPHhg/WJnAeZFw0Xzt/w8erRtLmBnB/CSmaC599I + 2PYVRl+CXigu3R9SfCC0Pf1MZ1oqvqvjogX7gtRFJfb1n24g7GblfQcFP2fkBYm5anxqQcbLKgzyK/Df + WRTkV5+RMTg84ZrgAOHo4ZIDVNdJw67CpsVLZ5gifj97Typlq2ZFQXj8LKh5EHpnaIar8N+Al5l9Y9Vs + T7OiIAzjqaMsa6QJnBkeWvgOHdPkAuIV67PSeQpCYYZplsZ+KyyWLRyFF8D553EDbURY770J0rrYJbda + SYE4iWb9NcgpRKDrOMAWwYP6d5BTaC52zyaAWDlAm/DweL8AX9zXukfxHsIAAAAASUVORK5CYII= + + + + + iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 + YQUAAAAZdEVYdFNvZnR3YXJlAEFkb2JlIEltYWdlUmVhZHlxyWU8AAADZmlUWHRYTUw6Y29tLmFkb2Jl + LnhtcAAAAAAAPD94cGFja2V0IGJlZ2luPSLvu78iIGlkPSJXNU0wTXBDZWhpSHpyZVN6TlRjemtjOWQi + Pz4gPHg6eG1wbWV0YSB4bWxuczp4PSJhZG9iZTpuczptZXRhLyIgeDp4bXB0az0iQWRvYmUgWE1QIENv + cmUgNS4zLWMwMTEgNjYuMTQ1NjYxLCAyMDEyLzAyLzA2LTE0OjU2OjI3ICAgICAgICAiPiA8cmRmOlJE + RiB4bWxuczpyZGY9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkvMDIvMjItcmRmLXN5bnRheC1ucyMiPiA8 + cmRmOkRlc2NyaXB0aW9uIHJkZjphYm91dD0iIiB4bWxuczp4bXBNTT0iaHR0cDovL25zLmFkb2JlLmNv + bS94YXAvMS4wL21tLyIgeG1sbnM6c3RSZWY9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlw + ZS9SZXNvdXJjZVJlZiMiIHhtbG5zOnhtcD0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wLyIgeG1w + TU06T3JpZ2luYWxEb2N1bWVudElEPSJ4bXAuZGlkOjJGQzkyMzc0Rjk0OUU0MTE5NjNCQjRENDMzQjlC + MUM4IiB4bXBNTTpEb2N1bWVudElEPSJ4bXAuZGlkOkVENUYwQThBNEQyOTExRTQ5QzUzQzdFMkFGQkQy + NTA1IiB4bXBNTTpJbnN0YW5jZUlEPSJ4bXAuaWlkOkVENUYwQTg5NEQyOTExRTQ5QzUzQzdFMkFGQkQy + NTA1IiB4bXA6Q3JlYXRvclRvb2w9IkFkb2JlIFBob3Rvc2hvcCBDUzYgKFdpbmRvd3MpIj4gPHhtcE1N + OkRlcml2ZWRGcm9tIHN0UmVmOmluc3RhbmNlSUQ9InhtcC5paWQ6MkRGNkEzOUYyOTRERTQxMUIzNkJE + NUVDQjU5MzE1NjIiIHN0UmVmOmRvY3VtZW50SUQ9InhtcC5kaWQ6MkZDOTIzNzRGOTQ5RTQxMTk2M0JC + NEQ0MzNCOUIxQzgiLz4gPC9yZGY6RGVzY3JpcHRpb24+IDwvcmRmOlJERj4gPC94OnhtcG1ldGE+IDw/ + eHBhY2tldCBlbmQ9InIiPz6npMy1AAAGEUlEQVRIS7WVeVDUZRjHf7Ase8ECu+wl4LIXcqyyHC783AWW + 5QaRFTHkMi9SQvE+UhLzwk0BUcQSgQBBgcYDzStMSzOPcpqcmo5pmqk/+rOapqb+iG/PbzfFcSz/6pn5 + zPN739/7fp/nvZn/3TSLjj+XJy2/RaItPCT5vaBd8m1+q2Qku1lcrcvki+iXr7fFU6ZZeOx5KDU1b7jU + 1Z2bVPMPWNMbRXrXkWAc+ywVLbcS8fKwFjlu8VdpW0XzSc6f8PEIPzJ19dFnU3WEJdHL9P3X9O1nkdB8 + CQrX7i3mKn9zfqsUq29ZsPfjRBx5aMO2cTMy94gm7FuF7XyJTwDJTo5GVdHxNALVgsPd5Ceye+9g8b0f + UXbjB8RtH4Msd+MeXS7f6twjxbILZiy7pEHDtTBsvG7BqivTUXpsClLWCbtJNpDwBlGVH3ySIFV520eW + nedRcf0HVJGwbeRrOHs/h2n1CGRZDe7wND/W1hiI8sEYlJ4KRcVpJcrfVqByNBILhqLh3KeA+UXBOpL2 + jkRZduARPGXZ/vH4pnMou/gd7INfIPn4QyQc/RSOzk9hrBtEiKPerUn1Y5PXBaDojWlwdgUjr0+G/H4Z + cnpCUNJrQNZ+LeLrBD/LYnixFEDAKFz7vJQ0r49dO4zikS8x8/ADxLd9jIT2B5ix/z7SX78Pw+K3EJy2 + wq1M4rEz6sRwthgw82Ag2KNS2I5JPZ4rZx00ImGNHIZSfisFkDGhxbs5AkKLd/3kaLkDlgTjXrsNc/Md + mPfeQeyOD2HbcRu6yi4E2Wrd8ngeG71IBPtePWa4JUhsD0DykQAkHQqApUWCFLcGyZvDoZ/P/5oCTGXk + hU2MvGB7rbGmG47dd2Fa+x6iX/kAMa/eQvS2m4jaeAPspvcROb8TQexid3CcL2usFCJjnwE5nQYU9RhR + PGDC7D4TCrqMyDqkR9oePbRz/SZEKh8rI8vdyshyXhmzLD8DS/1VGOquwtgw7glkXH0Nhvp3kbL2GrSl + hyC11ril03xZfbkQKZuVsDeq4NihRtYuDbJ2auBoUsO2TQXrJiWMlWIExflWMiHOjRzfJy0bg776HCKX + vANd7WXol1/xeN3Si7A2XIXW1YbAxAq3UO0zPTSd1yG38bplLK//vxBrffKY4PQ1HH9aKk8jonQUUyvO + Qlt9HtqaCx4/tXIMyXWXMXXOAQTEv+D2zCvDhBBTCN1zCGOCZq3k+DXO1YcpRYOY4hpF2LzTCCs74/VE + 3IvnEVd1EhGFblBbWot6BKXWQZq64tlYa2+TuJwQM9KU5cRL35hyOxCe2w913hA0hcPQFI16KRzxEFtO + a1Q9htSVN5C+5S5x7x/uIm3DR7CvuomUReOImt1FU7nwEolHECImMGkJE5i46EJkejNM+X1QOPqhzBqC + KvskVDmnJuHKT/K4bgjKzBMItXcjJv84NOwWiKPndJK40TOCgPgaRmIur1dZ1yM6txvyWT0ITR+AImOQ + gg39N1ybDBJP60PorC5My3oTwQm18FdNryBxbq0EJL6AEUTYZBTkF0NGKyKdvZDb3qJOAxSIOqcP/jtp + JyC3D1BSvYgp6EN4aiNlP/cTEk4gFASPEUeXkWd8RaY5jcrEBkTn9UCT4Q3gzfBfRvJE9rrsfpicHSRe + NsFXmJeSXhTBXXY+jMjk8uArVkpExuKb6pkbYJ7L7Ria37xTUBeMeCkcncRTN0z/TyLKNYy4khNQJq2G + IMLBXdUWQkXwCYYR6md7IPP1k8WEC3UFDzSpG2BZeAZJtXQWFpyls3HOC50JzkdQnbFqDInLLiC2rBcq + 6xoSzzzP+NDVwDBaQkx4XzahNv8xZH48sVotCHeOUnnCWNJG18Q4UjddB7vlfbBbPwC7+YannLTyIrS5 + OyHU5v3hr07poL7JBHe4Jh8bzgQROY8h46IKCAVfbi73D3PcpfoJlX0VtEVN0JXsQlj2ZoRaaynj7N/8 + NfZLPLFmHrXnpiWSCCL8iMl32T/M6YGMq+R+covD7QADwfoIgqt4QVGtfvIZJ4lRv5CY4zypbjfjy+eE + M4l4gtuSwYSQ4DS4EZAew/wNiCYQJlvQU3cAAAAASUVORK5CYII= @@ -1054,142 +1272,6 @@ R2K5fxKLWbbp/7Dc0CBY8Q+pPmOq0VkzzQAAAABJRU5ErkJggg== - - - iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAZdEVYdFNvZnR3YXJlAEFkb2JlIEltYWdlUmVhZHlxyWU8AAADZmlUWHRYTUw6Y29tLmFkb2Jl - LnhtcAAAAAAAPD94cGFja2V0IGJlZ2luPSLvu78iIGlkPSJXNU0wTXBDZWhpSHpyZVN6TlRjemtjOWQi - Pz4gPHg6eG1wbWV0YSB4bWxuczp4PSJhZG9iZTpuczptZXRhLyIgeDp4bXB0az0iQWRvYmUgWE1QIENv - cmUgNS4zLWMwMTEgNjYuMTQ1NjYxLCAyMDEyLzAyLzA2LTE0OjU2OjI3ICAgICAgICAiPiA8cmRmOlJE - RiB4bWxuczpyZGY9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkvMDIvMjItcmRmLXN5bnRheC1ucyMiPiA8 - cmRmOkRlc2NyaXB0aW9uIHJkZjphYm91dD0iIiB4bWxuczp4bXBNTT0iaHR0cDovL25zLmFkb2JlLmNv - bS94YXAvMS4wL21tLyIgeG1sbnM6c3RSZWY9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlw - ZS9SZXNvdXJjZVJlZiMiIHhtbG5zOnhtcD0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wLyIgeG1w - TU06T3JpZ2luYWxEb2N1bWVudElEPSJ4bXAuZGlkOjJGQzkyMzc0Rjk0OUU0MTE5NjNCQjRENDMzQjlC - MUM4IiB4bXBNTTpEb2N1bWVudElEPSJ4bXAuZGlkOjlDMzFEOUI4NEFBRjExRTQ4OTA5OUYwQ0QzM0Q2 - NEI4IiB4bXBNTTpJbnN0YW5jZUlEPSJ4bXAuaWlkOjlDMzFEOUI3NEFBRjExRTQ4OTA5OUYwQ0QzM0Q2 - NEI4IiB4bXA6Q3JlYXRvclRvb2w9IkFkb2JlIFBob3Rvc2hvcCBDUzYgKFdpbmRvd3MpIj4gPHhtcE1N - OkRlcml2ZWRGcm9tIHN0UmVmOmluc3RhbmNlSUQ9InhtcC5paWQ6MDk5Mzk2NTZBRjRBRTQxMTk3NEFD - QUFFQjRCMzVENkUiIHN0UmVmOmRvY3VtZW50SUQ9InhtcC5kaWQ6MkZDOTIzNzRGOTQ5RTQxMTk2M0JC - NEQ0MzNCOUIxQzgiLz4gPC9yZGY6RGVzY3JpcHRpb24+IDwvcmRmOlJERj4gPC94OnhtcG1ldGE+IDw/ - eHBhY2tldCBlbmQ9InIiPz73sIMwAAADIElEQVRIS7WVa0iTYRTH56Uiysvm3TkvpLl5DRIvQYWVWl+6 - iNEVg0yhQqloQZHkLT+Y0YdAs75IpEUhzERZoZhsRpZlS7soblotsRwoxhqWeTrnYZtv+u7NsB74cZ5z - zv89/z17HzYRAPxXeIv/EpFXcOyi4BvKhfehv4FvKBfeh+ayqIUDlIgBgT8whpRYoT2fhgvNVJKBQT9s - hB8/QZDPpnEIjEhg0J5Pw4Vm0mwygG9T06BSqQQhTUhUMoRGpyxYT7OZwfhXC6jVakFIYzNYqN5uMGKa - BI1GIwhpghXJaJJi13d0dEB2bj74hsWzSDlXbzfQG02g0+kEIU2wIomdovzKdVifngnFFytBeb4cLN+n - WaSc6hfKKqB/eHTWoHfwExgMBkFII5MnQUD4WlAWloO26wVs35MDmifPmQFFyqlO/aKKqlmDp31DYDKZ - BCGNTJ4IPqHx8LJvACbNUw7p6e2HuJQMNIhhBuaHj3vBYrEI0tb1BoIiE9kJ9h7Oh7EJM+g/jEJuwVlY - s24ri5RTnfo5BedAIoueIYPumvomuHzjzm9cq2uCq7UNUH2rEarr7kNd0yP26Y+eKoSWtk4wfpmAg7kn - ITY5DUorq1g8cOQEqze3aplOEhRtJoMcL1mMTixV9IgD5a/tSBVDYql8AKOBQLEJtTP08gY/jjFiktKg - 5FIV21Ok3NazvmR2AvrFkCAJyGYk1comZAuHDM/AyLvHThfBveZ26NOPwI59eey7LsbhFCmnOvVJ5+Ef - rrYZLEU8EZ85+HLwW7ZCLMVTFWdkHoLut+/hgbYHaE9XN31XNsupTrWV3jKVs+uS3cyAD0cLe331jW3Q - qRt0CPUlQVHDKI+fN9iGo4W90uNnyuA2vvRtWTlQgxeg/dk7FimnOvU9/CNqUe47b7ANRwt7AfjpKvAK - Gt18Qur35ymhRfsKKLr5hN7EyzDq7humWrrcfSfKxbz/QlwcLDck1snZJdUzYHUDmk57+K1qdXJyzsL6 - RmQD9ZmObygXB8sVIRO6fXQB4hC6eRQppzr1XXmHclnAckFomLc1Um5dItEvhZ97MQXP9N0AAAAASUVO - RK5CYII= - - - - - iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAZdEVYdFNvZnR3YXJlAEFkb2JlIEltYWdlUmVhZHlxyWU8AAADZmlUWHRYTUw6Y29tLmFkb2Jl - LnhtcAAAAAAAPD94cGFja2V0IGJlZ2luPSLvu78iIGlkPSJXNU0wTXBDZWhpSHpyZVN6TlRjemtjOWQi - Pz4gPHg6eG1wbWV0YSB4bWxuczp4PSJhZG9iZTpuczptZXRhLyIgeDp4bXB0az0iQWRvYmUgWE1QIENv - cmUgNS4zLWMwMTEgNjYuMTQ1NjYxLCAyMDEyLzAyLzA2LTE0OjU2OjI3ICAgICAgICAiPiA8cmRmOlJE - RiB4bWxuczpyZGY9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkvMDIvMjItcmRmLXN5bnRheC1ucyMiPiA8 - cmRmOkRlc2NyaXB0aW9uIHJkZjphYm91dD0iIiB4bWxuczp4bXBNTT0iaHR0cDovL25zLmFkb2JlLmNv - bS94YXAvMS4wL21tLyIgeG1sbnM6c3RSZWY9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlw - ZS9SZXNvdXJjZVJlZiMiIHhtbG5zOnhtcD0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wLyIgeG1w - TU06T3JpZ2luYWxEb2N1bWVudElEPSJ4bXAuZGlkOjJGQzkyMzc0Rjk0OUU0MTE5NjNCQjRENDMzQjlC - MUM4IiB4bXBNTTpEb2N1bWVudElEPSJ4bXAuZGlkOjhDMTdBQjRENEFBRTExRTQ4QjQyODY0MDNBNTJE - NzNCIiB4bXBNTTpJbnN0YW5jZUlEPSJ4bXAuaWlkOjhDMTdBQjRDNEFBRTExRTQ4QjQyODY0MDNBNTJE - NzNCIiB4bXA6Q3JlYXRvclRvb2w9IkFkb2JlIFBob3Rvc2hvcCBDUzYgKFdpbmRvd3MpIj4gPHhtcE1N - OkRlcml2ZWRGcm9tIHN0UmVmOmluc3RhbmNlSUQ9InhtcC5paWQ6NUQyMjc4QTlBQjRBRTQxMTk3NEFD - QUFFQjRCMzVENkUiIHN0UmVmOmRvY3VtZW50SUQ9InhtcC5kaWQ6MkZDOTIzNzRGOTQ5RTQxMTk2M0JC - NEQ0MzNCOUIxQzgiLz4gPC9yZGY6RGVzY3JpcHRpb24+IDwvcmRmOlJERj4gPC94OnhtcG1ldGE+IDw/ - eHBhY2tldCBlbmQ9InIiPz4eHsDfAAAB00lEQVRIS7XVWytEURQH8HniTTNHLs0NCXNcXjTN5dH9g/gM - 3jx590QhFDJS0gyTGmpqaqJIMW4hzlAoOaWISS7LWifntI3ddnTGrl92e/57/We/DBsA/CvuYSHZSr0t - lvCGsriX/oI3lMW9lM/SwgF9SEHwizs08IX2vAyLZvZRgXJ+cQWv7yB0q96Ds86voT0vw6KZNJsK4Pnl - DWKxmBBlqhpDUN0UNp2n2VrB/WMOEomEEGX0ArN5o+BGfYB0Oi1EGa8cwpKw6bxRcH6lQiaTEaKMVw5q - rzCbNwr2z65BURQhynh8Qe0VZvNGwdZBFlRVFaKMxxfQXmE2rxc8rW3sQy6XE0puHoG7IaC9YnV9j5th - pbZPqOCDCrbH5uIwOD7/zWgkDkNTizAyuwQjkWWIxFNQWduqmVxI/MiPz6/A8HTUuDMTTYLkbrqhgt5S - T3PG4ZJ3HE7focElZx0u3yn+VQiG1ZLymmm7s74f88f42S6bl9zyJZ6d6Xckd+Mt5ieogH4xJORHHajt - SzvqZPSgECpHZSiA2DztuxBlad+NgnpBEbIjusiiYboKRF+kGFHegUR5ImkFv7G0eAPzWVq8gfksLd5/ - oULiHhYS97BwwPYJlSCUgVubViQAAAAASUVORK5CYII= - - - - - iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAZdEVYdFNvZnR3YXJlAEFkb2JlIEltYWdlUmVhZHlxyWU8AAADZmlUWHRYTUw6Y29tLmFkb2Jl - LnhtcAAAAAAAPD94cGFja2V0IGJlZ2luPSLvu78iIGlkPSJXNU0wTXBDZWhpSHpyZVN6TlRjemtjOWQi - Pz4gPHg6eG1wbWV0YSB4bWxuczp4PSJhZG9iZTpuczptZXRhLyIgeDp4bXB0az0iQWRvYmUgWE1QIENv - cmUgNS4zLWMwMTEgNjYuMTQ1NjYxLCAyMDEyLzAyLzA2LTE0OjU2OjI3ICAgICAgICAiPiA8cmRmOlJE - RiB4bWxuczpyZGY9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkvMDIvMjItcmRmLXN5bnRheC1ucyMiPiA8 - cmRmOkRlc2NyaXB0aW9uIHJkZjphYm91dD0iIiB4bWxuczp4bXBNTT0iaHR0cDovL25zLmFkb2JlLmNv - bS94YXAvMS4wL21tLyIgeG1sbnM6c3RSZWY9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlw - ZS9SZXNvdXJjZVJlZiMiIHhtbG5zOnhtcD0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wLyIgeG1w - TU06T3JpZ2luYWxEb2N1bWVudElEPSJ4bXAuZGlkOjJGQzkyMzc0Rjk0OUU0MTE5NjNCQjRENDMzQjlC - MUM4IiB4bXBNTTpEb2N1bWVudElEPSJ4bXAuZGlkOjJEMDQyOEZBNEFEMjExRTRBN0MxRDBCNzJGRUND - MDEzIiB4bXBNTTpJbnN0YW5jZUlEPSJ4bXAuaWlkOjJEMDQyOEY5NEFEMjExRTRBN0MxRDBCNzJGRUND - MDEzIiB4bXA6Q3JlYXRvclRvb2w9IkFkb2JlIFBob3Rvc2hvcCBDUzYgKFdpbmRvd3MpIj4gPHhtcE1N - OkRlcml2ZWRGcm9tIHN0UmVmOmluc3RhbmNlSUQ9InhtcC5paWQ6QkRDRkI1RDVEMTRBRTQxMTk3NEFD - QUFFQjRCMzVENkUiIHN0UmVmOmRvY3VtZW50SUQ9InhtcC5kaWQ6MkZDOTIzNzRGOTQ5RTQxMTk2M0JC - NEQ0MzNCOUIxQzgiLz4gPC9yZGY6RGVzY3JpcHRpb24+IDwvcmRmOlJERj4gPC94OnhtcG1ldGE+IDw/ - eHBhY2tldCBlbmQ9InIiPz59jfe3AAAEbUlEQVRIS8WTeUybZRzHF48/pnFOuQRajkFLgQFb5iRLNJr4 - l/EPgsniUI4xZDAY1zyxwApsMJyIME61rByl3DfoYGBrgbWUY06FcZSCha4rQ8jYxkqPr2/fvkv8o2Sg - S/wkT970eb6/T5/39z7Prv8dt/Oql4mR4HZJ3ccoXFxhVCzB9DT9JueJdSq6c1wzVZFupepVzxu34XVj - CaEDi1jX6hF8ZQoeokl4iBVwzV9YdU1XRlIl28eVo8phCdXwGltEeOUsro6psaHVwcSDh5volc4iOO8X - 7KuVwb1hEi7J8myq9PEQO//I85oafr0KtEpUpNSETm+AwWDAvfv3YTQaybnm/t/AyO6Ga+UonJOnIijF - 1hA9tWI2qle9RxcI+RIpmZpTIfBULhIyyqHVahHPKcN70TmYnFFCp9OhqXcc9KwW0DOHVl3YU1aUyjJu - F1SpfhO3EM6bMMsVt+D8Zhz2HIpC4oU6bG5uIu4cD3tfTwAjIBNypQYbGxsISquBU34PaDHiVEplGXee - SuIjVaBv3Lz7gJg8vHg4FlZvc+ATVoLipiHsD8qCXWAO7IPK8MG5FjLXKboOeoYADkldUkplGWb7vOb4 - 4BzxIXXQE/1m59WDXdgBvxPfwz6UC4eQUth/WIBDZ2qQXj+K7IYRImeE5s5fOFrcDPvPapcJzVNmmwVY - VxWG9U09uau1tTVymPpc0iYFLew7OEUJ4BwtALfvJpl5xMrKCu6s3cUrn5YbCM1us80CrJZZVWjXr7j3 - 4CE0y8v4IrcaH+cK4Bv+DRyPl8ApphYuia3wZ3eCUzOA1PIfcVuzjHnlIgK/vgy7mHzTG+w12yzA5E53 - edYPo1c2i/X1dQTEfwvbwDQ4hhXg8OcN4P48Df+UTrgkNIAeW4Hg3Hbo9Xq0iGSgs4ls5CUhoXnObLOA - S8pkhG/bdZzgDZJnffT3GXieLAA9XgB2/RjZjuQqMWhxfBw824H55XWyhcfy+HDNqoB1SH4Codn6G7iw - p3d78EaVPlXX0CaZgkqlgly1gpCiK0htHCH/IL6oFcEF3ZjT3CUvXqv0DzDSS0FPq1a/8EbYS5Rqa+if - SAJ8KoeNR7gitEsnoVQqSbGOkJmYX1ggxaY70SabwIGMUrjn8I3WIXnBRPnWu/8nDnE9Sd7cAaP/ZSES - 6/rRKJRArpiHXC7HzekZNIukiCyrhW9mGZgXa4w2kUVnibJnzdXbxP5URzyDO4QjxGl5i9uNpMZeKP5U - IrywAq9yCnGAOGGMonbYxpVnEPGdyR9BO/MTj8kfgXeNFPt5IngVtoF1kQ9WcTs8qgfgmNreQMS21xZL - 0E6Ln6ef75tg8sfgXT8O77oReAkkYNXJ4PRV/4ztyfo9VPTf4xjdf9CpQKzdxxuGe6UMbhXEmc8V6mze - r3qNivx3HGN7UmglQ6CVDMIxXwybo5UcaunJQD8te9rhyx4JrWwItlGNUut3y5+hlp4cDhFCpl14k9jq - nR+Y1NTjIe7NlmMnWKoHsOtvjWYcKpheqFQAAAAASUVORK5CYII= - - - - - iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAZdEVYdFNvZnR3YXJlAEFkb2JlIEltYWdlUmVhZHlxyWU8AAADZmlUWHRYTUw6Y29tLmFkb2Jl - LnhtcAAAAAAAPD94cGFja2V0IGJlZ2luPSLvu78iIGlkPSJXNU0wTXBDZWhpSHpyZVN6TlRjemtjOWQi - Pz4gPHg6eG1wbWV0YSB4bWxuczp4PSJhZG9iZTpuczptZXRhLyIgeDp4bXB0az0iQWRvYmUgWE1QIENv - cmUgNS4zLWMwMTEgNjYuMTQ1NjYxLCAyMDEyLzAyLzA2LTE0OjU2OjI3ICAgICAgICAiPiA8cmRmOlJE - RiB4bWxuczpyZGY9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkvMDIvMjItcmRmLXN5bnRheC1ucyMiPiA8 - cmRmOkRlc2NyaXB0aW9uIHJkZjphYm91dD0iIiB4bWxuczp4bXBNTT0iaHR0cDovL25zLmFkb2JlLmNv - bS94YXAvMS4wL21tLyIgeG1sbnM6c3RSZWY9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlw - ZS9SZXNvdXJjZVJlZiMiIHhtbG5zOnhtcD0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wLyIgeG1w - TU06T3JpZ2luYWxEb2N1bWVudElEPSJ4bXAuZGlkOjJGQzkyMzc0Rjk0OUU0MTE5NjNCQjRENDMzQjlC - MUM4IiB4bXBNTTpEb2N1bWVudElEPSJ4bXAuZGlkOjJERTg4QTFENEQyMjExRTRBODEyODk0M0RBMTc5 - Qjg3IiB4bXBNTTpJbnN0YW5jZUlEPSJ4bXAuaWlkOjJERTg4QTFDNEQyMjExRTRBODEyODk0M0RBMTc5 - Qjg3IiB4bXA6Q3JlYXRvclRvb2w9IkFkb2JlIFBob3Rvc2hvcCBDUzYgKFdpbmRvd3MpIj4gPHhtcE1N - OkRlcml2ZWRGcm9tIHN0UmVmOmluc3RhbmNlSUQ9InhtcC5paWQ6NjJGOUEyRDEyMTRERTQxMUIzNkJE - NUVDQjU5MzE1NjIiIHN0UmVmOmRvY3VtZW50SUQ9InhtcC5kaWQ6MkZDOTIzNzRGOTQ5RTQxMTk2M0JC - NEQ0MzNCOUIxQzgiLz4gPC9yZGY6RGVzY3JpcHRpb24+IDwvcmRmOlJERj4gPC94OnhtcG1ldGE+IDw/ - eHBhY2tldCBlbmQ9InIiPz6wJF34AAACl0lEQVRIS62Vy08TURSH73/QhQtXVnBhxEcMiUkhbEg0hB1R - Q1i68C8wIW5cEqMLN7ho2Ji4YiEhWq0prYUhfULbadN3obTaChobtZEUsFY9nnPS6WM6HYowyZf87j33 - nG/amaai9geOBYA+4pTxihmBE8DcTQB4J8em/9IwSQyagmrtL+z9rMFmvnhkKvtV7tcVHPz6DVsftulA - AckdhUg8zf19eoLKAd597iMLMItewfOxUDTN/bqCH3tVSG8VWIBZ9AoJApEk9+sKvu/uQ2IjzwJkGtH8 - OrTwy3Hu77vIAnV9mgWlcgWiqRwLjAMmkOMbPbNTKnN/JJntqJGEBZ++7oKcyLLgLN4JrU8Cms2C4pcy - BKKZumCI18temQ/8DzSLZlBmQX7nG/jCKdpgAa0driCtY5iFHuqHSjNoFtaags1iCdzBBG+QgNY2aZ0F - mIUe6osENAtrTUEq/7kDq9PHAszU5yYoq9f1i9cUSCD5ozxDEeTsrhAoONwyxLLb8MrhYQFmZYCHsnpd - v3hNgQROb5hnKIK29944MAThTBEWbS4WYBZ6qC/sKSy5ZJ6BGUQg8b4Bbhjod4AZXlhXWdBa10LrIVul - AM9ggS+aa6AIMMO8ZYUO0KeyIOMtZyaQpXpNi4LFucYzMINwhbMNcMNw5oIJMMNKIA0LNg88mZuH/ssj - dPgBMnN+cBRmny1wrRtSMMMzWCCFMg0UAeY2Fh0+GL5xG8Zu3oHXUrCj3g0WONdTbeBm21/o1N17gPtg - 98Xh3VoS3qzKMDI22agfglnY/Uld8NDc/ZlZwAwvl4Ngun6LGh8rdfVDViNs3rguOOzq6XOD8PDpc7g2 - OkHDH7XWtYa2It66Y4eCQ8cRfpvUNa2hTUD8A6JMaBvCyTdJAAAAAElFTkSuQmCC - - iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 @@ -1403,7 +1485,7 @@ AAAASUVORK5CYII= - + iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 YQUAAAAZdEVYdFNvZnR3YXJlAEFkb2JlIEltYWdlUmVhZHlxyWU8AAADZmlUWHRYTUw6Y29tLmFkb2Jl @@ -1415,108 +1497,26 @@ bS94YXAvMS4wL21tLyIgeG1sbnM6c3RSZWY9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlw ZS9SZXNvdXJjZVJlZiMiIHhtbG5zOnhtcD0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wLyIgeG1w TU06T3JpZ2luYWxEb2N1bWVudElEPSJ4bXAuZGlkOjJGQzkyMzc0Rjk0OUU0MTE5NjNCQjRENDMzQjlC - MUM4IiB4bXBNTTpEb2N1bWVudElEPSJ4bXAuZGlkOkUzNzJDMjE3NEFENjExRTRCNjE0OEVEQzI4MEM0 - RTZDIiB4bXBNTTpJbnN0YW5jZUlEPSJ4bXAuaWlkOkUzNzJDMjE2NEFENjExRTRCNjE0OEVEQzI4MEM0 - RTZDIiB4bXA6Q3JlYXRvclRvb2w9IkFkb2JlIFBob3Rvc2hvcCBDUzYgKFdpbmRvd3MpIj4gPHhtcE1N - OkRlcml2ZWRGcm9tIHN0UmVmOmluc3RhbmNlSUQ9InhtcC5paWQ6RkI3NUQ0QkNENDRBRTQxMTk3NEFD - QUFFQjRCMzVENkUiIHN0UmVmOmRvY3VtZW50SUQ9InhtcC5kaWQ6MkZDOTIzNzRGOTQ5RTQxMTk2M0JC - NEQ0MzNCOUIxQzgiLz4gPC9yZGY6RGVzY3JpcHRpb24+IDwvcmRmOlJERj4gPC94OnhtcG1ldGE+IDw/ - eHBhY2tldCBlbmQ9InIiPz6PyaLfAAADMElEQVRIS6VUXUiTYRT+vi3Tzd+ps23+3KRigtiPkolEQReG - UYTkhWatpWlWGkRdddfdSPImqUAJjSIT00oxLJIk0cR+tFSyzDJtgaMkDEPkdM7ZPvm2vS6jBx6es3Pe - 8zzvtm+TohLS/ov+AACStLgEQuJyLRJWYK1yzh/+FgCoQrpnfM4fOGBhcUlIMkEVkma4H4i1y2kFcMD8 - wqKQZILKZqTqmlTAWrfvMjhgbv63Dwm0hLWQohn1eNEbzrlfPiTQAtZCKjP1GXdAIC+r4XD+9CGBFrDm - RVJ1re6pZ0GyHHMvIawauYVNCFPfvvuQQAtYC6meKXU0amNsaGN/ZR60xIf9aIgN3cpGE9OzZCZ85nEm - pGiWlLABmuJCnUOXrNB7chdct4TUo32ANDbp4NuielDpqWfePdaPX6GrohSK4uLhlCEo96YlZLbOFHzH - oJXjMSBcGn4/zQGovEDqXXtzeTb+BTrKj0J3+Q54djYP7EZdTU2MPjFSK8eieQR9QtLg6GcOQPWgqKeQ - ZyOfoK30CDw+lg2Ot3Z4VLoNqo269mCNHIa2WjYn9A1PcAAqU6m9VV3TF9psOwwPS3JgZugCdNoyocwU - jU+RlImWBpezGz0vxzkA1YOiHvPFO7Ca1kGHLQtmXp2HdutmqN+/F6JiU+h3kOpyVeHJwBgHoLIpqajm - 189HoaG4CNqsGTA1UAWth9Lg6r490PygGyLjUikgzuWqQlffCAegelDdUwLqigqhpXgjTPYeh+bCFCg2 - RkEk3vxuVz/P0c43oLP3DQegLhspNalSFxiNcLswHT48LYNbBUlQk7ebzenmyhm08w1o7xmiAP6hRZiT - 70eYkzpctUuJWdHmwWs74+F1Uz7cyE+E4ohQB5mHm9a3GywpTXzektyKduIAIsKI3ISkL4rIdYle05C9 - VrZVBmvtl7eboUyv7V4jSQdwRn8FdI72iErtCUxnIuifkJ5hUqUOq9Jr7OeCNU6bTpNVqtMcDJSldOwn - KnOk+jypJ5QANRWc0cs5SEelXr54QidfwVYAMoiHq4W/gNM6OaNCJ+diaUIqN/43+Atwg27t+9ZXBUn6 - A2MdqQeVc5pWAAAAAElFTkSuQmCC - - - - - iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAIAAABvFaqvAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAZdEVYdFNvZnR3YXJlAEFkb2JlIEltYWdlUmVhZHlxyWU8AAADZmlUWHRYTUw6Y29tLmFkb2Jl - LnhtcAAAAAAAPD94cGFja2V0IGJlZ2luPSLvu78iIGlkPSJXNU0wTXBDZWhpSHpyZVN6TlRjemtjOWQi - Pz4gPHg6eG1wbWV0YSB4bWxuczp4PSJhZG9iZTpuczptZXRhLyIgeDp4bXB0az0iQWRvYmUgWE1QIENv - cmUgNS4zLWMwMTEgNjYuMTQ1NjYxLCAyMDEyLzAyLzA2LTE0OjU2OjI3ICAgICAgICAiPiA8cmRmOlJE - RiB4bWxuczpyZGY9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkvMDIvMjItcmRmLXN5bnRheC1ucyMiPiA8 - cmRmOkRlc2NyaXB0aW9uIHJkZjphYm91dD0iIiB4bWxuczp4bXBNTT0iaHR0cDovL25zLmFkb2JlLmNv - bS94YXAvMS4wL21tLyIgeG1sbnM6c3RSZWY9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlw - ZS9SZXNvdXJjZVJlZiMiIHhtbG5zOnhtcD0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wLyIgeG1w - TU06T3JpZ2luYWxEb2N1bWVudElEPSJ4bXAuZGlkOjJGQzkyMzc0Rjk0OUU0MTE5NjNCQjRENDMzQjlC - MUM4IiB4bXBNTTpEb2N1bWVudElEPSJ4bXAuZGlkOjUzQzNGNDI5NEQyQzExRTQ4QkE1QUNCMEVDRDZF - MDVEIiB4bXBNTTpJbnN0YW5jZUlEPSJ4bXAuaWlkOjUzQzNGNDI4NEQyQzExRTQ4QkE1QUNCMEVDRDZF - MDVEIiB4bXA6Q3JlYXRvclRvb2w9IkFkb2JlIFBob3Rvc2hvcCBDUzYgKFdpbmRvd3MpIj4gPHhtcE1N - OkRlcml2ZWRGcm9tIHN0UmVmOmluc3RhbmNlSUQ9InhtcC5paWQ6RkI1NUY4OTYyQTRERTQxMUIzNkJE + MUM4IiB4bXBNTTpEb2N1bWVudElEPSJ4bXAuZGlkOjJERjY3MEZENEQyMzExRTRCNDlGQUMwMzk0OTAw + Qzc4IiB4bXBNTTpJbnN0YW5jZUlEPSJ4bXAuaWlkOjJERjY3MEZDNEQyMzExRTRCNDlGQUMwMzk0OTAw + Qzc4IiB4bXA6Q3JlYXRvclRvb2w9IkFkb2JlIFBob3Rvc2hvcCBDUzYgKFdpbmRvd3MpIj4gPHhtcE1N + OkRlcml2ZWRGcm9tIHN0UmVmOmluc3RhbmNlSUQ9InhtcC5paWQ6NjhGOUEyRDEyMTRERTQxMUIzNkJE NUVDQjU5MzE1NjIiIHN0UmVmOmRvY3VtZW50SUQ9InhtcC5kaWQ6MkZDOTIzNzRGOTQ5RTQxMTk2M0JC NEQ0MzNCOUIxQzgiLz4gPC9yZGY6RGVzY3JpcHRpb24+IDwvcmRmOlJERj4gPC94OnhtcG1ldGE+IDw/ - eHBhY2tldCBlbmQ9InIiPz6IsaOmAAADF0lEQVQ4T62U/UuTURTH+0nICqRI1ERMMyNQe8N0ChqBwQhN - yvwhEgJjVCqJ/qCibZo6tzQ339h6Nre5prapUzc1XzItX1ilzuWMLLVAen+xf6DTuTxjdxsFVj58ebjc - c+7nnud7z3228DbpIaDFH/CfoqCn72DIDvNfPDM2KAqyr8PcJxqY+QBTb8kkjocXQTsKigGwfqYJHqIg - 1OxHGHvlWPx4hXB1YyA3g4CBhqst+piEnrDA3rA95vBAY1x8d7lq/DVZwm5PQZNvoKYdypSgHgbVEIh1 - cLOZzOCbSSsyRQRba6uWtcpVLbPcwlglInNUCJNWWKqABqMLCGvGlfpJELaQ/V1Vd1lujAhe0chtUrH5 - ZExnmJ85MdomEa+qZMbIEF2BHGunILSjdZwYgTt4gJqjjj0Rltml1Zq9AeL0Mn71Wn2mtDU80MIvsFTw - O+KPIoWC8BNYRIUaqrRQroJKjQOk9N+xLBF2pXJFKfnsDGYa8gS6xOO2whyMuoHaHpGzZ/pBM0IMrtXD - nT4HqNHXe0lYoogMFeQP4jbSDkCPTUyXmnNoPutSo+9WN5DEQDyeWCWnhqm4p7Oimt3b54rzmmKPVHKz - 0Xg0AU1pz87VJp+yXOfd9t3mBmLXsGrsJhSsDtF4iOWxKdpzyQNnuRW7vEUp13obFG05OVUBPtO5V1Sn - k5q4SX8ENfWA6C7xHsP981Bb2sf38ZKd4JhSuXUJHPHhg/WJnAeZFw0Xzt/w8erRtLmBnB/CSmaC599I - 2PYVRl+CXigu3R9SfCC0Pf1MZ1oqvqvjogX7gtRFJfb1n24g7GblfQcFP2fkBYm5anxqQcbLKgzyK/Df - WRTkV5+RMTg84ZrgAOHo4ZIDVNdJw67CpsVLZ5gifj97Typlq2ZFQXj8LKh5EHpnaIar8N+Al5l9Y9Vs - T7OiIAzjqaMsa6QJnBkeWvgOHdPkAuIV67PSeQpCYYZplsZ+KyyWLRyFF8D553EDbURY770J0rrYJbda - SYE4iWb9NcgpRKDrOMAWwYP6d5BTaC52zyaAWDlAm/DweL8AX9zXukfxHsIAAAAASUVORK5CYII= - - - - - iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAZdEVYdFNvZnR3YXJlAEFkb2JlIEltYWdlUmVhZHlxyWU8AAADZmlUWHRYTUw6Y29tLmFkb2Jl - LnhtcAAAAAAAPD94cGFja2V0IGJlZ2luPSLvu78iIGlkPSJXNU0wTXBDZWhpSHpyZVN6TlRjemtjOWQi - Pz4gPHg6eG1wbWV0YSB4bWxuczp4PSJhZG9iZTpuczptZXRhLyIgeDp4bXB0az0iQWRvYmUgWE1QIENv - cmUgNS4zLWMwMTEgNjYuMTQ1NjYxLCAyMDEyLzAyLzA2LTE0OjU2OjI3ICAgICAgICAiPiA8cmRmOlJE - RiB4bWxuczpyZGY9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkvMDIvMjItcmRmLXN5bnRheC1ucyMiPiA8 - cmRmOkRlc2NyaXB0aW9uIHJkZjphYm91dD0iIiB4bWxuczp4bXBNTT0iaHR0cDovL25zLmFkb2JlLmNv - bS94YXAvMS4wL21tLyIgeG1sbnM6c3RSZWY9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlw - ZS9SZXNvdXJjZVJlZiMiIHhtbG5zOnhtcD0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wLyIgeG1w - TU06T3JpZ2luYWxEb2N1bWVudElEPSJ4bXAuZGlkOjJGQzkyMzc0Rjk0OUU0MTE5NjNCQjRENDMzQjlC - MUM4IiB4bXBNTTpEb2N1bWVudElEPSJ4bXAuZGlkOkVENUYwQThBNEQyOTExRTQ5QzUzQzdFMkFGQkQy - NTA1IiB4bXBNTTpJbnN0YW5jZUlEPSJ4bXAuaWlkOkVENUYwQTg5NEQyOTExRTQ5QzUzQzdFMkFGQkQy - NTA1IiB4bXA6Q3JlYXRvclRvb2w9IkFkb2JlIFBob3Rvc2hvcCBDUzYgKFdpbmRvd3MpIj4gPHhtcE1N - OkRlcml2ZWRGcm9tIHN0UmVmOmluc3RhbmNlSUQ9InhtcC5paWQ6MkRGNkEzOUYyOTRERTQxMUIzNkJE - NUVDQjU5MzE1NjIiIHN0UmVmOmRvY3VtZW50SUQ9InhtcC5kaWQ6MkZDOTIzNzRGOTQ5RTQxMTk2M0JC - NEQ0MzNCOUIxQzgiLz4gPC9yZGY6RGVzY3JpcHRpb24+IDwvcmRmOlJERj4gPC94OnhtcG1ldGE+IDw/ - eHBhY2tldCBlbmQ9InIiPz6npMy1AAAGEUlEQVRIS7WVeVDUZRjHf7Ase8ECu+wl4LIXcqyyHC783AWW - 5QaRFTHkMi9SQvE+UhLzwk0BUcQSgQBBgcYDzStMSzOPcpqcmo5pmqk/+rOapqb+iG/PbzfFcSz/6pn5 - zPN739/7fp/nvZn/3TSLjj+XJy2/RaItPCT5vaBd8m1+q2Qku1lcrcvki+iXr7fFU6ZZeOx5KDU1b7jU - 1Z2bVPMPWNMbRXrXkWAc+ywVLbcS8fKwFjlu8VdpW0XzSc6f8PEIPzJ19dFnU3WEJdHL9P3X9O1nkdB8 - CQrX7i3mKn9zfqsUq29ZsPfjRBx5aMO2cTMy94gm7FuF7XyJTwDJTo5GVdHxNALVgsPd5Ceye+9g8b0f - UXbjB8RtH4Msd+MeXS7f6twjxbILZiy7pEHDtTBsvG7BqivTUXpsClLWCbtJNpDwBlGVH3ySIFV520eW - nedRcf0HVJGwbeRrOHs/h2n1CGRZDe7wND/W1hiI8sEYlJ4KRcVpJcrfVqByNBILhqLh3KeA+UXBOpL2 - jkRZduARPGXZ/vH4pnMou/gd7INfIPn4QyQc/RSOzk9hrBtEiKPerUn1Y5PXBaDojWlwdgUjr0+G/H4Z - cnpCUNJrQNZ+LeLrBD/LYnixFEDAKFz7vJQ0r49dO4zikS8x8/ADxLd9jIT2B5ix/z7SX78Pw+K3EJy2 - wq1M4rEz6sRwthgw82Ag2KNS2I5JPZ4rZx00ImGNHIZSfisFkDGhxbs5AkKLd/3kaLkDlgTjXrsNc/Md - mPfeQeyOD2HbcRu6yi4E2Wrd8ngeG71IBPtePWa4JUhsD0DykQAkHQqApUWCFLcGyZvDoZ/P/5oCTGXk - hU2MvGB7rbGmG47dd2Fa+x6iX/kAMa/eQvS2m4jaeAPspvcROb8TQexid3CcL2usFCJjnwE5nQYU9RhR - PGDC7D4TCrqMyDqkR9oePbRz/SZEKh8rI8vdyshyXhmzLD8DS/1VGOquwtgw7glkXH0Nhvp3kbL2GrSl - hyC11ril03xZfbkQKZuVsDeq4NihRtYuDbJ2auBoUsO2TQXrJiWMlWIExflWMiHOjRzfJy0bg776HCKX - vANd7WXol1/xeN3Si7A2XIXW1YbAxAq3UO0zPTSd1yG38bplLK//vxBrffKY4PQ1HH9aKk8jonQUUyvO - Qlt9HtqaCx4/tXIMyXWXMXXOAQTEv+D2zCvDhBBTCN1zCGOCZq3k+DXO1YcpRYOY4hpF2LzTCCs74/VE - 3IvnEVd1EhGFblBbWot6BKXWQZq64tlYa2+TuJwQM9KU5cRL35hyOxCe2w913hA0hcPQFI16KRzxEFtO - a1Q9htSVN5C+5S5x7x/uIm3DR7CvuomUReOImt1FU7nwEolHECImMGkJE5i46EJkejNM+X1QOPqhzBqC - KvskVDmnJuHKT/K4bgjKzBMItXcjJv84NOwWiKPndJK40TOCgPgaRmIur1dZ1yM6txvyWT0ITR+AImOQ - gg39N1ybDBJP60PorC5My3oTwQm18FdNryBxbq0EJL6AEUTYZBTkF0NGKyKdvZDb3qJOAxSIOqcP/jtp - JyC3D1BSvYgp6EN4aiNlP/cTEk4gFASPEUeXkWd8RaY5jcrEBkTn9UCT4Q3gzfBfRvJE9rrsfpicHSRe - NsFXmJeSXhTBXXY+jMjk8uArVkpExuKb6pkbYJ7L7Ria37xTUBeMeCkcncRTN0z/TyLKNYy4khNQJq2G - IMLBXdUWQkXwCYYR6md7IPP1k8WEC3UFDzSpG2BZeAZJtXQWFpyls3HOC50JzkdQnbFqDInLLiC2rBcq - 6xoSzzzP+NDVwDBaQkx4XzahNv8xZH48sVotCHeOUnnCWNJG18Q4UjddB7vlfbBbPwC7+YannLTyIrS5 - OyHU5v3hr07poL7JBHe4Jh8bzgQROY8h46IKCAVfbi73D3PcpfoJlX0VtEVN0JXsQlj2ZoRaaynj7N/8 - NfZLPLFmHrXnpiWSCCL8iMl32T/M6YGMq+R+covD7QADwfoIgqt4QVGtfvIZJ4lRv5CY4zypbjfjy+eE - M4l4gtuSwYSQ4DS4EZAew/wNiCYQJlvQU3cAAAAASUVORK5CYII= + eHBhY2tldCBlbmQ9InIiPz6GKmpFAAAC+UlEQVRIS63T20vTYRzH8Yforj/Ei24UiSgKIygKi8oyxZQo + cvNYeXaesmzqPGu2POd0ulSsnIdaurTSTJ3O6UxTPGya5vCQx5AuPn39RbHop7nZxQt+z3ie93e/Z4w1 + p7nsCoBt8R6yBF/UHPv+Wb0rfFFzm99CRIwEW1gnqXzxTXxRc0ydctm4OlID2sxrw6iCtiwItC+A2P/D + frLnjwGNSZdMq6N1WOvLwFpP4l/WdRlY6Jaio9Ab7QXba8sVoDHZGdT8PYS9THDqMGnLsKpNw0qXGCua + BO55VZdNQ6U/DRRibVCGb+N1pH5bukoRqHmDHOIG1N8/X2F4I8WyNhtf2+9hqSsZxqZ4upbb6HsSZLHO + Im90ym6hNVcIaktYTexZyUelGEvaHMy/jcFiZxo0xX5Y7ivGcn8JkVmA9uvlWBmqwpJeAWovs+poR99O + eRgWtQWYVUdgrj0FH+i+F3XF3NoappZYGJrEoLaOVYpOOTY/FGJB+xjTqnDMtMTTAC/Ma/Ix/TLUKl9e + x0JfFQpql7PykBP7lWIXzPeUYLIhHCPKCLr/AMy2ZsKoDLTKdNNdvM8TgNpRTBZwfJ885CTmaIChPhwa + mS+GnkdhqjEWY9X+VplqvIMXEhdQ24mZeuSs0N/BNNWWj4k6EdSZHhhXxWH0aSCGFd4c4Tk7zk7XBlUM + FKLToK4Nm+0qYnneRzqGGiSYaIiiyZdhVCdgqFSIwRJPjucZW85O1pvnRmvDkO9zFNTdy2Y6HjGp4HCF + 5kk4xhoiURd/EROv4tBfeM0qAyUC9Mp9QM0+7o829T6LZV0/mNycS6+nFKFWfAGj9ZHozfGwil7miZYH + 7qCmghsw+S6VpV894KuUuKFbfhNNqa749CwY3dm0toK+VABl3HlQM5obYHybwFLc7W1y/Y5BlX6FfgNn + DNcEY0DhZZX+MiGKbh0DNR24AYYWMSfJzc6GZBApwS5skIzNODcg0dV2V36FtsJ7yBJ8UXO8hyzBFzXH + ++H/A/YDv9/V87iOlrYAAAAASUVORK5CYII= @@ -3164,9 +3164,6 @@ 864, 17 - - 864, 17 - iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 diff --git a/Program.cs b/Program.cs index e38f7b8..a76d0d4 100644 --- a/Program.cs +++ b/Program.cs @@ -16,14 +16,14 @@ [STAThread] static void Main() { - ValidateInfo validateInfo = ValidateConfig.LoadConfig(); + ValidateConfig.LoadConfig(); string localConfigPath = Application.StartupPath + "/Config.xml"; //获取程序及版本信息 string currentVersionCode = Assembly.GetExecutingAssembly().GetName().Version.ToString(); //获取文件版本信息 FileVersionInfo.GetVersionInfo(Application.ExecutablePath); - + Utility.SysInfoConfig(); string configUrl = getProgramUrl(localConfigPath, "configurl"); if (configUrl != "") { diff --git a/TreeUtils.cs b/TreeUtils.cs index 1f055b5..ad39643 100644 --- a/TreeUtils.cs +++ b/TreeUtils.cs @@ -19,7 +19,7 @@ public static void InitLayerTree(GSOGlobeControl gsoGlobeControl, TreeView treeView, string viewDatasrc) { // treeView.Nodes.Clear(); - LayerConfig layerConfig = Utility.layerConfig;//layertree所在的配置文件 + LayerConfig layerConfig = Utility.LayerConfig;//layertree所在的配置文件 List datasrcs = layerConfig.datasrcs; foreach (DataSrc datasrc in datasrcs) { diff --git a/Utility.cs b/Utility.cs index c03e405..ab947a3 100644 --- a/Utility.cs +++ b/Utility.cs @@ -20,7 +20,7 @@ public static string dbdatabase; public static string userID; - public static Hashtable Pipe_QueryFields; +// public static Hashtable Pipe_QueryFields; public static string DBPassword; public static string DBServer; public static string DBBackUp; @@ -38,7 +38,7 @@ public static List listPipelineType; public static string PicRootURL; public static string PicDefaultURL; - public static double dFlyAboveLine = 2; +// public static double dFlyAboveLine = 2; public static string userName; public static string projectStr; public static string userRole; @@ -85,12 +85,17 @@ public static List pipefittingLayerNames = new List();//管件图层名称 public static List sgPipeLayersNames = new List();//施工管线图层名称 -// public static Dictionary dictionaryNetLayerNameAndCaption = new Dictionary(); - public static HashSet layerNameSet = new HashSet(); + public static HashSet layerNameSet = new HashSet();//记录有哪些图层要显示 public static string roadLayerName = ""; #endregion wxl - public static LayerConfig layerConfig; + public static LayerConfig LayerConfig; + + public static string RoleServer; + public static string TitleImagePath; + public static string SysnameVersion; + public static string Copyright; + public static void SetBallons(GSOBalloon featureTooltip, GSOBalloonEx balloonEx) { featureTooltip.CacheFilePath = Application.StartupPath + "/GeoScene/Globe/Temp"; @@ -188,25 +193,6 @@ } return s.ToString(); } - public static GSOFeatures Table2Features(DataTable table, string currentQueryLayer, GSOGlobeControl globeControl1) - { - GSOFeatures features = new GSOFeatures(); - for (int i = 0; i < table.Rows.Count; i++) - { - DataRow row = table.Rows[i]; - - string featureName = row["编号"].ToString(); - featureName = featureName.Trim(); - GSOLayer layer = globeControl1.Globe.Layers.GetLayerByCaption(currentQueryLayer); - GSOFeatures tempfeatures = layer.GetFeatureByName(featureName, false); - if (tempfeatures.Length > 0) - { - features.Add(tempfeatures[0]); - } - } - return features; - } - //程序启动的时候读取配置文件 public static void SetParams() @@ -358,8 +344,8 @@ #region wxl 从layerconfig.xml中读取 - layerConfig = XmlTools.DeserializeFromXml(layerConfigFile); - List dataSrcs = layerConfig.datasrcs; + LayerConfig = XmlTools.DeserializeFromXml(layerConfigFile); + List dataSrcs = LayerConfig.datasrcs; foreach (var dataSrc in dataSrcs) { @@ -598,76 +584,49 @@ #endregion } - /* - //判断网络是否连接 - public static bool isNetworkConnectionSuccess(string ipAdress) + /// + /// 获取Config.xml配置文件中的roleurl配置，并返回 + /// + /// 请求综合信息平台的服务地址 + public static void SysInfoConfig() { - //return true; - if (ipAdress == null) - { - return false; - } - if (ipAdress.Contains("\\")) - { - ipAdress = ipAdress.Substring(0, ipAdress.LastIndexOf('\\')); - } - if (ipAdress.Trim() == "localhost" || ipAdress.Trim() == "127.0.0.1" || ipAdress.Trim() == Dns.GetHostName()) - { - return true; - } - Ping ping = new Ping(); + if (!File.Exists(filename)) return; + + XmlTextReader xmlReader = new XmlTextReader(filename); try { - PingReply pr = ping.Send(ipAdress.Trim(), 3000); - if (pr.Status == IPStatus.Success) + while (xmlReader.Read()) { - return true; + if (xmlReader.Name.Equals("roleurl")) + { + RoleServer = xmlReader.ReadElementString(); + } + else if (xmlReader.Name.Equals("titleimgpath")) + { + TitleImagePath = xmlReader.ReadElementString(); + } + else if (xmlReader.Name.Equals("sysname")) + { + SysnameVersion = xmlReader.ReadElementString(); + } + else if (xmlReader.Name.Equals("copyright")) + { + Copyright = xmlReader.ReadElementString(); + } } - else - { - return false; - } + } catch (Exception ex) { - LogError.PublishError(ex); - return false; + + LogHelper.Error("在config.xml配置文件中读取roleurl时出错"); } - } - */ - - - //TODO LIST:下面两个方法移到featueTools.cs中 - //根据附属物图层名字得到里面含有的附属物 - public static string[] getAccStrsByLayer(string layername) - { - string[] accStrs = null; - string sql = "select 附属物名称 from " + layername + " group by 附属物名称"; - DataSet dataset = OledbHelper.getDataSet(sql, layername); - if (dataset == null) return null; - accStrs = new string[dataset.Tables[0].Rows.Count]; - for (int i = 0; i < dataset.Tables[0].Rows.Count; i++) + finally { - accStrs[i] = dataset.Tables[0].Rows[i][0].ToString(); + xmlReader.Close(); } - return accStrs; } - //删除内存图层中指定名称的feature - public static void RemoveFeatureFromName(GSOGlobeControl globeControl1, string featureName) - { - GSOFeatures features = globeControl1.Globe.MemoryLayer.GetFeatureByName(featureName, true); - if (features != null) - { - for (int i = features.Length - 1; i >= 0; i--) - { - GSOFeature feature = features[i]; - if (feature != null) - { - globeControl1.Globe.MemoryLayer.RemoveFeatureByID(feature.ID); - } - } - } - globeControl1.Refresh(); - } + + } } diff --git a/ValidateInfo.cs b/ValidateInfo.cs index de75391..01546da 100644 --- a/ValidateInfo.cs +++ b/ValidateInfo.cs @@ -192,7 +192,7 @@ } if (!isSuccess) { - LogHelper.WriteLog(typeof(FieldUniqueValidate), logStr); + LogHelper.Error(logStr); } return isSuccess; } @@ -247,7 +247,7 @@ err += "未找到字段或其类型匹配:" + unFoundField.label + ":" + unFoundField.type + "\r\n"; } - LogHelper.WriteLog(typeof(FieldCountValidate), err); + LogHelper.Error(err); return false; } return true; @@ -316,7 +316,7 @@ { err += "字段:" + field.label + "出错\r\n"; } - LogHelper.WriteLog(typeof(FieldOrderValidate), err); + LogHelper.Error(err); return false; } return true; @@ -388,8 +388,7 @@ } if (isSuccess == false) { - LogHelper.WriteLog(typeof(FieldEmptyValidate), - "字段为空检查失败:\r\n" + err); + LogHelper.Error("字段为空检查失败:\r\n" + err); } return isSuccess; } diff --git a/FeatureStatisticsService.cs b/FeatureStatisticsService.cs index 331ee47..b127fe3 100644 --- a/FeatureStatisticsService.cs +++ b/FeatureStatisticsService.cs @@ -190,7 +190,7 @@ List result = new List(); //layer.Name是表名 - string[] accessStrs = Utility.getAccStrsByLayer(layer.Name); + string[] accessStrs = FeatureTools.GetAccStrsByLayer(layer.Name); foreach (string accssname in accessStrs) { diff --git a/FeatureTools.cs b/FeatureTools.cs index be4b469..3c08f34 100644 --- a/FeatureTools.cs +++ b/FeatureTools.cs @@ -1,5 +1,6 @@ using System; using System.Collections.Generic; +using System.Data; using System.Linq; using System.Text; using System.Windows.Forms; @@ -43,7 +44,7 @@ } feature.Delete();//地球上删除该feature string sql = "delete from " + layerName + " where LSSYS_ID =" + feature.ID + " and (编号 is null or substr(编号,length(编号)-2)='TMP')"; - OledbHelper.sqlExecuteNonQuery(sql);//目前无法取到LSSYS_ID，所以这个判断条件不太合适，会导致把该类所有新建的都删除了 + OledbHelper.sqlExecuteNonQuery(sql); } catch (Exception) { @@ -106,5 +107,46 @@ } return value; } + + /// + /// 根据附属物图层名字得到里面含有的附属物 + /// + /// + /// + public static string[] GetAccStrsByLayer(string layername) + { + string[] accStrs = null; + string sql = "select 附属物名称 from " + layername + " group by 附属物名称"; + DataSet dataset = OledbHelper.getDataSet(sql, layername); + if (dataset == null) return null; + accStrs = new string[dataset.Tables[0].Rows.Count]; + for (int i = 0; i < dataset.Tables[0].Rows.Count; i++) + { + accStrs[i] = dataset.Tables[0].Rows[i][0].ToString(); + } + return accStrs; + } + + /// + /// 删除内存图层中指定名称的feature + /// + /// + /// + public static void RemoveFeatureFromName(GSOGlobeControl globeControl1, string featureName) + { + GSOFeatures features = globeControl1.Globe.MemoryLayer.GetFeatureByName(featureName, true); + if (features != null) + { + for (int i = features.Length - 1; i >= 0; i--) + { + GSOFeature feature = features[i]; + if (feature != null) + { + globeControl1.Globe.MemoryLayer.RemoveFeatureByID(feature.ID); + } + } + } + globeControl1.Refresh(); + } } } diff --git a/Forms/FrmPipelineModelDataBase.cs b/Forms/FrmPipelineModelDataBase.cs index b577fd8..bc1e479 100644 --- a/Forms/FrmPipelineModelDataBase.cs +++ b/Forms/FrmPipelineModelDataBase.cs @@ -149,7 +149,7 @@ catch (Exception ex) { LogError.PublishError(ex); - LogHelper.WriteLog(typeof(FrmPipelineModelDB), ex.Message); + LogHelper.Error(ex.Message); } } diff --git a/FrmAccessoriesSensor.cs b/FrmAccessoriesSensor.cs index 98aa1cf..542f19a 100644 --- a/FrmAccessoriesSensor.cs +++ b/FrmAccessoriesSensor.cs @@ -240,7 +240,7 @@ { if (clbPipeLine.CheckedItems.Count > 0) { - Utility.RemoveFeatureFromName(globeControl1, "trackPolygon"); + FeatureTools.RemoveFeatureFromName(globeControl1, "trackPolygon"); globeControl1.Globe.Action = EnumAction3D.TrackPolygon; globeControl1.TrackPolygonEndEvent += globeControl1_TrackPolygonEndEvent; } @@ -259,7 +259,7 @@ private void FrmAccessoriesgather_FormClosing(object sender, FormClosingEventArgs e) { frm = null; - Utility.RemoveFeatureFromName(globeControl1, "trackPolygon"); + FeatureTools.RemoveFeatureFromName(globeControl1, "trackPolygon"); globeControl1.Globe.Action = EnumAction3D.ActionNull; globeControl1.TrackPolygonEndEvent -= globeControl1_TrackPolygonEndEvent; } diff --git a/FrmAccessoriesgather.cs b/FrmAccessoriesgather.cs index e1d176e..c36273b 100644 --- a/FrmAccessoriesgather.cs +++ b/FrmAccessoriesgather.cs @@ -118,7 +118,7 @@ { if (clbPipeLine2.Text!="") { - Utility.RemoveFeatureFromName(globeControl1, "trackPolygon"); + FeatureTools.RemoveFeatureFromName(globeControl1, "trackPolygon"); globeControl1.Globe.Action = EnumAction3D.TrackPolygon; globeControl1.Globe.TrackPolygonTool.TrackMode = EnumTrackMode.SpaceTrack; globeControl1.TrackPolygonEndEvent += globeControl1_TrackPolygonEndEvent; @@ -295,7 +295,7 @@ private void FrmAccessoriesgather_FormClosing(object sender, FormClosingEventArgs e) { frm = null; - Utility.RemoveFeatureFromName(globeControl1, "trackPolygon"); + FeatureTools.RemoveFeatureFromName(globeControl1, "trackPolygon"); globeControl1.TrackPolygonEndEvent -= globeControl1_TrackPolygonEndEvent; globeControl1.Globe.Action = EnumAction3D.ActionNull; diff --git a/FrmAddWellShp.cs b/FrmAddWellShp.cs index 7983349..78d8946 100644 --- a/FrmAddWellShp.cs +++ b/FrmAddWellShp.cs @@ -100,7 +100,7 @@ catch (Exception ex) { LogError.PublishError(ex); - LogHelper.WriteLog(typeof(FrmAddWellShp), ex.Message); + LogHelper.Error(ex.Message); } } diff --git a/FrmBSQStatis.cs b/FrmBSQStatis.cs index 5b05926..b5e581d 100644 --- a/FrmBSQStatis.cs +++ b/FrmBSQStatis.cs @@ -97,7 +97,7 @@ } catch (Exception ex) { - LogHelper.WriteLog(typeof(FrmBSQStatis),ex.Message); + LogHelper.Error(ex.Message); } return typeAndCount; } @@ -108,7 +108,7 @@ GSOLayer layer = globeControl1.Globe.Layers.GetLayerByCaption("标识器"); GSOFeatures bsqFs = FeatureStatisticsService.GetLayerFeatures(polygon, layer); if (bsqFs == null || bsqFs.Length <= 0) { - LogHelper.WriteLog(typeof(FrmBSQStatis),"标识器图层下的Feature为空"); + LogHelper.Error("标识器图层下的Feature为空!"); return null; } diff --git a/FrmBasicQuery.cs b/FrmBasicQuery.cs index baeeade..cc8d3ff 100644 --- a/FrmBasicQuery.cs +++ b/FrmBasicQuery.cs @@ -224,7 +224,7 @@ } catch(Exception ex) { - LogHelper.WriteLog(typeof(FrmBasicQuery), ex.Message); + LogHelper.Error(ex.Message); } } else diff --git a/FrmCodingQuery.cs b/FrmCodingQuery.cs index f1ac322..d4ec095 100644 --- a/FrmCodingQuery.cs +++ b/FrmCodingQuery.cs @@ -82,7 +82,7 @@ } catch (Exception ex) { - LogHelper.WriteLog(typeof(FrmCodingQuery), ex.Message); ; + LogHelper.Error(ex.Message); } } diff --git a/FrmDiameterQuery.cs b/FrmDiameterQuery.cs index e7b3657..75d7949 100644 --- a/FrmDiameterQuery.cs +++ b/FrmDiameterQuery.cs @@ -150,7 +150,7 @@ catch (Exception ex) { //LogError.PublishError(ex); - LogHelper.WriteLog(typeof(FrmDiameterQuery), ex.Message); + LogHelper.Error(ex.Message); MessageBox.Show("请输入正确的管径范围！"); return; } diff --git a/FrmFittingQuery.cs b/FrmFittingQuery.cs index 12f6007..8645011 100644 --- a/FrmFittingQuery.cs +++ b/FrmFittingQuery.cs @@ -69,7 +69,7 @@ } catch (Exception ex) { - LogHelper.WriteLog(typeof(FrmFittingQuery), ex.Message); + LogHelper.Error(ex.Message); } } /// diff --git a/FrmKeywordQuery.cs b/FrmKeywordQuery.cs index 405524f..ede0a93 100644 --- a/FrmKeywordQuery.cs +++ b/FrmKeywordQuery.cs @@ -87,7 +87,7 @@ } catch (Exception ex) { - LogHelper.WriteLog(typeof(FrmKeywordQuery), ex.Message); + LogHelper.Error(ex.Message); } } diff --git a/FrmLogin.cs b/FrmLogin.cs index 1172c23..6fbaed9 100644 --- a/FrmLogin.cs +++ b/FrmLogin.cs @@ -2,6 +2,8 @@ using System.Data; using System.Data.OracleClient; using System.IO; +using System.Net; +using System.Text; using System.Windows.Forms; using System.Xml; using DevComponents.DotNetBar; @@ -10,16 +12,15 @@ { public partial class FrmLogin : Office2007Form { + + //登录界面 -- 配置文件的路径 + public static string filename = Application.StartupPath + "\\login.xml"; + + public FrmLogin() { InitializeComponent(); } - public string rolename = "浏览"; - public string username = ""; - public string department = ""; - - //登录界面 -- 配置文件的路径 - public static string filename = Application.StartupPath + "\\login.xml"; /// /// 登录按钮事件处理 /// @@ -28,9 +29,10 @@ private void button1_Click(object sender, EventArgs e) { bool result = ValidateUser(); +// bool result =ValidateFromUrl();//从平台获取用户角色信息，判断是否能登陆成功 if (result) { - username = txtUser.Text.Trim(); + WriteXml(); Utility.userName = txtUser.Text.Trim(); DialogResult = DialogResult.OK; Close(); @@ -43,80 +45,6 @@ } } /// - /// 关闭按钮事件处理 - /// - /// - /// - private void button2_Click(object sender, EventArgs e) - { - Close(); - } - /// - /// 验证端口号 - /// - /// - //private bool ValiPort() - //{ - // Ping p = new Ping();//创建Ping对象p - // PingReply pr = p.Send(Utility.localicenseserverip);//向指定IP或者主机名的计算机发送ICMP协议的ping数据包 - // if (pr.Status == IPStatus.Success)//如果ping成功 - // { - // try - // { - // TcpClient tcpc = new TcpClient(Utility.localicenseserverip, Utility.localicenseserverport);//对IP地址为"192.168.0.105"的计算机的1500端口提出连接申请 - // tcpc.Close(); - // return true; - // } - // catch (Exception ex) - // { - // LogError.PublishError(ex); - // MessageBox.Show("端口连接错误！" + ex.Message); - // return false; - // } - // } - // else - // { - // int times = 0;//重新连接次数; - // int count = 2;//设置尝试次数 - // while (times < count) - // { - // //Thread.Sleep(1000);//等待时间(方便测试的话，你可以改为1000) - // pr = p.Send(Utility.localicenseserverip); - - // if (pr.Status == IPStatus.Success) - // { - // try - // { - // TcpClient tcpc = new TcpClient(Utility.localicenseserverip, Utility.localicenseserverport);//对IP地址为"192.168.0.105"的计算机的1500端口提出连接申请 - // tcpc.Close(); - // return true; - // } - // catch (Exception ex) - // { - // LogError.PublishError(ex); - // MessageBox.Show("端口连接错误！" + ex.Message); - // return false; - // } - // } - // else - // { - // times++; - // if (times < count) - // { - // continue; - // } - // else - // { - // MessageBox.Show("重新尝试连接失败"); - // return false; - // } - // } - - // } - // return false; - // } - //} - /// /// 验证用户名、密码 /// /// @@ -126,24 +54,64 @@ string sql = "select * from casic_userinfotest where USERNAME='" + txtUser.Text.Trim() + "' and PASSWORD='" + passWord + "' and sysname='GHFX' "; DataTable dt = OledbHelper.QueryTable(sql); - if (dt != null && dt.Rows.Count > 0) + if (dt == null || dt.Rows.Count <= 0) return false; + if (String.IsNullOrEmpty(dt.Rows[0]["rid"].ToString())) return true; + sql = "select gid from casic_userroletest where id=" + dt.Rows[0]["rid"] + " and sysname='GHFX' "; + using (OracleDataReader reader = OracleUtils.ExecuteReader(OracleUtils.ConnectionString, CommandType.Text, sql)) { - WriteXML(); - if (!String.IsNullOrEmpty(dt.Rows[0]["rid"].ToString())) + while (reader.Read()) { - sql = "select gid from casic_userroletest where id=" + dt.Rows[0]["rid"] + " and sysname='GHFX' "; - using (OracleDataReader reader = OracleUtils.ExecuteReader(OracleUtils.ConnectionString, CommandType.Text, sql)) - { - while (reader.Read()) - { - Utility.userRole = reader[0].ToString(); - break; - } - } + Utility.userRole = reader[0].ToString(); + LogHelper.Debug("测试一下"); + break; } - return true; } - return false; + return true; + } + + + + private bool ValidateFromUrl() + { + string user = txtUser.Text.Trim(); + string pwd = textBoxPassWord.Text.Trim(); + //做成配置的 + string roleserver = Utility.RoleServer; + if (roleserver == null || roleserver.Trim().Equals("")) + { + MessageBox.Show("请在Config.xml中配置roleurl！"); + return false; + } + HttpWebRequest request = + WebRequest.Create(roleserver+"/rs/authority/user?username=" + user + "&password=" + pwd + "&appId=21") as HttpWebRequest; + if (request == null) return false; + using (HttpWebResponse response = request.GetResponse() as HttpWebResponse) + { + try + { + if (response == null || response.GetResponseStream() == null) return false; + StreamReader reader = new StreamReader(response.GetResponseStream()); + string[] result = reader.ReadToEnd().Split(','); + //解析result + if (result.Length < 5) return false; + StringBuilder userRole = new StringBuilder(""); + for (int i = 4; i < result.Length; i++) + { + string[] tmpStrings = result[i].Split('_'); + if (tmpStrings.Length < 2) continue; + userRole.Append(tmpStrings[1].Trim() + ","); + } + if (userRole.Length < 3) return false; + userRole.Remove(userRole.Length - 3, 3); + // MessageBox.Show(userRole.ToString()); + Utility.userRole = userRole.ToString(); + return Utility.userRole != null && !Utility.userRole.Equals("null"); + } + catch (Exception e) + { + return false; + } + } } private void FrmLogin_Load(object sender, EventArgs e) @@ -153,74 +121,56 @@ StartPosition = FormStartPosition.CenterScreen; - ReadXML(); + ReadXml(); } /// /// 读取上一次登录的用户名和密码 /// - private void ReadXML() + private void ReadXml() { - if (File.Exists(filename)) + if (!File.Exists(filename)) return; + //初始化XML文档操作类 + XmlDocument myDoc = new XmlDocument(); { - if (!File.Exists(filename)) + //加载XML文件 + try { + myDoc.Load(filename); + } + catch (Exception e) + { + LogError.PublishError(e); return; } - - //初始化XML文档操作类 - XmlDocument myDoc = new XmlDocument(); + //搜索指定的节点 + XmlNode serverRootNode = myDoc.SelectSingleNode("Params"); + XmlNodeList nodes = null; + if (serverRootNode != null) { - //加载XML文件 - try + nodes = serverRootNode.ChildNodes; + } + if (nodes == null) return; + foreach (XmlNode xn in nodes) + { + if (xn.Name.Equals("username")) { - myDoc.Load(filename); + txtUser.Text = xn.InnerText.Trim(); } - catch (Exception e) + else if (xn.Name.Equals("password")) { - LogError.PublishError(e); - return; + textBoxPassWord.Text = xn.InnerText.Trim(); } - //搜索指定的节点 - XmlNode serverRootNode = myDoc.SelectSingleNode("Params"); - XmlNodeList nodes = null; - if (serverRootNode != null) + else if (xn.Name.Equals("isremember")) { - nodes = serverRootNode.ChildNodes; - } - if (nodes != null) - { - foreach (XmlNode xn in nodes) - { - if (xn.Name == "username") - { - txtUser.Text = xn.InnerText.Trim(); - } - else if (xn.Name == "password") - { - textBoxPassWord.Text = xn.InnerText.Trim(); - } - else if (xn.Name == "isremember") - { - if (xn.InnerText.Trim() == "true") - { - checkBoxXRememberPassword.Checked = true; - } - else if (xn.InnerText.Trim() == "false") - { - checkBoxXRememberPassword.Checked = false; - } - } - } - + checkBoxXRememberPassword.Checked = xn.InnerText.Trim().Equals("true"); } } } - } /// /// 记录登录的用户名和密码 /// - private void WriteXML() + private void WriteXml() { if (!File.Exists(filename)) { @@ -252,31 +202,17 @@ foreach (XmlNode xn in nodes) { XmlElement xe = (XmlElement)xn; - if (xe.Name == "username") + if (xe.Name.Equals("username")) { xe.InnerText = txtUser.Text.Trim(); } - else if (xe.Name == "password") + else if (xe.Name.Equals("password")) { - if (checkBoxXRememberPassword.Checked) - { - xe.InnerText = textBoxPassWord.Text.Trim(); - } - else - { - xe.InnerText = ""; - } + xe.InnerText = checkBoxXRememberPassword.Checked ? textBoxPassWord.Text.Trim() : ""; } - else if (xe.Name == "isremember") + else if (xe.Name.Equals("isremember")) { - if (checkBoxXRememberPassword.Checked) - { - xe.InnerText = "true"; - } - else - { - xe.InnerText = "false"; - } + xe.InnerText = checkBoxXRememberPassword.Checked ? "true" : "false"; } } } diff --git a/FrmMaterialSel.cs b/FrmMaterialSel.cs index 8645ab3..d23f385 100644 --- a/FrmMaterialSel.cs +++ b/FrmMaterialSel.cs @@ -157,7 +157,7 @@ } catch (Exception ex) { - LogHelper.WriteLog(typeof(FrmMaterialSel), ex.Message); + LogHelper.Error(ex.Message); } } diff --git a/FrmMetadataStat.cs b/FrmMetadataStat.cs index c3c1359..96029a6 100644 --- a/FrmMetadataStat.cs +++ b/FrmMetadataStat.cs @@ -96,7 +96,7 @@ //统计有多少个图层 private int statistLayer() { - List datasrcs = Utility.layerConfig.datasrcs; + List datasrcs = Utility.LayerConfig.datasrcs; return datasrcs.SelectMany(datasrc => datasrc.layertypes).Sum(layerType => layerType.layers.Count); } diff --git a/FrmpipeDeepstatis.cs b/FrmpipeDeepstatis.cs index 6a5c895..8d915a9 100644 --- a/FrmpipeDeepstatis.cs +++ b/FrmpipeDeepstatis.cs @@ -2,6 +2,7 @@ using System.Collections.Generic; using System.Diagnostics; using System.IO; +using System.Reflection; using System.Text; using System.Windows.Forms; using System.Windows.Forms.DataVisualization.Charting; @@ -320,7 +321,7 @@ MessageBox.Show("请添加分段"); return; } - Utility.RemoveFeatureFromName(globeControl1, "trackPolygon"); + FeatureTools.RemoveFeatureFromName(globeControl1, "trackPolygon"); globeControl1.Globe.Action = EnumAction3D.TrackPolygon; globeControl1.Globe.TrackPolygonTool.TrackMode = EnumTrackMode.SpaceTrack; globeControl1.TrackPolygonEndEvent += globeControl1_TrackPolygonEndEvent; @@ -408,12 +409,11 @@ TextBox control; private void dataGridViewX2_EditingControlShowing(object sender, DataGridViewEditingControlShowingEventArgs e) { - if (e.Control.GetType().BaseType.Name == "TextBox") - { - control = new TextBox(); - control = (TextBox)e.Control; - control.KeyPress += control_KeyPress; - } + MemberInfo memberInfo = e.Control.GetType().BaseType; + if (memberInfo != null && !memberInfo.Name.Equals("TextBox")) return; + control = new TextBox(); + control = (TextBox)e.Control; + control.KeyPress += control_KeyPress; } /// /// 键盘按键按下事件处理 @@ -423,28 +423,24 @@ void control_KeyPress(object sender, KeyPressEventArgs e) { TextBox text = sender as TextBox; + if (text == null) return; if ((e.KeyChar < 48 || e.KeyChar > 57) && (e.KeyChar != 8) && e.KeyChar != 46) { e.Handled = true; } - if (e.KeyChar == 46) //小数点 + if (e.KeyChar != 46) return; + if (text.Text.Length <= 0) + e.Handled = true; //小数点不能在第一位 + else //处理不规则的小数点 { - if (text.Text.Length <= 0) - e.Handled = true; //小数点不能在第一位 - else //处理不规则的小数点 + float f; + float oldf; + bool b1 = false, b2 = false; + b1 = float.TryParse(text.Text, out oldf); + b2 = float.TryParse(text.Text + e.KeyChar, out f); + if (!b2) { - float f; - float oldf; - bool b1 = false, b2 = false; - b1 = float.TryParse(text.Text, out oldf); - b2 = float.TryParse(text.Text + e.KeyChar, out f); - if (b2 == false) - { - if (b1) - e.Handled = true; - else - e.Handled = false; - } + e.Handled = b1; } } } @@ -457,7 +453,7 @@ { frm = null; - Utility.RemoveFeatureFromName(globeControl1, "trackPolygon"); + FeatureTools.RemoveFeatureFromName(globeControl1, "trackPolygon"); globeControl1.TrackPolygonEndEvent -= globeControl1_TrackPolygonEndEvent; globeControl1.Globe.Action = EnumAction3D.ActionNull; diff --git a/FrmpipeDiametergather.cs b/FrmpipeDiametergather.cs index a9d96fa..c09aaf1 100644 --- a/FrmpipeDiametergather.cs +++ b/FrmpipeDiametergather.cs @@ -154,7 +154,7 @@ MessageBox.Show("请选择图层！"); return; } - Utility.RemoveFeatureFromName(globeControl1, "trackPolygon"); + FeatureTools.RemoveFeatureFromName(globeControl1, "trackPolygon"); globeControl1.Globe.Action = EnumAction3D.TrackPolygon; globeControl1.Globe.TrackPolygonTool.TrackMode = EnumTrackMode.SpaceTrack; globeControl1.TrackPolygonEndEvent += globeControl1_TrackPolygonEndEvent; @@ -392,7 +392,7 @@ private void FrmpipeDiametergather_FormClosing(object sender, FormClosingEventArgs e) { frm = null; - Utility.RemoveFeatureFromName(globeControl1, "trackPolygon"); + FeatureTools.RemoveFeatureFromName(globeControl1, "trackPolygon"); globeControl1.TrackPolygonEndEvent -= globeControl1_TrackPolygonEndEvent; globeControl1.Globe.Action = EnumAction3D.ActionNull; diff --git a/FrmpipeMaterialGather.cs b/FrmpipeMaterialGather.cs index 44e7f24..5ca8144 100644 --- a/FrmpipeMaterialGather.cs +++ b/FrmpipeMaterialGather.cs @@ -58,10 +58,9 @@ for (int i = 0; i < pipeLayerNames.Count; i++) { clbPipeLine.Items.Add(pipeLayerNames[i]); - GSOLayer layer = globeControl1.Globe.Layers.GetLayerByCaption(pipeLayerNames[i]); - if (layer.Dataset == null || !layer.Dataset.IsFeatureDataset || layer.Type != EnumLayerType.FeatureLayer) continue; + GSOLayer layer = globeControl1.Globe.Layers.GetLayerByCaption(pipeLayerNames[i]); + if (layer == null || layer.Dataset == null || !layer.Dataset.IsFeatureDataset || layer.Type != EnumLayerType.FeatureLayer) continue; - string name = layer.Name; GSOFeatureLayer flayer = layer as GSOFeatureLayer; GSOFeatures feats = flayer.GetAllFeatures(); @@ -205,7 +204,7 @@ { chart1.Series.Add(clbPipeLine.CheckedItems[i].ToString()); GSOLayer layer = globeControl1.Globe.Layers.GetLayerByCaption(clbPipeLine.CheckedItems[i].ToString()); - if (layer != null && layer is GSOFeatureLayer) + if (layer is GSOFeatureLayer) { GSOFeatureLayer flayer = layer as GSOFeatureLayer; GSOFeatures features = flayer.GetAllFeatures(); @@ -240,10 +239,9 @@ labeStyleAxisX.Enabled = true; chart1.ChartAreas["ChartArea1"].AxisX.LabelStyle = labeStyleAxisX; - Dictionary dic1 = new Dictionary(); for (int j = 0; j < chart1.Series.Count; j++) { - dic1 = new Dictionary(); + Dictionary dic1 = new Dictionary(); foreach (string key in dic.Keys) { if (key.Contains(chart1.Series[j].Name)) @@ -304,7 +302,7 @@ MessageBox.Show("请选择材质类型！"); return; } - Utility.RemoveFeatureFromName(globeControl1, "trackPolygon"); + FeatureTools.RemoveFeatureFromName(globeControl1, "trackPolygon"); globeControl1.Globe.Action = EnumAction3D.TrackPolygon; globeControl1.Globe.TrackPolygonTool.TrackMode = EnumTrackMode.SpaceTrack; globeControl1.TrackPolygonEndEvent += globeControl1_TrackPolygonEndEvent; @@ -318,7 +316,7 @@ private void FrmpipeMaterialGather_FormClosing(object sender, FormClosingEventArgs e) { frm = null; - Utility.RemoveFeatureFromName(globeControl1, "trackPolygon"); + FeatureTools.RemoveFeatureFromName(globeControl1, "trackPolygon"); globeControl1.TrackPolygonEndEvent -= globeControl1_TrackPolygonEndEvent; globeControl1.Globe.Action = EnumAction3D.ActionNull; diff --git a/Frmpipediameterstatis.cs b/Frmpipediameterstatis.cs index 4fb25a8..631a996 100644 --- a/Frmpipediameterstatis.cs +++ b/Frmpipediameterstatis.cs @@ -202,8 +202,8 @@ } catch (Exception ex) { - LogHelper.WriteLog(typeof(Frmpipediameterstatis), ex.Message); //MessageBox.Show(ex.Message); + LogHelper.Error(ex.Message); LogError.PublishError(ex); } } @@ -372,7 +372,7 @@ MessageBox.Show("请添加分段！"); return; } - Utility.RemoveFeatureFromName(globeControl1, "trackPolygon"); + FeatureTools.RemoveFeatureFromName(globeControl1, "trackPolygon"); globeControl1.Globe.Action = EnumAction3D.TrackPolygon; globeControl1.Globe.TrackPolygonTool.TrackMode = EnumTrackMode.SpaceTrack; globeControl1.TrackPolygonEndEvent += globeControl1_TrackPolygonEndEvent; @@ -422,7 +422,7 @@ globeControl1.Globe.Action = EnumAction3D.ActionNull; globeControl1.TrackPolygonEndEvent -= globeControl1_TrackPolygonEndEvent; - Utility.RemoveFeatureFromName(globeControl1, "trackPolygon"); + FeatureTools.RemoveFeatureFromName(globeControl1, "trackPolygon"); globeControl1.Globe.MemoryLayer.RemoveAllFeature(); } diff --git a/LineBuilder.cs b/LineBuilder.cs index 33a216c..b6a8516 100644 --- a/LineBuilder.cs +++ b/LineBuilder.cs @@ -43,8 +43,8 @@ GSOGeoPolyline3D lineeee = f.Geometry as GSOGeoPolyline3D; if (lineeee == null || lineeee.GetSpaceLength(true, 6378137) == 0) { - LogHelper.WriteLog(typeof(LineBuilder), "出现数据无法入库:"+f.ID); - continue; //TODO LIST:判断是否会出现部署数据无法入库情况,Log2Net + LogHelper.Error("出现数据无法入库:" + f.ID); + continue; } GSOFeature newFeature = newFeatureSet.CreateFeature(); diff --git a/LogHelper.cs b/LogHelper.cs index 9ef5f27..04573cf 100644 --- a/LogHelper.cs +++ b/LogHelper.cs @@ -1,4 +1,5 @@ using System; +using System.Diagnostics; using log4net; using log4net.Config; @@ -7,35 +8,82 @@ { public class LogHelper { - /// - /// 输出日志到Log4Net - /// - /// - /// - #region static void WriteLog(Type t, Exception ex) - public static void WriteLog(Type t, Exception ex) + private static ILog _logdebug = log4net.LogManager.GetLogger("logdebug"); + private static ILog _loginfo = log4net.LogManager.GetLogger("loginfo"); + private static ILog _logwarn = log4net.LogManager.GetLogger("logwarn"); + private static ILog _logerror = log4net.LogManager.GetLogger("logerror"); + private static ILog _logfatal = log4net.LogManager.GetLogger("logfatal"); + + public static void Debug(string msg) { - ILog log = log4net.LogManager.GetLogger(t); - log.Error("Error", ex); + StackFrame sf = new StackFrame(1); + msg = string.Format("{0}.{1}:{2}", sf.GetMethod().ReflectedType.FullName, sf.GetMethod().Name, msg); + _logdebug.Debug(msg); + } + public static void Debug(string msg, Exception e) + { + StackFrame sf = new StackFrame(1); + msg = string.Format("{0}.{1}:{2}", sf.GetMethod().ReflectedType.FullName, sf.GetMethod().Name, msg); + _logdebug.Debug(msg, e); } - #endregion - /// - /// 输出日志到Log4Net - /// - /// - /// - #region static void WriteLog(Type t, string msg) - - public static void WriteLog(Type t, string msg) + public static void Info(string msg) { - ILog log = log4net.LogManager.GetLogger(t); - log.Error(msg); + StackFrame sf = new StackFrame(1); + msg = string.Format("{0}.{1}:{2}", sf.GetMethod().ReflectedType.FullName, sf.GetMethod().Name, msg); + _loginfo.Info(msg); + } + public static void Info(string msg, Exception e) + { + StackFrame sf = new StackFrame(1); + msg = string.Format("{0}.{1}:{2}", sf.GetMethod().ReflectedType.FullName, sf.GetMethod().Name, msg); + _loginfo.Info(msg, e); } - #endregion + + public static void Warn(string msg) + { + StackFrame sf = new StackFrame(1); + msg = string.Format("{0}.{1}:{2}", sf.GetMethod().ReflectedType.FullName, sf.GetMethod().Name, msg); + _logwarn.Warn(msg); + } + public static void Warn(string msg, Exception e) + { + StackFrame sf = new StackFrame(1); + msg = string.Format("{0}.{1}:{2}", sf.GetMethod().ReflectedType.FullName, sf.GetMethod().Name, msg); + _logwarn.Warn(msg, e); + } + + + public static void Error(string msg) + { + StackFrame sf = new StackFrame(1); + msg = string.Format("{0}.{1}:{2}", sf.GetMethod().ReflectedType.FullName, sf.GetMethod().Name, msg); + _logerror.Error(msg); + } + public static void Error(string msg, Exception e) + { + StackFrame sf = new StackFrame(1); + msg = string.Format("{0}.{1}:{2}", sf.GetMethod().ReflectedType.FullName, sf.GetMethod().Name, msg); + _logerror.Error(msg, e); + } + + + public static void Fatal(string msg) + { + StackFrame sf = new StackFrame(1); + msg = string.Format("{0}.{1}:{2}", sf.GetMethod().ReflectedType.FullName, sf.GetMethod().Name, msg); + _logfatal.Fatal(msg); + } + public static void Fatal(string msg, Exception e) + { + StackFrame sf = new StackFrame(1); + msg = string.Format("{0}.{1}:{2}", sf.GetMethod().ReflectedType.FullName, sf.GetMethod().Name, msg); + _logfatal.Fatal(msg, e); + } + } diff --git a/MainFrm.cs b/MainFrm.cs index 43de664..51f362a 100644 --- a/MainFrm.cs +++ b/MainFrm.cs @@ -18,7 +18,6 @@ using GeoScene.Data; using GeoScene.Engine; using GeoScene.Globe; -using Timer = System.Windows.Forms.Timer; using ToolTip = System.Windows.Forms.ToolTip; namespace Cyberpipe @@ -163,6 +162,7 @@ /// private void AddGZ() { + lendendGZ50 = new GSOHudButton(); lendendGZ50.SetImage(Application.StartupPath + "/Resource/管纵/50.png"); lendendGZ50.SetOffset(0, 0); @@ -1294,18 +1294,19 @@ private void MainFrm_Load(object sender, EventArgs e) { + layerTree.Nodes.Add("正在加载，请稍后……");//树状图加载在图层加载之后，故增加提示 initGlobalControl(); - //initGlobalMap(); - //initLayerTree(); initMarkerTree(); initLayout(); loadData(); - double x = Convert.ToDouble(Utility.Query_Roads["定位"].ToString().Split(',')[0]); - double y = Convert.ToDouble(Utility.Query_Roads["定位"].ToString().Split(',')[1]); - double z = Convert.ToDouble(Utility.Query_Roads["定位"].ToString().Split(',')[2]); + + double x = Convert.ToDouble(Utility.Query_Roads["绿岛"].ToString().Split(',')[0]); + double y = Convert.ToDouble(Utility.Query_Roads["绿岛"].ToString().Split(',')[1]); + double z = Convert.ToDouble(Utility.Query_Roads["绿岛"].ToString().Split(',')[2]); jumpToCameraState(x, y, z); + } #endregion @@ -1315,11 +1316,17 @@ if (e.Layer == null || !e.Layer.Caption.Equals(Utility.roadLayerName)) return; foreach (TreeNode layerTreeNode in layerTree.Nodes) { - foreach (TreeNode node in layerTreeNode.Nodes) + for (int i=0;i dt, DataGridView dataGridView) @@ -7330,7 +7337,7 @@ } catch (Exception ex) { - LogHelper.WriteLog(typeof(MainFrm), ex); + LogHelper.Debug("", ex); } } } @@ -7362,7 +7369,7 @@ GSOLayer layer = globeControl1.Globe.Layers.Add(strDataPath); if (layer == null) {//wxl - LogHelper.WriteLog(typeof(MainFrm), "buttonItemHX1_Click操作中，" + strDataPath + "的layer为空"); + LogHelper.Error("buttonItemHX1_Click操作中，" + strDataPath + "的layer为空"); continue; } GSOFeatures redFeatures = layer.GetAllFeatures(); @@ -7457,17 +7464,12 @@ { try { + globeControl1.BeforeSceneRenderEvent -= globeControl1_BeforeSceneRenderEvent; globeControl2.BeforeSceneRenderEvent -= globeControl2_BeforeSceneRenderEvent; - double x = Convert.ToDouble(Utility.Query_Roads["定位"].ToString().Split(',')[0]); - double y = Convert.ToDouble(Utility.Query_Roads["定位"].ToString().Split(',')[1]); - double z = Convert.ToDouble(Utility.Query_Roads["定位"].ToString().Split(',')[2]); - jumpToCameraState(x, y, z); - /* globeControl1.Globe.FlyToPosition(new GSOPoint3d(120.610963, 31.188121, 50), EnumAltitudeMode.Absolute, -4, 50, 800); globeControl1.Globe.FlyToPointSpeed = 10000000; - * */ globeControl1.Globe.Action = EnumAction3D.SelectObject; globeControl1.Refresh(); @@ -7489,6 +7491,37 @@ } } /// + /// 基础工具 + /// + /// + /// + private void ribbonTabItem1_MouseDown(object sender, MouseEventArgs e) + { + try + { + + globeControl1.BeforeSceneRenderEvent -= globeControl1_BeforeSceneRenderEvent; + globeControl2.BeforeSceneRenderEvent -= globeControl2_BeforeSceneRenderEvent; + + globeControl1.Globe.Action = EnumAction3D.ActionNull; + dataGridViewX1.AutoSizeColumnsMode = DataGridViewAutoSizeColumnsMode.AllCells; + //zhanshi = false; + redSH = false; + splitContainer1.Panel2Collapsed = true; + panelOfTable.Visible = false; + legendSC.Visible = false; + legendSG.Visible = false; + ClearGZData(); + GSOLayer redLayer = globeControl1.Globe.Layers.GetLayerByCaption("红线"); + if (redLayer == null) return; + redLayer.Visible = false; + } + catch (Exception ex) + { + //MessageBox.Show("系统运行错误:" + ex.ToString(), "错误", MessageBoxButtons.OK, MessageBoxIcon.Error); + } + } + /// /// 一键审核 /// /// @@ -7497,6 +7530,7 @@ { try { + globeControl1.BeforeSceneRenderEvent -= globeControl1_BeforeSceneRenderEvent; globeControl2.BeforeSceneRenderEvent -= globeControl2_BeforeSceneRenderEvent; @@ -7518,32 +7552,7 @@ //MessageBox.Show("系统运行错误:" + ex.ToString(), "错误", MessageBoxButtons.OK, MessageBoxIcon.Error); } } - - void ResetRibbonTab() - { - try - { - globeControl1.BeforeSceneRenderEvent -= globeControl1_BeforeSceneRenderEvent; - globeControl2.BeforeSceneRenderEvent -= globeControl2_BeforeSceneRenderEvent; - - globeControl1.Globe.Action = EnumAction3D.ActionNull; - dataGridViewX1.AutoSizeColumnsMode = DataGridViewAutoSizeColumnsMode.AllCells; - //zhanshi = false; - redSH = false; - splitContainer1.Panel2Collapsed = true; - panelOfTable.Visible = false; - legendSC.Visible = false; - legendSG.Visible = false; - ClearGZData(); - GSOLayer redLayer = globeControl1.Globe.Layers.GetLayerByCaption("红线"); - if (redLayer == null) return; - redLayer.Visible = false; - } - catch (Exception ex) - { - LogHelper.WriteLog(typeof(MainFrm), ex); - } - } + /// /// 双屏对比 /// @@ -7553,8 +7562,8 @@ { try { - globeControl1.BeforeSceneRenderEvent += new BeforeSceneRenderEventHandler(globeControl1_BeforeSceneRenderEvent); - globeControl2.BeforeSceneRenderEvent += new BeforeSceneRenderEventHandler(globeControl2_BeforeSceneRenderEvent); + globeControl1.BeforeSceneRenderEvent += globeControl1_BeforeSceneRenderEvent; + globeControl2.BeforeSceneRenderEvent += globeControl2_BeforeSceneRenderEvent; globeControl1.Globe.Action = EnumAction3D.ActionNull; panelOfTable.Visible = false; @@ -7570,32 +7579,43 @@ GSOLayer redLayer = globeControl1.Globe.Layers.GetLayerByCaption("红线"); if (redLayer != null) - { redLayer.Visible = false; - } } catch (Exception ex) { - LogHelper.WriteLog(typeof(MainFrm), ex); + //MessageBox.Show("系统运行错误:" + ex.ToString(), "错误", MessageBoxButtons.OK, MessageBoxIcon.Error); } } /// - /// 基础工具 - /// - /// - /// - private void ribbonTabItem1_MouseDown(object sender, MouseEventArgs e) - { - ResetRibbonTab(); - } - /// /// 文档管理 /// /// /// private void ribbonTabItem4_MouseDown(object sender, MouseEventArgs e) { - ResetRibbonTab(); + try + { + + globeControl1.BeforeSceneRenderEvent -= globeControl1_BeforeSceneRenderEvent; + globeControl2.BeforeSceneRenderEvent -= globeControl2_BeforeSceneRenderEvent; + + globeControl1.Globe.Action = EnumAction3D.ActionNull; + panelOfTable.Visible = false; + //zhanshi = false; + redSH = false; + splitContainer1.Panel2Collapsed = true; + dataGridViewX1.AutoSizeColumnsMode = DataGridViewAutoSizeColumnsMode.AllCells; + legendSC.Visible = false; + legendSG.Visible = false; + ClearGZData(); + GSOLayer redLayer = globeControl1.Globe.Layers.GetLayerByCaption("红线"); + if (redLayer != null) + redLayer.Visible = false; + } + catch (Exception ex) + { + //MessageBox.Show("系统运行错误:" + ex.ToString(), "错误", MessageBoxButtons.OK, MessageBoxIcon.Error); + } } /// /// 基础管理 @@ -7604,7 +7624,29 @@ /// private void ribbonTabItem14_MouseDown(object sender, MouseEventArgs e) { - ResetRibbonTab(); + try + { + globeControl1.BeforeSceneRenderEvent -= globeControl1_BeforeSceneRenderEvent; + globeControl2.BeforeSceneRenderEvent -= globeControl2_BeforeSceneRenderEvent; + + globeControl1.Globe.Action = EnumAction3D.ActionNull; + panelOfTable.Visible = false; + //zhanshi = false; + redSH = false; + splitContainer1.Panel2Collapsed = true; + dataGridViewX1.AutoSizeColumnsMode = DataGridViewAutoSizeColumnsMode.AllCells; + legendSC.Visible = false; + legendSG.Visible = false; + ClearGZData(); + + GSOLayer redLayer = globeControl1.Globe.Layers.GetLayerByCaption("红线"); + if (redLayer != null) + redLayer.Visible = false; + } + catch (Exception ex) + { + //MessageBox.Show("系统运行错误:" + ex.ToString(), "错误", MessageBoxButtons.OK, MessageBoxIcon.Error); + } } /// /// 权限管理 @@ -7613,26 +7655,31 @@ /// private void ribbonTabItem2_MouseDown(object sender, MouseEventArgs e) { - ResetRibbonTab(); + try + { + globeControl1.BeforeSceneRenderEvent -= globeControl1_BeforeSceneRenderEvent; + globeControl2.BeforeSceneRenderEvent -= globeControl2_BeforeSceneRenderEvent; + + globeControl1.Globe.Action = EnumAction3D.ActionNull; + panelOfTable.Visible = false; + //zhanshi = false; + redSH = false; + splitContainer1.Panel2Collapsed = true; + dataGridViewX1.AutoSizeColumnsMode = DataGridViewAutoSizeColumnsMode.AllCells; + legendSC.Visible = false; + legendSG.Visible = false; + ClearGZData(); + + GSOLayer redLayer = globeControl1.Globe.Layers.GetLayerByCaption("红线"); + if (redLayer == null) return; + redLayer.Visible = false; + } + catch (Exception ex) + { + //MessageBox.Show("系统运行错误:" + ex.ToString(), "错误", MessageBoxButtons.OK, MessageBoxIcon.Error); + } } - /// - /// 管线定位 - /// - /// - /// - private void ribbonTabItem7_MouseDown(object sender, MouseEventArgs e) - { - ResetRibbonTab(); - } - /// - /// 标识器管理 - /// - /// - /// - private void ribbonTabItem5_MouseDown(object sender, MouseEventArgs e) - { - ResetRibbonTab(); - } + //GSOFeature dpFeatuer = null; /// /// 双屏分析，点击管段分析 @@ -8017,7 +8064,9 @@ private void btn_flag_Click(object sender, EventArgs e) { if (FrmFlagManagers.IS_OPEN) + { return; + } FrmFlagManagers frm = new FrmFlagManagers(globeControl1); frm.Show(this); } diff --git a/MainFrm.designer.cs b/MainFrm.designer.cs index e3dca41..73398c0 100644 --- a/MainFrm.designer.cs +++ b/MainFrm.designer.cs @@ -4,6 +4,7 @@ using DevComponents.DotNetBar; using DevComponents.DotNetBar.Controls; using DevComponents.Editors; +using System.Drawing; namespace Cyberpipe { @@ -89,6 +90,7 @@ this.sideBar1 = new DevComponents.DotNetBar.SideBar(); this.panelEx3 = new DevComponents.DotNetBar.PanelEx(); this.layerSensorTree = new System.Windows.Forms.TreeView(); + this.layerTree = new Cyberpipe.MyTreeView(); this.sideBarPanelItem3 = new DevComponents.DotNetBar.SideBarPanelItem(); this.controlContainerItem3 = new DevComponents.DotNetBar.ControlContainerItem(); this.sideBarPanelItem4 = new DevComponents.DotNetBar.SideBarPanelItem(); @@ -243,42 +245,18 @@ this.保存ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.定位ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.ribbonControl1 = new DevComponents.DotNetBar.RibbonControl(); - this.ribbonPanel6 = new DevComponents.DotNetBar.RibbonPanel(); - this.ribbonBar6 = new DevComponents.DotNetBar.RibbonBar(); - this.buttonItemSPSZ = new DevComponents.DotNetBar.ButtonItem(); - this.buttonItem8 = new DevComponents.DotNetBar.ButtonItem(); - this.buttonItemLocation = new DevComponents.DotNetBar.ButtonItem(); - this.sliderItem2 = new DevComponents.DotNetBar.SliderItem(); - this.buttonItemGBJC = new DevComponents.DotNetBar.ButtonItem(); - this.ribbonPanel5 = new DevComponents.DotNetBar.RibbonPanel(); - this.ribbonBar2 = new DevComponents.DotNetBar.RibbonBar(); - this.buttonItemHX1 = new DevComponents.DotNetBar.ButtonItem(); - this.buttonItemHX2 = new DevComponents.DotNetBar.ButtonItem(); - this.buttonItemDCTP = new DevComponents.DotNetBar.ButtonItem(); - this.sliderItem3 = new DevComponents.DotNetBar.SliderItem(); - this.ribbonPanel1 = new DevComponents.DotNetBar.RibbonPanel(); - this.ribbonBar21 = new DevComponents.DotNetBar.RibbonBar(); - this.buttonItem87 = new DevComponents.DotNetBar.ButtonItem(); - this.buttonItem88 = new DevComponents.DotNetBar.ButtonItem(); - this.buttonItem27 = new DevComponents.DotNetBar.ButtonItem(); - this.buttonItem91 = new DevComponents.DotNetBar.ButtonItem(); - this.buttonItem1 = new DevComponents.DotNetBar.ButtonItem(); - this.btnlegendSet = new DevComponents.DotNetBar.ButtonItem(); - this.buttonItem89 = new DevComponents.DotNetBar.ButtonItem(); - this.btnOutputJPG = new DevComponents.DotNetBar.ButtonItem(); - this.ribbonPanel12 = new DevComponents.DotNetBar.RibbonPanel(); - this.ribbonBar18 = new DevComponents.DotNetBar.RibbonBar(); - this.buttonItem133 = new DevComponents.DotNetBar.ButtonItem(); - this.ribbonBar13 = new DevComponents.DotNetBar.RibbonBar(); - this.buttonItem127 = new DevComponents.DotNetBar.ButtonItem(); - this.buttonItem128 = new DevComponents.DotNetBar.ButtonItem(); - this.sliderItem1 = new DevComponents.DotNetBar.SliderItem(); - this.buttonItem134 = new DevComponents.DotNetBar.ButtonItem(); - this.buttonItem130 = new DevComponents.DotNetBar.ButtonItem(); - this.btn_check_history = new DevComponents.DotNetBar.ButtonItem(); - this.ribbonPanel4 = new DevComponents.DotNetBar.RibbonPanel(); - this.ribbonBar1 = new DevComponents.DotNetBar.RibbonBar(); - this.btn_document_info = new DevComponents.DotNetBar.ButtonItem(); + this.ribbonPanel3 = new DevComponents.DotNetBar.RibbonPanel(); + this.ribbonBar4 = new DevComponents.DotNetBar.RibbonBar(); + this.btn_flag = new DevComponents.DotNetBar.ButtonItem(); + this.slider4ground = new DevComponents.DotNetBar.SliderItem(); + this.ribbonPanel7 = new DevComponents.DotNetBar.RibbonPanel(); + this.gxdw_ribbonbar = new DevComponents.DotNetBar.RibbonBar(); + this.buttonItem9 = new DevComponents.DotNetBar.ButtonItem(); + this.buttonItem10 = new DevComponents.DotNetBar.ButtonItem(); + this.buttonItem11 = new DevComponents.DotNetBar.ButtonItem(); + this.buttonItem12 = new DevComponents.DotNetBar.ButtonItem(); + this.buttonItem13 = new DevComponents.DotNetBar.ButtonItem(); + this.buttonItem14 = new DevComponents.DotNetBar.ButtonItem(); this.ribbonPanel15 = new DevComponents.DotNetBar.RibbonPanel(); this.ribbonBar20 = new DevComponents.DotNetBar.RibbonBar(); this.buttonItemSH = new DevComponents.DotNetBar.ButtonItem(); @@ -334,18 +312,6 @@ this.buttonItemXT4 = new DevComponents.DotNetBar.ButtonItem(); this.buttonItemXT4_1 = new DevComponents.DotNetBar.ButtonItem(); this.buttonItemXT4_2 = new DevComponents.DotNetBar.ButtonItem(); - this.ribbonPanel3 = new DevComponents.DotNetBar.RibbonPanel(); - this.ribbonBar4 = new DevComponents.DotNetBar.RibbonBar(); - this.btn_flag = new DevComponents.DotNetBar.ButtonItem(); - this.slider4ground = new DevComponents.DotNetBar.SliderItem(); - this.ribbonPanel7 = new DevComponents.DotNetBar.RibbonPanel(); - this.gxdw_ribbonbar = new DevComponents.DotNetBar.RibbonBar(); - this.buttonItem9 = new DevComponents.DotNetBar.ButtonItem(); - this.buttonItem10 = new DevComponents.DotNetBar.ButtonItem(); - this.buttonItem11 = new DevComponents.DotNetBar.ButtonItem(); - this.buttonItem12 = new DevComponents.DotNetBar.ButtonItem(); - this.buttonItem13 = new DevComponents.DotNetBar.ButtonItem(); - this.buttonItem14 = new DevComponents.DotNetBar.ButtonItem(); this.ribbonPanel2 = new DevComponents.DotNetBar.RibbonPanel(); this.ribbonBar3 = new DevComponents.DotNetBar.RibbonBar(); this.btn_user_info = new DevComponents.DotNetBar.ButtonItem(); @@ -355,6 +321,43 @@ this.btn_user_role = new DevComponents.DotNetBar.ButtonItem(); this.btn_password_edit = new DevComponents.DotNetBar.ButtonItem(); this.buttonItemPasswordReset = new DevComponents.DotNetBar.ButtonItem(); + this.ribbonPanel6 = new DevComponents.DotNetBar.RibbonPanel(); + this.ribbonBar6 = new DevComponents.DotNetBar.RibbonBar(); + this.buttonItemSPSZ = new DevComponents.DotNetBar.ButtonItem(); + this.buttonItem8 = new DevComponents.DotNetBar.ButtonItem(); + this.buttonItemLocation = new DevComponents.DotNetBar.ButtonItem(); + this.sliderItem2 = new DevComponents.DotNetBar.SliderItem(); + this.buttonItemGBJC = new DevComponents.DotNetBar.ButtonItem(); + this.ribbonPanel5 = new DevComponents.DotNetBar.RibbonPanel(); + this.ribbonBar2 = new DevComponents.DotNetBar.RibbonBar(); + this.buttonItemHX1 = new DevComponents.DotNetBar.ButtonItem(); + this.buttonItemHX2 = new DevComponents.DotNetBar.ButtonItem(); + this.buttonItemDCTP = new DevComponents.DotNetBar.ButtonItem(); + this.sliderItem3 = new DevComponents.DotNetBar.SliderItem(); + this.ribbonPanel1 = new DevComponents.DotNetBar.RibbonPanel(); + this.ribbonBar21 = new DevComponents.DotNetBar.RibbonBar(); + this.buttonItem87 = new DevComponents.DotNetBar.ButtonItem(); + this.buttonItem88 = new DevComponents.DotNetBar.ButtonItem(); + this.buttonItem27 = new DevComponents.DotNetBar.ButtonItem(); + this.buttonItem91 = new DevComponents.DotNetBar.ButtonItem(); + this.buttonItem1 = new DevComponents.DotNetBar.ButtonItem(); + this.btnlegendSet = new DevComponents.DotNetBar.ButtonItem(); + this.buttonItem89 = new DevComponents.DotNetBar.ButtonItem(); + this.btnOutputJPG = new DevComponents.DotNetBar.ButtonItem(); + this.ribbonPanel12 = new DevComponents.DotNetBar.RibbonPanel(); + this.ribbonBar18 = new DevComponents.DotNetBar.RibbonBar(); + this.buttonItem133 = new DevComponents.DotNetBar.ButtonItem(); + this.buttonItem132 = new DevComponents.DotNetBar.ButtonItem(); + this.ribbonBar13 = new DevComponents.DotNetBar.RibbonBar(); + this.buttonItem127 = new DevComponents.DotNetBar.ButtonItem(); + this.buttonItem128 = new DevComponents.DotNetBar.ButtonItem(); + this.sliderItem1 = new DevComponents.DotNetBar.SliderItem(); + this.buttonItem134 = new DevComponents.DotNetBar.ButtonItem(); + this.buttonItem130 = new DevComponents.DotNetBar.ButtonItem(); + this.btn_check_history = new DevComponents.DotNetBar.ButtonItem(); + this.ribbonPanel4 = new DevComponents.DotNetBar.RibbonPanel(); + this.ribbonBar1 = new DevComponents.DotNetBar.RibbonBar(); + this.btn_document_info = new DevComponents.DotNetBar.ButtonItem(); this.ribbonTabItem1 = new DevComponents.DotNetBar.RibbonTabItem(); this.ribbonTabItem11 = new DevComponents.DotNetBar.RibbonTabItem(); this.ribbonTabItem6 = new DevComponents.DotNetBar.RibbonTabItem(); @@ -516,7 +519,6 @@ this.labelX17 = new DevComponents.DotNetBar.LabelX(); this.panelEx4 = new DevComponents.DotNetBar.PanelEx(); this.pictureBox1 = new System.Windows.Forms.PictureBox(); - this.layerTree = new Cyberpipe.MyTreeView(); this.statusStrip1.SuspendLayout(); this.sideBar1.SuspendLayout(); this.panelEx3.SuspendLayout(); @@ -527,15 +529,15 @@ this.contextMenuStrip3.SuspendLayout(); this.contextMenuStripDeleteLayerNode.SuspendLayout(); this.ribbonControl1.SuspendLayout(); + this.ribbonPanel3.SuspendLayout(); + this.ribbonPanel7.SuspendLayout(); + this.ribbonPanel15.SuspendLayout(); + this.ribbonPanel2.SuspendLayout(); this.ribbonPanel6.SuspendLayout(); this.ribbonPanel5.SuspendLayout(); this.ribbonPanel1.SuspendLayout(); this.ribbonPanel12.SuspendLayout(); this.ribbonPanel4.SuspendLayout(); - this.ribbonPanel15.SuspendLayout(); - this.ribbonPanel3.SuspendLayout(); - this.ribbonPanel7.SuspendLayout(); - this.ribbonPanel2.SuspendLayout(); this.panelOfTable.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.dataGridViewX1)).BeginInit(); this.statusStrip2.SuspendLayout(); @@ -711,7 +713,8 @@ this.statusLabel.Name = "statusLabel"; this.statusLabel.Size = new System.Drawing.Size(1313, 17); this.statusLabel.Spring = true; - this.statusLabel.Text = " ©2014-2015 苏州航天系统工程有限公司 版权所有"; + this.statusLabel.Text = Utility.Copyright; +// this.statusLabel.Text = " ©2014-2015 苏州航天系统工程有限公司 版权所有"; // // toolStripDropDownButton1 // @@ -956,6 +959,18 @@ this.layerSensorTree.NodeMouseClick += new System.Windows.Forms.TreeNodeMouseClickEventHandler(this.layerMarkerTree_NodeMouseClick); this.layerSensorTree.NodeMouseDoubleClick += new System.Windows.Forms.TreeNodeMouseClickEventHandler(this.layerTree_NodeMouseDoubleClick); // + // layerTree + // + this.layerTree.CheckBoxes = true; + this.layerTree.ItemHeight = 18; + this.layerTree.Location = new System.Drawing.Point(30, 78); + this.layerTree.Name = "layerTree"; + this.layerTree.Size = new System.Drawing.Size(121, 97); + this.layerTree.TabIndex = 1; + this.layerTree.AfterCheck += new System.Windows.Forms.TreeViewEventHandler(this.layerTree_AfterCheck); + this.layerTree.NodeMouseClick += new System.Windows.Forms.TreeNodeMouseClickEventHandler(this.layerTree_NodeMouseClick); + this.layerTree.NodeMouseDoubleClick += new System.Windows.Forms.TreeNodeMouseClickEventHandler(this.layerTree_NodeMouseDoubleClick); + // // sideBarPanelItem3 // this.sideBarPanelItem3.FontBold = true; @@ -2150,13 +2165,13 @@ this.ribbonControl1.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.ribbonControl1.Controls.Add(this.ribbonPanel3); this.ribbonControl1.Controls.Add(this.ribbonPanel7); - this.ribbonControl1.Controls.Add(this.ribbonPanel2); this.ribbonControl1.Controls.Add(this.ribbonPanel15); - this.ribbonControl1.Controls.Add(this.ribbonPanel4); - this.ribbonControl1.Controls.Add(this.ribbonPanel1); + this.ribbonControl1.Controls.Add(this.ribbonPanel2); this.ribbonControl1.Controls.Add(this.ribbonPanel6); - this.ribbonControl1.Controls.Add(this.ribbonPanel12); this.ribbonControl1.Controls.Add(this.ribbonPanel5); + this.ribbonControl1.Controls.Add(this.ribbonPanel1); + this.ribbonControl1.Controls.Add(this.ribbonPanel12); + this.ribbonControl1.Controls.Add(this.ribbonPanel4); this.ribbonControl1.Dock = System.Windows.Forms.DockStyle.Top; this.ribbonControl1.ImeMode = System.Windows.Forms.ImeMode.NoControl; this.ribbonControl1.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { @@ -2200,609 +2215,216 @@ this.ribbonControl1.Text = "ribbonControl1"; this.ribbonControl1.UseCustomizeDialog = false; // - // ribbonPanel6 + // ribbonPanel3 // - this.ribbonPanel6.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.ribbonPanel6.Controls.Add(this.ribbonBar6); - this.ribbonPanel6.Dock = System.Windows.Forms.DockStyle.Fill; - this.ribbonPanel6.Location = new System.Drawing.Point(0, 0); - this.ribbonPanel6.Name = "ribbonPanel6"; - this.ribbonPanel6.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); - this.ribbonPanel6.Size = new System.Drawing.Size(1328, 95); + this.ribbonPanel3.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.ribbonPanel3.Controls.Add(this.ribbonBar4); + this.ribbonPanel3.Dock = System.Windows.Forms.DockStyle.Fill; + this.ribbonPanel3.Location = new System.Drawing.Point(0, 33); + this.ribbonPanel3.Name = "ribbonPanel3"; + this.ribbonPanel3.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); + this.ribbonPanel3.Size = new System.Drawing.Size(1328, 62); // // // - this.ribbonPanel6.Style.Class = ""; - this.ribbonPanel6.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonPanel3.Style.Class = ""; + this.ribbonPanel3.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; // // // - this.ribbonPanel6.StyleMouseDown.Class = ""; - this.ribbonPanel6.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonPanel3.StyleMouseDown.Class = ""; + this.ribbonPanel3.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; // // // - this.ribbonPanel6.StyleMouseOver.Class = ""; - this.ribbonPanel6.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonPanel6.TabIndex = 38; - this.ribbonPanel6.Visible = false; + this.ribbonPanel3.StyleMouseOver.Class = ""; + this.ribbonPanel3.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonPanel3.TabIndex = 40; // - // ribbonBar6 + // ribbonBar4 // - this.ribbonBar6.AutoOverflowEnabled = true; + this.ribbonBar4.AutoOverflowEnabled = true; // // // - this.ribbonBar6.BackgroundMouseOverStyle.Class = ""; - this.ribbonBar6.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar4.BackgroundMouseOverStyle.Class = ""; + this.ribbonBar4.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; // // // - this.ribbonBar6.BackgroundStyle.Class = ""; - this.ribbonBar6.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonBar6.ContainerControlProcessDialogKey = true; - this.ribbonBar6.Dock = System.Windows.Forms.DockStyle.Left; - this.ribbonBar6.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { - this.buttonItemSPSZ, - this.buttonItem8, - this.buttonItemLocation, - this.sliderItem2, - this.buttonItemGBJC}); - this.ribbonBar6.Location = new System.Drawing.Point(3, 0); - this.ribbonBar6.Name = "ribbonBar6"; - this.ribbonBar6.Size = new System.Drawing.Size(427, 92); - this.ribbonBar6.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.ribbonBar6.TabIndex = 0; + this.ribbonBar4.BackgroundStyle.Class = ""; + this.ribbonBar4.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar4.ContainerControlProcessDialogKey = true; + this.ribbonBar4.Dock = System.Windows.Forms.DockStyle.Left; + this.ribbonBar4.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { + this.btn_flag, + this.slider4ground}); + this.ribbonBar4.Location = new System.Drawing.Point(3, 0); + this.ribbonBar4.Name = "ribbonBar4"; + this.ribbonBar4.Size = new System.Drawing.Size(634, 59); + this.ribbonBar4.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.ribbonBar4.TabIndex = 0; // // // - this.ribbonBar6.TitleStyle.Class = ""; - this.ribbonBar6.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar4.TitleStyle.Class = ""; + this.ribbonBar4.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; // // // - this.ribbonBar6.TitleStyleMouseOver.Class = ""; - this.ribbonBar6.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonBar6.TitleVisible = false; + this.ribbonBar4.TitleStyleMouseOver.Class = ""; + this.ribbonBar4.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar4.TitleVisible = false; // - // buttonItemSPSZ + // btn_flag // - this.buttonItemSPSZ.Image = ((System.Drawing.Image)(resources.GetObject("buttonItemSPSZ.Image"))); - this.buttonItemSPSZ.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItemSPSZ.Name = "buttonItemSPSZ"; - this.buttonItemSPSZ.SubItemsExpandWidth = 14; - this.buttonItemSPSZ.Text = "双屏设置"; - this.buttonItemSPSZ.Click += new System.EventHandler(this.buttonItemSPSZ_Click); + this.btn_flag.Image = global::Cyberpipe.Properties.Resources._24x24icon_03_hover; + this.btn_flag.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.btn_flag.Name = "btn_flag"; + this.btn_flag.SubItemsExpandWidth = 14; + this.btn_flag.Text = "标识器管理"; + this.btn_flag.Click += new System.EventHandler(this.btn_flag_Click); // - // buttonItem8 + // slider4ground // - this.buttonItem8.Image = ((System.Drawing.Image)(resources.GetObject("buttonItem8.Image"))); - this.buttonItem8.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem8.Name = "buttonItem8"; - this.buttonItem8.SubItemsExpandWidth = 14; - this.buttonItem8.Text = "双屏分析"; - this.buttonItem8.Click += new System.EventHandler(this.buttonItem8_Click); + this.slider4ground.LabelPosition = DevComponents.DotNetBar.eSliderLabelPosition.Top; + this.slider4ground.LabelWidth = 50; + this.slider4ground.Name = "slider4ground"; + this.slider4ground.Text = "地面透明度"; + this.slider4ground.TextColor = System.Drawing.Color.Black; + this.slider4ground.Value = 0; + this.slider4ground.ValueChanged += new System.EventHandler(this.slider4ground_ValueChanged); // - // buttonItemLocation + // ribbonPanel7 // - this.buttonItemLocation.Image = ((System.Drawing.Image)(resources.GetObject("buttonItemLocation.Image"))); - this.buttonItemLocation.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItemLocation.Name = "buttonItemLocation"; - this.buttonItemLocation.SubItemsExpandWidth = 14; - this.buttonItemLocation.Text = "快速定位"; - this.buttonItemLocation.Click += new System.EventHandler(this.buttonItemLocation_Click); + this.ribbonPanel7.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.ribbonPanel7.Controls.Add(this.gxdw_ribbonbar); + this.ribbonPanel7.Dock = System.Windows.Forms.DockStyle.Fill; + this.ribbonPanel7.Location = new System.Drawing.Point(0, 33); + this.ribbonPanel7.Name = "ribbonPanel7"; + this.ribbonPanel7.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); + this.ribbonPanel7.Size = new System.Drawing.Size(1328, 62); // - // sliderItem2 // - this.sliderItem2.LabelPosition = DevComponents.DotNetBar.eSliderLabelPosition.Top; - this.sliderItem2.LabelWidth = 50; - this.sliderItem2.Name = "sliderItem2"; - this.sliderItem2.Text = "地面透明度"; - this.sliderItem2.TextColor = System.Drawing.Color.Black; - this.sliderItem2.Value = 0; - this.sliderItem2.ValueChanged += new System.EventHandler(this.sliderItem2_ValueChanged); // - // buttonItemGBJC + this.ribbonPanel7.Style.Class = ""; + this.ribbonPanel7.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; // - this.buttonItemGBJC.Image = ((System.Drawing.Image)(resources.GetObject("buttonItemGBJC.Image"))); - this.buttonItemGBJC.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItemGBJC.Name = "buttonItemGBJC"; - this.buttonItemGBJC.SubItemsExpandWidth = 14; - this.buttonItemGBJC.Text = "国标检测"; - this.buttonItemGBJC.Click += new System.EventHandler(this.buttonItemGBJC_Click); // - // ribbonPanel5 // - this.ribbonPanel5.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.ribbonPanel5.Controls.Add(this.ribbonBar2); - this.ribbonPanel5.Dock = System.Windows.Forms.DockStyle.Fill; - this.ribbonPanel5.Location = new System.Drawing.Point(0, 0); - this.ribbonPanel5.Name = "ribbonPanel5"; - this.ribbonPanel5.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); - this.ribbonPanel5.Size = new System.Drawing.Size(1328, 95); + this.ribbonPanel7.StyleMouseDown.Class = ""; + this.ribbonPanel7.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; // // // - this.ribbonPanel5.Style.Class = ""; - this.ribbonPanel5.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonPanel7.StyleMouseOver.Class = ""; + this.ribbonPanel7.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonPanel7.TabIndex = 41; + this.ribbonPanel7.Visible = false; // + // gxdw_ribbonbar // + this.gxdw_ribbonbar.AutoOverflowEnabled = true; // - this.ribbonPanel5.StyleMouseDown.Class = ""; - this.ribbonPanel5.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; // // + this.gxdw_ribbonbar.BackgroundMouseOverStyle.Class = ""; + this.gxdw_ribbonbar.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; // - this.ribbonPanel5.StyleMouseOver.Class = ""; - this.ribbonPanel5.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonPanel5.TabIndex = 37; - this.ribbonPanel5.Visible = false; // - // ribbonBar2 // - this.ribbonBar2.AutoOverflowEnabled = true; + this.gxdw_ribbonbar.BackgroundStyle.Class = ""; + this.gxdw_ribbonbar.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.gxdw_ribbonbar.ContainerControlProcessDialogKey = true; + this.gxdw_ribbonbar.Dock = System.Windows.Forms.DockStyle.Left; + this.gxdw_ribbonbar.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { + this.buttonItem9, + this.buttonItem10, + this.buttonItem11, + this.buttonItem12, + this.buttonItem13, + this.buttonItem14}); + this.gxdw_ribbonbar.Location = new System.Drawing.Point(3, 0); + this.gxdw_ribbonbar.Name = "gxdw_ribbonbar"; + this.gxdw_ribbonbar.Size = new System.Drawing.Size(564, 59); + this.gxdw_ribbonbar.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.gxdw_ribbonbar.TabIndex = 0; + this.gxdw_ribbonbar.Text = "ribbonBar5"; // // // - this.ribbonBar2.BackgroundMouseOverStyle.Class = ""; - this.ribbonBar2.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.gxdw_ribbonbar.TitleStyle.Class = ""; + this.gxdw_ribbonbar.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; // // // - this.ribbonBar2.BackgroundStyle.Class = ""; - this.ribbonBar2.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonBar2.ContainerControlProcessDialogKey = true; - this.ribbonBar2.Dock = System.Windows.Forms.DockStyle.Left; - this.ribbonBar2.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { - this.buttonItemHX1, - this.buttonItemHX2, - this.buttonItemDCTP, - this.sliderItem3}); - this.ribbonBar2.Location = new System.Drawing.Point(3, 0); - this.ribbonBar2.Name = "ribbonBar2"; - this.ribbonBar2.Size = new System.Drawing.Size(350, 92); - this.ribbonBar2.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.ribbonBar2.TabIndex = 0; + this.gxdw_ribbonbar.TitleStyleMouseOver.Class = ""; + this.gxdw_ribbonbar.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.gxdw_ribbonbar.TitleVisible = false; // + // buttonItem9 // + this.buttonItem9.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__76; + this.buttonItem9.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem9.Name = "buttonItem9"; + this.buttonItem9.SubItemsExpandWidth = 14; + this.buttonItem9.Text = "工单管理"; + this.buttonItem9.Click += new System.EventHandler(this.buttonItem9_Click); // - this.ribbonBar2.TitleStyle.Class = ""; - this.ribbonBar2.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // buttonItem10 // + this.buttonItem10.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__69; + this.buttonItem10.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem10.Name = "buttonItem10"; + this.buttonItem10.SubItemsExpandWidth = 14; + this.buttonItem10.Text = "在线任务"; + this.buttonItem10.Click += new System.EventHandler(this.buttonItem10_Click); // + // buttonItem11 // - this.ribbonBar2.TitleStyleMouseOver.Class = ""; - this.ribbonBar2.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonBar2.TitleVisible = false; + this.buttonItem11.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__72; + this.buttonItem11.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem11.Name = "buttonItem11"; + this.buttonItem11.SubItemsExpandWidth = 14; + this.buttonItem11.Text = "事件管理"; + this.buttonItem11.Click += new System.EventHandler(this.buttonItem11_Click); // - // buttonItemHX1 + // buttonItem12 // - this.buttonItemHX1.AutoExpandOnClick = true; - this.buttonItemHX1.Image = ((System.Drawing.Image)(resources.GetObject("buttonItemHX1.Image"))); - this.buttonItemHX1.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItemHX1.Name = "buttonItemHX1"; - this.buttonItemHX1.SubItemsExpandWidth = 14; - this.buttonItemHX1.Text = "导入红线"; - this.buttonItemHX1.Click += new System.EventHandler(this.buttonItemHX1_Click); + this.buttonItem12.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__34; + this.buttonItem12.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem12.Name = "buttonItem12"; + this.buttonItem12.SubItemsExpandWidth = 14; + this.buttonItem12.Text = "探测仪管理"; + this.buttonItem12.Click += new System.EventHandler(this.buttonItem12_Click); // - // buttonItemHX2 + // buttonItem13 // - this.buttonItemHX2.Image = ((System.Drawing.Image)(resources.GetObject("buttonItemHX2.Image"))); - this.buttonItemHX2.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItemHX2.Name = "buttonItemHX2"; - this.buttonItemHX2.SubItemsExpandWidth = 14; - this.buttonItemHX2.Text = "红线审核"; - this.buttonItemHX2.Click += new System.EventHandler(this.buttonItemHX2_Click); + this.buttonItem13.Image = global::Cyberpipe.Properties.Resources._24x24icon_13_hover; + this.buttonItem13.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem13.Name = "buttonItem13"; + this.buttonItem13.SubItemsExpandWidth = 14; + this.buttonItem13.Text = "巡检人员维护"; + this.buttonItem13.Click += new System.EventHandler(this.buttonItem13_Click); // - // buttonItemDCTP + // buttonItem14 // - this.buttonItemDCTP.Image = ((System.Drawing.Image)(resources.GetObject("buttonItemDCTP.Image"))); - this.buttonItemDCTP.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItemDCTP.Name = "buttonItemDCTP"; - this.buttonItemDCTP.SubItemsExpandWidth = 14; - this.buttonItemDCTP.Text = "导出图片"; - this.buttonItemDCTP.Click += new System.EventHandler(this.buttonItemDCTP_Click); - // - // sliderItem3 - // - this.sliderItem3.LabelPosition = DevComponents.DotNetBar.eSliderLabelPosition.Top; - this.sliderItem3.LabelWidth = 50; - this.sliderItem3.Name = "sliderItem3"; - this.sliderItem3.Text = "地面透明度"; - this.sliderItem3.TextColor = System.Drawing.Color.Black; - this.sliderItem3.Value = 0; - this.sliderItem3.ValueChanged += new System.EventHandler(this.sliderItem3_ValueChanged); - // - // ribbonPanel1 - // - this.ribbonPanel1.AutoSize = true; - this.ribbonPanel1.CanvasColor = System.Drawing.Color.Gray; - this.ribbonPanel1.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.ribbonPanel1.Controls.Add(this.ribbonBar21); - this.ribbonPanel1.Dock = System.Windows.Forms.DockStyle.Fill; - this.ribbonPanel1.Location = new System.Drawing.Point(0, 0); - this.ribbonPanel1.Name = "ribbonPanel1"; - this.ribbonPanel1.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); - this.ribbonPanel1.Size = new System.Drawing.Size(1328, 95); - // - // - // - this.ribbonPanel1.Style.Class = ""; - this.ribbonPanel1.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonPanel1.StyleMouseDown.Class = ""; - this.ribbonPanel1.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonPanel1.StyleMouseOver.Class = ""; - this.ribbonPanel1.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonPanel1.TabIndex = 1; - this.ribbonPanel1.Visible = false; - // - // ribbonBar21 - // - this.ribbonBar21.AutoOverflowEnabled = true; - this.ribbonBar21.BackColor = System.Drawing.Color.White; - // - // - // - this.ribbonBar21.BackgroundMouseOverStyle.Class = ""; - this.ribbonBar21.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonBar21.BackgroundStyle.Class = ""; - this.ribbonBar21.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonBar21.ContainerControlProcessDialogKey = true; - this.ribbonBar21.Dock = System.Windows.Forms.DockStyle.Left; - this.ribbonBar21.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { - this.buttonItem87, - this.buttonItem88, - this.buttonItem27, - this.sliderGroundTransSet1, - this.buttonItem91, - this.buttonItem1, - this.btnlegendSet, - this.buttonItem89, - this.btnOutputJPG}); - this.ribbonBar21.Location = new System.Drawing.Point(3, 0); - this.ribbonBar21.Name = "ribbonBar21"; - this.ribbonBar21.Size = new System.Drawing.Size(649, 92); - this.ribbonBar21.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.ribbonBar21.TabIndex = 2; - this.ribbonBar21.Text = "浏览模式"; - // - // - // - this.ribbonBar21.TitleStyle.Class = ""; - this.ribbonBar21.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonBar21.TitleStyleMouseOver.Class = ""; - this.ribbonBar21.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonBar21.TitleVisible = false; - // - // buttonItem87 - // - this.buttonItem87.Image = ((System.Drawing.Image)(resources.GetObject("buttonItem87.Image"))); - this.buttonItem87.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem87.Name = "buttonItem87"; - this.buttonItem87.SubItemsExpandWidth = 14; - this.buttonItem87.Text = "地上模式"; - this.buttonItem87.Click += new System.EventHandler(this.buttonItem87_Click); - // - // buttonItem88 - // - this.buttonItem88.Image = ((System.Drawing.Image)(resources.GetObject("buttonItem88.Image"))); - this.buttonItem88.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem88.Name = "buttonItem88"; - this.buttonItem88.SubItemsExpandWidth = 14; - this.buttonItem88.Text = "地下模式"; - this.buttonItem88.Click += new System.EventHandler(this.buttonItem88_Click); - // - // buttonItem27 - // - this.buttonItem27.Image = ((System.Drawing.Image)(resources.GetObject("buttonItem27.Image"))); - this.buttonItem27.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem27.Name = "buttonItem27"; - this.buttonItem27.SubItemsExpandWidth = 14; - this.buttonItem27.Text = "行走模式"; - this.buttonItem27.Click += new System.EventHandler(this.buttonItem27_Click); - // - // buttonItem91 - // - this.buttonItem91.ForeColor = System.Drawing.Color.Black; - this.buttonItem91.Image = ((System.Drawing.Image)(resources.GetObject("buttonItem91.Image"))); - this.buttonItem91.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem91.Name = "buttonItem91"; - this.buttonItem91.SubItemsExpandWidth = 14; - this.buttonItem91.Text = "快速定位"; - this.buttonItem91.Click += new System.EventHandler(this.buttonItem91_Click); - // - // buttonItem1 - // - this.buttonItem1.Image = ((System.Drawing.Image)(resources.GetObject("buttonItem1.Image"))); - this.buttonItem1.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem1.Name = "buttonItem1"; - this.buttonItem1.SubItemsExpandWidth = 14; - this.buttonItem1.Text = "图层管理"; - this.buttonItem1.Click += new System.EventHandler(this.buttonItem1_Click); - // - // btnlegendSet - // - this.btnlegendSet.Image = ((System.Drawing.Image)(resources.GetObject("btnlegendSet.Image"))); - this.btnlegendSet.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.btnlegendSet.Name = "btnlegendSet"; - this.btnlegendSet.SubItemsExpandWidth = 14; - this.btnlegendSet.Text = "图例"; - this.btnlegendSet.Click += new System.EventHandler(this.btnlegendSet_Click); - // - // buttonItem89 - // - this.buttonItem89.Image = ((System.Drawing.Image)(resources.GetObject("buttonItem89.Image"))); - this.buttonItem89.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem89.Name = "buttonItem89"; - this.buttonItem89.SubItemsExpandWidth = 14; - this.buttonItem89.Text = "全屏显示"; - this.buttonItem89.Click += new System.EventHandler(this.buttonItem89_Click); - // - // btnOutputJPG - // - this.btnOutputJPG.Image = ((System.Drawing.Image)(resources.GetObject("btnOutputJPG.Image"))); - this.btnOutputJPG.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.btnOutputJPG.Name = "btnOutputJPG"; - this.btnOutputJPG.SubItemsExpandWidth = 14; - this.btnOutputJPG.Text = "导出图片"; - this.btnOutputJPG.Click += new System.EventHandler(this.btnOutputJPG_Click); - // - // ribbonPanel12 - // - this.ribbonPanel12.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.ribbonPanel12.Controls.Add(this.ribbonBar18); - this.ribbonPanel12.Controls.Add(this.ribbonBar13); - this.ribbonPanel12.Dock = System.Windows.Forms.DockStyle.Fill; - this.ribbonPanel12.Location = new System.Drawing.Point(0, 0); - this.ribbonPanel12.Name = "ribbonPanel12"; - this.ribbonPanel12.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); - this.ribbonPanel12.Size = new System.Drawing.Size(1328, 95); - // - // - // - this.ribbonPanel12.Style.Class = ""; - this.ribbonPanel12.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonPanel12.StyleMouseDown.Class = ""; - this.ribbonPanel12.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonPanel12.StyleMouseOver.Class = ""; - this.ribbonPanel12.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonPanel12.TabIndex = 34; - this.ribbonPanel12.Visible = false; - // - // ribbonBar18 - // - this.ribbonBar18.AutoOverflowEnabled = true; - // - // - // - this.ribbonBar18.BackgroundMouseOverStyle.Class = ""; - this.ribbonBar18.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonBar18.BackgroundStyle.Class = ""; - this.ribbonBar18.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonBar18.ContainerControlProcessDialogKey = true; - this.ribbonBar18.Dock = System.Windows.Forms.DockStyle.Left; - this.ribbonBar18.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { - this.buttonItem133}); - this.ribbonBar18.Location = new System.Drawing.Point(531, 0); - this.ribbonBar18.Name = "ribbonBar18"; - this.ribbonBar18.Size = new System.Drawing.Size(129, 92); - this.ribbonBar18.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.ribbonBar18.TabIndex = 1; - // - // - // - this.ribbonBar18.TitleStyle.Class = ""; - this.ribbonBar18.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonBar18.TitleStyleMouseOver.Class = ""; - this.ribbonBar18.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonBar18.TitleVisible = false; - // - // buttonItem133 - // - this.buttonItem133.Image = ((System.Drawing.Image)(resources.GetObject("buttonItem133.Image"))); - this.buttonItem133.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem133.Name = "buttonItem133"; - this.buttonItem133.SubItemsExpandWidth = 14; - this.buttonItem133.Text = "审核入库"; - this.buttonItem133.Click += new System.EventHandler(this.buttonItem133_Click_1); - // - // ribbonBar13 - // - this.ribbonBar13.AutoOverflowEnabled = true; - // - // - // - this.ribbonBar13.BackgroundMouseOverStyle.Class = ""; - this.ribbonBar13.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonBar13.BackgroundStyle.Class = ""; - this.ribbonBar13.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonBar13.ContainerControlProcessDialogKey = true; - this.ribbonBar13.Dock = System.Windows.Forms.DockStyle.Left; - this.ribbonBar13.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { - this.buttonItem127, - this.buttonItem128, - this.sliderItem1, - this.buttonItem134, - this.buttonItem130, - this.btn_check_history}); - this.ribbonBar13.Location = new System.Drawing.Point(3, 0); - this.ribbonBar13.Name = "ribbonBar13"; - this.ribbonBar13.Size = new System.Drawing.Size(528, 92); - this.ribbonBar13.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.ribbonBar13.TabIndex = 0; - // - // - // - this.ribbonBar13.TitleStyle.Class = ""; - this.ribbonBar13.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonBar13.TitleStyleMouseOver.Class = ""; - this.ribbonBar13.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonBar13.TitleVisible = false; - // - // buttonItem127 - // - this.buttonItem127.Image = ((System.Drawing.Image)(resources.GetObject("buttonItem127.Image"))); - this.buttonItem127.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem127.Name = "buttonItem127"; - this.buttonItem127.SubItemsExpandWidth = 14; - this.buttonItem127.Text = "打开数据"; - this.buttonItem127.Click += new System.EventHandler(this.buttonItem127_Click_2); - // - // buttonItem128 - // - this.buttonItem128.Image = ((System.Drawing.Image)(resources.GetObject("buttonItem128.Image"))); - this.buttonItem128.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem128.Name = "buttonItem128"; - this.buttonItem128.SubItemsExpandWidth = 14; - this.buttonItem128.Text = "一键审核"; - this.buttonItem128.Click += new System.EventHandler(this.buttonItem128_Click); - // - // sliderItem1 - // - this.sliderItem1.LabelPosition = DevComponents.DotNetBar.eSliderLabelPosition.Top; - this.sliderItem1.LabelWidth = 50; - this.sliderItem1.Name = "sliderItem1"; - this.sliderItem1.Text = "地面透明度"; - this.sliderItem1.TextColor = System.Drawing.Color.Black; - this.sliderItem1.Value = 0; - this.sliderItem1.ValueChanged += new System.EventHandler(this.sliderItem1_ValueChanged); - // - // buttonItem134 - // - this.buttonItem134.Image = ((System.Drawing.Image)(resources.GetObject("buttonItem134.Image"))); - this.buttonItem134.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem134.Name = "buttonItem134"; - this.buttonItem134.SubItemsExpandWidth = 14; - this.buttonItem134.Text = "模拟设计修改"; - this.buttonItem134.Click += new System.EventHandler(this.buttonItem134_Click_1); - // - // buttonItem130 - // - this.buttonItem130.Image = ((System.Drawing.Image)(resources.GetObject("buttonItem130.Image"))); - this.buttonItem130.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem130.Name = "buttonItem130"; - this.buttonItem130.SubItemsExpandWidth = 14; - this.buttonItem130.Text = "导出审核图"; - this.buttonItem130.Click += new System.EventHandler(this.buttonItem130_Click_1); - // - // btn_check_history - // - this.btn_check_history.Image = ((System.Drawing.Image)(resources.GetObject("btn_check_history.Image"))); - this.btn_check_history.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.btn_check_history.Name = "btn_check_history"; - this.btn_check_history.SubItemsExpandWidth = 14; - this.btn_check_history.Text = "审核历史"; - this.btn_check_history.Click += new System.EventHandler(this.btn_check_history_Click); - // - // ribbonPanel4 - // - this.ribbonPanel4.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.ribbonPanel4.Controls.Add(this.ribbonBar1); - this.ribbonPanel4.Dock = System.Windows.Forms.DockStyle.Fill; - this.ribbonPanel4.Location = new System.Drawing.Point(0, 0); - this.ribbonPanel4.Name = "ribbonPanel4"; - this.ribbonPanel4.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); - this.ribbonPanel4.Size = new System.Drawing.Size(1328, 95); - // - // - // - this.ribbonPanel4.Style.Class = ""; - this.ribbonPanel4.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonPanel4.StyleMouseDown.Class = ""; - this.ribbonPanel4.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonPanel4.StyleMouseOver.Class = ""; - this.ribbonPanel4.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonPanel4.TabIndex = 36; - this.ribbonPanel4.Visible = false; - // - // ribbonBar1 - // - this.ribbonBar1.AutoOverflowEnabled = true; - // - // - // - this.ribbonBar1.BackgroundMouseOverStyle.Class = ""; - this.ribbonBar1.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonBar1.BackgroundStyle.Class = ""; - this.ribbonBar1.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonBar1.ContainerControlProcessDialogKey = true; - this.ribbonBar1.Dock = System.Windows.Forms.DockStyle.Left; - this.ribbonBar1.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { - this.btn_document_info}); - this.ribbonBar1.Location = new System.Drawing.Point(3, 0); - this.ribbonBar1.Name = "ribbonBar1"; - this.ribbonBar1.Size = new System.Drawing.Size(88, 92); - this.ribbonBar1.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.ribbonBar1.TabIndex = 0; - // - // - // - this.ribbonBar1.TitleStyle.Class = ""; - this.ribbonBar1.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonBar1.TitleStyleMouseOver.Class = ""; - this.ribbonBar1.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonBar1.TitleVisible = false; - // - // btn_document_info - // - this.btn_document_info.Image = ((System.Drawing.Image)(resources.GetObject("btn_document_info.Image"))); - this.btn_document_info.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.btn_document_info.Name = "btn_document_info"; - this.btn_document_info.SubItemsExpandWidth = 14; - this.btn_document_info.Text = "文档管理"; - this.btn_document_info.Click += new System.EventHandler(this.btn_document_info_Click); + this.buttonItem14.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__56; + this.buttonItem14.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem14.Name = "buttonItem14"; + this.buttonItem14.SubItemsExpandWidth = 14; + this.buttonItem14.Text = "导出施工图"; + this.buttonItem14.Click += new System.EventHandler(this.buttonItem14_Click); // // ribbonPanel15 // this.ribbonPanel15.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; this.ribbonPanel15.Controls.Add(this.ribbonBar20); this.ribbonPanel15.Dock = System.Windows.Forms.DockStyle.Fill; - this.ribbonPanel15.Location = new System.Drawing.Point(0, 0); + this.ribbonPanel15.Location = new System.Drawing.Point(0, 33); this.ribbonPanel15.Name = "ribbonPanel15"; this.ribbonPanel15.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); - this.ribbonPanel15.Size = new System.Drawing.Size(1328, 95); + this.ribbonPanel15.Size = new System.Drawing.Size(1328, 62); // // // @@ -2843,7 +2465,7 @@ this.buttonItemXTGL}); this.ribbonBar20.Location = new System.Drawing.Point(3, 0); this.ribbonBar20.Name = "ribbonBar20"; - this.ribbonBar20.Size = new System.Drawing.Size(283, 92); + this.ribbonBar20.Size = new System.Drawing.Size(283, 59); this.ribbonBar20.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; this.ribbonBar20.TabIndex = 0; // @@ -3274,216 +2896,15 @@ this.buttonItemXT4_2.Text = "人员修改"; this.buttonItemXT4_2.Click += new System.EventHandler(this.buttonItemXT4_2_Click); // - // ribbonPanel3 - // - this.ribbonPanel3.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.ribbonPanel3.Controls.Add(this.ribbonBar4); - this.ribbonPanel3.Dock = System.Windows.Forms.DockStyle.Fill; - this.ribbonPanel3.Location = new System.Drawing.Point(0, 33); - this.ribbonPanel3.Name = "ribbonPanel3"; - this.ribbonPanel3.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); - this.ribbonPanel3.Size = new System.Drawing.Size(1328, 62); - // - // - // - this.ribbonPanel3.Style.Class = ""; - this.ribbonPanel3.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonPanel3.StyleMouseDown.Class = ""; - this.ribbonPanel3.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonPanel3.StyleMouseOver.Class = ""; - this.ribbonPanel3.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonPanel3.TabIndex = 40; - // - // ribbonBar4 - // - this.ribbonBar4.AutoOverflowEnabled = true; - // - // - // - this.ribbonBar4.BackgroundMouseOverStyle.Class = ""; - this.ribbonBar4.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonBar4.BackgroundStyle.Class = ""; - this.ribbonBar4.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonBar4.ContainerControlProcessDialogKey = true; - this.ribbonBar4.Dock = System.Windows.Forms.DockStyle.Left; - this.ribbonBar4.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { - this.btn_flag, - this.slider4ground}); - this.ribbonBar4.Location = new System.Drawing.Point(3, 0); - this.ribbonBar4.Name = "ribbonBar4"; - this.ribbonBar4.Size = new System.Drawing.Size(321, 59); - this.ribbonBar4.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.ribbonBar4.TabIndex = 0; - // - // - // - this.ribbonBar4.TitleStyle.Class = ""; - this.ribbonBar4.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonBar4.TitleStyleMouseOver.Class = ""; - this.ribbonBar4.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonBar4.TitleVisible = false; - // - // btn_flag - // - this.btn_flag.Image = global::Cyberpipe.Properties.Resources._24x24icon_03_hover; - this.btn_flag.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.btn_flag.Name = "btn_flag"; - this.btn_flag.SubItemsExpandWidth = 14; - this.btn_flag.Text = "标识器管理"; - this.btn_flag.Click += new System.EventHandler(this.btn_flag_Click); - // - // slider4ground - // - this.slider4ground.LabelPosition = DevComponents.DotNetBar.eSliderLabelPosition.Top; - this.slider4ground.LabelWidth = 50; - this.slider4ground.Name = "slider4ground"; - this.slider4ground.Text = "地面透明度"; - this.slider4ground.TextColor = System.Drawing.Color.Black; - this.slider4ground.Value = 0; - this.slider4ground.ValueChanged += new System.EventHandler(this.slider4ground_ValueChanged); - // - // ribbonPanel7 - // - this.ribbonPanel7.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.ribbonPanel7.Controls.Add(this.gxdw_ribbonbar); - this.ribbonPanel7.Dock = System.Windows.Forms.DockStyle.Fill; - this.ribbonPanel7.Location = new System.Drawing.Point(0, 33); - this.ribbonPanel7.Name = "ribbonPanel7"; - this.ribbonPanel7.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); - this.ribbonPanel7.Size = new System.Drawing.Size(1328, 62); - // - // - // - this.ribbonPanel7.Style.Class = ""; - this.ribbonPanel7.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonPanel7.StyleMouseDown.Class = ""; - this.ribbonPanel7.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonPanel7.StyleMouseOver.Class = ""; - this.ribbonPanel7.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonPanel7.TabIndex = 41; - this.ribbonPanel7.Visible = false; - // - // gxdw_ribbonbar - // - this.gxdw_ribbonbar.AutoOverflowEnabled = true; - // - // - // - this.gxdw_ribbonbar.BackgroundMouseOverStyle.Class = ""; - this.gxdw_ribbonbar.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.gxdw_ribbonbar.BackgroundStyle.Class = ""; - this.gxdw_ribbonbar.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.gxdw_ribbonbar.ContainerControlProcessDialogKey = true; - this.gxdw_ribbonbar.Dock = System.Windows.Forms.DockStyle.Left; - this.gxdw_ribbonbar.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { - this.buttonItem9, - this.buttonItem10, - this.buttonItem11, - this.buttonItem12, - this.buttonItem13, - this.buttonItem14}); - this.gxdw_ribbonbar.Location = new System.Drawing.Point(3, 0); - this.gxdw_ribbonbar.Name = "gxdw_ribbonbar"; - this.gxdw_ribbonbar.Size = new System.Drawing.Size(522, 59); - this.gxdw_ribbonbar.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.gxdw_ribbonbar.TabIndex = 0; - this.gxdw_ribbonbar.Text = "ribbonBar5"; - // - // - // - this.gxdw_ribbonbar.TitleStyle.Class = ""; - this.gxdw_ribbonbar.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.gxdw_ribbonbar.TitleStyleMouseOver.Class = ""; - this.gxdw_ribbonbar.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.gxdw_ribbonbar.TitleVisible = false; - // - // buttonItem9 - // - this.buttonItem9.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__76; - this.buttonItem9.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem9.Name = "buttonItem9"; - this.buttonItem9.SubItemsExpandWidth = 14; - this.buttonItem9.Text = "工单管理"; - this.buttonItem9.Click += new System.EventHandler(this.buttonItem9_Click); - // - // buttonItem10 - // - this.buttonItem10.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__69; - this.buttonItem10.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem10.Name = "buttonItem10"; - this.buttonItem10.SubItemsExpandWidth = 14; - this.buttonItem10.Text = "在线任务"; - this.buttonItem10.Click += new System.EventHandler(this.buttonItem10_Click); - // - // buttonItem11 - // - this.buttonItem11.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__72; - this.buttonItem11.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem11.Name = "buttonItem11"; - this.buttonItem11.SubItemsExpandWidth = 14; - this.buttonItem11.Text = "事件管理"; - this.buttonItem11.Click += new System.EventHandler(this.buttonItem11_Click); - // - // buttonItem12 - // - this.buttonItem12.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__34; - this.buttonItem12.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem12.Name = "buttonItem12"; - this.buttonItem12.SubItemsExpandWidth = 14; - this.buttonItem12.Text = "探测仪管理"; - this.buttonItem12.Click += new System.EventHandler(this.buttonItem12_Click); - // - // buttonItem13 - // - this.buttonItem13.Image = global::Cyberpipe.Properties.Resources._24x24icon_13_hover; - this.buttonItem13.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem13.Name = "buttonItem13"; - this.buttonItem13.SubItemsExpandWidth = 14; - this.buttonItem13.Text = "巡检人员维护"; - this.buttonItem13.Click += new System.EventHandler(this.buttonItem13_Click); - // - // buttonItem14 - // - this.buttonItem14.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__56; - this.buttonItem14.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem14.Name = "buttonItem14"; - this.buttonItem14.SubItemsExpandWidth = 14; - this.buttonItem14.Text = "导出施工图"; - this.buttonItem14.Click += new System.EventHandler(this.buttonItem14_Click); - // // ribbonPanel2 // this.ribbonPanel2.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; this.ribbonPanel2.Controls.Add(this.ribbonBar3); this.ribbonPanel2.Dock = System.Windows.Forms.DockStyle.Fill; - this.ribbonPanel2.Location = new System.Drawing.Point(0, 33); + this.ribbonPanel2.Location = new System.Drawing.Point(0, 0); this.ribbonPanel2.Name = "ribbonPanel2"; this.ribbonPanel2.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); - this.ribbonPanel2.Size = new System.Drawing.Size(1328, 62); + this.ribbonPanel2.Size = new System.Drawing.Size(1328, 95); // // // @@ -3527,7 +2948,7 @@ this.buttonItemPasswordReset}); this.ribbonBar3.Location = new System.Drawing.Point(3, 0); this.ribbonBar3.Name = "ribbonBar3"; - this.ribbonBar3.Size = new System.Drawing.Size(551, 59); + this.ribbonBar3.Size = new System.Drawing.Size(551, 92); this.ribbonBar3.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; this.ribbonBar3.TabIndex = 1; // @@ -3567,6 +2988,7 @@ this.btn_resc_info.Name = "btn_resc_info"; this.btn_resc_info.SubItemsExpandWidth = 14; this.btn_resc_info.Text = "资源管理"; + this.btn_resc_info.Visible = false; this.btn_resc_info.Click += new System.EventHandler(this.btn_resc_info_Click); // // btn_role_resc @@ -3605,6 +3027,605 @@ this.buttonItemPasswordReset.Text = "重置密码"; this.buttonItemPasswordReset.Click += new System.EventHandler(this.buttonItemPasswordReset_Click); // + // ribbonPanel6 + // + this.ribbonPanel6.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.ribbonPanel6.Controls.Add(this.ribbonBar6); + this.ribbonPanel6.Dock = System.Windows.Forms.DockStyle.Fill; + this.ribbonPanel6.Location = new System.Drawing.Point(0, 0); + this.ribbonPanel6.Name = "ribbonPanel6"; + this.ribbonPanel6.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); + this.ribbonPanel6.Size = new System.Drawing.Size(1328, 95); + // + // + // + this.ribbonPanel6.Style.Class = ""; + this.ribbonPanel6.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonPanel6.StyleMouseDown.Class = ""; + this.ribbonPanel6.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonPanel6.StyleMouseOver.Class = ""; + this.ribbonPanel6.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonPanel6.TabIndex = 38; + this.ribbonPanel6.Visible = false; + // + // ribbonBar6 + // + this.ribbonBar6.AutoOverflowEnabled = true; + // + // + // + this.ribbonBar6.BackgroundMouseOverStyle.Class = ""; + this.ribbonBar6.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonBar6.BackgroundStyle.Class = ""; + this.ribbonBar6.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar6.ContainerControlProcessDialogKey = true; + this.ribbonBar6.Dock = System.Windows.Forms.DockStyle.Left; + this.ribbonBar6.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { + this.buttonItemSPSZ, + this.buttonItem8, + this.buttonItemLocation, + this.sliderItem2, + this.buttonItemGBJC}); + this.ribbonBar6.Location = new System.Drawing.Point(3, 0); + this.ribbonBar6.Name = "ribbonBar6"; + this.ribbonBar6.Size = new System.Drawing.Size(427, 92); + this.ribbonBar6.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.ribbonBar6.TabIndex = 0; + // + // + // + this.ribbonBar6.TitleStyle.Class = ""; + this.ribbonBar6.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonBar6.TitleStyleMouseOver.Class = ""; + this.ribbonBar6.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar6.TitleVisible = false; + // + // buttonItemSPSZ + // + this.buttonItemSPSZ.Image = ((System.Drawing.Image)(resources.GetObject("buttonItemSPSZ.Image"))); + this.buttonItemSPSZ.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItemSPSZ.Name = "buttonItemSPSZ"; + this.buttonItemSPSZ.SubItemsExpandWidth = 14; + this.buttonItemSPSZ.Text = "双屏设置"; + this.buttonItemSPSZ.Click += new System.EventHandler(this.buttonItemSPSZ_Click); + // + // buttonItem8 + // + this.buttonItem8.Image = ((System.Drawing.Image)(resources.GetObject("buttonItem8.Image"))); + this.buttonItem8.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem8.Name = "buttonItem8"; + this.buttonItem8.SubItemsExpandWidth = 14; + this.buttonItem8.Text = "双屏分析"; + this.buttonItem8.Click += new System.EventHandler(this.buttonItem8_Click); + // + // buttonItemLocation + // + this.buttonItemLocation.Image = ((System.Drawing.Image)(resources.GetObject("buttonItemLocation.Image"))); + this.buttonItemLocation.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItemLocation.Name = "buttonItemLocation"; + this.buttonItemLocation.SubItemsExpandWidth = 14; + this.buttonItemLocation.Text = "快速定位"; + this.buttonItemLocation.Click += new System.EventHandler(this.buttonItemLocation_Click); + // + // sliderItem2 + // + this.sliderItem2.LabelPosition = DevComponents.DotNetBar.eSliderLabelPosition.Top; + this.sliderItem2.LabelWidth = 50; + this.sliderItem2.Name = "sliderItem2"; + this.sliderItem2.Text = "地面透明度"; + this.sliderItem2.TextColor = System.Drawing.Color.Black; + this.sliderItem2.Value = 0; + this.sliderItem2.ValueChanged += new System.EventHandler(this.sliderItem2_ValueChanged); + // + // buttonItemGBJC + // + this.buttonItemGBJC.Image = ((System.Drawing.Image)(resources.GetObject("buttonItemGBJC.Image"))); + this.buttonItemGBJC.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItemGBJC.Name = "buttonItemGBJC"; + this.buttonItemGBJC.SubItemsExpandWidth = 14; + this.buttonItemGBJC.Text = "国标检测"; + this.buttonItemGBJC.Click += new System.EventHandler(this.buttonItemGBJC_Click); + // + // ribbonPanel5 + // + this.ribbonPanel5.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.ribbonPanel5.Controls.Add(this.ribbonBar2); + this.ribbonPanel5.Dock = System.Windows.Forms.DockStyle.Fill; + this.ribbonPanel5.Location = new System.Drawing.Point(0, 33); + this.ribbonPanel5.Name = "ribbonPanel5"; + this.ribbonPanel5.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); + this.ribbonPanel5.Size = new System.Drawing.Size(1328, 62); + // + // + // + this.ribbonPanel5.Style.Class = ""; + this.ribbonPanel5.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonPanel5.StyleMouseDown.Class = ""; + this.ribbonPanel5.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonPanel5.StyleMouseOver.Class = ""; + this.ribbonPanel5.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonPanel5.TabIndex = 37; + this.ribbonPanel5.Visible = false; + // + // ribbonBar2 + // + this.ribbonBar2.AutoOverflowEnabled = true; + // + // + // + this.ribbonBar2.BackgroundMouseOverStyle.Class = ""; + this.ribbonBar2.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonBar2.BackgroundStyle.Class = ""; + this.ribbonBar2.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar2.ContainerControlProcessDialogKey = true; + this.ribbonBar2.Dock = System.Windows.Forms.DockStyle.Left; + this.ribbonBar2.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { + this.buttonItemHX1, + this.buttonItemHX2, + this.buttonItemDCTP, + this.sliderItem3}); + this.ribbonBar2.Location = new System.Drawing.Point(3, 0); + this.ribbonBar2.Name = "ribbonBar2"; + this.ribbonBar2.Size = new System.Drawing.Size(350, 59); + this.ribbonBar2.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.ribbonBar2.TabIndex = 0; + // + // + // + this.ribbonBar2.TitleStyle.Class = ""; + this.ribbonBar2.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonBar2.TitleStyleMouseOver.Class = ""; + this.ribbonBar2.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar2.TitleVisible = false; + // + // buttonItemHX1 + // + this.buttonItemHX1.AutoExpandOnClick = true; + this.buttonItemHX1.Image = ((System.Drawing.Image)(resources.GetObject("buttonItemHX1.Image"))); + this.buttonItemHX1.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItemHX1.Name = "buttonItemHX1"; + this.buttonItemHX1.SubItemsExpandWidth = 14; + this.buttonItemHX1.Text = "导入红线"; + this.buttonItemHX1.Click += new System.EventHandler(this.buttonItemHX1_Click); + // + // buttonItemHX2 + // + this.buttonItemHX2.Image = ((System.Drawing.Image)(resources.GetObject("buttonItemHX2.Image"))); + this.buttonItemHX2.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItemHX2.Name = "buttonItemHX2"; + this.buttonItemHX2.SubItemsExpandWidth = 14; + this.buttonItemHX2.Text = "红线审核"; + this.buttonItemHX2.Click += new System.EventHandler(this.buttonItemHX2_Click); + // + // buttonItemDCTP + // + this.buttonItemDCTP.Image = ((System.Drawing.Image)(resources.GetObject("buttonItemDCTP.Image"))); + this.buttonItemDCTP.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItemDCTP.Name = "buttonItemDCTP"; + this.buttonItemDCTP.SubItemsExpandWidth = 14; + this.buttonItemDCTP.Text = "导出图片"; + this.buttonItemDCTP.Click += new System.EventHandler(this.buttonItemDCTP_Click); + // + // sliderItem3 + // + this.sliderItem3.LabelPosition = DevComponents.DotNetBar.eSliderLabelPosition.Top; + this.sliderItem3.LabelWidth = 50; + this.sliderItem3.Name = "sliderItem3"; + this.sliderItem3.Text = "地面透明度"; + this.sliderItem3.TextColor = System.Drawing.Color.Black; + this.sliderItem3.Value = 0; + this.sliderItem3.ValueChanged += new System.EventHandler(this.sliderItem3_ValueChanged); + // + // ribbonPanel1 + // + this.ribbonPanel1.AutoSize = true; + this.ribbonPanel1.CanvasColor = System.Drawing.Color.Gray; + this.ribbonPanel1.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.ribbonPanel1.Controls.Add(this.ribbonBar21); + this.ribbonPanel1.Dock = System.Windows.Forms.DockStyle.Fill; + this.ribbonPanel1.Location = new System.Drawing.Point(0, 33); + this.ribbonPanel1.Name = "ribbonPanel1"; + this.ribbonPanel1.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); + this.ribbonPanel1.Size = new System.Drawing.Size(1328, 62); + // + // + // + this.ribbonPanel1.Style.Class = ""; + this.ribbonPanel1.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonPanel1.StyleMouseDown.Class = ""; + this.ribbonPanel1.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonPanel1.StyleMouseOver.Class = ""; + this.ribbonPanel1.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonPanel1.TabIndex = 1; + this.ribbonPanel1.Visible = false; + // + // ribbonBar21 + // + this.ribbonBar21.AutoOverflowEnabled = true; + this.ribbonBar21.BackColor = System.Drawing.Color.White; + // + // + // + this.ribbonBar21.BackgroundMouseOverStyle.Class = ""; + this.ribbonBar21.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonBar21.BackgroundStyle.Class = ""; + this.ribbonBar21.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar21.ContainerControlProcessDialogKey = true; + this.ribbonBar21.Dock = System.Windows.Forms.DockStyle.Left; + this.ribbonBar21.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { + this.buttonItem87, + this.buttonItem88, + this.buttonItem27, + this.sliderGroundTransSet1, + this.buttonItem91, + this.buttonItem1, + this.btnlegendSet, + this.buttonItem89, + this.btnOutputJPG}); + this.ribbonBar21.Location = new System.Drawing.Point(3, 0); + this.ribbonBar21.Name = "ribbonBar21"; + this.ribbonBar21.Size = new System.Drawing.Size(649, 59); + this.ribbonBar21.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.ribbonBar21.TabIndex = 2; + this.ribbonBar21.Text = "浏览模式"; + // + // + // + this.ribbonBar21.TitleStyle.Class = ""; + this.ribbonBar21.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonBar21.TitleStyleMouseOver.Class = ""; + this.ribbonBar21.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar21.TitleVisible = false; + // + // buttonItem87 + // + this.buttonItem87.Image = ((System.Drawing.Image)(resources.GetObject("buttonItem87.Image"))); + this.buttonItem87.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem87.Name = "buttonItem87"; + this.buttonItem87.SubItemsExpandWidth = 14; + this.buttonItem87.Text = "地上模式"; + this.buttonItem87.Click += new System.EventHandler(this.buttonItem87_Click); + // + // buttonItem88 + // + this.buttonItem88.Image = ((System.Drawing.Image)(resources.GetObject("buttonItem88.Image"))); + this.buttonItem88.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem88.Name = "buttonItem88"; + this.buttonItem88.SubItemsExpandWidth = 14; + this.buttonItem88.Text = "地下模式"; + this.buttonItem88.Click += new System.EventHandler(this.buttonItem88_Click); + // + // buttonItem27 + // + this.buttonItem27.Image = ((System.Drawing.Image)(resources.GetObject("buttonItem27.Image"))); + this.buttonItem27.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem27.Name = "buttonItem27"; + this.buttonItem27.SubItemsExpandWidth = 14; + this.buttonItem27.Text = "行走模式"; + this.buttonItem27.Click += new System.EventHandler(this.buttonItem27_Click); + // + // buttonItem91 + // + this.buttonItem91.ForeColor = System.Drawing.Color.Black; + this.buttonItem91.Image = ((System.Drawing.Image)(resources.GetObject("buttonItem91.Image"))); + this.buttonItem91.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem91.Name = "buttonItem91"; + this.buttonItem91.SubItemsExpandWidth = 14; + this.buttonItem91.Text = "快速定位"; + this.buttonItem91.Click += new System.EventHandler(this.buttonItem91_Click); + // + // buttonItem1 + // + this.buttonItem1.Image = ((System.Drawing.Image)(resources.GetObject("buttonItem1.Image"))); + this.buttonItem1.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem1.Name = "buttonItem1"; + this.buttonItem1.SubItemsExpandWidth = 14; + this.buttonItem1.Text = "图层管理"; + this.buttonItem1.Click += new System.EventHandler(this.buttonItem1_Click); + // + // btnlegendSet + // + this.btnlegendSet.Image = ((System.Drawing.Image)(resources.GetObject("btnlegendSet.Image"))); + this.btnlegendSet.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.btnlegendSet.Name = "btnlegendSet"; + this.btnlegendSet.SubItemsExpandWidth = 14; + this.btnlegendSet.Text = "图例"; + this.btnlegendSet.Click += new System.EventHandler(this.btnlegendSet_Click); + // + // buttonItem89 + // + this.buttonItem89.Image = ((System.Drawing.Image)(resources.GetObject("buttonItem89.Image"))); + this.buttonItem89.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem89.Name = "buttonItem89"; + this.buttonItem89.SubItemsExpandWidth = 14; + this.buttonItem89.Text = "全屏显示"; + this.buttonItem89.Click += new System.EventHandler(this.buttonItem89_Click); + // + // btnOutputJPG + // + this.btnOutputJPG.Image = ((System.Drawing.Image)(resources.GetObject("btnOutputJPG.Image"))); + this.btnOutputJPG.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.btnOutputJPG.Name = "btnOutputJPG"; + this.btnOutputJPG.SubItemsExpandWidth = 14; + this.btnOutputJPG.Text = "导出图片"; + this.btnOutputJPG.Click += new System.EventHandler(this.btnOutputJPG_Click); + // + // ribbonPanel12 + // + this.ribbonPanel12.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.ribbonPanel12.Controls.Add(this.ribbonBar18); + this.ribbonPanel12.Controls.Add(this.ribbonBar13); + this.ribbonPanel12.Dock = System.Windows.Forms.DockStyle.Fill; + this.ribbonPanel12.Location = new System.Drawing.Point(0, 33); + this.ribbonPanel12.Name = "ribbonPanel12"; + this.ribbonPanel12.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); + this.ribbonPanel12.Size = new System.Drawing.Size(1328, 62); + // + // + // + this.ribbonPanel12.Style.Class = ""; + this.ribbonPanel12.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonPanel12.StyleMouseDown.Class = ""; + this.ribbonPanel12.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonPanel12.StyleMouseOver.Class = ""; + this.ribbonPanel12.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonPanel12.TabIndex = 34; + this.ribbonPanel12.Visible = false; + // + // ribbonBar18 + // + this.ribbonBar18.AutoOverflowEnabled = true; + // + // + // + this.ribbonBar18.BackgroundMouseOverStyle.Class = ""; + this.ribbonBar18.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonBar18.BackgroundStyle.Class = ""; + this.ribbonBar18.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar18.ContainerControlProcessDialogKey = true; + this.ribbonBar18.Dock = System.Windows.Forms.DockStyle.Left; + this.ribbonBar18.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { + this.buttonItem133, + this.buttonItem132}); + this.ribbonBar18.Location = new System.Drawing.Point(508, 0); + this.ribbonBar18.Name = "ribbonBar18"; + this.ribbonBar18.Size = new System.Drawing.Size(75, 59); + this.ribbonBar18.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.ribbonBar18.TabIndex = 1; + // + // + // + this.ribbonBar18.TitleStyle.Class = ""; + this.ribbonBar18.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonBar18.TitleStyleMouseOver.Class = ""; + this.ribbonBar18.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar18.TitleVisible = false; + // + // buttonItem133 + // + this.buttonItem133.Image = ((System.Drawing.Image)(resources.GetObject("buttonItem133.Image"))); + this.buttonItem133.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem133.Name = "buttonItem133"; + this.buttonItem133.SubItemsExpandWidth = 14; + this.buttonItem133.Text = "审核入库"; + this.buttonItem133.Click += new System.EventHandler(this.buttonItem133_Click_1); + // + // buttonItem132 + // + this.buttonItem132.Name = "buttonItem132"; + // + // ribbonBar13 + // + this.ribbonBar13.AutoOverflowEnabled = true; + // + // + // + this.ribbonBar13.BackgroundMouseOverStyle.Class = ""; + this.ribbonBar13.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonBar13.BackgroundStyle.Class = ""; + this.ribbonBar13.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar13.ContainerControlProcessDialogKey = true; + this.ribbonBar13.Dock = System.Windows.Forms.DockStyle.Left; + this.ribbonBar13.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { + this.buttonItem127, + this.buttonItem128, + this.sliderItem1, + this.buttonItem134, + this.buttonItem130, + this.btn_check_history}); + this.ribbonBar13.Location = new System.Drawing.Point(3, 0); + this.ribbonBar13.Name = "ribbonBar13"; + this.ribbonBar13.Size = new System.Drawing.Size(505, 59); + this.ribbonBar13.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.ribbonBar13.TabIndex = 0; + // + // + // + this.ribbonBar13.TitleStyle.Class = ""; + this.ribbonBar13.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonBar13.TitleStyleMouseOver.Class = ""; + this.ribbonBar13.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar13.TitleVisible = false; + // + // buttonItem127 + // + this.buttonItem127.Image = ((System.Drawing.Image)(resources.GetObject("buttonItem127.Image"))); + this.buttonItem127.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem127.Name = "buttonItem127"; + this.buttonItem127.SubItemsExpandWidth = 14; + this.buttonItem127.Text = "打开数据"; + this.buttonItem127.Click += new System.EventHandler(this.buttonItem127_Click_2); + // + // buttonItem128 + // + this.buttonItem128.Image = ((System.Drawing.Image)(resources.GetObject("buttonItem128.Image"))); + this.buttonItem128.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem128.Name = "buttonItem128"; + this.buttonItem128.SubItemsExpandWidth = 14; + this.buttonItem128.Text = "一键审核"; + this.buttonItem128.Click += new System.EventHandler(this.buttonItem128_Click); + // + // sliderItem1 + // + this.sliderItem1.LabelPosition = DevComponents.DotNetBar.eSliderLabelPosition.Top; + this.sliderItem1.LabelWidth = 50; + this.sliderItem1.Name = "sliderItem1"; + this.sliderItem1.Text = "地面透明度"; + this.sliderItem1.TextColor = System.Drawing.Color.Black; + this.sliderItem1.Value = 0; + this.sliderItem1.ValueChanged += new System.EventHandler(this.sliderItem1_ValueChanged); + // + // buttonItem134 + // + this.buttonItem134.Image = ((System.Drawing.Image)(resources.GetObject("buttonItem134.Image"))); + this.buttonItem134.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem134.Name = "buttonItem134"; + this.buttonItem134.SubItemsExpandWidth = 14; + this.buttonItem134.Text = "模拟设计修改"; + this.buttonItem134.Click += new System.EventHandler(this.buttonItem134_Click_1); + // + // buttonItem130 + // + this.buttonItem130.Image = ((System.Drawing.Image)(resources.GetObject("buttonItem130.Image"))); + this.buttonItem130.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem130.Name = "buttonItem130"; + this.buttonItem130.SubItemsExpandWidth = 14; + this.buttonItem130.Text = "导出审核图"; + this.buttonItem130.Click += new System.EventHandler(this.buttonItem130_Click_1); + // + // btn_check_history + // + this.btn_check_history.Image = ((System.Drawing.Image)(resources.GetObject("btn_check_history.Image"))); + this.btn_check_history.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.btn_check_history.Name = "btn_check_history"; + this.btn_check_history.SubItemsExpandWidth = 14; + this.btn_check_history.Text = "审核历史"; + this.btn_check_history.Click += new System.EventHandler(this.btn_check_history_Click); + // + // ribbonPanel4 + // + this.ribbonPanel4.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.ribbonPanel4.Controls.Add(this.ribbonBar1); + this.ribbonPanel4.Dock = System.Windows.Forms.DockStyle.Fill; + this.ribbonPanel4.Location = new System.Drawing.Point(0, 33); + this.ribbonPanel4.Name = "ribbonPanel4"; + this.ribbonPanel4.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); + this.ribbonPanel4.Size = new System.Drawing.Size(1328, 62); + // + // + // + this.ribbonPanel4.Style.Class = ""; + this.ribbonPanel4.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonPanel4.StyleMouseDown.Class = ""; + this.ribbonPanel4.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonPanel4.StyleMouseOver.Class = ""; + this.ribbonPanel4.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonPanel4.TabIndex = 36; + this.ribbonPanel4.Visible = false; + // + // ribbonBar1 + // + this.ribbonBar1.AutoOverflowEnabled = true; + // + // + // + this.ribbonBar1.BackgroundMouseOverStyle.Class = ""; + this.ribbonBar1.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonBar1.BackgroundStyle.Class = ""; + this.ribbonBar1.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar1.ContainerControlProcessDialogKey = true; + this.ribbonBar1.Dock = System.Windows.Forms.DockStyle.Left; + this.ribbonBar1.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { + this.btn_document_info}); + this.ribbonBar1.Location = new System.Drawing.Point(3, 0); + this.ribbonBar1.Name = "ribbonBar1"; + this.ribbonBar1.Size = new System.Drawing.Size(88, 59); + this.ribbonBar1.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.ribbonBar1.TabIndex = 0; + // + // + // + this.ribbonBar1.TitleStyle.Class = ""; + this.ribbonBar1.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonBar1.TitleStyleMouseOver.Class = ""; + this.ribbonBar1.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar1.TitleVisible = false; + // + // btn_document_info + // + this.btn_document_info.Image = ((System.Drawing.Image)(resources.GetObject("btn_document_info.Image"))); + this.btn_document_info.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.btn_document_info.Name = "btn_document_info"; + this.btn_document_info.SubItemsExpandWidth = 14; + this.btn_document_info.Text = "文档管理"; + this.btn_document_info.Click += new System.EventHandler(this.btn_document_info_Click); + // // ribbonTabItem1 // this.ribbonTabItem1.ButtonStyle = DevComponents.DotNetBar.eButtonStyle.ImageAndText; @@ -3673,7 +3694,6 @@ this.ribbonTabItem7.Name = "ribbonTabItem7"; this.ribbonTabItem7.Panel = this.ribbonPanel7; this.ribbonTabItem7.Text = "管线定位"; - this.ribbonTabItem7.MouseDown += new System.Windows.Forms.MouseEventHandler(this.ribbonTabItem7_MouseDown); // // ribbonTabItem5 // @@ -3684,7 +3704,6 @@ this.ribbonTabItem5.Name = "ribbonTabItem5"; this.ribbonTabItem5.Panel = this.ribbonPanel3; this.ribbonTabItem5.Text = "标识器管理"; - this.ribbonTabItem5.MouseDown += new System.Windows.Forms.MouseEventHandler(this.ribbonTabItem5_MouseDown); // // ribbonTabItem2 // @@ -4451,7 +4470,7 @@ this.dataGridViewX2.ReadOnly = true; this.dataGridViewX2.RowHeadersVisible = false; this.dataGridViewX2.RowTemplate.Height = 23; - this.dataGridViewX2.Size = new System.Drawing.Size(31081, 92); + this.dataGridViewX2.Size = new System.Drawing.Size(31378, 92); this.dataGridViewX2.TabIndex = 11; // // dataGridViewTextBoxColumn10 @@ -4545,7 +4564,7 @@ this.dataGridViewX3.ReadOnly = true; this.dataGridViewX3.RowHeadersVisible = false; this.dataGridViewX3.RowTemplate.Height = 23; - this.dataGridViewX3.Size = new System.Drawing.Size(31080, 127); + this.dataGridViewX3.Size = new System.Drawing.Size(31377, 127); this.dataGridViewX3.TabIndex = 5; this.dataGridViewX3.MouseDoubleClick += new System.Windows.Forms.MouseEventHandler(this.dataGridViewX3_MouseDoubleClick); // @@ -5722,7 +5741,8 @@ // pictureBox1 // this.pictureBox1.Dock = System.Windows.Forms.DockStyle.Top; - this.pictureBox1.Image = ((System.Drawing.Image)(resources.GetObject("pictureBox1.Image"))); +// this.pictureBox1.Image = ((System.Drawing.Image)(resources.GetObject("pictureBox1.Image"))); + this.pictureBox1.Image = Image.FromFile(Application.StartupPath + Utility.TitleImagePath); this.pictureBox1.Location = new System.Drawing.Point(0, 0); this.pictureBox1.Margin = new System.Windows.Forms.Padding(0); this.pictureBox1.Name = "pictureBox1"; @@ -5732,18 +5752,6 @@ this.pictureBox1.TabStop = false; this.pictureBox1.Paint += new System.Windows.Forms.PaintEventHandler(this.pictureBox1_Paint); // - // layerTree - // - this.layerTree.CheckBoxes = true; - this.layerTree.ItemHeight = 18; - this.layerTree.Location = new System.Drawing.Point(30, 78); - this.layerTree.Name = "layerTree"; - this.layerTree.Size = new System.Drawing.Size(121, 97); - this.layerTree.TabIndex = 1; - this.layerTree.AfterCheck += new System.Windows.Forms.TreeViewEventHandler(this.layerTree_AfterCheck); - this.layerTree.NodeMouseClick += new System.Windows.Forms.TreeNodeMouseClickEventHandler(this.layerTree_NodeMouseClick); - this.layerTree.NodeMouseDoubleClick += new System.Windows.Forms.TreeNodeMouseClickEventHandler(this.layerTree_NodeMouseDoubleClick); - // // MainFrm // this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Inherit; @@ -5770,7 +5778,8 @@ this.KeyPreview = true; this.Name = "MainFrm"; this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen; - this.Text = "智慧太湖新城管网规划分析系统6.0"; +// this.Text = "智慧太湖新城管网规划分析系统6.0"; + this.Text = Utility.SysnameVersion; this.WindowState = System.Windows.Forms.FormWindowState.Maximized; this.FormClosing += new System.Windows.Forms.FormClosingEventHandler(this.MainFrm_FormClosing); this.Load += new System.EventHandler(this.MainFrm_Load); @@ -5787,15 +5796,15 @@ this.contextMenuStripDeleteLayerNode.ResumeLayout(false); this.ribbonControl1.ResumeLayout(false); this.ribbonControl1.PerformLayout(); + this.ribbonPanel3.ResumeLayout(false); + this.ribbonPanel7.ResumeLayout(false); + this.ribbonPanel15.ResumeLayout(false); + this.ribbonPanel2.ResumeLayout(false); this.ribbonPanel6.ResumeLayout(false); this.ribbonPanel5.ResumeLayout(false); this.ribbonPanel1.ResumeLayout(false); this.ribbonPanel12.ResumeLayout(false); this.ribbonPanel4.ResumeLayout(false); - this.ribbonPanel15.ResumeLayout(false); - this.ribbonPanel3.ResumeLayout(false); - this.ribbonPanel7.ResumeLayout(false); - this.ribbonPanel2.ResumeLayout(false); this.panelOfTable.ResumeLayout(false); this.panelOfTable.PerformLayout(); ((System.ComponentModel.ISupportInitialize)(this.dataGridViewX1)).EndInit(); @@ -5955,6 +5964,7 @@ private RibbonTabItem ribbonTabItem11; private ButtonItem buttonItem130; private RibbonBar ribbonBar18; + private ButtonItem buttonItem132; private SliderItem sliderItem1; private ButtonItem buttonItem133; private ButtonItem buttonItem134; diff --git a/MainFrm.resx b/MainFrm.resx index 9f9bba4..ce490c1 100644 --- a/MainFrm.resx +++ b/MainFrm.resx @@ -351,6 +351,146 @@ 766, 54 + + + iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 + YQUAAAAZdEVYdFNvZnR3YXJlAEFkb2JlIEltYWdlUmVhZHlxyWU8AAADZmlUWHRYTUw6Y29tLmFkb2Jl + LnhtcAAAAAAAPD94cGFja2V0IGJlZ2luPSLvu78iIGlkPSJXNU0wTXBDZWhpSHpyZVN6TlRjemtjOWQi + Pz4gPHg6eG1wbWV0YSB4bWxuczp4PSJhZG9iZTpuczptZXRhLyIgeDp4bXB0az0iQWRvYmUgWE1QIENv + cmUgNS4zLWMwMTEgNjYuMTQ1NjYxLCAyMDEyLzAyLzA2LTE0OjU2OjI3ICAgICAgICAiPiA8cmRmOlJE + RiB4bWxuczpyZGY9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkvMDIvMjItcmRmLXN5bnRheC1ucyMiPiA8 + cmRmOkRlc2NyaXB0aW9uIHJkZjphYm91dD0iIiB4bWxuczp4bXBNTT0iaHR0cDovL25zLmFkb2JlLmNv + bS94YXAvMS4wL21tLyIgeG1sbnM6c3RSZWY9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlw + ZS9SZXNvdXJjZVJlZiMiIHhtbG5zOnhtcD0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wLyIgeG1w + TU06T3JpZ2luYWxEb2N1bWVudElEPSJ4bXAuZGlkOjYzQTM5NEY4Mjg0OUU0MTE5NDBEQTc4ODZEQzk5 + N0NGIiB4bXBNTTpEb2N1bWVudElEPSJ4bXAuZGlkOjEwQ0IxNzBBNEM1QzExRTRBNkNGQzRBMjhDQzI0 + MkY4IiB4bXBNTTpJbnN0YW5jZUlEPSJ4bXAuaWlkOjEwQ0IxNzA5NEM1QzExRTRBNkNGQzRBMjhDQzI0 + MkY4IiB4bXA6Q3JlYXRvclRvb2w9IkFkb2JlIFBob3Rvc2hvcCBDUzYgKFdpbmRvd3MpIj4gPHhtcE1N + OkRlcml2ZWRGcm9tIHN0UmVmOmluc3RhbmNlSUQ9InhtcC5paWQ6NTEzMDNDMjA1QjRDRTQxMTg4NERE + MUVBOEQ4QTgyNTUiIHN0UmVmOmRvY3VtZW50SUQ9InhtcC5kaWQ6NjNBMzk0RjgyODQ5RTQxMTk0MERB + Nzg4NkRDOTk3Q0YiLz4gPC9yZGY6RGVzY3JpcHRpb24+IDwvcmRmOlJERj4gPC94OnhtcG1ldGE+IDw/ + eHBhY2tldCBlbmQ9InIiPz43wa2/AAAFaUlEQVRIS6WUC0xTVxzGKy0UkSmlFGjBFilSkNpSaAWRh63y + sIiAArKs4spLRLQoiEJlSMGoMCc6CBOnYHzMOHUqqOhEHOqCbjNu6kCd6KYje5mZ6KbObd/OuVL3cEzj + /skv997/+b7v39PTW9aj3/BM+OKxPEIZoW/gyrOuPbP+GvRPSNBQQqXYLwSW1etw7cYt5kqfaZ+uD8QM + Xg8f/f4UxGhHMHv4qlG6vAb9394G6T+BPpdV1oCuUx3VD8Q9XT8//PUJRMghlLhLg1C41IK+r/pB+oNC + 16mO6qmP+gdi/6y793+hwTYEk9uoQOSaStHzxQ2Q/nND9XMKy0D9NIfmDcSzaLhI4KXE7LwinLtwGXfu + PXhhqJ/m0DyS62EdUGWpqcf3P97DD3d++t/QnKraBjpghXWAiC+WN0ZNScOe1mP45vbdF2ZvWwdoDs/D + b6ejs6ecxHPoAG/l+Fhkzy+FyCcY0YkG7D/yAW5+d+e5oXrqo36aQ/McnNyjyAAuHWA05pfgzPlehhyT + mflV6FOMaDt2Ctf7bw8KXac6qqc+a4Zx3hLwRLJCZgcJjcPIEPkyIZmeX1SB7vOX0dn9KQy5jw8r8eVc + HOrsxidXP0d9hxlzd4QgeYMzEt7kQVvOR0pFFNpOHmd81E9znIS+dSTc1foVGWfNKUZjyy6Ex6SQl0cD + 09IVxHAFh0+cReqr+QjK8ERqEw+VHWOwoycSR/v1OHwzDlsvhcNCeqkbedAYxQiPm87kZOQVw0nkW0QG + 2DFnIA+JRm3DFpzr/RKNW3ZDE5UAsX8ocizZiFs7DEUHvPFunw4Hb05B+y09jn49lYHe0x5doxqqLVlf + DJrnyB+pIQNs6QAhf6R8tZu3CqpwPdZu2I6PLl3HwnV5iHv9JVSeUOKdqzq81xeDvddiYG73R0aLEIZm + IRa1jUbjxQnYRHa17YqW0VJPwHT3LocRbirrDiymspXo6L6AgiXV8JSNQ2i6GpNWOqK4U4n1n0Vge68W + 9ecmIKnBBSqDCIp4P2RWGDB/QxqS6l1QcToIld3BqDobgsXEQ73+Se5HrGcgdJEokGzIx66DXXi7dRvC + yx2Q2RqApR+GoPbjCag8pUZ6sxjqWRKEldljRr07ZjaKmHt5qpBZKzkeiIJ2BbIPKmA8MIbJUC/ghrM0 + RfYsDtdhqJNIVulK/ku0BQokbfZGZrsKBR3BmEsMOfvl0FY7o7ypDPo1brCcGc+QUCdExabXEFsjQO4B + ObL2BSBlqx8SWwibvBE0334nK3Ael+yEbIW81DZszlhZ2oieuAYvpO5VIHGzP9J2+CN9pz/CzDwExMox + eZUbFnZpkEc+gLZagJjMWOiqXZDVqmC0+kZf6Nb4IHKFCPIsu92sgCw7BlJswjBJLCdenmuPyFUS6Gp9 + oG/yRdJWGSKqhYjKDgLRImK5ACGlzsy9d/zwXn2DBMZDSkZLPaHlnpBncyGO5kxj+Rps/wYdJE2xzfOb + zcU4sye0b0gRu3E0Ypt8ELTICRFGNcShUgjHuZyWxNu2096sdiXS9o1ltNQjyyDhes4SkuXEGpXC+Ve8 + kjlzpDPtoCkVQrdOihgyIHmXP6LryGEX86Ba6ISJNR7IeF+JV8gAfbOM0XoTj8dktpmEOxM4rJHTBscz + njNNnMiBagEfU98ajRnbZMg7GojCk2oGU1cw5nUGw7BHAZWJD6oVhLFzSDCPCacljGP/J7xAm6Hu0ew6 + STIXkcvckN7ig8XHVCjvUiNvdwAmW0Twms6FayS7meM4REoihxPoeT4u10nsZ0LKhhdsIxZEsVcLtOyL + pHffVcd+IJjI7uGHsRscJEPURMMn2FMtNTwuFusPrjFl48ji7nIAAAAASUVORK5CYII= + + + + + iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 + YQUAAAAZdEVYdFNvZnR3YXJlAEFkb2JlIEltYWdlUmVhZHlxyWU8AAADZmlUWHRYTUw6Y29tLmFkb2Jl + LnhtcAAAAAAAPD94cGFja2V0IGJlZ2luPSLvu78iIGlkPSJXNU0wTXBDZWhpSHpyZVN6TlRjemtjOWQi + Pz4gPHg6eG1wbWV0YSB4bWxuczp4PSJhZG9iZTpuczptZXRhLyIgeDp4bXB0az0iQWRvYmUgWE1QIENv + cmUgNS4zLWMwMTEgNjYuMTQ1NjYxLCAyMDEyLzAyLzA2LTE0OjU2OjI3ICAgICAgICAiPiA8cmRmOlJE + RiB4bWxuczpyZGY9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkvMDIvMjItcmRmLXN5bnRheC1ucyMiPiA8 + cmRmOkRlc2NyaXB0aW9uIHJkZjphYm91dD0iIiB4bWxuczp4bXBNTT0iaHR0cDovL25zLmFkb2JlLmNv + bS94YXAvMS4wL21tLyIgeG1sbnM6c3RSZWY9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlw + ZS9SZXNvdXJjZVJlZiMiIHhtbG5zOnhtcD0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wLyIgeG1w + TU06T3JpZ2luYWxEb2N1bWVudElEPSJ4bXAuZGlkOjYzQTM5NEY4Mjg0OUU0MTE5NDBEQTc4ODZEQzk5 + N0NGIiB4bXBNTTpEb2N1bWVudElEPSJ4bXAuZGlkOkUyMTg3NjEyNDlEODExRTQ4NjNGQjM2Mzk1QkNB + RkQwIiB4bXBNTTpJbnN0YW5jZUlEPSJ4bXAuaWlkOkUyMTg3NjExNDlEODExRTQ4NjNGQjM2Mzk1QkNB + RkQwIiB4bXA6Q3JlYXRvclRvb2w9IkFkb2JlIFBob3Rvc2hvcCBDUzYgKFdpbmRvd3MpIj4gPHhtcE1N + OkRlcml2ZWRGcm9tIHN0UmVmOmluc3RhbmNlSUQ9InhtcC5paWQ6NkJCNTE0NDlEODQ5RTQxMUE0QzNB + MjdEOTJBQzc3QkMiIHN0UmVmOmRvY3VtZW50SUQ9InhtcC5kaWQ6NjNBMzk0RjgyODQ5RTQxMTk0MERB + Nzg4NkRDOTk3Q0YiLz4gPC9yZGY6RGVzY3JpcHRpb24+IDwvcmRmOlJERj4gPC94OnhtcG1ldGE+IDw/ + eHBhY2tldCBlbmQ9InIiPz5e5MstAAADiUlEQVRIS+2UW0yTdxjGcePwtYyVVpAUCi1tv9ImrVbxhAei + kjGphAgFT4jzEJ0gGuJhDk0sml0sglmWmC1hqHNKWwI4srgNh3phpjg1O1yIN5DMbFHQZUu42O76+D4f + 3Fl6Z7ILn+SXvH3f533++X/98iUBeKW81v9Uwx1G1+1240EhfKfdeE/4U3qTAqaZZO/2aeN9IXLrY+Ph + wVOZHll9YyohgYZOGS4JsYdXVDy+NQ8Tvy3BP6OlmPyjDP9OBDRYs8cZPfRy5/uQISIRqcIsLSye+j7I + wN+PluOvhyWY+NmL8fsOjP9kxdN7BRh/YJHfFjy5m48nd4ThQjy968bEgwV49usicFciTEKKFhZPXXv1 + eHxtLsYGPBjttwsWjF0xY+ybOfj9uylYs8cZPfQS7kpEnqDTwuLp9GYlfKZeifUfzcb1j/Iw/IkNv3Q6 + MfKVC6O9bg3W7HFGD73cORlMG5AIizDzAaVtunD5ESXWfNSEY/tNCO00oG1zOkJBBSeqUjVYh6R3Qmat + zSY0Hjah7IASW7hPuSoRvIGihcVTSauCppvFODRUjJZvPWgaKMTuXgt2RHOxLTwHDd3EjPfCudgesWJX + jxM7eryo7/Ni8SGFj8gp6LWwePLvS0Og043A5y5UdtkQOJeLivM5ePf8bJSfM04zG2u7chDoysW6Thsq + zqpY0+GAvymNB/gEgxYWT64tKdGihpSYv8WEpSEzVp0pwDuf2SVQReCiS4M1e5zRQy937NXJ1yRirjDz + AVmVJyNZa9+PObauh7ptKdR6FY6N2SisTYe1OlmDNXtqvRNqwxLYt1TCVLY1ZijZOSQRbuEtLSyeTOXH + sfLDH1EauoFFx6/Cd6Qf7pYI1ObLsO+9iMLdF+DccwEuqd2Nl+Br6sbCxiiKd/XBuPogH1HiAzJXHMC8 + YA98td1wb4rCuaEH1roo8oMR5JGaMPIFa10Ejtowiuouw1vzJTwVXyBz+X4ekPgRZfgbohkLtsfMy47B + tqYdakUnPFUM6YUv+LUGa/Y4o8e8rBXcSffWDkpE4j9ZpEvNmb9KsZV16BzrBnVq1YjeVf1MX1Tzn74o + iCmkdq1/LrNHOkfgB6Vg9afJRrVOdv2ClRkMmklvCnyPs4V8ge81v5RegddnCGHNHmf00JslcJcZCcWv + IU1pAhcyhLcFXj1zGtbscUYPvdyZ+Uv6Wi8rKekFBjoX2627by8AAAAASUVORK5CYII= + + + + + iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 + YQUAAAAZdEVYdFNvZnR3YXJlAEFkb2JlIEltYWdlUmVhZHlxyWU8AAADZmlUWHRYTUw6Y29tLmFkb2Jl + LnhtcAAAAAAAPD94cGFja2V0IGJlZ2luPSLvu78iIGlkPSJXNU0wTXBDZWhpSHpyZVN6TlRjemtjOWQi + Pz4gPHg6eG1wbWV0YSB4bWxuczp4PSJhZG9iZTpuczptZXRhLyIgeDp4bXB0az0iQWRvYmUgWE1QIENv + cmUgNS4zLWMwMTEgNjYuMTQ1NjYxLCAyMDEyLzAyLzA2LTE0OjU2OjI3ICAgICAgICAiPiA8cmRmOlJE + RiB4bWxuczpyZGY9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkvMDIvMjItcmRmLXN5bnRheC1ucyMiPiA8 + cmRmOkRlc2NyaXB0aW9uIHJkZjphYm91dD0iIiB4bWxuczp4bXBNTT0iaHR0cDovL25zLmFkb2JlLmNv + bS94YXAvMS4wL21tLyIgeG1sbnM6c3RSZWY9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlw + ZS9SZXNvdXJjZVJlZiMiIHhtbG5zOnhtcD0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wLyIgeG1w + TU06T3JpZ2luYWxEb2N1bWVudElEPSJ4bXAuZGlkOjYzQTM5NEY4Mjg0OUU0MTE5NDBEQTc4ODZEQzk5 + N0NGIiB4bXBNTTpEb2N1bWVudElEPSJ4bXAuZGlkOkE2Q0VGMDE2NDlEQTExRTQ4NTlCQTI3NTMyOEY5 + NEU2IiB4bXBNTTpJbnN0YW5jZUlEPSJ4bXAuaWlkOkE2Q0VGMDE1NDlEQTExRTQ4NTlCQTI3NTMyOEY5 + NEU2IiB4bXA6Q3JlYXRvclRvb2w9IkFkb2JlIFBob3Rvc2hvcCBDUzYgKFdpbmRvd3MpIj4gPHhtcE1N + OkRlcml2ZWRGcm9tIHN0UmVmOmluc3RhbmNlSUQ9InhtcC5paWQ6NjA1MjM3NzFEOTQ5RTQxMUE0QzNB + MjdEOTJBQzc3QkMiIHN0UmVmOmRvY3VtZW50SUQ9InhtcC5kaWQ6NjNBMzk0RjgyODQ5RTQxMTk0MERB + Nzg4NkRDOTk3Q0YiLz4gPC9yZGY6RGVzY3JpcHRpb24+IDwvcmRmOlJERj4gPC94OnhtcG1ldGE+IDw/ + eHBhY2tldCBlbmQ9InIiPz6UH16BAAABrElEQVRIS63N70tTURzH8fsnKSGCCEIQCBKISMq2iILCgQOL + JUxQAoVKdMGQuwgWFepsMGjFZCMuorsIJV4WFatpvzdr1ZAFsaIHn8559v1eDsI91wevJ/ee7/tjbMRH + fAFwJOWRF6oopTzyQhWlVEdBwRbgUhICAnuvilKGtXDGzW6WV/CvbjE/xTfxr+R6q4xSxtP5YTf8rVn4 + s5dG+809Rv5zvVVGKaNwfYgyBfhksoH83CCF9seiL7LBBnLXTlP4/W4dza0ZLS0nCdlgA9npAQq/qk/Q + sKa0NJ8nIBtsIBPrp9CqPMJBYVLLj+04ZIMNrF49ReHwVRafH1/R8m3zJmSDDdy/fJJC88Ua3mcjWurW + LGSDDaQifRS+O8uopsNaPhVnIBts4E64l0Jj5y4qDy5q+ZCPQTbYgHmph8LXZ0m8TJ3Xsp+LQjbYQOJC + N4XadgLl22e1vM1OQDbYwK1zXRS+lBbhmEHsLgU8kTeVh+OQDTawEDpB2U4mitfpMS22GYJssIH5QCcV + FGwBmuRtkA3cGO3whcZUlEdeqKKU8sgLVZRSfjw+MP4DJ2GPpDR9OIsAAAAASUVORK5CYII= + + + + + iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 + YQUAAAAZdEVYdFNvZnR3YXJlAEFkb2JlIEltYWdlUmVhZHlxyWU8AAADZmlUWHRYTUw6Y29tLmFkb2Jl + LnhtcAAAAAAAPD94cGFja2V0IGJlZ2luPSLvu78iIGlkPSJXNU0wTXBDZWhpSHpyZVN6TlRjemtjOWQi + Pz4gPHg6eG1wbWV0YSB4bWxuczp4PSJhZG9iZTpuczptZXRhLyIgeDp4bXB0az0iQWRvYmUgWE1QIENv + cmUgNS4zLWMwMTEgNjYuMTQ1NjYxLCAyMDEyLzAyLzA2LTE0OjU2OjI3ICAgICAgICAiPiA8cmRmOlJE + RiB4bWxuczpyZGY9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkvMDIvMjItcmRmLXN5bnRheC1ucyMiPiA8 + cmRmOkRlc2NyaXB0aW9uIHJkZjphYm91dD0iIiB4bWxuczp4bXBNTT0iaHR0cDovL25zLmFkb2JlLmNv + bS94YXAvMS4wL21tLyIgeG1sbnM6c3RSZWY9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlw + ZS9SZXNvdXJjZVJlZiMiIHhtbG5zOnhtcD0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wLyIgeG1w + TU06T3JpZ2luYWxEb2N1bWVudElEPSJ4bXAuZGlkOjYzQTM5NEY4Mjg0OUU0MTE5NDBEQTc4ODZEQzk5 + N0NGIiB4bXBNTTpEb2N1bWVudElEPSJ4bXAuZGlkOjJGRTU5OEQ1NDlEQjExRTRBRUVDOTkyMjQ5NzEw + REUwIiB4bXBNTTpJbnN0YW5jZUlEPSJ4bXAuaWlkOjJGRTU5OEQ0NDlEQjExRTRBRUVDOTkyMjQ5NzEw + REUwIiB4bXA6Q3JlYXRvclRvb2w9IkFkb2JlIFBob3Rvc2hvcCBDUzYgKFdpbmRvd3MpIj4gPHhtcE1N + OkRlcml2ZWRGcm9tIHN0UmVmOmluc3RhbmNlSUQ9InhtcC5paWQ6MTY0MkI1RjlEQTQ5RTQxMUE0QzNB + MjdEOTJBQzc3QkMiIHN0UmVmOmRvY3VtZW50SUQ9InhtcC5kaWQ6NjNBMzk0RjgyODQ5RTQxMTk0MERB + Nzg4NkRDOTk3Q0YiLz4gPC9yZGY6RGVzY3JpcHRpb24+IDwvcmRmOlJERj4gPC94OnhtcG1ldGE+IDw/ + eHBhY2tldCBlbmQ9InIiPz6B5sF9AAACe0lEQVRIS7WVb2jMcRzHL7UHanF/Mts5prE/1li3kAfu5Ak7 + 5IHNobBkSC2UIuGJkrrSWRvTmHQWK8U1T8jqUtYwkZpaGjV/Js6to5YwfXze39+fu/v23f36hXe9us+f + 7/v9rd/dr3MQ0X/F4Zm3+K9QhWajNNlBFZqN0mQHS6lMdrCUyqSgimllUsy4XmOmp+QRDllQWbygjjq6 + uimZStOX8a+ixox3pXrM1JLCDAqYJmY7c669M0bff07mcLbtEl9QE8k6V6BH5ooXMsHZZX7ae+AY7W45 + SrPm19LbsSR9m/iRA2bYGefggVePzUgKBzeu9sQpmZ4QcG/WMtk7eLjv0WMz0kOz+TX6MUXvP6cFeNbD + bz6YvQFm2Bk9PPByZO6jksLB5KvRTzTyLikIrG2ktsvXzd4g2hGjYP1ms4eHvb850qkl65LCQW/ntVs0 + 9HpMcPx0K1X4V1Ff/3NzhnphbVDsjBk8Lm/VE44s0ZJ1KS4Ie8uXUvPBE7Tn0ElCzTMqrV5BO/cfEaDG + TD5X6PFFONLygsTF7jj1vxihyPkYNTS1iFrFxm37KHIhJmp43L7qZxzp0pJ1SeHhQGgLJQaH6fb9R1QX + 2EB3Ek9FryLe95j8K9eLT/TB0FZcskOP1iRdkIh23aR7Ay9pzaZddKY9Jup8nIpeoXXhZlHD655b85Bj + p2npLOmCML+dD/iTZhaX3+UvbRB1PpzeygFnSUUvatecRUMzisoOc+x0LZ3FixxYhQyK1cxyZhkTYhqY + RgnM6hmcwVl4ljDI0KS4AC+Kmyli8Jv2MF7GNwXY4QzOwgNv5mWTL7CLpVQmO1hKZbKDpVR/1P8OcvwB + lh7gOXXZq9sAAAAASUVORK5CYII= + + iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 @@ -598,147 +738,7 @@ 1BGxz38BvCwLsyQ3iHgAAAAASUVORK5CYII= - - - iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAZdEVYdFNvZnR3YXJlAEFkb2JlIEltYWdlUmVhZHlxyWU8AAADZmlUWHRYTUw6Y29tLmFkb2Jl - LnhtcAAAAAAAPD94cGFja2V0IGJlZ2luPSLvu78iIGlkPSJXNU0wTXBDZWhpSHpyZVN6TlRjemtjOWQi - Pz4gPHg6eG1wbWV0YSB4bWxuczp4PSJhZG9iZTpuczptZXRhLyIgeDp4bXB0az0iQWRvYmUgWE1QIENv - cmUgNS4zLWMwMTEgNjYuMTQ1NjYxLCAyMDEyLzAyLzA2LTE0OjU2OjI3ICAgICAgICAiPiA8cmRmOlJE - RiB4bWxuczpyZGY9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkvMDIvMjItcmRmLXN5bnRheC1ucyMiPiA8 - cmRmOkRlc2NyaXB0aW9uIHJkZjphYm91dD0iIiB4bWxuczp4bXBNTT0iaHR0cDovL25zLmFkb2JlLmNv - bS94YXAvMS4wL21tLyIgeG1sbnM6c3RSZWY9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlw - ZS9SZXNvdXJjZVJlZiMiIHhtbG5zOnhtcD0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wLyIgeG1w - TU06T3JpZ2luYWxEb2N1bWVudElEPSJ4bXAuZGlkOjYzQTM5NEY4Mjg0OUU0MTE5NDBEQTc4ODZEQzk5 - N0NGIiB4bXBNTTpEb2N1bWVudElEPSJ4bXAuZGlkOjEwQ0IxNzBBNEM1QzExRTRBNkNGQzRBMjhDQzI0 - MkY4IiB4bXBNTTpJbnN0YW5jZUlEPSJ4bXAuaWlkOjEwQ0IxNzA5NEM1QzExRTRBNkNGQzRBMjhDQzI0 - MkY4IiB4bXA6Q3JlYXRvclRvb2w9IkFkb2JlIFBob3Rvc2hvcCBDUzYgKFdpbmRvd3MpIj4gPHhtcE1N - OkRlcml2ZWRGcm9tIHN0UmVmOmluc3RhbmNlSUQ9InhtcC5paWQ6NTEzMDNDMjA1QjRDRTQxMTg4NERE - MUVBOEQ4QTgyNTUiIHN0UmVmOmRvY3VtZW50SUQ9InhtcC5kaWQ6NjNBMzk0RjgyODQ5RTQxMTk0MERB - Nzg4NkRDOTk3Q0YiLz4gPC9yZGY6RGVzY3JpcHRpb24+IDwvcmRmOlJERj4gPC94OnhtcG1ldGE+IDw/ - eHBhY2tldCBlbmQ9InIiPz43wa2/AAAFaUlEQVRIS6WUC0xTVxzGKy0UkSmlFGjBFilSkNpSaAWRh63y - sIiAArKs4spLRLQoiEJlSMGoMCc6CBOnYHzMOHUqqOhEHOqCbjNu6kCd6KYje5mZ6KbObd/OuVL3cEzj - /skv997/+b7v39PTW9aj3/BM+OKxPEIZoW/gyrOuPbP+GvRPSNBQQqXYLwSW1etw7cYt5kqfaZ+uD8QM - Xg8f/f4UxGhHMHv4qlG6vAb9394G6T+BPpdV1oCuUx3VD8Q9XT8//PUJRMghlLhLg1C41IK+r/pB+oNC - 16mO6qmP+gdi/6y793+hwTYEk9uoQOSaStHzxQ2Q/nND9XMKy0D9NIfmDcSzaLhI4KXE7LwinLtwGXfu - PXhhqJ/m0DyS62EdUGWpqcf3P97DD3d++t/QnKraBjpghXWAiC+WN0ZNScOe1mP45vbdF2ZvWwdoDs/D - b6ejs6ecxHPoAG/l+Fhkzy+FyCcY0YkG7D/yAW5+d+e5oXrqo36aQ/McnNyjyAAuHWA05pfgzPlehhyT - mflV6FOMaDt2Ctf7bw8KXac6qqc+a4Zx3hLwRLJCZgcJjcPIEPkyIZmeX1SB7vOX0dn9KQy5jw8r8eVc - HOrsxidXP0d9hxlzd4QgeYMzEt7kQVvOR0pFFNpOHmd81E9znIS+dSTc1foVGWfNKUZjyy6Ex6SQl0cD - 09IVxHAFh0+cReqr+QjK8ERqEw+VHWOwoycSR/v1OHwzDlsvhcNCeqkbedAYxQiPm87kZOQVw0nkW0QG - 2DFnIA+JRm3DFpzr/RKNW3ZDE5UAsX8ocizZiFs7DEUHvPFunw4Hb05B+y09jn49lYHe0x5doxqqLVlf - DJrnyB+pIQNs6QAhf6R8tZu3CqpwPdZu2I6PLl3HwnV5iHv9JVSeUOKdqzq81xeDvddiYG73R0aLEIZm - IRa1jUbjxQnYRHa17YqW0VJPwHT3LocRbirrDiymspXo6L6AgiXV8JSNQ2i6GpNWOqK4U4n1n0Vge68W - 9ecmIKnBBSqDCIp4P2RWGDB/QxqS6l1QcToIld3BqDobgsXEQ73+Se5HrGcgdJEokGzIx66DXXi7dRvC - yx2Q2RqApR+GoPbjCag8pUZ6sxjqWRKEldljRr07ZjaKmHt5qpBZKzkeiIJ2BbIPKmA8MIbJUC/ghrM0 - RfYsDtdhqJNIVulK/ku0BQokbfZGZrsKBR3BmEsMOfvl0FY7o7ypDPo1brCcGc+QUCdExabXEFsjQO4B - ObL2BSBlqx8SWwibvBE0334nK3Ael+yEbIW81DZszlhZ2oieuAYvpO5VIHGzP9J2+CN9pz/CzDwExMox - eZUbFnZpkEc+gLZagJjMWOiqXZDVqmC0+kZf6Nb4IHKFCPIsu92sgCw7BlJswjBJLCdenmuPyFUS6Gp9 - oG/yRdJWGSKqhYjKDgLRImK5ACGlzsy9d/zwXn2DBMZDSkZLPaHlnpBncyGO5kxj+Rps/wYdJE2xzfOb - zcU4sye0b0gRu3E0Ypt8ELTICRFGNcShUgjHuZyWxNu2096sdiXS9o1ltNQjyyDhes4SkuXEGpXC+Ve8 - kjlzpDPtoCkVQrdOihgyIHmXP6LryGEX86Ba6ISJNR7IeF+JV8gAfbOM0XoTj8dktpmEOxM4rJHTBscz - njNNnMiBagEfU98ajRnbZMg7GojCk2oGU1cw5nUGw7BHAZWJD6oVhLFzSDCPCacljGP/J7xAm6Hu0ew6 - STIXkcvckN7ig8XHVCjvUiNvdwAmW0Twms6FayS7meM4REoihxPoeT4u10nsZ0LKhhdsIxZEsVcLtOyL - pHffVcd+IJjI7uGHsRscJEPURMMn2FMtNTwuFusPrjFl48ji7nIAAAAASUVORK5CYII= - - - - - iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAZdEVYdFNvZnR3YXJlAEFkb2JlIEltYWdlUmVhZHlxyWU8AAADZmlUWHRYTUw6Y29tLmFkb2Jl - LnhtcAAAAAAAPD94cGFja2V0IGJlZ2luPSLvu78iIGlkPSJXNU0wTXBDZWhpSHpyZVN6TlRjemtjOWQi - Pz4gPHg6eG1wbWV0YSB4bWxuczp4PSJhZG9iZTpuczptZXRhLyIgeDp4bXB0az0iQWRvYmUgWE1QIENv - cmUgNS4zLWMwMTEgNjYuMTQ1NjYxLCAyMDEyLzAyLzA2LTE0OjU2OjI3ICAgICAgICAiPiA8cmRmOlJE - RiB4bWxuczpyZGY9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkvMDIvMjItcmRmLXN5bnRheC1ucyMiPiA8 - cmRmOkRlc2NyaXB0aW9uIHJkZjphYm91dD0iIiB4bWxuczp4bXBNTT0iaHR0cDovL25zLmFkb2JlLmNv - bS94YXAvMS4wL21tLyIgeG1sbnM6c3RSZWY9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlw - ZS9SZXNvdXJjZVJlZiMiIHhtbG5zOnhtcD0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wLyIgeG1w - TU06T3JpZ2luYWxEb2N1bWVudElEPSJ4bXAuZGlkOjYzQTM5NEY4Mjg0OUU0MTE5NDBEQTc4ODZEQzk5 - N0NGIiB4bXBNTTpEb2N1bWVudElEPSJ4bXAuZGlkOkUyMTg3NjEyNDlEODExRTQ4NjNGQjM2Mzk1QkNB - RkQwIiB4bXBNTTpJbnN0YW5jZUlEPSJ4bXAuaWlkOkUyMTg3NjExNDlEODExRTQ4NjNGQjM2Mzk1QkNB - RkQwIiB4bXA6Q3JlYXRvclRvb2w9IkFkb2JlIFBob3Rvc2hvcCBDUzYgKFdpbmRvd3MpIj4gPHhtcE1N - OkRlcml2ZWRGcm9tIHN0UmVmOmluc3RhbmNlSUQ9InhtcC5paWQ6NkJCNTE0NDlEODQ5RTQxMUE0QzNB - MjdEOTJBQzc3QkMiIHN0UmVmOmRvY3VtZW50SUQ9InhtcC5kaWQ6NjNBMzk0RjgyODQ5RTQxMTk0MERB - Nzg4NkRDOTk3Q0YiLz4gPC9yZGY6RGVzY3JpcHRpb24+IDwvcmRmOlJERj4gPC94OnhtcG1ldGE+IDw/ - eHBhY2tldCBlbmQ9InIiPz5e5MstAAADiUlEQVRIS+2UW0yTdxjGcePwtYyVVpAUCi1tv9ImrVbxhAei - kjGphAgFT4jzEJ0gGuJhDk0sml0sglmWmC1hqHNKWwI4srgNh3phpjg1O1yIN5DMbFHQZUu42O76+D4f - 3Fl6Z7ILn+SXvH3f533++X/98iUBeKW81v9Uwx1G1+1240EhfKfdeE/4U3qTAqaZZO/2aeN9IXLrY+Ph - wVOZHll9YyohgYZOGS4JsYdXVDy+NQ8Tvy3BP6OlmPyjDP9OBDRYs8cZPfRy5/uQISIRqcIsLSye+j7I - wN+PluOvhyWY+NmL8fsOjP9kxdN7BRh/YJHfFjy5m48nd4ThQjy968bEgwV49usicFciTEKKFhZPXXv1 - eHxtLsYGPBjttwsWjF0xY+ybOfj9uylYs8cZPfQS7kpEnqDTwuLp9GYlfKZeifUfzcb1j/Iw/IkNv3Q6 - MfKVC6O9bg3W7HFGD73cORlMG5AIizDzAaVtunD5ESXWfNSEY/tNCO00oG1zOkJBBSeqUjVYh6R3Qmat - zSY0Hjah7IASW7hPuSoRvIGihcVTSauCppvFODRUjJZvPWgaKMTuXgt2RHOxLTwHDd3EjPfCudgesWJX - jxM7eryo7/Ni8SGFj8gp6LWwePLvS0Og043A5y5UdtkQOJeLivM5ePf8bJSfM04zG2u7chDoysW6Thsq - zqpY0+GAvymNB/gEgxYWT64tKdGihpSYv8WEpSEzVp0pwDuf2SVQReCiS4M1e5zRQy937NXJ1yRirjDz - AVmVJyNZa9+PObauh7ptKdR6FY6N2SisTYe1OlmDNXtqvRNqwxLYt1TCVLY1ZijZOSQRbuEtLSyeTOXH - sfLDH1EauoFFx6/Cd6Qf7pYI1ObLsO+9iMLdF+DccwEuqd2Nl+Br6sbCxiiKd/XBuPogH1HiAzJXHMC8 - YA98td1wb4rCuaEH1roo8oMR5JGaMPIFa10Ejtowiuouw1vzJTwVXyBz+X4ekPgRZfgbohkLtsfMy47B - tqYdakUnPFUM6YUv+LUGa/Y4o8e8rBXcSffWDkpE4j9ZpEvNmb9KsZV16BzrBnVq1YjeVf1MX1Tzn74o - iCmkdq1/LrNHOkfgB6Vg9afJRrVOdv2ClRkMmklvCnyPs4V8ge81v5RegddnCGHNHmf00JslcJcZCcWv - IU1pAhcyhLcFXj1zGtbscUYPvdyZ+Uv6Wi8rKekFBjoX2627by8AAAAASUVORK5CYII= - - - - - iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAZdEVYdFNvZnR3YXJlAEFkb2JlIEltYWdlUmVhZHlxyWU8AAADZmlUWHRYTUw6Y29tLmFkb2Jl - LnhtcAAAAAAAPD94cGFja2V0IGJlZ2luPSLvu78iIGlkPSJXNU0wTXBDZWhpSHpyZVN6TlRjemtjOWQi - Pz4gPHg6eG1wbWV0YSB4bWxuczp4PSJhZG9iZTpuczptZXRhLyIgeDp4bXB0az0iQWRvYmUgWE1QIENv - cmUgNS4zLWMwMTEgNjYuMTQ1NjYxLCAyMDEyLzAyLzA2LTE0OjU2OjI3ICAgICAgICAiPiA8cmRmOlJE - RiB4bWxuczpyZGY9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkvMDIvMjItcmRmLXN5bnRheC1ucyMiPiA8 - cmRmOkRlc2NyaXB0aW9uIHJkZjphYm91dD0iIiB4bWxuczp4bXBNTT0iaHR0cDovL25zLmFkb2JlLmNv - bS94YXAvMS4wL21tLyIgeG1sbnM6c3RSZWY9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlw - ZS9SZXNvdXJjZVJlZiMiIHhtbG5zOnhtcD0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wLyIgeG1w - TU06T3JpZ2luYWxEb2N1bWVudElEPSJ4bXAuZGlkOjYzQTM5NEY4Mjg0OUU0MTE5NDBEQTc4ODZEQzk5 - N0NGIiB4bXBNTTpEb2N1bWVudElEPSJ4bXAuZGlkOkE2Q0VGMDE2NDlEQTExRTQ4NTlCQTI3NTMyOEY5 - NEU2IiB4bXBNTTpJbnN0YW5jZUlEPSJ4bXAuaWlkOkE2Q0VGMDE1NDlEQTExRTQ4NTlCQTI3NTMyOEY5 - NEU2IiB4bXA6Q3JlYXRvclRvb2w9IkFkb2JlIFBob3Rvc2hvcCBDUzYgKFdpbmRvd3MpIj4gPHhtcE1N - OkRlcml2ZWRGcm9tIHN0UmVmOmluc3RhbmNlSUQ9InhtcC5paWQ6NjA1MjM3NzFEOTQ5RTQxMUE0QzNB - MjdEOTJBQzc3QkMiIHN0UmVmOmRvY3VtZW50SUQ9InhtcC5kaWQ6NjNBMzk0RjgyODQ5RTQxMTk0MERB - Nzg4NkRDOTk3Q0YiLz4gPC9yZGY6RGVzY3JpcHRpb24+IDwvcmRmOlJERj4gPC94OnhtcG1ldGE+IDw/ - eHBhY2tldCBlbmQ9InIiPz6UH16BAAABrElEQVRIS63N70tTURzH8fsnKSGCCEIQCBKISMq2iILCgQOL - JUxQAoVKdMGQuwgWFepsMGjFZCMuorsIJV4WFatpvzdr1ZAFsaIHn8559v1eDsI91wevJ/ee7/tjbMRH - fAFwJOWRF6oopTzyQhWlVEdBwRbgUhICAnuvilKGtXDGzW6WV/CvbjE/xTfxr+R6q4xSxtP5YTf8rVn4 - s5dG+809Rv5zvVVGKaNwfYgyBfhksoH83CCF9seiL7LBBnLXTlP4/W4dza0ZLS0nCdlgA9npAQq/qk/Q - sKa0NJ8nIBtsIBPrp9CqPMJBYVLLj+04ZIMNrF49ReHwVRafH1/R8m3zJmSDDdy/fJJC88Ua3mcjWurW - LGSDDaQifRS+O8uopsNaPhVnIBts4E64l0Jj5y4qDy5q+ZCPQTbYgHmph8LXZ0m8TJ3Xsp+LQjbYQOJC - N4XadgLl22e1vM1OQDbYwK1zXRS+lBbhmEHsLgU8kTeVh+OQDTawEDpB2U4mitfpMS22GYJssIH5QCcV - FGwBmuRtkA3cGO3whcZUlEdeqKKU8sgLVZRSfjw+MP4DJ2GPpDR9OIsAAAAASUVORK5CYII= - - - - - iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAZdEVYdFNvZnR3YXJlAEFkb2JlIEltYWdlUmVhZHlxyWU8AAADZmlUWHRYTUw6Y29tLmFkb2Jl - LnhtcAAAAAAAPD94cGFja2V0IGJlZ2luPSLvu78iIGlkPSJXNU0wTXBDZWhpSHpyZVN6TlRjemtjOWQi - Pz4gPHg6eG1wbWV0YSB4bWxuczp4PSJhZG9iZTpuczptZXRhLyIgeDp4bXB0az0iQWRvYmUgWE1QIENv - cmUgNS4zLWMwMTEgNjYuMTQ1NjYxLCAyMDEyLzAyLzA2LTE0OjU2OjI3ICAgICAgICAiPiA8cmRmOlJE - RiB4bWxuczpyZGY9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkvMDIvMjItcmRmLXN5bnRheC1ucyMiPiA8 - cmRmOkRlc2NyaXB0aW9uIHJkZjphYm91dD0iIiB4bWxuczp4bXBNTT0iaHR0cDovL25zLmFkb2JlLmNv - bS94YXAvMS4wL21tLyIgeG1sbnM6c3RSZWY9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlw - ZS9SZXNvdXJjZVJlZiMiIHhtbG5zOnhtcD0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wLyIgeG1w - TU06T3JpZ2luYWxEb2N1bWVudElEPSJ4bXAuZGlkOjYzQTM5NEY4Mjg0OUU0MTE5NDBEQTc4ODZEQzk5 - N0NGIiB4bXBNTTpEb2N1bWVudElEPSJ4bXAuZGlkOjJGRTU5OEQ1NDlEQjExRTRBRUVDOTkyMjQ5NzEw - REUwIiB4bXBNTTpJbnN0YW5jZUlEPSJ4bXAuaWlkOjJGRTU5OEQ0NDlEQjExRTRBRUVDOTkyMjQ5NzEw - REUwIiB4bXA6Q3JlYXRvclRvb2w9IkFkb2JlIFBob3Rvc2hvcCBDUzYgKFdpbmRvd3MpIj4gPHhtcE1N - OkRlcml2ZWRGcm9tIHN0UmVmOmluc3RhbmNlSUQ9InhtcC5paWQ6MTY0MkI1RjlEQTQ5RTQxMUE0QzNB - MjdEOTJBQzc3QkMiIHN0UmVmOmRvY3VtZW50SUQ9InhtcC5kaWQ6NjNBMzk0RjgyODQ5RTQxMTk0MERB - Nzg4NkRDOTk3Q0YiLz4gPC9yZGY6RGVzY3JpcHRpb24+IDwvcmRmOlJERj4gPC94OnhtcG1ldGE+IDw/ - eHBhY2tldCBlbmQ9InIiPz6B5sF9AAACe0lEQVRIS7WVb2jMcRzHL7UHanF/Mts5prE/1li3kAfu5Ak7 - 5IHNobBkSC2UIuGJkrrSWRvTmHQWK8U1T8jqUtYwkZpaGjV/Js6to5YwfXze39+fu/v23f36hXe9us+f - 7/v9rd/dr3MQ0X/F4Zm3+K9QhWajNNlBFZqN0mQHS6lMdrCUyqSgimllUsy4XmOmp+QRDllQWbygjjq6 - uimZStOX8a+ixox3pXrM1JLCDAqYJmY7c669M0bff07mcLbtEl9QE8k6V6BH5ooXMsHZZX7ae+AY7W45 - SrPm19LbsSR9m/iRA2bYGefggVePzUgKBzeu9sQpmZ4QcG/WMtk7eLjv0WMz0kOz+TX6MUXvP6cFeNbD - bz6YvQFm2Bk9PPByZO6jksLB5KvRTzTyLikIrG2ktsvXzd4g2hGjYP1ms4eHvb850qkl65LCQW/ntVs0 - 9HpMcPx0K1X4V1Ff/3NzhnphbVDsjBk8Lm/VE44s0ZJ1KS4Ie8uXUvPBE7Tn0ElCzTMqrV5BO/cfEaDG - TD5X6PFFONLygsTF7jj1vxihyPkYNTS1iFrFxm37KHIhJmp43L7qZxzp0pJ1SeHhQGgLJQaH6fb9R1QX - 2EB3Ek9FryLe95j8K9eLT/TB0FZcskOP1iRdkIh23aR7Ay9pzaZddKY9Jup8nIpeoXXhZlHD655b85Bj - p2npLOmCML+dD/iTZhaX3+UvbRB1PpzeygFnSUUvatecRUMzisoOc+x0LZ3FixxYhQyK1cxyZhkTYhqY - RgnM6hmcwVl4ljDI0KS4AC+Kmyli8Jv2MF7GNwXY4QzOwgNv5mWTL7CLpVQmO1hKZbKDpVR/1P8OcvwB - lh7gOXXZq9sAAAAASUVORK5CYII= - - - + iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 YQUAAAAZdEVYdFNvZnR3YXJlAEFkb2JlIEltYWdlUmVhZHlxyWU8AAADZmlUWHRYTUw6Y29tLmFkb2Jl @@ -750,26 +750,244 @@ bS94YXAvMS4wL21tLyIgeG1sbnM6c3RSZWY9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlw ZS9SZXNvdXJjZVJlZiMiIHhtbG5zOnhtcD0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wLyIgeG1w TU06T3JpZ2luYWxEb2N1bWVudElEPSJ4bXAuZGlkOjJGQzkyMzc0Rjk0OUU0MTE5NjNCQjRENDMzQjlC - MUM4IiB4bXBNTTpEb2N1bWVudElEPSJ4bXAuZGlkOjJERjY3MEZENEQyMzExRTRCNDlGQUMwMzk0OTAw - Qzc4IiB4bXBNTTpJbnN0YW5jZUlEPSJ4bXAuaWlkOjJERjY3MEZDNEQyMzExRTRCNDlGQUMwMzk0OTAw - Qzc4IiB4bXA6Q3JlYXRvclRvb2w9IkFkb2JlIFBob3Rvc2hvcCBDUzYgKFdpbmRvd3MpIj4gPHhtcE1N - OkRlcml2ZWRGcm9tIHN0UmVmOmluc3RhbmNlSUQ9InhtcC5paWQ6NjhGOUEyRDEyMTRERTQxMUIzNkJE + MUM4IiB4bXBNTTpEb2N1bWVudElEPSJ4bXAuZGlkOjlDMzFEOUI4NEFBRjExRTQ4OTA5OUYwQ0QzM0Q2 + NEI4IiB4bXBNTTpJbnN0YW5jZUlEPSJ4bXAuaWlkOjlDMzFEOUI3NEFBRjExRTQ4OTA5OUYwQ0QzM0Q2 + NEI4IiB4bXA6Q3JlYXRvclRvb2w9IkFkb2JlIFBob3Rvc2hvcCBDUzYgKFdpbmRvd3MpIj4gPHhtcE1N + OkRlcml2ZWRGcm9tIHN0UmVmOmluc3RhbmNlSUQ9InhtcC5paWQ6MDk5Mzk2NTZBRjRBRTQxMTk3NEFD + QUFFQjRCMzVENkUiIHN0UmVmOmRvY3VtZW50SUQ9InhtcC5kaWQ6MkZDOTIzNzRGOTQ5RTQxMTk2M0JC + NEQ0MzNCOUIxQzgiLz4gPC9yZGY6RGVzY3JpcHRpb24+IDwvcmRmOlJERj4gPC94OnhtcG1ldGE+IDw/ + eHBhY2tldCBlbmQ9InIiPz73sIMwAAADIElEQVRIS7WVa0iTYRTH56Uiysvm3TkvpLl5DRIvQYWVWl+6 + iNEVg0yhQqloQZHkLT+Y0YdAs75IpEUhzERZoZhsRpZlS7soblotsRwoxhqWeTrnYZtv+u7NsB74cZ5z + zv89/z17HzYRAPxXeIv/EpFXcOyi4BvKhfehv4FvKBfeh+ayqIUDlIgBgT8whpRYoT2fhgvNVJKBQT9s + hB8/QZDPpnEIjEhg0J5Pw4Vm0mwygG9T06BSqQQhTUhUMoRGpyxYT7OZwfhXC6jVakFIYzNYqN5uMGKa + BI1GIwhpghXJaJJi13d0dEB2bj74hsWzSDlXbzfQG02g0+kEIU2wIomdovzKdVifngnFFytBeb4cLN+n + WaSc6hfKKqB/eHTWoHfwExgMBkFII5MnQUD4WlAWloO26wVs35MDmifPmQFFyqlO/aKKqlmDp31DYDKZ + BCGNTJ4IPqHx8LJvACbNUw7p6e2HuJQMNIhhBuaHj3vBYrEI0tb1BoIiE9kJ9h7Oh7EJM+g/jEJuwVlY + s24ri5RTnfo5BedAIoueIYPumvomuHzjzm9cq2uCq7UNUH2rEarr7kNd0yP26Y+eKoSWtk4wfpmAg7kn + ITY5DUorq1g8cOQEqze3aplOEhRtJoMcL1mMTixV9IgD5a/tSBVDYql8AKOBQLEJtTP08gY/jjFiktKg + 5FIV21Ok3NazvmR2AvrFkCAJyGYk1comZAuHDM/AyLvHThfBveZ26NOPwI59eey7LsbhFCmnOvVJ5+Ef + rrYZLEU8EZ85+HLwW7ZCLMVTFWdkHoLut+/hgbYHaE9XN31XNsupTrWV3jKVs+uS3cyAD0cLe331jW3Q + qRt0CPUlQVHDKI+fN9iGo4W90uNnyuA2vvRtWTlQgxeg/dk7FimnOvU9/CNqUe47b7ANRwt7AfjpKvAK + Gt18Qur35ymhRfsKKLr5hN7EyzDq7humWrrcfSfKxbz/QlwcLDck1snZJdUzYHUDmk57+K1qdXJyzsL6 + RmQD9ZmObygXB8sVIRO6fXQB4hC6eRQppzr1XXmHclnAckFomLc1Um5dItEvhZ97MQXP9N0AAAAASUVO + RK5CYII= + + + + + iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 + YQUAAAAZdEVYdFNvZnR3YXJlAEFkb2JlIEltYWdlUmVhZHlxyWU8AAADZmlUWHRYTUw6Y29tLmFkb2Jl + LnhtcAAAAAAAPD94cGFja2V0IGJlZ2luPSLvu78iIGlkPSJXNU0wTXBDZWhpSHpyZVN6TlRjemtjOWQi + Pz4gPHg6eG1wbWV0YSB4bWxuczp4PSJhZG9iZTpuczptZXRhLyIgeDp4bXB0az0iQWRvYmUgWE1QIENv + cmUgNS4zLWMwMTEgNjYuMTQ1NjYxLCAyMDEyLzAyLzA2LTE0OjU2OjI3ICAgICAgICAiPiA8cmRmOlJE + RiB4bWxuczpyZGY9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkvMDIvMjItcmRmLXN5bnRheC1ucyMiPiA8 + cmRmOkRlc2NyaXB0aW9uIHJkZjphYm91dD0iIiB4bWxuczp4bXBNTT0iaHR0cDovL25zLmFkb2JlLmNv + bS94YXAvMS4wL21tLyIgeG1sbnM6c3RSZWY9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlw + ZS9SZXNvdXJjZVJlZiMiIHhtbG5zOnhtcD0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wLyIgeG1w + TU06T3JpZ2luYWxEb2N1bWVudElEPSJ4bXAuZGlkOjJGQzkyMzc0Rjk0OUU0MTE5NjNCQjRENDMzQjlC + MUM4IiB4bXBNTTpEb2N1bWVudElEPSJ4bXAuZGlkOjhDMTdBQjRENEFBRTExRTQ4QjQyODY0MDNBNTJE + NzNCIiB4bXBNTTpJbnN0YW5jZUlEPSJ4bXAuaWlkOjhDMTdBQjRDNEFBRTExRTQ4QjQyODY0MDNBNTJE + NzNCIiB4bXA6Q3JlYXRvclRvb2w9IkFkb2JlIFBob3Rvc2hvcCBDUzYgKFdpbmRvd3MpIj4gPHhtcE1N + OkRlcml2ZWRGcm9tIHN0UmVmOmluc3RhbmNlSUQ9InhtcC5paWQ6NUQyMjc4QTlBQjRBRTQxMTk3NEFD + QUFFQjRCMzVENkUiIHN0UmVmOmRvY3VtZW50SUQ9InhtcC5kaWQ6MkZDOTIzNzRGOTQ5RTQxMTk2M0JC + NEQ0MzNCOUIxQzgiLz4gPC9yZGY6RGVzY3JpcHRpb24+IDwvcmRmOlJERj4gPC94OnhtcG1ldGE+IDw/ + eHBhY2tldCBlbmQ9InIiPz4eHsDfAAAB00lEQVRIS7XVWytEURQH8HniTTNHLs0NCXNcXjTN5dH9g/gM + 3jx590QhFDJS0gyTGmpqaqJIMW4hzlAoOaWISS7LWifntI3ddnTGrl92e/57/We/DBsA/CvuYSHZSr0t + lvCGsriX/oI3lMW9lM/SwgF9SEHwizs08IX2vAyLZvZRgXJ+cQWv7yB0q96Ds86voT0vw6KZNJsK4Pnl + DWKxmBBlqhpDUN0UNp2n2VrB/WMOEomEEGX0ArN5o+BGfYB0Oi1EGa8cwpKw6bxRcH6lQiaTEaKMVw5q + rzCbNwr2z65BURQhynh8Qe0VZvNGwdZBFlRVFaKMxxfQXmE2rxc8rW3sQy6XE0puHoG7IaC9YnV9j5th + pbZPqOCDCrbH5uIwOD7/zWgkDkNTizAyuwQjkWWIxFNQWduqmVxI/MiPz6/A8HTUuDMTTYLkbrqhgt5S + T3PG4ZJ3HE7focElZx0u3yn+VQiG1ZLymmm7s74f88f42S6bl9zyJZ6d6Xckd+Mt5ieogH4xJORHHajt + SzvqZPSgECpHZSiA2DztuxBlad+NgnpBEbIjusiiYboKRF+kGFHegUR5ImkFv7G0eAPzWVq8gfksLd5/ + oULiHhYS97BwwPYJlSCUgVubViQAAAAASUVORK5CYII= + + + + + iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 + YQUAAAAZdEVYdFNvZnR3YXJlAEFkb2JlIEltYWdlUmVhZHlxyWU8AAADZmlUWHRYTUw6Y29tLmFkb2Jl + LnhtcAAAAAAAPD94cGFja2V0IGJlZ2luPSLvu78iIGlkPSJXNU0wTXBDZWhpSHpyZVN6TlRjemtjOWQi + Pz4gPHg6eG1wbWV0YSB4bWxuczp4PSJhZG9iZTpuczptZXRhLyIgeDp4bXB0az0iQWRvYmUgWE1QIENv + cmUgNS4zLWMwMTEgNjYuMTQ1NjYxLCAyMDEyLzAyLzA2LTE0OjU2OjI3ICAgICAgICAiPiA8cmRmOlJE + RiB4bWxuczpyZGY9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkvMDIvMjItcmRmLXN5bnRheC1ucyMiPiA8 + cmRmOkRlc2NyaXB0aW9uIHJkZjphYm91dD0iIiB4bWxuczp4bXBNTT0iaHR0cDovL25zLmFkb2JlLmNv + bS94YXAvMS4wL21tLyIgeG1sbnM6c3RSZWY9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlw + ZS9SZXNvdXJjZVJlZiMiIHhtbG5zOnhtcD0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wLyIgeG1w + TU06T3JpZ2luYWxEb2N1bWVudElEPSJ4bXAuZGlkOjJGQzkyMzc0Rjk0OUU0MTE5NjNCQjRENDMzQjlC + MUM4IiB4bXBNTTpEb2N1bWVudElEPSJ4bXAuZGlkOjJEMDQyOEZBNEFEMjExRTRBN0MxRDBCNzJGRUND + MDEzIiB4bXBNTTpJbnN0YW5jZUlEPSJ4bXAuaWlkOjJEMDQyOEY5NEFEMjExRTRBN0MxRDBCNzJGRUND + MDEzIiB4bXA6Q3JlYXRvclRvb2w9IkFkb2JlIFBob3Rvc2hvcCBDUzYgKFdpbmRvd3MpIj4gPHhtcE1N + OkRlcml2ZWRGcm9tIHN0UmVmOmluc3RhbmNlSUQ9InhtcC5paWQ6QkRDRkI1RDVEMTRBRTQxMTk3NEFD + QUFFQjRCMzVENkUiIHN0UmVmOmRvY3VtZW50SUQ9InhtcC5kaWQ6MkZDOTIzNzRGOTQ5RTQxMTk2M0JC + NEQ0MzNCOUIxQzgiLz4gPC9yZGY6RGVzY3JpcHRpb24+IDwvcmRmOlJERj4gPC94OnhtcG1ldGE+IDw/ + eHBhY2tldCBlbmQ9InIiPz59jfe3AAAEbUlEQVRIS8WTeUybZRzHF48/pnFOuQRajkFLgQFb5iRLNJr4 + l/EPgsniUI4xZDAY1zyxwApsMJyIME61rByl3DfoYGBrgbWUY06FcZSCha4rQ8jYxkqPr2/fvkv8o2Sg + S/wkT970eb6/T5/39z7Prv8dt/Oql4mR4HZJ3ccoXFxhVCzB9DT9JueJdSq6c1wzVZFupepVzxu34XVj + CaEDi1jX6hF8ZQoeokl4iBVwzV9YdU1XRlIl28eVo8phCdXwGltEeOUsro6psaHVwcSDh5volc4iOO8X + 7KuVwb1hEi7J8myq9PEQO//I85oafr0KtEpUpNSETm+AwWDAvfv3YTQaybnm/t/AyO6Ga+UonJOnIijF + 1hA9tWI2qle9RxcI+RIpmZpTIfBULhIyyqHVahHPKcN70TmYnFFCp9OhqXcc9KwW0DOHVl3YU1aUyjJu + F1SpfhO3EM6bMMsVt+D8Zhz2HIpC4oU6bG5uIu4cD3tfTwAjIBNypQYbGxsISquBU34PaDHiVEplGXee + SuIjVaBv3Lz7gJg8vHg4FlZvc+ATVoLipiHsD8qCXWAO7IPK8MG5FjLXKboOeoYADkldUkplGWb7vOb4 + 4BzxIXXQE/1m59WDXdgBvxPfwz6UC4eQUth/WIBDZ2qQXj+K7IYRImeE5s5fOFrcDPvPapcJzVNmmwVY + VxWG9U09uau1tTVymPpc0iYFLew7OEUJ4BwtALfvJpl5xMrKCu6s3cUrn5YbCM1us80CrJZZVWjXr7j3 + 4CE0y8v4IrcaH+cK4Bv+DRyPl8ApphYuia3wZ3eCUzOA1PIfcVuzjHnlIgK/vgy7mHzTG+w12yzA5E53 + edYPo1c2i/X1dQTEfwvbwDQ4hhXg8OcN4P48Df+UTrgkNIAeW4Hg3Hbo9Xq0iGSgs4ls5CUhoXnObLOA + S8pkhG/bdZzgDZJnffT3GXieLAA9XgB2/RjZjuQqMWhxfBw824H55XWyhcfy+HDNqoB1SH4Codn6G7iw + p3d78EaVPlXX0CaZgkqlgly1gpCiK0htHCH/IL6oFcEF3ZjT3CUvXqv0DzDSS0FPq1a/8EbYS5Rqa+if + SAJ8KoeNR7gitEsnoVQqSbGOkJmYX1ggxaY70SabwIGMUrjn8I3WIXnBRPnWu/8nDnE9Sd7cAaP/ZSES + 6/rRKJRArpiHXC7HzekZNIukiCyrhW9mGZgXa4w2kUVnibJnzdXbxP5URzyDO4QjxGl5i9uNpMZeKP5U + IrywAq9yCnGAOGGMonbYxpVnEPGdyR9BO/MTj8kfgXeNFPt5IngVtoF1kQ9WcTs8qgfgmNreQMS21xZL + 0E6Ln6ef75tg8sfgXT8O77oReAkkYNXJ4PRV/4ztyfo9VPTf4xjdf9CpQKzdxxuGe6UMbhXEmc8V6mze + r3qNivx3HGN7UmglQ6CVDMIxXwybo5UcaunJQD8te9rhyx4JrWwItlGNUut3y5+hlp4cDhFCpl14k9jq + nR+Y1NTjIe7NlmMnWKoHsOtvjWYcKpheqFQAAAAASUVORK5CYII= + + + + + iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 + YQUAAAAZdEVYdFNvZnR3YXJlAEFkb2JlIEltYWdlUmVhZHlxyWU8AAADZmlUWHRYTUw6Y29tLmFkb2Jl + LnhtcAAAAAAAPD94cGFja2V0IGJlZ2luPSLvu78iIGlkPSJXNU0wTXBDZWhpSHpyZVN6TlRjemtjOWQi + Pz4gPHg6eG1wbWV0YSB4bWxuczp4PSJhZG9iZTpuczptZXRhLyIgeDp4bXB0az0iQWRvYmUgWE1QIENv + cmUgNS4zLWMwMTEgNjYuMTQ1NjYxLCAyMDEyLzAyLzA2LTE0OjU2OjI3ICAgICAgICAiPiA8cmRmOlJE + RiB4bWxuczpyZGY9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkvMDIvMjItcmRmLXN5bnRheC1ucyMiPiA8 + cmRmOkRlc2NyaXB0aW9uIHJkZjphYm91dD0iIiB4bWxuczp4bXBNTT0iaHR0cDovL25zLmFkb2JlLmNv + bS94YXAvMS4wL21tLyIgeG1sbnM6c3RSZWY9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlw + ZS9SZXNvdXJjZVJlZiMiIHhtbG5zOnhtcD0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wLyIgeG1w + TU06T3JpZ2luYWxEb2N1bWVudElEPSJ4bXAuZGlkOjJGQzkyMzc0Rjk0OUU0MTE5NjNCQjRENDMzQjlC + MUM4IiB4bXBNTTpEb2N1bWVudElEPSJ4bXAuZGlkOjJERTg4QTFENEQyMjExRTRBODEyODk0M0RBMTc5 + Qjg3IiB4bXBNTTpJbnN0YW5jZUlEPSJ4bXAuaWlkOjJERTg4QTFDNEQyMjExRTRBODEyODk0M0RBMTc5 + Qjg3IiB4bXA6Q3JlYXRvclRvb2w9IkFkb2JlIFBob3Rvc2hvcCBDUzYgKFdpbmRvd3MpIj4gPHhtcE1N + OkRlcml2ZWRGcm9tIHN0UmVmOmluc3RhbmNlSUQ9InhtcC5paWQ6NjJGOUEyRDEyMTRERTQxMUIzNkJE NUVDQjU5MzE1NjIiIHN0UmVmOmRvY3VtZW50SUQ9InhtcC5kaWQ6MkZDOTIzNzRGOTQ5RTQxMTk2M0JC NEQ0MzNCOUIxQzgiLz4gPC9yZGY6RGVzY3JpcHRpb24+IDwvcmRmOlJERj4gPC94OnhtcG1ldGE+IDw/ - eHBhY2tldCBlbmQ9InIiPz6GKmpFAAAC+UlEQVRIS63T20vTYRzH8Yforj/Ei24UiSgKIygKi8oyxZQo - cvNYeXaesmzqPGu2POd0ulSsnIdaurTSTJ3O6UxTPGya5vCQx5AuPn39RbHop7nZxQt+z3ie93e/Z4w1 - p7nsCoBt8R6yBF/UHPv+Wb0rfFFzm99CRIwEW1gnqXzxTXxRc0ydctm4OlID2sxrw6iCtiwItC+A2P/D - frLnjwGNSZdMq6N1WOvLwFpP4l/WdRlY6Jaio9Ab7QXba8sVoDHZGdT8PYS9THDqMGnLsKpNw0qXGCua - BO55VZdNQ6U/DRRibVCGb+N1pH5bukoRqHmDHOIG1N8/X2F4I8WyNhtf2+9hqSsZxqZ4upbb6HsSZLHO - Im90ym6hNVcIaktYTexZyUelGEvaHMy/jcFiZxo0xX5Y7ivGcn8JkVmA9uvlWBmqwpJeAWovs+poR99O - eRgWtQWYVUdgrj0FH+i+F3XF3NoappZYGJrEoLaOVYpOOTY/FGJB+xjTqnDMtMTTAC/Ma/Ix/TLUKl9e - x0JfFQpql7PykBP7lWIXzPeUYLIhHCPKCLr/AMy2ZsKoDLTKdNNdvM8TgNpRTBZwfJ885CTmaIChPhwa - mS+GnkdhqjEWY9X+VplqvIMXEhdQ24mZeuSs0N/BNNWWj4k6EdSZHhhXxWH0aSCGFd4c4Tk7zk7XBlUM - FKLToK4Nm+0qYnneRzqGGiSYaIiiyZdhVCdgqFSIwRJPjucZW85O1pvnRmvDkO9zFNTdy2Y6HjGp4HCF - 5kk4xhoiURd/EROv4tBfeM0qAyUC9Mp9QM0+7o829T6LZV0/mNycS6+nFKFWfAGj9ZHozfGwil7miZYH - 7qCmghsw+S6VpV894KuUuKFbfhNNqa749CwY3dm0toK+VABl3HlQM5obYHybwFLc7W1y/Y5BlX6FfgNn - DNcEY0DhZZX+MiGKbh0DNR24AYYWMSfJzc6GZBApwS5skIzNODcg0dV2V36FtsJ7yBJ8UXO8hyzBFzXH - ++H/A/YDv9/V87iOlrYAAAAASUVORK5CYII= + eHBhY2tldCBlbmQ9InIiPz6wJF34AAACl0lEQVRIS62Vy08TURSH73/QhQtXVnBhxEcMiUkhbEg0hB1R + Q1i68C8wIW5cEqMLN7ho2Ji4YiEhWq0prYUhfULbadN3obTaChobtZEUsFY9nnPS6WM6HYowyZf87j33 + nG/amaai9geOBYA+4pTxihmBE8DcTQB4J8em/9IwSQyagmrtL+z9rMFmvnhkKvtV7tcVHPz6DVsftulA + AckdhUg8zf19eoLKAd597iMLMItewfOxUDTN/bqCH3tVSG8VWIBZ9AoJApEk9+sKvu/uQ2IjzwJkGtH8 + OrTwy3Hu77vIAnV9mgWlcgWiqRwLjAMmkOMbPbNTKnN/JJntqJGEBZ++7oKcyLLgLN4JrU8Cms2C4pcy + BKKZumCI18temQ/8DzSLZlBmQX7nG/jCKdpgAa0driCtY5iFHuqHSjNoFtaags1iCdzBBG+QgNY2aZ0F + mIUe6osENAtrTUEq/7kDq9PHAszU5yYoq9f1i9cUSCD5ozxDEeTsrhAoONwyxLLb8MrhYQFmZYCHsnpd + v3hNgQROb5hnKIK29944MAThTBEWbS4WYBZ6qC/sKSy5ZJ6BGUQg8b4Bbhjod4AZXlhXWdBa10LrIVul + AM9ggS+aa6AIMMO8ZYUO0KeyIOMtZyaQpXpNi4LFucYzMINwhbMNcMNw5oIJMMNKIA0LNg88mZuH/ssj + dPgBMnN+cBRmny1wrRtSMMMzWCCFMg0UAeY2Fh0+GL5xG8Zu3oHXUrCj3g0WONdTbeBm21/o1N17gPtg + 98Xh3VoS3qzKMDI22agfglnY/Uld8NDc/ZlZwAwvl4Ngun6LGh8rdfVDViNs3rguOOzq6XOD8PDpc7g2 + OkHDH7XWtYa2It66Y4eCQ8cRfpvUNa2hTUD8A6JMaBvCyTdJAAAAAElFTkSuQmCC + + + + + iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 + YQUAAAAZdEVYdFNvZnR3YXJlAEFkb2JlIEltYWdlUmVhZHlxyWU8AAADZmlUWHRYTUw6Y29tLmFkb2Jl + LnhtcAAAAAAAPD94cGFja2V0IGJlZ2luPSLvu78iIGlkPSJXNU0wTXBDZWhpSHpyZVN6TlRjemtjOWQi + Pz4gPHg6eG1wbWV0YSB4bWxuczp4PSJhZG9iZTpuczptZXRhLyIgeDp4bXB0az0iQWRvYmUgWE1QIENv + cmUgNS4zLWMwMTEgNjYuMTQ1NjYxLCAyMDEyLzAyLzA2LTE0OjU2OjI3ICAgICAgICAiPiA8cmRmOlJE + RiB4bWxuczpyZGY9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkvMDIvMjItcmRmLXN5bnRheC1ucyMiPiA8 + cmRmOkRlc2NyaXB0aW9uIHJkZjphYm91dD0iIiB4bWxuczp4bXBNTT0iaHR0cDovL25zLmFkb2JlLmNv + bS94YXAvMS4wL21tLyIgeG1sbnM6c3RSZWY9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlw + ZS9SZXNvdXJjZVJlZiMiIHhtbG5zOnhtcD0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wLyIgeG1w + TU06T3JpZ2luYWxEb2N1bWVudElEPSJ4bXAuZGlkOjJGQzkyMzc0Rjk0OUU0MTE5NjNCQjRENDMzQjlC + MUM4IiB4bXBNTTpEb2N1bWVudElEPSJ4bXAuZGlkOkUzNzJDMjE3NEFENjExRTRCNjE0OEVEQzI4MEM0 + RTZDIiB4bXBNTTpJbnN0YW5jZUlEPSJ4bXAuaWlkOkUzNzJDMjE2NEFENjExRTRCNjE0OEVEQzI4MEM0 + RTZDIiB4bXA6Q3JlYXRvclRvb2w9IkFkb2JlIFBob3Rvc2hvcCBDUzYgKFdpbmRvd3MpIj4gPHhtcE1N + OkRlcml2ZWRGcm9tIHN0UmVmOmluc3RhbmNlSUQ9InhtcC5paWQ6RkI3NUQ0QkNENDRBRTQxMTk3NEFD + QUFFQjRCMzVENkUiIHN0UmVmOmRvY3VtZW50SUQ9InhtcC5kaWQ6MkZDOTIzNzRGOTQ5RTQxMTk2M0JC + NEQ0MzNCOUIxQzgiLz4gPC9yZGY6RGVzY3JpcHRpb24+IDwvcmRmOlJERj4gPC94OnhtcG1ldGE+IDw/ + eHBhY2tldCBlbmQ9InIiPz6PyaLfAAADMElEQVRIS6VUXUiTYRT+vi3Tzd+ps23+3KRigtiPkolEQReG + UYTkhWatpWlWGkRdddfdSPImqUAJjSIT00oxLJIk0cR+tFSyzDJtgaMkDEPkdM7ZPvm2vS6jBx6es3Pe + 8zzvtm+TohLS/ov+AACStLgEQuJyLRJWYK1yzh/+FgCoQrpnfM4fOGBhcUlIMkEVkma4H4i1y2kFcMD8 + wqKQZILKZqTqmlTAWrfvMjhgbv63Dwm0hLWQohn1eNEbzrlfPiTQAtZCKjP1GXdAIC+r4XD+9CGBFrDm + RVJ1re6pZ0GyHHMvIawauYVNCFPfvvuQQAtYC6meKXU0amNsaGN/ZR60xIf9aIgN3cpGE9OzZCZ85nEm + pGiWlLABmuJCnUOXrNB7chdct4TUo32ANDbp4NuielDpqWfePdaPX6GrohSK4uLhlCEo96YlZLbOFHzH + oJXjMSBcGn4/zQGovEDqXXtzeTb+BTrKj0J3+Q54djYP7EZdTU2MPjFSK8eieQR9QtLg6GcOQPWgqKeQ + ZyOfoK30CDw+lg2Ot3Z4VLoNqo269mCNHIa2WjYn9A1PcAAqU6m9VV3TF9psOwwPS3JgZugCdNoyocwU + jU+RlImWBpezGz0vxzkA1YOiHvPFO7Ca1kGHLQtmXp2HdutmqN+/F6JiU+h3kOpyVeHJwBgHoLIpqajm + 189HoaG4CNqsGTA1UAWth9Lg6r490PygGyLjUikgzuWqQlffCAegelDdUwLqigqhpXgjTPYeh+bCFCg2 + RkEk3vxuVz/P0c43oLP3DQegLhspNalSFxiNcLswHT48LYNbBUlQk7ebzenmyhm08w1o7xmiAP6hRZiT + 70eYkzpctUuJWdHmwWs74+F1Uz7cyE+E4ohQB5mHm9a3GywpTXzektyKduIAIsKI3ISkL4rIdYle05C9 + VrZVBmvtl7eboUyv7V4jSQdwRn8FdI72iErtCUxnIuifkJ5hUqUOq9Jr7OeCNU6bTpNVqtMcDJSldOwn + KnOk+jypJ5QANRWc0cs5SEelXr54QidfwVYAMoiHq4W/gNM6OaNCJ+diaUIqN/43+Atwg27t+9ZXBUn6 + A2MdqQeVc5pWAAAAAElFTkSuQmCC + + + + + iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAIAAABvFaqvAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 + YQUAAAAZdEVYdFNvZnR3YXJlAEFkb2JlIEltYWdlUmVhZHlxyWU8AAADZmlUWHRYTUw6Y29tLmFkb2Jl + LnhtcAAAAAAAPD94cGFja2V0IGJlZ2luPSLvu78iIGlkPSJXNU0wTXBDZWhpSHpyZVN6TlRjemtjOWQi + Pz4gPHg6eG1wbWV0YSB4bWxuczp4PSJhZG9iZTpuczptZXRhLyIgeDp4bXB0az0iQWRvYmUgWE1QIENv + cmUgNS4zLWMwMTEgNjYuMTQ1NjYxLCAyMDEyLzAyLzA2LTE0OjU2OjI3ICAgICAgICAiPiA8cmRmOlJE + RiB4bWxuczpyZGY9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkvMDIvMjItcmRmLXN5bnRheC1ucyMiPiA8 + cmRmOkRlc2NyaXB0aW9uIHJkZjphYm91dD0iIiB4bWxuczp4bXBNTT0iaHR0cDovL25zLmFkb2JlLmNv + bS94YXAvMS4wL21tLyIgeG1sbnM6c3RSZWY9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlw + ZS9SZXNvdXJjZVJlZiMiIHhtbG5zOnhtcD0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wLyIgeG1w + TU06T3JpZ2luYWxEb2N1bWVudElEPSJ4bXAuZGlkOjJGQzkyMzc0Rjk0OUU0MTE5NjNCQjRENDMzQjlC + MUM4IiB4bXBNTTpEb2N1bWVudElEPSJ4bXAuZGlkOjUzQzNGNDI5NEQyQzExRTQ4QkE1QUNCMEVDRDZF + MDVEIiB4bXBNTTpJbnN0YW5jZUlEPSJ4bXAuaWlkOjUzQzNGNDI4NEQyQzExRTQ4QkE1QUNCMEVDRDZF + MDVEIiB4bXA6Q3JlYXRvclRvb2w9IkFkb2JlIFBob3Rvc2hvcCBDUzYgKFdpbmRvd3MpIj4gPHhtcE1N + OkRlcml2ZWRGcm9tIHN0UmVmOmluc3RhbmNlSUQ9InhtcC5paWQ6RkI1NUY4OTYyQTRERTQxMUIzNkJE + NUVDQjU5MzE1NjIiIHN0UmVmOmRvY3VtZW50SUQ9InhtcC5kaWQ6MkZDOTIzNzRGOTQ5RTQxMTk2M0JC + NEQ0MzNCOUIxQzgiLz4gPC9yZGY6RGVzY3JpcHRpb24+IDwvcmRmOlJERj4gPC94OnhtcG1ldGE+IDw/ + eHBhY2tldCBlbmQ9InIiPz6IsaOmAAADF0lEQVQ4T62U/UuTURTH+0nICqRI1ERMMyNQe8N0ChqBwQhN + yvwhEgJjVCqJ/qCibZo6tzQ339h6Nre5prapUzc1XzItX1ilzuWMLLVAen+xf6DTuTxjdxsFVj58ebjc + c+7nnud7z3228DbpIaDFH/CfoqCn72DIDvNfPDM2KAqyr8PcJxqY+QBTb8kkjocXQTsKigGwfqYJHqIg + 1OxHGHvlWPx4hXB1YyA3g4CBhqst+piEnrDA3rA95vBAY1x8d7lq/DVZwm5PQZNvoKYdypSgHgbVEIh1 + cLOZzOCbSSsyRQRba6uWtcpVLbPcwlglInNUCJNWWKqABqMLCGvGlfpJELaQ/V1Vd1lujAhe0chtUrH5 + ZExnmJ85MdomEa+qZMbIEF2BHGunILSjdZwYgTt4gJqjjj0Rltml1Zq9AeL0Mn71Wn2mtDU80MIvsFTw + O+KPIoWC8BNYRIUaqrRQroJKjQOk9N+xLBF2pXJFKfnsDGYa8gS6xOO2whyMuoHaHpGzZ/pBM0IMrtXD + nT4HqNHXe0lYoogMFeQP4jbSDkCPTUyXmnNoPutSo+9WN5DEQDyeWCWnhqm4p7Oimt3b54rzmmKPVHKz + 0Xg0AU1pz87VJp+yXOfd9t3mBmLXsGrsJhSsDtF4iOWxKdpzyQNnuRW7vEUp13obFG05OVUBPtO5V1Sn + k5q4SX8ENfWA6C7xHsP981Bb2sf38ZKd4JhSuXUJHPHhg/WJnAeZFw0Xzt/w8erRtLmBnB/CSmaC599I + 2PYVRl+CXigu3R9SfCC0Pf1MZ1oqvqvjogX7gtRFJfb1n24g7GblfQcFP2fkBYm5anxqQcbLKgzyK/Df + WRTkV5+RMTg84ZrgAOHo4ZIDVNdJw67CpsVLZ5gifj97Typlq2ZFQXj8LKh5EHpnaIar8N+Al5l9Y9Vs + T7OiIAzjqaMsa6QJnBkeWvgOHdPkAuIV67PSeQpCYYZplsZ+KyyWLRyFF8D553EDbURY770J0rrYJbda + SYE4iWb9NcgpRKDrOMAWwYP6d5BTaC52zyaAWDlAm/DweL8AX9zXukfxHsIAAAAASUVORK5CYII= + + + + + iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 + YQUAAAAZdEVYdFNvZnR3YXJlAEFkb2JlIEltYWdlUmVhZHlxyWU8AAADZmlUWHRYTUw6Y29tLmFkb2Jl + LnhtcAAAAAAAPD94cGFja2V0IGJlZ2luPSLvu78iIGlkPSJXNU0wTXBDZWhpSHpyZVN6TlRjemtjOWQi + Pz4gPHg6eG1wbWV0YSB4bWxuczp4PSJhZG9iZTpuczptZXRhLyIgeDp4bXB0az0iQWRvYmUgWE1QIENv + cmUgNS4zLWMwMTEgNjYuMTQ1NjYxLCAyMDEyLzAyLzA2LTE0OjU2OjI3ICAgICAgICAiPiA8cmRmOlJE + RiB4bWxuczpyZGY9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkvMDIvMjItcmRmLXN5bnRheC1ucyMiPiA8 + cmRmOkRlc2NyaXB0aW9uIHJkZjphYm91dD0iIiB4bWxuczp4bXBNTT0iaHR0cDovL25zLmFkb2JlLmNv + bS94YXAvMS4wL21tLyIgeG1sbnM6c3RSZWY9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlw + ZS9SZXNvdXJjZVJlZiMiIHhtbG5zOnhtcD0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wLyIgeG1w + TU06T3JpZ2luYWxEb2N1bWVudElEPSJ4bXAuZGlkOjJGQzkyMzc0Rjk0OUU0MTE5NjNCQjRENDMzQjlC + MUM4IiB4bXBNTTpEb2N1bWVudElEPSJ4bXAuZGlkOkVENUYwQThBNEQyOTExRTQ5QzUzQzdFMkFGQkQy + NTA1IiB4bXBNTTpJbnN0YW5jZUlEPSJ4bXAuaWlkOkVENUYwQTg5NEQyOTExRTQ5QzUzQzdFMkFGQkQy + NTA1IiB4bXA6Q3JlYXRvclRvb2w9IkFkb2JlIFBob3Rvc2hvcCBDUzYgKFdpbmRvd3MpIj4gPHhtcE1N + OkRlcml2ZWRGcm9tIHN0UmVmOmluc3RhbmNlSUQ9InhtcC5paWQ6MkRGNkEzOUYyOTRERTQxMUIzNkJE + NUVDQjU5MzE1NjIiIHN0UmVmOmRvY3VtZW50SUQ9InhtcC5kaWQ6MkZDOTIzNzRGOTQ5RTQxMTk2M0JC + NEQ0MzNCOUIxQzgiLz4gPC9yZGY6RGVzY3JpcHRpb24+IDwvcmRmOlJERj4gPC94OnhtcG1ldGE+IDw/ + eHBhY2tldCBlbmQ9InIiPz6npMy1AAAGEUlEQVRIS7WVeVDUZRjHf7Ase8ECu+wl4LIXcqyyHC783AWW + 5QaRFTHkMi9SQvE+UhLzwk0BUcQSgQBBgcYDzStMSzOPcpqcmo5pmqk/+rOapqb+iG/PbzfFcSz/6pn5 + zPN739/7fp/nvZn/3TSLjj+XJy2/RaItPCT5vaBd8m1+q2Qku1lcrcvki+iXr7fFU6ZZeOx5KDU1b7jU + 1Z2bVPMPWNMbRXrXkWAc+ywVLbcS8fKwFjlu8VdpW0XzSc6f8PEIPzJ19dFnU3WEJdHL9P3X9O1nkdB8 + CQrX7i3mKn9zfqsUq29ZsPfjRBx5aMO2cTMy94gm7FuF7XyJTwDJTo5GVdHxNALVgsPd5Ceye+9g8b0f + UXbjB8RtH4Msd+MeXS7f6twjxbILZiy7pEHDtTBsvG7BqivTUXpsClLWCbtJNpDwBlGVH3ySIFV520eW + nedRcf0HVJGwbeRrOHs/h2n1CGRZDe7wND/W1hiI8sEYlJ4KRcVpJcrfVqByNBILhqLh3KeA+UXBOpL2 + jkRZduARPGXZ/vH4pnMou/gd7INfIPn4QyQc/RSOzk9hrBtEiKPerUn1Y5PXBaDojWlwdgUjr0+G/H4Z + cnpCUNJrQNZ+LeLrBD/LYnixFEDAKFz7vJQ0r49dO4zikS8x8/ADxLd9jIT2B5ix/z7SX78Pw+K3EJy2 + wq1M4rEz6sRwthgw82Ag2KNS2I5JPZ4rZx00ImGNHIZSfisFkDGhxbs5AkKLd/3kaLkDlgTjXrsNc/Md + mPfeQeyOD2HbcRu6yi4E2Wrd8ngeG71IBPtePWa4JUhsD0DykQAkHQqApUWCFLcGyZvDoZ/P/5oCTGXk + hU2MvGB7rbGmG47dd2Fa+x6iX/kAMa/eQvS2m4jaeAPspvcROb8TQexid3CcL2usFCJjnwE5nQYU9RhR + PGDC7D4TCrqMyDqkR9oePbRz/SZEKh8rI8vdyshyXhmzLD8DS/1VGOquwtgw7glkXH0Nhvp3kbL2GrSl + hyC11ril03xZfbkQKZuVsDeq4NihRtYuDbJ2auBoUsO2TQXrJiWMlWIExflWMiHOjRzfJy0bg776HCKX + vANd7WXol1/xeN3Si7A2XIXW1YbAxAq3UO0zPTSd1yG38bplLK//vxBrffKY4PQ1HH9aKk8jonQUUyvO + Qlt9HtqaCx4/tXIMyXWXMXXOAQTEv+D2zCvDhBBTCN1zCGOCZq3k+DXO1YcpRYOY4hpF2LzTCCs74/VE + 3IvnEVd1EhGFblBbWot6BKXWQZq64tlYa2+TuJwQM9KU5cRL35hyOxCe2w913hA0hcPQFI16KRzxEFtO + a1Q9htSVN5C+5S5x7x/uIm3DR7CvuomUReOImt1FU7nwEolHECImMGkJE5i46EJkejNM+X1QOPqhzBqC + KvskVDmnJuHKT/K4bgjKzBMItXcjJv84NOwWiKPndJK40TOCgPgaRmIur1dZ1yM6txvyWT0ITR+AImOQ + gg39N1ybDBJP60PorC5My3oTwQm18FdNryBxbq0EJL6AEUTYZBTkF0NGKyKdvZDb3qJOAxSIOqcP/jtp + JyC3D1BSvYgp6EN4aiNlP/cTEk4gFASPEUeXkWd8RaY5jcrEBkTn9UCT4Q3gzfBfRvJE9rrsfpicHSRe + NsFXmJeSXhTBXXY+jMjk8uArVkpExuKb6pkbYJ7L7Ria37xTUBeMeCkcncRTN0z/TyLKNYy4khNQJq2G + IMLBXdUWQkXwCYYR6md7IPP1k8WEC3UFDzSpG2BZeAZJtXQWFpyls3HOC50JzkdQnbFqDInLLiC2rBcq + 6xoSzzzP+NDVwDBaQkx4XzahNv8xZH48sVotCHeOUnnCWNJG18Q4UjddB7vlfbBbPwC7+YannLTyIrS5 + OyHU5v3hr07poL7JBHe4Jh8bzgQROY8h46IKCAVfbi73D3PcpfoJlX0VtEVN0JXsQlj2ZoRaaynj7N/8 + NfZLPLFmHrXnpiWSCCL8iMl32T/M6YGMq+R+covD7QADwfoIgqt4QVGtfvIZJ4lRv5CY4zypbjfjy+eE + M4l4gtuSwYSQ4DS4EZAew/wNiCYQJlvQU3cAAAAASUVORK5CYII= @@ -1054,142 +1272,6 @@ R2K5fxKLWbbp/7Dc0CBY8Q+pPmOq0VkzzQAAAABJRU5ErkJggg== - - - iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAZdEVYdFNvZnR3YXJlAEFkb2JlIEltYWdlUmVhZHlxyWU8AAADZmlUWHRYTUw6Y29tLmFkb2Jl - LnhtcAAAAAAAPD94cGFja2V0IGJlZ2luPSLvu78iIGlkPSJXNU0wTXBDZWhpSHpyZVN6TlRjemtjOWQi - Pz4gPHg6eG1wbWV0YSB4bWxuczp4PSJhZG9iZTpuczptZXRhLyIgeDp4bXB0az0iQWRvYmUgWE1QIENv - cmUgNS4zLWMwMTEgNjYuMTQ1NjYxLCAyMDEyLzAyLzA2LTE0OjU2OjI3ICAgICAgICAiPiA8cmRmOlJE - RiB4bWxuczpyZGY9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkvMDIvMjItcmRmLXN5bnRheC1ucyMiPiA8 - cmRmOkRlc2NyaXB0aW9uIHJkZjphYm91dD0iIiB4bWxuczp4bXBNTT0iaHR0cDovL25zLmFkb2JlLmNv - bS94YXAvMS4wL21tLyIgeG1sbnM6c3RSZWY9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlw - ZS9SZXNvdXJjZVJlZiMiIHhtbG5zOnhtcD0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wLyIgeG1w - TU06T3JpZ2luYWxEb2N1bWVudElEPSJ4bXAuZGlkOjJGQzkyMzc0Rjk0OUU0MTE5NjNCQjRENDMzQjlC - MUM4IiB4bXBNTTpEb2N1bWVudElEPSJ4bXAuZGlkOjlDMzFEOUI4NEFBRjExRTQ4OTA5OUYwQ0QzM0Q2 - NEI4IiB4bXBNTTpJbnN0YW5jZUlEPSJ4bXAuaWlkOjlDMzFEOUI3NEFBRjExRTQ4OTA5OUYwQ0QzM0Q2 - NEI4IiB4bXA6Q3JlYXRvclRvb2w9IkFkb2JlIFBob3Rvc2hvcCBDUzYgKFdpbmRvd3MpIj4gPHhtcE1N - OkRlcml2ZWRGcm9tIHN0UmVmOmluc3RhbmNlSUQ9InhtcC5paWQ6MDk5Mzk2NTZBRjRBRTQxMTk3NEFD - QUFFQjRCMzVENkUiIHN0UmVmOmRvY3VtZW50SUQ9InhtcC5kaWQ6MkZDOTIzNzRGOTQ5RTQxMTk2M0JC - NEQ0MzNCOUIxQzgiLz4gPC9yZGY6RGVzY3JpcHRpb24+IDwvcmRmOlJERj4gPC94OnhtcG1ldGE+IDw/ - eHBhY2tldCBlbmQ9InIiPz73sIMwAAADIElEQVRIS7WVa0iTYRTH56Uiysvm3TkvpLl5DRIvQYWVWl+6 - iNEVg0yhQqloQZHkLT+Y0YdAs75IpEUhzERZoZhsRpZlS7soblotsRwoxhqWeTrnYZtv+u7NsB74cZ5z - zv89/z17HzYRAPxXeIv/EpFXcOyi4BvKhfehv4FvKBfeh+ayqIUDlIgBgT8whpRYoT2fhgvNVJKBQT9s - hB8/QZDPpnEIjEhg0J5Pw4Vm0mwygG9T06BSqQQhTUhUMoRGpyxYT7OZwfhXC6jVakFIYzNYqN5uMGKa - BI1GIwhpghXJaJJi13d0dEB2bj74hsWzSDlXbzfQG02g0+kEIU2wIomdovzKdVifngnFFytBeb4cLN+n - WaSc6hfKKqB/eHTWoHfwExgMBkFII5MnQUD4WlAWloO26wVs35MDmifPmQFFyqlO/aKKqlmDp31DYDKZ - BCGNTJ4IPqHx8LJvACbNUw7p6e2HuJQMNIhhBuaHj3vBYrEI0tb1BoIiE9kJ9h7Oh7EJM+g/jEJuwVlY - s24ri5RTnfo5BedAIoueIYPumvomuHzjzm9cq2uCq7UNUH2rEarr7kNd0yP26Y+eKoSWtk4wfpmAg7kn - ITY5DUorq1g8cOQEqze3aplOEhRtJoMcL1mMTixV9IgD5a/tSBVDYql8AKOBQLEJtTP08gY/jjFiktKg - 5FIV21Ok3NazvmR2AvrFkCAJyGYk1comZAuHDM/AyLvHThfBveZ26NOPwI59eey7LsbhFCmnOvVJ5+Ef - rrYZLEU8EZ85+HLwW7ZCLMVTFWdkHoLut+/hgbYHaE9XN31XNsupTrWV3jKVs+uS3cyAD0cLe331jW3Q - qRt0CPUlQVHDKI+fN9iGo4W90uNnyuA2vvRtWTlQgxeg/dk7FimnOvU9/CNqUe47b7ANRwt7AfjpKvAK - Gt18Qur35ymhRfsKKLr5hN7EyzDq7humWrrcfSfKxbz/QlwcLDck1snZJdUzYHUDmk57+K1qdXJyzsL6 - RmQD9ZmObygXB8sVIRO6fXQB4hC6eRQppzr1XXmHclnAckFomLc1Um5dItEvhZ97MQXP9N0AAAAASUVO - RK5CYII= - - - - - iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAZdEVYdFNvZnR3YXJlAEFkb2JlIEltYWdlUmVhZHlxyWU8AAADZmlUWHRYTUw6Y29tLmFkb2Jl - LnhtcAAAAAAAPD94cGFja2V0IGJlZ2luPSLvu78iIGlkPSJXNU0wTXBDZWhpSHpyZVN6TlRjemtjOWQi - Pz4gPHg6eG1wbWV0YSB4bWxuczp4PSJhZG9iZTpuczptZXRhLyIgeDp4bXB0az0iQWRvYmUgWE1QIENv - cmUgNS4zLWMwMTEgNjYuMTQ1NjYxLCAyMDEyLzAyLzA2LTE0OjU2OjI3ICAgICAgICAiPiA8cmRmOlJE - RiB4bWxuczpyZGY9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkvMDIvMjItcmRmLXN5bnRheC1ucyMiPiA8 - cmRmOkRlc2NyaXB0aW9uIHJkZjphYm91dD0iIiB4bWxuczp4bXBNTT0iaHR0cDovL25zLmFkb2JlLmNv - bS94YXAvMS4wL21tLyIgeG1sbnM6c3RSZWY9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlw - ZS9SZXNvdXJjZVJlZiMiIHhtbG5zOnhtcD0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wLyIgeG1w - TU06T3JpZ2luYWxEb2N1bWVudElEPSJ4bXAuZGlkOjJGQzkyMzc0Rjk0OUU0MTE5NjNCQjRENDMzQjlC - MUM4IiB4bXBNTTpEb2N1bWVudElEPSJ4bXAuZGlkOjhDMTdBQjRENEFBRTExRTQ4QjQyODY0MDNBNTJE - NzNCIiB4bXBNTTpJbnN0YW5jZUlEPSJ4bXAuaWlkOjhDMTdBQjRDNEFBRTExRTQ4QjQyODY0MDNBNTJE - NzNCIiB4bXA6Q3JlYXRvclRvb2w9IkFkb2JlIFBob3Rvc2hvcCBDUzYgKFdpbmRvd3MpIj4gPHhtcE1N - OkRlcml2ZWRGcm9tIHN0UmVmOmluc3RhbmNlSUQ9InhtcC5paWQ6NUQyMjc4QTlBQjRBRTQxMTk3NEFD - QUFFQjRCMzVENkUiIHN0UmVmOmRvY3VtZW50SUQ9InhtcC5kaWQ6MkZDOTIzNzRGOTQ5RTQxMTk2M0JC - NEQ0MzNCOUIxQzgiLz4gPC9yZGY6RGVzY3JpcHRpb24+IDwvcmRmOlJERj4gPC94OnhtcG1ldGE+IDw/ - eHBhY2tldCBlbmQ9InIiPz4eHsDfAAAB00lEQVRIS7XVWytEURQH8HniTTNHLs0NCXNcXjTN5dH9g/gM - 3jx590QhFDJS0gyTGmpqaqJIMW4hzlAoOaWISS7LWifntI3ddnTGrl92e/57/We/DBsA/CvuYSHZSr0t - lvCGsriX/oI3lMW9lM/SwgF9SEHwizs08IX2vAyLZvZRgXJ+cQWv7yB0q96Ds86voT0vw6KZNJsK4Pnl - DWKxmBBlqhpDUN0UNp2n2VrB/WMOEomEEGX0ArN5o+BGfYB0Oi1EGa8cwpKw6bxRcH6lQiaTEaKMVw5q - rzCbNwr2z65BURQhynh8Qe0VZvNGwdZBFlRVFaKMxxfQXmE2rxc8rW3sQy6XE0puHoG7IaC9YnV9j5th - pbZPqOCDCrbH5uIwOD7/zWgkDkNTizAyuwQjkWWIxFNQWduqmVxI/MiPz6/A8HTUuDMTTYLkbrqhgt5S - T3PG4ZJ3HE7focElZx0u3yn+VQiG1ZLymmm7s74f88f42S6bl9zyJZ6d6Xckd+Mt5ieogH4xJORHHajt - SzvqZPSgECpHZSiA2DztuxBlad+NgnpBEbIjusiiYboKRF+kGFHegUR5ImkFv7G0eAPzWVq8gfksLd5/ - oULiHhYS97BwwPYJlSCUgVubViQAAAAASUVORK5CYII= - - - - - iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAZdEVYdFNvZnR3YXJlAEFkb2JlIEltYWdlUmVhZHlxyWU8AAADZmlUWHRYTUw6Y29tLmFkb2Jl - LnhtcAAAAAAAPD94cGFja2V0IGJlZ2luPSLvu78iIGlkPSJXNU0wTXBDZWhpSHpyZVN6TlRjemtjOWQi - Pz4gPHg6eG1wbWV0YSB4bWxuczp4PSJhZG9iZTpuczptZXRhLyIgeDp4bXB0az0iQWRvYmUgWE1QIENv - cmUgNS4zLWMwMTEgNjYuMTQ1NjYxLCAyMDEyLzAyLzA2LTE0OjU2OjI3ICAgICAgICAiPiA8cmRmOlJE - RiB4bWxuczpyZGY9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkvMDIvMjItcmRmLXN5bnRheC1ucyMiPiA8 - cmRmOkRlc2NyaXB0aW9uIHJkZjphYm91dD0iIiB4bWxuczp4bXBNTT0iaHR0cDovL25zLmFkb2JlLmNv - bS94YXAvMS4wL21tLyIgeG1sbnM6c3RSZWY9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlw - ZS9SZXNvdXJjZVJlZiMiIHhtbG5zOnhtcD0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wLyIgeG1w - TU06T3JpZ2luYWxEb2N1bWVudElEPSJ4bXAuZGlkOjJGQzkyMzc0Rjk0OUU0MTE5NjNCQjRENDMzQjlC - MUM4IiB4bXBNTTpEb2N1bWVudElEPSJ4bXAuZGlkOjJEMDQyOEZBNEFEMjExRTRBN0MxRDBCNzJGRUND - MDEzIiB4bXBNTTpJbnN0YW5jZUlEPSJ4bXAuaWlkOjJEMDQyOEY5NEFEMjExRTRBN0MxRDBCNzJGRUND - MDEzIiB4bXA6Q3JlYXRvclRvb2w9IkFkb2JlIFBob3Rvc2hvcCBDUzYgKFdpbmRvd3MpIj4gPHhtcE1N - OkRlcml2ZWRGcm9tIHN0UmVmOmluc3RhbmNlSUQ9InhtcC5paWQ6QkRDRkI1RDVEMTRBRTQxMTk3NEFD - QUFFQjRCMzVENkUiIHN0UmVmOmRvY3VtZW50SUQ9InhtcC5kaWQ6MkZDOTIzNzRGOTQ5RTQxMTk2M0JC - NEQ0MzNCOUIxQzgiLz4gPC9yZGY6RGVzY3JpcHRpb24+IDwvcmRmOlJERj4gPC94OnhtcG1ldGE+IDw/ - eHBhY2tldCBlbmQ9InIiPz59jfe3AAAEbUlEQVRIS8WTeUybZRzHF48/pnFOuQRajkFLgQFb5iRLNJr4 - l/EPgsniUI4xZDAY1zyxwApsMJyIME61rByl3DfoYGBrgbWUY06FcZSCha4rQ8jYxkqPr2/fvkv8o2Sg - S/wkT970eb6/T5/39z7Prv8dt/Oql4mR4HZJ3ccoXFxhVCzB9DT9JueJdSq6c1wzVZFupepVzxu34XVj - CaEDi1jX6hF8ZQoeokl4iBVwzV9YdU1XRlIl28eVo8phCdXwGltEeOUsro6psaHVwcSDh5volc4iOO8X - 7KuVwb1hEi7J8myq9PEQO//I85oafr0KtEpUpNSETm+AwWDAvfv3YTQaybnm/t/AyO6Ga+UonJOnIijF - 1hA9tWI2qle9RxcI+RIpmZpTIfBULhIyyqHVahHPKcN70TmYnFFCp9OhqXcc9KwW0DOHVl3YU1aUyjJu - F1SpfhO3EM6bMMsVt+D8Zhz2HIpC4oU6bG5uIu4cD3tfTwAjIBNypQYbGxsISquBU34PaDHiVEplGXee - SuIjVaBv3Lz7gJg8vHg4FlZvc+ATVoLipiHsD8qCXWAO7IPK8MG5FjLXKboOeoYADkldUkplGWb7vOb4 - 4BzxIXXQE/1m59WDXdgBvxPfwz6UC4eQUth/WIBDZ2qQXj+K7IYRImeE5s5fOFrcDPvPapcJzVNmmwVY - VxWG9U09uau1tTVymPpc0iYFLew7OEUJ4BwtALfvJpl5xMrKCu6s3cUrn5YbCM1us80CrJZZVWjXr7j3 - 4CE0y8v4IrcaH+cK4Bv+DRyPl8ApphYuia3wZ3eCUzOA1PIfcVuzjHnlIgK/vgy7mHzTG+w12yzA5E53 - edYPo1c2i/X1dQTEfwvbwDQ4hhXg8OcN4P48Df+UTrgkNIAeW4Hg3Hbo9Xq0iGSgs4ls5CUhoXnObLOA - S8pkhG/bdZzgDZJnffT3GXieLAA9XgB2/RjZjuQqMWhxfBw824H55XWyhcfy+HDNqoB1SH4Codn6G7iw - p3d78EaVPlXX0CaZgkqlgly1gpCiK0htHCH/IL6oFcEF3ZjT3CUvXqv0DzDSS0FPq1a/8EbYS5Rqa+if - SAJ8KoeNR7gitEsnoVQqSbGOkJmYX1ggxaY70SabwIGMUrjn8I3WIXnBRPnWu/8nDnE9Sd7cAaP/ZSES - 6/rRKJRArpiHXC7HzekZNIukiCyrhW9mGZgXa4w2kUVnibJnzdXbxP5URzyDO4QjxGl5i9uNpMZeKP5U - IrywAq9yCnGAOGGMonbYxpVnEPGdyR9BO/MTj8kfgXeNFPt5IngVtoF1kQ9WcTs8qgfgmNreQMS21xZL - 0E6Ln6ef75tg8sfgXT8O77oReAkkYNXJ4PRV/4ztyfo9VPTf4xjdf9CpQKzdxxuGe6UMbhXEmc8V6mze - r3qNivx3HGN7UmglQ6CVDMIxXwybo5UcaunJQD8te9rhyx4JrWwItlGNUut3y5+hlp4cDhFCpl14k9jq - nR+Y1NTjIe7NlmMnWKoHsOtvjWYcKpheqFQAAAAASUVORK5CYII= - - - - - iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAZdEVYdFNvZnR3YXJlAEFkb2JlIEltYWdlUmVhZHlxyWU8AAADZmlUWHRYTUw6Y29tLmFkb2Jl - LnhtcAAAAAAAPD94cGFja2V0IGJlZ2luPSLvu78iIGlkPSJXNU0wTXBDZWhpSHpyZVN6TlRjemtjOWQi - Pz4gPHg6eG1wbWV0YSB4bWxuczp4PSJhZG9iZTpuczptZXRhLyIgeDp4bXB0az0iQWRvYmUgWE1QIENv - cmUgNS4zLWMwMTEgNjYuMTQ1NjYxLCAyMDEyLzAyLzA2LTE0OjU2OjI3ICAgICAgICAiPiA8cmRmOlJE - RiB4bWxuczpyZGY9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkvMDIvMjItcmRmLXN5bnRheC1ucyMiPiA8 - cmRmOkRlc2NyaXB0aW9uIHJkZjphYm91dD0iIiB4bWxuczp4bXBNTT0iaHR0cDovL25zLmFkb2JlLmNv - bS94YXAvMS4wL21tLyIgeG1sbnM6c3RSZWY9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlw - ZS9SZXNvdXJjZVJlZiMiIHhtbG5zOnhtcD0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wLyIgeG1w - TU06T3JpZ2luYWxEb2N1bWVudElEPSJ4bXAuZGlkOjJGQzkyMzc0Rjk0OUU0MTE5NjNCQjRENDMzQjlC - MUM4IiB4bXBNTTpEb2N1bWVudElEPSJ4bXAuZGlkOjJERTg4QTFENEQyMjExRTRBODEyODk0M0RBMTc5 - Qjg3IiB4bXBNTTpJbnN0YW5jZUlEPSJ4bXAuaWlkOjJERTg4QTFDNEQyMjExRTRBODEyODk0M0RBMTc5 - Qjg3IiB4bXA6Q3JlYXRvclRvb2w9IkFkb2JlIFBob3Rvc2hvcCBDUzYgKFdpbmRvd3MpIj4gPHhtcE1N - OkRlcml2ZWRGcm9tIHN0UmVmOmluc3RhbmNlSUQ9InhtcC5paWQ6NjJGOUEyRDEyMTRERTQxMUIzNkJE - NUVDQjU5MzE1NjIiIHN0UmVmOmRvY3VtZW50SUQ9InhtcC5kaWQ6MkZDOTIzNzRGOTQ5RTQxMTk2M0JC - NEQ0MzNCOUIxQzgiLz4gPC9yZGY6RGVzY3JpcHRpb24+IDwvcmRmOlJERj4gPC94OnhtcG1ldGE+IDw/ - eHBhY2tldCBlbmQ9InIiPz6wJF34AAACl0lEQVRIS62Vy08TURSH73/QhQtXVnBhxEcMiUkhbEg0hB1R - Q1i68C8wIW5cEqMLN7ho2Ji4YiEhWq0prYUhfULbadN3obTaChobtZEUsFY9nnPS6WM6HYowyZf87j33 - nG/amaai9geOBYA+4pTxihmBE8DcTQB4J8em/9IwSQyagmrtL+z9rMFmvnhkKvtV7tcVHPz6DVsftulA - AckdhUg8zf19eoLKAd597iMLMItewfOxUDTN/bqCH3tVSG8VWIBZ9AoJApEk9+sKvu/uQ2IjzwJkGtH8 - OrTwy3Hu77vIAnV9mgWlcgWiqRwLjAMmkOMbPbNTKnN/JJntqJGEBZ++7oKcyLLgLN4JrU8Cms2C4pcy - BKKZumCI18temQ/8DzSLZlBmQX7nG/jCKdpgAa0driCtY5iFHuqHSjNoFtaags1iCdzBBG+QgNY2aZ0F - mIUe6osENAtrTUEq/7kDq9PHAszU5yYoq9f1i9cUSCD5ozxDEeTsrhAoONwyxLLb8MrhYQFmZYCHsnpd - v3hNgQROb5hnKIK29944MAThTBEWbS4WYBZ6qC/sKSy5ZJ6BGUQg8b4Bbhjod4AZXlhXWdBa10LrIVul - AM9ggS+aa6AIMMO8ZYUO0KeyIOMtZyaQpXpNi4LFucYzMINwhbMNcMNw5oIJMMNKIA0LNg88mZuH/ssj - dPgBMnN+cBRmny1wrRtSMMMzWCCFMg0UAeY2Fh0+GL5xG8Zu3oHXUrCj3g0WONdTbeBm21/o1N17gPtg - 98Xh3VoS3qzKMDI22agfglnY/Uld8NDc/ZlZwAwvl4Ngun6LGh8rdfVDViNs3rguOOzq6XOD8PDpc7g2 - OkHDH7XWtYa2It66Y4eCQ8cRfpvUNa2hTUD8A6JMaBvCyTdJAAAAAElFTkSuQmCC - - iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 @@ -1403,7 +1485,7 @@ AAAASUVORK5CYII= - + iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 YQUAAAAZdEVYdFNvZnR3YXJlAEFkb2JlIEltYWdlUmVhZHlxyWU8AAADZmlUWHRYTUw6Y29tLmFkb2Jl @@ -1415,108 +1497,26 @@ bS94YXAvMS4wL21tLyIgeG1sbnM6c3RSZWY9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlw ZS9SZXNvdXJjZVJlZiMiIHhtbG5zOnhtcD0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wLyIgeG1w TU06T3JpZ2luYWxEb2N1bWVudElEPSJ4bXAuZGlkOjJGQzkyMzc0Rjk0OUU0MTE5NjNCQjRENDMzQjlC - MUM4IiB4bXBNTTpEb2N1bWVudElEPSJ4bXAuZGlkOkUzNzJDMjE3NEFENjExRTRCNjE0OEVEQzI4MEM0 - RTZDIiB4bXBNTTpJbnN0YW5jZUlEPSJ4bXAuaWlkOkUzNzJDMjE2NEFENjExRTRCNjE0OEVEQzI4MEM0 - RTZDIiB4bXA6Q3JlYXRvclRvb2w9IkFkb2JlIFBob3Rvc2hvcCBDUzYgKFdpbmRvd3MpIj4gPHhtcE1N - OkRlcml2ZWRGcm9tIHN0UmVmOmluc3RhbmNlSUQ9InhtcC5paWQ6RkI3NUQ0QkNENDRBRTQxMTk3NEFD - QUFFQjRCMzVENkUiIHN0UmVmOmRvY3VtZW50SUQ9InhtcC5kaWQ6MkZDOTIzNzRGOTQ5RTQxMTk2M0JC - NEQ0MzNCOUIxQzgiLz4gPC9yZGY6RGVzY3JpcHRpb24+IDwvcmRmOlJERj4gPC94OnhtcG1ldGE+IDw/ - eHBhY2tldCBlbmQ9InIiPz6PyaLfAAADMElEQVRIS6VUXUiTYRT+vi3Tzd+ps23+3KRigtiPkolEQReG - UYTkhWatpWlWGkRdddfdSPImqUAJjSIT00oxLJIk0cR+tFSyzDJtgaMkDEPkdM7ZPvm2vS6jBx6es3Pe - 8zzvtm+TohLS/ov+AACStLgEQuJyLRJWYK1yzh/+FgCoQrpnfM4fOGBhcUlIMkEVkma4H4i1y2kFcMD8 - wqKQZILKZqTqmlTAWrfvMjhgbv63Dwm0hLWQohn1eNEbzrlfPiTQAtZCKjP1GXdAIC+r4XD+9CGBFrDm - RVJ1re6pZ0GyHHMvIawauYVNCFPfvvuQQAtYC6meKXU0amNsaGN/ZR60xIf9aIgN3cpGE9OzZCZ85nEm - pGiWlLABmuJCnUOXrNB7chdct4TUo32ANDbp4NuielDpqWfePdaPX6GrohSK4uLhlCEo96YlZLbOFHzH - oJXjMSBcGn4/zQGovEDqXXtzeTb+BTrKj0J3+Q54djYP7EZdTU2MPjFSK8eieQR9QtLg6GcOQPWgqKeQ - ZyOfoK30CDw+lg2Ot3Z4VLoNqo269mCNHIa2WjYn9A1PcAAqU6m9VV3TF9psOwwPS3JgZugCdNoyocwU - jU+RlImWBpezGz0vxzkA1YOiHvPFO7Ca1kGHLQtmXp2HdutmqN+/F6JiU+h3kOpyVeHJwBgHoLIpqajm - 189HoaG4CNqsGTA1UAWth9Lg6r490PygGyLjUikgzuWqQlffCAegelDdUwLqigqhpXgjTPYeh+bCFCg2 - RkEk3vxuVz/P0c43oLP3DQegLhspNalSFxiNcLswHT48LYNbBUlQk7ebzenmyhm08w1o7xmiAP6hRZiT - 70eYkzpctUuJWdHmwWs74+F1Uz7cyE+E4ohQB5mHm9a3GywpTXzektyKduIAIsKI3ISkL4rIdYle05C9 - VrZVBmvtl7eboUyv7V4jSQdwRn8FdI72iErtCUxnIuifkJ5hUqUOq9Jr7OeCNU6bTpNVqtMcDJSldOwn - KnOk+jypJ5QANRWc0cs5SEelXr54QidfwVYAMoiHq4W/gNM6OaNCJ+diaUIqN/43+Atwg27t+9ZXBUn6 - A2MdqQeVc5pWAAAAAElFTkSuQmCC - - - - - iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAIAAABvFaqvAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAZdEVYdFNvZnR3YXJlAEFkb2JlIEltYWdlUmVhZHlxyWU8AAADZmlUWHRYTUw6Y29tLmFkb2Jl - LnhtcAAAAAAAPD94cGFja2V0IGJlZ2luPSLvu78iIGlkPSJXNU0wTXBDZWhpSHpyZVN6TlRjemtjOWQi - Pz4gPHg6eG1wbWV0YSB4bWxuczp4PSJhZG9iZTpuczptZXRhLyIgeDp4bXB0az0iQWRvYmUgWE1QIENv - cmUgNS4zLWMwMTEgNjYuMTQ1NjYxLCAyMDEyLzAyLzA2LTE0OjU2OjI3ICAgICAgICAiPiA8cmRmOlJE - RiB4bWxuczpyZGY9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkvMDIvMjItcmRmLXN5bnRheC1ucyMiPiA8 - cmRmOkRlc2NyaXB0aW9uIHJkZjphYm91dD0iIiB4bWxuczp4bXBNTT0iaHR0cDovL25zLmFkb2JlLmNv - bS94YXAvMS4wL21tLyIgeG1sbnM6c3RSZWY9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlw - ZS9SZXNvdXJjZVJlZiMiIHhtbG5zOnhtcD0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wLyIgeG1w - TU06T3JpZ2luYWxEb2N1bWVudElEPSJ4bXAuZGlkOjJGQzkyMzc0Rjk0OUU0MTE5NjNCQjRENDMzQjlC - MUM4IiB4bXBNTTpEb2N1bWVudElEPSJ4bXAuZGlkOjUzQzNGNDI5NEQyQzExRTQ4QkE1QUNCMEVDRDZF - MDVEIiB4bXBNTTpJbnN0YW5jZUlEPSJ4bXAuaWlkOjUzQzNGNDI4NEQyQzExRTQ4QkE1QUNCMEVDRDZF - MDVEIiB4bXA6Q3JlYXRvclRvb2w9IkFkb2JlIFBob3Rvc2hvcCBDUzYgKFdpbmRvd3MpIj4gPHhtcE1N - OkRlcml2ZWRGcm9tIHN0UmVmOmluc3RhbmNlSUQ9InhtcC5paWQ6RkI1NUY4OTYyQTRERTQxMUIzNkJE + MUM4IiB4bXBNTTpEb2N1bWVudElEPSJ4bXAuZGlkOjJERjY3MEZENEQyMzExRTRCNDlGQUMwMzk0OTAw + Qzc4IiB4bXBNTTpJbnN0YW5jZUlEPSJ4bXAuaWlkOjJERjY3MEZDNEQyMzExRTRCNDlGQUMwMzk0OTAw + Qzc4IiB4bXA6Q3JlYXRvclRvb2w9IkFkb2JlIFBob3Rvc2hvcCBDUzYgKFdpbmRvd3MpIj4gPHhtcE1N + OkRlcml2ZWRGcm9tIHN0UmVmOmluc3RhbmNlSUQ9InhtcC5paWQ6NjhGOUEyRDEyMTRERTQxMUIzNkJE NUVDQjU5MzE1NjIiIHN0UmVmOmRvY3VtZW50SUQ9InhtcC5kaWQ6MkZDOTIzNzRGOTQ5RTQxMTk2M0JC NEQ0MzNCOUIxQzgiLz4gPC9yZGY6RGVzY3JpcHRpb24+IDwvcmRmOlJERj4gPC94OnhtcG1ldGE+IDw/ - eHBhY2tldCBlbmQ9InIiPz6IsaOmAAADF0lEQVQ4T62U/UuTURTH+0nICqRI1ERMMyNQe8N0ChqBwQhN - yvwhEgJjVCqJ/qCibZo6tzQ339h6Nre5prapUzc1XzItX1ilzuWMLLVAen+xf6DTuTxjdxsFVj58ebjc - c+7nnud7z3228DbpIaDFH/CfoqCn72DIDvNfPDM2KAqyr8PcJxqY+QBTb8kkjocXQTsKigGwfqYJHqIg - 1OxHGHvlWPx4hXB1YyA3g4CBhqst+piEnrDA3rA95vBAY1x8d7lq/DVZwm5PQZNvoKYdypSgHgbVEIh1 - cLOZzOCbSSsyRQRba6uWtcpVLbPcwlglInNUCJNWWKqABqMLCGvGlfpJELaQ/V1Vd1lujAhe0chtUrH5 - ZExnmJ85MdomEa+qZMbIEF2BHGunILSjdZwYgTt4gJqjjj0Rltml1Zq9AeL0Mn71Wn2mtDU80MIvsFTw - O+KPIoWC8BNYRIUaqrRQroJKjQOk9N+xLBF2pXJFKfnsDGYa8gS6xOO2whyMuoHaHpGzZ/pBM0IMrtXD - nT4HqNHXe0lYoogMFeQP4jbSDkCPTUyXmnNoPutSo+9WN5DEQDyeWCWnhqm4p7Oimt3b54rzmmKPVHKz - 0Xg0AU1pz87VJp+yXOfd9t3mBmLXsGrsJhSsDtF4iOWxKdpzyQNnuRW7vEUp13obFG05OVUBPtO5V1Sn - k5q4SX8ENfWA6C7xHsP981Bb2sf38ZKd4JhSuXUJHPHhg/WJnAeZFw0Xzt/w8erRtLmBnB/CSmaC599I - 2PYVRl+CXigu3R9SfCC0Pf1MZ1oqvqvjogX7gtRFJfb1n24g7GblfQcFP2fkBYm5anxqQcbLKgzyK/Df - WRTkV5+RMTg84ZrgAOHo4ZIDVNdJw67CpsVLZ5gifj97Typlq2ZFQXj8LKh5EHpnaIar8N+Al5l9Y9Vs - T7OiIAzjqaMsa6QJnBkeWvgOHdPkAuIV67PSeQpCYYZplsZ+KyyWLRyFF8D553EDbURY770J0rrYJbda - SYE4iWb9NcgpRKDrOMAWwYP6d5BTaC52zyaAWDlAm/DweL8AX9zXukfxHsIAAAAASUVORK5CYII= - - - - - iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAZdEVYdFNvZnR3YXJlAEFkb2JlIEltYWdlUmVhZHlxyWU8AAADZmlUWHRYTUw6Y29tLmFkb2Jl - LnhtcAAAAAAAPD94cGFja2V0IGJlZ2luPSLvu78iIGlkPSJXNU0wTXBDZWhpSHpyZVN6TlRjemtjOWQi - Pz4gPHg6eG1wbWV0YSB4bWxuczp4PSJhZG9iZTpuczptZXRhLyIgeDp4bXB0az0iQWRvYmUgWE1QIENv - cmUgNS4zLWMwMTEgNjYuMTQ1NjYxLCAyMDEyLzAyLzA2LTE0OjU2OjI3ICAgICAgICAiPiA8cmRmOlJE - RiB4bWxuczpyZGY9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkvMDIvMjItcmRmLXN5bnRheC1ucyMiPiA8 - cmRmOkRlc2NyaXB0aW9uIHJkZjphYm91dD0iIiB4bWxuczp4bXBNTT0iaHR0cDovL25zLmFkb2JlLmNv - bS94YXAvMS4wL21tLyIgeG1sbnM6c3RSZWY9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlw - ZS9SZXNvdXJjZVJlZiMiIHhtbG5zOnhtcD0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wLyIgeG1w - TU06T3JpZ2luYWxEb2N1bWVudElEPSJ4bXAuZGlkOjJGQzkyMzc0Rjk0OUU0MTE5NjNCQjRENDMzQjlC - MUM4IiB4bXBNTTpEb2N1bWVudElEPSJ4bXAuZGlkOkVENUYwQThBNEQyOTExRTQ5QzUzQzdFMkFGQkQy - NTA1IiB4bXBNTTpJbnN0YW5jZUlEPSJ4bXAuaWlkOkVENUYwQTg5NEQyOTExRTQ5QzUzQzdFMkFGQkQy - NTA1IiB4bXA6Q3JlYXRvclRvb2w9IkFkb2JlIFBob3Rvc2hvcCBDUzYgKFdpbmRvd3MpIj4gPHhtcE1N - OkRlcml2ZWRGcm9tIHN0UmVmOmluc3RhbmNlSUQ9InhtcC5paWQ6MkRGNkEzOUYyOTRERTQxMUIzNkJE - NUVDQjU5MzE1NjIiIHN0UmVmOmRvY3VtZW50SUQ9InhtcC5kaWQ6MkZDOTIzNzRGOTQ5RTQxMTk2M0JC - NEQ0MzNCOUIxQzgiLz4gPC9yZGY6RGVzY3JpcHRpb24+IDwvcmRmOlJERj4gPC94OnhtcG1ldGE+IDw/ - eHBhY2tldCBlbmQ9InIiPz6npMy1AAAGEUlEQVRIS7WVeVDUZRjHf7Ase8ECu+wl4LIXcqyyHC783AWW - 5QaRFTHkMi9SQvE+UhLzwk0BUcQSgQBBgcYDzStMSzOPcpqcmo5pmqk/+rOapqb+iG/PbzfFcSz/6pn5 - zPN739/7fp/nvZn/3TSLjj+XJy2/RaItPCT5vaBd8m1+q2Qku1lcrcvki+iXr7fFU6ZZeOx5KDU1b7jU - 1Z2bVPMPWNMbRXrXkWAc+ywVLbcS8fKwFjlu8VdpW0XzSc6f8PEIPzJ19dFnU3WEJdHL9P3X9O1nkdB8 - CQrX7i3mKn9zfqsUq29ZsPfjRBx5aMO2cTMy94gm7FuF7XyJTwDJTo5GVdHxNALVgsPd5Ceye+9g8b0f - UXbjB8RtH4Msd+MeXS7f6twjxbILZiy7pEHDtTBsvG7BqivTUXpsClLWCbtJNpDwBlGVH3ySIFV520eW - nedRcf0HVJGwbeRrOHs/h2n1CGRZDe7wND/W1hiI8sEYlJ4KRcVpJcrfVqByNBILhqLh3KeA+UXBOpL2 - jkRZduARPGXZ/vH4pnMou/gd7INfIPn4QyQc/RSOzk9hrBtEiKPerUn1Y5PXBaDojWlwdgUjr0+G/H4Z - cnpCUNJrQNZ+LeLrBD/LYnixFEDAKFz7vJQ0r49dO4zikS8x8/ADxLd9jIT2B5ix/z7SX78Pw+K3EJy2 - wq1M4rEz6sRwthgw82Ag2KNS2I5JPZ4rZx00ImGNHIZSfisFkDGhxbs5AkKLd/3kaLkDlgTjXrsNc/Md - mPfeQeyOD2HbcRu6yi4E2Wrd8ngeG71IBPtePWa4JUhsD0DykQAkHQqApUWCFLcGyZvDoZ/P/5oCTGXk - hU2MvGB7rbGmG47dd2Fa+x6iX/kAMa/eQvS2m4jaeAPspvcROb8TQexid3CcL2usFCJjnwE5nQYU9RhR - PGDC7D4TCrqMyDqkR9oePbRz/SZEKh8rI8vdyshyXhmzLD8DS/1VGOquwtgw7glkXH0Nhvp3kbL2GrSl - hyC11ril03xZfbkQKZuVsDeq4NihRtYuDbJ2auBoUsO2TQXrJiWMlWIExflWMiHOjRzfJy0bg776HCKX - vANd7WXol1/xeN3Si7A2XIXW1YbAxAq3UO0zPTSd1yG38bplLK//vxBrffKY4PQ1HH9aKk8jonQUUyvO - Qlt9HtqaCx4/tXIMyXWXMXXOAQTEv+D2zCvDhBBTCN1zCGOCZq3k+DXO1YcpRYOY4hpF2LzTCCs74/VE - 3IvnEVd1EhGFblBbWot6BKXWQZq64tlYa2+TuJwQM9KU5cRL35hyOxCe2w913hA0hcPQFI16KRzxEFtO - a1Q9htSVN5C+5S5x7x/uIm3DR7CvuomUReOImt1FU7nwEolHECImMGkJE5i46EJkejNM+X1QOPqhzBqC - KvskVDmnJuHKT/K4bgjKzBMItXcjJv84NOwWiKPndJK40TOCgPgaRmIur1dZ1yM6txvyWT0ITR+AImOQ - gg39N1ybDBJP60PorC5My3oTwQm18FdNryBxbq0EJL6AEUTYZBTkF0NGKyKdvZDb3qJOAxSIOqcP/jtp - JyC3D1BSvYgp6EN4aiNlP/cTEk4gFASPEUeXkWd8RaY5jcrEBkTn9UCT4Q3gzfBfRvJE9rrsfpicHSRe - NsFXmJeSXhTBXXY+jMjk8uArVkpExuKb6pkbYJ7L7Ria37xTUBeMeCkcncRTN0z/TyLKNYy4khNQJq2G - IMLBXdUWQkXwCYYR6md7IPP1k8WEC3UFDzSpG2BZeAZJtXQWFpyls3HOC50JzkdQnbFqDInLLiC2rBcq - 6xoSzzzP+NDVwDBaQkx4XzahNv8xZH48sVotCHeOUnnCWNJG18Q4UjddB7vlfbBbPwC7+YannLTyIrS5 - OyHU5v3hr07poL7JBHe4Jh8bzgQROY8h46IKCAVfbi73D3PcpfoJlX0VtEVN0JXsQlj2ZoRaaynj7N/8 - NfZLPLFmHrXnpiWSCCL8iMl32T/M6YGMq+R+covD7QADwfoIgqt4QVGtfvIZJ4lRv5CY4zypbjfjy+eE - M4l4gtuSwYSQ4DS4EZAew/wNiCYQJlvQU3cAAAAASUVORK5CYII= + eHBhY2tldCBlbmQ9InIiPz6GKmpFAAAC+UlEQVRIS63T20vTYRzH8Yforj/Ei24UiSgKIygKi8oyxZQo + cvNYeXaesmzqPGu2POd0ulSsnIdaurTSTJ3O6UxTPGya5vCQx5AuPn39RbHop7nZxQt+z3ie93e/Z4w1 + p7nsCoBt8R6yBF/UHPv+Wb0rfFFzm99CRIwEW1gnqXzxTXxRc0ydctm4OlID2sxrw6iCtiwItC+A2P/D + frLnjwGNSZdMq6N1WOvLwFpP4l/WdRlY6Jaio9Ab7QXba8sVoDHZGdT8PYS9THDqMGnLsKpNw0qXGCua + BO55VZdNQ6U/DRRibVCGb+N1pH5bukoRqHmDHOIG1N8/X2F4I8WyNhtf2+9hqSsZxqZ4upbb6HsSZLHO + Im90ym6hNVcIaktYTexZyUelGEvaHMy/jcFiZxo0xX5Y7ivGcn8JkVmA9uvlWBmqwpJeAWovs+poR99O + eRgWtQWYVUdgrj0FH+i+F3XF3NoappZYGJrEoLaOVYpOOTY/FGJB+xjTqnDMtMTTAC/Ma/Ix/TLUKl9e + x0JfFQpql7PykBP7lWIXzPeUYLIhHCPKCLr/AMy2ZsKoDLTKdNNdvM8TgNpRTBZwfJ885CTmaIChPhwa + mS+GnkdhqjEWY9X+VplqvIMXEhdQ24mZeuSs0N/BNNWWj4k6EdSZHhhXxWH0aSCGFd4c4Tk7zk7XBlUM + FKLToK4Nm+0qYnneRzqGGiSYaIiiyZdhVCdgqFSIwRJPjucZW85O1pvnRmvDkO9zFNTdy2Y6HjGp4HCF + 5kk4xhoiURd/EROv4tBfeM0qAyUC9Mp9QM0+7o829T6LZV0/mNycS6+nFKFWfAGj9ZHozfGwil7miZYH + 7qCmghsw+S6VpV894KuUuKFbfhNNqa749CwY3dm0toK+VABl3HlQM5obYHybwFLc7W1y/Y5BlX6FfgNn + DNcEY0DhZZX+MiGKbh0DNR24AYYWMSfJzc6GZBApwS5skIzNODcg0dV2V36FtsJ7yBJ8UXO8hyzBFzXH + ++H/A/YDv9/V87iOlrYAAAAASUVORK5CYII= @@ -3164,9 +3164,6 @@ 864, 17 - - 864, 17 - iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 diff --git a/Program.cs b/Program.cs index e38f7b8..a76d0d4 100644 --- a/Program.cs +++ b/Program.cs @@ -16,14 +16,14 @@ [STAThread] static void Main() { - ValidateInfo validateInfo = ValidateConfig.LoadConfig(); + ValidateConfig.LoadConfig(); string localConfigPath = Application.StartupPath + "/Config.xml"; //获取程序及版本信息 string currentVersionCode = Assembly.GetExecutingAssembly().GetName().Version.ToString(); //获取文件版本信息 FileVersionInfo.GetVersionInfo(Application.ExecutablePath); - + Utility.SysInfoConfig(); string configUrl = getProgramUrl(localConfigPath, "configurl"); if (configUrl != "") { diff --git a/TreeUtils.cs b/TreeUtils.cs index 1f055b5..ad39643 100644 --- a/TreeUtils.cs +++ b/TreeUtils.cs @@ -19,7 +19,7 @@ public static void InitLayerTree(GSOGlobeControl gsoGlobeControl, TreeView treeView, string viewDatasrc) { // treeView.Nodes.Clear(); - LayerConfig layerConfig = Utility.layerConfig;//layertree所在的配置文件 + LayerConfig layerConfig = Utility.LayerConfig;//layertree所在的配置文件 List datasrcs = layerConfig.datasrcs; foreach (DataSrc datasrc in datasrcs) { diff --git a/Utility.cs b/Utility.cs index c03e405..ab947a3 100644 --- a/Utility.cs +++ b/Utility.cs @@ -20,7 +20,7 @@ public static string dbdatabase; public static string userID; - public static Hashtable Pipe_QueryFields; +// public static Hashtable Pipe_QueryFields; public static string DBPassword; public static string DBServer; public static string DBBackUp; @@ -38,7 +38,7 @@ public static List listPipelineType; public static string PicRootURL; public static string PicDefaultURL; - public static double dFlyAboveLine = 2; +// public static double dFlyAboveLine = 2; public static string userName; public static string projectStr; public static string userRole; @@ -85,12 +85,17 @@ public static List pipefittingLayerNames = new List();//管件图层名称 public static List sgPipeLayersNames = new List();//施工管线图层名称 -// public static Dictionary dictionaryNetLayerNameAndCaption = new Dictionary(); - public static HashSet layerNameSet = new HashSet(); + public static HashSet layerNameSet = new HashSet();//记录有哪些图层要显示 public static string roadLayerName = ""; #endregion wxl - public static LayerConfig layerConfig; + public static LayerConfig LayerConfig; + + public static string RoleServer; + public static string TitleImagePath; + public static string SysnameVersion; + public static string Copyright; + public static void SetBallons(GSOBalloon featureTooltip, GSOBalloonEx balloonEx) { featureTooltip.CacheFilePath = Application.StartupPath + "/GeoScene/Globe/Temp"; @@ -188,25 +193,6 @@ } return s.ToString(); } - public static GSOFeatures Table2Features(DataTable table, string currentQueryLayer, GSOGlobeControl globeControl1) - { - GSOFeatures features = new GSOFeatures(); - for (int i = 0; i < table.Rows.Count; i++) - { - DataRow row = table.Rows[i]; - - string featureName = row["编号"].ToString(); - featureName = featureName.Trim(); - GSOLayer layer = globeControl1.Globe.Layers.GetLayerByCaption(currentQueryLayer); - GSOFeatures tempfeatures = layer.GetFeatureByName(featureName, false); - if (tempfeatures.Length > 0) - { - features.Add(tempfeatures[0]); - } - } - return features; - } - //程序启动的时候读取配置文件 public static void SetParams() @@ -358,8 +344,8 @@ #region wxl 从layerconfig.xml中读取 - layerConfig = XmlTools.DeserializeFromXml(layerConfigFile); - List dataSrcs = layerConfig.datasrcs; + LayerConfig = XmlTools.DeserializeFromXml(layerConfigFile); + List dataSrcs = LayerConfig.datasrcs; foreach (var dataSrc in dataSrcs) { @@ -598,76 +584,49 @@ #endregion } - /* - //判断网络是否连接 - public static bool isNetworkConnectionSuccess(string ipAdress) + /// + /// 获取Config.xml配置文件中的roleurl配置，并返回 + /// + /// 请求综合信息平台的服务地址 + public static void SysInfoConfig() { - //return true; - if (ipAdress == null) - { - return false; - } - if (ipAdress.Contains("\\")) - { - ipAdress = ipAdress.Substring(0, ipAdress.LastIndexOf('\\')); - } - if (ipAdress.Trim() == "localhost" || ipAdress.Trim() == "127.0.0.1" || ipAdress.Trim() == Dns.GetHostName()) - { - return true; - } - Ping ping = new Ping(); + if (!File.Exists(filename)) return; + + XmlTextReader xmlReader = new XmlTextReader(filename); try { - PingReply pr = ping.Send(ipAdress.Trim(), 3000); - if (pr.Status == IPStatus.Success) + while (xmlReader.Read()) { - return true; + if (xmlReader.Name.Equals("roleurl")) + { + RoleServer = xmlReader.ReadElementString(); + } + else if (xmlReader.Name.Equals("titleimgpath")) + { + TitleImagePath = xmlReader.ReadElementString(); + } + else if (xmlReader.Name.Equals("sysname")) + { + SysnameVersion = xmlReader.ReadElementString(); + } + else if (xmlReader.Name.Equals("copyright")) + { + Copyright = xmlReader.ReadElementString(); + } } - else - { - return false; - } + } catch (Exception ex) { - LogError.PublishError(ex); - return false; + + LogHelper.Error("在config.xml配置文件中读取roleurl时出错"); } - } - */ - - - //TODO LIST:下面两个方法移到featueTools.cs中 - //根据附属物图层名字得到里面含有的附属物 - public static string[] getAccStrsByLayer(string layername) - { - string[] accStrs = null; - string sql = "select 附属物名称 from " + layername + " group by 附属物名称"; - DataSet dataset = OledbHelper.getDataSet(sql, layername); - if (dataset == null) return null; - accStrs = new string[dataset.Tables[0].Rows.Count]; - for (int i = 0; i < dataset.Tables[0].Rows.Count; i++) + finally { - accStrs[i] = dataset.Tables[0].Rows[i][0].ToString(); + xmlReader.Close(); } - return accStrs; } - //删除内存图层中指定名称的feature - public static void RemoveFeatureFromName(GSOGlobeControl globeControl1, string featureName) - { - GSOFeatures features = globeControl1.Globe.MemoryLayer.GetFeatureByName(featureName, true); - if (features != null) - { - for (int i = features.Length - 1; i >= 0; i--) - { - GSOFeature feature = features[i]; - if (feature != null) - { - globeControl1.Globe.MemoryLayer.RemoveFeatureByID(feature.ID); - } - } - } - globeControl1.Refresh(); - } + + } } diff --git a/ValidateInfo.cs b/ValidateInfo.cs index de75391..01546da 100644 --- a/ValidateInfo.cs +++ b/ValidateInfo.cs @@ -192,7 +192,7 @@ } if (!isSuccess) { - LogHelper.WriteLog(typeof(FieldUniqueValidate), logStr); + LogHelper.Error(logStr); } return isSuccess; } @@ -247,7 +247,7 @@ err += "未找到字段或其类型匹配:" + unFoundField.label + ":" + unFoundField.type + "\r\n"; } - LogHelper.WriteLog(typeof(FieldCountValidate), err); + LogHelper.Error(err); return false; } return true; @@ -316,7 +316,7 @@ { err += "字段:" + field.label + "出错\r\n"; } - LogHelper.WriteLog(typeof(FieldOrderValidate), err); + LogHelper.Error(err); return false; } return true; @@ -388,8 +388,7 @@ } if (isSuccess == false) { - LogHelper.WriteLog(typeof(FieldEmptyValidate), - "字段为空检查失败:\r\n" + err); + LogHelper.Error("字段为空检查失败:\r\n" + err); } return isSuccess; } diff --git a/bin/x86/Debug/Config.xml b/bin/x86/Debug/Config.xml index 6995f64..6a453a3 100644 --- a/bin/x86/Debug/Config.xml +++ b/bin/x86/Debug/Config.xml @@ -25,6 +25,11 @@ http://127.0.0.1/Cyberpipe.msi http://127.0.0.1/Config.xml + http://192.168.0.102:8080/ctrl + /Resource/title.jpg + 智慧太湖新城管网规划分析系统6.0 + @2014-2015 苏州航天系统工程有限公司 版权所有 + 编号,管线编码,管径_毫米,材质,埋设方式,起始地面高程,起始埋深,终止地面高程,终止埋深,建设年代,使用年限,权属单位,设计单位,设计负责人,施工单位,施工负责人,监理单位,监理负责人,业务负责人,备注 编号,管线编码,管径_毫米,材质,埋设方式,起始地面高程,起始埋深,终止地面高程,终止埋深,建设年代,使用年限,权属单位,设计单位,设计负责人,施工单位,施工负责人,监理单位,监理负责人,业务负责人,备注 diff --git a/FeatureStatisticsService.cs b/FeatureStatisticsService.cs index 331ee47..b127fe3 100644 --- a/FeatureStatisticsService.cs +++ b/FeatureStatisticsService.cs @@ -190,7 +190,7 @@ List result = new List(); //layer.Name是表名 - string[] accessStrs = Utility.getAccStrsByLayer(layer.Name); + string[] accessStrs = FeatureTools.GetAccStrsByLayer(layer.Name); foreach (string accssname in accessStrs) { diff --git a/FeatureTools.cs b/FeatureTools.cs index be4b469..3c08f34 100644 --- a/FeatureTools.cs +++ b/FeatureTools.cs @@ -1,5 +1,6 @@ using System; using System.Collections.Generic; +using System.Data; using System.Linq; using System.Text; using System.Windows.Forms; @@ -43,7 +44,7 @@ } feature.Delete();//地球上删除该feature string sql = "delete from " + layerName + " where LSSYS_ID =" + feature.ID + " and (编号 is null or substr(编号,length(编号)-2)='TMP')"; - OledbHelper.sqlExecuteNonQuery(sql);//目前无法取到LSSYS_ID，所以这个判断条件不太合适，会导致把该类所有新建的都删除了 + OledbHelper.sqlExecuteNonQuery(sql); } catch (Exception) { @@ -106,5 +107,46 @@ } return value; } + + /// + /// 根据附属物图层名字得到里面含有的附属物 + /// + /// + /// + public static string[] GetAccStrsByLayer(string layername) + { + string[] accStrs = null; + string sql = "select 附属物名称 from " + layername + " group by 附属物名称"; + DataSet dataset = OledbHelper.getDataSet(sql, layername); + if (dataset == null) return null; + accStrs = new string[dataset.Tables[0].Rows.Count]; + for (int i = 0; i < dataset.Tables[0].Rows.Count; i++) + { + accStrs[i] = dataset.Tables[0].Rows[i][0].ToString(); + } + return accStrs; + } + + /// + /// 删除内存图层中指定名称的feature + /// + /// + /// + public static void RemoveFeatureFromName(GSOGlobeControl globeControl1, string featureName) + { + GSOFeatures features = globeControl1.Globe.MemoryLayer.GetFeatureByName(featureName, true); + if (features != null) + { + for (int i = features.Length - 1; i >= 0; i--) + { + GSOFeature feature = features[i]; + if (feature != null) + { + globeControl1.Globe.MemoryLayer.RemoveFeatureByID(feature.ID); + } + } + } + globeControl1.Refresh(); + } } } diff --git a/Forms/FrmPipelineModelDataBase.cs b/Forms/FrmPipelineModelDataBase.cs index b577fd8..bc1e479 100644 --- a/Forms/FrmPipelineModelDataBase.cs +++ b/Forms/FrmPipelineModelDataBase.cs @@ -149,7 +149,7 @@ catch (Exception ex) { LogError.PublishError(ex); - LogHelper.WriteLog(typeof(FrmPipelineModelDB), ex.Message); + LogHelper.Error(ex.Message); } } diff --git a/FrmAccessoriesSensor.cs b/FrmAccessoriesSensor.cs index 98aa1cf..542f19a 100644 --- a/FrmAccessoriesSensor.cs +++ b/FrmAccessoriesSensor.cs @@ -240,7 +240,7 @@ { if (clbPipeLine.CheckedItems.Count > 0) { - Utility.RemoveFeatureFromName(globeControl1, "trackPolygon"); + FeatureTools.RemoveFeatureFromName(globeControl1, "trackPolygon"); globeControl1.Globe.Action = EnumAction3D.TrackPolygon; globeControl1.TrackPolygonEndEvent += globeControl1_TrackPolygonEndEvent; } @@ -259,7 +259,7 @@ private void FrmAccessoriesgather_FormClosing(object sender, FormClosingEventArgs e) { frm = null; - Utility.RemoveFeatureFromName(globeControl1, "trackPolygon"); + FeatureTools.RemoveFeatureFromName(globeControl1, "trackPolygon"); globeControl1.Globe.Action = EnumAction3D.ActionNull; globeControl1.TrackPolygonEndEvent -= globeControl1_TrackPolygonEndEvent; } diff --git a/FrmAccessoriesgather.cs b/FrmAccessoriesgather.cs index e1d176e..c36273b 100644 --- a/FrmAccessoriesgather.cs +++ b/FrmAccessoriesgather.cs @@ -118,7 +118,7 @@ { if (clbPipeLine2.Text!="") { - Utility.RemoveFeatureFromName(globeControl1, "trackPolygon"); + FeatureTools.RemoveFeatureFromName(globeControl1, "trackPolygon"); globeControl1.Globe.Action = EnumAction3D.TrackPolygon; globeControl1.Globe.TrackPolygonTool.TrackMode = EnumTrackMode.SpaceTrack; globeControl1.TrackPolygonEndEvent += globeControl1_TrackPolygonEndEvent; @@ -295,7 +295,7 @@ private void FrmAccessoriesgather_FormClosing(object sender, FormClosingEventArgs e) { frm = null; - Utility.RemoveFeatureFromName(globeControl1, "trackPolygon"); + FeatureTools.RemoveFeatureFromName(globeControl1, "trackPolygon"); globeControl1.TrackPolygonEndEvent -= globeControl1_TrackPolygonEndEvent; globeControl1.Globe.Action = EnumAction3D.ActionNull; diff --git a/FrmAddWellShp.cs b/FrmAddWellShp.cs index 7983349..78d8946 100644 --- a/FrmAddWellShp.cs +++ b/FrmAddWellShp.cs @@ -100,7 +100,7 @@ catch (Exception ex) { LogError.PublishError(ex); - LogHelper.WriteLog(typeof(FrmAddWellShp), ex.Message); + LogHelper.Error(ex.Message); } } diff --git a/FrmBSQStatis.cs b/FrmBSQStatis.cs index 5b05926..b5e581d 100644 --- a/FrmBSQStatis.cs +++ b/FrmBSQStatis.cs @@ -97,7 +97,7 @@ } catch (Exception ex) { - LogHelper.WriteLog(typeof(FrmBSQStatis),ex.Message); + LogHelper.Error(ex.Message); } return typeAndCount; } @@ -108,7 +108,7 @@ GSOLayer layer = globeControl1.Globe.Layers.GetLayerByCaption("标识器"); GSOFeatures bsqFs = FeatureStatisticsService.GetLayerFeatures(polygon, layer); if (bsqFs == null || bsqFs.Length <= 0) { - LogHelper.WriteLog(typeof(FrmBSQStatis),"标识器图层下的Feature为空"); + LogHelper.Error("标识器图层下的Feature为空!"); return null; } diff --git a/FrmBasicQuery.cs b/FrmBasicQuery.cs index baeeade..cc8d3ff 100644 --- a/FrmBasicQuery.cs +++ b/FrmBasicQuery.cs @@ -224,7 +224,7 @@ } catch(Exception ex) { - LogHelper.WriteLog(typeof(FrmBasicQuery), ex.Message); + LogHelper.Error(ex.Message); } } else diff --git a/FrmCodingQuery.cs b/FrmCodingQuery.cs index f1ac322..d4ec095 100644 --- a/FrmCodingQuery.cs +++ b/FrmCodingQuery.cs @@ -82,7 +82,7 @@ } catch (Exception ex) { - LogHelper.WriteLog(typeof(FrmCodingQuery), ex.Message); ; + LogHelper.Error(ex.Message); } } diff --git a/FrmDiameterQuery.cs b/FrmDiameterQuery.cs index e7b3657..75d7949 100644 --- a/FrmDiameterQuery.cs +++ b/FrmDiameterQuery.cs @@ -150,7 +150,7 @@ catch (Exception ex) { //LogError.PublishError(ex); - LogHelper.WriteLog(typeof(FrmDiameterQuery), ex.Message); + LogHelper.Error(ex.Message); MessageBox.Show("请输入正确的管径范围！"); return; } diff --git a/FrmFittingQuery.cs b/FrmFittingQuery.cs index 12f6007..8645011 100644 --- a/FrmFittingQuery.cs +++ b/FrmFittingQuery.cs @@ -69,7 +69,7 @@ } catch (Exception ex) { - LogHelper.WriteLog(typeof(FrmFittingQuery), ex.Message); + LogHelper.Error(ex.Message); } } /// diff --git a/FrmKeywordQuery.cs b/FrmKeywordQuery.cs index 405524f..ede0a93 100644 --- a/FrmKeywordQuery.cs +++ b/FrmKeywordQuery.cs @@ -87,7 +87,7 @@ } catch (Exception ex) { - LogHelper.WriteLog(typeof(FrmKeywordQuery), ex.Message); + LogHelper.Error(ex.Message); } } diff --git a/FrmLogin.cs b/FrmLogin.cs index 1172c23..6fbaed9 100644 --- a/FrmLogin.cs +++ b/FrmLogin.cs @@ -2,6 +2,8 @@ using System.Data; using System.Data.OracleClient; using System.IO; +using System.Net; +using System.Text; using System.Windows.Forms; using System.Xml; using DevComponents.DotNetBar; @@ -10,16 +12,15 @@ { public partial class FrmLogin : Office2007Form { + + //登录界面 -- 配置文件的路径 + public static string filename = Application.StartupPath + "\\login.xml"; + + public FrmLogin() { InitializeComponent(); } - public string rolename = "浏览"; - public string username = ""; - public string department = ""; - - //登录界面 -- 配置文件的路径 - public static string filename = Application.StartupPath + "\\login.xml"; /// /// 登录按钮事件处理 /// @@ -28,9 +29,10 @@ private void button1_Click(object sender, EventArgs e) { bool result = ValidateUser(); +// bool result =ValidateFromUrl();//从平台获取用户角色信息，判断是否能登陆成功 if (result) { - username = txtUser.Text.Trim(); + WriteXml(); Utility.userName = txtUser.Text.Trim(); DialogResult = DialogResult.OK; Close(); @@ -43,80 +45,6 @@ } } /// - /// 关闭按钮事件处理 - /// - /// - /// - private void button2_Click(object sender, EventArgs e) - { - Close(); - } - /// - /// 验证端口号 - /// - /// - //private bool ValiPort() - //{ - // Ping p = new Ping();//创建Ping对象p - // PingReply pr = p.Send(Utility.localicenseserverip);//向指定IP或者主机名的计算机发送ICMP协议的ping数据包 - // if (pr.Status == IPStatus.Success)//如果ping成功 - // { - // try - // { - // TcpClient tcpc = new TcpClient(Utility.localicenseserverip, Utility.localicenseserverport);//对IP地址为"192.168.0.105"的计算机的1500端口提出连接申请 - // tcpc.Close(); - // return true; - // } - // catch (Exception ex) - // { - // LogError.PublishError(ex); - // MessageBox.Show("端口连接错误！" + ex.Message); - // return false; - // } - // } - // else - // { - // int times = 0;//重新连接次数; - // int count = 2;//设置尝试次数 - // while (times < count) - // { - // //Thread.Sleep(1000);//等待时间(方便测试的话，你可以改为1000) - // pr = p.Send(Utility.localicenseserverip); - - // if (pr.Status == IPStatus.Success) - // { - // try - // { - // TcpClient tcpc = new TcpClient(Utility.localicenseserverip, Utility.localicenseserverport);//对IP地址为"192.168.0.105"的计算机的1500端口提出连接申请 - // tcpc.Close(); - // return true; - // } - // catch (Exception ex) - // { - // LogError.PublishError(ex); - // MessageBox.Show("端口连接错误！" + ex.Message); - // return false; - // } - // } - // else - // { - // times++; - // if (times < count) - // { - // continue; - // } - // else - // { - // MessageBox.Show("重新尝试连接失败"); - // return false; - // } - // } - - // } - // return false; - // } - //} - /// /// 验证用户名、密码 /// /// @@ -126,24 +54,64 @@ string sql = "select * from casic_userinfotest where USERNAME='" + txtUser.Text.Trim() + "' and PASSWORD='" + passWord + "' and sysname='GHFX' "; DataTable dt = OledbHelper.QueryTable(sql); - if (dt != null && dt.Rows.Count > 0) + if (dt == null || dt.Rows.Count <= 0) return false; + if (String.IsNullOrEmpty(dt.Rows[0]["rid"].ToString())) return true; + sql = "select gid from casic_userroletest where id=" + dt.Rows[0]["rid"] + " and sysname='GHFX' "; + using (OracleDataReader reader = OracleUtils.ExecuteReader(OracleUtils.ConnectionString, CommandType.Text, sql)) { - WriteXML(); - if (!String.IsNullOrEmpty(dt.Rows[0]["rid"].ToString())) + while (reader.Read()) { - sql = "select gid from casic_userroletest where id=" + dt.Rows[0]["rid"] + " and sysname='GHFX' "; - using (OracleDataReader reader = OracleUtils.ExecuteReader(OracleUtils.ConnectionString, CommandType.Text, sql)) - { - while (reader.Read()) - { - Utility.userRole = reader[0].ToString(); - break; - } - } + Utility.userRole = reader[0].ToString(); + LogHelper.Debug("测试一下"); + break; } - return true; } - return false; + return true; + } + + + + private bool ValidateFromUrl() + { + string user = txtUser.Text.Trim(); + string pwd = textBoxPassWord.Text.Trim(); + //做成配置的 + string roleserver = Utility.RoleServer; + if (roleserver == null || roleserver.Trim().Equals("")) + { + MessageBox.Show("请在Config.xml中配置roleurl！"); + return false; + } + HttpWebRequest request = + WebRequest.Create(roleserver+"/rs/authority/user?username=" + user + "&password=" + pwd + "&appId=21") as HttpWebRequest; + if (request == null) return false; + using (HttpWebResponse response = request.GetResponse() as HttpWebResponse) + { + try + { + if (response == null || response.GetResponseStream() == null) return false; + StreamReader reader = new StreamReader(response.GetResponseStream()); + string[] result = reader.ReadToEnd().Split(','); + //解析result + if (result.Length < 5) return false; + StringBuilder userRole = new StringBuilder(""); + for (int i = 4; i < result.Length; i++) + { + string[] tmpStrings = result[i].Split('_'); + if (tmpStrings.Length < 2) continue; + userRole.Append(tmpStrings[1].Trim() + ","); + } + if (userRole.Length < 3) return false; + userRole.Remove(userRole.Length - 3, 3); + // MessageBox.Show(userRole.ToString()); + Utility.userRole = userRole.ToString(); + return Utility.userRole != null && !Utility.userRole.Equals("null"); + } + catch (Exception e) + { + return false; + } + } } private void FrmLogin_Load(object sender, EventArgs e) @@ -153,74 +121,56 @@ StartPosition = FormStartPosition.CenterScreen; - ReadXML(); + ReadXml(); } /// /// 读取上一次登录的用户名和密码 /// - private void ReadXML() + private void ReadXml() { - if (File.Exists(filename)) + if (!File.Exists(filename)) return; + //初始化XML文档操作类 + XmlDocument myDoc = new XmlDocument(); { - if (!File.Exists(filename)) + //加载XML文件 + try { + myDoc.Load(filename); + } + catch (Exception e) + { + LogError.PublishError(e); return; } - - //初始化XML文档操作类 - XmlDocument myDoc = new XmlDocument(); + //搜索指定的节点 + XmlNode serverRootNode = myDoc.SelectSingleNode("Params"); + XmlNodeList nodes = null; + if (serverRootNode != null) { - //加载XML文件 - try + nodes = serverRootNode.ChildNodes; + } + if (nodes == null) return; + foreach (XmlNode xn in nodes) + { + if (xn.Name.Equals("username")) { - myDoc.Load(filename); + txtUser.Text = xn.InnerText.Trim(); } - catch (Exception e) + else if (xn.Name.Equals("password")) { - LogError.PublishError(e); - return; + textBoxPassWord.Text = xn.InnerText.Trim(); } - //搜索指定的节点 - XmlNode serverRootNode = myDoc.SelectSingleNode("Params"); - XmlNodeList nodes = null; - if (serverRootNode != null) + else if (xn.Name.Equals("isremember")) { - nodes = serverRootNode.ChildNodes; - } - if (nodes != null) - { - foreach (XmlNode xn in nodes) - { - if (xn.Name == "username") - { - txtUser.Text = xn.InnerText.Trim(); - } - else if (xn.Name == "password") - { - textBoxPassWord.Text = xn.InnerText.Trim(); - } - else if (xn.Name == "isremember") - { - if (xn.InnerText.Trim() == "true") - { - checkBoxXRememberPassword.Checked = true; - } - else if (xn.InnerText.Trim() == "false") - { - checkBoxXRememberPassword.Checked = false; - } - } - } - + checkBoxXRememberPassword.Checked = xn.InnerText.Trim().Equals("true"); } } } - } /// /// 记录登录的用户名和密码 /// - private void WriteXML() + private void WriteXml() { if (!File.Exists(filename)) { @@ -252,31 +202,17 @@ foreach (XmlNode xn in nodes) { XmlElement xe = (XmlElement)xn; - if (xe.Name == "username") + if (xe.Name.Equals("username")) { xe.InnerText = txtUser.Text.Trim(); } - else if (xe.Name == "password") + else if (xe.Name.Equals("password")) { - if (checkBoxXRememberPassword.Checked) - { - xe.InnerText = textBoxPassWord.Text.Trim(); - } - else - { - xe.InnerText = ""; - } + xe.InnerText = checkBoxXRememberPassword.Checked ? textBoxPassWord.Text.Trim() : ""; } - else if (xe.Name == "isremember") + else if (xe.Name.Equals("isremember")) { - if (checkBoxXRememberPassword.Checked) - { - xe.InnerText = "true"; - } - else - { - xe.InnerText = "false"; - } + xe.InnerText = checkBoxXRememberPassword.Checked ? "true" : "false"; } } } diff --git a/FrmMaterialSel.cs b/FrmMaterialSel.cs index 8645ab3..d23f385 100644 --- a/FrmMaterialSel.cs +++ b/FrmMaterialSel.cs @@ -157,7 +157,7 @@ } catch (Exception ex) { - LogHelper.WriteLog(typeof(FrmMaterialSel), ex.Message); + LogHelper.Error(ex.Message); } } diff --git a/FrmMetadataStat.cs b/FrmMetadataStat.cs index c3c1359..96029a6 100644 --- a/FrmMetadataStat.cs +++ b/FrmMetadataStat.cs @@ -96,7 +96,7 @@ //统计有多少个图层 private int statistLayer() { - List datasrcs = Utility.layerConfig.datasrcs; + List datasrcs = Utility.LayerConfig.datasrcs; return datasrcs.SelectMany(datasrc => datasrc.layertypes).Sum(layerType => layerType.layers.Count); } diff --git a/FrmpipeDeepstatis.cs b/FrmpipeDeepstatis.cs index 6a5c895..8d915a9 100644 --- a/FrmpipeDeepstatis.cs +++ b/FrmpipeDeepstatis.cs @@ -2,6 +2,7 @@ using System.Collections.Generic; using System.Diagnostics; using System.IO; +using System.Reflection; using System.Text; using System.Windows.Forms; using System.Windows.Forms.DataVisualization.Charting; @@ -320,7 +321,7 @@ MessageBox.Show("请添加分段"); return; } - Utility.RemoveFeatureFromName(globeControl1, "trackPolygon"); + FeatureTools.RemoveFeatureFromName(globeControl1, "trackPolygon"); globeControl1.Globe.Action = EnumAction3D.TrackPolygon; globeControl1.Globe.TrackPolygonTool.TrackMode = EnumTrackMode.SpaceTrack; globeControl1.TrackPolygonEndEvent += globeControl1_TrackPolygonEndEvent; @@ -408,12 +409,11 @@ TextBox control; private void dataGridViewX2_EditingControlShowing(object sender, DataGridViewEditingControlShowingEventArgs e) { - if (e.Control.GetType().BaseType.Name == "TextBox") - { - control = new TextBox(); - control = (TextBox)e.Control; - control.KeyPress += control_KeyPress; - } + MemberInfo memberInfo = e.Control.GetType().BaseType; + if (memberInfo != null && !memberInfo.Name.Equals("TextBox")) return; + control = new TextBox(); + control = (TextBox)e.Control; + control.KeyPress += control_KeyPress; } /// /// 键盘按键按下事件处理 @@ -423,28 +423,24 @@ void control_KeyPress(object sender, KeyPressEventArgs e) { TextBox text = sender as TextBox; + if (text == null) return; if ((e.KeyChar < 48 || e.KeyChar > 57) && (e.KeyChar != 8) && e.KeyChar != 46) { e.Handled = true; } - if (e.KeyChar == 46) //小数点 + if (e.KeyChar != 46) return; + if (text.Text.Length <= 0) + e.Handled = true; //小数点不能在第一位 + else //处理不规则的小数点 { - if (text.Text.Length <= 0) - e.Handled = true; //小数点不能在第一位 - else //处理不规则的小数点 + float f; + float oldf; + bool b1 = false, b2 = false; + b1 = float.TryParse(text.Text, out oldf); + b2 = float.TryParse(text.Text + e.KeyChar, out f); + if (!b2) { - float f; - float oldf; - bool b1 = false, b2 = false; - b1 = float.TryParse(text.Text, out oldf); - b2 = float.TryParse(text.Text + e.KeyChar, out f); - if (b2 == false) - { - if (b1) - e.Handled = true; - else - e.Handled = false; - } + e.Handled = b1; } } } @@ -457,7 +453,7 @@ { frm = null; - Utility.RemoveFeatureFromName(globeControl1, "trackPolygon"); + FeatureTools.RemoveFeatureFromName(globeControl1, "trackPolygon"); globeControl1.TrackPolygonEndEvent -= globeControl1_TrackPolygonEndEvent; globeControl1.Globe.Action = EnumAction3D.ActionNull; diff --git a/FrmpipeDiametergather.cs b/FrmpipeDiametergather.cs index a9d96fa..c09aaf1 100644 --- a/FrmpipeDiametergather.cs +++ b/FrmpipeDiametergather.cs @@ -154,7 +154,7 @@ MessageBox.Show("请选择图层！"); return; } - Utility.RemoveFeatureFromName(globeControl1, "trackPolygon"); + FeatureTools.RemoveFeatureFromName(globeControl1, "trackPolygon"); globeControl1.Globe.Action = EnumAction3D.TrackPolygon; globeControl1.Globe.TrackPolygonTool.TrackMode = EnumTrackMode.SpaceTrack; globeControl1.TrackPolygonEndEvent += globeControl1_TrackPolygonEndEvent; @@ -392,7 +392,7 @@ private void FrmpipeDiametergather_FormClosing(object sender, FormClosingEventArgs e) { frm = null; - Utility.RemoveFeatureFromName(globeControl1, "trackPolygon"); + FeatureTools.RemoveFeatureFromName(globeControl1, "trackPolygon"); globeControl1.TrackPolygonEndEvent -= globeControl1_TrackPolygonEndEvent; globeControl1.Globe.Action = EnumAction3D.ActionNull; diff --git a/FrmpipeMaterialGather.cs b/FrmpipeMaterialGather.cs index 44e7f24..5ca8144 100644 --- a/FrmpipeMaterialGather.cs +++ b/FrmpipeMaterialGather.cs @@ -58,10 +58,9 @@ for (int i = 0; i < pipeLayerNames.Count; i++) { clbPipeLine.Items.Add(pipeLayerNames[i]); - GSOLayer layer = globeControl1.Globe.Layers.GetLayerByCaption(pipeLayerNames[i]); - if (layer.Dataset == null || !layer.Dataset.IsFeatureDataset || layer.Type != EnumLayerType.FeatureLayer) continue; + GSOLayer layer = globeControl1.Globe.Layers.GetLayerByCaption(pipeLayerNames[i]); + if (layer == null || layer.Dataset == null || !layer.Dataset.IsFeatureDataset || layer.Type != EnumLayerType.FeatureLayer) continue; - string name = layer.Name; GSOFeatureLayer flayer = layer as GSOFeatureLayer; GSOFeatures feats = flayer.GetAllFeatures(); @@ -205,7 +204,7 @@ { chart1.Series.Add(clbPipeLine.CheckedItems[i].ToString()); GSOLayer layer = globeControl1.Globe.Layers.GetLayerByCaption(clbPipeLine.CheckedItems[i].ToString()); - if (layer != null && layer is GSOFeatureLayer) + if (layer is GSOFeatureLayer) { GSOFeatureLayer flayer = layer as GSOFeatureLayer; GSOFeatures features = flayer.GetAllFeatures(); @@ -240,10 +239,9 @@ labeStyleAxisX.Enabled = true; chart1.ChartAreas["ChartArea1"].AxisX.LabelStyle = labeStyleAxisX; - Dictionary dic1 = new Dictionary(); for (int j = 0; j < chart1.Series.Count; j++) { - dic1 = new Dictionary(); + Dictionary dic1 = new Dictionary(); foreach (string key in dic.Keys) { if (key.Contains(chart1.Series[j].Name)) @@ -304,7 +302,7 @@ MessageBox.Show("请选择材质类型！"); return; } - Utility.RemoveFeatureFromName(globeControl1, "trackPolygon"); + FeatureTools.RemoveFeatureFromName(globeControl1, "trackPolygon"); globeControl1.Globe.Action = EnumAction3D.TrackPolygon; globeControl1.Globe.TrackPolygonTool.TrackMode = EnumTrackMode.SpaceTrack; globeControl1.TrackPolygonEndEvent += globeControl1_TrackPolygonEndEvent; @@ -318,7 +316,7 @@ private void FrmpipeMaterialGather_FormClosing(object sender, FormClosingEventArgs e) { frm = null; - Utility.RemoveFeatureFromName(globeControl1, "trackPolygon"); + FeatureTools.RemoveFeatureFromName(globeControl1, "trackPolygon"); globeControl1.TrackPolygonEndEvent -= globeControl1_TrackPolygonEndEvent; globeControl1.Globe.Action = EnumAction3D.ActionNull; diff --git a/Frmpipediameterstatis.cs b/Frmpipediameterstatis.cs index 4fb25a8..631a996 100644 --- a/Frmpipediameterstatis.cs +++ b/Frmpipediameterstatis.cs @@ -202,8 +202,8 @@ } catch (Exception ex) { - LogHelper.WriteLog(typeof(Frmpipediameterstatis), ex.Message); //MessageBox.Show(ex.Message); + LogHelper.Error(ex.Message); LogError.PublishError(ex); } } @@ -372,7 +372,7 @@ MessageBox.Show("请添加分段！"); return; } - Utility.RemoveFeatureFromName(globeControl1, "trackPolygon"); + FeatureTools.RemoveFeatureFromName(globeControl1, "trackPolygon"); globeControl1.Globe.Action = EnumAction3D.TrackPolygon; globeControl1.Globe.TrackPolygonTool.TrackMode = EnumTrackMode.SpaceTrack; globeControl1.TrackPolygonEndEvent += globeControl1_TrackPolygonEndEvent; @@ -422,7 +422,7 @@ globeControl1.Globe.Action = EnumAction3D.ActionNull; globeControl1.TrackPolygonEndEvent -= globeControl1_TrackPolygonEndEvent; - Utility.RemoveFeatureFromName(globeControl1, "trackPolygon"); + FeatureTools.RemoveFeatureFromName(globeControl1, "trackPolygon"); globeControl1.Globe.MemoryLayer.RemoveAllFeature(); } diff --git a/LineBuilder.cs b/LineBuilder.cs index 33a216c..b6a8516 100644 --- a/LineBuilder.cs +++ b/LineBuilder.cs @@ -43,8 +43,8 @@ GSOGeoPolyline3D lineeee = f.Geometry as GSOGeoPolyline3D; if (lineeee == null || lineeee.GetSpaceLength(true, 6378137) == 0) { - LogHelper.WriteLog(typeof(LineBuilder), "出现数据无法入库:"+f.ID); - continue; //TODO LIST:判断是否会出现部署数据无法入库情况,Log2Net + LogHelper.Error("出现数据无法入库:" + f.ID); + continue; } GSOFeature newFeature = newFeatureSet.CreateFeature(); diff --git a/LogHelper.cs b/LogHelper.cs index 9ef5f27..04573cf 100644 --- a/LogHelper.cs +++ b/LogHelper.cs @@ -1,4 +1,5 @@ using System; +using System.Diagnostics; using log4net; using log4net.Config; @@ -7,35 +8,82 @@ { public class LogHelper { - /// - /// 输出日志到Log4Net - /// - /// - /// - #region static void WriteLog(Type t, Exception ex) - public static void WriteLog(Type t, Exception ex) + private static ILog _logdebug = log4net.LogManager.GetLogger("logdebug"); + private static ILog _loginfo = log4net.LogManager.GetLogger("loginfo"); + private static ILog _logwarn = log4net.LogManager.GetLogger("logwarn"); + private static ILog _logerror = log4net.LogManager.GetLogger("logerror"); + private static ILog _logfatal = log4net.LogManager.GetLogger("logfatal"); + + public static void Debug(string msg) { - ILog log = log4net.LogManager.GetLogger(t); - log.Error("Error", ex); + StackFrame sf = new StackFrame(1); + msg = string.Format("{0}.{1}:{2}", sf.GetMethod().ReflectedType.FullName, sf.GetMethod().Name, msg); + _logdebug.Debug(msg); + } + public static void Debug(string msg, Exception e) + { + StackFrame sf = new StackFrame(1); + msg = string.Format("{0}.{1}:{2}", sf.GetMethod().ReflectedType.FullName, sf.GetMethod().Name, msg); + _logdebug.Debug(msg, e); } - #endregion - /// - /// 输出日志到Log4Net - /// - /// - /// - #region static void WriteLog(Type t, string msg) - - public static void WriteLog(Type t, string msg) + public static void Info(string msg) { - ILog log = log4net.LogManager.GetLogger(t); - log.Error(msg); + StackFrame sf = new StackFrame(1); + msg = string.Format("{0}.{1}:{2}", sf.GetMethod().ReflectedType.FullName, sf.GetMethod().Name, msg); + _loginfo.Info(msg); + } + public static void Info(string msg, Exception e) + { + StackFrame sf = new StackFrame(1); + msg = string.Format("{0}.{1}:{2}", sf.GetMethod().ReflectedType.FullName, sf.GetMethod().Name, msg); + _loginfo.Info(msg, e); } - #endregion + + public static void Warn(string msg) + { + StackFrame sf = new StackFrame(1); + msg = string.Format("{0}.{1}:{2}", sf.GetMethod().ReflectedType.FullName, sf.GetMethod().Name, msg); + _logwarn.Warn(msg); + } + public static void Warn(string msg, Exception e) + { + StackFrame sf = new StackFrame(1); + msg = string.Format("{0}.{1}:{2}", sf.GetMethod().ReflectedType.FullName, sf.GetMethod().Name, msg); + _logwarn.Warn(msg, e); + } + + + public static void Error(string msg) + { + StackFrame sf = new StackFrame(1); + msg = string.Format("{0}.{1}:{2}", sf.GetMethod().ReflectedType.FullName, sf.GetMethod().Name, msg); + _logerror.Error(msg); + } + public static void Error(string msg, Exception e) + { + StackFrame sf = new StackFrame(1); + msg = string.Format("{0}.{1}:{2}", sf.GetMethod().ReflectedType.FullName, sf.GetMethod().Name, msg); + _logerror.Error(msg, e); + } + + + public static void Fatal(string msg) + { + StackFrame sf = new StackFrame(1); + msg = string.Format("{0}.{1}:{2}", sf.GetMethod().ReflectedType.FullName, sf.GetMethod().Name, msg); + _logfatal.Fatal(msg); + } + public static void Fatal(string msg, Exception e) + { + StackFrame sf = new StackFrame(1); + msg = string.Format("{0}.{1}:{2}", sf.GetMethod().ReflectedType.FullName, sf.GetMethod().Name, msg); + _logfatal.Fatal(msg, e); + } + } diff --git a/MainFrm.cs b/MainFrm.cs index 43de664..51f362a 100644 --- a/MainFrm.cs +++ b/MainFrm.cs @@ -18,7 +18,6 @@ using GeoScene.Data; using GeoScene.Engine; using GeoScene.Globe; -using Timer = System.Windows.Forms.Timer; using ToolTip = System.Windows.Forms.ToolTip; namespace Cyberpipe @@ -163,6 +162,7 @@ /// private void AddGZ() { + lendendGZ50 = new GSOHudButton(); lendendGZ50.SetImage(Application.StartupPath + "/Resource/管纵/50.png"); lendendGZ50.SetOffset(0, 0); @@ -1294,18 +1294,19 @@ private void MainFrm_Load(object sender, EventArgs e) { + layerTree.Nodes.Add("正在加载，请稍后……");//树状图加载在图层加载之后，故增加提示 initGlobalControl(); - //initGlobalMap(); - //initLayerTree(); initMarkerTree(); initLayout(); loadData(); - double x = Convert.ToDouble(Utility.Query_Roads["定位"].ToString().Split(',')[0]); - double y = Convert.ToDouble(Utility.Query_Roads["定位"].ToString().Split(',')[1]); - double z = Convert.ToDouble(Utility.Query_Roads["定位"].ToString().Split(',')[2]); + + double x = Convert.ToDouble(Utility.Query_Roads["绿岛"].ToString().Split(',')[0]); + double y = Convert.ToDouble(Utility.Query_Roads["绿岛"].ToString().Split(',')[1]); + double z = Convert.ToDouble(Utility.Query_Roads["绿岛"].ToString().Split(',')[2]); jumpToCameraState(x, y, z); + } #endregion @@ -1315,11 +1316,17 @@ if (e.Layer == null || !e.Layer.Caption.Equals(Utility.roadLayerName)) return; foreach (TreeNode layerTreeNode in layerTree.Nodes) { - foreach (TreeNode node in layerTreeNode.Nodes) + for (int i=0;i dt, DataGridView dataGridView) @@ -7330,7 +7337,7 @@ } catch (Exception ex) { - LogHelper.WriteLog(typeof(MainFrm), ex); + LogHelper.Debug("", ex); } } } @@ -7362,7 +7369,7 @@ GSOLayer layer = globeControl1.Globe.Layers.Add(strDataPath); if (layer == null) {//wxl - LogHelper.WriteLog(typeof(MainFrm), "buttonItemHX1_Click操作中，" + strDataPath + "的layer为空"); + LogHelper.Error("buttonItemHX1_Click操作中，" + strDataPath + "的layer为空"); continue; } GSOFeatures redFeatures = layer.GetAllFeatures(); @@ -7457,17 +7464,12 @@ { try { + globeControl1.BeforeSceneRenderEvent -= globeControl1_BeforeSceneRenderEvent; globeControl2.BeforeSceneRenderEvent -= globeControl2_BeforeSceneRenderEvent; - double x = Convert.ToDouble(Utility.Query_Roads["定位"].ToString().Split(',')[0]); - double y = Convert.ToDouble(Utility.Query_Roads["定位"].ToString().Split(',')[1]); - double z = Convert.ToDouble(Utility.Query_Roads["定位"].ToString().Split(',')[2]); - jumpToCameraState(x, y, z); - /* globeControl1.Globe.FlyToPosition(new GSOPoint3d(120.610963, 31.188121, 50), EnumAltitudeMode.Absolute, -4, 50, 800); globeControl1.Globe.FlyToPointSpeed = 10000000; - * */ globeControl1.Globe.Action = EnumAction3D.SelectObject; globeControl1.Refresh(); @@ -7489,6 +7491,37 @@ } } /// + /// 基础工具 + /// + /// + /// + private void ribbonTabItem1_MouseDown(object sender, MouseEventArgs e) + { + try + { + + globeControl1.BeforeSceneRenderEvent -= globeControl1_BeforeSceneRenderEvent; + globeControl2.BeforeSceneRenderEvent -= globeControl2_BeforeSceneRenderEvent; + + globeControl1.Globe.Action = EnumAction3D.ActionNull; + dataGridViewX1.AutoSizeColumnsMode = DataGridViewAutoSizeColumnsMode.AllCells; + //zhanshi = false; + redSH = false; + splitContainer1.Panel2Collapsed = true; + panelOfTable.Visible = false; + legendSC.Visible = false; + legendSG.Visible = false; + ClearGZData(); + GSOLayer redLayer = globeControl1.Globe.Layers.GetLayerByCaption("红线"); + if (redLayer == null) return; + redLayer.Visible = false; + } + catch (Exception ex) + { + //MessageBox.Show("系统运行错误:" + ex.ToString(), "错误", MessageBoxButtons.OK, MessageBoxIcon.Error); + } + } + /// /// 一键审核 /// /// @@ -7497,6 +7530,7 @@ { try { + globeControl1.BeforeSceneRenderEvent -= globeControl1_BeforeSceneRenderEvent; globeControl2.BeforeSceneRenderEvent -= globeControl2_BeforeSceneRenderEvent; @@ -7518,32 +7552,7 @@ //MessageBox.Show("系统运行错误:" + ex.ToString(), "错误", MessageBoxButtons.OK, MessageBoxIcon.Error); } } - - void ResetRibbonTab() - { - try - { - globeControl1.BeforeSceneRenderEvent -= globeControl1_BeforeSceneRenderEvent; - globeControl2.BeforeSceneRenderEvent -= globeControl2_BeforeSceneRenderEvent; - - globeControl1.Globe.Action = EnumAction3D.ActionNull; - dataGridViewX1.AutoSizeColumnsMode = DataGridViewAutoSizeColumnsMode.AllCells; - //zhanshi = false; - redSH = false; - splitContainer1.Panel2Collapsed = true; - panelOfTable.Visible = false; - legendSC.Visible = false; - legendSG.Visible = false; - ClearGZData(); - GSOLayer redLayer = globeControl1.Globe.Layers.GetLayerByCaption("红线"); - if (redLayer == null) return; - redLayer.Visible = false; - } - catch (Exception ex) - { - LogHelper.WriteLog(typeof(MainFrm), ex); - } - } + /// /// 双屏对比 /// @@ -7553,8 +7562,8 @@ { try { - globeControl1.BeforeSceneRenderEvent += new BeforeSceneRenderEventHandler(globeControl1_BeforeSceneRenderEvent); - globeControl2.BeforeSceneRenderEvent += new BeforeSceneRenderEventHandler(globeControl2_BeforeSceneRenderEvent); + globeControl1.BeforeSceneRenderEvent += globeControl1_BeforeSceneRenderEvent; + globeControl2.BeforeSceneRenderEvent += globeControl2_BeforeSceneRenderEvent; globeControl1.Globe.Action = EnumAction3D.ActionNull; panelOfTable.Visible = false; @@ -7570,32 +7579,43 @@ GSOLayer redLayer = globeControl1.Globe.Layers.GetLayerByCaption("红线"); if (redLayer != null) - { redLayer.Visible = false; - } } catch (Exception ex) { - LogHelper.WriteLog(typeof(MainFrm), ex); + //MessageBox.Show("系统运行错误:" + ex.ToString(), "错误", MessageBoxButtons.OK, MessageBoxIcon.Error); } } /// - /// 基础工具 - /// - /// - /// - private void ribbonTabItem1_MouseDown(object sender, MouseEventArgs e) - { - ResetRibbonTab(); - } - /// /// 文档管理 /// /// /// private void ribbonTabItem4_MouseDown(object sender, MouseEventArgs e) { - ResetRibbonTab(); + try + { + + globeControl1.BeforeSceneRenderEvent -= globeControl1_BeforeSceneRenderEvent; + globeControl2.BeforeSceneRenderEvent -= globeControl2_BeforeSceneRenderEvent; + + globeControl1.Globe.Action = EnumAction3D.ActionNull; + panelOfTable.Visible = false; + //zhanshi = false; + redSH = false; + splitContainer1.Panel2Collapsed = true; + dataGridViewX1.AutoSizeColumnsMode = DataGridViewAutoSizeColumnsMode.AllCells; + legendSC.Visible = false; + legendSG.Visible = false; + ClearGZData(); + GSOLayer redLayer = globeControl1.Globe.Layers.GetLayerByCaption("红线"); + if (redLayer != null) + redLayer.Visible = false; + } + catch (Exception ex) + { + //MessageBox.Show("系统运行错误:" + ex.ToString(), "错误", MessageBoxButtons.OK, MessageBoxIcon.Error); + } } /// /// 基础管理 @@ -7604,7 +7624,29 @@ /// private void ribbonTabItem14_MouseDown(object sender, MouseEventArgs e) { - ResetRibbonTab(); + try + { + globeControl1.BeforeSceneRenderEvent -= globeControl1_BeforeSceneRenderEvent; + globeControl2.BeforeSceneRenderEvent -= globeControl2_BeforeSceneRenderEvent; + + globeControl1.Globe.Action = EnumAction3D.ActionNull; + panelOfTable.Visible = false; + //zhanshi = false; + redSH = false; + splitContainer1.Panel2Collapsed = true; + dataGridViewX1.AutoSizeColumnsMode = DataGridViewAutoSizeColumnsMode.AllCells; + legendSC.Visible = false; + legendSG.Visible = false; + ClearGZData(); + + GSOLayer redLayer = globeControl1.Globe.Layers.GetLayerByCaption("红线"); + if (redLayer != null) + redLayer.Visible = false; + } + catch (Exception ex) + { + //MessageBox.Show("系统运行错误:" + ex.ToString(), "错误", MessageBoxButtons.OK, MessageBoxIcon.Error); + } } /// /// 权限管理 @@ -7613,26 +7655,31 @@ /// private void ribbonTabItem2_MouseDown(object sender, MouseEventArgs e) { - ResetRibbonTab(); + try + { + globeControl1.BeforeSceneRenderEvent -= globeControl1_BeforeSceneRenderEvent; + globeControl2.BeforeSceneRenderEvent -= globeControl2_BeforeSceneRenderEvent; + + globeControl1.Globe.Action = EnumAction3D.ActionNull; + panelOfTable.Visible = false; + //zhanshi = false; + redSH = false; + splitContainer1.Panel2Collapsed = true; + dataGridViewX1.AutoSizeColumnsMode = DataGridViewAutoSizeColumnsMode.AllCells; + legendSC.Visible = false; + legendSG.Visible = false; + ClearGZData(); + + GSOLayer redLayer = globeControl1.Globe.Layers.GetLayerByCaption("红线"); + if (redLayer == null) return; + redLayer.Visible = false; + } + catch (Exception ex) + { + //MessageBox.Show("系统运行错误:" + ex.ToString(), "错误", MessageBoxButtons.OK, MessageBoxIcon.Error); + } } - /// - /// 管线定位 - /// - /// - /// - private void ribbonTabItem7_MouseDown(object sender, MouseEventArgs e) - { - ResetRibbonTab(); - } - /// - /// 标识器管理 - /// - /// - /// - private void ribbonTabItem5_MouseDown(object sender, MouseEventArgs e) - { - ResetRibbonTab(); - } + //GSOFeature dpFeatuer = null; /// /// 双屏分析，点击管段分析 @@ -8017,7 +8064,9 @@ private void btn_flag_Click(object sender, EventArgs e) { if (FrmFlagManagers.IS_OPEN) + { return; + } FrmFlagManagers frm = new FrmFlagManagers(globeControl1); frm.Show(this); } diff --git a/MainFrm.designer.cs b/MainFrm.designer.cs index e3dca41..73398c0 100644 --- a/MainFrm.designer.cs +++ b/MainFrm.designer.cs @@ -4,6 +4,7 @@ using DevComponents.DotNetBar; using DevComponents.DotNetBar.Controls; using DevComponents.Editors; +using System.Drawing; namespace Cyberpipe { @@ -89,6 +90,7 @@ this.sideBar1 = new DevComponents.DotNetBar.SideBar(); this.panelEx3 = new DevComponents.DotNetBar.PanelEx(); this.layerSensorTree = new System.Windows.Forms.TreeView(); + this.layerTree = new Cyberpipe.MyTreeView(); this.sideBarPanelItem3 = new DevComponents.DotNetBar.SideBarPanelItem(); this.controlContainerItem3 = new DevComponents.DotNetBar.ControlContainerItem(); this.sideBarPanelItem4 = new DevComponents.DotNetBar.SideBarPanelItem(); @@ -243,42 +245,18 @@ this.保存ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.定位ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.ribbonControl1 = new DevComponents.DotNetBar.RibbonControl(); - this.ribbonPanel6 = new DevComponents.DotNetBar.RibbonPanel(); - this.ribbonBar6 = new DevComponents.DotNetBar.RibbonBar(); - this.buttonItemSPSZ = new DevComponents.DotNetBar.ButtonItem(); - this.buttonItem8 = new DevComponents.DotNetBar.ButtonItem(); - this.buttonItemLocation = new DevComponents.DotNetBar.ButtonItem(); - this.sliderItem2 = new DevComponents.DotNetBar.SliderItem(); - this.buttonItemGBJC = new DevComponents.DotNetBar.ButtonItem(); - this.ribbonPanel5 = new DevComponents.DotNetBar.RibbonPanel(); - this.ribbonBar2 = new DevComponents.DotNetBar.RibbonBar(); - this.buttonItemHX1 = new DevComponents.DotNetBar.ButtonItem(); - this.buttonItemHX2 = new DevComponents.DotNetBar.ButtonItem(); - this.buttonItemDCTP = new DevComponents.DotNetBar.ButtonItem(); - this.sliderItem3 = new DevComponents.DotNetBar.SliderItem(); - this.ribbonPanel1 = new DevComponents.DotNetBar.RibbonPanel(); - this.ribbonBar21 = new DevComponents.DotNetBar.RibbonBar(); - this.buttonItem87 = new DevComponents.DotNetBar.ButtonItem(); - this.buttonItem88 = new DevComponents.DotNetBar.ButtonItem(); - this.buttonItem27 = new DevComponents.DotNetBar.ButtonItem(); - this.buttonItem91 = new DevComponents.DotNetBar.ButtonItem(); - this.buttonItem1 = new DevComponents.DotNetBar.ButtonItem(); - this.btnlegendSet = new DevComponents.DotNetBar.ButtonItem(); - this.buttonItem89 = new DevComponents.DotNetBar.ButtonItem(); - this.btnOutputJPG = new DevComponents.DotNetBar.ButtonItem(); - this.ribbonPanel12 = new DevComponents.DotNetBar.RibbonPanel(); - this.ribbonBar18 = new DevComponents.DotNetBar.RibbonBar(); - this.buttonItem133 = new DevComponents.DotNetBar.ButtonItem(); - this.ribbonBar13 = new DevComponents.DotNetBar.RibbonBar(); - this.buttonItem127 = new DevComponents.DotNetBar.ButtonItem(); - this.buttonItem128 = new DevComponents.DotNetBar.ButtonItem(); - this.sliderItem1 = new DevComponents.DotNetBar.SliderItem(); - this.buttonItem134 = new DevComponents.DotNetBar.ButtonItem(); - this.buttonItem130 = new DevComponents.DotNetBar.ButtonItem(); - this.btn_check_history = new DevComponents.DotNetBar.ButtonItem(); - this.ribbonPanel4 = new DevComponents.DotNetBar.RibbonPanel(); - this.ribbonBar1 = new DevComponents.DotNetBar.RibbonBar(); - this.btn_document_info = new DevComponents.DotNetBar.ButtonItem(); + this.ribbonPanel3 = new DevComponents.DotNetBar.RibbonPanel(); + this.ribbonBar4 = new DevComponents.DotNetBar.RibbonBar(); + this.btn_flag = new DevComponents.DotNetBar.ButtonItem(); + this.slider4ground = new DevComponents.DotNetBar.SliderItem(); + this.ribbonPanel7 = new DevComponents.DotNetBar.RibbonPanel(); + this.gxdw_ribbonbar = new DevComponents.DotNetBar.RibbonBar(); + this.buttonItem9 = new DevComponents.DotNetBar.ButtonItem(); + this.buttonItem10 = new DevComponents.DotNetBar.ButtonItem(); + this.buttonItem11 = new DevComponents.DotNetBar.ButtonItem(); + this.buttonItem12 = new DevComponents.DotNetBar.ButtonItem(); + this.buttonItem13 = new DevComponents.DotNetBar.ButtonItem(); + this.buttonItem14 = new DevComponents.DotNetBar.ButtonItem(); this.ribbonPanel15 = new DevComponents.DotNetBar.RibbonPanel(); this.ribbonBar20 = new DevComponents.DotNetBar.RibbonBar(); this.buttonItemSH = new DevComponents.DotNetBar.ButtonItem(); @@ -334,18 +312,6 @@ this.buttonItemXT4 = new DevComponents.DotNetBar.ButtonItem(); this.buttonItemXT4_1 = new DevComponents.DotNetBar.ButtonItem(); this.buttonItemXT4_2 = new DevComponents.DotNetBar.ButtonItem(); - this.ribbonPanel3 = new DevComponents.DotNetBar.RibbonPanel(); - this.ribbonBar4 = new DevComponents.DotNetBar.RibbonBar(); - this.btn_flag = new DevComponents.DotNetBar.ButtonItem(); - this.slider4ground = new DevComponents.DotNetBar.SliderItem(); - this.ribbonPanel7 = new DevComponents.DotNetBar.RibbonPanel(); - this.gxdw_ribbonbar = new DevComponents.DotNetBar.RibbonBar(); - this.buttonItem9 = new DevComponents.DotNetBar.ButtonItem(); - this.buttonItem10 = new DevComponents.DotNetBar.ButtonItem(); - this.buttonItem11 = new DevComponents.DotNetBar.ButtonItem(); - this.buttonItem12 = new DevComponents.DotNetBar.ButtonItem(); - this.buttonItem13 = new DevComponents.DotNetBar.ButtonItem(); - this.buttonItem14 = new DevComponents.DotNetBar.ButtonItem(); this.ribbonPanel2 = new DevComponents.DotNetBar.RibbonPanel(); this.ribbonBar3 = new DevComponents.DotNetBar.RibbonBar(); this.btn_user_info = new DevComponents.DotNetBar.ButtonItem(); @@ -355,6 +321,43 @@ this.btn_user_role = new DevComponents.DotNetBar.ButtonItem(); this.btn_password_edit = new DevComponents.DotNetBar.ButtonItem(); this.buttonItemPasswordReset = new DevComponents.DotNetBar.ButtonItem(); + this.ribbonPanel6 = new DevComponents.DotNetBar.RibbonPanel(); + this.ribbonBar6 = new DevComponents.DotNetBar.RibbonBar(); + this.buttonItemSPSZ = new DevComponents.DotNetBar.ButtonItem(); + this.buttonItem8 = new DevComponents.DotNetBar.ButtonItem(); + this.buttonItemLocation = new DevComponents.DotNetBar.ButtonItem(); + this.sliderItem2 = new DevComponents.DotNetBar.SliderItem(); + this.buttonItemGBJC = new DevComponents.DotNetBar.ButtonItem(); + this.ribbonPanel5 = new DevComponents.DotNetBar.RibbonPanel(); + this.ribbonBar2 = new DevComponents.DotNetBar.RibbonBar(); + this.buttonItemHX1 = new DevComponents.DotNetBar.ButtonItem(); + this.buttonItemHX2 = new DevComponents.DotNetBar.ButtonItem(); + this.buttonItemDCTP = new DevComponents.DotNetBar.ButtonItem(); + this.sliderItem3 = new DevComponents.DotNetBar.SliderItem(); + this.ribbonPanel1 = new DevComponents.DotNetBar.RibbonPanel(); + this.ribbonBar21 = new DevComponents.DotNetBar.RibbonBar(); + this.buttonItem87 = new DevComponents.DotNetBar.ButtonItem(); + this.buttonItem88 = new DevComponents.DotNetBar.ButtonItem(); + this.buttonItem27 = new DevComponents.DotNetBar.ButtonItem(); + this.buttonItem91 = new DevComponents.DotNetBar.ButtonItem(); + this.buttonItem1 = new DevComponents.DotNetBar.ButtonItem(); + this.btnlegendSet = new DevComponents.DotNetBar.ButtonItem(); + this.buttonItem89 = new DevComponents.DotNetBar.ButtonItem(); + this.btnOutputJPG = new DevComponents.DotNetBar.ButtonItem(); + this.ribbonPanel12 = new DevComponents.DotNetBar.RibbonPanel(); + this.ribbonBar18 = new DevComponents.DotNetBar.RibbonBar(); + this.buttonItem133 = new DevComponents.DotNetBar.ButtonItem(); + this.buttonItem132 = new DevComponents.DotNetBar.ButtonItem(); + this.ribbonBar13 = new DevComponents.DotNetBar.RibbonBar(); + this.buttonItem127 = new DevComponents.DotNetBar.ButtonItem(); + this.buttonItem128 = new DevComponents.DotNetBar.ButtonItem(); + this.sliderItem1 = new DevComponents.DotNetBar.SliderItem(); + this.buttonItem134 = new DevComponents.DotNetBar.ButtonItem(); + this.buttonItem130 = new DevComponents.DotNetBar.ButtonItem(); + this.btn_check_history = new DevComponents.DotNetBar.ButtonItem(); + this.ribbonPanel4 = new DevComponents.DotNetBar.RibbonPanel(); + this.ribbonBar1 = new DevComponents.DotNetBar.RibbonBar(); + this.btn_document_info = new DevComponents.DotNetBar.ButtonItem(); this.ribbonTabItem1 = new DevComponents.DotNetBar.RibbonTabItem(); this.ribbonTabItem11 = new DevComponents.DotNetBar.RibbonTabItem(); this.ribbonTabItem6 = new DevComponents.DotNetBar.RibbonTabItem(); @@ -516,7 +519,6 @@ this.labelX17 = new DevComponents.DotNetBar.LabelX(); this.panelEx4 = new DevComponents.DotNetBar.PanelEx(); this.pictureBox1 = new System.Windows.Forms.PictureBox(); - this.layerTree = new Cyberpipe.MyTreeView(); this.statusStrip1.SuspendLayout(); this.sideBar1.SuspendLayout(); this.panelEx3.SuspendLayout(); @@ -527,15 +529,15 @@ this.contextMenuStrip3.SuspendLayout(); this.contextMenuStripDeleteLayerNode.SuspendLayout(); this.ribbonControl1.SuspendLayout(); + this.ribbonPanel3.SuspendLayout(); + this.ribbonPanel7.SuspendLayout(); + this.ribbonPanel15.SuspendLayout(); + this.ribbonPanel2.SuspendLayout(); this.ribbonPanel6.SuspendLayout(); this.ribbonPanel5.SuspendLayout(); this.ribbonPanel1.SuspendLayout(); this.ribbonPanel12.SuspendLayout(); this.ribbonPanel4.SuspendLayout(); - this.ribbonPanel15.SuspendLayout(); - this.ribbonPanel3.SuspendLayout(); - this.ribbonPanel7.SuspendLayout(); - this.ribbonPanel2.SuspendLayout(); this.panelOfTable.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.dataGridViewX1)).BeginInit(); this.statusStrip2.SuspendLayout(); @@ -711,7 +713,8 @@ this.statusLabel.Name = "statusLabel"; this.statusLabel.Size = new System.Drawing.Size(1313, 17); this.statusLabel.Spring = true; - this.statusLabel.Text = " ©2014-2015 苏州航天系统工程有限公司 版权所有"; + this.statusLabel.Text = Utility.Copyright; +// this.statusLabel.Text = " ©2014-2015 苏州航天系统工程有限公司 版权所有"; // // toolStripDropDownButton1 // @@ -956,6 +959,18 @@ this.layerSensorTree.NodeMouseClick += new System.Windows.Forms.TreeNodeMouseClickEventHandler(this.layerMarkerTree_NodeMouseClick); this.layerSensorTree.NodeMouseDoubleClick += new System.Windows.Forms.TreeNodeMouseClickEventHandler(this.layerTree_NodeMouseDoubleClick); // + // layerTree + // + this.layerTree.CheckBoxes = true; + this.layerTree.ItemHeight = 18; + this.layerTree.Location = new System.Drawing.Point(30, 78); + this.layerTree.Name = "layerTree"; + this.layerTree.Size = new System.Drawing.Size(121, 97); + this.layerTree.TabIndex = 1; + this.layerTree.AfterCheck += new System.Windows.Forms.TreeViewEventHandler(this.layerTree_AfterCheck); + this.layerTree.NodeMouseClick += new System.Windows.Forms.TreeNodeMouseClickEventHandler(this.layerTree_NodeMouseClick); + this.layerTree.NodeMouseDoubleClick += new System.Windows.Forms.TreeNodeMouseClickEventHandler(this.layerTree_NodeMouseDoubleClick); + // // sideBarPanelItem3 // this.sideBarPanelItem3.FontBold = true; @@ -2150,13 +2165,13 @@ this.ribbonControl1.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.ribbonControl1.Controls.Add(this.ribbonPanel3); this.ribbonControl1.Controls.Add(this.ribbonPanel7); - this.ribbonControl1.Controls.Add(this.ribbonPanel2); this.ribbonControl1.Controls.Add(this.ribbonPanel15); - this.ribbonControl1.Controls.Add(this.ribbonPanel4); - this.ribbonControl1.Controls.Add(this.ribbonPanel1); + this.ribbonControl1.Controls.Add(this.ribbonPanel2); this.ribbonControl1.Controls.Add(this.ribbonPanel6); - this.ribbonControl1.Controls.Add(this.ribbonPanel12); this.ribbonControl1.Controls.Add(this.ribbonPanel5); + this.ribbonControl1.Controls.Add(this.ribbonPanel1); + this.ribbonControl1.Controls.Add(this.ribbonPanel12); + this.ribbonControl1.Controls.Add(this.ribbonPanel4); this.ribbonControl1.Dock = System.Windows.Forms.DockStyle.Top; this.ribbonControl1.ImeMode = System.Windows.Forms.ImeMode.NoControl; this.ribbonControl1.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { @@ -2200,609 +2215,216 @@ this.ribbonControl1.Text = "ribbonControl1"; this.ribbonControl1.UseCustomizeDialog = false; // - // ribbonPanel6 + // ribbonPanel3 // - this.ribbonPanel6.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.ribbonPanel6.Controls.Add(this.ribbonBar6); - this.ribbonPanel6.Dock = System.Windows.Forms.DockStyle.Fill; - this.ribbonPanel6.Location = new System.Drawing.Point(0, 0); - this.ribbonPanel6.Name = "ribbonPanel6"; - this.ribbonPanel6.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); - this.ribbonPanel6.Size = new System.Drawing.Size(1328, 95); + this.ribbonPanel3.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.ribbonPanel3.Controls.Add(this.ribbonBar4); + this.ribbonPanel3.Dock = System.Windows.Forms.DockStyle.Fill; + this.ribbonPanel3.Location = new System.Drawing.Point(0, 33); + this.ribbonPanel3.Name = "ribbonPanel3"; + this.ribbonPanel3.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); + this.ribbonPanel3.Size = new System.Drawing.Size(1328, 62); // // // - this.ribbonPanel6.Style.Class = ""; - this.ribbonPanel6.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonPanel3.Style.Class = ""; + this.ribbonPanel3.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; // // // - this.ribbonPanel6.StyleMouseDown.Class = ""; - this.ribbonPanel6.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonPanel3.StyleMouseDown.Class = ""; + this.ribbonPanel3.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; // // // - this.ribbonPanel6.StyleMouseOver.Class = ""; - this.ribbonPanel6.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonPanel6.TabIndex = 38; - this.ribbonPanel6.Visible = false; + this.ribbonPanel3.StyleMouseOver.Class = ""; + this.ribbonPanel3.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonPanel3.TabIndex = 40; // - // ribbonBar6 + // ribbonBar4 // - this.ribbonBar6.AutoOverflowEnabled = true; + this.ribbonBar4.AutoOverflowEnabled = true; // // // - this.ribbonBar6.BackgroundMouseOverStyle.Class = ""; - this.ribbonBar6.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar4.BackgroundMouseOverStyle.Class = ""; + this.ribbonBar4.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; // // // - this.ribbonBar6.BackgroundStyle.Class = ""; - this.ribbonBar6.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonBar6.ContainerControlProcessDialogKey = true; - this.ribbonBar6.Dock = System.Windows.Forms.DockStyle.Left; - this.ribbonBar6.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { - this.buttonItemSPSZ, - this.buttonItem8, - this.buttonItemLocation, - this.sliderItem2, - this.buttonItemGBJC}); - this.ribbonBar6.Location = new System.Drawing.Point(3, 0); - this.ribbonBar6.Name = "ribbonBar6"; - this.ribbonBar6.Size = new System.Drawing.Size(427, 92); - this.ribbonBar6.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.ribbonBar6.TabIndex = 0; + this.ribbonBar4.BackgroundStyle.Class = ""; + this.ribbonBar4.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar4.ContainerControlProcessDialogKey = true; + this.ribbonBar4.Dock = System.Windows.Forms.DockStyle.Left; + this.ribbonBar4.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { + this.btn_flag, + this.slider4ground}); + this.ribbonBar4.Location = new System.Drawing.Point(3, 0); + this.ribbonBar4.Name = "ribbonBar4"; + this.ribbonBar4.Size = new System.Drawing.Size(634, 59); + this.ribbonBar4.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.ribbonBar4.TabIndex = 0; // // // - this.ribbonBar6.TitleStyle.Class = ""; - this.ribbonBar6.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar4.TitleStyle.Class = ""; + this.ribbonBar4.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; // // // - this.ribbonBar6.TitleStyleMouseOver.Class = ""; - this.ribbonBar6.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonBar6.TitleVisible = false; + this.ribbonBar4.TitleStyleMouseOver.Class = ""; + this.ribbonBar4.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar4.TitleVisible = false; // - // buttonItemSPSZ + // btn_flag // - this.buttonItemSPSZ.Image = ((System.Drawing.Image)(resources.GetObject("buttonItemSPSZ.Image"))); - this.buttonItemSPSZ.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItemSPSZ.Name = "buttonItemSPSZ"; - this.buttonItemSPSZ.SubItemsExpandWidth = 14; - this.buttonItemSPSZ.Text = "双屏设置"; - this.buttonItemSPSZ.Click += new System.EventHandler(this.buttonItemSPSZ_Click); + this.btn_flag.Image = global::Cyberpipe.Properties.Resources._24x24icon_03_hover; + this.btn_flag.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.btn_flag.Name = "btn_flag"; + this.btn_flag.SubItemsExpandWidth = 14; + this.btn_flag.Text = "标识器管理"; + this.btn_flag.Click += new System.EventHandler(this.btn_flag_Click); // - // buttonItem8 + // slider4ground // - this.buttonItem8.Image = ((System.Drawing.Image)(resources.GetObject("buttonItem8.Image"))); - this.buttonItem8.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem8.Name = "buttonItem8"; - this.buttonItem8.SubItemsExpandWidth = 14; - this.buttonItem8.Text = "双屏分析"; - this.buttonItem8.Click += new System.EventHandler(this.buttonItem8_Click); + this.slider4ground.LabelPosition = DevComponents.DotNetBar.eSliderLabelPosition.Top; + this.slider4ground.LabelWidth = 50; + this.slider4ground.Name = "slider4ground"; + this.slider4ground.Text = "地面透明度"; + this.slider4ground.TextColor = System.Drawing.Color.Black; + this.slider4ground.Value = 0; + this.slider4ground.ValueChanged += new System.EventHandler(this.slider4ground_ValueChanged); // - // buttonItemLocation + // ribbonPanel7 // - this.buttonItemLocation.Image = ((System.Drawing.Image)(resources.GetObject("buttonItemLocation.Image"))); - this.buttonItemLocation.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItemLocation.Name = "buttonItemLocation"; - this.buttonItemLocation.SubItemsExpandWidth = 14; - this.buttonItemLocation.Text = "快速定位"; - this.buttonItemLocation.Click += new System.EventHandler(this.buttonItemLocation_Click); + this.ribbonPanel7.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.ribbonPanel7.Controls.Add(this.gxdw_ribbonbar); + this.ribbonPanel7.Dock = System.Windows.Forms.DockStyle.Fill; + this.ribbonPanel7.Location = new System.Drawing.Point(0, 33); + this.ribbonPanel7.Name = "ribbonPanel7"; + this.ribbonPanel7.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); + this.ribbonPanel7.Size = new System.Drawing.Size(1328, 62); // - // sliderItem2 // - this.sliderItem2.LabelPosition = DevComponents.DotNetBar.eSliderLabelPosition.Top; - this.sliderItem2.LabelWidth = 50; - this.sliderItem2.Name = "sliderItem2"; - this.sliderItem2.Text = "地面透明度"; - this.sliderItem2.TextColor = System.Drawing.Color.Black; - this.sliderItem2.Value = 0; - this.sliderItem2.ValueChanged += new System.EventHandler(this.sliderItem2_ValueChanged); // - // buttonItemGBJC + this.ribbonPanel7.Style.Class = ""; + this.ribbonPanel7.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; // - this.buttonItemGBJC.Image = ((System.Drawing.Image)(resources.GetObject("buttonItemGBJC.Image"))); - this.buttonItemGBJC.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItemGBJC.Name = "buttonItemGBJC"; - this.buttonItemGBJC.SubItemsExpandWidth = 14; - this.buttonItemGBJC.Text = "国标检测"; - this.buttonItemGBJC.Click += new System.EventHandler(this.buttonItemGBJC_Click); // - // ribbonPanel5 // - this.ribbonPanel5.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.ribbonPanel5.Controls.Add(this.ribbonBar2); - this.ribbonPanel5.Dock = System.Windows.Forms.DockStyle.Fill; - this.ribbonPanel5.Location = new System.Drawing.Point(0, 0); - this.ribbonPanel5.Name = "ribbonPanel5"; - this.ribbonPanel5.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); - this.ribbonPanel5.Size = new System.Drawing.Size(1328, 95); + this.ribbonPanel7.StyleMouseDown.Class = ""; + this.ribbonPanel7.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; // // // - this.ribbonPanel5.Style.Class = ""; - this.ribbonPanel5.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonPanel7.StyleMouseOver.Class = ""; + this.ribbonPanel7.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonPanel7.TabIndex = 41; + this.ribbonPanel7.Visible = false; // + // gxdw_ribbonbar // + this.gxdw_ribbonbar.AutoOverflowEnabled = true; // - this.ribbonPanel5.StyleMouseDown.Class = ""; - this.ribbonPanel5.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; // // + this.gxdw_ribbonbar.BackgroundMouseOverStyle.Class = ""; + this.gxdw_ribbonbar.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; // - this.ribbonPanel5.StyleMouseOver.Class = ""; - this.ribbonPanel5.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonPanel5.TabIndex = 37; - this.ribbonPanel5.Visible = false; // - // ribbonBar2 // - this.ribbonBar2.AutoOverflowEnabled = true; + this.gxdw_ribbonbar.BackgroundStyle.Class = ""; + this.gxdw_ribbonbar.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.gxdw_ribbonbar.ContainerControlProcessDialogKey = true; + this.gxdw_ribbonbar.Dock = System.Windows.Forms.DockStyle.Left; + this.gxdw_ribbonbar.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { + this.buttonItem9, + this.buttonItem10, + this.buttonItem11, + this.buttonItem12, + this.buttonItem13, + this.buttonItem14}); + this.gxdw_ribbonbar.Location = new System.Drawing.Point(3, 0); + this.gxdw_ribbonbar.Name = "gxdw_ribbonbar"; + this.gxdw_ribbonbar.Size = new System.Drawing.Size(564, 59); + this.gxdw_ribbonbar.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.gxdw_ribbonbar.TabIndex = 0; + this.gxdw_ribbonbar.Text = "ribbonBar5"; // // // - this.ribbonBar2.BackgroundMouseOverStyle.Class = ""; - this.ribbonBar2.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.gxdw_ribbonbar.TitleStyle.Class = ""; + this.gxdw_ribbonbar.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; // // // - this.ribbonBar2.BackgroundStyle.Class = ""; - this.ribbonBar2.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonBar2.ContainerControlProcessDialogKey = true; - this.ribbonBar2.Dock = System.Windows.Forms.DockStyle.Left; - this.ribbonBar2.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { - this.buttonItemHX1, - this.buttonItemHX2, - this.buttonItemDCTP, - this.sliderItem3}); - this.ribbonBar2.Location = new System.Drawing.Point(3, 0); - this.ribbonBar2.Name = "ribbonBar2"; - this.ribbonBar2.Size = new System.Drawing.Size(350, 92); - this.ribbonBar2.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.ribbonBar2.TabIndex = 0; + this.gxdw_ribbonbar.TitleStyleMouseOver.Class = ""; + this.gxdw_ribbonbar.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.gxdw_ribbonbar.TitleVisible = false; // + // buttonItem9 // + this.buttonItem9.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__76; + this.buttonItem9.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem9.Name = "buttonItem9"; + this.buttonItem9.SubItemsExpandWidth = 14; + this.buttonItem9.Text = "工单管理"; + this.buttonItem9.Click += new System.EventHandler(this.buttonItem9_Click); // - this.ribbonBar2.TitleStyle.Class = ""; - this.ribbonBar2.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // buttonItem10 // + this.buttonItem10.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__69; + this.buttonItem10.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem10.Name = "buttonItem10"; + this.buttonItem10.SubItemsExpandWidth = 14; + this.buttonItem10.Text = "在线任务"; + this.buttonItem10.Click += new System.EventHandler(this.buttonItem10_Click); // + // buttonItem11 // - this.ribbonBar2.TitleStyleMouseOver.Class = ""; - this.ribbonBar2.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonBar2.TitleVisible = false; + this.buttonItem11.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__72; + this.buttonItem11.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem11.Name = "buttonItem11"; + this.buttonItem11.SubItemsExpandWidth = 14; + this.buttonItem11.Text = "事件管理"; + this.buttonItem11.Click += new System.EventHandler(this.buttonItem11_Click); // - // buttonItemHX1 + // buttonItem12 // - this.buttonItemHX1.AutoExpandOnClick = true; - this.buttonItemHX1.Image = ((System.Drawing.Image)(resources.GetObject("buttonItemHX1.Image"))); - this.buttonItemHX1.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItemHX1.Name = "buttonItemHX1"; - this.buttonItemHX1.SubItemsExpandWidth = 14; - this.buttonItemHX1.Text = "导入红线"; - this.buttonItemHX1.Click += new System.EventHandler(this.buttonItemHX1_Click); + this.buttonItem12.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__34; + this.buttonItem12.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem12.Name = "buttonItem12"; + this.buttonItem12.SubItemsExpandWidth = 14; + this.buttonItem12.Text = "探测仪管理"; + this.buttonItem12.Click += new System.EventHandler(this.buttonItem12_Click); // - // buttonItemHX2 + // buttonItem13 // - this.buttonItemHX2.Image = ((System.Drawing.Image)(resources.GetObject("buttonItemHX2.Image"))); - this.buttonItemHX2.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItemHX2.Name = "buttonItemHX2"; - this.buttonItemHX2.SubItemsExpandWidth = 14; - this.buttonItemHX2.Text = "红线审核"; - this.buttonItemHX2.Click += new System.EventHandler(this.buttonItemHX2_Click); + this.buttonItem13.Image = global::Cyberpipe.Properties.Resources._24x24icon_13_hover; + this.buttonItem13.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem13.Name = "buttonItem13"; + this.buttonItem13.SubItemsExpandWidth = 14; + this.buttonItem13.Text = "巡检人员维护"; + this.buttonItem13.Click += new System.EventHandler(this.buttonItem13_Click); // - // buttonItemDCTP + // buttonItem14 // - this.buttonItemDCTP.Image = ((System.Drawing.Image)(resources.GetObject("buttonItemDCTP.Image"))); - this.buttonItemDCTP.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItemDCTP.Name = "buttonItemDCTP"; - this.buttonItemDCTP.SubItemsExpandWidth = 14; - this.buttonItemDCTP.Text = "导出图片"; - this.buttonItemDCTP.Click += new System.EventHandler(this.buttonItemDCTP_Click); - // - // sliderItem3 - // - this.sliderItem3.LabelPosition = DevComponents.DotNetBar.eSliderLabelPosition.Top; - this.sliderItem3.LabelWidth = 50; - this.sliderItem3.Name = "sliderItem3"; - this.sliderItem3.Text = "地面透明度"; - this.sliderItem3.TextColor = System.Drawing.Color.Black; - this.sliderItem3.Value = 0; - this.sliderItem3.ValueChanged += new System.EventHandler(this.sliderItem3_ValueChanged); - // - // ribbonPanel1 - // - this.ribbonPanel1.AutoSize = true; - this.ribbonPanel1.CanvasColor = System.Drawing.Color.Gray; - this.ribbonPanel1.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.ribbonPanel1.Controls.Add(this.ribbonBar21); - this.ribbonPanel1.Dock = System.Windows.Forms.DockStyle.Fill; - this.ribbonPanel1.Location = new System.Drawing.Point(0, 0); - this.ribbonPanel1.Name = "ribbonPanel1"; - this.ribbonPanel1.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); - this.ribbonPanel1.Size = new System.Drawing.Size(1328, 95); - // - // - // - this.ribbonPanel1.Style.Class = ""; - this.ribbonPanel1.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonPanel1.StyleMouseDown.Class = ""; - this.ribbonPanel1.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonPanel1.StyleMouseOver.Class = ""; - this.ribbonPanel1.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonPanel1.TabIndex = 1; - this.ribbonPanel1.Visible = false; - // - // ribbonBar21 - // - this.ribbonBar21.AutoOverflowEnabled = true; - this.ribbonBar21.BackColor = System.Drawing.Color.White; - // - // - // - this.ribbonBar21.BackgroundMouseOverStyle.Class = ""; - this.ribbonBar21.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonBar21.BackgroundStyle.Class = ""; - this.ribbonBar21.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonBar21.ContainerControlProcessDialogKey = true; - this.ribbonBar21.Dock = System.Windows.Forms.DockStyle.Left; - this.ribbonBar21.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { - this.buttonItem87, - this.buttonItem88, - this.buttonItem27, - this.sliderGroundTransSet1, - this.buttonItem91, - this.buttonItem1, - this.btnlegendSet, - this.buttonItem89, - this.btnOutputJPG}); - this.ribbonBar21.Location = new System.Drawing.Point(3, 0); - this.ribbonBar21.Name = "ribbonBar21"; - this.ribbonBar21.Size = new System.Drawing.Size(649, 92); - this.ribbonBar21.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.ribbonBar21.TabIndex = 2; - this.ribbonBar21.Text = "浏览模式"; - // - // - // - this.ribbonBar21.TitleStyle.Class = ""; - this.ribbonBar21.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonBar21.TitleStyleMouseOver.Class = ""; - this.ribbonBar21.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonBar21.TitleVisible = false; - // - // buttonItem87 - // - this.buttonItem87.Image = ((System.Drawing.Image)(resources.GetObject("buttonItem87.Image"))); - this.buttonItem87.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem87.Name = "buttonItem87"; - this.buttonItem87.SubItemsExpandWidth = 14; - this.buttonItem87.Text = "地上模式"; - this.buttonItem87.Click += new System.EventHandler(this.buttonItem87_Click); - // - // buttonItem88 - // - this.buttonItem88.Image = ((System.Drawing.Image)(resources.GetObject("buttonItem88.Image"))); - this.buttonItem88.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem88.Name = "buttonItem88"; - this.buttonItem88.SubItemsExpandWidth = 14; - this.buttonItem88.Text = "地下模式"; - this.buttonItem88.Click += new System.EventHandler(this.buttonItem88_Click); - // - // buttonItem27 - // - this.buttonItem27.Image = ((System.Drawing.Image)(resources.GetObject("buttonItem27.Image"))); - this.buttonItem27.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem27.Name = "buttonItem27"; - this.buttonItem27.SubItemsExpandWidth = 14; - this.buttonItem27.Text = "行走模式"; - this.buttonItem27.Click += new System.EventHandler(this.buttonItem27_Click); - // - // buttonItem91 - // - this.buttonItem91.ForeColor = System.Drawing.Color.Black; - this.buttonItem91.Image = ((System.Drawing.Image)(resources.GetObject("buttonItem91.Image"))); - this.buttonItem91.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem91.Name = "buttonItem91"; - this.buttonItem91.SubItemsExpandWidth = 14; - this.buttonItem91.Text = "快速定位"; - this.buttonItem91.Click += new System.EventHandler(this.buttonItem91_Click); - // - // buttonItem1 - // - this.buttonItem1.Image = ((System.Drawing.Image)(resources.GetObject("buttonItem1.Image"))); - this.buttonItem1.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem1.Name = "buttonItem1"; - this.buttonItem1.SubItemsExpandWidth = 14; - this.buttonItem1.Text = "图层管理"; - this.buttonItem1.Click += new System.EventHandler(this.buttonItem1_Click); - // - // btnlegendSet - // - this.btnlegendSet.Image = ((System.Drawing.Image)(resources.GetObject("btnlegendSet.Image"))); - this.btnlegendSet.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.btnlegendSet.Name = "btnlegendSet"; - this.btnlegendSet.SubItemsExpandWidth = 14; - this.btnlegendSet.Text = "图例"; - this.btnlegendSet.Click += new System.EventHandler(this.btnlegendSet_Click); - // - // buttonItem89 - // - this.buttonItem89.Image = ((System.Drawing.Image)(resources.GetObject("buttonItem89.Image"))); - this.buttonItem89.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem89.Name = "buttonItem89"; - this.buttonItem89.SubItemsExpandWidth = 14; - this.buttonItem89.Text = "全屏显示"; - this.buttonItem89.Click += new System.EventHandler(this.buttonItem89_Click); - // - // btnOutputJPG - // - this.btnOutputJPG.Image = ((System.Drawing.Image)(resources.GetObject("btnOutputJPG.Image"))); - this.btnOutputJPG.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.btnOutputJPG.Name = "btnOutputJPG"; - this.btnOutputJPG.SubItemsExpandWidth = 14; - this.btnOutputJPG.Text = "导出图片"; - this.btnOutputJPG.Click += new System.EventHandler(this.btnOutputJPG_Click); - // - // ribbonPanel12 - // - this.ribbonPanel12.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.ribbonPanel12.Controls.Add(this.ribbonBar18); - this.ribbonPanel12.Controls.Add(this.ribbonBar13); - this.ribbonPanel12.Dock = System.Windows.Forms.DockStyle.Fill; - this.ribbonPanel12.Location = new System.Drawing.Point(0, 0); - this.ribbonPanel12.Name = "ribbonPanel12"; - this.ribbonPanel12.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); - this.ribbonPanel12.Size = new System.Drawing.Size(1328, 95); - // - // - // - this.ribbonPanel12.Style.Class = ""; - this.ribbonPanel12.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonPanel12.StyleMouseDown.Class = ""; - this.ribbonPanel12.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonPanel12.StyleMouseOver.Class = ""; - this.ribbonPanel12.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonPanel12.TabIndex = 34; - this.ribbonPanel12.Visible = false; - // - // ribbonBar18 - // - this.ribbonBar18.AutoOverflowEnabled = true; - // - // - // - this.ribbonBar18.BackgroundMouseOverStyle.Class = ""; - this.ribbonBar18.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonBar18.BackgroundStyle.Class = ""; - this.ribbonBar18.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonBar18.ContainerControlProcessDialogKey = true; - this.ribbonBar18.Dock = System.Windows.Forms.DockStyle.Left; - this.ribbonBar18.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { - this.buttonItem133}); - this.ribbonBar18.Location = new System.Drawing.Point(531, 0); - this.ribbonBar18.Name = "ribbonBar18"; - this.ribbonBar18.Size = new System.Drawing.Size(129, 92); - this.ribbonBar18.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.ribbonBar18.TabIndex = 1; - // - // - // - this.ribbonBar18.TitleStyle.Class = ""; - this.ribbonBar18.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonBar18.TitleStyleMouseOver.Class = ""; - this.ribbonBar18.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonBar18.TitleVisible = false; - // - // buttonItem133 - // - this.buttonItem133.Image = ((System.Drawing.Image)(resources.GetObject("buttonItem133.Image"))); - this.buttonItem133.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem133.Name = "buttonItem133"; - this.buttonItem133.SubItemsExpandWidth = 14; - this.buttonItem133.Text = "审核入库"; - this.buttonItem133.Click += new System.EventHandler(this.buttonItem133_Click_1); - // - // ribbonBar13 - // - this.ribbonBar13.AutoOverflowEnabled = true; - // - // - // - this.ribbonBar13.BackgroundMouseOverStyle.Class = ""; - this.ribbonBar13.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonBar13.BackgroundStyle.Class = ""; - this.ribbonBar13.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonBar13.ContainerControlProcessDialogKey = true; - this.ribbonBar13.Dock = System.Windows.Forms.DockStyle.Left; - this.ribbonBar13.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { - this.buttonItem127, - this.buttonItem128, - this.sliderItem1, - this.buttonItem134, - this.buttonItem130, - this.btn_check_history}); - this.ribbonBar13.Location = new System.Drawing.Point(3, 0); - this.ribbonBar13.Name = "ribbonBar13"; - this.ribbonBar13.Size = new System.Drawing.Size(528, 92); - this.ribbonBar13.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.ribbonBar13.TabIndex = 0; - // - // - // - this.ribbonBar13.TitleStyle.Class = ""; - this.ribbonBar13.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonBar13.TitleStyleMouseOver.Class = ""; - this.ribbonBar13.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonBar13.TitleVisible = false; - // - // buttonItem127 - // - this.buttonItem127.Image = ((System.Drawing.Image)(resources.GetObject("buttonItem127.Image"))); - this.buttonItem127.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem127.Name = "buttonItem127"; - this.buttonItem127.SubItemsExpandWidth = 14; - this.buttonItem127.Text = "打开数据"; - this.buttonItem127.Click += new System.EventHandler(this.buttonItem127_Click_2); - // - // buttonItem128 - // - this.buttonItem128.Image = ((System.Drawing.Image)(resources.GetObject("buttonItem128.Image"))); - this.buttonItem128.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem128.Name = "buttonItem128"; - this.buttonItem128.SubItemsExpandWidth = 14; - this.buttonItem128.Text = "一键审核"; - this.buttonItem128.Click += new System.EventHandler(this.buttonItem128_Click); - // - // sliderItem1 - // - this.sliderItem1.LabelPosition = DevComponents.DotNetBar.eSliderLabelPosition.Top; - this.sliderItem1.LabelWidth = 50; - this.sliderItem1.Name = "sliderItem1"; - this.sliderItem1.Text = "地面透明度"; - this.sliderItem1.TextColor = System.Drawing.Color.Black; - this.sliderItem1.Value = 0; - this.sliderItem1.ValueChanged += new System.EventHandler(this.sliderItem1_ValueChanged); - // - // buttonItem134 - // - this.buttonItem134.Image = ((System.Drawing.Image)(resources.GetObject("buttonItem134.Image"))); - this.buttonItem134.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem134.Name = "buttonItem134"; - this.buttonItem134.SubItemsExpandWidth = 14; - this.buttonItem134.Text = "模拟设计修改"; - this.buttonItem134.Click += new System.EventHandler(this.buttonItem134_Click_1); - // - // buttonItem130 - // - this.buttonItem130.Image = ((System.Drawing.Image)(resources.GetObject("buttonItem130.Image"))); - this.buttonItem130.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem130.Name = "buttonItem130"; - this.buttonItem130.SubItemsExpandWidth = 14; - this.buttonItem130.Text = "导出审核图"; - this.buttonItem130.Click += new System.EventHandler(this.buttonItem130_Click_1); - // - // btn_check_history - // - this.btn_check_history.Image = ((System.Drawing.Image)(resources.GetObject("btn_check_history.Image"))); - this.btn_check_history.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.btn_check_history.Name = "btn_check_history"; - this.btn_check_history.SubItemsExpandWidth = 14; - this.btn_check_history.Text = "审核历史"; - this.btn_check_history.Click += new System.EventHandler(this.btn_check_history_Click); - // - // ribbonPanel4 - // - this.ribbonPanel4.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.ribbonPanel4.Controls.Add(this.ribbonBar1); - this.ribbonPanel4.Dock = System.Windows.Forms.DockStyle.Fill; - this.ribbonPanel4.Location = new System.Drawing.Point(0, 0); - this.ribbonPanel4.Name = "ribbonPanel4"; - this.ribbonPanel4.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); - this.ribbonPanel4.Size = new System.Drawing.Size(1328, 95); - // - // - // - this.ribbonPanel4.Style.Class = ""; - this.ribbonPanel4.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonPanel4.StyleMouseDown.Class = ""; - this.ribbonPanel4.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonPanel4.StyleMouseOver.Class = ""; - this.ribbonPanel4.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonPanel4.TabIndex = 36; - this.ribbonPanel4.Visible = false; - // - // ribbonBar1 - // - this.ribbonBar1.AutoOverflowEnabled = true; - // - // - // - this.ribbonBar1.BackgroundMouseOverStyle.Class = ""; - this.ribbonBar1.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonBar1.BackgroundStyle.Class = ""; - this.ribbonBar1.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonBar1.ContainerControlProcessDialogKey = true; - this.ribbonBar1.Dock = System.Windows.Forms.DockStyle.Left; - this.ribbonBar1.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { - this.btn_document_info}); - this.ribbonBar1.Location = new System.Drawing.Point(3, 0); - this.ribbonBar1.Name = "ribbonBar1"; - this.ribbonBar1.Size = new System.Drawing.Size(88, 92); - this.ribbonBar1.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.ribbonBar1.TabIndex = 0; - // - // - // - this.ribbonBar1.TitleStyle.Class = ""; - this.ribbonBar1.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonBar1.TitleStyleMouseOver.Class = ""; - this.ribbonBar1.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonBar1.TitleVisible = false; - // - // btn_document_info - // - this.btn_document_info.Image = ((System.Drawing.Image)(resources.GetObject("btn_document_info.Image"))); - this.btn_document_info.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.btn_document_info.Name = "btn_document_info"; - this.btn_document_info.SubItemsExpandWidth = 14; - this.btn_document_info.Text = "文档管理"; - this.btn_document_info.Click += new System.EventHandler(this.btn_document_info_Click); + this.buttonItem14.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__56; + this.buttonItem14.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem14.Name = "buttonItem14"; + this.buttonItem14.SubItemsExpandWidth = 14; + this.buttonItem14.Text = "导出施工图"; + this.buttonItem14.Click += new System.EventHandler(this.buttonItem14_Click); // // ribbonPanel15 // this.ribbonPanel15.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; this.ribbonPanel15.Controls.Add(this.ribbonBar20); this.ribbonPanel15.Dock = System.Windows.Forms.DockStyle.Fill; - this.ribbonPanel15.Location = new System.Drawing.Point(0, 0); + this.ribbonPanel15.Location = new System.Drawing.Point(0, 33); this.ribbonPanel15.Name = "ribbonPanel15"; this.ribbonPanel15.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); - this.ribbonPanel15.Size = new System.Drawing.Size(1328, 95); + this.ribbonPanel15.Size = new System.Drawing.Size(1328, 62); // // // @@ -2843,7 +2465,7 @@ this.buttonItemXTGL}); this.ribbonBar20.Location = new System.Drawing.Point(3, 0); this.ribbonBar20.Name = "ribbonBar20"; - this.ribbonBar20.Size = new System.Drawing.Size(283, 92); + this.ribbonBar20.Size = new System.Drawing.Size(283, 59); this.ribbonBar20.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; this.ribbonBar20.TabIndex = 0; // @@ -3274,216 +2896,15 @@ this.buttonItemXT4_2.Text = "人员修改"; this.buttonItemXT4_2.Click += new System.EventHandler(this.buttonItemXT4_2_Click); // - // ribbonPanel3 - // - this.ribbonPanel3.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.ribbonPanel3.Controls.Add(this.ribbonBar4); - this.ribbonPanel3.Dock = System.Windows.Forms.DockStyle.Fill; - this.ribbonPanel3.Location = new System.Drawing.Point(0, 33); - this.ribbonPanel3.Name = "ribbonPanel3"; - this.ribbonPanel3.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); - this.ribbonPanel3.Size = new System.Drawing.Size(1328, 62); - // - // - // - this.ribbonPanel3.Style.Class = ""; - this.ribbonPanel3.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonPanel3.StyleMouseDown.Class = ""; - this.ribbonPanel3.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonPanel3.StyleMouseOver.Class = ""; - this.ribbonPanel3.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonPanel3.TabIndex = 40; - // - // ribbonBar4 - // - this.ribbonBar4.AutoOverflowEnabled = true; - // - // - // - this.ribbonBar4.BackgroundMouseOverStyle.Class = ""; - this.ribbonBar4.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonBar4.BackgroundStyle.Class = ""; - this.ribbonBar4.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonBar4.ContainerControlProcessDialogKey = true; - this.ribbonBar4.Dock = System.Windows.Forms.DockStyle.Left; - this.ribbonBar4.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { - this.btn_flag, - this.slider4ground}); - this.ribbonBar4.Location = new System.Drawing.Point(3, 0); - this.ribbonBar4.Name = "ribbonBar4"; - this.ribbonBar4.Size = new System.Drawing.Size(321, 59); - this.ribbonBar4.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.ribbonBar4.TabIndex = 0; - // - // - // - this.ribbonBar4.TitleStyle.Class = ""; - this.ribbonBar4.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonBar4.TitleStyleMouseOver.Class = ""; - this.ribbonBar4.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonBar4.TitleVisible = false; - // - // btn_flag - // - this.btn_flag.Image = global::Cyberpipe.Properties.Resources._24x24icon_03_hover; - this.btn_flag.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.btn_flag.Name = "btn_flag"; - this.btn_flag.SubItemsExpandWidth = 14; - this.btn_flag.Text = "标识器管理"; - this.btn_flag.Click += new System.EventHandler(this.btn_flag_Click); - // - // slider4ground - // - this.slider4ground.LabelPosition = DevComponents.DotNetBar.eSliderLabelPosition.Top; - this.slider4ground.LabelWidth = 50; - this.slider4ground.Name = "slider4ground"; - this.slider4ground.Text = "地面透明度"; - this.slider4ground.TextColor = System.Drawing.Color.Black; - this.slider4ground.Value = 0; - this.slider4ground.ValueChanged += new System.EventHandler(this.slider4ground_ValueChanged); - // - // ribbonPanel7 - // - this.ribbonPanel7.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.ribbonPanel7.Controls.Add(this.gxdw_ribbonbar); - this.ribbonPanel7.Dock = System.Windows.Forms.DockStyle.Fill; - this.ribbonPanel7.Location = new System.Drawing.Point(0, 33); - this.ribbonPanel7.Name = "ribbonPanel7"; - this.ribbonPanel7.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); - this.ribbonPanel7.Size = new System.Drawing.Size(1328, 62); - // - // - // - this.ribbonPanel7.Style.Class = ""; - this.ribbonPanel7.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonPanel7.StyleMouseDown.Class = ""; - this.ribbonPanel7.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonPanel7.StyleMouseOver.Class = ""; - this.ribbonPanel7.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonPanel7.TabIndex = 41; - this.ribbonPanel7.Visible = false; - // - // gxdw_ribbonbar - // - this.gxdw_ribbonbar.AutoOverflowEnabled = true; - // - // - // - this.gxdw_ribbonbar.BackgroundMouseOverStyle.Class = ""; - this.gxdw_ribbonbar.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.gxdw_ribbonbar.BackgroundStyle.Class = ""; - this.gxdw_ribbonbar.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.gxdw_ribbonbar.ContainerControlProcessDialogKey = true; - this.gxdw_ribbonbar.Dock = System.Windows.Forms.DockStyle.Left; - this.gxdw_ribbonbar.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { - this.buttonItem9, - this.buttonItem10, - this.buttonItem11, - this.buttonItem12, - this.buttonItem13, - this.buttonItem14}); - this.gxdw_ribbonbar.Location = new System.Drawing.Point(3, 0); - this.gxdw_ribbonbar.Name = "gxdw_ribbonbar"; - this.gxdw_ribbonbar.Size = new System.Drawing.Size(522, 59); - this.gxdw_ribbonbar.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.gxdw_ribbonbar.TabIndex = 0; - this.gxdw_ribbonbar.Text = "ribbonBar5"; - // - // - // - this.gxdw_ribbonbar.TitleStyle.Class = ""; - this.gxdw_ribbonbar.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.gxdw_ribbonbar.TitleStyleMouseOver.Class = ""; - this.gxdw_ribbonbar.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.gxdw_ribbonbar.TitleVisible = false; - // - // buttonItem9 - // - this.buttonItem9.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__76; - this.buttonItem9.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem9.Name = "buttonItem9"; - this.buttonItem9.SubItemsExpandWidth = 14; - this.buttonItem9.Text = "工单管理"; - this.buttonItem9.Click += new System.EventHandler(this.buttonItem9_Click); - // - // buttonItem10 - // - this.buttonItem10.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__69; - this.buttonItem10.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem10.Name = "buttonItem10"; - this.buttonItem10.SubItemsExpandWidth = 14; - this.buttonItem10.Text = "在线任务"; - this.buttonItem10.Click += new System.EventHandler(this.buttonItem10_Click); - // - // buttonItem11 - // - this.buttonItem11.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__72; - this.buttonItem11.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem11.Name = "buttonItem11"; - this.buttonItem11.SubItemsExpandWidth = 14; - this.buttonItem11.Text = "事件管理"; - this.buttonItem11.Click += new System.EventHandler(this.buttonItem11_Click); - // - // buttonItem12 - // - this.buttonItem12.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__34; - this.buttonItem12.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem12.Name = "buttonItem12"; - this.buttonItem12.SubItemsExpandWidth = 14; - this.buttonItem12.Text = "探测仪管理"; - this.buttonItem12.Click += new System.EventHandler(this.buttonItem12_Click); - // - // buttonItem13 - // - this.buttonItem13.Image = global::Cyberpipe.Properties.Resources._24x24icon_13_hover; - this.buttonItem13.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem13.Name = "buttonItem13"; - this.buttonItem13.SubItemsExpandWidth = 14; - this.buttonItem13.Text = "巡检人员维护"; - this.buttonItem13.Click += new System.EventHandler(this.buttonItem13_Click); - // - // buttonItem14 - // - this.buttonItem14.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__56; - this.buttonItem14.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem14.Name = "buttonItem14"; - this.buttonItem14.SubItemsExpandWidth = 14; - this.buttonItem14.Text = "导出施工图"; - this.buttonItem14.Click += new System.EventHandler(this.buttonItem14_Click); - // // ribbonPanel2 // this.ribbonPanel2.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; this.ribbonPanel2.Controls.Add(this.ribbonBar3); this.ribbonPanel2.Dock = System.Windows.Forms.DockStyle.Fill; - this.ribbonPanel2.Location = new System.Drawing.Point(0, 33); + this.ribbonPanel2.Location = new System.Drawing.Point(0, 0); this.ribbonPanel2.Name = "ribbonPanel2"; this.ribbonPanel2.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); - this.ribbonPanel2.Size = new System.Drawing.Size(1328, 62); + this.ribbonPanel2.Size = new System.Drawing.Size(1328, 95); // // // @@ -3527,7 +2948,7 @@ this.buttonItemPasswordReset}); this.ribbonBar3.Location = new System.Drawing.Point(3, 0); this.ribbonBar3.Name = "ribbonBar3"; - this.ribbonBar3.Size = new System.Drawing.Size(551, 59); + this.ribbonBar3.Size = new System.Drawing.Size(551, 92); this.ribbonBar3.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; this.ribbonBar3.TabIndex = 1; // @@ -3567,6 +2988,7 @@ this.btn_resc_info.Name = "btn_resc_info"; this.btn_resc_info.SubItemsExpandWidth = 14; this.btn_resc_info.Text = "资源管理"; + this.btn_resc_info.Visible = false; this.btn_resc_info.Click += new System.EventHandler(this.btn_resc_info_Click); // // btn_role_resc @@ -3605,6 +3027,605 @@ this.buttonItemPasswordReset.Text = "重置密码"; this.buttonItemPasswordReset.Click += new System.EventHandler(this.buttonItemPasswordReset_Click); // + // ribbonPanel6 + // + this.ribbonPanel6.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.ribbonPanel6.Controls.Add(this.ribbonBar6); + this.ribbonPanel6.Dock = System.Windows.Forms.DockStyle.Fill; + this.ribbonPanel6.Location = new System.Drawing.Point(0, 0); + this.ribbonPanel6.Name = "ribbonPanel6"; + this.ribbonPanel6.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); + this.ribbonPanel6.Size = new System.Drawing.Size(1328, 95); + // + // + // + this.ribbonPanel6.Style.Class = ""; + this.ribbonPanel6.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonPanel6.StyleMouseDown.Class = ""; + this.ribbonPanel6.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonPanel6.StyleMouseOver.Class = ""; + this.ribbonPanel6.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonPanel6.TabIndex = 38; + this.ribbonPanel6.Visible = false; + // + // ribbonBar6 + // + this.ribbonBar6.AutoOverflowEnabled = true; + // + // + // + this.ribbonBar6.BackgroundMouseOverStyle.Class = ""; + this.ribbonBar6.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonBar6.BackgroundStyle.Class = ""; + this.ribbonBar6.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar6.ContainerControlProcessDialogKey = true; + this.ribbonBar6.Dock = System.Windows.Forms.DockStyle.Left; + this.ribbonBar6.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { + this.buttonItemSPSZ, + this.buttonItem8, + this.buttonItemLocation, + this.sliderItem2, + this.buttonItemGBJC}); + this.ribbonBar6.Location = new System.Drawing.Point(3, 0); + this.ribbonBar6.Name = "ribbonBar6"; + this.ribbonBar6.Size = new System.Drawing.Size(427, 92); + this.ribbonBar6.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.ribbonBar6.TabIndex = 0; + // + // + // + this.ribbonBar6.TitleStyle.Class = ""; + this.ribbonBar6.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonBar6.TitleStyleMouseOver.Class = ""; + this.ribbonBar6.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar6.TitleVisible = false; + // + // buttonItemSPSZ + // + this.buttonItemSPSZ.Image = ((System.Drawing.Image)(resources.GetObject("buttonItemSPSZ.Image"))); + this.buttonItemSPSZ.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItemSPSZ.Name = "buttonItemSPSZ"; + this.buttonItemSPSZ.SubItemsExpandWidth = 14; + this.buttonItemSPSZ.Text = "双屏设置"; + this.buttonItemSPSZ.Click += new System.EventHandler(this.buttonItemSPSZ_Click); + // + // buttonItem8 + // + this.buttonItem8.Image = ((System.Drawing.Image)(resources.GetObject("buttonItem8.Image"))); + this.buttonItem8.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem8.Name = "buttonItem8"; + this.buttonItem8.SubItemsExpandWidth = 14; + this.buttonItem8.Text = "双屏分析"; + this.buttonItem8.Click += new System.EventHandler(this.buttonItem8_Click); + // + // buttonItemLocation + // + this.buttonItemLocation.Image = ((System.Drawing.Image)(resources.GetObject("buttonItemLocation.Image"))); + this.buttonItemLocation.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItemLocation.Name = "buttonItemLocation"; + this.buttonItemLocation.SubItemsExpandWidth = 14; + this.buttonItemLocation.Text = "快速定位"; + this.buttonItemLocation.Click += new System.EventHandler(this.buttonItemLocation_Click); + // + // sliderItem2 + // + this.sliderItem2.LabelPosition = DevComponents.DotNetBar.eSliderLabelPosition.Top; + this.sliderItem2.LabelWidth = 50; + this.sliderItem2.Name = "sliderItem2"; + this.sliderItem2.Text = "地面透明度"; + this.sliderItem2.TextColor = System.Drawing.Color.Black; + this.sliderItem2.Value = 0; + this.sliderItem2.ValueChanged += new System.EventHandler(this.sliderItem2_ValueChanged); + // + // buttonItemGBJC + // + this.buttonItemGBJC.Image = ((System.Drawing.Image)(resources.GetObject("buttonItemGBJC.Image"))); + this.buttonItemGBJC.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItemGBJC.Name = "buttonItemGBJC"; + this.buttonItemGBJC.SubItemsExpandWidth = 14; + this.buttonItemGBJC.Text = "国标检测"; + this.buttonItemGBJC.Click += new System.EventHandler(this.buttonItemGBJC_Click); + // + // ribbonPanel5 + // + this.ribbonPanel5.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.ribbonPanel5.Controls.Add(this.ribbonBar2); + this.ribbonPanel5.Dock = System.Windows.Forms.DockStyle.Fill; + this.ribbonPanel5.Location = new System.Drawing.Point(0, 33); + this.ribbonPanel5.Name = "ribbonPanel5"; + this.ribbonPanel5.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); + this.ribbonPanel5.Size = new System.Drawing.Size(1328, 62); + // + // + // + this.ribbonPanel5.Style.Class = ""; + this.ribbonPanel5.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonPanel5.StyleMouseDown.Class = ""; + this.ribbonPanel5.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonPanel5.StyleMouseOver.Class = ""; + this.ribbonPanel5.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonPanel5.TabIndex = 37; + this.ribbonPanel5.Visible = false; + // + // ribbonBar2 + // + this.ribbonBar2.AutoOverflowEnabled = true; + // + // + // + this.ribbonBar2.BackgroundMouseOverStyle.Class = ""; + this.ribbonBar2.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonBar2.BackgroundStyle.Class = ""; + this.ribbonBar2.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar2.ContainerControlProcessDialogKey = true; + this.ribbonBar2.Dock = System.Windows.Forms.DockStyle.Left; + this.ribbonBar2.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { + this.buttonItemHX1, + this.buttonItemHX2, + this.buttonItemDCTP, + this.sliderItem3}); + this.ribbonBar2.Location = new System.Drawing.Point(3, 0); + this.ribbonBar2.Name = "ribbonBar2"; + this.ribbonBar2.Size = new System.Drawing.Size(350, 59); + this.ribbonBar2.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.ribbonBar2.TabIndex = 0; + // + // + // + this.ribbonBar2.TitleStyle.Class = ""; + this.ribbonBar2.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonBar2.TitleStyleMouseOver.Class = ""; + this.ribbonBar2.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar2.TitleVisible = false; + // + // buttonItemHX1 + // + this.buttonItemHX1.AutoExpandOnClick = true; + this.buttonItemHX1.Image = ((System.Drawing.Image)(resources.GetObject("buttonItemHX1.Image"))); + this.buttonItemHX1.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItemHX1.Name = "buttonItemHX1"; + this.buttonItemHX1.SubItemsExpandWidth = 14; + this.buttonItemHX1.Text = "导入红线"; + this.buttonItemHX1.Click += new System.EventHandler(this.buttonItemHX1_Click); + // + // buttonItemHX2 + // + this.buttonItemHX2.Image = ((System.Drawing.Image)(resources.GetObject("buttonItemHX2.Image"))); + this.buttonItemHX2.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItemHX2.Name = "buttonItemHX2"; + this.buttonItemHX2.SubItemsExpandWidth = 14; + this.buttonItemHX2.Text = "红线审核"; + this.buttonItemHX2.Click += new System.EventHandler(this.buttonItemHX2_Click); + // + // buttonItemDCTP + // + this.buttonItemDCTP.Image = ((System.Drawing.Image)(resources.GetObject("buttonItemDCTP.Image"))); + this.buttonItemDCTP.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItemDCTP.Name = "buttonItemDCTP"; + this.buttonItemDCTP.SubItemsExpandWidth = 14; + this.buttonItemDCTP.Text = "导出图片"; + this.buttonItemDCTP.Click += new System.EventHandler(this.buttonItemDCTP_Click); + // + // sliderItem3 + // + this.sliderItem3.LabelPosition = DevComponents.DotNetBar.eSliderLabelPosition.Top; + this.sliderItem3.LabelWidth = 50; + this.sliderItem3.Name = "sliderItem3"; + this.sliderItem3.Text = "地面透明度"; + this.sliderItem3.TextColor = System.Drawing.Color.Black; + this.sliderItem3.Value = 0; + this.sliderItem3.ValueChanged += new System.EventHandler(this.sliderItem3_ValueChanged); + // + // ribbonPanel1 + // + this.ribbonPanel1.AutoSize = true; + this.ribbonPanel1.CanvasColor = System.Drawing.Color.Gray; + this.ribbonPanel1.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.ribbonPanel1.Controls.Add(this.ribbonBar21); + this.ribbonPanel1.Dock = System.Windows.Forms.DockStyle.Fill; + this.ribbonPanel1.Location = new System.Drawing.Point(0, 33); + this.ribbonPanel1.Name = "ribbonPanel1"; + this.ribbonPanel1.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); + this.ribbonPanel1.Size = new System.Drawing.Size(1328, 62); + // + // + // + this.ribbonPanel1.Style.Class = ""; + this.ribbonPanel1.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonPanel1.StyleMouseDown.Class = ""; + this.ribbonPanel1.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonPanel1.StyleMouseOver.Class = ""; + this.ribbonPanel1.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonPanel1.TabIndex = 1; + this.ribbonPanel1.Visible = false; + // + // ribbonBar21 + // + this.ribbonBar21.AutoOverflowEnabled = true; + this.ribbonBar21.BackColor = System.Drawing.Color.White; + // + // + // + this.ribbonBar21.BackgroundMouseOverStyle.Class = ""; + this.ribbonBar21.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonBar21.BackgroundStyle.Class = ""; + this.ribbonBar21.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar21.ContainerControlProcessDialogKey = true; + this.ribbonBar21.Dock = System.Windows.Forms.DockStyle.Left; + this.ribbonBar21.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { + this.buttonItem87, + this.buttonItem88, + this.buttonItem27, + this.sliderGroundTransSet1, + this.buttonItem91, + this.buttonItem1, + this.btnlegendSet, + this.buttonItem89, + this.btnOutputJPG}); + this.ribbonBar21.Location = new System.Drawing.Point(3, 0); + this.ribbonBar21.Name = "ribbonBar21"; + this.ribbonBar21.Size = new System.Drawing.Size(649, 59); + this.ribbonBar21.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.ribbonBar21.TabIndex = 2; + this.ribbonBar21.Text = "浏览模式"; + // + // + // + this.ribbonBar21.TitleStyle.Class = ""; + this.ribbonBar21.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonBar21.TitleStyleMouseOver.Class = ""; + this.ribbonBar21.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar21.TitleVisible = false; + // + // buttonItem87 + // + this.buttonItem87.Image = ((System.Drawing.Image)(resources.GetObject("buttonItem87.Image"))); + this.buttonItem87.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem87.Name = "buttonItem87"; + this.buttonItem87.SubItemsExpandWidth = 14; + this.buttonItem87.Text = "地上模式"; + this.buttonItem87.Click += new System.EventHandler(this.buttonItem87_Click); + // + // buttonItem88 + // + this.buttonItem88.Image = ((System.Drawing.Image)(resources.GetObject("buttonItem88.Image"))); + this.buttonItem88.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem88.Name = "buttonItem88"; + this.buttonItem88.SubItemsExpandWidth = 14; + this.buttonItem88.Text = "地下模式"; + this.buttonItem88.Click += new System.EventHandler(this.buttonItem88_Click); + // + // buttonItem27 + // + this.buttonItem27.Image = ((System.Drawing.Image)(resources.GetObject("buttonItem27.Image"))); + this.buttonItem27.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem27.Name = "buttonItem27"; + this.buttonItem27.SubItemsExpandWidth = 14; + this.buttonItem27.Text = "行走模式"; + this.buttonItem27.Click += new System.EventHandler(this.buttonItem27_Click); + // + // buttonItem91 + // + this.buttonItem91.ForeColor = System.Drawing.Color.Black; + this.buttonItem91.Image = ((System.Drawing.Image)(resources.GetObject("buttonItem91.Image"))); + this.buttonItem91.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem91.Name = "buttonItem91"; + this.buttonItem91.SubItemsExpandWidth = 14; + this.buttonItem91.Text = "快速定位"; + this.buttonItem91.Click += new System.EventHandler(this.buttonItem91_Click); + // + // buttonItem1 + // + this.buttonItem1.Image = ((System.Drawing.Image)(resources.GetObject("buttonItem1.Image"))); + this.buttonItem1.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem1.Name = "buttonItem1"; + this.buttonItem1.SubItemsExpandWidth = 14; + this.buttonItem1.Text = "图层管理"; + this.buttonItem1.Click += new System.EventHandler(this.buttonItem1_Click); + // + // btnlegendSet + // + this.btnlegendSet.Image = ((System.Drawing.Image)(resources.GetObject("btnlegendSet.Image"))); + this.btnlegendSet.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.btnlegendSet.Name = "btnlegendSet"; + this.btnlegendSet.SubItemsExpandWidth = 14; + this.btnlegendSet.Text = "图例"; + this.btnlegendSet.Click += new System.EventHandler(this.btnlegendSet_Click); + // + // buttonItem89 + // + this.buttonItem89.Image = ((System.Drawing.Image)(resources.GetObject("buttonItem89.Image"))); + this.buttonItem89.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem89.Name = "buttonItem89"; + this.buttonItem89.SubItemsExpandWidth = 14; + this.buttonItem89.Text = "全屏显示"; + this.buttonItem89.Click += new System.EventHandler(this.buttonItem89_Click); + // + // btnOutputJPG + // + this.btnOutputJPG.Image = ((System.Drawing.Image)(resources.GetObject("btnOutputJPG.Image"))); + this.btnOutputJPG.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.btnOutputJPG.Name = "btnOutputJPG"; + this.btnOutputJPG.SubItemsExpandWidth = 14; + this.btnOutputJPG.Text = "导出图片"; + this.btnOutputJPG.Click += new System.EventHandler(this.btnOutputJPG_Click); + // + // ribbonPanel12 + // + this.ribbonPanel12.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.ribbonPanel12.Controls.Add(this.ribbonBar18); + this.ribbonPanel12.Controls.Add(this.ribbonBar13); + this.ribbonPanel12.Dock = System.Windows.Forms.DockStyle.Fill; + this.ribbonPanel12.Location = new System.Drawing.Point(0, 33); + this.ribbonPanel12.Name = "ribbonPanel12"; + this.ribbonPanel12.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); + this.ribbonPanel12.Size = new System.Drawing.Size(1328, 62); + // + // + // + this.ribbonPanel12.Style.Class = ""; + this.ribbonPanel12.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonPanel12.StyleMouseDown.Class = ""; + this.ribbonPanel12.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonPanel12.StyleMouseOver.Class = ""; + this.ribbonPanel12.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonPanel12.TabIndex = 34; + this.ribbonPanel12.Visible = false; + // + // ribbonBar18 + // + this.ribbonBar18.AutoOverflowEnabled = true; + // + // + // + this.ribbonBar18.BackgroundMouseOverStyle.Class = ""; + this.ribbonBar18.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonBar18.BackgroundStyle.Class = ""; + this.ribbonBar18.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar18.ContainerControlProcessDialogKey = true; + this.ribbonBar18.Dock = System.Windows.Forms.DockStyle.Left; + this.ribbonBar18.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { + this.buttonItem133, + this.buttonItem132}); + this.ribbonBar18.Location = new System.Drawing.Point(508, 0); + this.ribbonBar18.Name = "ribbonBar18"; + this.ribbonBar18.Size = new System.Drawing.Size(75, 59); + this.ribbonBar18.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.ribbonBar18.TabIndex = 1; + // + // + // + this.ribbonBar18.TitleStyle.Class = ""; + this.ribbonBar18.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonBar18.TitleStyleMouseOver.Class = ""; + this.ribbonBar18.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar18.TitleVisible = false; + // + // buttonItem133 + // + this.buttonItem133.Image = ((System.Drawing.Image)(resources.GetObject("buttonItem133.Image"))); + this.buttonItem133.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem133.Name = "buttonItem133"; + this.buttonItem133.SubItemsExpandWidth = 14; + this.buttonItem133.Text = "审核入库"; + this.buttonItem133.Click += new System.EventHandler(this.buttonItem133_Click_1); + // + // buttonItem132 + // + this.buttonItem132.Name = "buttonItem132"; + // + // ribbonBar13 + // + this.ribbonBar13.AutoOverflowEnabled = true; + // + // + // + this.ribbonBar13.BackgroundMouseOverStyle.Class = ""; + this.ribbonBar13.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonBar13.BackgroundStyle.Class = ""; + this.ribbonBar13.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar13.ContainerControlProcessDialogKey = true; + this.ribbonBar13.Dock = System.Windows.Forms.DockStyle.Left; + this.ribbonBar13.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { + this.buttonItem127, + this.buttonItem128, + this.sliderItem1, + this.buttonItem134, + this.buttonItem130, + this.btn_check_history}); + this.ribbonBar13.Location = new System.Drawing.Point(3, 0); + this.ribbonBar13.Name = "ribbonBar13"; + this.ribbonBar13.Size = new System.Drawing.Size(505, 59); + this.ribbonBar13.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.ribbonBar13.TabIndex = 0; + // + // + // + this.ribbonBar13.TitleStyle.Class = ""; + this.ribbonBar13.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonBar13.TitleStyleMouseOver.Class = ""; + this.ribbonBar13.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar13.TitleVisible = false; + // + // buttonItem127 + // + this.buttonItem127.Image = ((System.Drawing.Image)(resources.GetObject("buttonItem127.Image"))); + this.buttonItem127.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem127.Name = "buttonItem127"; + this.buttonItem127.SubItemsExpandWidth = 14; + this.buttonItem127.Text = "打开数据"; + this.buttonItem127.Click += new System.EventHandler(this.buttonItem127_Click_2); + // + // buttonItem128 + // + this.buttonItem128.Image = ((System.Drawing.Image)(resources.GetObject("buttonItem128.Image"))); + this.buttonItem128.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem128.Name = "buttonItem128"; + this.buttonItem128.SubItemsExpandWidth = 14; + this.buttonItem128.Text = "一键审核"; + this.buttonItem128.Click += new System.EventHandler(this.buttonItem128_Click); + // + // sliderItem1 + // + this.sliderItem1.LabelPosition = DevComponents.DotNetBar.eSliderLabelPosition.Top; + this.sliderItem1.LabelWidth = 50; + this.sliderItem1.Name = "sliderItem1"; + this.sliderItem1.Text = "地面透明度"; + this.sliderItem1.TextColor = System.Drawing.Color.Black; + this.sliderItem1.Value = 0; + this.sliderItem1.ValueChanged += new System.EventHandler(this.sliderItem1_ValueChanged); + // + // buttonItem134 + // + this.buttonItem134.Image = ((System.Drawing.Image)(resources.GetObject("buttonItem134.Image"))); + this.buttonItem134.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem134.Name = "buttonItem134"; + this.buttonItem134.SubItemsExpandWidth = 14; + this.buttonItem134.Text = "模拟设计修改"; + this.buttonItem134.Click += new System.EventHandler(this.buttonItem134_Click_1); + // + // buttonItem130 + // + this.buttonItem130.Image = ((System.Drawing.Image)(resources.GetObject("buttonItem130.Image"))); + this.buttonItem130.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem130.Name = "buttonItem130"; + this.buttonItem130.SubItemsExpandWidth = 14; + this.buttonItem130.Text = "导出审核图"; + this.buttonItem130.Click += new System.EventHandler(this.buttonItem130_Click_1); + // + // btn_check_history + // + this.btn_check_history.Image = ((System.Drawing.Image)(resources.GetObject("btn_check_history.Image"))); + this.btn_check_history.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.btn_check_history.Name = "btn_check_history"; + this.btn_check_history.SubItemsExpandWidth = 14; + this.btn_check_history.Text = "审核历史"; + this.btn_check_history.Click += new System.EventHandler(this.btn_check_history_Click); + // + // ribbonPanel4 + // + this.ribbonPanel4.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.ribbonPanel4.Controls.Add(this.ribbonBar1); + this.ribbonPanel4.Dock = System.Windows.Forms.DockStyle.Fill; + this.ribbonPanel4.Location = new System.Drawing.Point(0, 33); + this.ribbonPanel4.Name = "ribbonPanel4"; + this.ribbonPanel4.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); + this.ribbonPanel4.Size = new System.Drawing.Size(1328, 62); + // + // + // + this.ribbonPanel4.Style.Class = ""; + this.ribbonPanel4.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonPanel4.StyleMouseDown.Class = ""; + this.ribbonPanel4.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonPanel4.StyleMouseOver.Class = ""; + this.ribbonPanel4.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonPanel4.TabIndex = 36; + this.ribbonPanel4.Visible = false; + // + // ribbonBar1 + // + this.ribbonBar1.AutoOverflowEnabled = true; + // + // + // + this.ribbonBar1.BackgroundMouseOverStyle.Class = ""; + this.ribbonBar1.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonBar1.BackgroundStyle.Class = ""; + this.ribbonBar1.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar1.ContainerControlProcessDialogKey = true; + this.ribbonBar1.Dock = System.Windows.Forms.DockStyle.Left; + this.ribbonBar1.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { + this.btn_document_info}); + this.ribbonBar1.Location = new System.Drawing.Point(3, 0); + this.ribbonBar1.Name = "ribbonBar1"; + this.ribbonBar1.Size = new System.Drawing.Size(88, 59); + this.ribbonBar1.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.ribbonBar1.TabIndex = 0; + // + // + // + this.ribbonBar1.TitleStyle.Class = ""; + this.ribbonBar1.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonBar1.TitleStyleMouseOver.Class = ""; + this.ribbonBar1.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar1.TitleVisible = false; + // + // btn_document_info + // + this.btn_document_info.Image = ((System.Drawing.Image)(resources.GetObject("btn_document_info.Image"))); + this.btn_document_info.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.btn_document_info.Name = "btn_document_info"; + this.btn_document_info.SubItemsExpandWidth = 14; + this.btn_document_info.Text = "文档管理"; + this.btn_document_info.Click += new System.EventHandler(this.btn_document_info_Click); + // // ribbonTabItem1 // this.ribbonTabItem1.ButtonStyle = DevComponents.DotNetBar.eButtonStyle.ImageAndText; @@ -3673,7 +3694,6 @@ this.ribbonTabItem7.Name = "ribbonTabItem7"; this.ribbonTabItem7.Panel = this.ribbonPanel7; this.ribbonTabItem7.Text = "管线定位"; - this.ribbonTabItem7.MouseDown += new System.Windows.Forms.MouseEventHandler(this.ribbonTabItem7_MouseDown); // // ribbonTabItem5 // @@ -3684,7 +3704,6 @@ this.ribbonTabItem5.Name = "ribbonTabItem5"; this.ribbonTabItem5.Panel = this.ribbonPanel3; this.ribbonTabItem5.Text = "标识器管理"; - this.ribbonTabItem5.MouseDown += new System.Windows.Forms.MouseEventHandler(this.ribbonTabItem5_MouseDown); // // ribbonTabItem2 // @@ -4451,7 +4470,7 @@ this.dataGridViewX2.ReadOnly = true; this.dataGridViewX2.RowHeadersVisible = false; this.dataGridViewX2.RowTemplate.Height = 23; - this.dataGridViewX2.Size = new System.Drawing.Size(31081, 92); + this.dataGridViewX2.Size = new System.Drawing.Size(31378, 92); this.dataGridViewX2.TabIndex = 11; // // dataGridViewTextBoxColumn10 @@ -4545,7 +4564,7 @@ this.dataGridViewX3.ReadOnly = true; this.dataGridViewX3.RowHeadersVisible = false; this.dataGridViewX3.RowTemplate.Height = 23; - this.dataGridViewX3.Size = new System.Drawing.Size(31080, 127); + this.dataGridViewX3.Size = new System.Drawing.Size(31377, 127); this.dataGridViewX3.TabIndex = 5; this.dataGridViewX3.MouseDoubleClick += new System.Windows.Forms.MouseEventHandler(this.dataGridViewX3_MouseDoubleClick); // @@ -5722,7 +5741,8 @@ // pictureBox1 // this.pictureBox1.Dock = System.Windows.Forms.DockStyle.Top; - this.pictureBox1.Image = ((System.Drawing.Image)(resources.GetObject("pictureBox1.Image"))); +// this.pictureBox1.Image = ((System.Drawing.Image)(resources.GetObject("pictureBox1.Image"))); + this.pictureBox1.Image = Image.FromFile(Application.StartupPath + Utility.TitleImagePath); this.pictureBox1.Location = new System.Drawing.Point(0, 0); this.pictureBox1.Margin = new System.Windows.Forms.Padding(0); this.pictureBox1.Name = "pictureBox1"; @@ -5732,18 +5752,6 @@ this.pictureBox1.TabStop = false; this.pictureBox1.Paint += new System.Windows.Forms.PaintEventHandler(this.pictureBox1_Paint); // - // layerTree - // - this.layerTree.CheckBoxes = true; - this.layerTree.ItemHeight = 18; - this.layerTree.Location = new System.Drawing.Point(30, 78); - this.layerTree.Name = "layerTree"; - this.layerTree.Size = new System.Drawing.Size(121, 97); - this.layerTree.TabIndex = 1; - this.layerTree.AfterCheck += new System.Windows.Forms.TreeViewEventHandler(this.layerTree_AfterCheck); - this.layerTree.NodeMouseClick += new System.Windows.Forms.TreeNodeMouseClickEventHandler(this.layerTree_NodeMouseClick); - this.layerTree.NodeMouseDoubleClick += new System.Windows.Forms.TreeNodeMouseClickEventHandler(this.layerTree_NodeMouseDoubleClick); - // // MainFrm // this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Inherit; @@ -5770,7 +5778,8 @@ this.KeyPreview = true; this.Name = "MainFrm"; this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen; - this.Text = "智慧太湖新城管网规划分析系统6.0"; +// this.Text = "智慧太湖新城管网规划分析系统6.0"; + this.Text = Utility.SysnameVersion; this.WindowState = System.Windows.Forms.FormWindowState.Maximized; this.FormClosing += new System.Windows.Forms.FormClosingEventHandler(this.MainFrm_FormClosing); this.Load += new System.EventHandler(this.MainFrm_Load); @@ -5787,15 +5796,15 @@ this.contextMenuStripDeleteLayerNode.ResumeLayout(false); this.ribbonControl1.ResumeLayout(false); this.ribbonControl1.PerformLayout(); + this.ribbonPanel3.ResumeLayout(false); + this.ribbonPanel7.ResumeLayout(false); + this.ribbonPanel15.ResumeLayout(false); + this.ribbonPanel2.ResumeLayout(false); this.ribbonPanel6.ResumeLayout(false); this.ribbonPanel5.ResumeLayout(false); this.ribbonPanel1.ResumeLayout(false); this.ribbonPanel12.ResumeLayout(false); this.ribbonPanel4.ResumeLayout(false); - this.ribbonPanel15.ResumeLayout(false); - this.ribbonPanel3.ResumeLayout(false); - this.ribbonPanel7.ResumeLayout(false); - this.ribbonPanel2.ResumeLayout(false); this.panelOfTable.ResumeLayout(false); this.panelOfTable.PerformLayout(); ((System.ComponentModel.ISupportInitialize)(this.dataGridViewX1)).EndInit(); @@ -5955,6 +5964,7 @@ private RibbonTabItem ribbonTabItem11; private ButtonItem buttonItem130; private RibbonBar ribbonBar18; + private ButtonItem buttonItem132; private SliderItem sliderItem1; private ButtonItem buttonItem133; private ButtonItem buttonItem134; diff --git a/MainFrm.resx b/MainFrm.resx index 9f9bba4..ce490c1 100644 --- a/MainFrm.resx +++ b/MainFrm.resx @@ -351,6 +351,146 @@ 766, 54 + + + iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 + YQUAAAAZdEVYdFNvZnR3YXJlAEFkb2JlIEltYWdlUmVhZHlxyWU8AAADZmlUWHRYTUw6Y29tLmFkb2Jl + LnhtcAAAAAAAPD94cGFja2V0IGJlZ2luPSLvu78iIGlkPSJXNU0wTXBDZWhpSHpyZVN6TlRjemtjOWQi + Pz4gPHg6eG1wbWV0YSB4bWxuczp4PSJhZG9iZTpuczptZXRhLyIgeDp4bXB0az0iQWRvYmUgWE1QIENv + cmUgNS4zLWMwMTEgNjYuMTQ1NjYxLCAyMDEyLzAyLzA2LTE0OjU2OjI3ICAgICAgICAiPiA8cmRmOlJE + RiB4bWxuczpyZGY9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkvMDIvMjItcmRmLXN5bnRheC1ucyMiPiA8 + cmRmOkRlc2NyaXB0aW9uIHJkZjphYm91dD0iIiB4bWxuczp4bXBNTT0iaHR0cDovL25zLmFkb2JlLmNv + bS94YXAvMS4wL21tLyIgeG1sbnM6c3RSZWY9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlw + ZS9SZXNvdXJjZVJlZiMiIHhtbG5zOnhtcD0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wLyIgeG1w + TU06T3JpZ2luYWxEb2N1bWVudElEPSJ4bXAuZGlkOjYzQTM5NEY4Mjg0OUU0MTE5NDBEQTc4ODZEQzk5 + N0NGIiB4bXBNTTpEb2N1bWVudElEPSJ4bXAuZGlkOjEwQ0IxNzBBNEM1QzExRTRBNkNGQzRBMjhDQzI0 + MkY4IiB4bXBNTTpJbnN0YW5jZUlEPSJ4bXAuaWlkOjEwQ0IxNzA5NEM1QzExRTRBNkNGQzRBMjhDQzI0 + MkY4IiB4bXA6Q3JlYXRvclRvb2w9IkFkb2JlIFBob3Rvc2hvcCBDUzYgKFdpbmRvd3MpIj4gPHhtcE1N + OkRlcml2ZWRGcm9tIHN0UmVmOmluc3RhbmNlSUQ9InhtcC5paWQ6NTEzMDNDMjA1QjRDRTQxMTg4NERE + MUVBOEQ4QTgyNTUiIHN0UmVmOmRvY3VtZW50SUQ9InhtcC5kaWQ6NjNBMzk0RjgyODQ5RTQxMTk0MERB + Nzg4NkRDOTk3Q0YiLz4gPC9yZGY6RGVzY3JpcHRpb24+IDwvcmRmOlJERj4gPC94OnhtcG1ldGE+IDw/ + eHBhY2tldCBlbmQ9InIiPz43wa2/AAAFaUlEQVRIS6WUC0xTVxzGKy0UkSmlFGjBFilSkNpSaAWRh63y + sIiAArKs4spLRLQoiEJlSMGoMCc6CBOnYHzMOHUqqOhEHOqCbjNu6kCd6KYje5mZ6KbObd/OuVL3cEzj + /skv997/+b7v39PTW9aj3/BM+OKxPEIZoW/gyrOuPbP+GvRPSNBQQqXYLwSW1etw7cYt5kqfaZ+uD8QM + Xg8f/f4UxGhHMHv4qlG6vAb9394G6T+BPpdV1oCuUx3VD8Q9XT8//PUJRMghlLhLg1C41IK+r/pB+oNC + 16mO6qmP+gdi/6y793+hwTYEk9uoQOSaStHzxQ2Q/nND9XMKy0D9NIfmDcSzaLhI4KXE7LwinLtwGXfu + PXhhqJ/m0DyS62EdUGWpqcf3P97DD3d++t/QnKraBjpghXWAiC+WN0ZNScOe1mP45vbdF2ZvWwdoDs/D + b6ejs6ecxHPoAG/l+Fhkzy+FyCcY0YkG7D/yAW5+d+e5oXrqo36aQ/McnNyjyAAuHWA05pfgzPlehhyT + mflV6FOMaDt2Ctf7bw8KXac6qqc+a4Zx3hLwRLJCZgcJjcPIEPkyIZmeX1SB7vOX0dn9KQy5jw8r8eVc + HOrsxidXP0d9hxlzd4QgeYMzEt7kQVvOR0pFFNpOHmd81E9znIS+dSTc1foVGWfNKUZjyy6Ex6SQl0cD + 09IVxHAFh0+cReqr+QjK8ERqEw+VHWOwoycSR/v1OHwzDlsvhcNCeqkbedAYxQiPm87kZOQVw0nkW0QG + 2DFnIA+JRm3DFpzr/RKNW3ZDE5UAsX8ocizZiFs7DEUHvPFunw4Hb05B+y09jn49lYHe0x5doxqqLVlf + DJrnyB+pIQNs6QAhf6R8tZu3CqpwPdZu2I6PLl3HwnV5iHv9JVSeUOKdqzq81xeDvddiYG73R0aLEIZm + IRa1jUbjxQnYRHa17YqW0VJPwHT3LocRbirrDiymspXo6L6AgiXV8JSNQ2i6GpNWOqK4U4n1n0Vge68W + 9ecmIKnBBSqDCIp4P2RWGDB/QxqS6l1QcToIld3BqDobgsXEQ73+Se5HrGcgdJEokGzIx66DXXi7dRvC + yx2Q2RqApR+GoPbjCag8pUZ6sxjqWRKEldljRr07ZjaKmHt5qpBZKzkeiIJ2BbIPKmA8MIbJUC/ghrM0 + RfYsDtdhqJNIVulK/ku0BQokbfZGZrsKBR3BmEsMOfvl0FY7o7ypDPo1brCcGc+QUCdExabXEFsjQO4B + ObL2BSBlqx8SWwibvBE0334nK3Ael+yEbIW81DZszlhZ2oieuAYvpO5VIHGzP9J2+CN9pz/CzDwExMox + eZUbFnZpkEc+gLZagJjMWOiqXZDVqmC0+kZf6Nb4IHKFCPIsu92sgCw7BlJswjBJLCdenmuPyFUS6Gp9 + oG/yRdJWGSKqhYjKDgLRImK5ACGlzsy9d/zwXn2DBMZDSkZLPaHlnpBncyGO5kxj+Rps/wYdJE2xzfOb + zcU4sye0b0gRu3E0Ypt8ELTICRFGNcShUgjHuZyWxNu2096sdiXS9o1ltNQjyyDhes4SkuXEGpXC+Ve8 + kjlzpDPtoCkVQrdOihgyIHmXP6LryGEX86Ba6ISJNR7IeF+JV8gAfbOM0XoTj8dktpmEOxM4rJHTBscz + njNNnMiBagEfU98ajRnbZMg7GojCk2oGU1cw5nUGw7BHAZWJD6oVhLFzSDCPCacljGP/J7xAm6Hu0ew6 + STIXkcvckN7ig8XHVCjvUiNvdwAmW0Twms6FayS7meM4REoihxPoeT4u10nsZ0LKhhdsIxZEsVcLtOyL + pHffVcd+IJjI7uGHsRscJEPURMMn2FMtNTwuFusPrjFl48ji7nIAAAAASUVORK5CYII= + + + + + iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 + YQUAAAAZdEVYdFNvZnR3YXJlAEFkb2JlIEltYWdlUmVhZHlxyWU8AAADZmlUWHRYTUw6Y29tLmFkb2Jl + LnhtcAAAAAAAPD94cGFja2V0IGJlZ2luPSLvu78iIGlkPSJXNU0wTXBDZWhpSHpyZVN6TlRjemtjOWQi + Pz4gPHg6eG1wbWV0YSB4bWxuczp4PSJhZG9iZTpuczptZXRhLyIgeDp4bXB0az0iQWRvYmUgWE1QIENv + cmUgNS4zLWMwMTEgNjYuMTQ1NjYxLCAyMDEyLzAyLzA2LTE0OjU2OjI3ICAgICAgICAiPiA8cmRmOlJE + RiB4bWxuczpyZGY9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkvMDIvMjItcmRmLXN5bnRheC1ucyMiPiA8 + cmRmOkRlc2NyaXB0aW9uIHJkZjphYm91dD0iIiB4bWxuczp4bXBNTT0iaHR0cDovL25zLmFkb2JlLmNv + bS94YXAvMS4wL21tLyIgeG1sbnM6c3RSZWY9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlw + ZS9SZXNvdXJjZVJlZiMiIHhtbG5zOnhtcD0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wLyIgeG1w + TU06T3JpZ2luYWxEb2N1bWVudElEPSJ4bXAuZGlkOjYzQTM5NEY4Mjg0OUU0MTE5NDBEQTc4ODZEQzk5 + N0NGIiB4bXBNTTpEb2N1bWVudElEPSJ4bXAuZGlkOkUyMTg3NjEyNDlEODExRTQ4NjNGQjM2Mzk1QkNB + RkQwIiB4bXBNTTpJbnN0YW5jZUlEPSJ4bXAuaWlkOkUyMTg3NjExNDlEODExRTQ4NjNGQjM2Mzk1QkNB + RkQwIiB4bXA6Q3JlYXRvclRvb2w9IkFkb2JlIFBob3Rvc2hvcCBDUzYgKFdpbmRvd3MpIj4gPHhtcE1N + OkRlcml2ZWRGcm9tIHN0UmVmOmluc3RhbmNlSUQ9InhtcC5paWQ6NkJCNTE0NDlEODQ5RTQxMUE0QzNB + MjdEOTJBQzc3QkMiIHN0UmVmOmRvY3VtZW50SUQ9InhtcC5kaWQ6NjNBMzk0RjgyODQ5RTQxMTk0MERB + Nzg4NkRDOTk3Q0YiLz4gPC9yZGY6RGVzY3JpcHRpb24+IDwvcmRmOlJERj4gPC94OnhtcG1ldGE+IDw/ + eHBhY2tldCBlbmQ9InIiPz5e5MstAAADiUlEQVRIS+2UW0yTdxjGcePwtYyVVpAUCi1tv9ImrVbxhAei + kjGphAgFT4jzEJ0gGuJhDk0sml0sglmWmC1hqHNKWwI4srgNh3phpjg1O1yIN5DMbFHQZUu42O76+D4f + 3Fl6Z7ILn+SXvH3f533++X/98iUBeKW81v9Uwx1G1+1240EhfKfdeE/4U3qTAqaZZO/2aeN9IXLrY+Ph + wVOZHll9YyohgYZOGS4JsYdXVDy+NQ8Tvy3BP6OlmPyjDP9OBDRYs8cZPfRy5/uQISIRqcIsLSye+j7I + wN+PluOvhyWY+NmL8fsOjP9kxdN7BRh/YJHfFjy5m48nd4ThQjy968bEgwV49usicFciTEKKFhZPXXv1 + eHxtLsYGPBjttwsWjF0xY+ybOfj9uylYs8cZPfQS7kpEnqDTwuLp9GYlfKZeifUfzcb1j/Iw/IkNv3Q6 + MfKVC6O9bg3W7HFGD73cORlMG5AIizDzAaVtunD5ESXWfNSEY/tNCO00oG1zOkJBBSeqUjVYh6R3Qmat + zSY0Hjah7IASW7hPuSoRvIGihcVTSauCppvFODRUjJZvPWgaKMTuXgt2RHOxLTwHDd3EjPfCudgesWJX + jxM7eryo7/Ni8SGFj8gp6LWwePLvS0Og043A5y5UdtkQOJeLivM5ePf8bJSfM04zG2u7chDoysW6Thsq + zqpY0+GAvymNB/gEgxYWT64tKdGihpSYv8WEpSEzVp0pwDuf2SVQReCiS4M1e5zRQy937NXJ1yRirjDz + AVmVJyNZa9+PObauh7ptKdR6FY6N2SisTYe1OlmDNXtqvRNqwxLYt1TCVLY1ZijZOSQRbuEtLSyeTOXH + sfLDH1EauoFFx6/Cd6Qf7pYI1ObLsO+9iMLdF+DccwEuqd2Nl+Br6sbCxiiKd/XBuPogH1HiAzJXHMC8 + YA98td1wb4rCuaEH1roo8oMR5JGaMPIFa10Ejtowiuouw1vzJTwVXyBz+X4ekPgRZfgbohkLtsfMy47B + tqYdakUnPFUM6YUv+LUGa/Y4o8e8rBXcSffWDkpE4j9ZpEvNmb9KsZV16BzrBnVq1YjeVf1MX1Tzn74o + iCmkdq1/LrNHOkfgB6Vg9afJRrVOdv2ClRkMmklvCnyPs4V8ge81v5RegddnCGHNHmf00JslcJcZCcWv + IU1pAhcyhLcFXj1zGtbscUYPvdyZ+Uv6Wi8rKekFBjoX2627by8AAAAASUVORK5CYII= + + + + + iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 + YQUAAAAZdEVYdFNvZnR3YXJlAEFkb2JlIEltYWdlUmVhZHlxyWU8AAADZmlUWHRYTUw6Y29tLmFkb2Jl + LnhtcAAAAAAAPD94cGFja2V0IGJlZ2luPSLvu78iIGlkPSJXNU0wTXBDZWhpSHpyZVN6TlRjemtjOWQi + Pz4gPHg6eG1wbWV0YSB4bWxuczp4PSJhZG9iZTpuczptZXRhLyIgeDp4bXB0az0iQWRvYmUgWE1QIENv + cmUgNS4zLWMwMTEgNjYuMTQ1NjYxLCAyMDEyLzAyLzA2LTE0OjU2OjI3ICAgICAgICAiPiA8cmRmOlJE + RiB4bWxuczpyZGY9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkvMDIvMjItcmRmLXN5bnRheC1ucyMiPiA8 + cmRmOkRlc2NyaXB0aW9uIHJkZjphYm91dD0iIiB4bWxuczp4bXBNTT0iaHR0cDovL25zLmFkb2JlLmNv + bS94YXAvMS4wL21tLyIgeG1sbnM6c3RSZWY9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlw + ZS9SZXNvdXJjZVJlZiMiIHhtbG5zOnhtcD0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wLyIgeG1w + TU06T3JpZ2luYWxEb2N1bWVudElEPSJ4bXAuZGlkOjYzQTM5NEY4Mjg0OUU0MTE5NDBEQTc4ODZEQzk5 + N0NGIiB4bXBNTTpEb2N1bWVudElEPSJ4bXAuZGlkOkE2Q0VGMDE2NDlEQTExRTQ4NTlCQTI3NTMyOEY5 + NEU2IiB4bXBNTTpJbnN0YW5jZUlEPSJ4bXAuaWlkOkE2Q0VGMDE1NDlEQTExRTQ4NTlCQTI3NTMyOEY5 + NEU2IiB4bXA6Q3JlYXRvclRvb2w9IkFkb2JlIFBob3Rvc2hvcCBDUzYgKFdpbmRvd3MpIj4gPHhtcE1N + OkRlcml2ZWRGcm9tIHN0UmVmOmluc3RhbmNlSUQ9InhtcC5paWQ6NjA1MjM3NzFEOTQ5RTQxMUE0QzNB + MjdEOTJBQzc3QkMiIHN0UmVmOmRvY3VtZW50SUQ9InhtcC5kaWQ6NjNBMzk0RjgyODQ5RTQxMTk0MERB + Nzg4NkRDOTk3Q0YiLz4gPC9yZGY6RGVzY3JpcHRpb24+IDwvcmRmOlJERj4gPC94OnhtcG1ldGE+IDw/ + eHBhY2tldCBlbmQ9InIiPz6UH16BAAABrElEQVRIS63N70tTURzH8fsnKSGCCEIQCBKISMq2iILCgQOL + JUxQAoVKdMGQuwgWFepsMGjFZCMuorsIJV4WFatpvzdr1ZAFsaIHn8559v1eDsI91wevJ/ee7/tjbMRH + fAFwJOWRF6oopTzyQhWlVEdBwRbgUhICAnuvilKGtXDGzW6WV/CvbjE/xTfxr+R6q4xSxtP5YTf8rVn4 + s5dG+809Rv5zvVVGKaNwfYgyBfhksoH83CCF9seiL7LBBnLXTlP4/W4dza0ZLS0nCdlgA9npAQq/qk/Q + sKa0NJ8nIBtsIBPrp9CqPMJBYVLLj+04ZIMNrF49ReHwVRafH1/R8m3zJmSDDdy/fJJC88Ua3mcjWurW + LGSDDaQifRS+O8uopsNaPhVnIBts4E64l0Jj5y4qDy5q+ZCPQTbYgHmph8LXZ0m8TJ3Xsp+LQjbYQOJC + N4XadgLl22e1vM1OQDbYwK1zXRS+lBbhmEHsLgU8kTeVh+OQDTawEDpB2U4mitfpMS22GYJssIH5QCcV + FGwBmuRtkA3cGO3whcZUlEdeqKKU8sgLVZRSfjw+MP4DJ2GPpDR9OIsAAAAASUVORK5CYII= + + + + + iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 + YQUAAAAZdEVYdFNvZnR3YXJlAEFkb2JlIEltYWdlUmVhZHlxyWU8AAADZmlUWHRYTUw6Y29tLmFkb2Jl + LnhtcAAAAAAAPD94cGFja2V0IGJlZ2luPSLvu78iIGlkPSJXNU0wTXBDZWhpSHpyZVN6TlRjemtjOWQi + Pz4gPHg6eG1wbWV0YSB4bWxuczp4PSJhZG9iZTpuczptZXRhLyIgeDp4bXB0az0iQWRvYmUgWE1QIENv + cmUgNS4zLWMwMTEgNjYuMTQ1NjYxLCAyMDEyLzAyLzA2LTE0OjU2OjI3ICAgICAgICAiPiA8cmRmOlJE + RiB4bWxuczpyZGY9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkvMDIvMjItcmRmLXN5bnRheC1ucyMiPiA8 + cmRmOkRlc2NyaXB0aW9uIHJkZjphYm91dD0iIiB4bWxuczp4bXBNTT0iaHR0cDovL25zLmFkb2JlLmNv + bS94YXAvMS4wL21tLyIgeG1sbnM6c3RSZWY9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlw + ZS9SZXNvdXJjZVJlZiMiIHhtbG5zOnhtcD0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wLyIgeG1w + TU06T3JpZ2luYWxEb2N1bWVudElEPSJ4bXAuZGlkOjYzQTM5NEY4Mjg0OUU0MTE5NDBEQTc4ODZEQzk5 + N0NGIiB4bXBNTTpEb2N1bWVudElEPSJ4bXAuZGlkOjJGRTU5OEQ1NDlEQjExRTRBRUVDOTkyMjQ5NzEw + REUwIiB4bXBNTTpJbnN0YW5jZUlEPSJ4bXAuaWlkOjJGRTU5OEQ0NDlEQjExRTRBRUVDOTkyMjQ5NzEw + REUwIiB4bXA6Q3JlYXRvclRvb2w9IkFkb2JlIFBob3Rvc2hvcCBDUzYgKFdpbmRvd3MpIj4gPHhtcE1N + OkRlcml2ZWRGcm9tIHN0UmVmOmluc3RhbmNlSUQ9InhtcC5paWQ6MTY0MkI1RjlEQTQ5RTQxMUE0QzNB + MjdEOTJBQzc3QkMiIHN0UmVmOmRvY3VtZW50SUQ9InhtcC5kaWQ6NjNBMzk0RjgyODQ5RTQxMTk0MERB + Nzg4NkRDOTk3Q0YiLz4gPC9yZGY6RGVzY3JpcHRpb24+IDwvcmRmOlJERj4gPC94OnhtcG1ldGE+IDw/ + eHBhY2tldCBlbmQ9InIiPz6B5sF9AAACe0lEQVRIS7WVb2jMcRzHL7UHanF/Mts5prE/1li3kAfu5Ak7 + 5IHNobBkSC2UIuGJkrrSWRvTmHQWK8U1T8jqUtYwkZpaGjV/Js6to5YwfXze39+fu/v23f36hXe9us+f + 7/v9rd/dr3MQ0X/F4Zm3+K9QhWajNNlBFZqN0mQHS6lMdrCUyqSgimllUsy4XmOmp+QRDllQWbygjjq6 + uimZStOX8a+ixox3pXrM1JLCDAqYJmY7c669M0bff07mcLbtEl9QE8k6V6BH5ooXMsHZZX7ae+AY7W45 + SrPm19LbsSR9m/iRA2bYGefggVePzUgKBzeu9sQpmZ4QcG/WMtk7eLjv0WMz0kOz+TX6MUXvP6cFeNbD + bz6YvQFm2Bk9PPByZO6jksLB5KvRTzTyLikIrG2ktsvXzd4g2hGjYP1ms4eHvb850qkl65LCQW/ntVs0 + 9HpMcPx0K1X4V1Ff/3NzhnphbVDsjBk8Lm/VE44s0ZJ1KS4Ie8uXUvPBE7Tn0ElCzTMqrV5BO/cfEaDG + TD5X6PFFONLygsTF7jj1vxihyPkYNTS1iFrFxm37KHIhJmp43L7qZxzp0pJ1SeHhQGgLJQaH6fb9R1QX + 2EB3Ek9FryLe95j8K9eLT/TB0FZcskOP1iRdkIh23aR7Ay9pzaZddKY9Jup8nIpeoXXhZlHD655b85Bj + p2npLOmCML+dD/iTZhaX3+UvbRB1PpzeygFnSUUvatecRUMzisoOc+x0LZ3FixxYhQyK1cxyZhkTYhqY + RgnM6hmcwVl4ljDI0KS4AC+Kmyli8Jv2MF7GNwXY4QzOwgNv5mWTL7CLpVQmO1hKZbKDpVR/1P8OcvwB + lh7gOXXZq9sAAAAASUVORK5CYII= + + iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 @@ -598,147 +738,7 @@ 1BGxz38BvCwLsyQ3iHgAAAAASUVORK5CYII= - - - iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAZdEVYdFNvZnR3YXJlAEFkb2JlIEltYWdlUmVhZHlxyWU8AAADZmlUWHRYTUw6Y29tLmFkb2Jl - LnhtcAAAAAAAPD94cGFja2V0IGJlZ2luPSLvu78iIGlkPSJXNU0wTXBDZWhpSHpyZVN6TlRjemtjOWQi - Pz4gPHg6eG1wbWV0YSB4bWxuczp4PSJhZG9iZTpuczptZXRhLyIgeDp4bXB0az0iQWRvYmUgWE1QIENv - cmUgNS4zLWMwMTEgNjYuMTQ1NjYxLCAyMDEyLzAyLzA2LTE0OjU2OjI3ICAgICAgICAiPiA8cmRmOlJE - RiB4bWxuczpyZGY9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkvMDIvMjItcmRmLXN5bnRheC1ucyMiPiA8 - cmRmOkRlc2NyaXB0aW9uIHJkZjphYm91dD0iIiB4bWxuczp4bXBNTT0iaHR0cDovL25zLmFkb2JlLmNv - bS94YXAvMS4wL21tLyIgeG1sbnM6c3RSZWY9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlw - ZS9SZXNvdXJjZVJlZiMiIHhtbG5zOnhtcD0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wLyIgeG1w - TU06T3JpZ2luYWxEb2N1bWVudElEPSJ4bXAuZGlkOjYzQTM5NEY4Mjg0OUU0MTE5NDBEQTc4ODZEQzk5 - N0NGIiB4bXBNTTpEb2N1bWVudElEPSJ4bXAuZGlkOjEwQ0IxNzBBNEM1QzExRTRBNkNGQzRBMjhDQzI0 - MkY4IiB4bXBNTTpJbnN0YW5jZUlEPSJ4bXAuaWlkOjEwQ0IxNzA5NEM1QzExRTRBNkNGQzRBMjhDQzI0 - MkY4IiB4bXA6Q3JlYXRvclRvb2w9IkFkb2JlIFBob3Rvc2hvcCBDUzYgKFdpbmRvd3MpIj4gPHhtcE1N - OkRlcml2ZWRGcm9tIHN0UmVmOmluc3RhbmNlSUQ9InhtcC5paWQ6NTEzMDNDMjA1QjRDRTQxMTg4NERE - MUVBOEQ4QTgyNTUiIHN0UmVmOmRvY3VtZW50SUQ9InhtcC5kaWQ6NjNBMzk0RjgyODQ5RTQxMTk0MERB - Nzg4NkRDOTk3Q0YiLz4gPC9yZGY6RGVzY3JpcHRpb24+IDwvcmRmOlJERj4gPC94OnhtcG1ldGE+IDw/ - eHBhY2tldCBlbmQ9InIiPz43wa2/AAAFaUlEQVRIS6WUC0xTVxzGKy0UkSmlFGjBFilSkNpSaAWRh63y - sIiAArKs4spLRLQoiEJlSMGoMCc6CBOnYHzMOHUqqOhEHOqCbjNu6kCd6KYje5mZ6KbObd/OuVL3cEzj - /skv997/+b7v39PTW9aj3/BM+OKxPEIZoW/gyrOuPbP+GvRPSNBQQqXYLwSW1etw7cYt5kqfaZ+uD8QM - Xg8f/f4UxGhHMHv4qlG6vAb9394G6T+BPpdV1oCuUx3VD8Q9XT8//PUJRMghlLhLg1C41IK+r/pB+oNC - 16mO6qmP+gdi/6y793+hwTYEk9uoQOSaStHzxQ2Q/nND9XMKy0D9NIfmDcSzaLhI4KXE7LwinLtwGXfu - PXhhqJ/m0DyS62EdUGWpqcf3P97DD3d++t/QnKraBjpghXWAiC+WN0ZNScOe1mP45vbdF2ZvWwdoDs/D - b6ejs6ecxHPoAG/l+Fhkzy+FyCcY0YkG7D/yAW5+d+e5oXrqo36aQ/McnNyjyAAuHWA05pfgzPlehhyT - mflV6FOMaDt2Ctf7bw8KXac6qqc+a4Zx3hLwRLJCZgcJjcPIEPkyIZmeX1SB7vOX0dn9KQy5jw8r8eVc - HOrsxidXP0d9hxlzd4QgeYMzEt7kQVvOR0pFFNpOHmd81E9znIS+dSTc1foVGWfNKUZjyy6Ex6SQl0cD - 09IVxHAFh0+cReqr+QjK8ERqEw+VHWOwoycSR/v1OHwzDlsvhcNCeqkbedAYxQiPm87kZOQVw0nkW0QG - 2DFnIA+JRm3DFpzr/RKNW3ZDE5UAsX8ocizZiFs7DEUHvPFunw4Hb05B+y09jn49lYHe0x5doxqqLVlf - DJrnyB+pIQNs6QAhf6R8tZu3CqpwPdZu2I6PLl3HwnV5iHv9JVSeUOKdqzq81xeDvddiYG73R0aLEIZm - IRa1jUbjxQnYRHa17YqW0VJPwHT3LocRbirrDiymspXo6L6AgiXV8JSNQ2i6GpNWOqK4U4n1n0Vge68W - 9ecmIKnBBSqDCIp4P2RWGDB/QxqS6l1QcToIld3BqDobgsXEQ73+Se5HrGcgdJEokGzIx66DXXi7dRvC - yx2Q2RqApR+GoPbjCag8pUZ6sxjqWRKEldljRr07ZjaKmHt5qpBZKzkeiIJ2BbIPKmA8MIbJUC/ghrM0 - RfYsDtdhqJNIVulK/ku0BQokbfZGZrsKBR3BmEsMOfvl0FY7o7ypDPo1brCcGc+QUCdExabXEFsjQO4B - ObL2BSBlqx8SWwibvBE0334nK3Ael+yEbIW81DZszlhZ2oieuAYvpO5VIHGzP9J2+CN9pz/CzDwExMox - eZUbFnZpkEc+gLZagJjMWOiqXZDVqmC0+kZf6Nb4IHKFCPIsu92sgCw7BlJswjBJLCdenmuPyFUS6Gp9 - oG/yRdJWGSKqhYjKDgLRImK5ACGlzsy9d/zwXn2DBMZDSkZLPaHlnpBncyGO5kxj+Rps/wYdJE2xzfOb - zcU4sye0b0gRu3E0Ypt8ELTICRFGNcShUgjHuZyWxNu2096sdiXS9o1ltNQjyyDhes4SkuXEGpXC+Ve8 - kjlzpDPtoCkVQrdOihgyIHmXP6LryGEX86Ba6ISJNR7IeF+JV8gAfbOM0XoTj8dktpmEOxM4rJHTBscz - njNNnMiBagEfU98ajRnbZMg7GojCk2oGU1cw5nUGw7BHAZWJD6oVhLFzSDCPCacljGP/J7xAm6Hu0ew6 - STIXkcvckN7ig8XHVCjvUiNvdwAmW0Twms6FayS7meM4REoihxPoeT4u10nsZ0LKhhdsIxZEsVcLtOyL - pHffVcd+IJjI7uGHsRscJEPURMMn2FMtNTwuFusPrjFl48ji7nIAAAAASUVORK5CYII= - - - - - iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAZdEVYdFNvZnR3YXJlAEFkb2JlIEltYWdlUmVhZHlxyWU8AAADZmlUWHRYTUw6Y29tLmFkb2Jl - LnhtcAAAAAAAPD94cGFja2V0IGJlZ2luPSLvu78iIGlkPSJXNU0wTXBDZWhpSHpyZVN6TlRjemtjOWQi - Pz4gPHg6eG1wbWV0YSB4bWxuczp4PSJhZG9iZTpuczptZXRhLyIgeDp4bXB0az0iQWRvYmUgWE1QIENv - cmUgNS4zLWMwMTEgNjYuMTQ1NjYxLCAyMDEyLzAyLzA2LTE0OjU2OjI3ICAgICAgICAiPiA8cmRmOlJE - RiB4bWxuczpyZGY9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkvMDIvMjItcmRmLXN5bnRheC1ucyMiPiA8 - cmRmOkRlc2NyaXB0aW9uIHJkZjphYm91dD0iIiB4bWxuczp4bXBNTT0iaHR0cDovL25zLmFkb2JlLmNv - bS94YXAvMS4wL21tLyIgeG1sbnM6c3RSZWY9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlw - ZS9SZXNvdXJjZVJlZiMiIHhtbG5zOnhtcD0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wLyIgeG1w - TU06T3JpZ2luYWxEb2N1bWVudElEPSJ4bXAuZGlkOjYzQTM5NEY4Mjg0OUU0MTE5NDBEQTc4ODZEQzk5 - N0NGIiB4bXBNTTpEb2N1bWVudElEPSJ4bXAuZGlkOkUyMTg3NjEyNDlEODExRTQ4NjNGQjM2Mzk1QkNB - RkQwIiB4bXBNTTpJbnN0YW5jZUlEPSJ4bXAuaWlkOkUyMTg3NjExNDlEODExRTQ4NjNGQjM2Mzk1QkNB - RkQwIiB4bXA6Q3JlYXRvclRvb2w9IkFkb2JlIFBob3Rvc2hvcCBDUzYgKFdpbmRvd3MpIj4gPHhtcE1N - OkRlcml2ZWRGcm9tIHN0UmVmOmluc3RhbmNlSUQ9InhtcC5paWQ6NkJCNTE0NDlEODQ5RTQxMUE0QzNB - MjdEOTJBQzc3QkMiIHN0UmVmOmRvY3VtZW50SUQ9InhtcC5kaWQ6NjNBMzk0RjgyODQ5RTQxMTk0MERB - Nzg4NkRDOTk3Q0YiLz4gPC9yZGY6RGVzY3JpcHRpb24+IDwvcmRmOlJERj4gPC94OnhtcG1ldGE+IDw/ - eHBhY2tldCBlbmQ9InIiPz5e5MstAAADiUlEQVRIS+2UW0yTdxjGcePwtYyVVpAUCi1tv9ImrVbxhAei - kjGphAgFT4jzEJ0gGuJhDk0sml0sglmWmC1hqHNKWwI4srgNh3phpjg1O1yIN5DMbFHQZUu42O76+D4f - 3Fl6Z7ILn+SXvH3f533++X/98iUBeKW81v9Uwx1G1+1240EhfKfdeE/4U3qTAqaZZO/2aeN9IXLrY+Ph - wVOZHll9YyohgYZOGS4JsYdXVDy+NQ8Tvy3BP6OlmPyjDP9OBDRYs8cZPfRy5/uQISIRqcIsLSye+j7I - wN+PluOvhyWY+NmL8fsOjP9kxdN7BRh/YJHfFjy5m48nd4ThQjy968bEgwV49usicFciTEKKFhZPXXv1 - eHxtLsYGPBjttwsWjF0xY+ybOfj9uylYs8cZPfQS7kpEnqDTwuLp9GYlfKZeifUfzcb1j/Iw/IkNv3Q6 - MfKVC6O9bg3W7HFGD73cORlMG5AIizDzAaVtunD5ESXWfNSEY/tNCO00oG1zOkJBBSeqUjVYh6R3Qmat - zSY0Hjah7IASW7hPuSoRvIGihcVTSauCppvFODRUjJZvPWgaKMTuXgt2RHOxLTwHDd3EjPfCudgesWJX - jxM7eryo7/Ni8SGFj8gp6LWwePLvS0Og043A5y5UdtkQOJeLivM5ePf8bJSfM04zG2u7chDoysW6Thsq - zqpY0+GAvymNB/gEgxYWT64tKdGihpSYv8WEpSEzVp0pwDuf2SVQReCiS4M1e5zRQy937NXJ1yRirjDz - AVmVJyNZa9+PObauh7ptKdR6FY6N2SisTYe1OlmDNXtqvRNqwxLYt1TCVLY1ZijZOSQRbuEtLSyeTOXH - sfLDH1EauoFFx6/Cd6Qf7pYI1ObLsO+9iMLdF+DccwEuqd2Nl+Br6sbCxiiKd/XBuPogH1HiAzJXHMC8 - YA98td1wb4rCuaEH1roo8oMR5JGaMPIFa10Ejtowiuouw1vzJTwVXyBz+X4ekPgRZfgbohkLtsfMy47B - tqYdakUnPFUM6YUv+LUGa/Y4o8e8rBXcSffWDkpE4j9ZpEvNmb9KsZV16BzrBnVq1YjeVf1MX1Tzn74o - iCmkdq1/LrNHOkfgB6Vg9afJRrVOdv2ClRkMmklvCnyPs4V8ge81v5RegddnCGHNHmf00JslcJcZCcWv - IU1pAhcyhLcFXj1zGtbscUYPvdyZ+Uv6Wi8rKekFBjoX2627by8AAAAASUVORK5CYII= - - - - - iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAZdEVYdFNvZnR3YXJlAEFkb2JlIEltYWdlUmVhZHlxyWU8AAADZmlUWHRYTUw6Y29tLmFkb2Jl - LnhtcAAAAAAAPD94cGFja2V0IGJlZ2luPSLvu78iIGlkPSJXNU0wTXBDZWhpSHpyZVN6TlRjemtjOWQi - Pz4gPHg6eG1wbWV0YSB4bWxuczp4PSJhZG9iZTpuczptZXRhLyIgeDp4bXB0az0iQWRvYmUgWE1QIENv - cmUgNS4zLWMwMTEgNjYuMTQ1NjYxLCAyMDEyLzAyLzA2LTE0OjU2OjI3ICAgICAgICAiPiA8cmRmOlJE - RiB4bWxuczpyZGY9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkvMDIvMjItcmRmLXN5bnRheC1ucyMiPiA8 - cmRmOkRlc2NyaXB0aW9uIHJkZjphYm91dD0iIiB4bWxuczp4bXBNTT0iaHR0cDovL25zLmFkb2JlLmNv - bS94YXAvMS4wL21tLyIgeG1sbnM6c3RSZWY9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlw - ZS9SZXNvdXJjZVJlZiMiIHhtbG5zOnhtcD0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wLyIgeG1w - TU06T3JpZ2luYWxEb2N1bWVudElEPSJ4bXAuZGlkOjYzQTM5NEY4Mjg0OUU0MTE5NDBEQTc4ODZEQzk5 - N0NGIiB4bXBNTTpEb2N1bWVudElEPSJ4bXAuZGlkOkE2Q0VGMDE2NDlEQTExRTQ4NTlCQTI3NTMyOEY5 - NEU2IiB4bXBNTTpJbnN0YW5jZUlEPSJ4bXAuaWlkOkE2Q0VGMDE1NDlEQTExRTQ4NTlCQTI3NTMyOEY5 - NEU2IiB4bXA6Q3JlYXRvclRvb2w9IkFkb2JlIFBob3Rvc2hvcCBDUzYgKFdpbmRvd3MpIj4gPHhtcE1N - OkRlcml2ZWRGcm9tIHN0UmVmOmluc3RhbmNlSUQ9InhtcC5paWQ6NjA1MjM3NzFEOTQ5RTQxMUE0QzNB - MjdEOTJBQzc3QkMiIHN0UmVmOmRvY3VtZW50SUQ9InhtcC5kaWQ6NjNBMzk0RjgyODQ5RTQxMTk0MERB - Nzg4NkRDOTk3Q0YiLz4gPC9yZGY6RGVzY3JpcHRpb24+IDwvcmRmOlJERj4gPC94OnhtcG1ldGE+IDw/ - eHBhY2tldCBlbmQ9InIiPz6UH16BAAABrElEQVRIS63N70tTURzH8fsnKSGCCEIQCBKISMq2iILCgQOL - JUxQAoVKdMGQuwgWFepsMGjFZCMuorsIJV4WFatpvzdr1ZAFsaIHn8559v1eDsI91wevJ/ee7/tjbMRH - fAFwJOWRF6oopTzyQhWlVEdBwRbgUhICAnuvilKGtXDGzW6WV/CvbjE/xTfxr+R6q4xSxtP5YTf8rVn4 - s5dG+809Rv5zvVVGKaNwfYgyBfhksoH83CCF9seiL7LBBnLXTlP4/W4dza0ZLS0nCdlgA9npAQq/qk/Q - sKa0NJ8nIBtsIBPrp9CqPMJBYVLLj+04ZIMNrF49ReHwVRafH1/R8m3zJmSDDdy/fJJC88Ua3mcjWurW - LGSDDaQifRS+O8uopsNaPhVnIBts4E64l0Jj5y4qDy5q+ZCPQTbYgHmph8LXZ0m8TJ3Xsp+LQjbYQOJC - N4XadgLl22e1vM1OQDbYwK1zXRS+lBbhmEHsLgU8kTeVh+OQDTawEDpB2U4mitfpMS22GYJssIH5QCcV - FGwBmuRtkA3cGO3whcZUlEdeqKKU8sgLVZRSfjw+MP4DJ2GPpDR9OIsAAAAASUVORK5CYII= - - - - - iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAZdEVYdFNvZnR3YXJlAEFkb2JlIEltYWdlUmVhZHlxyWU8AAADZmlUWHRYTUw6Y29tLmFkb2Jl - LnhtcAAAAAAAPD94cGFja2V0IGJlZ2luPSLvu78iIGlkPSJXNU0wTXBDZWhpSHpyZVN6TlRjemtjOWQi - Pz4gPHg6eG1wbWV0YSB4bWxuczp4PSJhZG9iZTpuczptZXRhLyIgeDp4bXB0az0iQWRvYmUgWE1QIENv - cmUgNS4zLWMwMTEgNjYuMTQ1NjYxLCAyMDEyLzAyLzA2LTE0OjU2OjI3ICAgICAgICAiPiA8cmRmOlJE - RiB4bWxuczpyZGY9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkvMDIvMjItcmRmLXN5bnRheC1ucyMiPiA8 - cmRmOkRlc2NyaXB0aW9uIHJkZjphYm91dD0iIiB4bWxuczp4bXBNTT0iaHR0cDovL25zLmFkb2JlLmNv - bS94YXAvMS4wL21tLyIgeG1sbnM6c3RSZWY9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlw - ZS9SZXNvdXJjZVJlZiMiIHhtbG5zOnhtcD0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wLyIgeG1w - TU06T3JpZ2luYWxEb2N1bWVudElEPSJ4bXAuZGlkOjYzQTM5NEY4Mjg0OUU0MTE5NDBEQTc4ODZEQzk5 - N0NGIiB4bXBNTTpEb2N1bWVudElEPSJ4bXAuZGlkOjJGRTU5OEQ1NDlEQjExRTRBRUVDOTkyMjQ5NzEw - REUwIiB4bXBNTTpJbnN0YW5jZUlEPSJ4bXAuaWlkOjJGRTU5OEQ0NDlEQjExRTRBRUVDOTkyMjQ5NzEw - REUwIiB4bXA6Q3JlYXRvclRvb2w9IkFkb2JlIFBob3Rvc2hvcCBDUzYgKFdpbmRvd3MpIj4gPHhtcE1N - OkRlcml2ZWRGcm9tIHN0UmVmOmluc3RhbmNlSUQ9InhtcC5paWQ6MTY0MkI1RjlEQTQ5RTQxMUE0QzNB - MjdEOTJBQzc3QkMiIHN0UmVmOmRvY3VtZW50SUQ9InhtcC5kaWQ6NjNBMzk0RjgyODQ5RTQxMTk0MERB - Nzg4NkRDOTk3Q0YiLz4gPC9yZGY6RGVzY3JpcHRpb24+IDwvcmRmOlJERj4gPC94OnhtcG1ldGE+IDw/ - eHBhY2tldCBlbmQ9InIiPz6B5sF9AAACe0lEQVRIS7WVb2jMcRzHL7UHanF/Mts5prE/1li3kAfu5Ak7 - 5IHNobBkSC2UIuGJkrrSWRvTmHQWK8U1T8jqUtYwkZpaGjV/Js6to5YwfXze39+fu/v23f36hXe9us+f - 7/v9rd/dr3MQ0X/F4Zm3+K9QhWajNNlBFZqN0mQHS6lMdrCUyqSgimllUsy4XmOmp+QRDllQWbygjjq6 - uimZStOX8a+ixox3pXrM1JLCDAqYJmY7c669M0bff07mcLbtEl9QE8k6V6BH5ooXMsHZZX7ae+AY7W45 - SrPm19LbsSR9m/iRA2bYGefggVePzUgKBzeu9sQpmZ4QcG/WMtk7eLjv0WMz0kOz+TX6MUXvP6cFeNbD - bz6YvQFm2Bk9PPByZO6jksLB5KvRTzTyLikIrG2ktsvXzd4g2hGjYP1ms4eHvb850qkl65LCQW/ntVs0 - 9HpMcPx0K1X4V1Ff/3NzhnphbVDsjBk8Lm/VE44s0ZJ1KS4Ie8uXUvPBE7Tn0ElCzTMqrV5BO/cfEaDG - TD5X6PFFONLygsTF7jj1vxihyPkYNTS1iFrFxm37KHIhJmp43L7qZxzp0pJ1SeHhQGgLJQaH6fb9R1QX - 2EB3Ek9FryLe95j8K9eLT/TB0FZcskOP1iRdkIh23aR7Ay9pzaZddKY9Jup8nIpeoXXhZlHD655b85Bj - p2npLOmCML+dD/iTZhaX3+UvbRB1PpzeygFnSUUvatecRUMzisoOc+x0LZ3FixxYhQyK1cxyZhkTYhqY - RgnM6hmcwVl4ljDI0KS4AC+Kmyli8Jv2MF7GNwXY4QzOwgNv5mWTL7CLpVQmO1hKZbKDpVR/1P8OcvwB - lh7gOXXZq9sAAAAASUVORK5CYII= - - - + iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 YQUAAAAZdEVYdFNvZnR3YXJlAEFkb2JlIEltYWdlUmVhZHlxyWU8AAADZmlUWHRYTUw6Y29tLmFkb2Jl @@ -750,26 +750,244 @@ bS94YXAvMS4wL21tLyIgeG1sbnM6c3RSZWY9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlw ZS9SZXNvdXJjZVJlZiMiIHhtbG5zOnhtcD0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wLyIgeG1w TU06T3JpZ2luYWxEb2N1bWVudElEPSJ4bXAuZGlkOjJGQzkyMzc0Rjk0OUU0MTE5NjNCQjRENDMzQjlC - MUM4IiB4bXBNTTpEb2N1bWVudElEPSJ4bXAuZGlkOjJERjY3MEZENEQyMzExRTRCNDlGQUMwMzk0OTAw - Qzc4IiB4bXBNTTpJbnN0YW5jZUlEPSJ4bXAuaWlkOjJERjY3MEZDNEQyMzExRTRCNDlGQUMwMzk0OTAw - Qzc4IiB4bXA6Q3JlYXRvclRvb2w9IkFkb2JlIFBob3Rvc2hvcCBDUzYgKFdpbmRvd3MpIj4gPHhtcE1N - OkRlcml2ZWRGcm9tIHN0UmVmOmluc3RhbmNlSUQ9InhtcC5paWQ6NjhGOUEyRDEyMTRERTQxMUIzNkJE + MUM4IiB4bXBNTTpEb2N1bWVudElEPSJ4bXAuZGlkOjlDMzFEOUI4NEFBRjExRTQ4OTA5OUYwQ0QzM0Q2 + NEI4IiB4bXBNTTpJbnN0YW5jZUlEPSJ4bXAuaWlkOjlDMzFEOUI3NEFBRjExRTQ4OTA5OUYwQ0QzM0Q2 + NEI4IiB4bXA6Q3JlYXRvclRvb2w9IkFkb2JlIFBob3Rvc2hvcCBDUzYgKFdpbmRvd3MpIj4gPHhtcE1N + OkRlcml2ZWRGcm9tIHN0UmVmOmluc3RhbmNlSUQ9InhtcC5paWQ6MDk5Mzk2NTZBRjRBRTQxMTk3NEFD + QUFFQjRCMzVENkUiIHN0UmVmOmRvY3VtZW50SUQ9InhtcC5kaWQ6MkZDOTIzNzRGOTQ5RTQxMTk2M0JC + NEQ0MzNCOUIxQzgiLz4gPC9yZGY6RGVzY3JpcHRpb24+IDwvcmRmOlJERj4gPC94OnhtcG1ldGE+IDw/ + eHBhY2tldCBlbmQ9InIiPz73sIMwAAADIElEQVRIS7WVa0iTYRTH56Uiysvm3TkvpLl5DRIvQYWVWl+6 + iNEVg0yhQqloQZHkLT+Y0YdAs75IpEUhzERZoZhsRpZlS7soblotsRwoxhqWeTrnYZtv+u7NsB74cZ5z + zv89/z17HzYRAPxXeIv/EpFXcOyi4BvKhfehv4FvKBfeh+ayqIUDlIgBgT8whpRYoT2fhgvNVJKBQT9s + hB8/QZDPpnEIjEhg0J5Pw4Vm0mwygG9T06BSqQQhTUhUMoRGpyxYT7OZwfhXC6jVakFIYzNYqN5uMGKa + BI1GIwhpghXJaJJi13d0dEB2bj74hsWzSDlXbzfQG02g0+kEIU2wIomdovzKdVifngnFFytBeb4cLN+n + WaSc6hfKKqB/eHTWoHfwExgMBkFII5MnQUD4WlAWloO26wVs35MDmifPmQFFyqlO/aKKqlmDp31DYDKZ + BCGNTJ4IPqHx8LJvACbNUw7p6e2HuJQMNIhhBuaHj3vBYrEI0tb1BoIiE9kJ9h7Oh7EJM+g/jEJuwVlY + s24ri5RTnfo5BedAIoueIYPumvomuHzjzm9cq2uCq7UNUH2rEarr7kNd0yP26Y+eKoSWtk4wfpmAg7kn + ITY5DUorq1g8cOQEqze3aplOEhRtJoMcL1mMTixV9IgD5a/tSBVDYql8AKOBQLEJtTP08gY/jjFiktKg + 5FIV21Ok3NazvmR2AvrFkCAJyGYk1comZAuHDM/AyLvHThfBveZ26NOPwI59eey7LsbhFCmnOvVJ5+Ef + rrYZLEU8EZ85+HLwW7ZCLMVTFWdkHoLut+/hgbYHaE9XN31XNsupTrWV3jKVs+uS3cyAD0cLe331jW3Q + qRt0CPUlQVHDKI+fN9iGo4W90uNnyuA2vvRtWTlQgxeg/dk7FimnOvU9/CNqUe47b7ANRwt7AfjpKvAK + Gt18Qur35ymhRfsKKLr5hN7EyzDq7humWrrcfSfKxbz/QlwcLDck1snZJdUzYHUDmk57+K1qdXJyzsL6 + RmQD9ZmObygXB8sVIRO6fXQB4hC6eRQppzr1XXmHclnAckFomLc1Um5dItEvhZ97MQXP9N0AAAAASUVO + RK5CYII= + + + + + iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 + YQUAAAAZdEVYdFNvZnR3YXJlAEFkb2JlIEltYWdlUmVhZHlxyWU8AAADZmlUWHRYTUw6Y29tLmFkb2Jl + LnhtcAAAAAAAPD94cGFja2V0IGJlZ2luPSLvu78iIGlkPSJXNU0wTXBDZWhpSHpyZVN6TlRjemtjOWQi + Pz4gPHg6eG1wbWV0YSB4bWxuczp4PSJhZG9iZTpuczptZXRhLyIgeDp4bXB0az0iQWRvYmUgWE1QIENv + cmUgNS4zLWMwMTEgNjYuMTQ1NjYxLCAyMDEyLzAyLzA2LTE0OjU2OjI3ICAgICAgICAiPiA8cmRmOlJE + RiB4bWxuczpyZGY9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkvMDIvMjItcmRmLXN5bnRheC1ucyMiPiA8 + cmRmOkRlc2NyaXB0aW9uIHJkZjphYm91dD0iIiB4bWxuczp4bXBNTT0iaHR0cDovL25zLmFkb2JlLmNv + bS94YXAvMS4wL21tLyIgeG1sbnM6c3RSZWY9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlw + ZS9SZXNvdXJjZVJlZiMiIHhtbG5zOnhtcD0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wLyIgeG1w + TU06T3JpZ2luYWxEb2N1bWVudElEPSJ4bXAuZGlkOjJGQzkyMzc0Rjk0OUU0MTE5NjNCQjRENDMzQjlC + MUM4IiB4bXBNTTpEb2N1bWVudElEPSJ4bXAuZGlkOjhDMTdBQjRENEFBRTExRTQ4QjQyODY0MDNBNTJE + NzNCIiB4bXBNTTpJbnN0YW5jZUlEPSJ4bXAuaWlkOjhDMTdBQjRDNEFBRTExRTQ4QjQyODY0MDNBNTJE + NzNCIiB4bXA6Q3JlYXRvclRvb2w9IkFkb2JlIFBob3Rvc2hvcCBDUzYgKFdpbmRvd3MpIj4gPHhtcE1N + OkRlcml2ZWRGcm9tIHN0UmVmOmluc3RhbmNlSUQ9InhtcC5paWQ6NUQyMjc4QTlBQjRBRTQxMTk3NEFD + QUFFQjRCMzVENkUiIHN0UmVmOmRvY3VtZW50SUQ9InhtcC5kaWQ6MkZDOTIzNzRGOTQ5RTQxMTk2M0JC + NEQ0MzNCOUIxQzgiLz4gPC9yZGY6RGVzY3JpcHRpb24+IDwvcmRmOlJERj4gPC94OnhtcG1ldGE+IDw/ + eHBhY2tldCBlbmQ9InIiPz4eHsDfAAAB00lEQVRIS7XVWytEURQH8HniTTNHLs0NCXNcXjTN5dH9g/gM + 3jx590QhFDJS0gyTGmpqaqJIMW4hzlAoOaWISS7LWifntI3ddnTGrl92e/57/We/DBsA/CvuYSHZSr0t + lvCGsriX/oI3lMW9lM/SwgF9SEHwizs08IX2vAyLZvZRgXJ+cQWv7yB0q96Ds86voT0vw6KZNJsK4Pnl + DWKxmBBlqhpDUN0UNp2n2VrB/WMOEomEEGX0ArN5o+BGfYB0Oi1EGa8cwpKw6bxRcH6lQiaTEaKMVw5q + rzCbNwr2z65BURQhynh8Qe0VZvNGwdZBFlRVFaKMxxfQXmE2rxc8rW3sQy6XE0puHoG7IaC9YnV9j5th + pbZPqOCDCrbH5uIwOD7/zWgkDkNTizAyuwQjkWWIxFNQWduqmVxI/MiPz6/A8HTUuDMTTYLkbrqhgt5S + T3PG4ZJ3HE7focElZx0u3yn+VQiG1ZLymmm7s74f88f42S6bl9zyJZ6d6Xckd+Mt5ieogH4xJORHHajt + SzvqZPSgECpHZSiA2DztuxBlad+NgnpBEbIjusiiYboKRF+kGFHegUR5ImkFv7G0eAPzWVq8gfksLd5/ + oULiHhYS97BwwPYJlSCUgVubViQAAAAASUVORK5CYII= + + + + + iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 + YQUAAAAZdEVYdFNvZnR3YXJlAEFkb2JlIEltYWdlUmVhZHlxyWU8AAADZmlUWHRYTUw6Y29tLmFkb2Jl + LnhtcAAAAAAAPD94cGFja2V0IGJlZ2luPSLvu78iIGlkPSJXNU0wTXBDZWhpSHpyZVN6TlRjemtjOWQi + Pz4gPHg6eG1wbWV0YSB4bWxuczp4PSJhZG9iZTpuczptZXRhLyIgeDp4bXB0az0iQWRvYmUgWE1QIENv + cmUgNS4zLWMwMTEgNjYuMTQ1NjYxLCAyMDEyLzAyLzA2LTE0OjU2OjI3ICAgICAgICAiPiA8cmRmOlJE + RiB4bWxuczpyZGY9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkvMDIvMjItcmRmLXN5bnRheC1ucyMiPiA8 + cmRmOkRlc2NyaXB0aW9uIHJkZjphYm91dD0iIiB4bWxuczp4bXBNTT0iaHR0cDovL25zLmFkb2JlLmNv + bS94YXAvMS4wL21tLyIgeG1sbnM6c3RSZWY9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlw + ZS9SZXNvdXJjZVJlZiMiIHhtbG5zOnhtcD0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wLyIgeG1w + TU06T3JpZ2luYWxEb2N1bWVudElEPSJ4bXAuZGlkOjJGQzkyMzc0Rjk0OUU0MTE5NjNCQjRENDMzQjlC + MUM4IiB4bXBNTTpEb2N1bWVudElEPSJ4bXAuZGlkOjJEMDQyOEZBNEFEMjExRTRBN0MxRDBCNzJGRUND + MDEzIiB4bXBNTTpJbnN0YW5jZUlEPSJ4bXAuaWlkOjJEMDQyOEY5NEFEMjExRTRBN0MxRDBCNzJGRUND + MDEzIiB4bXA6Q3JlYXRvclRvb2w9IkFkb2JlIFBob3Rvc2hvcCBDUzYgKFdpbmRvd3MpIj4gPHhtcE1N + OkRlcml2ZWRGcm9tIHN0UmVmOmluc3RhbmNlSUQ9InhtcC5paWQ6QkRDRkI1RDVEMTRBRTQxMTk3NEFD + QUFFQjRCMzVENkUiIHN0UmVmOmRvY3VtZW50SUQ9InhtcC5kaWQ6MkZDOTIzNzRGOTQ5RTQxMTk2M0JC + NEQ0MzNCOUIxQzgiLz4gPC9yZGY6RGVzY3JpcHRpb24+IDwvcmRmOlJERj4gPC94OnhtcG1ldGE+IDw/ + eHBhY2tldCBlbmQ9InIiPz59jfe3AAAEbUlEQVRIS8WTeUybZRzHF48/pnFOuQRajkFLgQFb5iRLNJr4 + l/EPgsniUI4xZDAY1zyxwApsMJyIME61rByl3DfoYGBrgbWUY06FcZSCha4rQ8jYxkqPr2/fvkv8o2Sg + S/wkT970eb6/T5/39z7Prv8dt/Oql4mR4HZJ3ccoXFxhVCzB9DT9JueJdSq6c1wzVZFupepVzxu34XVj + CaEDi1jX6hF8ZQoeokl4iBVwzV9YdU1XRlIl28eVo8phCdXwGltEeOUsro6psaHVwcSDh5volc4iOO8X + 7KuVwb1hEi7J8myq9PEQO//I85oafr0KtEpUpNSETm+AwWDAvfv3YTQaybnm/t/AyO6Ga+UonJOnIijF + 1hA9tWI2qle9RxcI+RIpmZpTIfBULhIyyqHVahHPKcN70TmYnFFCp9OhqXcc9KwW0DOHVl3YU1aUyjJu + F1SpfhO3EM6bMMsVt+D8Zhz2HIpC4oU6bG5uIu4cD3tfTwAjIBNypQYbGxsISquBU34PaDHiVEplGXee + SuIjVaBv3Lz7gJg8vHg4FlZvc+ATVoLipiHsD8qCXWAO7IPK8MG5FjLXKboOeoYADkldUkplGWb7vOb4 + 4BzxIXXQE/1m59WDXdgBvxPfwz6UC4eQUth/WIBDZ2qQXj+K7IYRImeE5s5fOFrcDPvPapcJzVNmmwVY + VxWG9U09uau1tTVymPpc0iYFLew7OEUJ4BwtALfvJpl5xMrKCu6s3cUrn5YbCM1us80CrJZZVWjXr7j3 + 4CE0y8v4IrcaH+cK4Bv+DRyPl8ApphYuia3wZ3eCUzOA1PIfcVuzjHnlIgK/vgy7mHzTG+w12yzA5E53 + edYPo1c2i/X1dQTEfwvbwDQ4hhXg8OcN4P48Df+UTrgkNIAeW4Hg3Hbo9Xq0iGSgs4ls5CUhoXnObLOA + S8pkhG/bdZzgDZJnffT3GXieLAA9XgB2/RjZjuQqMWhxfBw824H55XWyhcfy+HDNqoB1SH4Codn6G7iw + p3d78EaVPlXX0CaZgkqlgly1gpCiK0htHCH/IL6oFcEF3ZjT3CUvXqv0DzDSS0FPq1a/8EbYS5Rqa+if + SAJ8KoeNR7gitEsnoVQqSbGOkJmYX1ggxaY70SabwIGMUrjn8I3WIXnBRPnWu/8nDnE9Sd7cAaP/ZSES + 6/rRKJRArpiHXC7HzekZNIukiCyrhW9mGZgXa4w2kUVnibJnzdXbxP5URzyDO4QjxGl5i9uNpMZeKP5U + IrywAq9yCnGAOGGMonbYxpVnEPGdyR9BO/MTj8kfgXeNFPt5IngVtoF1kQ9WcTs8qgfgmNreQMS21xZL + 0E6Ln6ef75tg8sfgXT8O77oReAkkYNXJ4PRV/4ztyfo9VPTf4xjdf9CpQKzdxxuGe6UMbhXEmc8V6mze + r3qNivx3HGN7UmglQ6CVDMIxXwybo5UcaunJQD8te9rhyx4JrWwItlGNUut3y5+hlp4cDhFCpl14k9jq + nR+Y1NTjIe7NlmMnWKoHsOtvjWYcKpheqFQAAAAASUVORK5CYII= + + + + + iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 + YQUAAAAZdEVYdFNvZnR3YXJlAEFkb2JlIEltYWdlUmVhZHlxyWU8AAADZmlUWHRYTUw6Y29tLmFkb2Jl + LnhtcAAAAAAAPD94cGFja2V0IGJlZ2luPSLvu78iIGlkPSJXNU0wTXBDZWhpSHpyZVN6TlRjemtjOWQi + Pz4gPHg6eG1wbWV0YSB4bWxuczp4PSJhZG9iZTpuczptZXRhLyIgeDp4bXB0az0iQWRvYmUgWE1QIENv + cmUgNS4zLWMwMTEgNjYuMTQ1NjYxLCAyMDEyLzAyLzA2LTE0OjU2OjI3ICAgICAgICAiPiA8cmRmOlJE + RiB4bWxuczpyZGY9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkvMDIvMjItcmRmLXN5bnRheC1ucyMiPiA8 + cmRmOkRlc2NyaXB0aW9uIHJkZjphYm91dD0iIiB4bWxuczp4bXBNTT0iaHR0cDovL25zLmFkb2JlLmNv + bS94YXAvMS4wL21tLyIgeG1sbnM6c3RSZWY9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlw + ZS9SZXNvdXJjZVJlZiMiIHhtbG5zOnhtcD0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wLyIgeG1w + TU06T3JpZ2luYWxEb2N1bWVudElEPSJ4bXAuZGlkOjJGQzkyMzc0Rjk0OUU0MTE5NjNCQjRENDMzQjlC + MUM4IiB4bXBNTTpEb2N1bWVudElEPSJ4bXAuZGlkOjJERTg4QTFENEQyMjExRTRBODEyODk0M0RBMTc5 + Qjg3IiB4bXBNTTpJbnN0YW5jZUlEPSJ4bXAuaWlkOjJERTg4QTFDNEQyMjExRTRBODEyODk0M0RBMTc5 + Qjg3IiB4bXA6Q3JlYXRvclRvb2w9IkFkb2JlIFBob3Rvc2hvcCBDUzYgKFdpbmRvd3MpIj4gPHhtcE1N + OkRlcml2ZWRGcm9tIHN0UmVmOmluc3RhbmNlSUQ9InhtcC5paWQ6NjJGOUEyRDEyMTRERTQxMUIzNkJE NUVDQjU5MzE1NjIiIHN0UmVmOmRvY3VtZW50SUQ9InhtcC5kaWQ6MkZDOTIzNzRGOTQ5RTQxMTk2M0JC NEQ0MzNCOUIxQzgiLz4gPC9yZGY6RGVzY3JpcHRpb24+IDwvcmRmOlJERj4gPC94OnhtcG1ldGE+IDw/ - eHBhY2tldCBlbmQ9InIiPz6GKmpFAAAC+UlEQVRIS63T20vTYRzH8Yforj/Ei24UiSgKIygKi8oyxZQo - cvNYeXaesmzqPGu2POd0ulSsnIdaurTSTJ3O6UxTPGya5vCQx5AuPn39RbHop7nZxQt+z3ie93e/Z4w1 - p7nsCoBt8R6yBF/UHPv+Wb0rfFFzm99CRIwEW1gnqXzxTXxRc0ydctm4OlID2sxrw6iCtiwItC+A2P/D - frLnjwGNSZdMq6N1WOvLwFpP4l/WdRlY6Jaio9Ab7QXba8sVoDHZGdT8PYS9THDqMGnLsKpNw0qXGCua - BO55VZdNQ6U/DRRibVCGb+N1pH5bukoRqHmDHOIG1N8/X2F4I8WyNhtf2+9hqSsZxqZ4upbb6HsSZLHO - Im90ym6hNVcIaktYTexZyUelGEvaHMy/jcFiZxo0xX5Y7ivGcn8JkVmA9uvlWBmqwpJeAWovs+poR99O - eRgWtQWYVUdgrj0FH+i+F3XF3NoappZYGJrEoLaOVYpOOTY/FGJB+xjTqnDMtMTTAC/Ma/Ix/TLUKl9e - x0JfFQpql7PykBP7lWIXzPeUYLIhHCPKCLr/AMy2ZsKoDLTKdNNdvM8TgNpRTBZwfJ885CTmaIChPhwa - mS+GnkdhqjEWY9X+VplqvIMXEhdQ24mZeuSs0N/BNNWWj4k6EdSZHhhXxWH0aSCGFd4c4Tk7zk7XBlUM - FKLToK4Nm+0qYnneRzqGGiSYaIiiyZdhVCdgqFSIwRJPjucZW85O1pvnRmvDkO9zFNTdy2Y6HjGp4HCF - 5kk4xhoiURd/EROv4tBfeM0qAyUC9Mp9QM0+7o829T6LZV0/mNycS6+nFKFWfAGj9ZHozfGwil7miZYH - 7qCmghsw+S6VpV894KuUuKFbfhNNqa749CwY3dm0toK+VABl3HlQM5obYHybwFLc7W1y/Y5BlX6FfgNn - DNcEY0DhZZX+MiGKbh0DNR24AYYWMSfJzc6GZBApwS5skIzNODcg0dV2V36FtsJ7yBJ8UXO8hyzBFzXH - ++H/A/YDv9/V87iOlrYAAAAASUVORK5CYII= + eHBhY2tldCBlbmQ9InIiPz6wJF34AAACl0lEQVRIS62Vy08TURSH73/QhQtXVnBhxEcMiUkhbEg0hB1R + Q1i68C8wIW5cEqMLN7ho2Ji4YiEhWq0prYUhfULbadN3obTaChobtZEUsFY9nnPS6WM6HYowyZf87j33 + nG/amaai9geOBYA+4pTxihmBE8DcTQB4J8em/9IwSQyagmrtL+z9rMFmvnhkKvtV7tcVHPz6DVsftulA + AckdhUg8zf19eoLKAd597iMLMItewfOxUDTN/bqCH3tVSG8VWIBZ9AoJApEk9+sKvu/uQ2IjzwJkGtH8 + OrTwy3Hu77vIAnV9mgWlcgWiqRwLjAMmkOMbPbNTKnN/JJntqJGEBZ++7oKcyLLgLN4JrU8Cms2C4pcy + BKKZumCI18temQ/8DzSLZlBmQX7nG/jCKdpgAa0driCtY5iFHuqHSjNoFtaags1iCdzBBG+QgNY2aZ0F + mIUe6osENAtrTUEq/7kDq9PHAszU5yYoq9f1i9cUSCD5ozxDEeTsrhAoONwyxLLb8MrhYQFmZYCHsnpd + v3hNgQROb5hnKIK29944MAThTBEWbS4WYBZ6qC/sKSy5ZJ6BGUQg8b4Bbhjod4AZXlhXWdBa10LrIVul + AM9ggS+aa6AIMMO8ZYUO0KeyIOMtZyaQpXpNi4LFucYzMINwhbMNcMNw5oIJMMNKIA0LNg88mZuH/ssj + dPgBMnN+cBRmny1wrRtSMMMzWCCFMg0UAeY2Fh0+GL5xG8Zu3oHXUrCj3g0WONdTbeBm21/o1N17gPtg + 98Xh3VoS3qzKMDI22agfglnY/Uld8NDc/ZlZwAwvl4Ngun6LGh8rdfVDViNs3rguOOzq6XOD8PDpc7g2 + OkHDH7XWtYa2It66Y4eCQ8cRfpvUNa2hTUD8A6JMaBvCyTdJAAAAAElFTkSuQmCC + + + + + iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 + YQUAAAAZdEVYdFNvZnR3YXJlAEFkb2JlIEltYWdlUmVhZHlxyWU8AAADZmlUWHRYTUw6Y29tLmFkb2Jl + LnhtcAAAAAAAPD94cGFja2V0IGJlZ2luPSLvu78iIGlkPSJXNU0wTXBDZWhpSHpyZVN6TlRjemtjOWQi + Pz4gPHg6eG1wbWV0YSB4bWxuczp4PSJhZG9iZTpuczptZXRhLyIgeDp4bXB0az0iQWRvYmUgWE1QIENv + cmUgNS4zLWMwMTEgNjYuMTQ1NjYxLCAyMDEyLzAyLzA2LTE0OjU2OjI3ICAgICAgICAiPiA8cmRmOlJE + RiB4bWxuczpyZGY9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkvMDIvMjItcmRmLXN5bnRheC1ucyMiPiA8 + cmRmOkRlc2NyaXB0aW9uIHJkZjphYm91dD0iIiB4bWxuczp4bXBNTT0iaHR0cDovL25zLmFkb2JlLmNv + bS94YXAvMS4wL21tLyIgeG1sbnM6c3RSZWY9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlw + ZS9SZXNvdXJjZVJlZiMiIHhtbG5zOnhtcD0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wLyIgeG1w + TU06T3JpZ2luYWxEb2N1bWVudElEPSJ4bXAuZGlkOjJGQzkyMzc0Rjk0OUU0MTE5NjNCQjRENDMzQjlC + MUM4IiB4bXBNTTpEb2N1bWVudElEPSJ4bXAuZGlkOkUzNzJDMjE3NEFENjExRTRCNjE0OEVEQzI4MEM0 + RTZDIiB4bXBNTTpJbnN0YW5jZUlEPSJ4bXAuaWlkOkUzNzJDMjE2NEFENjExRTRCNjE0OEVEQzI4MEM0 + RTZDIiB4bXA6Q3JlYXRvclRvb2w9IkFkb2JlIFBob3Rvc2hvcCBDUzYgKFdpbmRvd3MpIj4gPHhtcE1N + OkRlcml2ZWRGcm9tIHN0UmVmOmluc3RhbmNlSUQ9InhtcC5paWQ6RkI3NUQ0QkNENDRBRTQxMTk3NEFD + QUFFQjRCMzVENkUiIHN0UmVmOmRvY3VtZW50SUQ9InhtcC5kaWQ6MkZDOTIzNzRGOTQ5RTQxMTk2M0JC + NEQ0MzNCOUIxQzgiLz4gPC9yZGY6RGVzY3JpcHRpb24+IDwvcmRmOlJERj4gPC94OnhtcG1ldGE+IDw/ + eHBhY2tldCBlbmQ9InIiPz6PyaLfAAADMElEQVRIS6VUXUiTYRT+vi3Tzd+ps23+3KRigtiPkolEQReG + UYTkhWatpWlWGkRdddfdSPImqUAJjSIT00oxLJIk0cR+tFSyzDJtgaMkDEPkdM7ZPvm2vS6jBx6es3Pe + 8zzvtm+TohLS/ov+AACStLgEQuJyLRJWYK1yzh/+FgCoQrpnfM4fOGBhcUlIMkEVkma4H4i1y2kFcMD8 + wqKQZILKZqTqmlTAWrfvMjhgbv63Dwm0hLWQohn1eNEbzrlfPiTQAtZCKjP1GXdAIC+r4XD+9CGBFrDm + RVJ1re6pZ0GyHHMvIawauYVNCFPfvvuQQAtYC6meKXU0amNsaGN/ZR60xIf9aIgN3cpGE9OzZCZ85nEm + pGiWlLABmuJCnUOXrNB7chdct4TUo32ANDbp4NuielDpqWfePdaPX6GrohSK4uLhlCEo96YlZLbOFHzH + oJXjMSBcGn4/zQGovEDqXXtzeTb+BTrKj0J3+Q54djYP7EZdTU2MPjFSK8eieQR9QtLg6GcOQPWgqKeQ + ZyOfoK30CDw+lg2Ot3Z4VLoNqo269mCNHIa2WjYn9A1PcAAqU6m9VV3TF9psOwwPS3JgZugCdNoyocwU + jU+RlImWBpezGz0vxzkA1YOiHvPFO7Ca1kGHLQtmXp2HdutmqN+/F6JiU+h3kOpyVeHJwBgHoLIpqajm + 189HoaG4CNqsGTA1UAWth9Lg6r490PygGyLjUikgzuWqQlffCAegelDdUwLqigqhpXgjTPYeh+bCFCg2 + RkEk3vxuVz/P0c43oLP3DQegLhspNalSFxiNcLswHT48LYNbBUlQk7ebzenmyhm08w1o7xmiAP6hRZiT + 70eYkzpctUuJWdHmwWs74+F1Uz7cyE+E4ohQB5mHm9a3GywpTXzektyKduIAIsKI3ISkL4rIdYle05C9 + VrZVBmvtl7eboUyv7V4jSQdwRn8FdI72iErtCUxnIuifkJ5hUqUOq9Jr7OeCNU6bTpNVqtMcDJSldOwn + KnOk+jypJ5QANRWc0cs5SEelXr54QidfwVYAMoiHq4W/gNM6OaNCJ+diaUIqN/43+Atwg27t+9ZXBUn6 + A2MdqQeVc5pWAAAAAElFTkSuQmCC + + + + + iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAIAAABvFaqvAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 + YQUAAAAZdEVYdFNvZnR3YXJlAEFkb2JlIEltYWdlUmVhZHlxyWU8AAADZmlUWHRYTUw6Y29tLmFkb2Jl + LnhtcAAAAAAAPD94cGFja2V0IGJlZ2luPSLvu78iIGlkPSJXNU0wTXBDZWhpSHpyZVN6TlRjemtjOWQi + Pz4gPHg6eG1wbWV0YSB4bWxuczp4PSJhZG9iZTpuczptZXRhLyIgeDp4bXB0az0iQWRvYmUgWE1QIENv + cmUgNS4zLWMwMTEgNjYuMTQ1NjYxLCAyMDEyLzAyLzA2LTE0OjU2OjI3ICAgICAgICAiPiA8cmRmOlJE + RiB4bWxuczpyZGY9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkvMDIvMjItcmRmLXN5bnRheC1ucyMiPiA8 + cmRmOkRlc2NyaXB0aW9uIHJkZjphYm91dD0iIiB4bWxuczp4bXBNTT0iaHR0cDovL25zLmFkb2JlLmNv + bS94YXAvMS4wL21tLyIgeG1sbnM6c3RSZWY9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlw + ZS9SZXNvdXJjZVJlZiMiIHhtbG5zOnhtcD0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wLyIgeG1w + TU06T3JpZ2luYWxEb2N1bWVudElEPSJ4bXAuZGlkOjJGQzkyMzc0Rjk0OUU0MTE5NjNCQjRENDMzQjlC + MUM4IiB4bXBNTTpEb2N1bWVudElEPSJ4bXAuZGlkOjUzQzNGNDI5NEQyQzExRTQ4QkE1QUNCMEVDRDZF + MDVEIiB4bXBNTTpJbnN0YW5jZUlEPSJ4bXAuaWlkOjUzQzNGNDI4NEQyQzExRTQ4QkE1QUNCMEVDRDZF + MDVEIiB4bXA6Q3JlYXRvclRvb2w9IkFkb2JlIFBob3Rvc2hvcCBDUzYgKFdpbmRvd3MpIj4gPHhtcE1N + OkRlcml2ZWRGcm9tIHN0UmVmOmluc3RhbmNlSUQ9InhtcC5paWQ6RkI1NUY4OTYyQTRERTQxMUIzNkJE + NUVDQjU5MzE1NjIiIHN0UmVmOmRvY3VtZW50SUQ9InhtcC5kaWQ6MkZDOTIzNzRGOTQ5RTQxMTk2M0JC + NEQ0MzNCOUIxQzgiLz4gPC9yZGY6RGVzY3JpcHRpb24+IDwvcmRmOlJERj4gPC94OnhtcG1ldGE+IDw/ + eHBhY2tldCBlbmQ9InIiPz6IsaOmAAADF0lEQVQ4T62U/UuTURTH+0nICqRI1ERMMyNQe8N0ChqBwQhN + yvwhEgJjVCqJ/qCibZo6tzQ339h6Nre5prapUzc1XzItX1ilzuWMLLVAen+xf6DTuTxjdxsFVj58ebjc + c+7nnud7z3228DbpIaDFH/CfoqCn72DIDvNfPDM2KAqyr8PcJxqY+QBTb8kkjocXQTsKigGwfqYJHqIg + 1OxHGHvlWPx4hXB1YyA3g4CBhqst+piEnrDA3rA95vBAY1x8d7lq/DVZwm5PQZNvoKYdypSgHgbVEIh1 + cLOZzOCbSSsyRQRba6uWtcpVLbPcwlglInNUCJNWWKqABqMLCGvGlfpJELaQ/V1Vd1lujAhe0chtUrH5 + ZExnmJ85MdomEa+qZMbIEF2BHGunILSjdZwYgTt4gJqjjj0Rltml1Zq9AeL0Mn71Wn2mtDU80MIvsFTw + O+KPIoWC8BNYRIUaqrRQroJKjQOk9N+xLBF2pXJFKfnsDGYa8gS6xOO2whyMuoHaHpGzZ/pBM0IMrtXD + nT4HqNHXe0lYoogMFeQP4jbSDkCPTUyXmnNoPutSo+9WN5DEQDyeWCWnhqm4p7Oimt3b54rzmmKPVHKz + 0Xg0AU1pz87VJp+yXOfd9t3mBmLXsGrsJhSsDtF4iOWxKdpzyQNnuRW7vEUp13obFG05OVUBPtO5V1Sn + k5q4SX8ENfWA6C7xHsP981Bb2sf38ZKd4JhSuXUJHPHhg/WJnAeZFw0Xzt/w8erRtLmBnB/CSmaC599I + 2PYVRl+CXigu3R9SfCC0Pf1MZ1oqvqvjogX7gtRFJfb1n24g7GblfQcFP2fkBYm5anxqQcbLKgzyK/Df + WRTkV5+RMTg84ZrgAOHo4ZIDVNdJw67CpsVLZ5gifj97Typlq2ZFQXj8LKh5EHpnaIar8N+Al5l9Y9Vs + T7OiIAzjqaMsa6QJnBkeWvgOHdPkAuIV67PSeQpCYYZplsZ+KyyWLRyFF8D553EDbURY770J0rrYJbda + SYE4iWb9NcgpRKDrOMAWwYP6d5BTaC52zyaAWDlAm/DweL8AX9zXukfxHsIAAAAASUVORK5CYII= + + + + + iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 + YQUAAAAZdEVYdFNvZnR3YXJlAEFkb2JlIEltYWdlUmVhZHlxyWU8AAADZmlUWHRYTUw6Y29tLmFkb2Jl + LnhtcAAAAAAAPD94cGFja2V0IGJlZ2luPSLvu78iIGlkPSJXNU0wTXBDZWhpSHpyZVN6TlRjemtjOWQi + Pz4gPHg6eG1wbWV0YSB4bWxuczp4PSJhZG9iZTpuczptZXRhLyIgeDp4bXB0az0iQWRvYmUgWE1QIENv + cmUgNS4zLWMwMTEgNjYuMTQ1NjYxLCAyMDEyLzAyLzA2LTE0OjU2OjI3ICAgICAgICAiPiA8cmRmOlJE + RiB4bWxuczpyZGY9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkvMDIvMjItcmRmLXN5bnRheC1ucyMiPiA8 + cmRmOkRlc2NyaXB0aW9uIHJkZjphYm91dD0iIiB4bWxuczp4bXBNTT0iaHR0cDovL25zLmFkb2JlLmNv + bS94YXAvMS4wL21tLyIgeG1sbnM6c3RSZWY9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlw + ZS9SZXNvdXJjZVJlZiMiIHhtbG5zOnhtcD0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wLyIgeG1w + TU06T3JpZ2luYWxEb2N1bWVudElEPSJ4bXAuZGlkOjJGQzkyMzc0Rjk0OUU0MTE5NjNCQjRENDMzQjlC + MUM4IiB4bXBNTTpEb2N1bWVudElEPSJ4bXAuZGlkOkVENUYwQThBNEQyOTExRTQ5QzUzQzdFMkFGQkQy + NTA1IiB4bXBNTTpJbnN0YW5jZUlEPSJ4bXAuaWlkOkVENUYwQTg5NEQyOTExRTQ5QzUzQzdFMkFGQkQy + NTA1IiB4bXA6Q3JlYXRvclRvb2w9IkFkb2JlIFBob3Rvc2hvcCBDUzYgKFdpbmRvd3MpIj4gPHhtcE1N + OkRlcml2ZWRGcm9tIHN0UmVmOmluc3RhbmNlSUQ9InhtcC5paWQ6MkRGNkEzOUYyOTRERTQxMUIzNkJE + NUVDQjU5MzE1NjIiIHN0UmVmOmRvY3VtZW50SUQ9InhtcC5kaWQ6MkZDOTIzNzRGOTQ5RTQxMTk2M0JC + NEQ0MzNCOUIxQzgiLz4gPC9yZGY6RGVzY3JpcHRpb24+IDwvcmRmOlJERj4gPC94OnhtcG1ldGE+IDw/ + eHBhY2tldCBlbmQ9InIiPz6npMy1AAAGEUlEQVRIS7WVeVDUZRjHf7Ase8ECu+wl4LIXcqyyHC783AWW + 5QaRFTHkMi9SQvE+UhLzwk0BUcQSgQBBgcYDzStMSzOPcpqcmo5pmqk/+rOapqb+iG/PbzfFcSz/6pn5 + zPN739/7fp/nvZn/3TSLjj+XJy2/RaItPCT5vaBd8m1+q2Qku1lcrcvki+iXr7fFU6ZZeOx5KDU1b7jU + 1Z2bVPMPWNMbRXrXkWAc+ywVLbcS8fKwFjlu8VdpW0XzSc6f8PEIPzJ19dFnU3WEJdHL9P3X9O1nkdB8 + CQrX7i3mKn9zfqsUq29ZsPfjRBx5aMO2cTMy94gm7FuF7XyJTwDJTo5GVdHxNALVgsPd5Ceye+9g8b0f + UXbjB8RtH4Msd+MeXS7f6twjxbILZiy7pEHDtTBsvG7BqivTUXpsClLWCbtJNpDwBlGVH3ySIFV520eW + nedRcf0HVJGwbeRrOHs/h2n1CGRZDe7wND/W1hiI8sEYlJ4KRcVpJcrfVqByNBILhqLh3KeA+UXBOpL2 + jkRZduARPGXZ/vH4pnMou/gd7INfIPn4QyQc/RSOzk9hrBtEiKPerUn1Y5PXBaDojWlwdgUjr0+G/H4Z + cnpCUNJrQNZ+LeLrBD/LYnixFEDAKFz7vJQ0r49dO4zikS8x8/ADxLd9jIT2B5ix/z7SX78Pw+K3EJy2 + wq1M4rEz6sRwthgw82Ag2KNS2I5JPZ4rZx00ImGNHIZSfisFkDGhxbs5AkKLd/3kaLkDlgTjXrsNc/Md + mPfeQeyOD2HbcRu6yi4E2Wrd8ngeG71IBPtePWa4JUhsD0DykQAkHQqApUWCFLcGyZvDoZ/P/5oCTGXk + hU2MvGB7rbGmG47dd2Fa+x6iX/kAMa/eQvS2m4jaeAPspvcROb8TQexid3CcL2usFCJjnwE5nQYU9RhR + PGDC7D4TCrqMyDqkR9oePbRz/SZEKh8rI8vdyshyXhmzLD8DS/1VGOquwtgw7glkXH0Nhvp3kbL2GrSl + hyC11ril03xZfbkQKZuVsDeq4NihRtYuDbJ2auBoUsO2TQXrJiWMlWIExflWMiHOjRzfJy0bg776HCKX + vANd7WXol1/xeN3Si7A2XIXW1YbAxAq3UO0zPTSd1yG38bplLK//vxBrffKY4PQ1HH9aKk8jonQUUyvO + Qlt9HtqaCx4/tXIMyXWXMXXOAQTEv+D2zCvDhBBTCN1zCGOCZq3k+DXO1YcpRYOY4hpF2LzTCCs74/VE + 3IvnEVd1EhGFblBbWot6BKXWQZq64tlYa2+TuJwQM9KU5cRL35hyOxCe2w913hA0hcPQFI16KRzxEFtO + a1Q9htSVN5C+5S5x7x/uIm3DR7CvuomUReOImt1FU7nwEolHECImMGkJE5i46EJkejNM+X1QOPqhzBqC + KvskVDmnJuHKT/K4bgjKzBMItXcjJv84NOwWiKPndJK40TOCgPgaRmIur1dZ1yM6txvyWT0ITR+AImOQ + gg39N1ybDBJP60PorC5My3oTwQm18FdNryBxbq0EJL6AEUTYZBTkF0NGKyKdvZDb3qJOAxSIOqcP/jtp + JyC3D1BSvYgp6EN4aiNlP/cTEk4gFASPEUeXkWd8RaY5jcrEBkTn9UCT4Q3gzfBfRvJE9rrsfpicHSRe + NsFXmJeSXhTBXXY+jMjk8uArVkpExuKb6pkbYJ7L7Ria37xTUBeMeCkcncRTN0z/TyLKNYy4khNQJq2G + IMLBXdUWQkXwCYYR6md7IPP1k8WEC3UFDzSpG2BZeAZJtXQWFpyls3HOC50JzkdQnbFqDInLLiC2rBcq + 6xoSzzzP+NDVwDBaQkx4XzahNv8xZH48sVotCHeOUnnCWNJG18Q4UjddB7vlfbBbPwC7+YannLTyIrS5 + OyHU5v3hr07poL7JBHe4Jh8bzgQROY8h46IKCAVfbi73D3PcpfoJlX0VtEVN0JXsQlj2ZoRaaynj7N/8 + NfZLPLFmHrXnpiWSCCL8iMl32T/M6YGMq+R+covD7QADwfoIgqt4QVGtfvIZJ4lRv5CY4zypbjfjy+eE + M4l4gtuSwYSQ4DS4EZAew/wNiCYQJlvQU3cAAAAASUVORK5CYII= @@ -1054,142 +1272,6 @@ R2K5fxKLWbbp/7Dc0CBY8Q+pPmOq0VkzzQAAAABJRU5ErkJggg== - - - iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAZdEVYdFNvZnR3YXJlAEFkb2JlIEltYWdlUmVhZHlxyWU8AAADZmlUWHRYTUw6Y29tLmFkb2Jl - LnhtcAAAAAAAPD94cGFja2V0IGJlZ2luPSLvu78iIGlkPSJXNU0wTXBDZWhpSHpyZVN6TlRjemtjOWQi - Pz4gPHg6eG1wbWV0YSB4bWxuczp4PSJhZG9iZTpuczptZXRhLyIgeDp4bXB0az0iQWRvYmUgWE1QIENv - cmUgNS4zLWMwMTEgNjYuMTQ1NjYxLCAyMDEyLzAyLzA2LTE0OjU2OjI3ICAgICAgICAiPiA8cmRmOlJE - RiB4bWxuczpyZGY9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkvMDIvMjItcmRmLXN5bnRheC1ucyMiPiA8 - cmRmOkRlc2NyaXB0aW9uIHJkZjphYm91dD0iIiB4bWxuczp4bXBNTT0iaHR0cDovL25zLmFkb2JlLmNv - bS94YXAvMS4wL21tLyIgeG1sbnM6c3RSZWY9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlw - ZS9SZXNvdXJjZVJlZiMiIHhtbG5zOnhtcD0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wLyIgeG1w - TU06T3JpZ2luYWxEb2N1bWVudElEPSJ4bXAuZGlkOjJGQzkyMzc0Rjk0OUU0MTE5NjNCQjRENDMzQjlC - MUM4IiB4bXBNTTpEb2N1bWVudElEPSJ4bXAuZGlkOjlDMzFEOUI4NEFBRjExRTQ4OTA5OUYwQ0QzM0Q2 - NEI4IiB4bXBNTTpJbnN0YW5jZUlEPSJ4bXAuaWlkOjlDMzFEOUI3NEFBRjExRTQ4OTA5OUYwQ0QzM0Q2 - NEI4IiB4bXA6Q3JlYXRvclRvb2w9IkFkb2JlIFBob3Rvc2hvcCBDUzYgKFdpbmRvd3MpIj4gPHhtcE1N - OkRlcml2ZWRGcm9tIHN0UmVmOmluc3RhbmNlSUQ9InhtcC5paWQ6MDk5Mzk2NTZBRjRBRTQxMTk3NEFD - QUFFQjRCMzVENkUiIHN0UmVmOmRvY3VtZW50SUQ9InhtcC5kaWQ6MkZDOTIzNzRGOTQ5RTQxMTk2M0JC - NEQ0MzNCOUIxQzgiLz4gPC9yZGY6RGVzY3JpcHRpb24+IDwvcmRmOlJERj4gPC94OnhtcG1ldGE+IDw/ - eHBhY2tldCBlbmQ9InIiPz73sIMwAAADIElEQVRIS7WVa0iTYRTH56Uiysvm3TkvpLl5DRIvQYWVWl+6 - iNEVg0yhQqloQZHkLT+Y0YdAs75IpEUhzERZoZhsRpZlS7soblotsRwoxhqWeTrnYZtv+u7NsB74cZ5z - zv89/z17HzYRAPxXeIv/EpFXcOyi4BvKhfehv4FvKBfeh+ayqIUDlIgBgT8whpRYoT2fhgvNVJKBQT9s - hB8/QZDPpnEIjEhg0J5Pw4Vm0mwygG9T06BSqQQhTUhUMoRGpyxYT7OZwfhXC6jVakFIYzNYqN5uMGKa - BI1GIwhpghXJaJJi13d0dEB2bj74hsWzSDlXbzfQG02g0+kEIU2wIomdovzKdVifngnFFytBeb4cLN+n - WaSc6hfKKqB/eHTWoHfwExgMBkFII5MnQUD4WlAWloO26wVs35MDmifPmQFFyqlO/aKKqlmDp31DYDKZ - BCGNTJ4IPqHx8LJvACbNUw7p6e2HuJQMNIhhBuaHj3vBYrEI0tb1BoIiE9kJ9h7Oh7EJM+g/jEJuwVlY - s24ri5RTnfo5BedAIoueIYPumvomuHzjzm9cq2uCq7UNUH2rEarr7kNd0yP26Y+eKoSWtk4wfpmAg7kn - ITY5DUorq1g8cOQEqze3aplOEhRtJoMcL1mMTixV9IgD5a/tSBVDYql8AKOBQLEJtTP08gY/jjFiktKg - 5FIV21Ok3NazvmR2AvrFkCAJyGYk1comZAuHDM/AyLvHThfBveZ26NOPwI59eey7LsbhFCmnOvVJ5+Ef - rrYZLEU8EZ85+HLwW7ZCLMVTFWdkHoLut+/hgbYHaE9XN31XNsupTrWV3jKVs+uS3cyAD0cLe331jW3Q - qRt0CPUlQVHDKI+fN9iGo4W90uNnyuA2vvRtWTlQgxeg/dk7FimnOvU9/CNqUe47b7ANRwt7AfjpKvAK - Gt18Qur35ymhRfsKKLr5hN7EyzDq7humWrrcfSfKxbz/QlwcLDck1snZJdUzYHUDmk57+K1qdXJyzsL6 - RmQD9ZmObygXB8sVIRO6fXQB4hC6eRQppzr1XXmHclnAckFomLc1Um5dItEvhZ97MQXP9N0AAAAASUVO - RK5CYII= - - - - - iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAZdEVYdFNvZnR3YXJlAEFkb2JlIEltYWdlUmVhZHlxyWU8AAADZmlUWHRYTUw6Y29tLmFkb2Jl - LnhtcAAAAAAAPD94cGFja2V0IGJlZ2luPSLvu78iIGlkPSJXNU0wTXBDZWhpSHpyZVN6TlRjemtjOWQi - Pz4gPHg6eG1wbWV0YSB4bWxuczp4PSJhZG9iZTpuczptZXRhLyIgeDp4bXB0az0iQWRvYmUgWE1QIENv - cmUgNS4zLWMwMTEgNjYuMTQ1NjYxLCAyMDEyLzAyLzA2LTE0OjU2OjI3ICAgICAgICAiPiA8cmRmOlJE - RiB4bWxuczpyZGY9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkvMDIvMjItcmRmLXN5bnRheC1ucyMiPiA8 - cmRmOkRlc2NyaXB0aW9uIHJkZjphYm91dD0iIiB4bWxuczp4bXBNTT0iaHR0cDovL25zLmFkb2JlLmNv - bS94YXAvMS4wL21tLyIgeG1sbnM6c3RSZWY9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlw - ZS9SZXNvdXJjZVJlZiMiIHhtbG5zOnhtcD0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wLyIgeG1w - TU06T3JpZ2luYWxEb2N1bWVudElEPSJ4bXAuZGlkOjJGQzkyMzc0Rjk0OUU0MTE5NjNCQjRENDMzQjlC - MUM4IiB4bXBNTTpEb2N1bWVudElEPSJ4bXAuZGlkOjhDMTdBQjRENEFBRTExRTQ4QjQyODY0MDNBNTJE - NzNCIiB4bXBNTTpJbnN0YW5jZUlEPSJ4bXAuaWlkOjhDMTdBQjRDNEFBRTExRTQ4QjQyODY0MDNBNTJE - NzNCIiB4bXA6Q3JlYXRvclRvb2w9IkFkb2JlIFBob3Rvc2hvcCBDUzYgKFdpbmRvd3MpIj4gPHhtcE1N - OkRlcml2ZWRGcm9tIHN0UmVmOmluc3RhbmNlSUQ9InhtcC5paWQ6NUQyMjc4QTlBQjRBRTQxMTk3NEFD - QUFFQjRCMzVENkUiIHN0UmVmOmRvY3VtZW50SUQ9InhtcC5kaWQ6MkZDOTIzNzRGOTQ5RTQxMTk2M0JC - NEQ0MzNCOUIxQzgiLz4gPC9yZGY6RGVzY3JpcHRpb24+IDwvcmRmOlJERj4gPC94OnhtcG1ldGE+IDw/ - eHBhY2tldCBlbmQ9InIiPz4eHsDfAAAB00lEQVRIS7XVWytEURQH8HniTTNHLs0NCXNcXjTN5dH9g/gM - 3jx590QhFDJS0gyTGmpqaqJIMW4hzlAoOaWISS7LWifntI3ddnTGrl92e/57/We/DBsA/CvuYSHZSr0t - lvCGsriX/oI3lMW9lM/SwgF9SEHwizs08IX2vAyLZvZRgXJ+cQWv7yB0q96Ds86voT0vw6KZNJsK4Pnl - DWKxmBBlqhpDUN0UNp2n2VrB/WMOEomEEGX0ArN5o+BGfYB0Oi1EGa8cwpKw6bxRcH6lQiaTEaKMVw5q - rzCbNwr2z65BURQhynh8Qe0VZvNGwdZBFlRVFaKMxxfQXmE2rxc8rW3sQy6XE0puHoG7IaC9YnV9j5th - pbZPqOCDCrbH5uIwOD7/zWgkDkNTizAyuwQjkWWIxFNQWduqmVxI/MiPz6/A8HTUuDMTTYLkbrqhgt5S - T3PG4ZJ3HE7focElZx0u3yn+VQiG1ZLymmm7s74f88f42S6bl9zyJZ6d6Xckd+Mt5ieogH4xJORHHajt - SzvqZPSgECpHZSiA2DztuxBlad+NgnpBEbIjusiiYboKRF+kGFHegUR5ImkFv7G0eAPzWVq8gfksLd5/ - oULiHhYS97BwwPYJlSCUgVubViQAAAAASUVORK5CYII= - - - - - iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAZdEVYdFNvZnR3YXJlAEFkb2JlIEltYWdlUmVhZHlxyWU8AAADZmlUWHRYTUw6Y29tLmFkb2Jl - LnhtcAAAAAAAPD94cGFja2V0IGJlZ2luPSLvu78iIGlkPSJXNU0wTXBDZWhpSHpyZVN6TlRjemtjOWQi - Pz4gPHg6eG1wbWV0YSB4bWxuczp4PSJhZG9iZTpuczptZXRhLyIgeDp4bXB0az0iQWRvYmUgWE1QIENv - cmUgNS4zLWMwMTEgNjYuMTQ1NjYxLCAyMDEyLzAyLzA2LTE0OjU2OjI3ICAgICAgICAiPiA8cmRmOlJE - RiB4bWxuczpyZGY9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkvMDIvMjItcmRmLXN5bnRheC1ucyMiPiA8 - cmRmOkRlc2NyaXB0aW9uIHJkZjphYm91dD0iIiB4bWxuczp4bXBNTT0iaHR0cDovL25zLmFkb2JlLmNv - bS94YXAvMS4wL21tLyIgeG1sbnM6c3RSZWY9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlw - ZS9SZXNvdXJjZVJlZiMiIHhtbG5zOnhtcD0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wLyIgeG1w - TU06T3JpZ2luYWxEb2N1bWVudElEPSJ4bXAuZGlkOjJGQzkyMzc0Rjk0OUU0MTE5NjNCQjRENDMzQjlC - MUM4IiB4bXBNTTpEb2N1bWVudElEPSJ4bXAuZGlkOjJEMDQyOEZBNEFEMjExRTRBN0MxRDBCNzJGRUND - MDEzIiB4bXBNTTpJbnN0YW5jZUlEPSJ4bXAuaWlkOjJEMDQyOEY5NEFEMjExRTRBN0MxRDBCNzJGRUND - MDEzIiB4bXA6Q3JlYXRvclRvb2w9IkFkb2JlIFBob3Rvc2hvcCBDUzYgKFdpbmRvd3MpIj4gPHhtcE1N - OkRlcml2ZWRGcm9tIHN0UmVmOmluc3RhbmNlSUQ9InhtcC5paWQ6QkRDRkI1RDVEMTRBRTQxMTk3NEFD - QUFFQjRCMzVENkUiIHN0UmVmOmRvY3VtZW50SUQ9InhtcC5kaWQ6MkZDOTIzNzRGOTQ5RTQxMTk2M0JC - NEQ0MzNCOUIxQzgiLz4gPC9yZGY6RGVzY3JpcHRpb24+IDwvcmRmOlJERj4gPC94OnhtcG1ldGE+IDw/ - eHBhY2tldCBlbmQ9InIiPz59jfe3AAAEbUlEQVRIS8WTeUybZRzHF48/pnFOuQRajkFLgQFb5iRLNJr4 - l/EPgsniUI4xZDAY1zyxwApsMJyIME61rByl3DfoYGBrgbWUY06FcZSCha4rQ8jYxkqPr2/fvkv8o2Sg - S/wkT970eb6/T5/39z7Prv8dt/Oql4mR4HZJ3ccoXFxhVCzB9DT9JueJdSq6c1wzVZFupepVzxu34XVj - CaEDi1jX6hF8ZQoeokl4iBVwzV9YdU1XRlIl28eVo8phCdXwGltEeOUsro6psaHVwcSDh5volc4iOO8X - 7KuVwb1hEi7J8myq9PEQO//I85oafr0KtEpUpNSETm+AwWDAvfv3YTQaybnm/t/AyO6Ga+UonJOnIijF - 1hA9tWI2qle9RxcI+RIpmZpTIfBULhIyyqHVahHPKcN70TmYnFFCp9OhqXcc9KwW0DOHVl3YU1aUyjJu - F1SpfhO3EM6bMMsVt+D8Zhz2HIpC4oU6bG5uIu4cD3tfTwAjIBNypQYbGxsISquBU34PaDHiVEplGXee - SuIjVaBv3Lz7gJg8vHg4FlZvc+ATVoLipiHsD8qCXWAO7IPK8MG5FjLXKboOeoYADkldUkplGWb7vOb4 - 4BzxIXXQE/1m59WDXdgBvxPfwz6UC4eQUth/WIBDZ2qQXj+K7IYRImeE5s5fOFrcDPvPapcJzVNmmwVY - VxWG9U09uau1tTVymPpc0iYFLew7OEUJ4BwtALfvJpl5xMrKCu6s3cUrn5YbCM1us80CrJZZVWjXr7j3 - 4CE0y8v4IrcaH+cK4Bv+DRyPl8ApphYuia3wZ3eCUzOA1PIfcVuzjHnlIgK/vgy7mHzTG+w12yzA5E53 - edYPo1c2i/X1dQTEfwvbwDQ4hhXg8OcN4P48Df+UTrgkNIAeW4Hg3Hbo9Xq0iGSgs4ls5CUhoXnObLOA - S8pkhG/bdZzgDZJnffT3GXieLAA9XgB2/RjZjuQqMWhxfBw824H55XWyhcfy+HDNqoB1SH4Codn6G7iw - p3d78EaVPlXX0CaZgkqlgly1gpCiK0htHCH/IL6oFcEF3ZjT3CUvXqv0DzDSS0FPq1a/8EbYS5Rqa+if - SAJ8KoeNR7gitEsnoVQqSbGOkJmYX1ggxaY70SabwIGMUrjn8I3WIXnBRPnWu/8nDnE9Sd7cAaP/ZSES - 6/rRKJRArpiHXC7HzekZNIukiCyrhW9mGZgXa4w2kUVnibJnzdXbxP5URzyDO4QjxGl5i9uNpMZeKP5U - IrywAq9yCnGAOGGMonbYxpVnEPGdyR9BO/MTj8kfgXeNFPt5IngVtoF1kQ9WcTs8qgfgmNreQMS21xZL - 0E6Ln6ef75tg8sfgXT8O77oReAkkYNXJ4PRV/4ztyfo9VPTf4xjdf9CpQKzdxxuGe6UMbhXEmc8V6mze - r3qNivx3HGN7UmglQ6CVDMIxXwybo5UcaunJQD8te9rhyx4JrWwItlGNUut3y5+hlp4cDhFCpl14k9jq - nR+Y1NTjIe7NlmMnWKoHsOtvjWYcKpheqFQAAAAASUVORK5CYII= - - - - - iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAZdEVYdFNvZnR3YXJlAEFkb2JlIEltYWdlUmVhZHlxyWU8AAADZmlUWHRYTUw6Y29tLmFkb2Jl - LnhtcAAAAAAAPD94cGFja2V0IGJlZ2luPSLvu78iIGlkPSJXNU0wTXBDZWhpSHpyZVN6TlRjemtjOWQi - Pz4gPHg6eG1wbWV0YSB4bWxuczp4PSJhZG9iZTpuczptZXRhLyIgeDp4bXB0az0iQWRvYmUgWE1QIENv - cmUgNS4zLWMwMTEgNjYuMTQ1NjYxLCAyMDEyLzAyLzA2LTE0OjU2OjI3ICAgICAgICAiPiA8cmRmOlJE - RiB4bWxuczpyZGY9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkvMDIvMjItcmRmLXN5bnRheC1ucyMiPiA8 - cmRmOkRlc2NyaXB0aW9uIHJkZjphYm91dD0iIiB4bWxuczp4bXBNTT0iaHR0cDovL25zLmFkb2JlLmNv - bS94YXAvMS4wL21tLyIgeG1sbnM6c3RSZWY9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlw - ZS9SZXNvdXJjZVJlZiMiIHhtbG5zOnhtcD0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wLyIgeG1w - TU06T3JpZ2luYWxEb2N1bWVudElEPSJ4bXAuZGlkOjJGQzkyMzc0Rjk0OUU0MTE5NjNCQjRENDMzQjlC - MUM4IiB4bXBNTTpEb2N1bWVudElEPSJ4bXAuZGlkOjJERTg4QTFENEQyMjExRTRBODEyODk0M0RBMTc5 - Qjg3IiB4bXBNTTpJbnN0YW5jZUlEPSJ4bXAuaWlkOjJERTg4QTFDNEQyMjExRTRBODEyODk0M0RBMTc5 - Qjg3IiB4bXA6Q3JlYXRvclRvb2w9IkFkb2JlIFBob3Rvc2hvcCBDUzYgKFdpbmRvd3MpIj4gPHhtcE1N - OkRlcml2ZWRGcm9tIHN0UmVmOmluc3RhbmNlSUQ9InhtcC5paWQ6NjJGOUEyRDEyMTRERTQxMUIzNkJE - NUVDQjU5MzE1NjIiIHN0UmVmOmRvY3VtZW50SUQ9InhtcC5kaWQ6MkZDOTIzNzRGOTQ5RTQxMTk2M0JC - NEQ0MzNCOUIxQzgiLz4gPC9yZGY6RGVzY3JpcHRpb24+IDwvcmRmOlJERj4gPC94OnhtcG1ldGE+IDw/ - eHBhY2tldCBlbmQ9InIiPz6wJF34AAACl0lEQVRIS62Vy08TURSH73/QhQtXVnBhxEcMiUkhbEg0hB1R - Q1i68C8wIW5cEqMLN7ho2Ji4YiEhWq0prYUhfULbadN3obTaChobtZEUsFY9nnPS6WM6HYowyZf87j33 - nG/amaai9geOBYA+4pTxihmBE8DcTQB4J8em/9IwSQyagmrtL+z9rMFmvnhkKvtV7tcVHPz6DVsftulA - AckdhUg8zf19eoLKAd597iMLMItewfOxUDTN/bqCH3tVSG8VWIBZ9AoJApEk9+sKvu/uQ2IjzwJkGtH8 - OrTwy3Hu77vIAnV9mgWlcgWiqRwLjAMmkOMbPbNTKnN/JJntqJGEBZ++7oKcyLLgLN4JrU8Cms2C4pcy - BKKZumCI18temQ/8DzSLZlBmQX7nG/jCKdpgAa0driCtY5iFHuqHSjNoFtaags1iCdzBBG+QgNY2aZ0F - mIUe6osENAtrTUEq/7kDq9PHAszU5yYoq9f1i9cUSCD5ozxDEeTsrhAoONwyxLLb8MrhYQFmZYCHsnpd - v3hNgQROb5hnKIK29944MAThTBEWbS4WYBZ6qC/sKSy5ZJ6BGUQg8b4Bbhjod4AZXlhXWdBa10LrIVul - AM9ggS+aa6AIMMO8ZYUO0KeyIOMtZyaQpXpNi4LFucYzMINwhbMNcMNw5oIJMMNKIA0LNg88mZuH/ssj - dPgBMnN+cBRmny1wrRtSMMMzWCCFMg0UAeY2Fh0+GL5xG8Zu3oHXUrCj3g0WONdTbeBm21/o1N17gPtg - 98Xh3VoS3qzKMDI22agfglnY/Uld8NDc/ZlZwAwvl4Ngun6LGh8rdfVDViNs3rguOOzq6XOD8PDpc7g2 - OkHDH7XWtYa2It66Y4eCQ8cRfpvUNa2hTUD8A6JMaBvCyTdJAAAAAElFTkSuQmCC - - iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 @@ -1403,7 +1485,7 @@ AAAASUVORK5CYII= - + iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 YQUAAAAZdEVYdFNvZnR3YXJlAEFkb2JlIEltYWdlUmVhZHlxyWU8AAADZmlUWHRYTUw6Y29tLmFkb2Jl @@ -1415,108 +1497,26 @@ bS94YXAvMS4wL21tLyIgeG1sbnM6c3RSZWY9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlw ZS9SZXNvdXJjZVJlZiMiIHhtbG5zOnhtcD0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wLyIgeG1w TU06T3JpZ2luYWxEb2N1bWVudElEPSJ4bXAuZGlkOjJGQzkyMzc0Rjk0OUU0MTE5NjNCQjRENDMzQjlC - MUM4IiB4bXBNTTpEb2N1bWVudElEPSJ4bXAuZGlkOkUzNzJDMjE3NEFENjExRTRCNjE0OEVEQzI4MEM0 - RTZDIiB4bXBNTTpJbnN0YW5jZUlEPSJ4bXAuaWlkOkUzNzJDMjE2NEFENjExRTRCNjE0OEVEQzI4MEM0 - RTZDIiB4bXA6Q3JlYXRvclRvb2w9IkFkb2JlIFBob3Rvc2hvcCBDUzYgKFdpbmRvd3MpIj4gPHhtcE1N - OkRlcml2ZWRGcm9tIHN0UmVmOmluc3RhbmNlSUQ9InhtcC5paWQ6RkI3NUQ0QkNENDRBRTQxMTk3NEFD - QUFFQjRCMzVENkUiIHN0UmVmOmRvY3VtZW50SUQ9InhtcC5kaWQ6MkZDOTIzNzRGOTQ5RTQxMTk2M0JC - NEQ0MzNCOUIxQzgiLz4gPC9yZGY6RGVzY3JpcHRpb24+IDwvcmRmOlJERj4gPC94OnhtcG1ldGE+IDw/ - eHBhY2tldCBlbmQ9InIiPz6PyaLfAAADMElEQVRIS6VUXUiTYRT+vi3Tzd+ps23+3KRigtiPkolEQReG - UYTkhWatpWlWGkRdddfdSPImqUAJjSIT00oxLJIk0cR+tFSyzDJtgaMkDEPkdM7ZPvm2vS6jBx6es3Pe - 8zzvtm+TohLS/ov+AACStLgEQuJyLRJWYK1yzh/+FgCoQrpnfM4fOGBhcUlIMkEVkma4H4i1y2kFcMD8 - wqKQZILKZqTqmlTAWrfvMjhgbv63Dwm0hLWQohn1eNEbzrlfPiTQAtZCKjP1GXdAIC+r4XD+9CGBFrDm - RVJ1re6pZ0GyHHMvIawauYVNCFPfvvuQQAtYC6meKXU0amNsaGN/ZR60xIf9aIgN3cpGE9OzZCZ85nEm - pGiWlLABmuJCnUOXrNB7chdct4TUo32ANDbp4NuielDpqWfePdaPX6GrohSK4uLhlCEo96YlZLbOFHzH - oJXjMSBcGn4/zQGovEDqXXtzeTb+BTrKj0J3+Q54djYP7EZdTU2MPjFSK8eieQR9QtLg6GcOQPWgqKeQ - ZyOfoK30CDw+lg2Ot3Z4VLoNqo269mCNHIa2WjYn9A1PcAAqU6m9VV3TF9psOwwPS3JgZugCdNoyocwU - jU+RlImWBpezGz0vxzkA1YOiHvPFO7Ca1kGHLQtmXp2HdutmqN+/F6JiU+h3kOpyVeHJwBgHoLIpqajm - 189HoaG4CNqsGTA1UAWth9Lg6r490PygGyLjUikgzuWqQlffCAegelDdUwLqigqhpXgjTPYeh+bCFCg2 - RkEk3vxuVz/P0c43oLP3DQegLhspNalSFxiNcLswHT48LYNbBUlQk7ebzenmyhm08w1o7xmiAP6hRZiT - 70eYkzpctUuJWdHmwWs74+F1Uz7cyE+E4ohQB5mHm9a3GywpTXzektyKduIAIsKI3ISkL4rIdYle05C9 - VrZVBmvtl7eboUyv7V4jSQdwRn8FdI72iErtCUxnIuifkJ5hUqUOq9Jr7OeCNU6bTpNVqtMcDJSldOwn - KnOk+jypJ5QANRWc0cs5SEelXr54QidfwVYAMoiHq4W/gNM6OaNCJ+diaUIqN/43+Atwg27t+9ZXBUn6 - A2MdqQeVc5pWAAAAAElFTkSuQmCC - - - - - iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAIAAABvFaqvAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAZdEVYdFNvZnR3YXJlAEFkb2JlIEltYWdlUmVhZHlxyWU8AAADZmlUWHRYTUw6Y29tLmFkb2Jl - LnhtcAAAAAAAPD94cGFja2V0IGJlZ2luPSLvu78iIGlkPSJXNU0wTXBDZWhpSHpyZVN6TlRjemtjOWQi - Pz4gPHg6eG1wbWV0YSB4bWxuczp4PSJhZG9iZTpuczptZXRhLyIgeDp4bXB0az0iQWRvYmUgWE1QIENv - cmUgNS4zLWMwMTEgNjYuMTQ1NjYxLCAyMDEyLzAyLzA2LTE0OjU2OjI3ICAgICAgICAiPiA8cmRmOlJE - RiB4bWxuczpyZGY9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkvMDIvMjItcmRmLXN5bnRheC1ucyMiPiA8 - cmRmOkRlc2NyaXB0aW9uIHJkZjphYm91dD0iIiB4bWxuczp4bXBNTT0iaHR0cDovL25zLmFkb2JlLmNv - bS94YXAvMS4wL21tLyIgeG1sbnM6c3RSZWY9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlw - ZS9SZXNvdXJjZVJlZiMiIHhtbG5zOnhtcD0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wLyIgeG1w - TU06T3JpZ2luYWxEb2N1bWVudElEPSJ4bXAuZGlkOjJGQzkyMzc0Rjk0OUU0MTE5NjNCQjRENDMzQjlC - MUM4IiB4bXBNTTpEb2N1bWVudElEPSJ4bXAuZGlkOjUzQzNGNDI5NEQyQzExRTQ4QkE1QUNCMEVDRDZF - MDVEIiB4bXBNTTpJbnN0YW5jZUlEPSJ4bXAuaWlkOjUzQzNGNDI4NEQyQzExRTQ4QkE1QUNCMEVDRDZF - MDVEIiB4bXA6Q3JlYXRvclRvb2w9IkFkb2JlIFBob3Rvc2hvcCBDUzYgKFdpbmRvd3MpIj4gPHhtcE1N - OkRlcml2ZWRGcm9tIHN0UmVmOmluc3RhbmNlSUQ9InhtcC5paWQ6RkI1NUY4OTYyQTRERTQxMUIzNkJE + MUM4IiB4bXBNTTpEb2N1bWVudElEPSJ4bXAuZGlkOjJERjY3MEZENEQyMzExRTRCNDlGQUMwMzk0OTAw + Qzc4IiB4bXBNTTpJbnN0YW5jZUlEPSJ4bXAuaWlkOjJERjY3MEZDNEQyMzExRTRCNDlGQUMwMzk0OTAw + Qzc4IiB4bXA6Q3JlYXRvclRvb2w9IkFkb2JlIFBob3Rvc2hvcCBDUzYgKFdpbmRvd3MpIj4gPHhtcE1N + OkRlcml2ZWRGcm9tIHN0UmVmOmluc3RhbmNlSUQ9InhtcC5paWQ6NjhGOUEyRDEyMTRERTQxMUIzNkJE NUVDQjU5MzE1NjIiIHN0UmVmOmRvY3VtZW50SUQ9InhtcC5kaWQ6MkZDOTIzNzRGOTQ5RTQxMTk2M0JC NEQ0MzNCOUIxQzgiLz4gPC9yZGY6RGVzY3JpcHRpb24+IDwvcmRmOlJERj4gPC94OnhtcG1ldGE+IDw/ - eHBhY2tldCBlbmQ9InIiPz6IsaOmAAADF0lEQVQ4T62U/UuTURTH+0nICqRI1ERMMyNQe8N0ChqBwQhN - yvwhEgJjVCqJ/qCibZo6tzQ339h6Nre5prapUzc1XzItX1ilzuWMLLVAen+xf6DTuTxjdxsFVj58ebjc - c+7nnud7z3228DbpIaDFH/CfoqCn72DIDvNfPDM2KAqyr8PcJxqY+QBTb8kkjocXQTsKigGwfqYJHqIg - 1OxHGHvlWPx4hXB1YyA3g4CBhqst+piEnrDA3rA95vBAY1x8d7lq/DVZwm5PQZNvoKYdypSgHgbVEIh1 - cLOZzOCbSSsyRQRba6uWtcpVLbPcwlglInNUCJNWWKqABqMLCGvGlfpJELaQ/V1Vd1lujAhe0chtUrH5 - ZExnmJ85MdomEa+qZMbIEF2BHGunILSjdZwYgTt4gJqjjj0Rltml1Zq9AeL0Mn71Wn2mtDU80MIvsFTw - O+KPIoWC8BNYRIUaqrRQroJKjQOk9N+xLBF2pXJFKfnsDGYa8gS6xOO2whyMuoHaHpGzZ/pBM0IMrtXD - nT4HqNHXe0lYoogMFeQP4jbSDkCPTUyXmnNoPutSo+9WN5DEQDyeWCWnhqm4p7Oimt3b54rzmmKPVHKz - 0Xg0AU1pz87VJp+yXOfd9t3mBmLXsGrsJhSsDtF4iOWxKdpzyQNnuRW7vEUp13obFG05OVUBPtO5V1Sn - k5q4SX8ENfWA6C7xHsP981Bb2sf38ZKd4JhSuXUJHPHhg/WJnAeZFw0Xzt/w8erRtLmBnB/CSmaC599I - 2PYVRl+CXigu3R9SfCC0Pf1MZ1oqvqvjogX7gtRFJfb1n24g7GblfQcFP2fkBYm5anxqQcbLKgzyK/Df - WRTkV5+RMTg84ZrgAOHo4ZIDVNdJw67CpsVLZ5gifj97Typlq2ZFQXj8LKh5EHpnaIar8N+Al5l9Y9Vs - T7OiIAzjqaMsa6QJnBkeWvgOHdPkAuIV67PSeQpCYYZplsZ+KyyWLRyFF8D553EDbURY770J0rrYJbda - SYE4iWb9NcgpRKDrOMAWwYP6d5BTaC52zyaAWDlAm/DweL8AX9zXukfxHsIAAAAASUVORK5CYII= - - - - - iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAZdEVYdFNvZnR3YXJlAEFkb2JlIEltYWdlUmVhZHlxyWU8AAADZmlUWHRYTUw6Y29tLmFkb2Jl - LnhtcAAAAAAAPD94cGFja2V0IGJlZ2luPSLvu78iIGlkPSJXNU0wTXBDZWhpSHpyZVN6TlRjemtjOWQi - Pz4gPHg6eG1wbWV0YSB4bWxuczp4PSJhZG9iZTpuczptZXRhLyIgeDp4bXB0az0iQWRvYmUgWE1QIENv - cmUgNS4zLWMwMTEgNjYuMTQ1NjYxLCAyMDEyLzAyLzA2LTE0OjU2OjI3ICAgICAgICAiPiA8cmRmOlJE - RiB4bWxuczpyZGY9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkvMDIvMjItcmRmLXN5bnRheC1ucyMiPiA8 - cmRmOkRlc2NyaXB0aW9uIHJkZjphYm91dD0iIiB4bWxuczp4bXBNTT0iaHR0cDovL25zLmFkb2JlLmNv - bS94YXAvMS4wL21tLyIgeG1sbnM6c3RSZWY9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlw - ZS9SZXNvdXJjZVJlZiMiIHhtbG5zOnhtcD0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wLyIgeG1w - TU06T3JpZ2luYWxEb2N1bWVudElEPSJ4bXAuZGlkOjJGQzkyMzc0Rjk0OUU0MTE5NjNCQjRENDMzQjlC - MUM4IiB4bXBNTTpEb2N1bWVudElEPSJ4bXAuZGlkOkVENUYwQThBNEQyOTExRTQ5QzUzQzdFMkFGQkQy - NTA1IiB4bXBNTTpJbnN0YW5jZUlEPSJ4bXAuaWlkOkVENUYwQTg5NEQyOTExRTQ5QzUzQzdFMkFGQkQy - NTA1IiB4bXA6Q3JlYXRvclRvb2w9IkFkb2JlIFBob3Rvc2hvcCBDUzYgKFdpbmRvd3MpIj4gPHhtcE1N - OkRlcml2ZWRGcm9tIHN0UmVmOmluc3RhbmNlSUQ9InhtcC5paWQ6MkRGNkEzOUYyOTRERTQxMUIzNkJE - NUVDQjU5MzE1NjIiIHN0UmVmOmRvY3VtZW50SUQ9InhtcC5kaWQ6MkZDOTIzNzRGOTQ5RTQxMTk2M0JC - NEQ0MzNCOUIxQzgiLz4gPC9yZGY6RGVzY3JpcHRpb24+IDwvcmRmOlJERj4gPC94OnhtcG1ldGE+IDw/ - eHBhY2tldCBlbmQ9InIiPz6npMy1AAAGEUlEQVRIS7WVeVDUZRjHf7Ase8ECu+wl4LIXcqyyHC783AWW - 5QaRFTHkMi9SQvE+UhLzwk0BUcQSgQBBgcYDzStMSzOPcpqcmo5pmqk/+rOapqb+iG/PbzfFcSz/6pn5 - zPN739/7fp/nvZn/3TSLjj+XJy2/RaItPCT5vaBd8m1+q2Qku1lcrcvki+iXr7fFU6ZZeOx5KDU1b7jU - 1Z2bVPMPWNMbRXrXkWAc+ywVLbcS8fKwFjlu8VdpW0XzSc6f8PEIPzJ19dFnU3WEJdHL9P3X9O1nkdB8 - CQrX7i3mKn9zfqsUq29ZsPfjRBx5aMO2cTMy94gm7FuF7XyJTwDJTo5GVdHxNALVgsPd5Ceye+9g8b0f - UXbjB8RtH4Msd+MeXS7f6twjxbILZiy7pEHDtTBsvG7BqivTUXpsClLWCbtJNpDwBlGVH3ySIFV520eW - nedRcf0HVJGwbeRrOHs/h2n1CGRZDe7wND/W1hiI8sEYlJ4KRcVpJcrfVqByNBILhqLh3KeA+UXBOpL2 - jkRZduARPGXZ/vH4pnMou/gd7INfIPn4QyQc/RSOzk9hrBtEiKPerUn1Y5PXBaDojWlwdgUjr0+G/H4Z - cnpCUNJrQNZ+LeLrBD/LYnixFEDAKFz7vJQ0r49dO4zikS8x8/ADxLd9jIT2B5ix/z7SX78Pw+K3EJy2 - wq1M4rEz6sRwthgw82Ag2KNS2I5JPZ4rZx00ImGNHIZSfisFkDGhxbs5AkKLd/3kaLkDlgTjXrsNc/Md - mPfeQeyOD2HbcRu6yi4E2Wrd8ngeG71IBPtePWa4JUhsD0DykQAkHQqApUWCFLcGyZvDoZ/P/5oCTGXk - hU2MvGB7rbGmG47dd2Fa+x6iX/kAMa/eQvS2m4jaeAPspvcROb8TQexid3CcL2usFCJjnwE5nQYU9RhR - PGDC7D4TCrqMyDqkR9oePbRz/SZEKh8rI8vdyshyXhmzLD8DS/1VGOquwtgw7glkXH0Nhvp3kbL2GrSl - hyC11ril03xZfbkQKZuVsDeq4NihRtYuDbJ2auBoUsO2TQXrJiWMlWIExflWMiHOjRzfJy0bg776HCKX - vANd7WXol1/xeN3Si7A2XIXW1YbAxAq3UO0zPTSd1yG38bplLK//vxBrffKY4PQ1HH9aKk8jonQUUyvO - Qlt9HtqaCx4/tXIMyXWXMXXOAQTEv+D2zCvDhBBTCN1zCGOCZq3k+DXO1YcpRYOY4hpF2LzTCCs74/VE - 3IvnEVd1EhGFblBbWot6BKXWQZq64tlYa2+TuJwQM9KU5cRL35hyOxCe2w913hA0hcPQFI16KRzxEFtO - a1Q9htSVN5C+5S5x7x/uIm3DR7CvuomUReOImt1FU7nwEolHECImMGkJE5i46EJkejNM+X1QOPqhzBqC - KvskVDmnJuHKT/K4bgjKzBMItXcjJv84NOwWiKPndJK40TOCgPgaRmIur1dZ1yM6txvyWT0ITR+AImOQ - gg39N1ybDBJP60PorC5My3oTwQm18FdNryBxbq0EJL6AEUTYZBTkF0NGKyKdvZDb3qJOAxSIOqcP/jtp - JyC3D1BSvYgp6EN4aiNlP/cTEk4gFASPEUeXkWd8RaY5jcrEBkTn9UCT4Q3gzfBfRvJE9rrsfpicHSRe - NsFXmJeSXhTBXXY+jMjk8uArVkpExuKb6pkbYJ7L7Ria37xTUBeMeCkcncRTN0z/TyLKNYy4khNQJq2G - IMLBXdUWQkXwCYYR6md7IPP1k8WEC3UFDzSpG2BZeAZJtXQWFpyls3HOC50JzkdQnbFqDInLLiC2rBcq - 6xoSzzzP+NDVwDBaQkx4XzahNv8xZH48sVotCHeOUnnCWNJG18Q4UjddB7vlfbBbPwC7+YannLTyIrS5 - OyHU5v3hr07poL7JBHe4Jh8bzgQROY8h46IKCAVfbi73D3PcpfoJlX0VtEVN0JXsQlj2ZoRaaynj7N/8 - NfZLPLFmHrXnpiWSCCL8iMl32T/M6YGMq+R+covD7QADwfoIgqt4QVGtfvIZJ4lRv5CY4zypbjfjy+eE - M4l4gtuSwYSQ4DS4EZAew/wNiCYQJlvQU3cAAAAASUVORK5CYII= + eHBhY2tldCBlbmQ9InIiPz6GKmpFAAAC+UlEQVRIS63T20vTYRzH8Yforj/Ei24UiSgKIygKi8oyxZQo + cvNYeXaesmzqPGu2POd0ulSsnIdaurTSTJ3O6UxTPGya5vCQx5AuPn39RbHop7nZxQt+z3ie93e/Z4w1 + p7nsCoBt8R6yBF/UHPv+Wb0rfFFzm99CRIwEW1gnqXzxTXxRc0ydctm4OlID2sxrw6iCtiwItC+A2P/D + frLnjwGNSZdMq6N1WOvLwFpP4l/WdRlY6Jaio9Ab7QXba8sVoDHZGdT8PYS9THDqMGnLsKpNw0qXGCua + BO55VZdNQ6U/DRRibVCGb+N1pH5bukoRqHmDHOIG1N8/X2F4I8WyNhtf2+9hqSsZxqZ4upbb6HsSZLHO + Im90ym6hNVcIaktYTexZyUelGEvaHMy/jcFiZxo0xX5Y7ivGcn8JkVmA9uvlWBmqwpJeAWovs+poR99O + eRgWtQWYVUdgrj0FH+i+F3XF3NoappZYGJrEoLaOVYpOOTY/FGJB+xjTqnDMtMTTAC/Ma/Ix/TLUKl9e + x0JfFQpql7PykBP7lWIXzPeUYLIhHCPKCLr/AMy2ZsKoDLTKdNNdvM8TgNpRTBZwfJ885CTmaIChPhwa + mS+GnkdhqjEWY9X+VplqvIMXEhdQ24mZeuSs0N/BNNWWj4k6EdSZHhhXxWH0aSCGFd4c4Tk7zk7XBlUM + FKLToK4Nm+0qYnneRzqGGiSYaIiiyZdhVCdgqFSIwRJPjucZW85O1pvnRmvDkO9zFNTdy2Y6HjGp4HCF + 5kk4xhoiURd/EROv4tBfeM0qAyUC9Mp9QM0+7o829T6LZV0/mNycS6+nFKFWfAGj9ZHozfGwil7miZYH + 7qCmghsw+S6VpV894KuUuKFbfhNNqa749CwY3dm0toK+VABl3HlQM5obYHybwFLc7W1y/Y5BlX6FfgNn + DNcEY0DhZZX+MiGKbh0DNR24AYYWMSfJzc6GZBApwS5skIzNODcg0dV2V36FtsJ7yBJ8UXO8hyzBFzXH + ++H/A/YDv9/V87iOlrYAAAAASUVORK5CYII= @@ -3164,9 +3164,6 @@ 864, 17 - - 864, 17 - iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 diff --git a/Program.cs b/Program.cs index e38f7b8..a76d0d4 100644 --- a/Program.cs +++ b/Program.cs @@ -16,14 +16,14 @@ [STAThread] static void Main() { - ValidateInfo validateInfo = ValidateConfig.LoadConfig(); + ValidateConfig.LoadConfig(); string localConfigPath = Application.StartupPath + "/Config.xml"; //获取程序及版本信息 string currentVersionCode = Assembly.GetExecutingAssembly().GetName().Version.ToString(); //获取文件版本信息 FileVersionInfo.GetVersionInfo(Application.ExecutablePath); - + Utility.SysInfoConfig(); string configUrl = getProgramUrl(localConfigPath, "configurl"); if (configUrl != "") { diff --git a/TreeUtils.cs b/TreeUtils.cs index 1f055b5..ad39643 100644 --- a/TreeUtils.cs +++ b/TreeUtils.cs @@ -19,7 +19,7 @@ public static void InitLayerTree(GSOGlobeControl gsoGlobeControl, TreeView treeView, string viewDatasrc) { // treeView.Nodes.Clear(); - LayerConfig layerConfig = Utility.layerConfig;//layertree所在的配置文件 + LayerConfig layerConfig = Utility.LayerConfig;//layertree所在的配置文件 List datasrcs = layerConfig.datasrcs; foreach (DataSrc datasrc in datasrcs) { diff --git a/Utility.cs b/Utility.cs index c03e405..ab947a3 100644 --- a/Utility.cs +++ b/Utility.cs @@ -20,7 +20,7 @@ public static string dbdatabase; public static string userID; - public static Hashtable Pipe_QueryFields; +// public static Hashtable Pipe_QueryFields; public static string DBPassword; public static string DBServer; public static string DBBackUp; @@ -38,7 +38,7 @@ public static List listPipelineType; public static string PicRootURL; public static string PicDefaultURL; - public static double dFlyAboveLine = 2; +// public static double dFlyAboveLine = 2; public static string userName; public static string projectStr; public static string userRole; @@ -85,12 +85,17 @@ public static List pipefittingLayerNames = new List();//管件图层名称 public static List sgPipeLayersNames = new List();//施工管线图层名称 -// public static Dictionary dictionaryNetLayerNameAndCaption = new Dictionary(); - public static HashSet layerNameSet = new HashSet(); + public static HashSet layerNameSet = new HashSet();//记录有哪些图层要显示 public static string roadLayerName = ""; #endregion wxl - public static LayerConfig layerConfig; + public static LayerConfig LayerConfig; + + public static string RoleServer; + public static string TitleImagePath; + public static string SysnameVersion; + public static string Copyright; + public static void SetBallons(GSOBalloon featureTooltip, GSOBalloonEx balloonEx) { featureTooltip.CacheFilePath = Application.StartupPath + "/GeoScene/Globe/Temp"; @@ -188,25 +193,6 @@ } return s.ToString(); } - public static GSOFeatures Table2Features(DataTable table, string currentQueryLayer, GSOGlobeControl globeControl1) - { - GSOFeatures features = new GSOFeatures(); - for (int i = 0; i < table.Rows.Count; i++) - { - DataRow row = table.Rows[i]; - - string featureName = row["编号"].ToString(); - featureName = featureName.Trim(); - GSOLayer layer = globeControl1.Globe.Layers.GetLayerByCaption(currentQueryLayer); - GSOFeatures tempfeatures = layer.GetFeatureByName(featureName, false); - if (tempfeatures.Length > 0) - { - features.Add(tempfeatures[0]); - } - } - return features; - } - //程序启动的时候读取配置文件 public static void SetParams() @@ -358,8 +344,8 @@ #region wxl 从layerconfig.xml中读取 - layerConfig = XmlTools.DeserializeFromXml(layerConfigFile); - List dataSrcs = layerConfig.datasrcs; + LayerConfig = XmlTools.DeserializeFromXml(layerConfigFile); + List dataSrcs = LayerConfig.datasrcs; foreach (var dataSrc in dataSrcs) { @@ -598,76 +584,49 @@ #endregion } - /* - //判断网络是否连接 - public static bool isNetworkConnectionSuccess(string ipAdress) + /// + /// 获取Config.xml配置文件中的roleurl配置，并返回 + /// + /// 请求综合信息平台的服务地址 + public static void SysInfoConfig() { - //return true; - if (ipAdress == null) - { - return false; - } - if (ipAdress.Contains("\\")) - { - ipAdress = ipAdress.Substring(0, ipAdress.LastIndexOf('\\')); - } - if (ipAdress.Trim() == "localhost" || ipAdress.Trim() == "127.0.0.1" || ipAdress.Trim() == Dns.GetHostName()) - { - return true; - } - Ping ping = new Ping(); + if (!File.Exists(filename)) return; + + XmlTextReader xmlReader = new XmlTextReader(filename); try { - PingReply pr = ping.Send(ipAdress.Trim(), 3000); - if (pr.Status == IPStatus.Success) + while (xmlReader.Read()) { - return true; + if (xmlReader.Name.Equals("roleurl")) + { + RoleServer = xmlReader.ReadElementString(); + } + else if (xmlReader.Name.Equals("titleimgpath")) + { + TitleImagePath = xmlReader.ReadElementString(); + } + else if (xmlReader.Name.Equals("sysname")) + { + SysnameVersion = xmlReader.ReadElementString(); + } + else if (xmlReader.Name.Equals("copyright")) + { + Copyright = xmlReader.ReadElementString(); + } } - else - { - return false; - } + } catch (Exception ex) { - LogError.PublishError(ex); - return false; + + LogHelper.Error("在config.xml配置文件中读取roleurl时出错"); } - } - */ - - - //TODO LIST:下面两个方法移到featueTools.cs中 - //根据附属物图层名字得到里面含有的附属物 - public static string[] getAccStrsByLayer(string layername) - { - string[] accStrs = null; - string sql = "select 附属物名称 from " + layername + " group by 附属物名称"; - DataSet dataset = OledbHelper.getDataSet(sql, layername); - if (dataset == null) return null; - accStrs = new string[dataset.Tables[0].Rows.Count]; - for (int i = 0; i < dataset.Tables[0].Rows.Count; i++) + finally { - accStrs[i] = dataset.Tables[0].Rows[i][0].ToString(); + xmlReader.Close(); } - return accStrs; } - //删除内存图层中指定名称的feature - public static void RemoveFeatureFromName(GSOGlobeControl globeControl1, string featureName) - { - GSOFeatures features = globeControl1.Globe.MemoryLayer.GetFeatureByName(featureName, true); - if (features != null) - { - for (int i = features.Length - 1; i >= 0; i--) - { - GSOFeature feature = features[i]; - if (feature != null) - { - globeControl1.Globe.MemoryLayer.RemoveFeatureByID(feature.ID); - } - } - } - globeControl1.Refresh(); - } + + } } diff --git a/ValidateInfo.cs b/ValidateInfo.cs index de75391..01546da 100644 --- a/ValidateInfo.cs +++ b/ValidateInfo.cs @@ -192,7 +192,7 @@ } if (!isSuccess) { - LogHelper.WriteLog(typeof(FieldUniqueValidate), logStr); + LogHelper.Error(logStr); } return isSuccess; } @@ -247,7 +247,7 @@ err += "未找到字段或其类型匹配:" + unFoundField.label + ":" + unFoundField.type + "\r\n"; } - LogHelper.WriteLog(typeof(FieldCountValidate), err); + LogHelper.Error(err); return false; } return true; @@ -316,7 +316,7 @@ { err += "字段:" + field.label + "出错\r\n"; } - LogHelper.WriteLog(typeof(FieldOrderValidate), err); + LogHelper.Error(err); return false; } return true; @@ -388,8 +388,7 @@ } if (isSuccess == false) { - LogHelper.WriteLog(typeof(FieldEmptyValidate), - "字段为空检查失败:\r\n" + err); + LogHelper.Error("字段为空检查失败:\r\n" + err); } return isSuccess; } diff --git a/bin/x86/Debug/Config.xml b/bin/x86/Debug/Config.xml index 6995f64..6a453a3 100644 --- a/bin/x86/Debug/Config.xml +++ b/bin/x86/Debug/Config.xml @@ -25,6 +25,11 @@ http://127.0.0.1/Cyberpipe.msi http://127.0.0.1/Config.xml + http://192.168.0.102:8080/ctrl + /Resource/title.jpg + 智慧太湖新城管网规划分析系统6.0 + @2014-2015 苏州航天系统工程有限公司 版权所有 + 编号,管线编码,管径_毫米,材质,埋设方式,起始地面高程,起始埋深,终止地面高程,终止埋深,建设年代,使用年限,权属单位,设计单位,设计负责人,施工单位,施工负责人,监理单位,监理负责人,业务负责人,备注 编号,管线编码,管径_毫米,材质,埋设方式,起始地面高程,起始埋深,终止地面高程,终止埋深,建设年代,使用年限,权属单位,设计单位,设计负责人,施工单位,施工负责人,监理单位,监理负责人,业务负责人,备注 diff --git a/bin/x86/Debug/config/log4net.config b/bin/x86/Debug/config/log4net.config index 80f9b25..6fbcfa7 100644 --- a/bin/x86/Debug/config/log4net.config +++ b/bin/x86/Debug/config/log4net.config @@ -3,29 +3,118 @@
- - - - - - - - - - - - - - - + + + -property: [%property{NDC}] - %n错误描述：%message%newline %n"/> - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/FeatureStatisticsService.cs b/FeatureStatisticsService.cs index 331ee47..b127fe3 100644 --- a/FeatureStatisticsService.cs +++ b/FeatureStatisticsService.cs @@ -190,7 +190,7 @@ List result = new List(); //layer.Name是表名 - string[] accessStrs = Utility.getAccStrsByLayer(layer.Name); + string[] accessStrs = FeatureTools.GetAccStrsByLayer(layer.Name); foreach (string accssname in accessStrs) { diff --git a/FeatureTools.cs b/FeatureTools.cs index be4b469..3c08f34 100644 --- a/FeatureTools.cs +++ b/FeatureTools.cs @@ -1,5 +1,6 @@ using System; using System.Collections.Generic; +using System.Data; using System.Linq; using System.Text; using System.Windows.Forms; @@ -43,7 +44,7 @@ } feature.Delete();//地球上删除该feature string sql = "delete from " + layerName + " where LSSYS_ID =" + feature.ID + " and (编号 is null or substr(编号,length(编号)-2)='TMP')"; - OledbHelper.sqlExecuteNonQuery(sql);//目前无法取到LSSYS_ID，所以这个判断条件不太合适，会导致把该类所有新建的都删除了 + OledbHelper.sqlExecuteNonQuery(sql); } catch (Exception) { @@ -106,5 +107,46 @@ } return value; } + + /// + /// 根据附属物图层名字得到里面含有的附属物 + /// + /// + /// + public static string[] GetAccStrsByLayer(string layername) + { + string[] accStrs = null; + string sql = "select 附属物名称 from " + layername + " group by 附属物名称"; + DataSet dataset = OledbHelper.getDataSet(sql, layername); + if (dataset == null) return null; + accStrs = new string[dataset.Tables[0].Rows.Count]; + for (int i = 0; i < dataset.Tables[0].Rows.Count; i++) + { + accStrs[i] = dataset.Tables[0].Rows[i][0].ToString(); + } + return accStrs; + } + + /// + /// 删除内存图层中指定名称的feature + /// + /// + /// + public static void RemoveFeatureFromName(GSOGlobeControl globeControl1, string featureName) + { + GSOFeatures features = globeControl1.Globe.MemoryLayer.GetFeatureByName(featureName, true); + if (features != null) + { + for (int i = features.Length - 1; i >= 0; i--) + { + GSOFeature feature = features[i]; + if (feature != null) + { + globeControl1.Globe.MemoryLayer.RemoveFeatureByID(feature.ID); + } + } + } + globeControl1.Refresh(); + } } } diff --git a/Forms/FrmPipelineModelDataBase.cs b/Forms/FrmPipelineModelDataBase.cs index b577fd8..bc1e479 100644 --- a/Forms/FrmPipelineModelDataBase.cs +++ b/Forms/FrmPipelineModelDataBase.cs @@ -149,7 +149,7 @@ catch (Exception ex) { LogError.PublishError(ex); - LogHelper.WriteLog(typeof(FrmPipelineModelDB), ex.Message); + LogHelper.Error(ex.Message); } } diff --git a/FrmAccessoriesSensor.cs b/FrmAccessoriesSensor.cs index 98aa1cf..542f19a 100644 --- a/FrmAccessoriesSensor.cs +++ b/FrmAccessoriesSensor.cs @@ -240,7 +240,7 @@ { if (clbPipeLine.CheckedItems.Count > 0) { - Utility.RemoveFeatureFromName(globeControl1, "trackPolygon"); + FeatureTools.RemoveFeatureFromName(globeControl1, "trackPolygon"); globeControl1.Globe.Action = EnumAction3D.TrackPolygon; globeControl1.TrackPolygonEndEvent += globeControl1_TrackPolygonEndEvent; } @@ -259,7 +259,7 @@ private void FrmAccessoriesgather_FormClosing(object sender, FormClosingEventArgs e) { frm = null; - Utility.RemoveFeatureFromName(globeControl1, "trackPolygon"); + FeatureTools.RemoveFeatureFromName(globeControl1, "trackPolygon"); globeControl1.Globe.Action = EnumAction3D.ActionNull; globeControl1.TrackPolygonEndEvent -= globeControl1_TrackPolygonEndEvent; } diff --git a/FrmAccessoriesgather.cs b/FrmAccessoriesgather.cs index e1d176e..c36273b 100644 --- a/FrmAccessoriesgather.cs +++ b/FrmAccessoriesgather.cs @@ -118,7 +118,7 @@ { if (clbPipeLine2.Text!="") { - Utility.RemoveFeatureFromName(globeControl1, "trackPolygon"); + FeatureTools.RemoveFeatureFromName(globeControl1, "trackPolygon"); globeControl1.Globe.Action = EnumAction3D.TrackPolygon; globeControl1.Globe.TrackPolygonTool.TrackMode = EnumTrackMode.SpaceTrack; globeControl1.TrackPolygonEndEvent += globeControl1_TrackPolygonEndEvent; @@ -295,7 +295,7 @@ private void FrmAccessoriesgather_FormClosing(object sender, FormClosingEventArgs e) { frm = null; - Utility.RemoveFeatureFromName(globeControl1, "trackPolygon"); + FeatureTools.RemoveFeatureFromName(globeControl1, "trackPolygon"); globeControl1.TrackPolygonEndEvent -= globeControl1_TrackPolygonEndEvent; globeControl1.Globe.Action = EnumAction3D.ActionNull; diff --git a/FrmAddWellShp.cs b/FrmAddWellShp.cs index 7983349..78d8946 100644 --- a/FrmAddWellShp.cs +++ b/FrmAddWellShp.cs @@ -100,7 +100,7 @@ catch (Exception ex) { LogError.PublishError(ex); - LogHelper.WriteLog(typeof(FrmAddWellShp), ex.Message); + LogHelper.Error(ex.Message); } } diff --git a/FrmBSQStatis.cs b/FrmBSQStatis.cs index 5b05926..b5e581d 100644 --- a/FrmBSQStatis.cs +++ b/FrmBSQStatis.cs @@ -97,7 +97,7 @@ } catch (Exception ex) { - LogHelper.WriteLog(typeof(FrmBSQStatis),ex.Message); + LogHelper.Error(ex.Message); } return typeAndCount; } @@ -108,7 +108,7 @@ GSOLayer layer = globeControl1.Globe.Layers.GetLayerByCaption("标识器"); GSOFeatures bsqFs = FeatureStatisticsService.GetLayerFeatures(polygon, layer); if (bsqFs == null || bsqFs.Length <= 0) { - LogHelper.WriteLog(typeof(FrmBSQStatis),"标识器图层下的Feature为空"); + LogHelper.Error("标识器图层下的Feature为空!"); return null; } diff --git a/FrmBasicQuery.cs b/FrmBasicQuery.cs index baeeade..cc8d3ff 100644 --- a/FrmBasicQuery.cs +++ b/FrmBasicQuery.cs @@ -224,7 +224,7 @@ } catch(Exception ex) { - LogHelper.WriteLog(typeof(FrmBasicQuery), ex.Message); + LogHelper.Error(ex.Message); } } else diff --git a/FrmCodingQuery.cs b/FrmCodingQuery.cs index f1ac322..d4ec095 100644 --- a/FrmCodingQuery.cs +++ b/FrmCodingQuery.cs @@ -82,7 +82,7 @@ } catch (Exception ex) { - LogHelper.WriteLog(typeof(FrmCodingQuery), ex.Message); ; + LogHelper.Error(ex.Message); } } diff --git a/FrmDiameterQuery.cs b/FrmDiameterQuery.cs index e7b3657..75d7949 100644 --- a/FrmDiameterQuery.cs +++ b/FrmDiameterQuery.cs @@ -150,7 +150,7 @@ catch (Exception ex) { //LogError.PublishError(ex); - LogHelper.WriteLog(typeof(FrmDiameterQuery), ex.Message); + LogHelper.Error(ex.Message); MessageBox.Show("请输入正确的管径范围！"); return; } diff --git a/FrmFittingQuery.cs b/FrmFittingQuery.cs index 12f6007..8645011 100644 --- a/FrmFittingQuery.cs +++ b/FrmFittingQuery.cs @@ -69,7 +69,7 @@ } catch (Exception ex) { - LogHelper.WriteLog(typeof(FrmFittingQuery), ex.Message); + LogHelper.Error(ex.Message); } } /// diff --git a/FrmKeywordQuery.cs b/FrmKeywordQuery.cs index 405524f..ede0a93 100644 --- a/FrmKeywordQuery.cs +++ b/FrmKeywordQuery.cs @@ -87,7 +87,7 @@ } catch (Exception ex) { - LogHelper.WriteLog(typeof(FrmKeywordQuery), ex.Message); + LogHelper.Error(ex.Message); } } diff --git a/FrmLogin.cs b/FrmLogin.cs index 1172c23..6fbaed9 100644 --- a/FrmLogin.cs +++ b/FrmLogin.cs @@ -2,6 +2,8 @@ using System.Data; using System.Data.OracleClient; using System.IO; +using System.Net; +using System.Text; using System.Windows.Forms; using System.Xml; using DevComponents.DotNetBar; @@ -10,16 +12,15 @@ { public partial class FrmLogin : Office2007Form { + + //登录界面 -- 配置文件的路径 + public static string filename = Application.StartupPath + "\\login.xml"; + + public FrmLogin() { InitializeComponent(); } - public string rolename = "浏览"; - public string username = ""; - public string department = ""; - - //登录界面 -- 配置文件的路径 - public static string filename = Application.StartupPath + "\\login.xml"; /// /// 登录按钮事件处理 /// @@ -28,9 +29,10 @@ private void button1_Click(object sender, EventArgs e) { bool result = ValidateUser(); +// bool result =ValidateFromUrl();//从平台获取用户角色信息，判断是否能登陆成功 if (result) { - username = txtUser.Text.Trim(); + WriteXml(); Utility.userName = txtUser.Text.Trim(); DialogResult = DialogResult.OK; Close(); @@ -43,80 +45,6 @@ } } /// - /// 关闭按钮事件处理 - /// - /// - /// - private void button2_Click(object sender, EventArgs e) - { - Close(); - } - /// - /// 验证端口号 - /// - /// - //private bool ValiPort() - //{ - // Ping p = new Ping();//创建Ping对象p - // PingReply pr = p.Send(Utility.localicenseserverip);//向指定IP或者主机名的计算机发送ICMP协议的ping数据包 - // if (pr.Status == IPStatus.Success)//如果ping成功 - // { - // try - // { - // TcpClient tcpc = new TcpClient(Utility.localicenseserverip, Utility.localicenseserverport);//对IP地址为"192.168.0.105"的计算机的1500端口提出连接申请 - // tcpc.Close(); - // return true; - // } - // catch (Exception ex) - // { - // LogError.PublishError(ex); - // MessageBox.Show("端口连接错误！" + ex.Message); - // return false; - // } - // } - // else - // { - // int times = 0;//重新连接次数; - // int count = 2;//设置尝试次数 - // while (times < count) - // { - // //Thread.Sleep(1000);//等待时间(方便测试的话，你可以改为1000) - // pr = p.Send(Utility.localicenseserverip); - - // if (pr.Status == IPStatus.Success) - // { - // try - // { - // TcpClient tcpc = new TcpClient(Utility.localicenseserverip, Utility.localicenseserverport);//对IP地址为"192.168.0.105"的计算机的1500端口提出连接申请 - // tcpc.Close(); - // return true; - // } - // catch (Exception ex) - // { - // LogError.PublishError(ex); - // MessageBox.Show("端口连接错误！" + ex.Message); - // return false; - // } - // } - // else - // { - // times++; - // if (times < count) - // { - // continue; - // } - // else - // { - // MessageBox.Show("重新尝试连接失败"); - // return false; - // } - // } - - // } - // return false; - // } - //} - /// /// 验证用户名、密码 /// /// @@ -126,24 +54,64 @@ string sql = "select * from casic_userinfotest where USERNAME='" + txtUser.Text.Trim() + "' and PASSWORD='" + passWord + "' and sysname='GHFX' "; DataTable dt = OledbHelper.QueryTable(sql); - if (dt != null && dt.Rows.Count > 0) + if (dt == null || dt.Rows.Count <= 0) return false; + if (String.IsNullOrEmpty(dt.Rows[0]["rid"].ToString())) return true; + sql = "select gid from casic_userroletest where id=" + dt.Rows[0]["rid"] + " and sysname='GHFX' "; + using (OracleDataReader reader = OracleUtils.ExecuteReader(OracleUtils.ConnectionString, CommandType.Text, sql)) { - WriteXML(); - if (!String.IsNullOrEmpty(dt.Rows[0]["rid"].ToString())) + while (reader.Read()) { - sql = "select gid from casic_userroletest where id=" + dt.Rows[0]["rid"] + " and sysname='GHFX' "; - using (OracleDataReader reader = OracleUtils.ExecuteReader(OracleUtils.ConnectionString, CommandType.Text, sql)) - { - while (reader.Read()) - { - Utility.userRole = reader[0].ToString(); - break; - } - } + Utility.userRole = reader[0].ToString(); + LogHelper.Debug("测试一下"); + break; } - return true; } - return false; + return true; + } + + + + private bool ValidateFromUrl() + { + string user = txtUser.Text.Trim(); + string pwd = textBoxPassWord.Text.Trim(); + //做成配置的 + string roleserver = Utility.RoleServer; + if (roleserver == null || roleserver.Trim().Equals("")) + { + MessageBox.Show("请在Config.xml中配置roleurl！"); + return false; + } + HttpWebRequest request = + WebRequest.Create(roleserver+"/rs/authority/user?username=" + user + "&password=" + pwd + "&appId=21") as HttpWebRequest; + if (request == null) return false; + using (HttpWebResponse response = request.GetResponse() as HttpWebResponse) + { + try + { + if (response == null || response.GetResponseStream() == null) return false; + StreamReader reader = new StreamReader(response.GetResponseStream()); + string[] result = reader.ReadToEnd().Split(','); + //解析result + if (result.Length < 5) return false; + StringBuilder userRole = new StringBuilder(""); + for (int i = 4; i < result.Length; i++) + { + string[] tmpStrings = result[i].Split('_'); + if (tmpStrings.Length < 2) continue; + userRole.Append(tmpStrings[1].Trim() + ","); + } + if (userRole.Length < 3) return false; + userRole.Remove(userRole.Length - 3, 3); + // MessageBox.Show(userRole.ToString()); + Utility.userRole = userRole.ToString(); + return Utility.userRole != null && !Utility.userRole.Equals("null"); + } + catch (Exception e) + { + return false; + } + } } private void FrmLogin_Load(object sender, EventArgs e) @@ -153,74 +121,56 @@ StartPosition = FormStartPosition.CenterScreen; - ReadXML(); + ReadXml(); } /// /// 读取上一次登录的用户名和密码 /// - private void ReadXML() + private void ReadXml() { - if (File.Exists(filename)) + if (!File.Exists(filename)) return; + //初始化XML文档操作类 + XmlDocument myDoc = new XmlDocument(); { - if (!File.Exists(filename)) + //加载XML文件 + try { + myDoc.Load(filename); + } + catch (Exception e) + { + LogError.PublishError(e); return; } - - //初始化XML文档操作类 - XmlDocument myDoc = new XmlDocument(); + //搜索指定的节点 + XmlNode serverRootNode = myDoc.SelectSingleNode("Params"); + XmlNodeList nodes = null; + if (serverRootNode != null) { - //加载XML文件 - try + nodes = serverRootNode.ChildNodes; + } + if (nodes == null) return; + foreach (XmlNode xn in nodes) + { + if (xn.Name.Equals("username")) { - myDoc.Load(filename); + txtUser.Text = xn.InnerText.Trim(); } - catch (Exception e) + else if (xn.Name.Equals("password")) { - LogError.PublishError(e); - return; + textBoxPassWord.Text = xn.InnerText.Trim(); } - //搜索指定的节点 - XmlNode serverRootNode = myDoc.SelectSingleNode("Params"); - XmlNodeList nodes = null; - if (serverRootNode != null) + else if (xn.Name.Equals("isremember")) { - nodes = serverRootNode.ChildNodes; - } - if (nodes != null) - { - foreach (XmlNode xn in nodes) - { - if (xn.Name == "username") - { - txtUser.Text = xn.InnerText.Trim(); - } - else if (xn.Name == "password") - { - textBoxPassWord.Text = xn.InnerText.Trim(); - } - else if (xn.Name == "isremember") - { - if (xn.InnerText.Trim() == "true") - { - checkBoxXRememberPassword.Checked = true; - } - else if (xn.InnerText.Trim() == "false") - { - checkBoxXRememberPassword.Checked = false; - } - } - } - + checkBoxXRememberPassword.Checked = xn.InnerText.Trim().Equals("true"); } } } - } /// /// 记录登录的用户名和密码 /// - private void WriteXML() + private void WriteXml() { if (!File.Exists(filename)) { @@ -252,31 +202,17 @@ foreach (XmlNode xn in nodes) { XmlElement xe = (XmlElement)xn; - if (xe.Name == "username") + if (xe.Name.Equals("username")) { xe.InnerText = txtUser.Text.Trim(); } - else if (xe.Name == "password") + else if (xe.Name.Equals("password")) { - if (checkBoxXRememberPassword.Checked) - { - xe.InnerText = textBoxPassWord.Text.Trim(); - } - else - { - xe.InnerText = ""; - } + xe.InnerText = checkBoxXRememberPassword.Checked ? textBoxPassWord.Text.Trim() : ""; } - else if (xe.Name == "isremember") + else if (xe.Name.Equals("isremember")) { - if (checkBoxXRememberPassword.Checked) - { - xe.InnerText = "true"; - } - else - { - xe.InnerText = "false"; - } + xe.InnerText = checkBoxXRememberPassword.Checked ? "true" : "false"; } } } diff --git a/FrmMaterialSel.cs b/FrmMaterialSel.cs index 8645ab3..d23f385 100644 --- a/FrmMaterialSel.cs +++ b/FrmMaterialSel.cs @@ -157,7 +157,7 @@ } catch (Exception ex) { - LogHelper.WriteLog(typeof(FrmMaterialSel), ex.Message); + LogHelper.Error(ex.Message); } } diff --git a/FrmMetadataStat.cs b/FrmMetadataStat.cs index c3c1359..96029a6 100644 --- a/FrmMetadataStat.cs +++ b/FrmMetadataStat.cs @@ -96,7 +96,7 @@ //统计有多少个图层 private int statistLayer() { - List datasrcs = Utility.layerConfig.datasrcs; + List datasrcs = Utility.LayerConfig.datasrcs; return datasrcs.SelectMany(datasrc => datasrc.layertypes).Sum(layerType => layerType.layers.Count); } diff --git a/FrmpipeDeepstatis.cs b/FrmpipeDeepstatis.cs index 6a5c895..8d915a9 100644 --- a/FrmpipeDeepstatis.cs +++ b/FrmpipeDeepstatis.cs @@ -2,6 +2,7 @@ using System.Collections.Generic; using System.Diagnostics; using System.IO; +using System.Reflection; using System.Text; using System.Windows.Forms; using System.Windows.Forms.DataVisualization.Charting; @@ -320,7 +321,7 @@ MessageBox.Show("请添加分段"); return; } - Utility.RemoveFeatureFromName(globeControl1, "trackPolygon"); + FeatureTools.RemoveFeatureFromName(globeControl1, "trackPolygon"); globeControl1.Globe.Action = EnumAction3D.TrackPolygon; globeControl1.Globe.TrackPolygonTool.TrackMode = EnumTrackMode.SpaceTrack; globeControl1.TrackPolygonEndEvent += globeControl1_TrackPolygonEndEvent; @@ -408,12 +409,11 @@ TextBox control; private void dataGridViewX2_EditingControlShowing(object sender, DataGridViewEditingControlShowingEventArgs e) { - if (e.Control.GetType().BaseType.Name == "TextBox") - { - control = new TextBox(); - control = (TextBox)e.Control; - control.KeyPress += control_KeyPress; - } + MemberInfo memberInfo = e.Control.GetType().BaseType; + if (memberInfo != null && !memberInfo.Name.Equals("TextBox")) return; + control = new TextBox(); + control = (TextBox)e.Control; + control.KeyPress += control_KeyPress; } /// /// 键盘按键按下事件处理 @@ -423,28 +423,24 @@ void control_KeyPress(object sender, KeyPressEventArgs e) { TextBox text = sender as TextBox; + if (text == null) return; if ((e.KeyChar < 48 || e.KeyChar > 57) && (e.KeyChar != 8) && e.KeyChar != 46) { e.Handled = true; } - if (e.KeyChar == 46) //小数点 + if (e.KeyChar != 46) return; + if (text.Text.Length <= 0) + e.Handled = true; //小数点不能在第一位 + else //处理不规则的小数点 { - if (text.Text.Length <= 0) - e.Handled = true; //小数点不能在第一位 - else //处理不规则的小数点 + float f; + float oldf; + bool b1 = false, b2 = false; + b1 = float.TryParse(text.Text, out oldf); + b2 = float.TryParse(text.Text + e.KeyChar, out f); + if (!b2) { - float f; - float oldf; - bool b1 = false, b2 = false; - b1 = float.TryParse(text.Text, out oldf); - b2 = float.TryParse(text.Text + e.KeyChar, out f); - if (b2 == false) - { - if (b1) - e.Handled = true; - else - e.Handled = false; - } + e.Handled = b1; } } } @@ -457,7 +453,7 @@ { frm = null; - Utility.RemoveFeatureFromName(globeControl1, "trackPolygon"); + FeatureTools.RemoveFeatureFromName(globeControl1, "trackPolygon"); globeControl1.TrackPolygonEndEvent -= globeControl1_TrackPolygonEndEvent; globeControl1.Globe.Action = EnumAction3D.ActionNull; diff --git a/FrmpipeDiametergather.cs b/FrmpipeDiametergather.cs index a9d96fa..c09aaf1 100644 --- a/FrmpipeDiametergather.cs +++ b/FrmpipeDiametergather.cs @@ -154,7 +154,7 @@ MessageBox.Show("请选择图层！"); return; } - Utility.RemoveFeatureFromName(globeControl1, "trackPolygon"); + FeatureTools.RemoveFeatureFromName(globeControl1, "trackPolygon"); globeControl1.Globe.Action = EnumAction3D.TrackPolygon; globeControl1.Globe.TrackPolygonTool.TrackMode = EnumTrackMode.SpaceTrack; globeControl1.TrackPolygonEndEvent += globeControl1_TrackPolygonEndEvent; @@ -392,7 +392,7 @@ private void FrmpipeDiametergather_FormClosing(object sender, FormClosingEventArgs e) { frm = null; - Utility.RemoveFeatureFromName(globeControl1, "trackPolygon"); + FeatureTools.RemoveFeatureFromName(globeControl1, "trackPolygon"); globeControl1.TrackPolygonEndEvent -= globeControl1_TrackPolygonEndEvent; globeControl1.Globe.Action = EnumAction3D.ActionNull; diff --git a/FrmpipeMaterialGather.cs b/FrmpipeMaterialGather.cs index 44e7f24..5ca8144 100644 --- a/FrmpipeMaterialGather.cs +++ b/FrmpipeMaterialGather.cs @@ -58,10 +58,9 @@ for (int i = 0; i < pipeLayerNames.Count; i++) { clbPipeLine.Items.Add(pipeLayerNames[i]); - GSOLayer layer = globeControl1.Globe.Layers.GetLayerByCaption(pipeLayerNames[i]); - if (layer.Dataset == null || !layer.Dataset.IsFeatureDataset || layer.Type != EnumLayerType.FeatureLayer) continue; + GSOLayer layer = globeControl1.Globe.Layers.GetLayerByCaption(pipeLayerNames[i]); + if (layer == null || layer.Dataset == null || !layer.Dataset.IsFeatureDataset || layer.Type != EnumLayerType.FeatureLayer) continue; - string name = layer.Name; GSOFeatureLayer flayer = layer as GSOFeatureLayer; GSOFeatures feats = flayer.GetAllFeatures(); @@ -205,7 +204,7 @@ { chart1.Series.Add(clbPipeLine.CheckedItems[i].ToString()); GSOLayer layer = globeControl1.Globe.Layers.GetLayerByCaption(clbPipeLine.CheckedItems[i].ToString()); - if (layer != null && layer is GSOFeatureLayer) + if (layer is GSOFeatureLayer) { GSOFeatureLayer flayer = layer as GSOFeatureLayer; GSOFeatures features = flayer.GetAllFeatures(); @@ -240,10 +239,9 @@ labeStyleAxisX.Enabled = true; chart1.ChartAreas["ChartArea1"].AxisX.LabelStyle = labeStyleAxisX; - Dictionary dic1 = new Dictionary(); for (int j = 0; j < chart1.Series.Count; j++) { - dic1 = new Dictionary(); + Dictionary dic1 = new Dictionary(); foreach (string key in dic.Keys) { if (key.Contains(chart1.Series[j].Name)) @@ -304,7 +302,7 @@ MessageBox.Show("请选择材质类型！"); return; } - Utility.RemoveFeatureFromName(globeControl1, "trackPolygon"); + FeatureTools.RemoveFeatureFromName(globeControl1, "trackPolygon"); globeControl1.Globe.Action = EnumAction3D.TrackPolygon; globeControl1.Globe.TrackPolygonTool.TrackMode = EnumTrackMode.SpaceTrack; globeControl1.TrackPolygonEndEvent += globeControl1_TrackPolygonEndEvent; @@ -318,7 +316,7 @@ private void FrmpipeMaterialGather_FormClosing(object sender, FormClosingEventArgs e) { frm = null; - Utility.RemoveFeatureFromName(globeControl1, "trackPolygon"); + FeatureTools.RemoveFeatureFromName(globeControl1, "trackPolygon"); globeControl1.TrackPolygonEndEvent -= globeControl1_TrackPolygonEndEvent; globeControl1.Globe.Action = EnumAction3D.ActionNull; diff --git a/Frmpipediameterstatis.cs b/Frmpipediameterstatis.cs index 4fb25a8..631a996 100644 --- a/Frmpipediameterstatis.cs +++ b/Frmpipediameterstatis.cs @@ -202,8 +202,8 @@ } catch (Exception ex) { - LogHelper.WriteLog(typeof(Frmpipediameterstatis), ex.Message); //MessageBox.Show(ex.Message); + LogHelper.Error(ex.Message); LogError.PublishError(ex); } } @@ -372,7 +372,7 @@ MessageBox.Show("请添加分段！"); return; } - Utility.RemoveFeatureFromName(globeControl1, "trackPolygon"); + FeatureTools.RemoveFeatureFromName(globeControl1, "trackPolygon"); globeControl1.Globe.Action = EnumAction3D.TrackPolygon; globeControl1.Globe.TrackPolygonTool.TrackMode = EnumTrackMode.SpaceTrack; globeControl1.TrackPolygonEndEvent += globeControl1_TrackPolygonEndEvent; @@ -422,7 +422,7 @@ globeControl1.Globe.Action = EnumAction3D.ActionNull; globeControl1.TrackPolygonEndEvent -= globeControl1_TrackPolygonEndEvent; - Utility.RemoveFeatureFromName(globeControl1, "trackPolygon"); + FeatureTools.RemoveFeatureFromName(globeControl1, "trackPolygon"); globeControl1.Globe.MemoryLayer.RemoveAllFeature(); } diff --git a/LineBuilder.cs b/LineBuilder.cs index 33a216c..b6a8516 100644 --- a/LineBuilder.cs +++ b/LineBuilder.cs @@ -43,8 +43,8 @@ GSOGeoPolyline3D lineeee = f.Geometry as GSOGeoPolyline3D; if (lineeee == null || lineeee.GetSpaceLength(true, 6378137) == 0) { - LogHelper.WriteLog(typeof(LineBuilder), "出现数据无法入库:"+f.ID); - continue; //TODO LIST:判断是否会出现部署数据无法入库情况,Log2Net + LogHelper.Error("出现数据无法入库:" + f.ID); + continue; } GSOFeature newFeature = newFeatureSet.CreateFeature(); diff --git a/LogHelper.cs b/LogHelper.cs index 9ef5f27..04573cf 100644 --- a/LogHelper.cs +++ b/LogHelper.cs @@ -1,4 +1,5 @@ using System; +using System.Diagnostics; using log4net; using log4net.Config; @@ -7,35 +8,82 @@ { public class LogHelper { - /// - /// 输出日志到Log4Net - /// - /// - /// - #region static void WriteLog(Type t, Exception ex) - public static void WriteLog(Type t, Exception ex) + private static ILog _logdebug = log4net.LogManager.GetLogger("logdebug"); + private static ILog _loginfo = log4net.LogManager.GetLogger("loginfo"); + private static ILog _logwarn = log4net.LogManager.GetLogger("logwarn"); + private static ILog _logerror = log4net.LogManager.GetLogger("logerror"); + private static ILog _logfatal = log4net.LogManager.GetLogger("logfatal"); + + public static void Debug(string msg) { - ILog log = log4net.LogManager.GetLogger(t); - log.Error("Error", ex); + StackFrame sf = new StackFrame(1); + msg = string.Format("{0}.{1}:{2}", sf.GetMethod().ReflectedType.FullName, sf.GetMethod().Name, msg); + _logdebug.Debug(msg); + } + public static void Debug(string msg, Exception e) + { + StackFrame sf = new StackFrame(1); + msg = string.Format("{0}.{1}:{2}", sf.GetMethod().ReflectedType.FullName, sf.GetMethod().Name, msg); + _logdebug.Debug(msg, e); } - #endregion - /// - /// 输出日志到Log4Net - /// - /// - /// - #region static void WriteLog(Type t, string msg) - - public static void WriteLog(Type t, string msg) + public static void Info(string msg) { - ILog log = log4net.LogManager.GetLogger(t); - log.Error(msg); + StackFrame sf = new StackFrame(1); + msg = string.Format("{0}.{1}:{2}", sf.GetMethod().ReflectedType.FullName, sf.GetMethod().Name, msg); + _loginfo.Info(msg); + } + public static void Info(string msg, Exception e) + { + StackFrame sf = new StackFrame(1); + msg = string.Format("{0}.{1}:{2}", sf.GetMethod().ReflectedType.FullName, sf.GetMethod().Name, msg); + _loginfo.Info(msg, e); } - #endregion + + public static void Warn(string msg) + { + StackFrame sf = new StackFrame(1); + msg = string.Format("{0}.{1}:{2}", sf.GetMethod().ReflectedType.FullName, sf.GetMethod().Name, msg); + _logwarn.Warn(msg); + } + public static void Warn(string msg, Exception e) + { + StackFrame sf = new StackFrame(1); + msg = string.Format("{0}.{1}:{2}", sf.GetMethod().ReflectedType.FullName, sf.GetMethod().Name, msg); + _logwarn.Warn(msg, e); + } + + + public static void Error(string msg) + { + StackFrame sf = new StackFrame(1); + msg = string.Format("{0}.{1}:{2}", sf.GetMethod().ReflectedType.FullName, sf.GetMethod().Name, msg); + _logerror.Error(msg); + } + public static void Error(string msg, Exception e) + { + StackFrame sf = new StackFrame(1); + msg = string.Format("{0}.{1}:{2}", sf.GetMethod().ReflectedType.FullName, sf.GetMethod().Name, msg); + _logerror.Error(msg, e); + } + + + public static void Fatal(string msg) + { + StackFrame sf = new StackFrame(1); + msg = string.Format("{0}.{1}:{2}", sf.GetMethod().ReflectedType.FullName, sf.GetMethod().Name, msg); + _logfatal.Fatal(msg); + } + public static void Fatal(string msg, Exception e) + { + StackFrame sf = new StackFrame(1); + msg = string.Format("{0}.{1}:{2}", sf.GetMethod().ReflectedType.FullName, sf.GetMethod().Name, msg); + _logfatal.Fatal(msg, e); + } + } diff --git a/MainFrm.cs b/MainFrm.cs index 43de664..51f362a 100644 --- a/MainFrm.cs +++ b/MainFrm.cs @@ -18,7 +18,6 @@ using GeoScene.Data; using GeoScene.Engine; using GeoScene.Globe; -using Timer = System.Windows.Forms.Timer; using ToolTip = System.Windows.Forms.ToolTip; namespace Cyberpipe @@ -163,6 +162,7 @@ /// private void AddGZ() { + lendendGZ50 = new GSOHudButton(); lendendGZ50.SetImage(Application.StartupPath + "/Resource/管纵/50.png"); lendendGZ50.SetOffset(0, 0); @@ -1294,18 +1294,19 @@ private void MainFrm_Load(object sender, EventArgs e) { + layerTree.Nodes.Add("正在加载，请稍后……");//树状图加载在图层加载之后，故增加提示 initGlobalControl(); - //initGlobalMap(); - //initLayerTree(); initMarkerTree(); initLayout(); loadData(); - double x = Convert.ToDouble(Utility.Query_Roads["定位"].ToString().Split(',')[0]); - double y = Convert.ToDouble(Utility.Query_Roads["定位"].ToString().Split(',')[1]); - double z = Convert.ToDouble(Utility.Query_Roads["定位"].ToString().Split(',')[2]); + + double x = Convert.ToDouble(Utility.Query_Roads["绿岛"].ToString().Split(',')[0]); + double y = Convert.ToDouble(Utility.Query_Roads["绿岛"].ToString().Split(',')[1]); + double z = Convert.ToDouble(Utility.Query_Roads["绿岛"].ToString().Split(',')[2]); jumpToCameraState(x, y, z); + } #endregion @@ -1315,11 +1316,17 @@ if (e.Layer == null || !e.Layer.Caption.Equals(Utility.roadLayerName)) return; foreach (TreeNode layerTreeNode in layerTree.Nodes) { - foreach (TreeNode node in layerTreeNode.Nodes) + for (int i=0;i dt, DataGridView dataGridView) @@ -7330,7 +7337,7 @@ } catch (Exception ex) { - LogHelper.WriteLog(typeof(MainFrm), ex); + LogHelper.Debug("", ex); } } } @@ -7362,7 +7369,7 @@ GSOLayer layer = globeControl1.Globe.Layers.Add(strDataPath); if (layer == null) {//wxl - LogHelper.WriteLog(typeof(MainFrm), "buttonItemHX1_Click操作中，" + strDataPath + "的layer为空"); + LogHelper.Error("buttonItemHX1_Click操作中，" + strDataPath + "的layer为空"); continue; } GSOFeatures redFeatures = layer.GetAllFeatures(); @@ -7457,17 +7464,12 @@ { try { + globeControl1.BeforeSceneRenderEvent -= globeControl1_BeforeSceneRenderEvent; globeControl2.BeforeSceneRenderEvent -= globeControl2_BeforeSceneRenderEvent; - double x = Convert.ToDouble(Utility.Query_Roads["定位"].ToString().Split(',')[0]); - double y = Convert.ToDouble(Utility.Query_Roads["定位"].ToString().Split(',')[1]); - double z = Convert.ToDouble(Utility.Query_Roads["定位"].ToString().Split(',')[2]); - jumpToCameraState(x, y, z); - /* globeControl1.Globe.FlyToPosition(new GSOPoint3d(120.610963, 31.188121, 50), EnumAltitudeMode.Absolute, -4, 50, 800); globeControl1.Globe.FlyToPointSpeed = 10000000; - * */ globeControl1.Globe.Action = EnumAction3D.SelectObject; globeControl1.Refresh(); @@ -7489,6 +7491,37 @@ } } /// + /// 基础工具 + /// + /// + /// + private void ribbonTabItem1_MouseDown(object sender, MouseEventArgs e) + { + try + { + + globeControl1.BeforeSceneRenderEvent -= globeControl1_BeforeSceneRenderEvent; + globeControl2.BeforeSceneRenderEvent -= globeControl2_BeforeSceneRenderEvent; + + globeControl1.Globe.Action = EnumAction3D.ActionNull; + dataGridViewX1.AutoSizeColumnsMode = DataGridViewAutoSizeColumnsMode.AllCells; + //zhanshi = false; + redSH = false; + splitContainer1.Panel2Collapsed = true; + panelOfTable.Visible = false; + legendSC.Visible = false; + legendSG.Visible = false; + ClearGZData(); + GSOLayer redLayer = globeControl1.Globe.Layers.GetLayerByCaption("红线"); + if (redLayer == null) return; + redLayer.Visible = false; + } + catch (Exception ex) + { + //MessageBox.Show("系统运行错误:" + ex.ToString(), "错误", MessageBoxButtons.OK, MessageBoxIcon.Error); + } + } + /// /// 一键审核 /// /// @@ -7497,6 +7530,7 @@ { try { + globeControl1.BeforeSceneRenderEvent -= globeControl1_BeforeSceneRenderEvent; globeControl2.BeforeSceneRenderEvent -= globeControl2_BeforeSceneRenderEvent; @@ -7518,32 +7552,7 @@ //MessageBox.Show("系统运行错误:" + ex.ToString(), "错误", MessageBoxButtons.OK, MessageBoxIcon.Error); } } - - void ResetRibbonTab() - { - try - { - globeControl1.BeforeSceneRenderEvent -= globeControl1_BeforeSceneRenderEvent; - globeControl2.BeforeSceneRenderEvent -= globeControl2_BeforeSceneRenderEvent; - - globeControl1.Globe.Action = EnumAction3D.ActionNull; - dataGridViewX1.AutoSizeColumnsMode = DataGridViewAutoSizeColumnsMode.AllCells; - //zhanshi = false; - redSH = false; - splitContainer1.Panel2Collapsed = true; - panelOfTable.Visible = false; - legendSC.Visible = false; - legendSG.Visible = false; - ClearGZData(); - GSOLayer redLayer = globeControl1.Globe.Layers.GetLayerByCaption("红线"); - if (redLayer == null) return; - redLayer.Visible = false; - } - catch (Exception ex) - { - LogHelper.WriteLog(typeof(MainFrm), ex); - } - } + /// /// 双屏对比 /// @@ -7553,8 +7562,8 @@ { try { - globeControl1.BeforeSceneRenderEvent += new BeforeSceneRenderEventHandler(globeControl1_BeforeSceneRenderEvent); - globeControl2.BeforeSceneRenderEvent += new BeforeSceneRenderEventHandler(globeControl2_BeforeSceneRenderEvent); + globeControl1.BeforeSceneRenderEvent += globeControl1_BeforeSceneRenderEvent; + globeControl2.BeforeSceneRenderEvent += globeControl2_BeforeSceneRenderEvent; globeControl1.Globe.Action = EnumAction3D.ActionNull; panelOfTable.Visible = false; @@ -7570,32 +7579,43 @@ GSOLayer redLayer = globeControl1.Globe.Layers.GetLayerByCaption("红线"); if (redLayer != null) - { redLayer.Visible = false; - } } catch (Exception ex) { - LogHelper.WriteLog(typeof(MainFrm), ex); + //MessageBox.Show("系统运行错误:" + ex.ToString(), "错误", MessageBoxButtons.OK, MessageBoxIcon.Error); } } /// - /// 基础工具 - /// - /// - /// - private void ribbonTabItem1_MouseDown(object sender, MouseEventArgs e) - { - ResetRibbonTab(); - } - /// /// 文档管理 /// /// /// private void ribbonTabItem4_MouseDown(object sender, MouseEventArgs e) { - ResetRibbonTab(); + try + { + + globeControl1.BeforeSceneRenderEvent -= globeControl1_BeforeSceneRenderEvent; + globeControl2.BeforeSceneRenderEvent -= globeControl2_BeforeSceneRenderEvent; + + globeControl1.Globe.Action = EnumAction3D.ActionNull; + panelOfTable.Visible = false; + //zhanshi = false; + redSH = false; + splitContainer1.Panel2Collapsed = true; + dataGridViewX1.AutoSizeColumnsMode = DataGridViewAutoSizeColumnsMode.AllCells; + legendSC.Visible = false; + legendSG.Visible = false; + ClearGZData(); + GSOLayer redLayer = globeControl1.Globe.Layers.GetLayerByCaption("红线"); + if (redLayer != null) + redLayer.Visible = false; + } + catch (Exception ex) + { + //MessageBox.Show("系统运行错误:" + ex.ToString(), "错误", MessageBoxButtons.OK, MessageBoxIcon.Error); + } } /// /// 基础管理 @@ -7604,7 +7624,29 @@ /// private void ribbonTabItem14_MouseDown(object sender, MouseEventArgs e) { - ResetRibbonTab(); + try + { + globeControl1.BeforeSceneRenderEvent -= globeControl1_BeforeSceneRenderEvent; + globeControl2.BeforeSceneRenderEvent -= globeControl2_BeforeSceneRenderEvent; + + globeControl1.Globe.Action = EnumAction3D.ActionNull; + panelOfTable.Visible = false; + //zhanshi = false; + redSH = false; + splitContainer1.Panel2Collapsed = true; + dataGridViewX1.AutoSizeColumnsMode = DataGridViewAutoSizeColumnsMode.AllCells; + legendSC.Visible = false; + legendSG.Visible = false; + ClearGZData(); + + GSOLayer redLayer = globeControl1.Globe.Layers.GetLayerByCaption("红线"); + if (redLayer != null) + redLayer.Visible = false; + } + catch (Exception ex) + { + //MessageBox.Show("系统运行错误:" + ex.ToString(), "错误", MessageBoxButtons.OK, MessageBoxIcon.Error); + } } /// /// 权限管理 @@ -7613,26 +7655,31 @@ /// private void ribbonTabItem2_MouseDown(object sender, MouseEventArgs e) { - ResetRibbonTab(); + try + { + globeControl1.BeforeSceneRenderEvent -= globeControl1_BeforeSceneRenderEvent; + globeControl2.BeforeSceneRenderEvent -= globeControl2_BeforeSceneRenderEvent; + + globeControl1.Globe.Action = EnumAction3D.ActionNull; + panelOfTable.Visible = false; + //zhanshi = false; + redSH = false; + splitContainer1.Panel2Collapsed = true; + dataGridViewX1.AutoSizeColumnsMode = DataGridViewAutoSizeColumnsMode.AllCells; + legendSC.Visible = false; + legendSG.Visible = false; + ClearGZData(); + + GSOLayer redLayer = globeControl1.Globe.Layers.GetLayerByCaption("红线"); + if (redLayer == null) return; + redLayer.Visible = false; + } + catch (Exception ex) + { + //MessageBox.Show("系统运行错误:" + ex.ToString(), "错误", MessageBoxButtons.OK, MessageBoxIcon.Error); + } } - /// - /// 管线定位 - /// - /// - /// - private void ribbonTabItem7_MouseDown(object sender, MouseEventArgs e) - { - ResetRibbonTab(); - } - /// - /// 标识器管理 - /// - /// - /// - private void ribbonTabItem5_MouseDown(object sender, MouseEventArgs e) - { - ResetRibbonTab(); - } + //GSOFeature dpFeatuer = null; /// /// 双屏分析，点击管段分析 @@ -8017,7 +8064,9 @@ private void btn_flag_Click(object sender, EventArgs e) { if (FrmFlagManagers.IS_OPEN) + { return; + } FrmFlagManagers frm = new FrmFlagManagers(globeControl1); frm.Show(this); } diff --git a/MainFrm.designer.cs b/MainFrm.designer.cs index e3dca41..73398c0 100644 --- a/MainFrm.designer.cs +++ b/MainFrm.designer.cs @@ -4,6 +4,7 @@ using DevComponents.DotNetBar; using DevComponents.DotNetBar.Controls; using DevComponents.Editors; +using System.Drawing; namespace Cyberpipe { @@ -89,6 +90,7 @@ this.sideBar1 = new DevComponents.DotNetBar.SideBar(); this.panelEx3 = new DevComponents.DotNetBar.PanelEx(); this.layerSensorTree = new System.Windows.Forms.TreeView(); + this.layerTree = new Cyberpipe.MyTreeView(); this.sideBarPanelItem3 = new DevComponents.DotNetBar.SideBarPanelItem(); this.controlContainerItem3 = new DevComponents.DotNetBar.ControlContainerItem(); this.sideBarPanelItem4 = new DevComponents.DotNetBar.SideBarPanelItem(); @@ -243,42 +245,18 @@ this.保存ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.定位ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.ribbonControl1 = new DevComponents.DotNetBar.RibbonControl(); - this.ribbonPanel6 = new DevComponents.DotNetBar.RibbonPanel(); - this.ribbonBar6 = new DevComponents.DotNetBar.RibbonBar(); - this.buttonItemSPSZ = new DevComponents.DotNetBar.ButtonItem(); - this.buttonItem8 = new DevComponents.DotNetBar.ButtonItem(); - this.buttonItemLocation = new DevComponents.DotNetBar.ButtonItem(); - this.sliderItem2 = new DevComponents.DotNetBar.SliderItem(); - this.buttonItemGBJC = new DevComponents.DotNetBar.ButtonItem(); - this.ribbonPanel5 = new DevComponents.DotNetBar.RibbonPanel(); - this.ribbonBar2 = new DevComponents.DotNetBar.RibbonBar(); - this.buttonItemHX1 = new DevComponents.DotNetBar.ButtonItem(); - this.buttonItemHX2 = new DevComponents.DotNetBar.ButtonItem(); - this.buttonItemDCTP = new DevComponents.DotNetBar.ButtonItem(); - this.sliderItem3 = new DevComponents.DotNetBar.SliderItem(); - this.ribbonPanel1 = new DevComponents.DotNetBar.RibbonPanel(); - this.ribbonBar21 = new DevComponents.DotNetBar.RibbonBar(); - this.buttonItem87 = new DevComponents.DotNetBar.ButtonItem(); - this.buttonItem88 = new DevComponents.DotNetBar.ButtonItem(); - this.buttonItem27 = new DevComponents.DotNetBar.ButtonItem(); - this.buttonItem91 = new DevComponents.DotNetBar.ButtonItem(); - this.buttonItem1 = new DevComponents.DotNetBar.ButtonItem(); - this.btnlegendSet = new DevComponents.DotNetBar.ButtonItem(); - this.buttonItem89 = new DevComponents.DotNetBar.ButtonItem(); - this.btnOutputJPG = new DevComponents.DotNetBar.ButtonItem(); - this.ribbonPanel12 = new DevComponents.DotNetBar.RibbonPanel(); - this.ribbonBar18 = new DevComponents.DotNetBar.RibbonBar(); - this.buttonItem133 = new DevComponents.DotNetBar.ButtonItem(); - this.ribbonBar13 = new DevComponents.DotNetBar.RibbonBar(); - this.buttonItem127 = new DevComponents.DotNetBar.ButtonItem(); - this.buttonItem128 = new DevComponents.DotNetBar.ButtonItem(); - this.sliderItem1 = new DevComponents.DotNetBar.SliderItem(); - this.buttonItem134 = new DevComponents.DotNetBar.ButtonItem(); - this.buttonItem130 = new DevComponents.DotNetBar.ButtonItem(); - this.btn_check_history = new DevComponents.DotNetBar.ButtonItem(); - this.ribbonPanel4 = new DevComponents.DotNetBar.RibbonPanel(); - this.ribbonBar1 = new DevComponents.DotNetBar.RibbonBar(); - this.btn_document_info = new DevComponents.DotNetBar.ButtonItem(); + this.ribbonPanel3 = new DevComponents.DotNetBar.RibbonPanel(); + this.ribbonBar4 = new DevComponents.DotNetBar.RibbonBar(); + this.btn_flag = new DevComponents.DotNetBar.ButtonItem(); + this.slider4ground = new DevComponents.DotNetBar.SliderItem(); + this.ribbonPanel7 = new DevComponents.DotNetBar.RibbonPanel(); + this.gxdw_ribbonbar = new DevComponents.DotNetBar.RibbonBar(); + this.buttonItem9 = new DevComponents.DotNetBar.ButtonItem(); + this.buttonItem10 = new DevComponents.DotNetBar.ButtonItem(); + this.buttonItem11 = new DevComponents.DotNetBar.ButtonItem(); + this.buttonItem12 = new DevComponents.DotNetBar.ButtonItem(); + this.buttonItem13 = new DevComponents.DotNetBar.ButtonItem(); + this.buttonItem14 = new DevComponents.DotNetBar.ButtonItem(); this.ribbonPanel15 = new DevComponents.DotNetBar.RibbonPanel(); this.ribbonBar20 = new DevComponents.DotNetBar.RibbonBar(); this.buttonItemSH = new DevComponents.DotNetBar.ButtonItem(); @@ -334,18 +312,6 @@ this.buttonItemXT4 = new DevComponents.DotNetBar.ButtonItem(); this.buttonItemXT4_1 = new DevComponents.DotNetBar.ButtonItem(); this.buttonItemXT4_2 = new DevComponents.DotNetBar.ButtonItem(); - this.ribbonPanel3 = new DevComponents.DotNetBar.RibbonPanel(); - this.ribbonBar4 = new DevComponents.DotNetBar.RibbonBar(); - this.btn_flag = new DevComponents.DotNetBar.ButtonItem(); - this.slider4ground = new DevComponents.DotNetBar.SliderItem(); - this.ribbonPanel7 = new DevComponents.DotNetBar.RibbonPanel(); - this.gxdw_ribbonbar = new DevComponents.DotNetBar.RibbonBar(); - this.buttonItem9 = new DevComponents.DotNetBar.ButtonItem(); - this.buttonItem10 = new DevComponents.DotNetBar.ButtonItem(); - this.buttonItem11 = new DevComponents.DotNetBar.ButtonItem(); - this.buttonItem12 = new DevComponents.DotNetBar.ButtonItem(); - this.buttonItem13 = new DevComponents.DotNetBar.ButtonItem(); - this.buttonItem14 = new DevComponents.DotNetBar.ButtonItem(); this.ribbonPanel2 = new DevComponents.DotNetBar.RibbonPanel(); this.ribbonBar3 = new DevComponents.DotNetBar.RibbonBar(); this.btn_user_info = new DevComponents.DotNetBar.ButtonItem(); @@ -355,6 +321,43 @@ this.btn_user_role = new DevComponents.DotNetBar.ButtonItem(); this.btn_password_edit = new DevComponents.DotNetBar.ButtonItem(); this.buttonItemPasswordReset = new DevComponents.DotNetBar.ButtonItem(); + this.ribbonPanel6 = new DevComponents.DotNetBar.RibbonPanel(); + this.ribbonBar6 = new DevComponents.DotNetBar.RibbonBar(); + this.buttonItemSPSZ = new DevComponents.DotNetBar.ButtonItem(); + this.buttonItem8 = new DevComponents.DotNetBar.ButtonItem(); + this.buttonItemLocation = new DevComponents.DotNetBar.ButtonItem(); + this.sliderItem2 = new DevComponents.DotNetBar.SliderItem(); + this.buttonItemGBJC = new DevComponents.DotNetBar.ButtonItem(); + this.ribbonPanel5 = new DevComponents.DotNetBar.RibbonPanel(); + this.ribbonBar2 = new DevComponents.DotNetBar.RibbonBar(); + this.buttonItemHX1 = new DevComponents.DotNetBar.ButtonItem(); + this.buttonItemHX2 = new DevComponents.DotNetBar.ButtonItem(); + this.buttonItemDCTP = new DevComponents.DotNetBar.ButtonItem(); + this.sliderItem3 = new DevComponents.DotNetBar.SliderItem(); + this.ribbonPanel1 = new DevComponents.DotNetBar.RibbonPanel(); + this.ribbonBar21 = new DevComponents.DotNetBar.RibbonBar(); + this.buttonItem87 = new DevComponents.DotNetBar.ButtonItem(); + this.buttonItem88 = new DevComponents.DotNetBar.ButtonItem(); + this.buttonItem27 = new DevComponents.DotNetBar.ButtonItem(); + this.buttonItem91 = new DevComponents.DotNetBar.ButtonItem(); + this.buttonItem1 = new DevComponents.DotNetBar.ButtonItem(); + this.btnlegendSet = new DevComponents.DotNetBar.ButtonItem(); + this.buttonItem89 = new DevComponents.DotNetBar.ButtonItem(); + this.btnOutputJPG = new DevComponents.DotNetBar.ButtonItem(); + this.ribbonPanel12 = new DevComponents.DotNetBar.RibbonPanel(); + this.ribbonBar18 = new DevComponents.DotNetBar.RibbonBar(); + this.buttonItem133 = new DevComponents.DotNetBar.ButtonItem(); + this.buttonItem132 = new DevComponents.DotNetBar.ButtonItem(); + this.ribbonBar13 = new DevComponents.DotNetBar.RibbonBar(); + this.buttonItem127 = new DevComponents.DotNetBar.ButtonItem(); + this.buttonItem128 = new DevComponents.DotNetBar.ButtonItem(); + this.sliderItem1 = new DevComponents.DotNetBar.SliderItem(); + this.buttonItem134 = new DevComponents.DotNetBar.ButtonItem(); + this.buttonItem130 = new DevComponents.DotNetBar.ButtonItem(); + this.btn_check_history = new DevComponents.DotNetBar.ButtonItem(); + this.ribbonPanel4 = new DevComponents.DotNetBar.RibbonPanel(); + this.ribbonBar1 = new DevComponents.DotNetBar.RibbonBar(); + this.btn_document_info = new DevComponents.DotNetBar.ButtonItem(); this.ribbonTabItem1 = new DevComponents.DotNetBar.RibbonTabItem(); this.ribbonTabItem11 = new DevComponents.DotNetBar.RibbonTabItem(); this.ribbonTabItem6 = new DevComponents.DotNetBar.RibbonTabItem(); @@ -516,7 +519,6 @@ this.labelX17 = new DevComponents.DotNetBar.LabelX(); this.panelEx4 = new DevComponents.DotNetBar.PanelEx(); this.pictureBox1 = new System.Windows.Forms.PictureBox(); - this.layerTree = new Cyberpipe.MyTreeView(); this.statusStrip1.SuspendLayout(); this.sideBar1.SuspendLayout(); this.panelEx3.SuspendLayout(); @@ -527,15 +529,15 @@ this.contextMenuStrip3.SuspendLayout(); this.contextMenuStripDeleteLayerNode.SuspendLayout(); this.ribbonControl1.SuspendLayout(); + this.ribbonPanel3.SuspendLayout(); + this.ribbonPanel7.SuspendLayout(); + this.ribbonPanel15.SuspendLayout(); + this.ribbonPanel2.SuspendLayout(); this.ribbonPanel6.SuspendLayout(); this.ribbonPanel5.SuspendLayout(); this.ribbonPanel1.SuspendLayout(); this.ribbonPanel12.SuspendLayout(); this.ribbonPanel4.SuspendLayout(); - this.ribbonPanel15.SuspendLayout(); - this.ribbonPanel3.SuspendLayout(); - this.ribbonPanel7.SuspendLayout(); - this.ribbonPanel2.SuspendLayout(); this.panelOfTable.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.dataGridViewX1)).BeginInit(); this.statusStrip2.SuspendLayout(); @@ -711,7 +713,8 @@ this.statusLabel.Name = "statusLabel"; this.statusLabel.Size = new System.Drawing.Size(1313, 17); this.statusLabel.Spring = true; - this.statusLabel.Text = " ©2014-2015 苏州航天系统工程有限公司 版权所有"; + this.statusLabel.Text = Utility.Copyright; +// this.statusLabel.Text = " ©2014-2015 苏州航天系统工程有限公司 版权所有"; // // toolStripDropDownButton1 // @@ -956,6 +959,18 @@ this.layerSensorTree.NodeMouseClick += new System.Windows.Forms.TreeNodeMouseClickEventHandler(this.layerMarkerTree_NodeMouseClick); this.layerSensorTree.NodeMouseDoubleClick += new System.Windows.Forms.TreeNodeMouseClickEventHandler(this.layerTree_NodeMouseDoubleClick); // + // layerTree + // + this.layerTree.CheckBoxes = true; + this.layerTree.ItemHeight = 18; + this.layerTree.Location = new System.Drawing.Point(30, 78); + this.layerTree.Name = "layerTree"; + this.layerTree.Size = new System.Drawing.Size(121, 97); + this.layerTree.TabIndex = 1; + this.layerTree.AfterCheck += new System.Windows.Forms.TreeViewEventHandler(this.layerTree_AfterCheck); + this.layerTree.NodeMouseClick += new System.Windows.Forms.TreeNodeMouseClickEventHandler(this.layerTree_NodeMouseClick); + this.layerTree.NodeMouseDoubleClick += new System.Windows.Forms.TreeNodeMouseClickEventHandler(this.layerTree_NodeMouseDoubleClick); + // // sideBarPanelItem3 // this.sideBarPanelItem3.FontBold = true; @@ -2150,13 +2165,13 @@ this.ribbonControl1.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.ribbonControl1.Controls.Add(this.ribbonPanel3); this.ribbonControl1.Controls.Add(this.ribbonPanel7); - this.ribbonControl1.Controls.Add(this.ribbonPanel2); this.ribbonControl1.Controls.Add(this.ribbonPanel15); - this.ribbonControl1.Controls.Add(this.ribbonPanel4); - this.ribbonControl1.Controls.Add(this.ribbonPanel1); + this.ribbonControl1.Controls.Add(this.ribbonPanel2); this.ribbonControl1.Controls.Add(this.ribbonPanel6); - this.ribbonControl1.Controls.Add(this.ribbonPanel12); this.ribbonControl1.Controls.Add(this.ribbonPanel5); + this.ribbonControl1.Controls.Add(this.ribbonPanel1); + this.ribbonControl1.Controls.Add(this.ribbonPanel12); + this.ribbonControl1.Controls.Add(this.ribbonPanel4); this.ribbonControl1.Dock = System.Windows.Forms.DockStyle.Top; this.ribbonControl1.ImeMode = System.Windows.Forms.ImeMode.NoControl; this.ribbonControl1.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { @@ -2200,609 +2215,216 @@ this.ribbonControl1.Text = "ribbonControl1"; this.ribbonControl1.UseCustomizeDialog = false; // - // ribbonPanel6 + // ribbonPanel3 // - this.ribbonPanel6.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.ribbonPanel6.Controls.Add(this.ribbonBar6); - this.ribbonPanel6.Dock = System.Windows.Forms.DockStyle.Fill; - this.ribbonPanel6.Location = new System.Drawing.Point(0, 0); - this.ribbonPanel6.Name = "ribbonPanel6"; - this.ribbonPanel6.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); - this.ribbonPanel6.Size = new System.Drawing.Size(1328, 95); + this.ribbonPanel3.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.ribbonPanel3.Controls.Add(this.ribbonBar4); + this.ribbonPanel3.Dock = System.Windows.Forms.DockStyle.Fill; + this.ribbonPanel3.Location = new System.Drawing.Point(0, 33); + this.ribbonPanel3.Name = "ribbonPanel3"; + this.ribbonPanel3.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); + this.ribbonPanel3.Size = new System.Drawing.Size(1328, 62); // // // - this.ribbonPanel6.Style.Class = ""; - this.ribbonPanel6.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonPanel3.Style.Class = ""; + this.ribbonPanel3.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; // // // - this.ribbonPanel6.StyleMouseDown.Class = ""; - this.ribbonPanel6.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonPanel3.StyleMouseDown.Class = ""; + this.ribbonPanel3.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; // // // - this.ribbonPanel6.StyleMouseOver.Class = ""; - this.ribbonPanel6.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonPanel6.TabIndex = 38; - this.ribbonPanel6.Visible = false; + this.ribbonPanel3.StyleMouseOver.Class = ""; + this.ribbonPanel3.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonPanel3.TabIndex = 40; // - // ribbonBar6 + // ribbonBar4 // - this.ribbonBar6.AutoOverflowEnabled = true; + this.ribbonBar4.AutoOverflowEnabled = true; // // // - this.ribbonBar6.BackgroundMouseOverStyle.Class = ""; - this.ribbonBar6.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar4.BackgroundMouseOverStyle.Class = ""; + this.ribbonBar4.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; // // // - this.ribbonBar6.BackgroundStyle.Class = ""; - this.ribbonBar6.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonBar6.ContainerControlProcessDialogKey = true; - this.ribbonBar6.Dock = System.Windows.Forms.DockStyle.Left; - this.ribbonBar6.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { - this.buttonItemSPSZ, - this.buttonItem8, - this.buttonItemLocation, - this.sliderItem2, - this.buttonItemGBJC}); - this.ribbonBar6.Location = new System.Drawing.Point(3, 0); - this.ribbonBar6.Name = "ribbonBar6"; - this.ribbonBar6.Size = new System.Drawing.Size(427, 92); - this.ribbonBar6.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.ribbonBar6.TabIndex = 0; + this.ribbonBar4.BackgroundStyle.Class = ""; + this.ribbonBar4.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar4.ContainerControlProcessDialogKey = true; + this.ribbonBar4.Dock = System.Windows.Forms.DockStyle.Left; + this.ribbonBar4.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { + this.btn_flag, + this.slider4ground}); + this.ribbonBar4.Location = new System.Drawing.Point(3, 0); + this.ribbonBar4.Name = "ribbonBar4"; + this.ribbonBar4.Size = new System.Drawing.Size(634, 59); + this.ribbonBar4.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.ribbonBar4.TabIndex = 0; // // // - this.ribbonBar6.TitleStyle.Class = ""; - this.ribbonBar6.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar4.TitleStyle.Class = ""; + this.ribbonBar4.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; // // // - this.ribbonBar6.TitleStyleMouseOver.Class = ""; - this.ribbonBar6.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonBar6.TitleVisible = false; + this.ribbonBar4.TitleStyleMouseOver.Class = ""; + this.ribbonBar4.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar4.TitleVisible = false; // - // buttonItemSPSZ + // btn_flag // - this.buttonItemSPSZ.Image = ((System.Drawing.Image)(resources.GetObject("buttonItemSPSZ.Image"))); - this.buttonItemSPSZ.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItemSPSZ.Name = "buttonItemSPSZ"; - this.buttonItemSPSZ.SubItemsExpandWidth = 14; - this.buttonItemSPSZ.Text = "双屏设置"; - this.buttonItemSPSZ.Click += new System.EventHandler(this.buttonItemSPSZ_Click); + this.btn_flag.Image = global::Cyberpipe.Properties.Resources._24x24icon_03_hover; + this.btn_flag.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.btn_flag.Name = "btn_flag"; + this.btn_flag.SubItemsExpandWidth = 14; + this.btn_flag.Text = "标识器管理"; + this.btn_flag.Click += new System.EventHandler(this.btn_flag_Click); // - // buttonItem8 + // slider4ground // - this.buttonItem8.Image = ((System.Drawing.Image)(resources.GetObject("buttonItem8.Image"))); - this.buttonItem8.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem8.Name = "buttonItem8"; - this.buttonItem8.SubItemsExpandWidth = 14; - this.buttonItem8.Text = "双屏分析"; - this.buttonItem8.Click += new System.EventHandler(this.buttonItem8_Click); + this.slider4ground.LabelPosition = DevComponents.DotNetBar.eSliderLabelPosition.Top; + this.slider4ground.LabelWidth = 50; + this.slider4ground.Name = "slider4ground"; + this.slider4ground.Text = "地面透明度"; + this.slider4ground.TextColor = System.Drawing.Color.Black; + this.slider4ground.Value = 0; + this.slider4ground.ValueChanged += new System.EventHandler(this.slider4ground_ValueChanged); // - // buttonItemLocation + // ribbonPanel7 // - this.buttonItemLocation.Image = ((System.Drawing.Image)(resources.GetObject("buttonItemLocation.Image"))); - this.buttonItemLocation.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItemLocation.Name = "buttonItemLocation"; - this.buttonItemLocation.SubItemsExpandWidth = 14; - this.buttonItemLocation.Text = "快速定位"; - this.buttonItemLocation.Click += new System.EventHandler(this.buttonItemLocation_Click); + this.ribbonPanel7.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.ribbonPanel7.Controls.Add(this.gxdw_ribbonbar); + this.ribbonPanel7.Dock = System.Windows.Forms.DockStyle.Fill; + this.ribbonPanel7.Location = new System.Drawing.Point(0, 33); + this.ribbonPanel7.Name = "ribbonPanel7"; + this.ribbonPanel7.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); + this.ribbonPanel7.Size = new System.Drawing.Size(1328, 62); // - // sliderItem2 // - this.sliderItem2.LabelPosition = DevComponents.DotNetBar.eSliderLabelPosition.Top; - this.sliderItem2.LabelWidth = 50; - this.sliderItem2.Name = "sliderItem2"; - this.sliderItem2.Text = "地面透明度"; - this.sliderItem2.TextColor = System.Drawing.Color.Black; - this.sliderItem2.Value = 0; - this.sliderItem2.ValueChanged += new System.EventHandler(this.sliderItem2_ValueChanged); // - // buttonItemGBJC + this.ribbonPanel7.Style.Class = ""; + this.ribbonPanel7.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; // - this.buttonItemGBJC.Image = ((System.Drawing.Image)(resources.GetObject("buttonItemGBJC.Image"))); - this.buttonItemGBJC.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItemGBJC.Name = "buttonItemGBJC"; - this.buttonItemGBJC.SubItemsExpandWidth = 14; - this.buttonItemGBJC.Text = "国标检测"; - this.buttonItemGBJC.Click += new System.EventHandler(this.buttonItemGBJC_Click); // - // ribbonPanel5 // - this.ribbonPanel5.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.ribbonPanel5.Controls.Add(this.ribbonBar2); - this.ribbonPanel5.Dock = System.Windows.Forms.DockStyle.Fill; - this.ribbonPanel5.Location = new System.Drawing.Point(0, 0); - this.ribbonPanel5.Name = "ribbonPanel5"; - this.ribbonPanel5.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); - this.ribbonPanel5.Size = new System.Drawing.Size(1328, 95); + this.ribbonPanel7.StyleMouseDown.Class = ""; + this.ribbonPanel7.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; // // // - this.ribbonPanel5.Style.Class = ""; - this.ribbonPanel5.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonPanel7.StyleMouseOver.Class = ""; + this.ribbonPanel7.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonPanel7.TabIndex = 41; + this.ribbonPanel7.Visible = false; // + // gxdw_ribbonbar // + this.gxdw_ribbonbar.AutoOverflowEnabled = true; // - this.ribbonPanel5.StyleMouseDown.Class = ""; - this.ribbonPanel5.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; // // + this.gxdw_ribbonbar.BackgroundMouseOverStyle.Class = ""; + this.gxdw_ribbonbar.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; // - this.ribbonPanel5.StyleMouseOver.Class = ""; - this.ribbonPanel5.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonPanel5.TabIndex = 37; - this.ribbonPanel5.Visible = false; // - // ribbonBar2 // - this.ribbonBar2.AutoOverflowEnabled = true; + this.gxdw_ribbonbar.BackgroundStyle.Class = ""; + this.gxdw_ribbonbar.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.gxdw_ribbonbar.ContainerControlProcessDialogKey = true; + this.gxdw_ribbonbar.Dock = System.Windows.Forms.DockStyle.Left; + this.gxdw_ribbonbar.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { + this.buttonItem9, + this.buttonItem10, + this.buttonItem11, + this.buttonItem12, + this.buttonItem13, + this.buttonItem14}); + this.gxdw_ribbonbar.Location = new System.Drawing.Point(3, 0); + this.gxdw_ribbonbar.Name = "gxdw_ribbonbar"; + this.gxdw_ribbonbar.Size = new System.Drawing.Size(564, 59); + this.gxdw_ribbonbar.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.gxdw_ribbonbar.TabIndex = 0; + this.gxdw_ribbonbar.Text = "ribbonBar5"; // // // - this.ribbonBar2.BackgroundMouseOverStyle.Class = ""; - this.ribbonBar2.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.gxdw_ribbonbar.TitleStyle.Class = ""; + this.gxdw_ribbonbar.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; // // // - this.ribbonBar2.BackgroundStyle.Class = ""; - this.ribbonBar2.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonBar2.ContainerControlProcessDialogKey = true; - this.ribbonBar2.Dock = System.Windows.Forms.DockStyle.Left; - this.ribbonBar2.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { - this.buttonItemHX1, - this.buttonItemHX2, - this.buttonItemDCTP, - this.sliderItem3}); - this.ribbonBar2.Location = new System.Drawing.Point(3, 0); - this.ribbonBar2.Name = "ribbonBar2"; - this.ribbonBar2.Size = new System.Drawing.Size(350, 92); - this.ribbonBar2.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.ribbonBar2.TabIndex = 0; + this.gxdw_ribbonbar.TitleStyleMouseOver.Class = ""; + this.gxdw_ribbonbar.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.gxdw_ribbonbar.TitleVisible = false; // + // buttonItem9 // + this.buttonItem9.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__76; + this.buttonItem9.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem9.Name = "buttonItem9"; + this.buttonItem9.SubItemsExpandWidth = 14; + this.buttonItem9.Text = "工单管理"; + this.buttonItem9.Click += new System.EventHandler(this.buttonItem9_Click); // - this.ribbonBar2.TitleStyle.Class = ""; - this.ribbonBar2.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // buttonItem10 // + this.buttonItem10.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__69; + this.buttonItem10.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem10.Name = "buttonItem10"; + this.buttonItem10.SubItemsExpandWidth = 14; + this.buttonItem10.Text = "在线任务"; + this.buttonItem10.Click += new System.EventHandler(this.buttonItem10_Click); // + // buttonItem11 // - this.ribbonBar2.TitleStyleMouseOver.Class = ""; - this.ribbonBar2.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonBar2.TitleVisible = false; + this.buttonItem11.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__72; + this.buttonItem11.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem11.Name = "buttonItem11"; + this.buttonItem11.SubItemsExpandWidth = 14; + this.buttonItem11.Text = "事件管理"; + this.buttonItem11.Click += new System.EventHandler(this.buttonItem11_Click); // - // buttonItemHX1 + // buttonItem12 // - this.buttonItemHX1.AutoExpandOnClick = true; - this.buttonItemHX1.Image = ((System.Drawing.Image)(resources.GetObject("buttonItemHX1.Image"))); - this.buttonItemHX1.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItemHX1.Name = "buttonItemHX1"; - this.buttonItemHX1.SubItemsExpandWidth = 14; - this.buttonItemHX1.Text = "导入红线"; - this.buttonItemHX1.Click += new System.EventHandler(this.buttonItemHX1_Click); + this.buttonItem12.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__34; + this.buttonItem12.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem12.Name = "buttonItem12"; + this.buttonItem12.SubItemsExpandWidth = 14; + this.buttonItem12.Text = "探测仪管理"; + this.buttonItem12.Click += new System.EventHandler(this.buttonItem12_Click); // - // buttonItemHX2 + // buttonItem13 // - this.buttonItemHX2.Image = ((System.Drawing.Image)(resources.GetObject("buttonItemHX2.Image"))); - this.buttonItemHX2.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItemHX2.Name = "buttonItemHX2"; - this.buttonItemHX2.SubItemsExpandWidth = 14; - this.buttonItemHX2.Text = "红线审核"; - this.buttonItemHX2.Click += new System.EventHandler(this.buttonItemHX2_Click); + this.buttonItem13.Image = global::Cyberpipe.Properties.Resources._24x24icon_13_hover; + this.buttonItem13.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem13.Name = "buttonItem13"; + this.buttonItem13.SubItemsExpandWidth = 14; + this.buttonItem13.Text = "巡检人员维护"; + this.buttonItem13.Click += new System.EventHandler(this.buttonItem13_Click); // - // buttonItemDCTP + // buttonItem14 // - this.buttonItemDCTP.Image = ((System.Drawing.Image)(resources.GetObject("buttonItemDCTP.Image"))); - this.buttonItemDCTP.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItemDCTP.Name = "buttonItemDCTP"; - this.buttonItemDCTP.SubItemsExpandWidth = 14; - this.buttonItemDCTP.Text = "导出图片"; - this.buttonItemDCTP.Click += new System.EventHandler(this.buttonItemDCTP_Click); - // - // sliderItem3 - // - this.sliderItem3.LabelPosition = DevComponents.DotNetBar.eSliderLabelPosition.Top; - this.sliderItem3.LabelWidth = 50; - this.sliderItem3.Name = "sliderItem3"; - this.sliderItem3.Text = "地面透明度"; - this.sliderItem3.TextColor = System.Drawing.Color.Black; - this.sliderItem3.Value = 0; - this.sliderItem3.ValueChanged += new System.EventHandler(this.sliderItem3_ValueChanged); - // - // ribbonPanel1 - // - this.ribbonPanel1.AutoSize = true; - this.ribbonPanel1.CanvasColor = System.Drawing.Color.Gray; - this.ribbonPanel1.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.ribbonPanel1.Controls.Add(this.ribbonBar21); - this.ribbonPanel1.Dock = System.Windows.Forms.DockStyle.Fill; - this.ribbonPanel1.Location = new System.Drawing.Point(0, 0); - this.ribbonPanel1.Name = "ribbonPanel1"; - this.ribbonPanel1.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); - this.ribbonPanel1.Size = new System.Drawing.Size(1328, 95); - // - // - // - this.ribbonPanel1.Style.Class = ""; - this.ribbonPanel1.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonPanel1.StyleMouseDown.Class = ""; - this.ribbonPanel1.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonPanel1.StyleMouseOver.Class = ""; - this.ribbonPanel1.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonPanel1.TabIndex = 1; - this.ribbonPanel1.Visible = false; - // - // ribbonBar21 - // - this.ribbonBar21.AutoOverflowEnabled = true; - this.ribbonBar21.BackColor = System.Drawing.Color.White; - // - // - // - this.ribbonBar21.BackgroundMouseOverStyle.Class = ""; - this.ribbonBar21.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonBar21.BackgroundStyle.Class = ""; - this.ribbonBar21.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonBar21.ContainerControlProcessDialogKey = true; - this.ribbonBar21.Dock = System.Windows.Forms.DockStyle.Left; - this.ribbonBar21.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { - this.buttonItem87, - this.buttonItem88, - this.buttonItem27, - this.sliderGroundTransSet1, - this.buttonItem91, - this.buttonItem1, - this.btnlegendSet, - this.buttonItem89, - this.btnOutputJPG}); - this.ribbonBar21.Location = new System.Drawing.Point(3, 0); - this.ribbonBar21.Name = "ribbonBar21"; - this.ribbonBar21.Size = new System.Drawing.Size(649, 92); - this.ribbonBar21.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.ribbonBar21.TabIndex = 2; - this.ribbonBar21.Text = "浏览模式"; - // - // - // - this.ribbonBar21.TitleStyle.Class = ""; - this.ribbonBar21.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonBar21.TitleStyleMouseOver.Class = ""; - this.ribbonBar21.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonBar21.TitleVisible = false; - // - // buttonItem87 - // - this.buttonItem87.Image = ((System.Drawing.Image)(resources.GetObject("buttonItem87.Image"))); - this.buttonItem87.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem87.Name = "buttonItem87"; - this.buttonItem87.SubItemsExpandWidth = 14; - this.buttonItem87.Text = "地上模式"; - this.buttonItem87.Click += new System.EventHandler(this.buttonItem87_Click); - // - // buttonItem88 - // - this.buttonItem88.Image = ((System.Drawing.Image)(resources.GetObject("buttonItem88.Image"))); - this.buttonItem88.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem88.Name = "buttonItem88"; - this.buttonItem88.SubItemsExpandWidth = 14; - this.buttonItem88.Text = "地下模式"; - this.buttonItem88.Click += new System.EventHandler(this.buttonItem88_Click); - // - // buttonItem27 - // - this.buttonItem27.Image = ((System.Drawing.Image)(resources.GetObject("buttonItem27.Image"))); - this.buttonItem27.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem27.Name = "buttonItem27"; - this.buttonItem27.SubItemsExpandWidth = 14; - this.buttonItem27.Text = "行走模式"; - this.buttonItem27.Click += new System.EventHandler(this.buttonItem27_Click); - // - // buttonItem91 - // - this.buttonItem91.ForeColor = System.Drawing.Color.Black; - this.buttonItem91.Image = ((System.Drawing.Image)(resources.GetObject("buttonItem91.Image"))); - this.buttonItem91.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem91.Name = "buttonItem91"; - this.buttonItem91.SubItemsExpandWidth = 14; - this.buttonItem91.Text = "快速定位"; - this.buttonItem91.Click += new System.EventHandler(this.buttonItem91_Click); - // - // buttonItem1 - // - this.buttonItem1.Image = ((System.Drawing.Image)(resources.GetObject("buttonItem1.Image"))); - this.buttonItem1.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem1.Name = "buttonItem1"; - this.buttonItem1.SubItemsExpandWidth = 14; - this.buttonItem1.Text = "图层管理"; - this.buttonItem1.Click += new System.EventHandler(this.buttonItem1_Click); - // - // btnlegendSet - // - this.btnlegendSet.Image = ((System.Drawing.Image)(resources.GetObject("btnlegendSet.Image"))); - this.btnlegendSet.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.btnlegendSet.Name = "btnlegendSet"; - this.btnlegendSet.SubItemsExpandWidth = 14; - this.btnlegendSet.Text = "图例"; - this.btnlegendSet.Click += new System.EventHandler(this.btnlegendSet_Click); - // - // buttonItem89 - // - this.buttonItem89.Image = ((System.Drawing.Image)(resources.GetObject("buttonItem89.Image"))); - this.buttonItem89.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem89.Name = "buttonItem89"; - this.buttonItem89.SubItemsExpandWidth = 14; - this.buttonItem89.Text = "全屏显示"; - this.buttonItem89.Click += new System.EventHandler(this.buttonItem89_Click); - // - // btnOutputJPG - // - this.btnOutputJPG.Image = ((System.Drawing.Image)(resources.GetObject("btnOutputJPG.Image"))); - this.btnOutputJPG.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.btnOutputJPG.Name = "btnOutputJPG"; - this.btnOutputJPG.SubItemsExpandWidth = 14; - this.btnOutputJPG.Text = "导出图片"; - this.btnOutputJPG.Click += new System.EventHandler(this.btnOutputJPG_Click); - // - // ribbonPanel12 - // - this.ribbonPanel12.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.ribbonPanel12.Controls.Add(this.ribbonBar18); - this.ribbonPanel12.Controls.Add(this.ribbonBar13); - this.ribbonPanel12.Dock = System.Windows.Forms.DockStyle.Fill; - this.ribbonPanel12.Location = new System.Drawing.Point(0, 0); - this.ribbonPanel12.Name = "ribbonPanel12"; - this.ribbonPanel12.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); - this.ribbonPanel12.Size = new System.Drawing.Size(1328, 95); - // - // - // - this.ribbonPanel12.Style.Class = ""; - this.ribbonPanel12.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonPanel12.StyleMouseDown.Class = ""; - this.ribbonPanel12.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonPanel12.StyleMouseOver.Class = ""; - this.ribbonPanel12.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonPanel12.TabIndex = 34; - this.ribbonPanel12.Visible = false; - // - // ribbonBar18 - // - this.ribbonBar18.AutoOverflowEnabled = true; - // - // - // - this.ribbonBar18.BackgroundMouseOverStyle.Class = ""; - this.ribbonBar18.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonBar18.BackgroundStyle.Class = ""; - this.ribbonBar18.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonBar18.ContainerControlProcessDialogKey = true; - this.ribbonBar18.Dock = System.Windows.Forms.DockStyle.Left; - this.ribbonBar18.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { - this.buttonItem133}); - this.ribbonBar18.Location = new System.Drawing.Point(531, 0); - this.ribbonBar18.Name = "ribbonBar18"; - this.ribbonBar18.Size = new System.Drawing.Size(129, 92); - this.ribbonBar18.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.ribbonBar18.TabIndex = 1; - // - // - // - this.ribbonBar18.TitleStyle.Class = ""; - this.ribbonBar18.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonBar18.TitleStyleMouseOver.Class = ""; - this.ribbonBar18.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonBar18.TitleVisible = false; - // - // buttonItem133 - // - this.buttonItem133.Image = ((System.Drawing.Image)(resources.GetObject("buttonItem133.Image"))); - this.buttonItem133.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem133.Name = "buttonItem133"; - this.buttonItem133.SubItemsExpandWidth = 14; - this.buttonItem133.Text = "审核入库"; - this.buttonItem133.Click += new System.EventHandler(this.buttonItem133_Click_1); - // - // ribbonBar13 - // - this.ribbonBar13.AutoOverflowEnabled = true; - // - // - // - this.ribbonBar13.BackgroundMouseOverStyle.Class = ""; - this.ribbonBar13.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonBar13.BackgroundStyle.Class = ""; - this.ribbonBar13.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonBar13.ContainerControlProcessDialogKey = true; - this.ribbonBar13.Dock = System.Windows.Forms.DockStyle.Left; - this.ribbonBar13.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { - this.buttonItem127, - this.buttonItem128, - this.sliderItem1, - this.buttonItem134, - this.buttonItem130, - this.btn_check_history}); - this.ribbonBar13.Location = new System.Drawing.Point(3, 0); - this.ribbonBar13.Name = "ribbonBar13"; - this.ribbonBar13.Size = new System.Drawing.Size(528, 92); - this.ribbonBar13.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.ribbonBar13.TabIndex = 0; - // - // - // - this.ribbonBar13.TitleStyle.Class = ""; - this.ribbonBar13.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonBar13.TitleStyleMouseOver.Class = ""; - this.ribbonBar13.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonBar13.TitleVisible = false; - // - // buttonItem127 - // - this.buttonItem127.Image = ((System.Drawing.Image)(resources.GetObject("buttonItem127.Image"))); - this.buttonItem127.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem127.Name = "buttonItem127"; - this.buttonItem127.SubItemsExpandWidth = 14; - this.buttonItem127.Text = "打开数据"; - this.buttonItem127.Click += new System.EventHandler(this.buttonItem127_Click_2); - // - // buttonItem128 - // - this.buttonItem128.Image = ((System.Drawing.Image)(resources.GetObject("buttonItem128.Image"))); - this.buttonItem128.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem128.Name = "buttonItem128"; - this.buttonItem128.SubItemsExpandWidth = 14; - this.buttonItem128.Text = "一键审核"; - this.buttonItem128.Click += new System.EventHandler(this.buttonItem128_Click); - // - // sliderItem1 - // - this.sliderItem1.LabelPosition = DevComponents.DotNetBar.eSliderLabelPosition.Top; - this.sliderItem1.LabelWidth = 50; - this.sliderItem1.Name = "sliderItem1"; - this.sliderItem1.Text = "地面透明度"; - this.sliderItem1.TextColor = System.Drawing.Color.Black; - this.sliderItem1.Value = 0; - this.sliderItem1.ValueChanged += new System.EventHandler(this.sliderItem1_ValueChanged); - // - // buttonItem134 - // - this.buttonItem134.Image = ((System.Drawing.Image)(resources.GetObject("buttonItem134.Image"))); - this.buttonItem134.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem134.Name = "buttonItem134"; - this.buttonItem134.SubItemsExpandWidth = 14; - this.buttonItem134.Text = "模拟设计修改"; - this.buttonItem134.Click += new System.EventHandler(this.buttonItem134_Click_1); - // - // buttonItem130 - // - this.buttonItem130.Image = ((System.Drawing.Image)(resources.GetObject("buttonItem130.Image"))); - this.buttonItem130.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem130.Name = "buttonItem130"; - this.buttonItem130.SubItemsExpandWidth = 14; - this.buttonItem130.Text = "导出审核图"; - this.buttonItem130.Click += new System.EventHandler(this.buttonItem130_Click_1); - // - // btn_check_history - // - this.btn_check_history.Image = ((System.Drawing.Image)(resources.GetObject("btn_check_history.Image"))); - this.btn_check_history.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.btn_check_history.Name = "btn_check_history"; - this.btn_check_history.SubItemsExpandWidth = 14; - this.btn_check_history.Text = "审核历史"; - this.btn_check_history.Click += new System.EventHandler(this.btn_check_history_Click); - // - // ribbonPanel4 - // - this.ribbonPanel4.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.ribbonPanel4.Controls.Add(this.ribbonBar1); - this.ribbonPanel4.Dock = System.Windows.Forms.DockStyle.Fill; - this.ribbonPanel4.Location = new System.Drawing.Point(0, 0); - this.ribbonPanel4.Name = "ribbonPanel4"; - this.ribbonPanel4.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); - this.ribbonPanel4.Size = new System.Drawing.Size(1328, 95); - // - // - // - this.ribbonPanel4.Style.Class = ""; - this.ribbonPanel4.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonPanel4.StyleMouseDown.Class = ""; - this.ribbonPanel4.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonPanel4.StyleMouseOver.Class = ""; - this.ribbonPanel4.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonPanel4.TabIndex = 36; - this.ribbonPanel4.Visible = false; - // - // ribbonBar1 - // - this.ribbonBar1.AutoOverflowEnabled = true; - // - // - // - this.ribbonBar1.BackgroundMouseOverStyle.Class = ""; - this.ribbonBar1.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonBar1.BackgroundStyle.Class = ""; - this.ribbonBar1.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonBar1.ContainerControlProcessDialogKey = true; - this.ribbonBar1.Dock = System.Windows.Forms.DockStyle.Left; - this.ribbonBar1.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { - this.btn_document_info}); - this.ribbonBar1.Location = new System.Drawing.Point(3, 0); - this.ribbonBar1.Name = "ribbonBar1"; - this.ribbonBar1.Size = new System.Drawing.Size(88, 92); - this.ribbonBar1.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.ribbonBar1.TabIndex = 0; - // - // - // - this.ribbonBar1.TitleStyle.Class = ""; - this.ribbonBar1.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonBar1.TitleStyleMouseOver.Class = ""; - this.ribbonBar1.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonBar1.TitleVisible = false; - // - // btn_document_info - // - this.btn_document_info.Image = ((System.Drawing.Image)(resources.GetObject("btn_document_info.Image"))); - this.btn_document_info.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.btn_document_info.Name = "btn_document_info"; - this.btn_document_info.SubItemsExpandWidth = 14; - this.btn_document_info.Text = "文档管理"; - this.btn_document_info.Click += new System.EventHandler(this.btn_document_info_Click); + this.buttonItem14.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__56; + this.buttonItem14.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem14.Name = "buttonItem14"; + this.buttonItem14.SubItemsExpandWidth = 14; + this.buttonItem14.Text = "导出施工图"; + this.buttonItem14.Click += new System.EventHandler(this.buttonItem14_Click); // // ribbonPanel15 // this.ribbonPanel15.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; this.ribbonPanel15.Controls.Add(this.ribbonBar20); this.ribbonPanel15.Dock = System.Windows.Forms.DockStyle.Fill; - this.ribbonPanel15.Location = new System.Drawing.Point(0, 0); + this.ribbonPanel15.Location = new System.Drawing.Point(0, 33); this.ribbonPanel15.Name = "ribbonPanel15"; this.ribbonPanel15.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); - this.ribbonPanel15.Size = new System.Drawing.Size(1328, 95); + this.ribbonPanel15.Size = new System.Drawing.Size(1328, 62); // // // @@ -2843,7 +2465,7 @@ this.buttonItemXTGL}); this.ribbonBar20.Location = new System.Drawing.Point(3, 0); this.ribbonBar20.Name = "ribbonBar20"; - this.ribbonBar20.Size = new System.Drawing.Size(283, 92); + this.ribbonBar20.Size = new System.Drawing.Size(283, 59); this.ribbonBar20.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; this.ribbonBar20.TabIndex = 0; // @@ -3274,216 +2896,15 @@ this.buttonItemXT4_2.Text = "人员修改"; this.buttonItemXT4_2.Click += new System.EventHandler(this.buttonItemXT4_2_Click); // - // ribbonPanel3 - // - this.ribbonPanel3.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.ribbonPanel3.Controls.Add(this.ribbonBar4); - this.ribbonPanel3.Dock = System.Windows.Forms.DockStyle.Fill; - this.ribbonPanel3.Location = new System.Drawing.Point(0, 33); - this.ribbonPanel3.Name = "ribbonPanel3"; - this.ribbonPanel3.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); - this.ribbonPanel3.Size = new System.Drawing.Size(1328, 62); - // - // - // - this.ribbonPanel3.Style.Class = ""; - this.ribbonPanel3.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonPanel3.StyleMouseDown.Class = ""; - this.ribbonPanel3.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonPanel3.StyleMouseOver.Class = ""; - this.ribbonPanel3.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonPanel3.TabIndex = 40; - // - // ribbonBar4 - // - this.ribbonBar4.AutoOverflowEnabled = true; - // - // - // - this.ribbonBar4.BackgroundMouseOverStyle.Class = ""; - this.ribbonBar4.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonBar4.BackgroundStyle.Class = ""; - this.ribbonBar4.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonBar4.ContainerControlProcessDialogKey = true; - this.ribbonBar4.Dock = System.Windows.Forms.DockStyle.Left; - this.ribbonBar4.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { - this.btn_flag, - this.slider4ground}); - this.ribbonBar4.Location = new System.Drawing.Point(3, 0); - this.ribbonBar4.Name = "ribbonBar4"; - this.ribbonBar4.Size = new System.Drawing.Size(321, 59); - this.ribbonBar4.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.ribbonBar4.TabIndex = 0; - // - // - // - this.ribbonBar4.TitleStyle.Class = ""; - this.ribbonBar4.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonBar4.TitleStyleMouseOver.Class = ""; - this.ribbonBar4.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonBar4.TitleVisible = false; - // - // btn_flag - // - this.btn_flag.Image = global::Cyberpipe.Properties.Resources._24x24icon_03_hover; - this.btn_flag.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.btn_flag.Name = "btn_flag"; - this.btn_flag.SubItemsExpandWidth = 14; - this.btn_flag.Text = "标识器管理"; - this.btn_flag.Click += new System.EventHandler(this.btn_flag_Click); - // - // slider4ground - // - this.slider4ground.LabelPosition = DevComponents.DotNetBar.eSliderLabelPosition.Top; - this.slider4ground.LabelWidth = 50; - this.slider4ground.Name = "slider4ground"; - this.slider4ground.Text = "地面透明度"; - this.slider4ground.TextColor = System.Drawing.Color.Black; - this.slider4ground.Value = 0; - this.slider4ground.ValueChanged += new System.EventHandler(this.slider4ground_ValueChanged); - // - // ribbonPanel7 - // - this.ribbonPanel7.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.ribbonPanel7.Controls.Add(this.gxdw_ribbonbar); - this.ribbonPanel7.Dock = System.Windows.Forms.DockStyle.Fill; - this.ribbonPanel7.Location = new System.Drawing.Point(0, 33); - this.ribbonPanel7.Name = "ribbonPanel7"; - this.ribbonPanel7.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); - this.ribbonPanel7.Size = new System.Drawing.Size(1328, 62); - // - // - // - this.ribbonPanel7.Style.Class = ""; - this.ribbonPanel7.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonPanel7.StyleMouseDown.Class = ""; - this.ribbonPanel7.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonPanel7.StyleMouseOver.Class = ""; - this.ribbonPanel7.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonPanel7.TabIndex = 41; - this.ribbonPanel7.Visible = false; - // - // gxdw_ribbonbar - // - this.gxdw_ribbonbar.AutoOverflowEnabled = true; - // - // - // - this.gxdw_ribbonbar.BackgroundMouseOverStyle.Class = ""; - this.gxdw_ribbonbar.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.gxdw_ribbonbar.BackgroundStyle.Class = ""; - this.gxdw_ribbonbar.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.gxdw_ribbonbar.ContainerControlProcessDialogKey = true; - this.gxdw_ribbonbar.Dock = System.Windows.Forms.DockStyle.Left; - this.gxdw_ribbonbar.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { - this.buttonItem9, - this.buttonItem10, - this.buttonItem11, - this.buttonItem12, - this.buttonItem13, - this.buttonItem14}); - this.gxdw_ribbonbar.Location = new System.Drawing.Point(3, 0); - this.gxdw_ribbonbar.Name = "gxdw_ribbonbar"; - this.gxdw_ribbonbar.Size = new System.Drawing.Size(522, 59); - this.gxdw_ribbonbar.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.gxdw_ribbonbar.TabIndex = 0; - this.gxdw_ribbonbar.Text = "ribbonBar5"; - // - // - // - this.gxdw_ribbonbar.TitleStyle.Class = ""; - this.gxdw_ribbonbar.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.gxdw_ribbonbar.TitleStyleMouseOver.Class = ""; - this.gxdw_ribbonbar.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.gxdw_ribbonbar.TitleVisible = false; - // - // buttonItem9 - // - this.buttonItem9.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__76; - this.buttonItem9.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem9.Name = "buttonItem9"; - this.buttonItem9.SubItemsExpandWidth = 14; - this.buttonItem9.Text = "工单管理"; - this.buttonItem9.Click += new System.EventHandler(this.buttonItem9_Click); - // - // buttonItem10 - // - this.buttonItem10.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__69; - this.buttonItem10.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem10.Name = "buttonItem10"; - this.buttonItem10.SubItemsExpandWidth = 14; - this.buttonItem10.Text = "在线任务"; - this.buttonItem10.Click += new System.EventHandler(this.buttonItem10_Click); - // - // buttonItem11 - // - this.buttonItem11.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__72; - this.buttonItem11.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem11.Name = "buttonItem11"; - this.buttonItem11.SubItemsExpandWidth = 14; - this.buttonItem11.Text = "事件管理"; - this.buttonItem11.Click += new System.EventHandler(this.buttonItem11_Click); - // - // buttonItem12 - // - this.buttonItem12.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__34; - this.buttonItem12.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem12.Name = "buttonItem12"; - this.buttonItem12.SubItemsExpandWidth = 14; - this.buttonItem12.Text = "探测仪管理"; - this.buttonItem12.Click += new System.EventHandler(this.buttonItem12_Click); - // - // buttonItem13 - // - this.buttonItem13.Image = global::Cyberpipe.Properties.Resources._24x24icon_13_hover; - this.buttonItem13.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem13.Name = "buttonItem13"; - this.buttonItem13.SubItemsExpandWidth = 14; - this.buttonItem13.Text = "巡检人员维护"; - this.buttonItem13.Click += new System.EventHandler(this.buttonItem13_Click); - // - // buttonItem14 - // - this.buttonItem14.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__56; - this.buttonItem14.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem14.Name = "buttonItem14"; - this.buttonItem14.SubItemsExpandWidth = 14; - this.buttonItem14.Text = "导出施工图"; - this.buttonItem14.Click += new System.EventHandler(this.buttonItem14_Click); - // // ribbonPanel2 // this.ribbonPanel2.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; this.ribbonPanel2.Controls.Add(this.ribbonBar3); this.ribbonPanel2.Dock = System.Windows.Forms.DockStyle.Fill; - this.ribbonPanel2.Location = new System.Drawing.Point(0, 33); + this.ribbonPanel2.Location = new System.Drawing.Point(0, 0); this.ribbonPanel2.Name = "ribbonPanel2"; this.ribbonPanel2.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); - this.ribbonPanel2.Size = new System.Drawing.Size(1328, 62); + this.ribbonPanel2.Size = new System.Drawing.Size(1328, 95); // // // @@ -3527,7 +2948,7 @@ this.buttonItemPasswordReset}); this.ribbonBar3.Location = new System.Drawing.Point(3, 0); this.ribbonBar3.Name = "ribbonBar3"; - this.ribbonBar3.Size = new System.Drawing.Size(551, 59); + this.ribbonBar3.Size = new System.Drawing.Size(551, 92); this.ribbonBar3.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; this.ribbonBar3.TabIndex = 1; // @@ -3567,6 +2988,7 @@ this.btn_resc_info.Name = "btn_resc_info"; this.btn_resc_info.SubItemsExpandWidth = 14; this.btn_resc_info.Text = "资源管理"; + this.btn_resc_info.Visible = false; this.btn_resc_info.Click += new System.EventHandler(this.btn_resc_info_Click); // // btn_role_resc @@ -3605,6 +3027,605 @@ this.buttonItemPasswordReset.Text = "重置密码"; this.buttonItemPasswordReset.Click += new System.EventHandler(this.buttonItemPasswordReset_Click); // + // ribbonPanel6 + // + this.ribbonPanel6.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.ribbonPanel6.Controls.Add(this.ribbonBar6); + this.ribbonPanel6.Dock = System.Windows.Forms.DockStyle.Fill; + this.ribbonPanel6.Location = new System.Drawing.Point(0, 0); + this.ribbonPanel6.Name = "ribbonPanel6"; + this.ribbonPanel6.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); + this.ribbonPanel6.Size = new System.Drawing.Size(1328, 95); + // + // + // + this.ribbonPanel6.Style.Class = ""; + this.ribbonPanel6.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonPanel6.StyleMouseDown.Class = ""; + this.ribbonPanel6.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonPanel6.StyleMouseOver.Class = ""; + this.ribbonPanel6.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonPanel6.TabIndex = 38; + this.ribbonPanel6.Visible = false; + // + // ribbonBar6 + // + this.ribbonBar6.AutoOverflowEnabled = true; + // + // + // + this.ribbonBar6.BackgroundMouseOverStyle.Class = ""; + this.ribbonBar6.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonBar6.BackgroundStyle.Class = ""; + this.ribbonBar6.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar6.ContainerControlProcessDialogKey = true; + this.ribbonBar6.Dock = System.Windows.Forms.DockStyle.Left; + this.ribbonBar6.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { + this.buttonItemSPSZ, + this.buttonItem8, + this.buttonItemLocation, + this.sliderItem2, + this.buttonItemGBJC}); + this.ribbonBar6.Location = new System.Drawing.Point(3, 0); + this.ribbonBar6.Name = "ribbonBar6"; + this.ribbonBar6.Size = new System.Drawing.Size(427, 92); + this.ribbonBar6.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.ribbonBar6.TabIndex = 0; + // + // + // + this.ribbonBar6.TitleStyle.Class = ""; + this.ribbonBar6.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonBar6.TitleStyleMouseOver.Class = ""; + this.ribbonBar6.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar6.TitleVisible = false; + // + // buttonItemSPSZ + // + this.buttonItemSPSZ.Image = ((System.Drawing.Image)(resources.GetObject("buttonItemSPSZ.Image"))); + this.buttonItemSPSZ.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItemSPSZ.Name = "buttonItemSPSZ"; + this.buttonItemSPSZ.SubItemsExpandWidth = 14; + this.buttonItemSPSZ.Text = "双屏设置"; + this.buttonItemSPSZ.Click += new System.EventHandler(this.buttonItemSPSZ_Click); + // + // buttonItem8 + // + this.buttonItem8.Image = ((System.Drawing.Image)(resources.GetObject("buttonItem8.Image"))); + this.buttonItem8.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem8.Name = "buttonItem8"; + this.buttonItem8.SubItemsExpandWidth = 14; + this.buttonItem8.Text = "双屏分析"; + this.buttonItem8.Click += new System.EventHandler(this.buttonItem8_Click); + // + // buttonItemLocation + // + this.buttonItemLocation.Image = ((System.Drawing.Image)(resources.GetObject("buttonItemLocation.Image"))); + this.buttonItemLocation.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItemLocation.Name = "buttonItemLocation"; + this.buttonItemLocation.SubItemsExpandWidth = 14; + this.buttonItemLocation.Text = "快速定位"; + this.buttonItemLocation.Click += new System.EventHandler(this.buttonItemLocation_Click); + // + // sliderItem2 + // + this.sliderItem2.LabelPosition = DevComponents.DotNetBar.eSliderLabelPosition.Top; + this.sliderItem2.LabelWidth = 50; + this.sliderItem2.Name = "sliderItem2"; + this.sliderItem2.Text = "地面透明度"; + this.sliderItem2.TextColor = System.Drawing.Color.Black; + this.sliderItem2.Value = 0; + this.sliderItem2.ValueChanged += new System.EventHandler(this.sliderItem2_ValueChanged); + // + // buttonItemGBJC + // + this.buttonItemGBJC.Image = ((System.Drawing.Image)(resources.GetObject("buttonItemGBJC.Image"))); + this.buttonItemGBJC.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItemGBJC.Name = "buttonItemGBJC"; + this.buttonItemGBJC.SubItemsExpandWidth = 14; + this.buttonItemGBJC.Text = "国标检测"; + this.buttonItemGBJC.Click += new System.EventHandler(this.buttonItemGBJC_Click); + // + // ribbonPanel5 + // + this.ribbonPanel5.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.ribbonPanel5.Controls.Add(this.ribbonBar2); + this.ribbonPanel5.Dock = System.Windows.Forms.DockStyle.Fill; + this.ribbonPanel5.Location = new System.Drawing.Point(0, 33); + this.ribbonPanel5.Name = "ribbonPanel5"; + this.ribbonPanel5.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); + this.ribbonPanel5.Size = new System.Drawing.Size(1328, 62); + // + // + // + this.ribbonPanel5.Style.Class = ""; + this.ribbonPanel5.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonPanel5.StyleMouseDown.Class = ""; + this.ribbonPanel5.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonPanel5.StyleMouseOver.Class = ""; + this.ribbonPanel5.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonPanel5.TabIndex = 37; + this.ribbonPanel5.Visible = false; + // + // ribbonBar2 + // + this.ribbonBar2.AutoOverflowEnabled = true; + // + // + // + this.ribbonBar2.BackgroundMouseOverStyle.Class = ""; + this.ribbonBar2.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonBar2.BackgroundStyle.Class = ""; + this.ribbonBar2.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar2.ContainerControlProcessDialogKey = true; + this.ribbonBar2.Dock = System.Windows.Forms.DockStyle.Left; + this.ribbonBar2.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { + this.buttonItemHX1, + this.buttonItemHX2, + this.buttonItemDCTP, + this.sliderItem3}); + this.ribbonBar2.Location = new System.Drawing.Point(3, 0); + this.ribbonBar2.Name = "ribbonBar2"; + this.ribbonBar2.Size = new System.Drawing.Size(350, 59); + this.ribbonBar2.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.ribbonBar2.TabIndex = 0; + // + // + // + this.ribbonBar2.TitleStyle.Class = ""; + this.ribbonBar2.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonBar2.TitleStyleMouseOver.Class = ""; + this.ribbonBar2.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar2.TitleVisible = false; + // + // buttonItemHX1 + // + this.buttonItemHX1.AutoExpandOnClick = true; + this.buttonItemHX1.Image = ((System.Drawing.Image)(resources.GetObject("buttonItemHX1.Image"))); + this.buttonItemHX1.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItemHX1.Name = "buttonItemHX1"; + this.buttonItemHX1.SubItemsExpandWidth = 14; + this.buttonItemHX1.Text = "导入红线"; + this.buttonItemHX1.Click += new System.EventHandler(this.buttonItemHX1_Click); + // + // buttonItemHX2 + // + this.buttonItemHX2.Image = ((System.Drawing.Image)(resources.GetObject("buttonItemHX2.Image"))); + this.buttonItemHX2.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItemHX2.Name = "buttonItemHX2"; + this.buttonItemHX2.SubItemsExpandWidth = 14; + this.buttonItemHX2.Text = "红线审核"; + this.buttonItemHX2.Click += new System.EventHandler(this.buttonItemHX2_Click); + // + // buttonItemDCTP + // + this.buttonItemDCTP.Image = ((System.Drawing.Image)(resources.GetObject("buttonItemDCTP.Image"))); + this.buttonItemDCTP.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItemDCTP.Name = "buttonItemDCTP"; + this.buttonItemDCTP.SubItemsExpandWidth = 14; + this.buttonItemDCTP.Text = "导出图片"; + this.buttonItemDCTP.Click += new System.EventHandler(this.buttonItemDCTP_Click); + // + // sliderItem3 + // + this.sliderItem3.LabelPosition = DevComponents.DotNetBar.eSliderLabelPosition.Top; + this.sliderItem3.LabelWidth = 50; + this.sliderItem3.Name = "sliderItem3"; + this.sliderItem3.Text = "地面透明度"; + this.sliderItem3.TextColor = System.Drawing.Color.Black; + this.sliderItem3.Value = 0; + this.sliderItem3.ValueChanged += new System.EventHandler(this.sliderItem3_ValueChanged); + // + // ribbonPanel1 + // + this.ribbonPanel1.AutoSize = true; + this.ribbonPanel1.CanvasColor = System.Drawing.Color.Gray; + this.ribbonPanel1.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.ribbonPanel1.Controls.Add(this.ribbonBar21); + this.ribbonPanel1.Dock = System.Windows.Forms.DockStyle.Fill; + this.ribbonPanel1.Location = new System.Drawing.Point(0, 33); + this.ribbonPanel1.Name = "ribbonPanel1"; + this.ribbonPanel1.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); + this.ribbonPanel1.Size = new System.Drawing.Size(1328, 62); + // + // + // + this.ribbonPanel1.Style.Class = ""; + this.ribbonPanel1.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonPanel1.StyleMouseDown.Class = ""; + this.ribbonPanel1.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonPanel1.StyleMouseOver.Class = ""; + this.ribbonPanel1.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonPanel1.TabIndex = 1; + this.ribbonPanel1.Visible = false; + // + // ribbonBar21 + // + this.ribbonBar21.AutoOverflowEnabled = true; + this.ribbonBar21.BackColor = System.Drawing.Color.White; + // + // + // + this.ribbonBar21.BackgroundMouseOverStyle.Class = ""; + this.ribbonBar21.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonBar21.BackgroundStyle.Class = ""; + this.ribbonBar21.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar21.ContainerControlProcessDialogKey = true; + this.ribbonBar21.Dock = System.Windows.Forms.DockStyle.Left; + this.ribbonBar21.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { + this.buttonItem87, + this.buttonItem88, + this.buttonItem27, + this.sliderGroundTransSet1, + this.buttonItem91, + this.buttonItem1, + this.btnlegendSet, + this.buttonItem89, + this.btnOutputJPG}); + this.ribbonBar21.Location = new System.Drawing.Point(3, 0); + this.ribbonBar21.Name = "ribbonBar21"; + this.ribbonBar21.Size = new System.Drawing.Size(649, 59); + this.ribbonBar21.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.ribbonBar21.TabIndex = 2; + this.ribbonBar21.Text = "浏览模式"; + // + // + // + this.ribbonBar21.TitleStyle.Class = ""; + this.ribbonBar21.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonBar21.TitleStyleMouseOver.Class = ""; + this.ribbonBar21.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar21.TitleVisible = false; + // + // buttonItem87 + // + this.buttonItem87.Image = ((System.Drawing.Image)(resources.GetObject("buttonItem87.Image"))); + this.buttonItem87.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem87.Name = "buttonItem87"; + this.buttonItem87.SubItemsExpandWidth = 14; + this.buttonItem87.Text = "地上模式"; + this.buttonItem87.Click += new System.EventHandler(this.buttonItem87_Click); + // + // buttonItem88 + // + this.buttonItem88.Image = ((System.Drawing.Image)(resources.GetObject("buttonItem88.Image"))); + this.buttonItem88.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem88.Name = "buttonItem88"; + this.buttonItem88.SubItemsExpandWidth = 14; + this.buttonItem88.Text = "地下模式"; + this.buttonItem88.Click += new System.EventHandler(this.buttonItem88_Click); + // + // buttonItem27 + // + this.buttonItem27.Image = ((System.Drawing.Image)(resources.GetObject("buttonItem27.Image"))); + this.buttonItem27.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem27.Name = "buttonItem27"; + this.buttonItem27.SubItemsExpandWidth = 14; + this.buttonItem27.Text = "行走模式"; + this.buttonItem27.Click += new System.EventHandler(this.buttonItem27_Click); + // + // buttonItem91 + // + this.buttonItem91.ForeColor = System.Drawing.Color.Black; + this.buttonItem91.Image = ((System.Drawing.Image)(resources.GetObject("buttonItem91.Image"))); + this.buttonItem91.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem91.Name = "buttonItem91"; + this.buttonItem91.SubItemsExpandWidth = 14; + this.buttonItem91.Text = "快速定位"; + this.buttonItem91.Click += new System.EventHandler(this.buttonItem91_Click); + // + // buttonItem1 + // + this.buttonItem1.Image = ((System.Drawing.Image)(resources.GetObject("buttonItem1.Image"))); + this.buttonItem1.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem1.Name = "buttonItem1"; + this.buttonItem1.SubItemsExpandWidth = 14; + this.buttonItem1.Text = "图层管理"; + this.buttonItem1.Click += new System.EventHandler(this.buttonItem1_Click); + // + // btnlegendSet + // + this.btnlegendSet.Image = ((System.Drawing.Image)(resources.GetObject("btnlegendSet.Image"))); + this.btnlegendSet.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.btnlegendSet.Name = "btnlegendSet"; + this.btnlegendSet.SubItemsExpandWidth = 14; + this.btnlegendSet.Text = "图例"; + this.btnlegendSet.Click += new System.EventHandler(this.btnlegendSet_Click); + // + // buttonItem89 + // + this.buttonItem89.Image = ((System.Drawing.Image)(resources.GetObject("buttonItem89.Image"))); + this.buttonItem89.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem89.Name = "buttonItem89"; + this.buttonItem89.SubItemsExpandWidth = 14; + this.buttonItem89.Text = "全屏显示"; + this.buttonItem89.Click += new System.EventHandler(this.buttonItem89_Click); + // + // btnOutputJPG + // + this.btnOutputJPG.Image = ((System.Drawing.Image)(resources.GetObject("btnOutputJPG.Image"))); + this.btnOutputJPG.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.btnOutputJPG.Name = "btnOutputJPG"; + this.btnOutputJPG.SubItemsExpandWidth = 14; + this.btnOutputJPG.Text = "导出图片"; + this.btnOutputJPG.Click += new System.EventHandler(this.btnOutputJPG_Click); + // + // ribbonPanel12 + // + this.ribbonPanel12.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.ribbonPanel12.Controls.Add(this.ribbonBar18); + this.ribbonPanel12.Controls.Add(this.ribbonBar13); + this.ribbonPanel12.Dock = System.Windows.Forms.DockStyle.Fill; + this.ribbonPanel12.Location = new System.Drawing.Point(0, 33); + this.ribbonPanel12.Name = "ribbonPanel12"; + this.ribbonPanel12.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); + this.ribbonPanel12.Size = new System.Drawing.Size(1328, 62); + // + // + // + this.ribbonPanel12.Style.Class = ""; + this.ribbonPanel12.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonPanel12.StyleMouseDown.Class = ""; + this.ribbonPanel12.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonPanel12.StyleMouseOver.Class = ""; + this.ribbonPanel12.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonPanel12.TabIndex = 34; + this.ribbonPanel12.Visible = false; + // + // ribbonBar18 + // + this.ribbonBar18.AutoOverflowEnabled = true; + // + // + // + this.ribbonBar18.BackgroundMouseOverStyle.Class = ""; + this.ribbonBar18.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonBar18.BackgroundStyle.Class = ""; + this.ribbonBar18.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar18.ContainerControlProcessDialogKey = true; + this.ribbonBar18.Dock = System.Windows.Forms.DockStyle.Left; + this.ribbonBar18.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { + this.buttonItem133, + this.buttonItem132}); + this.ribbonBar18.Location = new System.Drawing.Point(508, 0); + this.ribbonBar18.Name = "ribbonBar18"; + this.ribbonBar18.Size = new System.Drawing.Size(75, 59); + this.ribbonBar18.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.ribbonBar18.TabIndex = 1; + // + // + // + this.ribbonBar18.TitleStyle.Class = ""; + this.ribbonBar18.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonBar18.TitleStyleMouseOver.Class = ""; + this.ribbonBar18.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar18.TitleVisible = false; + // + // buttonItem133 + // + this.buttonItem133.Image = ((System.Drawing.Image)(resources.GetObject("buttonItem133.Image"))); + this.buttonItem133.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem133.Name = "buttonItem133"; + this.buttonItem133.SubItemsExpandWidth = 14; + this.buttonItem133.Text = "审核入库"; + this.buttonItem133.Click += new System.EventHandler(this.buttonItem133_Click_1); + // + // buttonItem132 + // + this.buttonItem132.Name = "buttonItem132"; + // + // ribbonBar13 + // + this.ribbonBar13.AutoOverflowEnabled = true; + // + // + // + this.ribbonBar13.BackgroundMouseOverStyle.Class = ""; + this.ribbonBar13.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonBar13.BackgroundStyle.Class = ""; + this.ribbonBar13.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar13.ContainerControlProcessDialogKey = true; + this.ribbonBar13.Dock = System.Windows.Forms.DockStyle.Left; + this.ribbonBar13.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { + this.buttonItem127, + this.buttonItem128, + this.sliderItem1, + this.buttonItem134, + this.buttonItem130, + this.btn_check_history}); + this.ribbonBar13.Location = new System.Drawing.Point(3, 0); + this.ribbonBar13.Name = "ribbonBar13"; + this.ribbonBar13.Size = new System.Drawing.Size(505, 59); + this.ribbonBar13.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.ribbonBar13.TabIndex = 0; + // + // + // + this.ribbonBar13.TitleStyle.Class = ""; + this.ribbonBar13.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonBar13.TitleStyleMouseOver.Class = ""; + this.ribbonBar13.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar13.TitleVisible = false; + // + // buttonItem127 + // + this.buttonItem127.Image = ((System.Drawing.Image)(resources.GetObject("buttonItem127.Image"))); + this.buttonItem127.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem127.Name = "buttonItem127"; + this.buttonItem127.SubItemsExpandWidth = 14; + this.buttonItem127.Text = "打开数据"; + this.buttonItem127.Click += new System.EventHandler(this.buttonItem127_Click_2); + // + // buttonItem128 + // + this.buttonItem128.Image = ((System.Drawing.Image)(resources.GetObject("buttonItem128.Image"))); + this.buttonItem128.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem128.Name = "buttonItem128"; + this.buttonItem128.SubItemsExpandWidth = 14; + this.buttonItem128.Text = "一键审核"; + this.buttonItem128.Click += new System.EventHandler(this.buttonItem128_Click); + // + // sliderItem1 + // + this.sliderItem1.LabelPosition = DevComponents.DotNetBar.eSliderLabelPosition.Top; + this.sliderItem1.LabelWidth = 50; + this.sliderItem1.Name = "sliderItem1"; + this.sliderItem1.Text = "地面透明度"; + this.sliderItem1.TextColor = System.Drawing.Color.Black; + this.sliderItem1.Value = 0; + this.sliderItem1.ValueChanged += new System.EventHandler(this.sliderItem1_ValueChanged); + // + // buttonItem134 + // + this.buttonItem134.Image = ((System.Drawing.Image)(resources.GetObject("buttonItem134.Image"))); + this.buttonItem134.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem134.Name = "buttonItem134"; + this.buttonItem134.SubItemsExpandWidth = 14; + this.buttonItem134.Text = "模拟设计修改"; + this.buttonItem134.Click += new System.EventHandler(this.buttonItem134_Click_1); + // + // buttonItem130 + // + this.buttonItem130.Image = ((System.Drawing.Image)(resources.GetObject("buttonItem130.Image"))); + this.buttonItem130.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem130.Name = "buttonItem130"; + this.buttonItem130.SubItemsExpandWidth = 14; + this.buttonItem130.Text = "导出审核图"; + this.buttonItem130.Click += new System.EventHandler(this.buttonItem130_Click_1); + // + // btn_check_history + // + this.btn_check_history.Image = ((System.Drawing.Image)(resources.GetObject("btn_check_history.Image"))); + this.btn_check_history.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.btn_check_history.Name = "btn_check_history"; + this.btn_check_history.SubItemsExpandWidth = 14; + this.btn_check_history.Text = "审核历史"; + this.btn_check_history.Click += new System.EventHandler(this.btn_check_history_Click); + // + // ribbonPanel4 + // + this.ribbonPanel4.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.ribbonPanel4.Controls.Add(this.ribbonBar1); + this.ribbonPanel4.Dock = System.Windows.Forms.DockStyle.Fill; + this.ribbonPanel4.Location = new System.Drawing.Point(0, 33); + this.ribbonPanel4.Name = "ribbonPanel4"; + this.ribbonPanel4.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); + this.ribbonPanel4.Size = new System.Drawing.Size(1328, 62); + // + // + // + this.ribbonPanel4.Style.Class = ""; + this.ribbonPanel4.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonPanel4.StyleMouseDown.Class = ""; + this.ribbonPanel4.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonPanel4.StyleMouseOver.Class = ""; + this.ribbonPanel4.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonPanel4.TabIndex = 36; + this.ribbonPanel4.Visible = false; + // + // ribbonBar1 + // + this.ribbonBar1.AutoOverflowEnabled = true; + // + // + // + this.ribbonBar1.BackgroundMouseOverStyle.Class = ""; + this.ribbonBar1.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonBar1.BackgroundStyle.Class = ""; + this.ribbonBar1.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar1.ContainerControlProcessDialogKey = true; + this.ribbonBar1.Dock = System.Windows.Forms.DockStyle.Left; + this.ribbonBar1.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { + this.btn_document_info}); + this.ribbonBar1.Location = new System.Drawing.Point(3, 0); + this.ribbonBar1.Name = "ribbonBar1"; + this.ribbonBar1.Size = new System.Drawing.Size(88, 59); + this.ribbonBar1.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.ribbonBar1.TabIndex = 0; + // + // + // + this.ribbonBar1.TitleStyle.Class = ""; + this.ribbonBar1.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonBar1.TitleStyleMouseOver.Class = ""; + this.ribbonBar1.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar1.TitleVisible = false; + // + // btn_document_info + // + this.btn_document_info.Image = ((System.Drawing.Image)(resources.GetObject("btn_document_info.Image"))); + this.btn_document_info.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.btn_document_info.Name = "btn_document_info"; + this.btn_document_info.SubItemsExpandWidth = 14; + this.btn_document_info.Text = "文档管理"; + this.btn_document_info.Click += new System.EventHandler(this.btn_document_info_Click); + // // ribbonTabItem1 // this.ribbonTabItem1.ButtonStyle = DevComponents.DotNetBar.eButtonStyle.ImageAndText; @@ -3673,7 +3694,6 @@ this.ribbonTabItem7.Name = "ribbonTabItem7"; this.ribbonTabItem7.Panel = this.ribbonPanel7; this.ribbonTabItem7.Text = "管线定位"; - this.ribbonTabItem7.MouseDown += new System.Windows.Forms.MouseEventHandler(this.ribbonTabItem7_MouseDown); // // ribbonTabItem5 // @@ -3684,7 +3704,6 @@ this.ribbonTabItem5.Name = "ribbonTabItem5"; this.ribbonTabItem5.Panel = this.ribbonPanel3; this.ribbonTabItem5.Text = "标识器管理"; - this.ribbonTabItem5.MouseDown += new System.Windows.Forms.MouseEventHandler(this.ribbonTabItem5_MouseDown); // // ribbonTabItem2 // @@ -4451,7 +4470,7 @@ this.dataGridViewX2.ReadOnly = true; this.dataGridViewX2.RowHeadersVisible = false; this.dataGridViewX2.RowTemplate.Height = 23; - this.dataGridViewX2.Size = new System.Drawing.Size(31081, 92); + this.dataGridViewX2.Size = new System.Drawing.Size(31378, 92); this.dataGridViewX2.TabIndex = 11; // // dataGridViewTextBoxColumn10 @@ -4545,7 +4564,7 @@ this.dataGridViewX3.ReadOnly = true; this.dataGridViewX3.RowHeadersVisible = false; this.dataGridViewX3.RowTemplate.Height = 23; - this.dataGridViewX3.Size = new System.Drawing.Size(31080, 127); + this.dataGridViewX3.Size = new System.Drawing.Size(31377, 127); this.dataGridViewX3.TabIndex = 5; this.dataGridViewX3.MouseDoubleClick += new System.Windows.Forms.MouseEventHandler(this.dataGridViewX3_MouseDoubleClick); // @@ -5722,7 +5741,8 @@ // pictureBox1 // this.pictureBox1.Dock = System.Windows.Forms.DockStyle.Top; - this.pictureBox1.Image = ((System.Drawing.Image)(resources.GetObject("pictureBox1.Image"))); +// this.pictureBox1.Image = ((System.Drawing.Image)(resources.GetObject("pictureBox1.Image"))); + this.pictureBox1.Image = Image.FromFile(Application.StartupPath + Utility.TitleImagePath); this.pictureBox1.Location = new System.Drawing.Point(0, 0); this.pictureBox1.Margin = new System.Windows.Forms.Padding(0); this.pictureBox1.Name = "pictureBox1"; @@ -5732,18 +5752,6 @@ this.pictureBox1.TabStop = false; this.pictureBox1.Paint += new System.Windows.Forms.PaintEventHandler(this.pictureBox1_Paint); // - // layerTree - // - this.layerTree.CheckBoxes = true; - this.layerTree.ItemHeight = 18; - this.layerTree.Location = new System.Drawing.Point(30, 78); - this.layerTree.Name = "layerTree"; - this.layerTree.Size = new System.Drawing.Size(121, 97); - this.layerTree.TabIndex = 1; - this.layerTree.AfterCheck += new System.Windows.Forms.TreeViewEventHandler(this.layerTree_AfterCheck); - this.layerTree.NodeMouseClick += new System.Windows.Forms.TreeNodeMouseClickEventHandler(this.layerTree_NodeMouseClick); - this.layerTree.NodeMouseDoubleClick += new System.Windows.Forms.TreeNodeMouseClickEventHandler(this.layerTree_NodeMouseDoubleClick); - // // MainFrm // this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Inherit; @@ -5770,7 +5778,8 @@ this.KeyPreview = true; this.Name = "MainFrm"; this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen; - this.Text = "智慧太湖新城管网规划分析系统6.0"; +// this.Text = "智慧太湖新城管网规划分析系统6.0"; + this.Text = Utility.SysnameVersion; this.WindowState = System.Windows.Forms.FormWindowState.Maximized; this.FormClosing += new System.Windows.Forms.FormClosingEventHandler(this.MainFrm_FormClosing); this.Load += new System.EventHandler(this.MainFrm_Load); @@ -5787,15 +5796,15 @@ this.contextMenuStripDeleteLayerNode.ResumeLayout(false); this.ribbonControl1.ResumeLayout(false); this.ribbonControl1.PerformLayout(); + this.ribbonPanel3.ResumeLayout(false); + this.ribbonPanel7.ResumeLayout(false); + this.ribbonPanel15.ResumeLayout(false); + this.ribbonPanel2.ResumeLayout(false); this.ribbonPanel6.ResumeLayout(false); this.ribbonPanel5.ResumeLayout(false); this.ribbonPanel1.ResumeLayout(false); this.ribbonPanel12.ResumeLayout(false); this.ribbonPanel4.ResumeLayout(false); - this.ribbonPanel15.ResumeLayout(false); - this.ribbonPanel3.ResumeLayout(false); - this.ribbonPanel7.ResumeLayout(false); - this.ribbonPanel2.ResumeLayout(false); this.panelOfTable.ResumeLayout(false); this.panelOfTable.PerformLayout(); ((System.ComponentModel.ISupportInitialize)(this.dataGridViewX1)).EndInit(); @@ -5955,6 +5964,7 @@ private RibbonTabItem ribbonTabItem11; private ButtonItem buttonItem130; private RibbonBar ribbonBar18; + private ButtonItem buttonItem132; private SliderItem sliderItem1; private ButtonItem buttonItem133; private ButtonItem buttonItem134; diff --git a/MainFrm.resx b/MainFrm.resx index 9f9bba4..ce490c1 100644 --- a/MainFrm.resx +++ b/MainFrm.resx @@ -351,6 +351,146 @@ 766, 54 + + + iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 + YQUAAAAZdEVYdFNvZnR3YXJlAEFkb2JlIEltYWdlUmVhZHlxyWU8AAADZmlUWHRYTUw6Y29tLmFkb2Jl + LnhtcAAAAAAAPD94cGFja2V0IGJlZ2luPSLvu78iIGlkPSJXNU0wTXBDZWhpSHpyZVN6TlRjemtjOWQi + Pz4gPHg6eG1wbWV0YSB4bWxuczp4PSJhZG9iZTpuczptZXRhLyIgeDp4bXB0az0iQWRvYmUgWE1QIENv + cmUgNS4zLWMwMTEgNjYuMTQ1NjYxLCAyMDEyLzAyLzA2LTE0OjU2OjI3ICAgICAgICAiPiA8cmRmOlJE + RiB4bWxuczpyZGY9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkvMDIvMjItcmRmLXN5bnRheC1ucyMiPiA8 + cmRmOkRlc2NyaXB0aW9uIHJkZjphYm91dD0iIiB4bWxuczp4bXBNTT0iaHR0cDovL25zLmFkb2JlLmNv + bS94YXAvMS4wL21tLyIgeG1sbnM6c3RSZWY9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlw + ZS9SZXNvdXJjZVJlZiMiIHhtbG5zOnhtcD0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wLyIgeG1w + TU06T3JpZ2luYWxEb2N1bWVudElEPSJ4bXAuZGlkOjYzQTM5NEY4Mjg0OUU0MTE5NDBEQTc4ODZEQzk5 + N0NGIiB4bXBNTTpEb2N1bWVudElEPSJ4bXAuZGlkOjEwQ0IxNzBBNEM1QzExRTRBNkNGQzRBMjhDQzI0 + MkY4IiB4bXBNTTpJbnN0YW5jZUlEPSJ4bXAuaWlkOjEwQ0IxNzA5NEM1QzExRTRBNkNGQzRBMjhDQzI0 + MkY4IiB4bXA6Q3JlYXRvclRvb2w9IkFkb2JlIFBob3Rvc2hvcCBDUzYgKFdpbmRvd3MpIj4gPHhtcE1N + OkRlcml2ZWRGcm9tIHN0UmVmOmluc3RhbmNlSUQ9InhtcC5paWQ6NTEzMDNDMjA1QjRDRTQxMTg4NERE + MUVBOEQ4QTgyNTUiIHN0UmVmOmRvY3VtZW50SUQ9InhtcC5kaWQ6NjNBMzk0RjgyODQ5RTQxMTk0MERB + Nzg4NkRDOTk3Q0YiLz4gPC9yZGY6RGVzY3JpcHRpb24+IDwvcmRmOlJERj4gPC94OnhtcG1ldGE+IDw/ + eHBhY2tldCBlbmQ9InIiPz43wa2/AAAFaUlEQVRIS6WUC0xTVxzGKy0UkSmlFGjBFilSkNpSaAWRh63y + sIiAArKs4spLRLQoiEJlSMGoMCc6CBOnYHzMOHUqqOhEHOqCbjNu6kCd6KYje5mZ6KbObd/OuVL3cEzj + /skv997/+b7v39PTW9aj3/BM+OKxPEIZoW/gyrOuPbP+GvRPSNBQQqXYLwSW1etw7cYt5kqfaZ+uD8QM + Xg8f/f4UxGhHMHv4qlG6vAb9394G6T+BPpdV1oCuUx3VD8Q9XT8//PUJRMghlLhLg1C41IK+r/pB+oNC + 16mO6qmP+gdi/6y793+hwTYEk9uoQOSaStHzxQ2Q/nND9XMKy0D9NIfmDcSzaLhI4KXE7LwinLtwGXfu + PXhhqJ/m0DyS62EdUGWpqcf3P97DD3d++t/QnKraBjpghXWAiC+WN0ZNScOe1mP45vbdF2ZvWwdoDs/D + b6ejs6ecxHPoAG/l+Fhkzy+FyCcY0YkG7D/yAW5+d+e5oXrqo36aQ/McnNyjyAAuHWA05pfgzPlehhyT + mflV6FOMaDt2Ctf7bw8KXac6qqc+a4Zx3hLwRLJCZgcJjcPIEPkyIZmeX1SB7vOX0dn9KQy5jw8r8eVc + HOrsxidXP0d9hxlzd4QgeYMzEt7kQVvOR0pFFNpOHmd81E9znIS+dSTc1foVGWfNKUZjyy6Ex6SQl0cD + 09IVxHAFh0+cReqr+QjK8ERqEw+VHWOwoycSR/v1OHwzDlsvhcNCeqkbedAYxQiPm87kZOQVw0nkW0QG + 2DFnIA+JRm3DFpzr/RKNW3ZDE5UAsX8ocizZiFs7DEUHvPFunw4Hb05B+y09jn49lYHe0x5doxqqLVlf + DJrnyB+pIQNs6QAhf6R8tZu3CqpwPdZu2I6PLl3HwnV5iHv9JVSeUOKdqzq81xeDvddiYG73R0aLEIZm + IRa1jUbjxQnYRHa17YqW0VJPwHT3LocRbirrDiymspXo6L6AgiXV8JSNQ2i6GpNWOqK4U4n1n0Vge68W + 9ecmIKnBBSqDCIp4P2RWGDB/QxqS6l1QcToIld3BqDobgsXEQ73+Se5HrGcgdJEokGzIx66DXXi7dRvC + yx2Q2RqApR+GoPbjCag8pUZ6sxjqWRKEldljRr07ZjaKmHt5qpBZKzkeiIJ2BbIPKmA8MIbJUC/ghrM0 + RfYsDtdhqJNIVulK/ku0BQokbfZGZrsKBR3BmEsMOfvl0FY7o7ypDPo1brCcGc+QUCdExabXEFsjQO4B + ObL2BSBlqx8SWwibvBE0334nK3Ael+yEbIW81DZszlhZ2oieuAYvpO5VIHGzP9J2+CN9pz/CzDwExMox + eZUbFnZpkEc+gLZagJjMWOiqXZDVqmC0+kZf6Nb4IHKFCPIsu92sgCw7BlJswjBJLCdenmuPyFUS6Gp9 + oG/yRdJWGSKqhYjKDgLRImK5ACGlzsy9d/zwXn2DBMZDSkZLPaHlnpBncyGO5kxj+Rps/wYdJE2xzfOb + zcU4sye0b0gRu3E0Ypt8ELTICRFGNcShUgjHuZyWxNu2096sdiXS9o1ltNQjyyDhes4SkuXEGpXC+Ve8 + kjlzpDPtoCkVQrdOihgyIHmXP6LryGEX86Ba6ISJNR7IeF+JV8gAfbOM0XoTj8dktpmEOxM4rJHTBscz + njNNnMiBagEfU98ajRnbZMg7GojCk2oGU1cw5nUGw7BHAZWJD6oVhLFzSDCPCacljGP/J7xAm6Hu0ew6 + STIXkcvckN7ig8XHVCjvUiNvdwAmW0Twms6FayS7meM4REoihxPoeT4u10nsZ0LKhhdsIxZEsVcLtOyL + pHffVcd+IJjI7uGHsRscJEPURMMn2FMtNTwuFusPrjFl48ji7nIAAAAASUVORK5CYII= + + + + + iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 + YQUAAAAZdEVYdFNvZnR3YXJlAEFkb2JlIEltYWdlUmVhZHlxyWU8AAADZmlUWHRYTUw6Y29tLmFkb2Jl + LnhtcAAAAAAAPD94cGFja2V0IGJlZ2luPSLvu78iIGlkPSJXNU0wTXBDZWhpSHpyZVN6TlRjemtjOWQi + Pz4gPHg6eG1wbWV0YSB4bWxuczp4PSJhZG9iZTpuczptZXRhLyIgeDp4bXB0az0iQWRvYmUgWE1QIENv + cmUgNS4zLWMwMTEgNjYuMTQ1NjYxLCAyMDEyLzAyLzA2LTE0OjU2OjI3ICAgICAgICAiPiA8cmRmOlJE + RiB4bWxuczpyZGY9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkvMDIvMjItcmRmLXN5bnRheC1ucyMiPiA8 + cmRmOkRlc2NyaXB0aW9uIHJkZjphYm91dD0iIiB4bWxuczp4bXBNTT0iaHR0cDovL25zLmFkb2JlLmNv + bS94YXAvMS4wL21tLyIgeG1sbnM6c3RSZWY9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlw + ZS9SZXNvdXJjZVJlZiMiIHhtbG5zOnhtcD0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wLyIgeG1w + TU06T3JpZ2luYWxEb2N1bWVudElEPSJ4bXAuZGlkOjYzQTM5NEY4Mjg0OUU0MTE5NDBEQTc4ODZEQzk5 + N0NGIiB4bXBNTTpEb2N1bWVudElEPSJ4bXAuZGlkOkUyMTg3NjEyNDlEODExRTQ4NjNGQjM2Mzk1QkNB + RkQwIiB4bXBNTTpJbnN0YW5jZUlEPSJ4bXAuaWlkOkUyMTg3NjExNDlEODExRTQ4NjNGQjM2Mzk1QkNB + RkQwIiB4bXA6Q3JlYXRvclRvb2w9IkFkb2JlIFBob3Rvc2hvcCBDUzYgKFdpbmRvd3MpIj4gPHhtcE1N + OkRlcml2ZWRGcm9tIHN0UmVmOmluc3RhbmNlSUQ9InhtcC5paWQ6NkJCNTE0NDlEODQ5RTQxMUE0QzNB + MjdEOTJBQzc3QkMiIHN0UmVmOmRvY3VtZW50SUQ9InhtcC5kaWQ6NjNBMzk0RjgyODQ5RTQxMTk0MERB + Nzg4NkRDOTk3Q0YiLz4gPC9yZGY6RGVzY3JpcHRpb24+IDwvcmRmOlJERj4gPC94OnhtcG1ldGE+IDw/ + eHBhY2tldCBlbmQ9InIiPz5e5MstAAADiUlEQVRIS+2UW0yTdxjGcePwtYyVVpAUCi1tv9ImrVbxhAei + kjGphAgFT4jzEJ0gGuJhDk0sml0sglmWmC1hqHNKWwI4srgNh3phpjg1O1yIN5DMbFHQZUu42O76+D4f + 3Fl6Z7ILn+SXvH3f533++X/98iUBeKW81v9Uwx1G1+1240EhfKfdeE/4U3qTAqaZZO/2aeN9IXLrY+Ph + wVOZHll9YyohgYZOGS4JsYdXVDy+NQ8Tvy3BP6OlmPyjDP9OBDRYs8cZPfRy5/uQISIRqcIsLSye+j7I + wN+PluOvhyWY+NmL8fsOjP9kxdN7BRh/YJHfFjy5m48nd4ThQjy968bEgwV49usicFciTEKKFhZPXXv1 + eHxtLsYGPBjttwsWjF0xY+ybOfj9uylYs8cZPfQS7kpEnqDTwuLp9GYlfKZeifUfzcb1j/Iw/IkNv3Q6 + MfKVC6O9bg3W7HFGD73cORlMG5AIizDzAaVtunD5ESXWfNSEY/tNCO00oG1zOkJBBSeqUjVYh6R3Qmat + zSY0Hjah7IASW7hPuSoRvIGihcVTSauCppvFODRUjJZvPWgaKMTuXgt2RHOxLTwHDd3EjPfCudgesWJX + jxM7eryo7/Ni8SGFj8gp6LWwePLvS0Og043A5y5UdtkQOJeLivM5ePf8bJSfM04zG2u7chDoysW6Thsq + zqpY0+GAvymNB/gEgxYWT64tKdGihpSYv8WEpSEzVp0pwDuf2SVQReCiS4M1e5zRQy937NXJ1yRirjDz + AVmVJyNZa9+PObauh7ptKdR6FY6N2SisTYe1OlmDNXtqvRNqwxLYt1TCVLY1ZijZOSQRbuEtLSyeTOXH + sfLDH1EauoFFx6/Cd6Qf7pYI1ObLsO+9iMLdF+DccwEuqd2Nl+Br6sbCxiiKd/XBuPogH1HiAzJXHMC8 + YA98td1wb4rCuaEH1roo8oMR5JGaMPIFa10Ejtowiuouw1vzJTwVXyBz+X4ekPgRZfgbohkLtsfMy47B + tqYdakUnPFUM6YUv+LUGa/Y4o8e8rBXcSffWDkpE4j9ZpEvNmb9KsZV16BzrBnVq1YjeVf1MX1Tzn74o + iCmkdq1/LrNHOkfgB6Vg9afJRrVOdv2ClRkMmklvCnyPs4V8ge81v5RegddnCGHNHmf00JslcJcZCcWv + IU1pAhcyhLcFXj1zGtbscUYPvdyZ+Uv6Wi8rKekFBjoX2627by8AAAAASUVORK5CYII= + + + + + iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 + YQUAAAAZdEVYdFNvZnR3YXJlAEFkb2JlIEltYWdlUmVhZHlxyWU8AAADZmlUWHRYTUw6Y29tLmFkb2Jl + LnhtcAAAAAAAPD94cGFja2V0IGJlZ2luPSLvu78iIGlkPSJXNU0wTXBDZWhpSHpyZVN6TlRjemtjOWQi + Pz4gPHg6eG1wbWV0YSB4bWxuczp4PSJhZG9iZTpuczptZXRhLyIgeDp4bXB0az0iQWRvYmUgWE1QIENv + cmUgNS4zLWMwMTEgNjYuMTQ1NjYxLCAyMDEyLzAyLzA2LTE0OjU2OjI3ICAgICAgICAiPiA8cmRmOlJE + RiB4bWxuczpyZGY9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkvMDIvMjItcmRmLXN5bnRheC1ucyMiPiA8 + cmRmOkRlc2NyaXB0aW9uIHJkZjphYm91dD0iIiB4bWxuczp4bXBNTT0iaHR0cDovL25zLmFkb2JlLmNv + bS94YXAvMS4wL21tLyIgeG1sbnM6c3RSZWY9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlw + ZS9SZXNvdXJjZVJlZiMiIHhtbG5zOnhtcD0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wLyIgeG1w + TU06T3JpZ2luYWxEb2N1bWVudElEPSJ4bXAuZGlkOjYzQTM5NEY4Mjg0OUU0MTE5NDBEQTc4ODZEQzk5 + N0NGIiB4bXBNTTpEb2N1bWVudElEPSJ4bXAuZGlkOkE2Q0VGMDE2NDlEQTExRTQ4NTlCQTI3NTMyOEY5 + NEU2IiB4bXBNTTpJbnN0YW5jZUlEPSJ4bXAuaWlkOkE2Q0VGMDE1NDlEQTExRTQ4NTlCQTI3NTMyOEY5 + NEU2IiB4bXA6Q3JlYXRvclRvb2w9IkFkb2JlIFBob3Rvc2hvcCBDUzYgKFdpbmRvd3MpIj4gPHhtcE1N + OkRlcml2ZWRGcm9tIHN0UmVmOmluc3RhbmNlSUQ9InhtcC5paWQ6NjA1MjM3NzFEOTQ5RTQxMUE0QzNB + MjdEOTJBQzc3QkMiIHN0UmVmOmRvY3VtZW50SUQ9InhtcC5kaWQ6NjNBMzk0RjgyODQ5RTQxMTk0MERB + Nzg4NkRDOTk3Q0YiLz4gPC9yZGY6RGVzY3JpcHRpb24+IDwvcmRmOlJERj4gPC94OnhtcG1ldGE+IDw/ + eHBhY2tldCBlbmQ9InIiPz6UH16BAAABrElEQVRIS63N70tTURzH8fsnKSGCCEIQCBKISMq2iILCgQOL + JUxQAoVKdMGQuwgWFepsMGjFZCMuorsIJV4WFatpvzdr1ZAFsaIHn8559v1eDsI91wevJ/ee7/tjbMRH + fAFwJOWRF6oopTzyQhWlVEdBwRbgUhICAnuvilKGtXDGzW6WV/CvbjE/xTfxr+R6q4xSxtP5YTf8rVn4 + s5dG+809Rv5zvVVGKaNwfYgyBfhksoH83CCF9seiL7LBBnLXTlP4/W4dza0ZLS0nCdlgA9npAQq/qk/Q + sKa0NJ8nIBtsIBPrp9CqPMJBYVLLj+04ZIMNrF49ReHwVRafH1/R8m3zJmSDDdy/fJJC88Ua3mcjWurW + LGSDDaQifRS+O8uopsNaPhVnIBts4E64l0Jj5y4qDy5q+ZCPQTbYgHmph8LXZ0m8TJ3Xsp+LQjbYQOJC + N4XadgLl22e1vM1OQDbYwK1zXRS+lBbhmEHsLgU8kTeVh+OQDTawEDpB2U4mitfpMS22GYJssIH5QCcV + FGwBmuRtkA3cGO3whcZUlEdeqKKU8sgLVZRSfjw+MP4DJ2GPpDR9OIsAAAAASUVORK5CYII= + + + + + iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 + YQUAAAAZdEVYdFNvZnR3YXJlAEFkb2JlIEltYWdlUmVhZHlxyWU8AAADZmlUWHRYTUw6Y29tLmFkb2Jl + LnhtcAAAAAAAPD94cGFja2V0IGJlZ2luPSLvu78iIGlkPSJXNU0wTXBDZWhpSHpyZVN6TlRjemtjOWQi + Pz4gPHg6eG1wbWV0YSB4bWxuczp4PSJhZG9iZTpuczptZXRhLyIgeDp4bXB0az0iQWRvYmUgWE1QIENv + cmUgNS4zLWMwMTEgNjYuMTQ1NjYxLCAyMDEyLzAyLzA2LTE0OjU2OjI3ICAgICAgICAiPiA8cmRmOlJE + RiB4bWxuczpyZGY9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkvMDIvMjItcmRmLXN5bnRheC1ucyMiPiA8 + cmRmOkRlc2NyaXB0aW9uIHJkZjphYm91dD0iIiB4bWxuczp4bXBNTT0iaHR0cDovL25zLmFkb2JlLmNv + bS94YXAvMS4wL21tLyIgeG1sbnM6c3RSZWY9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlw + ZS9SZXNvdXJjZVJlZiMiIHhtbG5zOnhtcD0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wLyIgeG1w + TU06T3JpZ2luYWxEb2N1bWVudElEPSJ4bXAuZGlkOjYzQTM5NEY4Mjg0OUU0MTE5NDBEQTc4ODZEQzk5 + N0NGIiB4bXBNTTpEb2N1bWVudElEPSJ4bXAuZGlkOjJGRTU5OEQ1NDlEQjExRTRBRUVDOTkyMjQ5NzEw + REUwIiB4bXBNTTpJbnN0YW5jZUlEPSJ4bXAuaWlkOjJGRTU5OEQ0NDlEQjExRTRBRUVDOTkyMjQ5NzEw + REUwIiB4bXA6Q3JlYXRvclRvb2w9IkFkb2JlIFBob3Rvc2hvcCBDUzYgKFdpbmRvd3MpIj4gPHhtcE1N + OkRlcml2ZWRGcm9tIHN0UmVmOmluc3RhbmNlSUQ9InhtcC5paWQ6MTY0MkI1RjlEQTQ5RTQxMUE0QzNB + MjdEOTJBQzc3QkMiIHN0UmVmOmRvY3VtZW50SUQ9InhtcC5kaWQ6NjNBMzk0RjgyODQ5RTQxMTk0MERB + Nzg4NkRDOTk3Q0YiLz4gPC9yZGY6RGVzY3JpcHRpb24+IDwvcmRmOlJERj4gPC94OnhtcG1ldGE+IDw/ + eHBhY2tldCBlbmQ9InIiPz6B5sF9AAACe0lEQVRIS7WVb2jMcRzHL7UHanF/Mts5prE/1li3kAfu5Ak7 + 5IHNobBkSC2UIuGJkrrSWRvTmHQWK8U1T8jqUtYwkZpaGjV/Js6to5YwfXze39+fu/v23f36hXe9us+f + 7/v9rd/dr3MQ0X/F4Zm3+K9QhWajNNlBFZqN0mQHS6lMdrCUyqSgimllUsy4XmOmp+QRDllQWbygjjq6 + uimZStOX8a+ixox3pXrM1JLCDAqYJmY7c669M0bff07mcLbtEl9QE8k6V6BH5ooXMsHZZX7ae+AY7W45 + SrPm19LbsSR9m/iRA2bYGefggVePzUgKBzeu9sQpmZ4QcG/WMtk7eLjv0WMz0kOz+TX6MUXvP6cFeNbD + bz6YvQFm2Bk9PPByZO6jksLB5KvRTzTyLikIrG2ktsvXzd4g2hGjYP1ms4eHvb850qkl65LCQW/ntVs0 + 9HpMcPx0K1X4V1Ff/3NzhnphbVDsjBk8Lm/VE44s0ZJ1KS4Ie8uXUvPBE7Tn0ElCzTMqrV5BO/cfEaDG + TD5X6PFFONLygsTF7jj1vxihyPkYNTS1iFrFxm37KHIhJmp43L7qZxzp0pJ1SeHhQGgLJQaH6fb9R1QX + 2EB3Ek9FryLe95j8K9eLT/TB0FZcskOP1iRdkIh23aR7Ay9pzaZddKY9Jup8nIpeoXXhZlHD655b85Bj + p2npLOmCML+dD/iTZhaX3+UvbRB1PpzeygFnSUUvatecRUMzisoOc+x0LZ3FixxYhQyK1cxyZhkTYhqY + RgnM6hmcwVl4ljDI0KS4AC+Kmyli8Jv2MF7GNwXY4QzOwgNv5mWTL7CLpVQmO1hKZbKDpVR/1P8OcvwB + lh7gOXXZq9sAAAAASUVORK5CYII= + + iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 @@ -598,147 +738,7 @@ 1BGxz38BvCwLsyQ3iHgAAAAASUVORK5CYII= - - - iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAZdEVYdFNvZnR3YXJlAEFkb2JlIEltYWdlUmVhZHlxyWU8AAADZmlUWHRYTUw6Y29tLmFkb2Jl - LnhtcAAAAAAAPD94cGFja2V0IGJlZ2luPSLvu78iIGlkPSJXNU0wTXBDZWhpSHpyZVN6TlRjemtjOWQi - Pz4gPHg6eG1wbWV0YSB4bWxuczp4PSJhZG9iZTpuczptZXRhLyIgeDp4bXB0az0iQWRvYmUgWE1QIENv - cmUgNS4zLWMwMTEgNjYuMTQ1NjYxLCAyMDEyLzAyLzA2LTE0OjU2OjI3ICAgICAgICAiPiA8cmRmOlJE - RiB4bWxuczpyZGY9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkvMDIvMjItcmRmLXN5bnRheC1ucyMiPiA8 - cmRmOkRlc2NyaXB0aW9uIHJkZjphYm91dD0iIiB4bWxuczp4bXBNTT0iaHR0cDovL25zLmFkb2JlLmNv - bS94YXAvMS4wL21tLyIgeG1sbnM6c3RSZWY9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlw - ZS9SZXNvdXJjZVJlZiMiIHhtbG5zOnhtcD0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wLyIgeG1w - TU06T3JpZ2luYWxEb2N1bWVudElEPSJ4bXAuZGlkOjYzQTM5NEY4Mjg0OUU0MTE5NDBEQTc4ODZEQzk5 - N0NGIiB4bXBNTTpEb2N1bWVudElEPSJ4bXAuZGlkOjEwQ0IxNzBBNEM1QzExRTRBNkNGQzRBMjhDQzI0 - MkY4IiB4bXBNTTpJbnN0YW5jZUlEPSJ4bXAuaWlkOjEwQ0IxNzA5NEM1QzExRTRBNkNGQzRBMjhDQzI0 - MkY4IiB4bXA6Q3JlYXRvclRvb2w9IkFkb2JlIFBob3Rvc2hvcCBDUzYgKFdpbmRvd3MpIj4gPHhtcE1N - OkRlcml2ZWRGcm9tIHN0UmVmOmluc3RhbmNlSUQ9InhtcC5paWQ6NTEzMDNDMjA1QjRDRTQxMTg4NERE - MUVBOEQ4QTgyNTUiIHN0UmVmOmRvY3VtZW50SUQ9InhtcC5kaWQ6NjNBMzk0RjgyODQ5RTQxMTk0MERB - Nzg4NkRDOTk3Q0YiLz4gPC9yZGY6RGVzY3JpcHRpb24+IDwvcmRmOlJERj4gPC94OnhtcG1ldGE+IDw/ - eHBhY2tldCBlbmQ9InIiPz43wa2/AAAFaUlEQVRIS6WUC0xTVxzGKy0UkSmlFGjBFilSkNpSaAWRh63y - sIiAArKs4spLRLQoiEJlSMGoMCc6CBOnYHzMOHUqqOhEHOqCbjNu6kCd6KYje5mZ6KbObd/OuVL3cEzj - /skv997/+b7v39PTW9aj3/BM+OKxPEIZoW/gyrOuPbP+GvRPSNBQQqXYLwSW1etw7cYt5kqfaZ+uD8QM - Xg8f/f4UxGhHMHv4qlG6vAb9394G6T+BPpdV1oCuUx3VD8Q9XT8//PUJRMghlLhLg1C41IK+r/pB+oNC - 16mO6qmP+gdi/6y793+hwTYEk9uoQOSaStHzxQ2Q/nND9XMKy0D9NIfmDcSzaLhI4KXE7LwinLtwGXfu - PXhhqJ/m0DyS62EdUGWpqcf3P97DD3d++t/QnKraBjpghXWAiC+WN0ZNScOe1mP45vbdF2ZvWwdoDs/D - b6ejs6ecxHPoAG/l+Fhkzy+FyCcY0YkG7D/yAW5+d+e5oXrqo36aQ/McnNyjyAAuHWA05pfgzPlehhyT - mflV6FOMaDt2Ctf7bw8KXac6qqc+a4Zx3hLwRLJCZgcJjcPIEPkyIZmeX1SB7vOX0dn9KQy5jw8r8eVc - HOrsxidXP0d9hxlzd4QgeYMzEt7kQVvOR0pFFNpOHmd81E9znIS+dSTc1foVGWfNKUZjyy6Ex6SQl0cD - 09IVxHAFh0+cReqr+QjK8ERqEw+VHWOwoycSR/v1OHwzDlsvhcNCeqkbedAYxQiPm87kZOQVw0nkW0QG - 2DFnIA+JRm3DFpzr/RKNW3ZDE5UAsX8ocizZiFs7DEUHvPFunw4Hb05B+y09jn49lYHe0x5doxqqLVlf - DJrnyB+pIQNs6QAhf6R8tZu3CqpwPdZu2I6PLl3HwnV5iHv9JVSeUOKdqzq81xeDvddiYG73R0aLEIZm - IRa1jUbjxQnYRHa17YqW0VJPwHT3LocRbirrDiymspXo6L6AgiXV8JSNQ2i6GpNWOqK4U4n1n0Vge68W - 9ecmIKnBBSqDCIp4P2RWGDB/QxqS6l1QcToIld3BqDobgsXEQ73+Se5HrGcgdJEokGzIx66DXXi7dRvC - yx2Q2RqApR+GoPbjCag8pUZ6sxjqWRKEldljRr07ZjaKmHt5qpBZKzkeiIJ2BbIPKmA8MIbJUC/ghrM0 - RfYsDtdhqJNIVulK/ku0BQokbfZGZrsKBR3BmEsMOfvl0FY7o7ypDPo1brCcGc+QUCdExabXEFsjQO4B - ObL2BSBlqx8SWwibvBE0334nK3Ael+yEbIW81DZszlhZ2oieuAYvpO5VIHGzP9J2+CN9pz/CzDwExMox - eZUbFnZpkEc+gLZagJjMWOiqXZDVqmC0+kZf6Nb4IHKFCPIsu92sgCw7BlJswjBJLCdenmuPyFUS6Gp9 - oG/yRdJWGSKqhYjKDgLRImK5ACGlzsy9d/zwXn2DBMZDSkZLPaHlnpBncyGO5kxj+Rps/wYdJE2xzfOb - zcU4sye0b0gRu3E0Ypt8ELTICRFGNcShUgjHuZyWxNu2096sdiXS9o1ltNQjyyDhes4SkuXEGpXC+Ve8 - kjlzpDPtoCkVQrdOihgyIHmXP6LryGEX86Ba6ISJNR7IeF+JV8gAfbOM0XoTj8dktpmEOxM4rJHTBscz - njNNnMiBagEfU98ajRnbZMg7GojCk2oGU1cw5nUGw7BHAZWJD6oVhLFzSDCPCacljGP/J7xAm6Hu0ew6 - STIXkcvckN7ig8XHVCjvUiNvdwAmW0Twms6FayS7meM4REoihxPoeT4u10nsZ0LKhhdsIxZEsVcLtOyL - pHffVcd+IJjI7uGHsRscJEPURMMn2FMtNTwuFusPrjFl48ji7nIAAAAASUVORK5CYII= - - - - - iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAZdEVYdFNvZnR3YXJlAEFkb2JlIEltYWdlUmVhZHlxyWU8AAADZmlUWHRYTUw6Y29tLmFkb2Jl - LnhtcAAAAAAAPD94cGFja2V0IGJlZ2luPSLvu78iIGlkPSJXNU0wTXBDZWhpSHpyZVN6TlRjemtjOWQi - Pz4gPHg6eG1wbWV0YSB4bWxuczp4PSJhZG9iZTpuczptZXRhLyIgeDp4bXB0az0iQWRvYmUgWE1QIENv - cmUgNS4zLWMwMTEgNjYuMTQ1NjYxLCAyMDEyLzAyLzA2LTE0OjU2OjI3ICAgICAgICAiPiA8cmRmOlJE - RiB4bWxuczpyZGY9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkvMDIvMjItcmRmLXN5bnRheC1ucyMiPiA8 - cmRmOkRlc2NyaXB0aW9uIHJkZjphYm91dD0iIiB4bWxuczp4bXBNTT0iaHR0cDovL25zLmFkb2JlLmNv - bS94YXAvMS4wL21tLyIgeG1sbnM6c3RSZWY9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlw - ZS9SZXNvdXJjZVJlZiMiIHhtbG5zOnhtcD0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wLyIgeG1w - TU06T3JpZ2luYWxEb2N1bWVudElEPSJ4bXAuZGlkOjYzQTM5NEY4Mjg0OUU0MTE5NDBEQTc4ODZEQzk5 - N0NGIiB4bXBNTTpEb2N1bWVudElEPSJ4bXAuZGlkOkUyMTg3NjEyNDlEODExRTQ4NjNGQjM2Mzk1QkNB - RkQwIiB4bXBNTTpJbnN0YW5jZUlEPSJ4bXAuaWlkOkUyMTg3NjExNDlEODExRTQ4NjNGQjM2Mzk1QkNB - RkQwIiB4bXA6Q3JlYXRvclRvb2w9IkFkb2JlIFBob3Rvc2hvcCBDUzYgKFdpbmRvd3MpIj4gPHhtcE1N - OkRlcml2ZWRGcm9tIHN0UmVmOmluc3RhbmNlSUQ9InhtcC5paWQ6NkJCNTE0NDlEODQ5RTQxMUE0QzNB - MjdEOTJBQzc3QkMiIHN0UmVmOmRvY3VtZW50SUQ9InhtcC5kaWQ6NjNBMzk0RjgyODQ5RTQxMTk0MERB - Nzg4NkRDOTk3Q0YiLz4gPC9yZGY6RGVzY3JpcHRpb24+IDwvcmRmOlJERj4gPC94OnhtcG1ldGE+IDw/ - eHBhY2tldCBlbmQ9InIiPz5e5MstAAADiUlEQVRIS+2UW0yTdxjGcePwtYyVVpAUCi1tv9ImrVbxhAei - kjGphAgFT4jzEJ0gGuJhDk0sml0sglmWmC1hqHNKWwI4srgNh3phpjg1O1yIN5DMbFHQZUu42O76+D4f - 3Fl6Z7ILn+SXvH3f533++X/98iUBeKW81v9Uwx1G1+1240EhfKfdeE/4U3qTAqaZZO/2aeN9IXLrY+Ph - wVOZHll9YyohgYZOGS4JsYdXVDy+NQ8Tvy3BP6OlmPyjDP9OBDRYs8cZPfRy5/uQISIRqcIsLSye+j7I - wN+PluOvhyWY+NmL8fsOjP9kxdN7BRh/YJHfFjy5m48nd4ThQjy968bEgwV49usicFciTEKKFhZPXXv1 - eHxtLsYGPBjttwsWjF0xY+ybOfj9uylYs8cZPfQS7kpEnqDTwuLp9GYlfKZeifUfzcb1j/Iw/IkNv3Q6 - MfKVC6O9bg3W7HFGD73cORlMG5AIizDzAaVtunD5ESXWfNSEY/tNCO00oG1zOkJBBSeqUjVYh6R3Qmat - zSY0Hjah7IASW7hPuSoRvIGihcVTSauCppvFODRUjJZvPWgaKMTuXgt2RHOxLTwHDd3EjPfCudgesWJX - jxM7eryo7/Ni8SGFj8gp6LWwePLvS0Og043A5y5UdtkQOJeLivM5ePf8bJSfM04zG2u7chDoysW6Thsq - zqpY0+GAvymNB/gEgxYWT64tKdGihpSYv8WEpSEzVp0pwDuf2SVQReCiS4M1e5zRQy937NXJ1yRirjDz - AVmVJyNZa9+PObauh7ptKdR6FY6N2SisTYe1OlmDNXtqvRNqwxLYt1TCVLY1ZijZOSQRbuEtLSyeTOXH - sfLDH1EauoFFx6/Cd6Qf7pYI1ObLsO+9iMLdF+DccwEuqd2Nl+Br6sbCxiiKd/XBuPogH1HiAzJXHMC8 - YA98td1wb4rCuaEH1roo8oMR5JGaMPIFa10Ejtowiuouw1vzJTwVXyBz+X4ekPgRZfgbohkLtsfMy47B - tqYdakUnPFUM6YUv+LUGa/Y4o8e8rBXcSffWDkpE4j9ZpEvNmb9KsZV16BzrBnVq1YjeVf1MX1Tzn74o - iCmkdq1/LrNHOkfgB6Vg9afJRrVOdv2ClRkMmklvCnyPs4V8ge81v5RegddnCGHNHmf00JslcJcZCcWv - IU1pAhcyhLcFXj1zGtbscUYPvdyZ+Uv6Wi8rKekFBjoX2627by8AAAAASUVORK5CYII= - - - - - iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAZdEVYdFNvZnR3YXJlAEFkb2JlIEltYWdlUmVhZHlxyWU8AAADZmlUWHRYTUw6Y29tLmFkb2Jl - LnhtcAAAAAAAPD94cGFja2V0IGJlZ2luPSLvu78iIGlkPSJXNU0wTXBDZWhpSHpyZVN6TlRjemtjOWQi - Pz4gPHg6eG1wbWV0YSB4bWxuczp4PSJhZG9iZTpuczptZXRhLyIgeDp4bXB0az0iQWRvYmUgWE1QIENv - cmUgNS4zLWMwMTEgNjYuMTQ1NjYxLCAyMDEyLzAyLzA2LTE0OjU2OjI3ICAgICAgICAiPiA8cmRmOlJE - RiB4bWxuczpyZGY9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkvMDIvMjItcmRmLXN5bnRheC1ucyMiPiA8 - cmRmOkRlc2NyaXB0aW9uIHJkZjphYm91dD0iIiB4bWxuczp4bXBNTT0iaHR0cDovL25zLmFkb2JlLmNv - bS94YXAvMS4wL21tLyIgeG1sbnM6c3RSZWY9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlw - ZS9SZXNvdXJjZVJlZiMiIHhtbG5zOnhtcD0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wLyIgeG1w - TU06T3JpZ2luYWxEb2N1bWVudElEPSJ4bXAuZGlkOjYzQTM5NEY4Mjg0OUU0MTE5NDBEQTc4ODZEQzk5 - N0NGIiB4bXBNTTpEb2N1bWVudElEPSJ4bXAuZGlkOkE2Q0VGMDE2NDlEQTExRTQ4NTlCQTI3NTMyOEY5 - NEU2IiB4bXBNTTpJbnN0YW5jZUlEPSJ4bXAuaWlkOkE2Q0VGMDE1NDlEQTExRTQ4NTlCQTI3NTMyOEY5 - NEU2IiB4bXA6Q3JlYXRvclRvb2w9IkFkb2JlIFBob3Rvc2hvcCBDUzYgKFdpbmRvd3MpIj4gPHhtcE1N - OkRlcml2ZWRGcm9tIHN0UmVmOmluc3RhbmNlSUQ9InhtcC5paWQ6NjA1MjM3NzFEOTQ5RTQxMUE0QzNB - MjdEOTJBQzc3QkMiIHN0UmVmOmRvY3VtZW50SUQ9InhtcC5kaWQ6NjNBMzk0RjgyODQ5RTQxMTk0MERB - Nzg4NkRDOTk3Q0YiLz4gPC9yZGY6RGVzY3JpcHRpb24+IDwvcmRmOlJERj4gPC94OnhtcG1ldGE+IDw/ - eHBhY2tldCBlbmQ9InIiPz6UH16BAAABrElEQVRIS63N70tTURzH8fsnKSGCCEIQCBKISMq2iILCgQOL - JUxQAoVKdMGQuwgWFepsMGjFZCMuorsIJV4WFatpvzdr1ZAFsaIHn8559v1eDsI91wevJ/ee7/tjbMRH - fAFwJOWRF6oopTzyQhWlVEdBwRbgUhICAnuvilKGtXDGzW6WV/CvbjE/xTfxr+R6q4xSxtP5YTf8rVn4 - s5dG+809Rv5zvVVGKaNwfYgyBfhksoH83CCF9seiL7LBBnLXTlP4/W4dza0ZLS0nCdlgA9npAQq/qk/Q - sKa0NJ8nIBtsIBPrp9CqPMJBYVLLj+04ZIMNrF49ReHwVRafH1/R8m3zJmSDDdy/fJJC88Ua3mcjWurW - LGSDDaQifRS+O8uopsNaPhVnIBts4E64l0Jj5y4qDy5q+ZCPQTbYgHmph8LXZ0m8TJ3Xsp+LQjbYQOJC - N4XadgLl22e1vM1OQDbYwK1zXRS+lBbhmEHsLgU8kTeVh+OQDTawEDpB2U4mitfpMS22GYJssIH5QCcV - FGwBmuRtkA3cGO3whcZUlEdeqKKU8sgLVZRSfjw+MP4DJ2GPpDR9OIsAAAAASUVORK5CYII= - - - - - iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAZdEVYdFNvZnR3YXJlAEFkb2JlIEltYWdlUmVhZHlxyWU8AAADZmlUWHRYTUw6Y29tLmFkb2Jl - LnhtcAAAAAAAPD94cGFja2V0IGJlZ2luPSLvu78iIGlkPSJXNU0wTXBDZWhpSHpyZVN6TlRjemtjOWQi - Pz4gPHg6eG1wbWV0YSB4bWxuczp4PSJhZG9iZTpuczptZXRhLyIgeDp4bXB0az0iQWRvYmUgWE1QIENv - cmUgNS4zLWMwMTEgNjYuMTQ1NjYxLCAyMDEyLzAyLzA2LTE0OjU2OjI3ICAgICAgICAiPiA8cmRmOlJE - RiB4bWxuczpyZGY9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkvMDIvMjItcmRmLXN5bnRheC1ucyMiPiA8 - cmRmOkRlc2NyaXB0aW9uIHJkZjphYm91dD0iIiB4bWxuczp4bXBNTT0iaHR0cDovL25zLmFkb2JlLmNv - bS94YXAvMS4wL21tLyIgeG1sbnM6c3RSZWY9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlw - ZS9SZXNvdXJjZVJlZiMiIHhtbG5zOnhtcD0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wLyIgeG1w - TU06T3JpZ2luYWxEb2N1bWVudElEPSJ4bXAuZGlkOjYzQTM5NEY4Mjg0OUU0MTE5NDBEQTc4ODZEQzk5 - N0NGIiB4bXBNTTpEb2N1bWVudElEPSJ4bXAuZGlkOjJGRTU5OEQ1NDlEQjExRTRBRUVDOTkyMjQ5NzEw - REUwIiB4bXBNTTpJbnN0YW5jZUlEPSJ4bXAuaWlkOjJGRTU5OEQ0NDlEQjExRTRBRUVDOTkyMjQ5NzEw - REUwIiB4bXA6Q3JlYXRvclRvb2w9IkFkb2JlIFBob3Rvc2hvcCBDUzYgKFdpbmRvd3MpIj4gPHhtcE1N - OkRlcml2ZWRGcm9tIHN0UmVmOmluc3RhbmNlSUQ9InhtcC5paWQ6MTY0MkI1RjlEQTQ5RTQxMUE0QzNB - MjdEOTJBQzc3QkMiIHN0UmVmOmRvY3VtZW50SUQ9InhtcC5kaWQ6NjNBMzk0RjgyODQ5RTQxMTk0MERB - Nzg4NkRDOTk3Q0YiLz4gPC9yZGY6RGVzY3JpcHRpb24+IDwvcmRmOlJERj4gPC94OnhtcG1ldGE+IDw/ - eHBhY2tldCBlbmQ9InIiPz6B5sF9AAACe0lEQVRIS7WVb2jMcRzHL7UHanF/Mts5prE/1li3kAfu5Ak7 - 5IHNobBkSC2UIuGJkrrSWRvTmHQWK8U1T8jqUtYwkZpaGjV/Js6to5YwfXze39+fu/v23f36hXe9us+f - 7/v9rd/dr3MQ0X/F4Zm3+K9QhWajNNlBFZqN0mQHS6lMdrCUyqSgimllUsy4XmOmp+QRDllQWbygjjq6 - uimZStOX8a+ixox3pXrM1JLCDAqYJmY7c669M0bff07mcLbtEl9QE8k6V6BH5ooXMsHZZX7ae+AY7W45 - SrPm19LbsSR9m/iRA2bYGefggVePzUgKBzeu9sQpmZ4QcG/WMtk7eLjv0WMz0kOz+TX6MUXvP6cFeNbD - bz6YvQFm2Bk9PPByZO6jksLB5KvRTzTyLikIrG2ktsvXzd4g2hGjYP1ms4eHvb850qkl65LCQW/ntVs0 - 9HpMcPx0K1X4V1Ff/3NzhnphbVDsjBk8Lm/VE44s0ZJ1KS4Ie8uXUvPBE7Tn0ElCzTMqrV5BO/cfEaDG - TD5X6PFFONLygsTF7jj1vxihyPkYNTS1iFrFxm37KHIhJmp43L7qZxzp0pJ1SeHhQGgLJQaH6fb9R1QX - 2EB3Ek9FryLe95j8K9eLT/TB0FZcskOP1iRdkIh23aR7Ay9pzaZddKY9Jup8nIpeoXXhZlHD655b85Bj - p2npLOmCML+dD/iTZhaX3+UvbRB1PpzeygFnSUUvatecRUMzisoOc+x0LZ3FixxYhQyK1cxyZhkTYhqY - RgnM6hmcwVl4ljDI0KS4AC+Kmyli8Jv2MF7GNwXY4QzOwgNv5mWTL7CLpVQmO1hKZbKDpVR/1P8OcvwB - lh7gOXXZq9sAAAAASUVORK5CYII= - - - + iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 YQUAAAAZdEVYdFNvZnR3YXJlAEFkb2JlIEltYWdlUmVhZHlxyWU8AAADZmlUWHRYTUw6Y29tLmFkb2Jl @@ -750,26 +750,244 @@ bS94YXAvMS4wL21tLyIgeG1sbnM6c3RSZWY9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlw ZS9SZXNvdXJjZVJlZiMiIHhtbG5zOnhtcD0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wLyIgeG1w TU06T3JpZ2luYWxEb2N1bWVudElEPSJ4bXAuZGlkOjJGQzkyMzc0Rjk0OUU0MTE5NjNCQjRENDMzQjlC - MUM4IiB4bXBNTTpEb2N1bWVudElEPSJ4bXAuZGlkOjJERjY3MEZENEQyMzExRTRCNDlGQUMwMzk0OTAw - Qzc4IiB4bXBNTTpJbnN0YW5jZUlEPSJ4bXAuaWlkOjJERjY3MEZDNEQyMzExRTRCNDlGQUMwMzk0OTAw - Qzc4IiB4bXA6Q3JlYXRvclRvb2w9IkFkb2JlIFBob3Rvc2hvcCBDUzYgKFdpbmRvd3MpIj4gPHhtcE1N - OkRlcml2ZWRGcm9tIHN0UmVmOmluc3RhbmNlSUQ9InhtcC5paWQ6NjhGOUEyRDEyMTRERTQxMUIzNkJE + MUM4IiB4bXBNTTpEb2N1bWVudElEPSJ4bXAuZGlkOjlDMzFEOUI4NEFBRjExRTQ4OTA5OUYwQ0QzM0Q2 + NEI4IiB4bXBNTTpJbnN0YW5jZUlEPSJ4bXAuaWlkOjlDMzFEOUI3NEFBRjExRTQ4OTA5OUYwQ0QzM0Q2 + NEI4IiB4bXA6Q3JlYXRvclRvb2w9IkFkb2JlIFBob3Rvc2hvcCBDUzYgKFdpbmRvd3MpIj4gPHhtcE1N + OkRlcml2ZWRGcm9tIHN0UmVmOmluc3RhbmNlSUQ9InhtcC5paWQ6MDk5Mzk2NTZBRjRBRTQxMTk3NEFD + QUFFQjRCMzVENkUiIHN0UmVmOmRvY3VtZW50SUQ9InhtcC5kaWQ6MkZDOTIzNzRGOTQ5RTQxMTk2M0JC + NEQ0MzNCOUIxQzgiLz4gPC9yZGY6RGVzY3JpcHRpb24+IDwvcmRmOlJERj4gPC94OnhtcG1ldGE+IDw/ + eHBhY2tldCBlbmQ9InIiPz73sIMwAAADIElEQVRIS7WVa0iTYRTH56Uiysvm3TkvpLl5DRIvQYWVWl+6 + iNEVg0yhQqloQZHkLT+Y0YdAs75IpEUhzERZoZhsRpZlS7soblotsRwoxhqWeTrnYZtv+u7NsB74cZ5z + zv89/z17HzYRAPxXeIv/EpFXcOyi4BvKhfehv4FvKBfeh+ayqIUDlIgBgT8whpRYoT2fhgvNVJKBQT9s + hB8/QZDPpnEIjEhg0J5Pw4Vm0mwygG9T06BSqQQhTUhUMoRGpyxYT7OZwfhXC6jVakFIYzNYqN5uMGKa + BI1GIwhpghXJaJJi13d0dEB2bj74hsWzSDlXbzfQG02g0+kEIU2wIomdovzKdVifngnFFytBeb4cLN+n + WaSc6hfKKqB/eHTWoHfwExgMBkFII5MnQUD4WlAWloO26wVs35MDmifPmQFFyqlO/aKKqlmDp31DYDKZ + BCGNTJ4IPqHx8LJvACbNUw7p6e2HuJQMNIhhBuaHj3vBYrEI0tb1BoIiE9kJ9h7Oh7EJM+g/jEJuwVlY + s24ri5RTnfo5BedAIoueIYPumvomuHzjzm9cq2uCq7UNUH2rEarr7kNd0yP26Y+eKoSWtk4wfpmAg7kn + ITY5DUorq1g8cOQEqze3aplOEhRtJoMcL1mMTixV9IgD5a/tSBVDYql8AKOBQLEJtTP08gY/jjFiktKg + 5FIV21Ok3NazvmR2AvrFkCAJyGYk1comZAuHDM/AyLvHThfBveZ26NOPwI59eey7LsbhFCmnOvVJ5+Ef + rrYZLEU8EZ85+HLwW7ZCLMVTFWdkHoLut+/hgbYHaE9XN31XNsupTrWV3jKVs+uS3cyAD0cLe331jW3Q + qRt0CPUlQVHDKI+fN9iGo4W90uNnyuA2vvRtWTlQgxeg/dk7FimnOvU9/CNqUe47b7ANRwt7AfjpKvAK + Gt18Qur35ymhRfsKKLr5hN7EyzDq7humWrrcfSfKxbz/QlwcLDck1snZJdUzYHUDmk57+K1qdXJyzsL6 + RmQD9ZmObygXB8sVIRO6fXQB4hC6eRQppzr1XXmHclnAckFomLc1Um5dItEvhZ97MQXP9N0AAAAASUVO + RK5CYII= + + + + + iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 + YQUAAAAZdEVYdFNvZnR3YXJlAEFkb2JlIEltYWdlUmVhZHlxyWU8AAADZmlUWHRYTUw6Y29tLmFkb2Jl + LnhtcAAAAAAAPD94cGFja2V0IGJlZ2luPSLvu78iIGlkPSJXNU0wTXBDZWhpSHpyZVN6TlRjemtjOWQi + Pz4gPHg6eG1wbWV0YSB4bWxuczp4PSJhZG9iZTpuczptZXRhLyIgeDp4bXB0az0iQWRvYmUgWE1QIENv + cmUgNS4zLWMwMTEgNjYuMTQ1NjYxLCAyMDEyLzAyLzA2LTE0OjU2OjI3ICAgICAgICAiPiA8cmRmOlJE + RiB4bWxuczpyZGY9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkvMDIvMjItcmRmLXN5bnRheC1ucyMiPiA8 + cmRmOkRlc2NyaXB0aW9uIHJkZjphYm91dD0iIiB4bWxuczp4bXBNTT0iaHR0cDovL25zLmFkb2JlLmNv + bS94YXAvMS4wL21tLyIgeG1sbnM6c3RSZWY9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlw + ZS9SZXNvdXJjZVJlZiMiIHhtbG5zOnhtcD0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wLyIgeG1w + TU06T3JpZ2luYWxEb2N1bWVudElEPSJ4bXAuZGlkOjJGQzkyMzc0Rjk0OUU0MTE5NjNCQjRENDMzQjlC + MUM4IiB4bXBNTTpEb2N1bWVudElEPSJ4bXAuZGlkOjhDMTdBQjRENEFBRTExRTQ4QjQyODY0MDNBNTJE + NzNCIiB4bXBNTTpJbnN0YW5jZUlEPSJ4bXAuaWlkOjhDMTdBQjRDNEFBRTExRTQ4QjQyODY0MDNBNTJE + NzNCIiB4bXA6Q3JlYXRvclRvb2w9IkFkb2JlIFBob3Rvc2hvcCBDUzYgKFdpbmRvd3MpIj4gPHhtcE1N + OkRlcml2ZWRGcm9tIHN0UmVmOmluc3RhbmNlSUQ9InhtcC5paWQ6NUQyMjc4QTlBQjRBRTQxMTk3NEFD + QUFFQjRCMzVENkUiIHN0UmVmOmRvY3VtZW50SUQ9InhtcC5kaWQ6MkZDOTIzNzRGOTQ5RTQxMTk2M0JC + NEQ0MzNCOUIxQzgiLz4gPC9yZGY6RGVzY3JpcHRpb24+IDwvcmRmOlJERj4gPC94OnhtcG1ldGE+IDw/ + eHBhY2tldCBlbmQ9InIiPz4eHsDfAAAB00lEQVRIS7XVWytEURQH8HniTTNHLs0NCXNcXjTN5dH9g/gM + 3jx590QhFDJS0gyTGmpqaqJIMW4hzlAoOaWISS7LWifntI3ddnTGrl92e/57/We/DBsA/CvuYSHZSr0t + lvCGsriX/oI3lMW9lM/SwgF9SEHwizs08IX2vAyLZvZRgXJ+cQWv7yB0q96Ds86voT0vw6KZNJsK4Pnl + DWKxmBBlqhpDUN0UNp2n2VrB/WMOEomEEGX0ArN5o+BGfYB0Oi1EGa8cwpKw6bxRcH6lQiaTEaKMVw5q + rzCbNwr2z65BURQhynh8Qe0VZvNGwdZBFlRVFaKMxxfQXmE2rxc8rW3sQy6XE0puHoG7IaC9YnV9j5th + pbZPqOCDCrbH5uIwOD7/zWgkDkNTizAyuwQjkWWIxFNQWduqmVxI/MiPz6/A8HTUuDMTTYLkbrqhgt5S + T3PG4ZJ3HE7focElZx0u3yn+VQiG1ZLymmm7s74f88f42S6bl9zyJZ6d6Xckd+Mt5ieogH4xJORHHajt + SzvqZPSgECpHZSiA2DztuxBlad+NgnpBEbIjusiiYboKRF+kGFHegUR5ImkFv7G0eAPzWVq8gfksLd5/ + oULiHhYS97BwwPYJlSCUgVubViQAAAAASUVORK5CYII= + + + + + iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 + YQUAAAAZdEVYdFNvZnR3YXJlAEFkb2JlIEltYWdlUmVhZHlxyWU8AAADZmlUWHRYTUw6Y29tLmFkb2Jl + LnhtcAAAAAAAPD94cGFja2V0IGJlZ2luPSLvu78iIGlkPSJXNU0wTXBDZWhpSHpyZVN6TlRjemtjOWQi + Pz4gPHg6eG1wbWV0YSB4bWxuczp4PSJhZG9iZTpuczptZXRhLyIgeDp4bXB0az0iQWRvYmUgWE1QIENv + cmUgNS4zLWMwMTEgNjYuMTQ1NjYxLCAyMDEyLzAyLzA2LTE0OjU2OjI3ICAgICAgICAiPiA8cmRmOlJE + RiB4bWxuczpyZGY9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkvMDIvMjItcmRmLXN5bnRheC1ucyMiPiA8 + cmRmOkRlc2NyaXB0aW9uIHJkZjphYm91dD0iIiB4bWxuczp4bXBNTT0iaHR0cDovL25zLmFkb2JlLmNv + bS94YXAvMS4wL21tLyIgeG1sbnM6c3RSZWY9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlw + ZS9SZXNvdXJjZVJlZiMiIHhtbG5zOnhtcD0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wLyIgeG1w + TU06T3JpZ2luYWxEb2N1bWVudElEPSJ4bXAuZGlkOjJGQzkyMzc0Rjk0OUU0MTE5NjNCQjRENDMzQjlC + MUM4IiB4bXBNTTpEb2N1bWVudElEPSJ4bXAuZGlkOjJEMDQyOEZBNEFEMjExRTRBN0MxRDBCNzJGRUND + MDEzIiB4bXBNTTpJbnN0YW5jZUlEPSJ4bXAuaWlkOjJEMDQyOEY5NEFEMjExRTRBN0MxRDBCNzJGRUND + MDEzIiB4bXA6Q3JlYXRvclRvb2w9IkFkb2JlIFBob3Rvc2hvcCBDUzYgKFdpbmRvd3MpIj4gPHhtcE1N + OkRlcml2ZWRGcm9tIHN0UmVmOmluc3RhbmNlSUQ9InhtcC5paWQ6QkRDRkI1RDVEMTRBRTQxMTk3NEFD + QUFFQjRCMzVENkUiIHN0UmVmOmRvY3VtZW50SUQ9InhtcC5kaWQ6MkZDOTIzNzRGOTQ5RTQxMTk2M0JC + NEQ0MzNCOUIxQzgiLz4gPC9yZGY6RGVzY3JpcHRpb24+IDwvcmRmOlJERj4gPC94OnhtcG1ldGE+IDw/ + eHBhY2tldCBlbmQ9InIiPz59jfe3AAAEbUlEQVRIS8WTeUybZRzHF48/pnFOuQRajkFLgQFb5iRLNJr4 + l/EPgsniUI4xZDAY1zyxwApsMJyIME61rByl3DfoYGBrgbWUY06FcZSCha4rQ8jYxkqPr2/fvkv8o2Sg + S/wkT970eb6/T5/39z7Prv8dt/Oql4mR4HZJ3ccoXFxhVCzB9DT9JueJdSq6c1wzVZFupepVzxu34XVj + CaEDi1jX6hF8ZQoeokl4iBVwzV9YdU1XRlIl28eVo8phCdXwGltEeOUsro6psaHVwcSDh5volc4iOO8X + 7KuVwb1hEi7J8myq9PEQO//I85oafr0KtEpUpNSETm+AwWDAvfv3YTQaybnm/t/AyO6Ga+UonJOnIijF + 1hA9tWI2qle9RxcI+RIpmZpTIfBULhIyyqHVahHPKcN70TmYnFFCp9OhqXcc9KwW0DOHVl3YU1aUyjJu + F1SpfhO3EM6bMMsVt+D8Zhz2HIpC4oU6bG5uIu4cD3tfTwAjIBNypQYbGxsISquBU34PaDHiVEplGXee + SuIjVaBv3Lz7gJg8vHg4FlZvc+ATVoLipiHsD8qCXWAO7IPK8MG5FjLXKboOeoYADkldUkplGWb7vOb4 + 4BzxIXXQE/1m59WDXdgBvxPfwz6UC4eQUth/WIBDZ2qQXj+K7IYRImeE5s5fOFrcDPvPapcJzVNmmwVY + VxWG9U09uau1tTVymPpc0iYFLew7OEUJ4BwtALfvJpl5xMrKCu6s3cUrn5YbCM1us80CrJZZVWjXr7j3 + 4CE0y8v4IrcaH+cK4Bv+DRyPl8ApphYuia3wZ3eCUzOA1PIfcVuzjHnlIgK/vgy7mHzTG+w12yzA5E53 + edYPo1c2i/X1dQTEfwvbwDQ4hhXg8OcN4P48Df+UTrgkNIAeW4Hg3Hbo9Xq0iGSgs4ls5CUhoXnObLOA + S8pkhG/bdZzgDZJnffT3GXieLAA9XgB2/RjZjuQqMWhxfBw824H55XWyhcfy+HDNqoB1SH4Codn6G7iw + p3d78EaVPlXX0CaZgkqlgly1gpCiK0htHCH/IL6oFcEF3ZjT3CUvXqv0DzDSS0FPq1a/8EbYS5Rqa+if + SAJ8KoeNR7gitEsnoVQqSbGOkJmYX1ggxaY70SabwIGMUrjn8I3WIXnBRPnWu/8nDnE9Sd7cAaP/ZSES + 6/rRKJRArpiHXC7HzekZNIukiCyrhW9mGZgXa4w2kUVnibJnzdXbxP5URzyDO4QjxGl5i9uNpMZeKP5U + IrywAq9yCnGAOGGMonbYxpVnEPGdyR9BO/MTj8kfgXeNFPt5IngVtoF1kQ9WcTs8qgfgmNreQMS21xZL + 0E6Ln6ef75tg8sfgXT8O77oReAkkYNXJ4PRV/4ztyfo9VPTf4xjdf9CpQKzdxxuGe6UMbhXEmc8V6mze + r3qNivx3HGN7UmglQ6CVDMIxXwybo5UcaunJQD8te9rhyx4JrWwItlGNUut3y5+hlp4cDhFCpl14k9jq + nR+Y1NTjIe7NlmMnWKoHsOtvjWYcKpheqFQAAAAASUVORK5CYII= + + + + + iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 + YQUAAAAZdEVYdFNvZnR3YXJlAEFkb2JlIEltYWdlUmVhZHlxyWU8AAADZmlUWHRYTUw6Y29tLmFkb2Jl + LnhtcAAAAAAAPD94cGFja2V0IGJlZ2luPSLvu78iIGlkPSJXNU0wTXBDZWhpSHpyZVN6TlRjemtjOWQi + Pz4gPHg6eG1wbWV0YSB4bWxuczp4PSJhZG9iZTpuczptZXRhLyIgeDp4bXB0az0iQWRvYmUgWE1QIENv + cmUgNS4zLWMwMTEgNjYuMTQ1NjYxLCAyMDEyLzAyLzA2LTE0OjU2OjI3ICAgICAgICAiPiA8cmRmOlJE + RiB4bWxuczpyZGY9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkvMDIvMjItcmRmLXN5bnRheC1ucyMiPiA8 + cmRmOkRlc2NyaXB0aW9uIHJkZjphYm91dD0iIiB4bWxuczp4bXBNTT0iaHR0cDovL25zLmFkb2JlLmNv + bS94YXAvMS4wL21tLyIgeG1sbnM6c3RSZWY9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlw + ZS9SZXNvdXJjZVJlZiMiIHhtbG5zOnhtcD0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wLyIgeG1w + TU06T3JpZ2luYWxEb2N1bWVudElEPSJ4bXAuZGlkOjJGQzkyMzc0Rjk0OUU0MTE5NjNCQjRENDMzQjlC + MUM4IiB4bXBNTTpEb2N1bWVudElEPSJ4bXAuZGlkOjJERTg4QTFENEQyMjExRTRBODEyODk0M0RBMTc5 + Qjg3IiB4bXBNTTpJbnN0YW5jZUlEPSJ4bXAuaWlkOjJERTg4QTFDNEQyMjExRTRBODEyODk0M0RBMTc5 + Qjg3IiB4bXA6Q3JlYXRvclRvb2w9IkFkb2JlIFBob3Rvc2hvcCBDUzYgKFdpbmRvd3MpIj4gPHhtcE1N + OkRlcml2ZWRGcm9tIHN0UmVmOmluc3RhbmNlSUQ9InhtcC5paWQ6NjJGOUEyRDEyMTRERTQxMUIzNkJE NUVDQjU5MzE1NjIiIHN0UmVmOmRvY3VtZW50SUQ9InhtcC5kaWQ6MkZDOTIzNzRGOTQ5RTQxMTk2M0JC NEQ0MzNCOUIxQzgiLz4gPC9yZGY6RGVzY3JpcHRpb24+IDwvcmRmOlJERj4gPC94OnhtcG1ldGE+IDw/ - eHBhY2tldCBlbmQ9InIiPz6GKmpFAAAC+UlEQVRIS63T20vTYRzH8Yforj/Ei24UiSgKIygKi8oyxZQo - cvNYeXaesmzqPGu2POd0ulSsnIdaurTSTJ3O6UxTPGya5vCQx5AuPn39RbHop7nZxQt+z3ie93e/Z4w1 - p7nsCoBt8R6yBF/UHPv+Wb0rfFFzm99CRIwEW1gnqXzxTXxRc0ydctm4OlID2sxrw6iCtiwItC+A2P/D - frLnjwGNSZdMq6N1WOvLwFpP4l/WdRlY6Jaio9Ab7QXba8sVoDHZGdT8PYS9THDqMGnLsKpNw0qXGCua - BO55VZdNQ6U/DRRibVCGb+N1pH5bukoRqHmDHOIG1N8/X2F4I8WyNhtf2+9hqSsZxqZ4upbb6HsSZLHO - Im90ym6hNVcIaktYTexZyUelGEvaHMy/jcFiZxo0xX5Y7ivGcn8JkVmA9uvlWBmqwpJeAWovs+poR99O - eRgWtQWYVUdgrj0FH+i+F3XF3NoappZYGJrEoLaOVYpOOTY/FGJB+xjTqnDMtMTTAC/Ma/Ix/TLUKl9e - x0JfFQpql7PykBP7lWIXzPeUYLIhHCPKCLr/AMy2ZsKoDLTKdNNdvM8TgNpRTBZwfJ885CTmaIChPhwa - mS+GnkdhqjEWY9X+VplqvIMXEhdQ24mZeuSs0N/BNNWWj4k6EdSZHhhXxWH0aSCGFd4c4Tk7zk7XBlUM - FKLToK4Nm+0qYnneRzqGGiSYaIiiyZdhVCdgqFSIwRJPjucZW85O1pvnRmvDkO9zFNTdy2Y6HjGp4HCF - 5kk4xhoiURd/EROv4tBfeM0qAyUC9Mp9QM0+7o829T6LZV0/mNycS6+nFKFWfAGj9ZHozfGwil7miZYH - 7qCmghsw+S6VpV894KuUuKFbfhNNqa749CwY3dm0toK+VABl3HlQM5obYHybwFLc7W1y/Y5BlX6FfgNn - DNcEY0DhZZX+MiGKbh0DNR24AYYWMSfJzc6GZBApwS5skIzNODcg0dV2V36FtsJ7yBJ8UXO8hyzBFzXH - ++H/A/YDv9/V87iOlrYAAAAASUVORK5CYII= + eHBhY2tldCBlbmQ9InIiPz6wJF34AAACl0lEQVRIS62Vy08TURSH73/QhQtXVnBhxEcMiUkhbEg0hB1R + Q1i68C8wIW5cEqMLN7ho2Ji4YiEhWq0prYUhfULbadN3obTaChobtZEUsFY9nnPS6WM6HYowyZf87j33 + nG/amaai9geOBYA+4pTxihmBE8DcTQB4J8em/9IwSQyagmrtL+z9rMFmvnhkKvtV7tcVHPz6DVsftulA + AckdhUg8zf19eoLKAd597iMLMItewfOxUDTN/bqCH3tVSG8VWIBZ9AoJApEk9+sKvu/uQ2IjzwJkGtH8 + OrTwy3Hu77vIAnV9mgWlcgWiqRwLjAMmkOMbPbNTKnN/JJntqJGEBZ++7oKcyLLgLN4JrU8Cms2C4pcy + BKKZumCI18temQ/8DzSLZlBmQX7nG/jCKdpgAa0driCtY5iFHuqHSjNoFtaags1iCdzBBG+QgNY2aZ0F + mIUe6osENAtrTUEq/7kDq9PHAszU5yYoq9f1i9cUSCD5ozxDEeTsrhAoONwyxLLb8MrhYQFmZYCHsnpd + v3hNgQROb5hnKIK29944MAThTBEWbS4WYBZ6qC/sKSy5ZJ6BGUQg8b4Bbhjod4AZXlhXWdBa10LrIVul + AM9ggS+aa6AIMMO8ZYUO0KeyIOMtZyaQpXpNi4LFucYzMINwhbMNcMNw5oIJMMNKIA0LNg88mZuH/ssj + dPgBMnN+cBRmny1wrRtSMMMzWCCFMg0UAeY2Fh0+GL5xG8Zu3oHXUrCj3g0WONdTbeBm21/o1N17gPtg + 98Xh3VoS3qzKMDI22agfglnY/Uld8NDc/ZlZwAwvl4Ngun6LGh8rdfVDViNs3rguOOzq6XOD8PDpc7g2 + OkHDH7XWtYa2It66Y4eCQ8cRfpvUNa2hTUD8A6JMaBvCyTdJAAAAAElFTkSuQmCC + + + + + iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 + YQUAAAAZdEVYdFNvZnR3YXJlAEFkb2JlIEltYWdlUmVhZHlxyWU8AAADZmlUWHRYTUw6Y29tLmFkb2Jl + LnhtcAAAAAAAPD94cGFja2V0IGJlZ2luPSLvu78iIGlkPSJXNU0wTXBDZWhpSHpyZVN6TlRjemtjOWQi + Pz4gPHg6eG1wbWV0YSB4bWxuczp4PSJhZG9iZTpuczptZXRhLyIgeDp4bXB0az0iQWRvYmUgWE1QIENv + cmUgNS4zLWMwMTEgNjYuMTQ1NjYxLCAyMDEyLzAyLzA2LTE0OjU2OjI3ICAgICAgICAiPiA8cmRmOlJE + RiB4bWxuczpyZGY9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkvMDIvMjItcmRmLXN5bnRheC1ucyMiPiA8 + cmRmOkRlc2NyaXB0aW9uIHJkZjphYm91dD0iIiB4bWxuczp4bXBNTT0iaHR0cDovL25zLmFkb2JlLmNv + bS94YXAvMS4wL21tLyIgeG1sbnM6c3RSZWY9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlw + ZS9SZXNvdXJjZVJlZiMiIHhtbG5zOnhtcD0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wLyIgeG1w + TU06T3JpZ2luYWxEb2N1bWVudElEPSJ4bXAuZGlkOjJGQzkyMzc0Rjk0OUU0MTE5NjNCQjRENDMzQjlC + MUM4IiB4bXBNTTpEb2N1bWVudElEPSJ4bXAuZGlkOkUzNzJDMjE3NEFENjExRTRCNjE0OEVEQzI4MEM0 + RTZDIiB4bXBNTTpJbnN0YW5jZUlEPSJ4bXAuaWlkOkUzNzJDMjE2NEFENjExRTRCNjE0OEVEQzI4MEM0 + RTZDIiB4bXA6Q3JlYXRvclRvb2w9IkFkb2JlIFBob3Rvc2hvcCBDUzYgKFdpbmRvd3MpIj4gPHhtcE1N + OkRlcml2ZWRGcm9tIHN0UmVmOmluc3RhbmNlSUQ9InhtcC5paWQ6RkI3NUQ0QkNENDRBRTQxMTk3NEFD + QUFFQjRCMzVENkUiIHN0UmVmOmRvY3VtZW50SUQ9InhtcC5kaWQ6MkZDOTIzNzRGOTQ5RTQxMTk2M0JC + NEQ0MzNCOUIxQzgiLz4gPC9yZGY6RGVzY3JpcHRpb24+IDwvcmRmOlJERj4gPC94OnhtcG1ldGE+IDw/ + eHBhY2tldCBlbmQ9InIiPz6PyaLfAAADMElEQVRIS6VUXUiTYRT+vi3Tzd+ps23+3KRigtiPkolEQReG + UYTkhWatpWlWGkRdddfdSPImqUAJjSIT00oxLJIk0cR+tFSyzDJtgaMkDEPkdM7ZPvm2vS6jBx6es3Pe + 8zzvtm+TohLS/ov+AACStLgEQuJyLRJWYK1yzh/+FgCoQrpnfM4fOGBhcUlIMkEVkma4H4i1y2kFcMD8 + wqKQZILKZqTqmlTAWrfvMjhgbv63Dwm0hLWQohn1eNEbzrlfPiTQAtZCKjP1GXdAIC+r4XD+9CGBFrDm + RVJ1re6pZ0GyHHMvIawauYVNCFPfvvuQQAtYC6meKXU0amNsaGN/ZR60xIf9aIgN3cpGE9OzZCZ85nEm + pGiWlLABmuJCnUOXrNB7chdct4TUo32ANDbp4NuielDpqWfePdaPX6GrohSK4uLhlCEo96YlZLbOFHzH + oJXjMSBcGn4/zQGovEDqXXtzeTb+BTrKj0J3+Q54djYP7EZdTU2MPjFSK8eieQR9QtLg6GcOQPWgqKeQ + ZyOfoK30CDw+lg2Ot3Z4VLoNqo269mCNHIa2WjYn9A1PcAAqU6m9VV3TF9psOwwPS3JgZugCdNoyocwU + jU+RlImWBpezGz0vxzkA1YOiHvPFO7Ca1kGHLQtmXp2HdutmqN+/F6JiU+h3kOpyVeHJwBgHoLIpqajm + 189HoaG4CNqsGTA1UAWth9Lg6r490PygGyLjUikgzuWqQlffCAegelDdUwLqigqhpXgjTPYeh+bCFCg2 + RkEk3vxuVz/P0c43oLP3DQegLhspNalSFxiNcLswHT48LYNbBUlQk7ebzenmyhm08w1o7xmiAP6hRZiT + 70eYkzpctUuJWdHmwWs74+F1Uz7cyE+E4ohQB5mHm9a3GywpTXzektyKduIAIsKI3ISkL4rIdYle05C9 + VrZVBmvtl7eboUyv7V4jSQdwRn8FdI72iErtCUxnIuifkJ5hUqUOq9Jr7OeCNU6bTpNVqtMcDJSldOwn + KnOk+jypJ5QANRWc0cs5SEelXr54QidfwVYAMoiHq4W/gNM6OaNCJ+diaUIqN/43+Atwg27t+9ZXBUn6 + A2MdqQeVc5pWAAAAAElFTkSuQmCC + + + + + iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAIAAABvFaqvAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 + YQUAAAAZdEVYdFNvZnR3YXJlAEFkb2JlIEltYWdlUmVhZHlxyWU8AAADZmlUWHRYTUw6Y29tLmFkb2Jl + LnhtcAAAAAAAPD94cGFja2V0IGJlZ2luPSLvu78iIGlkPSJXNU0wTXBDZWhpSHpyZVN6TlRjemtjOWQi + Pz4gPHg6eG1wbWV0YSB4bWxuczp4PSJhZG9iZTpuczptZXRhLyIgeDp4bXB0az0iQWRvYmUgWE1QIENv + cmUgNS4zLWMwMTEgNjYuMTQ1NjYxLCAyMDEyLzAyLzA2LTE0OjU2OjI3ICAgICAgICAiPiA8cmRmOlJE + RiB4bWxuczpyZGY9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkvMDIvMjItcmRmLXN5bnRheC1ucyMiPiA8 + cmRmOkRlc2NyaXB0aW9uIHJkZjphYm91dD0iIiB4bWxuczp4bXBNTT0iaHR0cDovL25zLmFkb2JlLmNv + bS94YXAvMS4wL21tLyIgeG1sbnM6c3RSZWY9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlw + ZS9SZXNvdXJjZVJlZiMiIHhtbG5zOnhtcD0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wLyIgeG1w + TU06T3JpZ2luYWxEb2N1bWVudElEPSJ4bXAuZGlkOjJGQzkyMzc0Rjk0OUU0MTE5NjNCQjRENDMzQjlC + MUM4IiB4bXBNTTpEb2N1bWVudElEPSJ4bXAuZGlkOjUzQzNGNDI5NEQyQzExRTQ4QkE1QUNCMEVDRDZF + MDVEIiB4bXBNTTpJbnN0YW5jZUlEPSJ4bXAuaWlkOjUzQzNGNDI4NEQyQzExRTQ4QkE1QUNCMEVDRDZF + MDVEIiB4bXA6Q3JlYXRvclRvb2w9IkFkb2JlIFBob3Rvc2hvcCBDUzYgKFdpbmRvd3MpIj4gPHhtcE1N + OkRlcml2ZWRGcm9tIHN0UmVmOmluc3RhbmNlSUQ9InhtcC5paWQ6RkI1NUY4OTYyQTRERTQxMUIzNkJE + NUVDQjU5MzE1NjIiIHN0UmVmOmRvY3VtZW50SUQ9InhtcC5kaWQ6MkZDOTIzNzRGOTQ5RTQxMTk2M0JC + NEQ0MzNCOUIxQzgiLz4gPC9yZGY6RGVzY3JpcHRpb24+IDwvcmRmOlJERj4gPC94OnhtcG1ldGE+IDw/ + eHBhY2tldCBlbmQ9InIiPz6IsaOmAAADF0lEQVQ4T62U/UuTURTH+0nICqRI1ERMMyNQe8N0ChqBwQhN + yvwhEgJjVCqJ/qCibZo6tzQ339h6Nre5prapUzc1XzItX1ilzuWMLLVAen+xf6DTuTxjdxsFVj58ebjc + c+7nnud7z3228DbpIaDFH/CfoqCn72DIDvNfPDM2KAqyr8PcJxqY+QBTb8kkjocXQTsKigGwfqYJHqIg + 1OxHGHvlWPx4hXB1YyA3g4CBhqst+piEnrDA3rA95vBAY1x8d7lq/DVZwm5PQZNvoKYdypSgHgbVEIh1 + cLOZzOCbSSsyRQRba6uWtcpVLbPcwlglInNUCJNWWKqABqMLCGvGlfpJELaQ/V1Vd1lujAhe0chtUrH5 + ZExnmJ85MdomEa+qZMbIEF2BHGunILSjdZwYgTt4gJqjjj0Rltml1Zq9AeL0Mn71Wn2mtDU80MIvsFTw + O+KPIoWC8BNYRIUaqrRQroJKjQOk9N+xLBF2pXJFKfnsDGYa8gS6xOO2whyMuoHaHpGzZ/pBM0IMrtXD + nT4HqNHXe0lYoogMFeQP4jbSDkCPTUyXmnNoPutSo+9WN5DEQDyeWCWnhqm4p7Oimt3b54rzmmKPVHKz + 0Xg0AU1pz87VJp+yXOfd9t3mBmLXsGrsJhSsDtF4iOWxKdpzyQNnuRW7vEUp13obFG05OVUBPtO5V1Sn + k5q4SX8ENfWA6C7xHsP981Bb2sf38ZKd4JhSuXUJHPHhg/WJnAeZFw0Xzt/w8erRtLmBnB/CSmaC599I + 2PYVRl+CXigu3R9SfCC0Pf1MZ1oqvqvjogX7gtRFJfb1n24g7GblfQcFP2fkBYm5anxqQcbLKgzyK/Df + WRTkV5+RMTg84ZrgAOHo4ZIDVNdJw67CpsVLZ5gifj97Typlq2ZFQXj8LKh5EHpnaIar8N+Al5l9Y9Vs + T7OiIAzjqaMsa6QJnBkeWvgOHdPkAuIV67PSeQpCYYZplsZ+KyyWLRyFF8D553EDbURY770J0rrYJbda + SYE4iWb9NcgpRKDrOMAWwYP6d5BTaC52zyaAWDlAm/DweL8AX9zXukfxHsIAAAAASUVORK5CYII= + + + + + iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 + YQUAAAAZdEVYdFNvZnR3YXJlAEFkb2JlIEltYWdlUmVhZHlxyWU8AAADZmlUWHRYTUw6Y29tLmFkb2Jl + LnhtcAAAAAAAPD94cGFja2V0IGJlZ2luPSLvu78iIGlkPSJXNU0wTXBDZWhpSHpyZVN6TlRjemtjOWQi + Pz4gPHg6eG1wbWV0YSB4bWxuczp4PSJhZG9iZTpuczptZXRhLyIgeDp4bXB0az0iQWRvYmUgWE1QIENv + cmUgNS4zLWMwMTEgNjYuMTQ1NjYxLCAyMDEyLzAyLzA2LTE0OjU2OjI3ICAgICAgICAiPiA8cmRmOlJE + RiB4bWxuczpyZGY9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkvMDIvMjItcmRmLXN5bnRheC1ucyMiPiA8 + cmRmOkRlc2NyaXB0aW9uIHJkZjphYm91dD0iIiB4bWxuczp4bXBNTT0iaHR0cDovL25zLmFkb2JlLmNv + bS94YXAvMS4wL21tLyIgeG1sbnM6c3RSZWY9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlw + ZS9SZXNvdXJjZVJlZiMiIHhtbG5zOnhtcD0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wLyIgeG1w + TU06T3JpZ2luYWxEb2N1bWVudElEPSJ4bXAuZGlkOjJGQzkyMzc0Rjk0OUU0MTE5NjNCQjRENDMzQjlC + MUM4IiB4bXBNTTpEb2N1bWVudElEPSJ4bXAuZGlkOkVENUYwQThBNEQyOTExRTQ5QzUzQzdFMkFGQkQy + NTA1IiB4bXBNTTpJbnN0YW5jZUlEPSJ4bXAuaWlkOkVENUYwQTg5NEQyOTExRTQ5QzUzQzdFMkFGQkQy + NTA1IiB4bXA6Q3JlYXRvclRvb2w9IkFkb2JlIFBob3Rvc2hvcCBDUzYgKFdpbmRvd3MpIj4gPHhtcE1N + OkRlcml2ZWRGcm9tIHN0UmVmOmluc3RhbmNlSUQ9InhtcC5paWQ6MkRGNkEzOUYyOTRERTQxMUIzNkJE + NUVDQjU5MzE1NjIiIHN0UmVmOmRvY3VtZW50SUQ9InhtcC5kaWQ6MkZDOTIzNzRGOTQ5RTQxMTk2M0JC + NEQ0MzNCOUIxQzgiLz4gPC9yZGY6RGVzY3JpcHRpb24+IDwvcmRmOlJERj4gPC94OnhtcG1ldGE+IDw/ + eHBhY2tldCBlbmQ9InIiPz6npMy1AAAGEUlEQVRIS7WVeVDUZRjHf7Ase8ECu+wl4LIXcqyyHC783AWW + 5QaRFTHkMi9SQvE+UhLzwk0BUcQSgQBBgcYDzStMSzOPcpqcmo5pmqk/+rOapqb+iG/PbzfFcSz/6pn5 + zPN739/7fp/nvZn/3TSLjj+XJy2/RaItPCT5vaBd8m1+q2Qku1lcrcvki+iXr7fFU6ZZeOx5KDU1b7jU + 1Z2bVPMPWNMbRXrXkWAc+ywVLbcS8fKwFjlu8VdpW0XzSc6f8PEIPzJ19dFnU3WEJdHL9P3X9O1nkdB8 + CQrX7i3mKn9zfqsUq29ZsPfjRBx5aMO2cTMy94gm7FuF7XyJTwDJTo5GVdHxNALVgsPd5Ceye+9g8b0f + UXbjB8RtH4Msd+MeXS7f6twjxbILZiy7pEHDtTBsvG7BqivTUXpsClLWCbtJNpDwBlGVH3ySIFV520eW + nedRcf0HVJGwbeRrOHs/h2n1CGRZDe7wND/W1hiI8sEYlJ4KRcVpJcrfVqByNBILhqLh3KeA+UXBOpL2 + jkRZduARPGXZ/vH4pnMou/gd7INfIPn4QyQc/RSOzk9hrBtEiKPerUn1Y5PXBaDojWlwdgUjr0+G/H4Z + cnpCUNJrQNZ+LeLrBD/LYnixFEDAKFz7vJQ0r49dO4zikS8x8/ADxLd9jIT2B5ix/z7SX78Pw+K3EJy2 + wq1M4rEz6sRwthgw82Ag2KNS2I5JPZ4rZx00ImGNHIZSfisFkDGhxbs5AkKLd/3kaLkDlgTjXrsNc/Md + mPfeQeyOD2HbcRu6yi4E2Wrd8ngeG71IBPtePWa4JUhsD0DykQAkHQqApUWCFLcGyZvDoZ/P/5oCTGXk + hU2MvGB7rbGmG47dd2Fa+x6iX/kAMa/eQvS2m4jaeAPspvcROb8TQexid3CcL2usFCJjnwE5nQYU9RhR + PGDC7D4TCrqMyDqkR9oePbRz/SZEKh8rI8vdyshyXhmzLD8DS/1VGOquwtgw7glkXH0Nhvp3kbL2GrSl + hyC11ril03xZfbkQKZuVsDeq4NihRtYuDbJ2auBoUsO2TQXrJiWMlWIExflWMiHOjRzfJy0bg776HCKX + vANd7WXol1/xeN3Si7A2XIXW1YbAxAq3UO0zPTSd1yG38bplLK//vxBrffKY4PQ1HH9aKk8jonQUUyvO + Qlt9HtqaCx4/tXIMyXWXMXXOAQTEv+D2zCvDhBBTCN1zCGOCZq3k+DXO1YcpRYOY4hpF2LzTCCs74/VE + 3IvnEVd1EhGFblBbWot6BKXWQZq64tlYa2+TuJwQM9KU5cRL35hyOxCe2w913hA0hcPQFI16KRzxEFtO + a1Q9htSVN5C+5S5x7x/uIm3DR7CvuomUReOImt1FU7nwEolHECImMGkJE5i46EJkejNM+X1QOPqhzBqC + KvskVDmnJuHKT/K4bgjKzBMItXcjJv84NOwWiKPndJK40TOCgPgaRmIur1dZ1yM6txvyWT0ITR+AImOQ + gg39N1ybDBJP60PorC5My3oTwQm18FdNryBxbq0EJL6AEUTYZBTkF0NGKyKdvZDb3qJOAxSIOqcP/jtp + JyC3D1BSvYgp6EN4aiNlP/cTEk4gFASPEUeXkWd8RaY5jcrEBkTn9UCT4Q3gzfBfRvJE9rrsfpicHSRe + NsFXmJeSXhTBXXY+jMjk8uArVkpExuKb6pkbYJ7L7Ria37xTUBeMeCkcncRTN0z/TyLKNYy4khNQJq2G + IMLBXdUWQkXwCYYR6md7IPP1k8WEC3UFDzSpG2BZeAZJtXQWFpyls3HOC50JzkdQnbFqDInLLiC2rBcq + 6xoSzzzP+NDVwDBaQkx4XzahNv8xZH48sVotCHeOUnnCWNJG18Q4UjddB7vlfbBbPwC7+YannLTyIrS5 + OyHU5v3hr07poL7JBHe4Jh8bzgQROY8h46IKCAVfbi73D3PcpfoJlX0VtEVN0JXsQlj2ZoRaaynj7N/8 + NfZLPLFmHrXnpiWSCCL8iMl32T/M6YGMq+R+covD7QADwfoIgqt4QVGtfvIZJ4lRv5CY4zypbjfjy+eE + M4l4gtuSwYSQ4DS4EZAew/wNiCYQJlvQU3cAAAAASUVORK5CYII= @@ -1054,142 +1272,6 @@ R2K5fxKLWbbp/7Dc0CBY8Q+pPmOq0VkzzQAAAABJRU5ErkJggg== - - - iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAZdEVYdFNvZnR3YXJlAEFkb2JlIEltYWdlUmVhZHlxyWU8AAADZmlUWHRYTUw6Y29tLmFkb2Jl - LnhtcAAAAAAAPD94cGFja2V0IGJlZ2luPSLvu78iIGlkPSJXNU0wTXBDZWhpSHpyZVN6TlRjemtjOWQi - Pz4gPHg6eG1wbWV0YSB4bWxuczp4PSJhZG9iZTpuczptZXRhLyIgeDp4bXB0az0iQWRvYmUgWE1QIENv - cmUgNS4zLWMwMTEgNjYuMTQ1NjYxLCAyMDEyLzAyLzA2LTE0OjU2OjI3ICAgICAgICAiPiA8cmRmOlJE - RiB4bWxuczpyZGY9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkvMDIvMjItcmRmLXN5bnRheC1ucyMiPiA8 - cmRmOkRlc2NyaXB0aW9uIHJkZjphYm91dD0iIiB4bWxuczp4bXBNTT0iaHR0cDovL25zLmFkb2JlLmNv - bS94YXAvMS4wL21tLyIgeG1sbnM6c3RSZWY9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlw - ZS9SZXNvdXJjZVJlZiMiIHhtbG5zOnhtcD0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wLyIgeG1w - TU06T3JpZ2luYWxEb2N1bWVudElEPSJ4bXAuZGlkOjJGQzkyMzc0Rjk0OUU0MTE5NjNCQjRENDMzQjlC - MUM4IiB4bXBNTTpEb2N1bWVudElEPSJ4bXAuZGlkOjlDMzFEOUI4NEFBRjExRTQ4OTA5OUYwQ0QzM0Q2 - NEI4IiB4bXBNTTpJbnN0YW5jZUlEPSJ4bXAuaWlkOjlDMzFEOUI3NEFBRjExRTQ4OTA5OUYwQ0QzM0Q2 - NEI4IiB4bXA6Q3JlYXRvclRvb2w9IkFkb2JlIFBob3Rvc2hvcCBDUzYgKFdpbmRvd3MpIj4gPHhtcE1N - OkRlcml2ZWRGcm9tIHN0UmVmOmluc3RhbmNlSUQ9InhtcC5paWQ6MDk5Mzk2NTZBRjRBRTQxMTk3NEFD - QUFFQjRCMzVENkUiIHN0UmVmOmRvY3VtZW50SUQ9InhtcC5kaWQ6MkZDOTIzNzRGOTQ5RTQxMTk2M0JC - NEQ0MzNCOUIxQzgiLz4gPC9yZGY6RGVzY3JpcHRpb24+IDwvcmRmOlJERj4gPC94OnhtcG1ldGE+IDw/ - eHBhY2tldCBlbmQ9InIiPz73sIMwAAADIElEQVRIS7WVa0iTYRTH56Uiysvm3TkvpLl5DRIvQYWVWl+6 - iNEVg0yhQqloQZHkLT+Y0YdAs75IpEUhzERZoZhsRpZlS7soblotsRwoxhqWeTrnYZtv+u7NsB74cZ5z - zv89/z17HzYRAPxXeIv/EpFXcOyi4BvKhfehv4FvKBfeh+ayqIUDlIgBgT8whpRYoT2fhgvNVJKBQT9s - hB8/QZDPpnEIjEhg0J5Pw4Vm0mwygG9T06BSqQQhTUhUMoRGpyxYT7OZwfhXC6jVakFIYzNYqN5uMGKa - BI1GIwhpghXJaJJi13d0dEB2bj74hsWzSDlXbzfQG02g0+kEIU2wIomdovzKdVifngnFFytBeb4cLN+n - WaSc6hfKKqB/eHTWoHfwExgMBkFII5MnQUD4WlAWloO26wVs35MDmifPmQFFyqlO/aKKqlmDp31DYDKZ - BCGNTJ4IPqHx8LJvACbNUw7p6e2HuJQMNIhhBuaHj3vBYrEI0tb1BoIiE9kJ9h7Oh7EJM+g/jEJuwVlY - s24ri5RTnfo5BedAIoueIYPumvomuHzjzm9cq2uCq7UNUH2rEarr7kNd0yP26Y+eKoSWtk4wfpmAg7kn - ITY5DUorq1g8cOQEqze3aplOEhRtJoMcL1mMTixV9IgD5a/tSBVDYql8AKOBQLEJtTP08gY/jjFiktKg - 5FIV21Ok3NazvmR2AvrFkCAJyGYk1comZAuHDM/AyLvHThfBveZ26NOPwI59eey7LsbhFCmnOvVJ5+Ef - rrYZLEU8EZ85+HLwW7ZCLMVTFWdkHoLut+/hgbYHaE9XN31XNsupTrWV3jKVs+uS3cyAD0cLe331jW3Q - qRt0CPUlQVHDKI+fN9iGo4W90uNnyuA2vvRtWTlQgxeg/dk7FimnOvU9/CNqUe47b7ANRwt7AfjpKvAK - Gt18Qur35ymhRfsKKLr5hN7EyzDq7humWrrcfSfKxbz/QlwcLDck1snZJdUzYHUDmk57+K1qdXJyzsL6 - RmQD9ZmObygXB8sVIRO6fXQB4hC6eRQppzr1XXmHclnAckFomLc1Um5dItEvhZ97MQXP9N0AAAAASUVO - RK5CYII= - - - - - iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAZdEVYdFNvZnR3YXJlAEFkb2JlIEltYWdlUmVhZHlxyWU8AAADZmlUWHRYTUw6Y29tLmFkb2Jl - LnhtcAAAAAAAPD94cGFja2V0IGJlZ2luPSLvu78iIGlkPSJXNU0wTXBDZWhpSHpyZVN6TlRjemtjOWQi - Pz4gPHg6eG1wbWV0YSB4bWxuczp4PSJhZG9iZTpuczptZXRhLyIgeDp4bXB0az0iQWRvYmUgWE1QIENv - cmUgNS4zLWMwMTEgNjYuMTQ1NjYxLCAyMDEyLzAyLzA2LTE0OjU2OjI3ICAgICAgICAiPiA8cmRmOlJE - RiB4bWxuczpyZGY9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkvMDIvMjItcmRmLXN5bnRheC1ucyMiPiA8 - cmRmOkRlc2NyaXB0aW9uIHJkZjphYm91dD0iIiB4bWxuczp4bXBNTT0iaHR0cDovL25zLmFkb2JlLmNv - bS94YXAvMS4wL21tLyIgeG1sbnM6c3RSZWY9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlw - ZS9SZXNvdXJjZVJlZiMiIHhtbG5zOnhtcD0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wLyIgeG1w - TU06T3JpZ2luYWxEb2N1bWVudElEPSJ4bXAuZGlkOjJGQzkyMzc0Rjk0OUU0MTE5NjNCQjRENDMzQjlC - MUM4IiB4bXBNTTpEb2N1bWVudElEPSJ4bXAuZGlkOjhDMTdBQjRENEFBRTExRTQ4QjQyODY0MDNBNTJE - NzNCIiB4bXBNTTpJbnN0YW5jZUlEPSJ4bXAuaWlkOjhDMTdBQjRDNEFBRTExRTQ4QjQyODY0MDNBNTJE - NzNCIiB4bXA6Q3JlYXRvclRvb2w9IkFkb2JlIFBob3Rvc2hvcCBDUzYgKFdpbmRvd3MpIj4gPHhtcE1N - OkRlcml2ZWRGcm9tIHN0UmVmOmluc3RhbmNlSUQ9InhtcC5paWQ6NUQyMjc4QTlBQjRBRTQxMTk3NEFD - QUFFQjRCMzVENkUiIHN0UmVmOmRvY3VtZW50SUQ9InhtcC5kaWQ6MkZDOTIzNzRGOTQ5RTQxMTk2M0JC - NEQ0MzNCOUIxQzgiLz4gPC9yZGY6RGVzY3JpcHRpb24+IDwvcmRmOlJERj4gPC94OnhtcG1ldGE+IDw/ - eHBhY2tldCBlbmQ9InIiPz4eHsDfAAAB00lEQVRIS7XVWytEURQH8HniTTNHLs0NCXNcXjTN5dH9g/gM - 3jx590QhFDJS0gyTGmpqaqJIMW4hzlAoOaWISS7LWifntI3ddnTGrl92e/57/We/DBsA/CvuYSHZSr0t - lvCGsriX/oI3lMW9lM/SwgF9SEHwizs08IX2vAyLZvZRgXJ+cQWv7yB0q96Ds86voT0vw6KZNJsK4Pnl - DWKxmBBlqhpDUN0UNp2n2VrB/WMOEomEEGX0ArN5o+BGfYB0Oi1EGa8cwpKw6bxRcH6lQiaTEaKMVw5q - rzCbNwr2z65BURQhynh8Qe0VZvNGwdZBFlRVFaKMxxfQXmE2rxc8rW3sQy6XE0puHoG7IaC9YnV9j5th - pbZPqOCDCrbH5uIwOD7/zWgkDkNTizAyuwQjkWWIxFNQWduqmVxI/MiPz6/A8HTUuDMTTYLkbrqhgt5S - T3PG4ZJ3HE7focElZx0u3yn+VQiG1ZLymmm7s74f88f42S6bl9zyJZ6d6Xckd+Mt5ieogH4xJORHHajt - SzvqZPSgECpHZSiA2DztuxBlad+NgnpBEbIjusiiYboKRF+kGFHegUR5ImkFv7G0eAPzWVq8gfksLd5/ - oULiHhYS97BwwPYJlSCUgVubViQAAAAASUVORK5CYII= - - - - - iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAZdEVYdFNvZnR3YXJlAEFkb2JlIEltYWdlUmVhZHlxyWU8AAADZmlUWHRYTUw6Y29tLmFkb2Jl - LnhtcAAAAAAAPD94cGFja2V0IGJlZ2luPSLvu78iIGlkPSJXNU0wTXBDZWhpSHpyZVN6TlRjemtjOWQi - Pz4gPHg6eG1wbWV0YSB4bWxuczp4PSJhZG9iZTpuczptZXRhLyIgeDp4bXB0az0iQWRvYmUgWE1QIENv - cmUgNS4zLWMwMTEgNjYuMTQ1NjYxLCAyMDEyLzAyLzA2LTE0OjU2OjI3ICAgICAgICAiPiA8cmRmOlJE - RiB4bWxuczpyZGY9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkvMDIvMjItcmRmLXN5bnRheC1ucyMiPiA8 - cmRmOkRlc2NyaXB0aW9uIHJkZjphYm91dD0iIiB4bWxuczp4bXBNTT0iaHR0cDovL25zLmFkb2JlLmNv - bS94YXAvMS4wL21tLyIgeG1sbnM6c3RSZWY9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlw - ZS9SZXNvdXJjZVJlZiMiIHhtbG5zOnhtcD0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wLyIgeG1w - TU06T3JpZ2luYWxEb2N1bWVudElEPSJ4bXAuZGlkOjJGQzkyMzc0Rjk0OUU0MTE5NjNCQjRENDMzQjlC - MUM4IiB4bXBNTTpEb2N1bWVudElEPSJ4bXAuZGlkOjJEMDQyOEZBNEFEMjExRTRBN0MxRDBCNzJGRUND - MDEzIiB4bXBNTTpJbnN0YW5jZUlEPSJ4bXAuaWlkOjJEMDQyOEY5NEFEMjExRTRBN0MxRDBCNzJGRUND - MDEzIiB4bXA6Q3JlYXRvclRvb2w9IkFkb2JlIFBob3Rvc2hvcCBDUzYgKFdpbmRvd3MpIj4gPHhtcE1N - OkRlcml2ZWRGcm9tIHN0UmVmOmluc3RhbmNlSUQ9InhtcC5paWQ6QkRDRkI1RDVEMTRBRTQxMTk3NEFD - QUFFQjRCMzVENkUiIHN0UmVmOmRvY3VtZW50SUQ9InhtcC5kaWQ6MkZDOTIzNzRGOTQ5RTQxMTk2M0JC - NEQ0MzNCOUIxQzgiLz4gPC9yZGY6RGVzY3JpcHRpb24+IDwvcmRmOlJERj4gPC94OnhtcG1ldGE+IDw/ - eHBhY2tldCBlbmQ9InIiPz59jfe3AAAEbUlEQVRIS8WTeUybZRzHF48/pnFOuQRajkFLgQFb5iRLNJr4 - l/EPgsniUI4xZDAY1zyxwApsMJyIME61rByl3DfoYGBrgbWUY06FcZSCha4rQ8jYxkqPr2/fvkv8o2Sg - S/wkT970eb6/T5/39z7Prv8dt/Oql4mR4HZJ3ccoXFxhVCzB9DT9JueJdSq6c1wzVZFupepVzxu34XVj - CaEDi1jX6hF8ZQoeokl4iBVwzV9YdU1XRlIl28eVo8phCdXwGltEeOUsro6psaHVwcSDh5volc4iOO8X - 7KuVwb1hEi7J8myq9PEQO//I85oafr0KtEpUpNSETm+AwWDAvfv3YTQaybnm/t/AyO6Ga+UonJOnIijF - 1hA9tWI2qle9RxcI+RIpmZpTIfBULhIyyqHVahHPKcN70TmYnFFCp9OhqXcc9KwW0DOHVl3YU1aUyjJu - F1SpfhO3EM6bMMsVt+D8Zhz2HIpC4oU6bG5uIu4cD3tfTwAjIBNypQYbGxsISquBU34PaDHiVEplGXee - SuIjVaBv3Lz7gJg8vHg4FlZvc+ATVoLipiHsD8qCXWAO7IPK8MG5FjLXKboOeoYADkldUkplGWb7vOb4 - 4BzxIXXQE/1m59WDXdgBvxPfwz6UC4eQUth/WIBDZ2qQXj+K7IYRImeE5s5fOFrcDPvPapcJzVNmmwVY - VxWG9U09uau1tTVymPpc0iYFLew7OEUJ4BwtALfvJpl5xMrKCu6s3cUrn5YbCM1us80CrJZZVWjXr7j3 - 4CE0y8v4IrcaH+cK4Bv+DRyPl8ApphYuia3wZ3eCUzOA1PIfcVuzjHnlIgK/vgy7mHzTG+w12yzA5E53 - edYPo1c2i/X1dQTEfwvbwDQ4hhXg8OcN4P48Df+UTrgkNIAeW4Hg3Hbo9Xq0iGSgs4ls5CUhoXnObLOA - S8pkhG/bdZzgDZJnffT3GXieLAA9XgB2/RjZjuQqMWhxfBw824H55XWyhcfy+HDNqoB1SH4Codn6G7iw - p3d78EaVPlXX0CaZgkqlgly1gpCiK0htHCH/IL6oFcEF3ZjT3CUvXqv0DzDSS0FPq1a/8EbYS5Rqa+if - SAJ8KoeNR7gitEsnoVQqSbGOkJmYX1ggxaY70SabwIGMUrjn8I3WIXnBRPnWu/8nDnE9Sd7cAaP/ZSES - 6/rRKJRArpiHXC7HzekZNIukiCyrhW9mGZgXa4w2kUVnibJnzdXbxP5URzyDO4QjxGl5i9uNpMZeKP5U - IrywAq9yCnGAOGGMonbYxpVnEPGdyR9BO/MTj8kfgXeNFPt5IngVtoF1kQ9WcTs8qgfgmNreQMS21xZL - 0E6Ln6ef75tg8sfgXT8O77oReAkkYNXJ4PRV/4ztyfo9VPTf4xjdf9CpQKzdxxuGe6UMbhXEmc8V6mze - r3qNivx3HGN7UmglQ6CVDMIxXwybo5UcaunJQD8te9rhyx4JrWwItlGNUut3y5+hlp4cDhFCpl14k9jq - nR+Y1NTjIe7NlmMnWKoHsOtvjWYcKpheqFQAAAAASUVORK5CYII= - - - - - iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAZdEVYdFNvZnR3YXJlAEFkb2JlIEltYWdlUmVhZHlxyWU8AAADZmlUWHRYTUw6Y29tLmFkb2Jl - LnhtcAAAAAAAPD94cGFja2V0IGJlZ2luPSLvu78iIGlkPSJXNU0wTXBDZWhpSHpyZVN6TlRjemtjOWQi - Pz4gPHg6eG1wbWV0YSB4bWxuczp4PSJhZG9iZTpuczptZXRhLyIgeDp4bXB0az0iQWRvYmUgWE1QIENv - cmUgNS4zLWMwMTEgNjYuMTQ1NjYxLCAyMDEyLzAyLzA2LTE0OjU2OjI3ICAgICAgICAiPiA8cmRmOlJE - RiB4bWxuczpyZGY9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkvMDIvMjItcmRmLXN5bnRheC1ucyMiPiA8 - cmRmOkRlc2NyaXB0aW9uIHJkZjphYm91dD0iIiB4bWxuczp4bXBNTT0iaHR0cDovL25zLmFkb2JlLmNv - bS94YXAvMS4wL21tLyIgeG1sbnM6c3RSZWY9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlw - ZS9SZXNvdXJjZVJlZiMiIHhtbG5zOnhtcD0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wLyIgeG1w - TU06T3JpZ2luYWxEb2N1bWVudElEPSJ4bXAuZGlkOjJGQzkyMzc0Rjk0OUU0MTE5NjNCQjRENDMzQjlC - MUM4IiB4bXBNTTpEb2N1bWVudElEPSJ4bXAuZGlkOjJERTg4QTFENEQyMjExRTRBODEyODk0M0RBMTc5 - Qjg3IiB4bXBNTTpJbnN0YW5jZUlEPSJ4bXAuaWlkOjJERTg4QTFDNEQyMjExRTRBODEyODk0M0RBMTc5 - Qjg3IiB4bXA6Q3JlYXRvclRvb2w9IkFkb2JlIFBob3Rvc2hvcCBDUzYgKFdpbmRvd3MpIj4gPHhtcE1N - OkRlcml2ZWRGcm9tIHN0UmVmOmluc3RhbmNlSUQ9InhtcC5paWQ6NjJGOUEyRDEyMTRERTQxMUIzNkJE - NUVDQjU5MzE1NjIiIHN0UmVmOmRvY3VtZW50SUQ9InhtcC5kaWQ6MkZDOTIzNzRGOTQ5RTQxMTk2M0JC - NEQ0MzNCOUIxQzgiLz4gPC9yZGY6RGVzY3JpcHRpb24+IDwvcmRmOlJERj4gPC94OnhtcG1ldGE+IDw/ - eHBhY2tldCBlbmQ9InIiPz6wJF34AAACl0lEQVRIS62Vy08TURSH73/QhQtXVnBhxEcMiUkhbEg0hB1R - Q1i68C8wIW5cEqMLN7ho2Ji4YiEhWq0prYUhfULbadN3obTaChobtZEUsFY9nnPS6WM6HYowyZf87j33 - nG/amaai9geOBYA+4pTxihmBE8DcTQB4J8em/9IwSQyagmrtL+z9rMFmvnhkKvtV7tcVHPz6DVsftulA - AckdhUg8zf19eoLKAd597iMLMItewfOxUDTN/bqCH3tVSG8VWIBZ9AoJApEk9+sKvu/uQ2IjzwJkGtH8 - OrTwy3Hu77vIAnV9mgWlcgWiqRwLjAMmkOMbPbNTKnN/JJntqJGEBZ++7oKcyLLgLN4JrU8Cms2C4pcy - BKKZumCI18temQ/8DzSLZlBmQX7nG/jCKdpgAa0driCtY5iFHuqHSjNoFtaags1iCdzBBG+QgNY2aZ0F - mIUe6osENAtrTUEq/7kDq9PHAszU5yYoq9f1i9cUSCD5ozxDEeTsrhAoONwyxLLb8MrhYQFmZYCHsnpd - v3hNgQROb5hnKIK29944MAThTBEWbS4WYBZ6qC/sKSy5ZJ6BGUQg8b4Bbhjod4AZXlhXWdBa10LrIVul - AM9ggS+aa6AIMMO8ZYUO0KeyIOMtZyaQpXpNi4LFucYzMINwhbMNcMNw5oIJMMNKIA0LNg88mZuH/ssj - dPgBMnN+cBRmny1wrRtSMMMzWCCFMg0UAeY2Fh0+GL5xG8Zu3oHXUrCj3g0WONdTbeBm21/o1N17gPtg - 98Xh3VoS3qzKMDI22agfglnY/Uld8NDc/ZlZwAwvl4Ngun6LGh8rdfVDViNs3rguOOzq6XOD8PDpc7g2 - OkHDH7XWtYa2It66Y4eCQ8cRfpvUNa2hTUD8A6JMaBvCyTdJAAAAAElFTkSuQmCC - - iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 @@ -1403,7 +1485,7 @@ AAAASUVORK5CYII= - + iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 YQUAAAAZdEVYdFNvZnR3YXJlAEFkb2JlIEltYWdlUmVhZHlxyWU8AAADZmlUWHRYTUw6Y29tLmFkb2Jl @@ -1415,108 +1497,26 @@ bS94YXAvMS4wL21tLyIgeG1sbnM6c3RSZWY9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlw ZS9SZXNvdXJjZVJlZiMiIHhtbG5zOnhtcD0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wLyIgeG1w TU06T3JpZ2luYWxEb2N1bWVudElEPSJ4bXAuZGlkOjJGQzkyMzc0Rjk0OUU0MTE5NjNCQjRENDMzQjlC - MUM4IiB4bXBNTTpEb2N1bWVudElEPSJ4bXAuZGlkOkUzNzJDMjE3NEFENjExRTRCNjE0OEVEQzI4MEM0 - RTZDIiB4bXBNTTpJbnN0YW5jZUlEPSJ4bXAuaWlkOkUzNzJDMjE2NEFENjExRTRCNjE0OEVEQzI4MEM0 - RTZDIiB4bXA6Q3JlYXRvclRvb2w9IkFkb2JlIFBob3Rvc2hvcCBDUzYgKFdpbmRvd3MpIj4gPHhtcE1N - OkRlcml2ZWRGcm9tIHN0UmVmOmluc3RhbmNlSUQ9InhtcC5paWQ6RkI3NUQ0QkNENDRBRTQxMTk3NEFD - QUFFQjRCMzVENkUiIHN0UmVmOmRvY3VtZW50SUQ9InhtcC5kaWQ6MkZDOTIzNzRGOTQ5RTQxMTk2M0JC - NEQ0MzNCOUIxQzgiLz4gPC9yZGY6RGVzY3JpcHRpb24+IDwvcmRmOlJERj4gPC94OnhtcG1ldGE+IDw/ - eHBhY2tldCBlbmQ9InIiPz6PyaLfAAADMElEQVRIS6VUXUiTYRT+vi3Tzd+ps23+3KRigtiPkolEQReG - UYTkhWatpWlWGkRdddfdSPImqUAJjSIT00oxLJIk0cR+tFSyzDJtgaMkDEPkdM7ZPvm2vS6jBx6es3Pe - 8zzvtm+TohLS/ov+AACStLgEQuJyLRJWYK1yzh/+FgCoQrpnfM4fOGBhcUlIMkEVkma4H4i1y2kFcMD8 - wqKQZILKZqTqmlTAWrfvMjhgbv63Dwm0hLWQohn1eNEbzrlfPiTQAtZCKjP1GXdAIC+r4XD+9CGBFrDm - RVJ1re6pZ0GyHHMvIawauYVNCFPfvvuQQAtYC6meKXU0amNsaGN/ZR60xIf9aIgN3cpGE9OzZCZ85nEm - pGiWlLABmuJCnUOXrNB7chdct4TUo32ANDbp4NuielDpqWfePdaPX6GrohSK4uLhlCEo96YlZLbOFHzH - oJXjMSBcGn4/zQGovEDqXXtzeTb+BTrKj0J3+Q54djYP7EZdTU2MPjFSK8eieQR9QtLg6GcOQPWgqKeQ - ZyOfoK30CDw+lg2Ot3Z4VLoNqo269mCNHIa2WjYn9A1PcAAqU6m9VV3TF9psOwwPS3JgZugCdNoyocwU - jU+RlImWBpezGz0vxzkA1YOiHvPFO7Ca1kGHLQtmXp2HdutmqN+/F6JiU+h3kOpyVeHJwBgHoLIpqajm - 189HoaG4CNqsGTA1UAWth9Lg6r490PygGyLjUikgzuWqQlffCAegelDdUwLqigqhpXgjTPYeh+bCFCg2 - RkEk3vxuVz/P0c43oLP3DQegLhspNalSFxiNcLswHT48LYNbBUlQk7ebzenmyhm08w1o7xmiAP6hRZiT - 70eYkzpctUuJWdHmwWs74+F1Uz7cyE+E4ohQB5mHm9a3GywpTXzektyKduIAIsKI3ISkL4rIdYle05C9 - VrZVBmvtl7eboUyv7V4jSQdwRn8FdI72iErtCUxnIuifkJ5hUqUOq9Jr7OeCNU6bTpNVqtMcDJSldOwn - KnOk+jypJ5QANRWc0cs5SEelXr54QidfwVYAMoiHq4W/gNM6OaNCJ+diaUIqN/43+Atwg27t+9ZXBUn6 - A2MdqQeVc5pWAAAAAElFTkSuQmCC - - - - - iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAIAAABvFaqvAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAZdEVYdFNvZnR3YXJlAEFkb2JlIEltYWdlUmVhZHlxyWU8AAADZmlUWHRYTUw6Y29tLmFkb2Jl - LnhtcAAAAAAAPD94cGFja2V0IGJlZ2luPSLvu78iIGlkPSJXNU0wTXBDZWhpSHpyZVN6TlRjemtjOWQi - Pz4gPHg6eG1wbWV0YSB4bWxuczp4PSJhZG9iZTpuczptZXRhLyIgeDp4bXB0az0iQWRvYmUgWE1QIENv - cmUgNS4zLWMwMTEgNjYuMTQ1NjYxLCAyMDEyLzAyLzA2LTE0OjU2OjI3ICAgICAgICAiPiA8cmRmOlJE - RiB4bWxuczpyZGY9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkvMDIvMjItcmRmLXN5bnRheC1ucyMiPiA8 - cmRmOkRlc2NyaXB0aW9uIHJkZjphYm91dD0iIiB4bWxuczp4bXBNTT0iaHR0cDovL25zLmFkb2JlLmNv - bS94YXAvMS4wL21tLyIgeG1sbnM6c3RSZWY9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlw - ZS9SZXNvdXJjZVJlZiMiIHhtbG5zOnhtcD0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wLyIgeG1w - TU06T3JpZ2luYWxEb2N1bWVudElEPSJ4bXAuZGlkOjJGQzkyMzc0Rjk0OUU0MTE5NjNCQjRENDMzQjlC - MUM4IiB4bXBNTTpEb2N1bWVudElEPSJ4bXAuZGlkOjUzQzNGNDI5NEQyQzExRTQ4QkE1QUNCMEVDRDZF - MDVEIiB4bXBNTTpJbnN0YW5jZUlEPSJ4bXAuaWlkOjUzQzNGNDI4NEQyQzExRTQ4QkE1QUNCMEVDRDZF - MDVEIiB4bXA6Q3JlYXRvclRvb2w9IkFkb2JlIFBob3Rvc2hvcCBDUzYgKFdpbmRvd3MpIj4gPHhtcE1N - OkRlcml2ZWRGcm9tIHN0UmVmOmluc3RhbmNlSUQ9InhtcC5paWQ6RkI1NUY4OTYyQTRERTQxMUIzNkJE + MUM4IiB4bXBNTTpEb2N1bWVudElEPSJ4bXAuZGlkOjJERjY3MEZENEQyMzExRTRCNDlGQUMwMzk0OTAw + Qzc4IiB4bXBNTTpJbnN0YW5jZUlEPSJ4bXAuaWlkOjJERjY3MEZDNEQyMzExRTRCNDlGQUMwMzk0OTAw + Qzc4IiB4bXA6Q3JlYXRvclRvb2w9IkFkb2JlIFBob3Rvc2hvcCBDUzYgKFdpbmRvd3MpIj4gPHhtcE1N + OkRlcml2ZWRGcm9tIHN0UmVmOmluc3RhbmNlSUQ9InhtcC5paWQ6NjhGOUEyRDEyMTRERTQxMUIzNkJE NUVDQjU5MzE1NjIiIHN0UmVmOmRvY3VtZW50SUQ9InhtcC5kaWQ6MkZDOTIzNzRGOTQ5RTQxMTk2M0JC NEQ0MzNCOUIxQzgiLz4gPC9yZGY6RGVzY3JpcHRpb24+IDwvcmRmOlJERj4gPC94OnhtcG1ldGE+IDw/ - eHBhY2tldCBlbmQ9InIiPz6IsaOmAAADF0lEQVQ4T62U/UuTURTH+0nICqRI1ERMMyNQe8N0ChqBwQhN - yvwhEgJjVCqJ/qCibZo6tzQ339h6Nre5prapUzc1XzItX1ilzuWMLLVAen+xf6DTuTxjdxsFVj58ebjc - c+7nnud7z3228DbpIaDFH/CfoqCn72DIDvNfPDM2KAqyr8PcJxqY+QBTb8kkjocXQTsKigGwfqYJHqIg - 1OxHGHvlWPx4hXB1YyA3g4CBhqst+piEnrDA3rA95vBAY1x8d7lq/DVZwm5PQZNvoKYdypSgHgbVEIh1 - cLOZzOCbSSsyRQRba6uWtcpVLbPcwlglInNUCJNWWKqABqMLCGvGlfpJELaQ/V1Vd1lujAhe0chtUrH5 - ZExnmJ85MdomEa+qZMbIEF2BHGunILSjdZwYgTt4gJqjjj0Rltml1Zq9AeL0Mn71Wn2mtDU80MIvsFTw - O+KPIoWC8BNYRIUaqrRQroJKjQOk9N+xLBF2pXJFKfnsDGYa8gS6xOO2whyMuoHaHpGzZ/pBM0IMrtXD - nT4HqNHXe0lYoogMFeQP4jbSDkCPTUyXmnNoPutSo+9WN5DEQDyeWCWnhqm4p7Oimt3b54rzmmKPVHKz - 0Xg0AU1pz87VJp+yXOfd9t3mBmLXsGrsJhSsDtF4iOWxKdpzyQNnuRW7vEUp13obFG05OVUBPtO5V1Sn - k5q4SX8ENfWA6C7xHsP981Bb2sf38ZKd4JhSuXUJHPHhg/WJnAeZFw0Xzt/w8erRtLmBnB/CSmaC599I - 2PYVRl+CXigu3R9SfCC0Pf1MZ1oqvqvjogX7gtRFJfb1n24g7GblfQcFP2fkBYm5anxqQcbLKgzyK/Df - WRTkV5+RMTg84ZrgAOHo4ZIDVNdJw67CpsVLZ5gifj97Typlq2ZFQXj8LKh5EHpnaIar8N+Al5l9Y9Vs - T7OiIAzjqaMsa6QJnBkeWvgOHdPkAuIV67PSeQpCYYZplsZ+KyyWLRyFF8D553EDbURY770J0rrYJbda - SYE4iWb9NcgpRKDrOMAWwYP6d5BTaC52zyaAWDlAm/DweL8AX9zXukfxHsIAAAAASUVORK5CYII= - - - - - iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAZdEVYdFNvZnR3YXJlAEFkb2JlIEltYWdlUmVhZHlxyWU8AAADZmlUWHRYTUw6Y29tLmFkb2Jl - LnhtcAAAAAAAPD94cGFja2V0IGJlZ2luPSLvu78iIGlkPSJXNU0wTXBDZWhpSHpyZVN6TlRjemtjOWQi - Pz4gPHg6eG1wbWV0YSB4bWxuczp4PSJhZG9iZTpuczptZXRhLyIgeDp4bXB0az0iQWRvYmUgWE1QIENv - cmUgNS4zLWMwMTEgNjYuMTQ1NjYxLCAyMDEyLzAyLzA2LTE0OjU2OjI3ICAgICAgICAiPiA8cmRmOlJE - RiB4bWxuczpyZGY9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkvMDIvMjItcmRmLXN5bnRheC1ucyMiPiA8 - cmRmOkRlc2NyaXB0aW9uIHJkZjphYm91dD0iIiB4bWxuczp4bXBNTT0iaHR0cDovL25zLmFkb2JlLmNv - bS94YXAvMS4wL21tLyIgeG1sbnM6c3RSZWY9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlw - ZS9SZXNvdXJjZVJlZiMiIHhtbG5zOnhtcD0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wLyIgeG1w - TU06T3JpZ2luYWxEb2N1bWVudElEPSJ4bXAuZGlkOjJGQzkyMzc0Rjk0OUU0MTE5NjNCQjRENDMzQjlC - MUM4IiB4bXBNTTpEb2N1bWVudElEPSJ4bXAuZGlkOkVENUYwQThBNEQyOTExRTQ5QzUzQzdFMkFGQkQy - NTA1IiB4bXBNTTpJbnN0YW5jZUlEPSJ4bXAuaWlkOkVENUYwQTg5NEQyOTExRTQ5QzUzQzdFMkFGQkQy - NTA1IiB4bXA6Q3JlYXRvclRvb2w9IkFkb2JlIFBob3Rvc2hvcCBDUzYgKFdpbmRvd3MpIj4gPHhtcE1N - OkRlcml2ZWRGcm9tIHN0UmVmOmluc3RhbmNlSUQ9InhtcC5paWQ6MkRGNkEzOUYyOTRERTQxMUIzNkJE - NUVDQjU5MzE1NjIiIHN0UmVmOmRvY3VtZW50SUQ9InhtcC5kaWQ6MkZDOTIzNzRGOTQ5RTQxMTk2M0JC - NEQ0MzNCOUIxQzgiLz4gPC9yZGY6RGVzY3JpcHRpb24+IDwvcmRmOlJERj4gPC94OnhtcG1ldGE+IDw/ - eHBhY2tldCBlbmQ9InIiPz6npMy1AAAGEUlEQVRIS7WVeVDUZRjHf7Ase8ECu+wl4LIXcqyyHC783AWW - 5QaRFTHkMi9SQvE+UhLzwk0BUcQSgQBBgcYDzStMSzOPcpqcmo5pmqk/+rOapqb+iG/PbzfFcSz/6pn5 - zPN739/7fp/nvZn/3TSLjj+XJy2/RaItPCT5vaBd8m1+q2Qku1lcrcvki+iXr7fFU6ZZeOx5KDU1b7jU - 1Z2bVPMPWNMbRXrXkWAc+ywVLbcS8fKwFjlu8VdpW0XzSc6f8PEIPzJ19dFnU3WEJdHL9P3X9O1nkdB8 - CQrX7i3mKn9zfqsUq29ZsPfjRBx5aMO2cTMy94gm7FuF7XyJTwDJTo5GVdHxNALVgsPd5Ceye+9g8b0f - UXbjB8RtH4Msd+MeXS7f6twjxbILZiy7pEHDtTBsvG7BqivTUXpsClLWCbtJNpDwBlGVH3ySIFV520eW - nedRcf0HVJGwbeRrOHs/h2n1CGRZDe7wND/W1hiI8sEYlJ4KRcVpJcrfVqByNBILhqLh3KeA+UXBOpL2 - jkRZduARPGXZ/vH4pnMou/gd7INfIPn4QyQc/RSOzk9hrBtEiKPerUn1Y5PXBaDojWlwdgUjr0+G/H4Z - cnpCUNJrQNZ+LeLrBD/LYnixFEDAKFz7vJQ0r49dO4zikS8x8/ADxLd9jIT2B5ix/z7SX78Pw+K3EJy2 - wq1M4rEz6sRwthgw82Ag2KNS2I5JPZ4rZx00ImGNHIZSfisFkDGhxbs5AkKLd/3kaLkDlgTjXrsNc/Md - mPfeQeyOD2HbcRu6yi4E2Wrd8ngeG71IBPtePWa4JUhsD0DykQAkHQqApUWCFLcGyZvDoZ/P/5oCTGXk - hU2MvGB7rbGmG47dd2Fa+x6iX/kAMa/eQvS2m4jaeAPspvcROb8TQexid3CcL2usFCJjnwE5nQYU9RhR - PGDC7D4TCrqMyDqkR9oePbRz/SZEKh8rI8vdyshyXhmzLD8DS/1VGOquwtgw7glkXH0Nhvp3kbL2GrSl - hyC11ril03xZfbkQKZuVsDeq4NihRtYuDbJ2auBoUsO2TQXrJiWMlWIExflWMiHOjRzfJy0bg776HCKX - vANd7WXol1/xeN3Si7A2XIXW1YbAxAq3UO0zPTSd1yG38bplLK//vxBrffKY4PQ1HH9aKk8jonQUUyvO - Qlt9HtqaCx4/tXIMyXWXMXXOAQTEv+D2zCvDhBBTCN1zCGOCZq3k+DXO1YcpRYOY4hpF2LzTCCs74/VE - 3IvnEVd1EhGFblBbWot6BKXWQZq64tlYa2+TuJwQM9KU5cRL35hyOxCe2w913hA0hcPQFI16KRzxEFtO - a1Q9htSVN5C+5S5x7x/uIm3DR7CvuomUReOImt1FU7nwEolHECImMGkJE5i46EJkejNM+X1QOPqhzBqC - KvskVDmnJuHKT/K4bgjKzBMItXcjJv84NOwWiKPndJK40TOCgPgaRmIur1dZ1yM6txvyWT0ITR+AImOQ - gg39N1ybDBJP60PorC5My3oTwQm18FdNryBxbq0EJL6AEUTYZBTkF0NGKyKdvZDb3qJOAxSIOqcP/jtp - JyC3D1BSvYgp6EN4aiNlP/cTEk4gFASPEUeXkWd8RaY5jcrEBkTn9UCT4Q3gzfBfRvJE9rrsfpicHSRe - NsFXmJeSXhTBXXY+jMjk8uArVkpExuKb6pkbYJ7L7Ria37xTUBeMeCkcncRTN0z/TyLKNYy4khNQJq2G - IMLBXdUWQkXwCYYR6md7IPP1k8WEC3UFDzSpG2BZeAZJtXQWFpyls3HOC50JzkdQnbFqDInLLiC2rBcq - 6xoSzzzP+NDVwDBaQkx4XzahNv8xZH48sVotCHeOUnnCWNJG18Q4UjddB7vlfbBbPwC7+YannLTyIrS5 - OyHU5v3hr07poL7JBHe4Jh8bzgQROY8h46IKCAVfbi73D3PcpfoJlX0VtEVN0JXsQlj2ZoRaaynj7N/8 - NfZLPLFmHrXnpiWSCCL8iMl32T/M6YGMq+R+covD7QADwfoIgqt4QVGtfvIZJ4lRv5CY4zypbjfjy+eE - M4l4gtuSwYSQ4DS4EZAew/wNiCYQJlvQU3cAAAAASUVORK5CYII= + eHBhY2tldCBlbmQ9InIiPz6GKmpFAAAC+UlEQVRIS63T20vTYRzH8Yforj/Ei24UiSgKIygKi8oyxZQo + cvNYeXaesmzqPGu2POd0ulSsnIdaurTSTJ3O6UxTPGya5vCQx5AuPn39RbHop7nZxQt+z3ie93e/Z4w1 + p7nsCoBt8R6yBF/UHPv+Wb0rfFFzm99CRIwEW1gnqXzxTXxRc0ydctm4OlID2sxrw6iCtiwItC+A2P/D + frLnjwGNSZdMq6N1WOvLwFpP4l/WdRlY6Jaio9Ab7QXba8sVoDHZGdT8PYS9THDqMGnLsKpNw0qXGCua + BO55VZdNQ6U/DRRibVCGb+N1pH5bukoRqHmDHOIG1N8/X2F4I8WyNhtf2+9hqSsZxqZ4upbb6HsSZLHO + Im90ym6hNVcIaktYTexZyUelGEvaHMy/jcFiZxo0xX5Y7ivGcn8JkVmA9uvlWBmqwpJeAWovs+poR99O + eRgWtQWYVUdgrj0FH+i+F3XF3NoappZYGJrEoLaOVYpOOTY/FGJB+xjTqnDMtMTTAC/Ma/Ix/TLUKl9e + x0JfFQpql7PykBP7lWIXzPeUYLIhHCPKCLr/AMy2ZsKoDLTKdNNdvM8TgNpRTBZwfJ885CTmaIChPhwa + mS+GnkdhqjEWY9X+VplqvIMXEhdQ24mZeuSs0N/BNNWWj4k6EdSZHhhXxWH0aSCGFd4c4Tk7zk7XBlUM + FKLToK4Nm+0qYnneRzqGGiSYaIiiyZdhVCdgqFSIwRJPjucZW85O1pvnRmvDkO9zFNTdy2Y6HjGp4HCF + 5kk4xhoiURd/EROv4tBfeM0qAyUC9Mp9QM0+7o829T6LZV0/mNycS6+nFKFWfAGj9ZHozfGwil7miZYH + 7qCmghsw+S6VpV894KuUuKFbfhNNqa749CwY3dm0toK+VABl3HlQM5obYHybwFLc7W1y/Y5BlX6FfgNn + DNcEY0DhZZX+MiGKbh0DNR24AYYWMSfJzc6GZBApwS5skIzNODcg0dV2V36FtsJ7yBJ8UXO8hyzBFzXH + ++H/A/YDv9/V87iOlrYAAAAASUVORK5CYII= @@ -3164,9 +3164,6 @@ 864, 17 - - 864, 17 - iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 diff --git a/Program.cs b/Program.cs index e38f7b8..a76d0d4 100644 --- a/Program.cs +++ b/Program.cs @@ -16,14 +16,14 @@ [STAThread] static void Main() { - ValidateInfo validateInfo = ValidateConfig.LoadConfig(); + ValidateConfig.LoadConfig(); string localConfigPath = Application.StartupPath + "/Config.xml"; //获取程序及版本信息 string currentVersionCode = Assembly.GetExecutingAssembly().GetName().Version.ToString(); //获取文件版本信息 FileVersionInfo.GetVersionInfo(Application.ExecutablePath); - + Utility.SysInfoConfig(); string configUrl = getProgramUrl(localConfigPath, "configurl"); if (configUrl != "") { diff --git a/TreeUtils.cs b/TreeUtils.cs index 1f055b5..ad39643 100644 --- a/TreeUtils.cs +++ b/TreeUtils.cs @@ -19,7 +19,7 @@ public static void InitLayerTree(GSOGlobeControl gsoGlobeControl, TreeView treeView, string viewDatasrc) { // treeView.Nodes.Clear(); - LayerConfig layerConfig = Utility.layerConfig;//layertree所在的配置文件 + LayerConfig layerConfig = Utility.LayerConfig;//layertree所在的配置文件 List datasrcs = layerConfig.datasrcs; foreach (DataSrc datasrc in datasrcs) { diff --git a/Utility.cs b/Utility.cs index c03e405..ab947a3 100644 --- a/Utility.cs +++ b/Utility.cs @@ -20,7 +20,7 @@ public static string dbdatabase; public static string userID; - public static Hashtable Pipe_QueryFields; +// public static Hashtable Pipe_QueryFields; public static string DBPassword; public static string DBServer; public static string DBBackUp; @@ -38,7 +38,7 @@ public static List listPipelineType; public static string PicRootURL; public static string PicDefaultURL; - public static double dFlyAboveLine = 2; +// public static double dFlyAboveLine = 2; public static string userName; public static string projectStr; public static string userRole; @@ -85,12 +85,17 @@ public static List pipefittingLayerNames = new List();//管件图层名称 public static List sgPipeLayersNames = new List();//施工管线图层名称 -// public static Dictionary dictionaryNetLayerNameAndCaption = new Dictionary(); - public static HashSet layerNameSet = new HashSet(); + public static HashSet layerNameSet = new HashSet();//记录有哪些图层要显示 public static string roadLayerName = ""; #endregion wxl - public static LayerConfig layerConfig; + public static LayerConfig LayerConfig; + + public static string RoleServer; + public static string TitleImagePath; + public static string SysnameVersion; + public static string Copyright; + public static void SetBallons(GSOBalloon featureTooltip, GSOBalloonEx balloonEx) { featureTooltip.CacheFilePath = Application.StartupPath + "/GeoScene/Globe/Temp"; @@ -188,25 +193,6 @@ } return s.ToString(); } - public static GSOFeatures Table2Features(DataTable table, string currentQueryLayer, GSOGlobeControl globeControl1) - { - GSOFeatures features = new GSOFeatures(); - for (int i = 0; i < table.Rows.Count; i++) - { - DataRow row = table.Rows[i]; - - string featureName = row["编号"].ToString(); - featureName = featureName.Trim(); - GSOLayer layer = globeControl1.Globe.Layers.GetLayerByCaption(currentQueryLayer); - GSOFeatures tempfeatures = layer.GetFeatureByName(featureName, false); - if (tempfeatures.Length > 0) - { - features.Add(tempfeatures[0]); - } - } - return features; - } - //程序启动的时候读取配置文件 public static void SetParams() @@ -358,8 +344,8 @@ #region wxl 从layerconfig.xml中读取 - layerConfig = XmlTools.DeserializeFromXml(layerConfigFile); - List dataSrcs = layerConfig.datasrcs; + LayerConfig = XmlTools.DeserializeFromXml(layerConfigFile); + List dataSrcs = LayerConfig.datasrcs; foreach (var dataSrc in dataSrcs) { @@ -598,76 +584,49 @@ #endregion } - /* - //判断网络是否连接 - public static bool isNetworkConnectionSuccess(string ipAdress) + /// + /// 获取Config.xml配置文件中的roleurl配置，并返回 + /// + /// 请求综合信息平台的服务地址 + public static void SysInfoConfig() { - //return true; - if (ipAdress == null) - { - return false; - } - if (ipAdress.Contains("\\")) - { - ipAdress = ipAdress.Substring(0, ipAdress.LastIndexOf('\\')); - } - if (ipAdress.Trim() == "localhost" || ipAdress.Trim() == "127.0.0.1" || ipAdress.Trim() == Dns.GetHostName()) - { - return true; - } - Ping ping = new Ping(); + if (!File.Exists(filename)) return; + + XmlTextReader xmlReader = new XmlTextReader(filename); try { - PingReply pr = ping.Send(ipAdress.Trim(), 3000); - if (pr.Status == IPStatus.Success) + while (xmlReader.Read()) { - return true; + if (xmlReader.Name.Equals("roleurl")) + { + RoleServer = xmlReader.ReadElementString(); + } + else if (xmlReader.Name.Equals("titleimgpath")) + { + TitleImagePath = xmlReader.ReadElementString(); + } + else if (xmlReader.Name.Equals("sysname")) + { + SysnameVersion = xmlReader.ReadElementString(); + } + else if (xmlReader.Name.Equals("copyright")) + { + Copyright = xmlReader.ReadElementString(); + } } - else - { - return false; - } + } catch (Exception ex) { - LogError.PublishError(ex); - return false; + + LogHelper.Error("在config.xml配置文件中读取roleurl时出错"); } - } - */ - - - //TODO LIST:下面两个方法移到featueTools.cs中 - //根据附属物图层名字得到里面含有的附属物 - public static string[] getAccStrsByLayer(string layername) - { - string[] accStrs = null; - string sql = "select 附属物名称 from " + layername + " group by 附属物名称"; - DataSet dataset = OledbHelper.getDataSet(sql, layername); - if (dataset == null) return null; - accStrs = new string[dataset.Tables[0].Rows.Count]; - for (int i = 0; i < dataset.Tables[0].Rows.Count; i++) + finally { - accStrs[i] = dataset.Tables[0].Rows[i][0].ToString(); + xmlReader.Close(); } - return accStrs; } - //删除内存图层中指定名称的feature - public static void RemoveFeatureFromName(GSOGlobeControl globeControl1, string featureName) - { - GSOFeatures features = globeControl1.Globe.MemoryLayer.GetFeatureByName(featureName, true); - if (features != null) - { - for (int i = features.Length - 1; i >= 0; i--) - { - GSOFeature feature = features[i]; - if (feature != null) - { - globeControl1.Globe.MemoryLayer.RemoveFeatureByID(feature.ID); - } - } - } - globeControl1.Refresh(); - } + + } } diff --git a/ValidateInfo.cs b/ValidateInfo.cs index de75391..01546da 100644 --- a/ValidateInfo.cs +++ b/ValidateInfo.cs @@ -192,7 +192,7 @@ } if (!isSuccess) { - LogHelper.WriteLog(typeof(FieldUniqueValidate), logStr); + LogHelper.Error(logStr); } return isSuccess; } @@ -247,7 +247,7 @@ err += "未找到字段或其类型匹配:" + unFoundField.label + ":" + unFoundField.type + "\r\n"; } - LogHelper.WriteLog(typeof(FieldCountValidate), err); + LogHelper.Error(err); return false; } return true; @@ -316,7 +316,7 @@ { err += "字段:" + field.label + "出错\r\n"; } - LogHelper.WriteLog(typeof(FieldOrderValidate), err); + LogHelper.Error(err); return false; } return true; @@ -388,8 +388,7 @@ } if (isSuccess == false) { - LogHelper.WriteLog(typeof(FieldEmptyValidate), - "字段为空检查失败:\r\n" + err); + LogHelper.Error("字段为空检查失败:\r\n" + err); } return isSuccess; } diff --git a/bin/x86/Debug/Config.xml b/bin/x86/Debug/Config.xml index 6995f64..6a453a3 100644 --- a/bin/x86/Debug/Config.xml +++ b/bin/x86/Debug/Config.xml @@ -25,6 +25,11 @@ http://127.0.0.1/Cyberpipe.msi http://127.0.0.1/Config.xml + http://192.168.0.102:8080/ctrl + /Resource/title.jpg + 智慧太湖新城管网规划分析系统6.0 + @2014-2015 苏州航天系统工程有限公司 版权所有 + 编号,管线编码,管径_毫米,材质,埋设方式,起始地面高程,起始埋深,终止地面高程,终止埋深,建设年代,使用年限,权属单位,设计单位,设计负责人,施工单位,施工负责人,监理单位,监理负责人,业务负责人,备注 编号,管线编码,管径_毫米,材质,埋设方式,起始地面高程,起始埋深,终止地面高程,终止埋深,建设年代,使用年限,权属单位,设计单位,设计负责人,施工单位,施工负责人,监理单位,监理负责人,业务负责人,备注 diff --git a/bin/x86/Debug/config/log4net.config b/bin/x86/Debug/config/log4net.config index 80f9b25..6fbcfa7 100644 --- a/bin/x86/Debug/config/log4net.config +++ b/bin/x86/Debug/config/log4net.config @@ -3,29 +3,118 @@
- - - - - - - - - - - - - - - + + + -property: [%property{NDC}] - %n错误描述：%message%newline %n"/> - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/bin/x86/Debug/glVersion.txt b/bin/x86/Debug/glVersion.txt index cd82eca..755455e 100644 --- a/bin/x86/Debug/glVersion.txt +++ b/bin/x86/Debug/glVersion.txt Binary files differ diff --git a/FeatureStatisticsService.cs b/FeatureStatisticsService.cs index 331ee47..b127fe3 100644 --- a/FeatureStatisticsService.cs +++ b/FeatureStatisticsService.cs @@ -190,7 +190,7 @@ List result = new List(); //layer.Name是表名 - string[] accessStrs = Utility.getAccStrsByLayer(layer.Name); + string[] accessStrs = FeatureTools.GetAccStrsByLayer(layer.Name); foreach (string accssname in accessStrs) { diff --git a/FeatureTools.cs b/FeatureTools.cs index be4b469..3c08f34 100644 --- a/FeatureTools.cs +++ b/FeatureTools.cs @@ -1,5 +1,6 @@ using System; using System.Collections.Generic; +using System.Data; using System.Linq; using System.Text; using System.Windows.Forms; @@ -43,7 +44,7 @@ } feature.Delete();//地球上删除该feature string sql = "delete from " + layerName + " where LSSYS_ID =" + feature.ID + " and (编号 is null or substr(编号,length(编号)-2)='TMP')"; - OledbHelper.sqlExecuteNonQuery(sql);//目前无法取到LSSYS_ID，所以这个判断条件不太合适，会导致把该类所有新建的都删除了 + OledbHelper.sqlExecuteNonQuery(sql); } catch (Exception) { @@ -106,5 +107,46 @@ } return value; } + + /// + /// 根据附属物图层名字得到里面含有的附属物 + /// + /// + /// + public static string[] GetAccStrsByLayer(string layername) + { + string[] accStrs = null; + string sql = "select 附属物名称 from " + layername + " group by 附属物名称"; + DataSet dataset = OledbHelper.getDataSet(sql, layername); + if (dataset == null) return null; + accStrs = new string[dataset.Tables[0].Rows.Count]; + for (int i = 0; i < dataset.Tables[0].Rows.Count; i++) + { + accStrs[i] = dataset.Tables[0].Rows[i][0].ToString(); + } + return accStrs; + } + + /// + /// 删除内存图层中指定名称的feature + /// + /// + /// + public static void RemoveFeatureFromName(GSOGlobeControl globeControl1, string featureName) + { + GSOFeatures features = globeControl1.Globe.MemoryLayer.GetFeatureByName(featureName, true); + if (features != null) + { + for (int i = features.Length - 1; i >= 0; i--) + { + GSOFeature feature = features[i]; + if (feature != null) + { + globeControl1.Globe.MemoryLayer.RemoveFeatureByID(feature.ID); + } + } + } + globeControl1.Refresh(); + } } } diff --git a/Forms/FrmPipelineModelDataBase.cs b/Forms/FrmPipelineModelDataBase.cs index b577fd8..bc1e479 100644 --- a/Forms/FrmPipelineModelDataBase.cs +++ b/Forms/FrmPipelineModelDataBase.cs @@ -149,7 +149,7 @@ catch (Exception ex) { LogError.PublishError(ex); - LogHelper.WriteLog(typeof(FrmPipelineModelDB), ex.Message); + LogHelper.Error(ex.Message); } } diff --git a/FrmAccessoriesSensor.cs b/FrmAccessoriesSensor.cs index 98aa1cf..542f19a 100644 --- a/FrmAccessoriesSensor.cs +++ b/FrmAccessoriesSensor.cs @@ -240,7 +240,7 @@ { if (clbPipeLine.CheckedItems.Count > 0) { - Utility.RemoveFeatureFromName(globeControl1, "trackPolygon"); + FeatureTools.RemoveFeatureFromName(globeControl1, "trackPolygon"); globeControl1.Globe.Action = EnumAction3D.TrackPolygon; globeControl1.TrackPolygonEndEvent += globeControl1_TrackPolygonEndEvent; } @@ -259,7 +259,7 @@ private void FrmAccessoriesgather_FormClosing(object sender, FormClosingEventArgs e) { frm = null; - Utility.RemoveFeatureFromName(globeControl1, "trackPolygon"); + FeatureTools.RemoveFeatureFromName(globeControl1, "trackPolygon"); globeControl1.Globe.Action = EnumAction3D.ActionNull; globeControl1.TrackPolygonEndEvent -= globeControl1_TrackPolygonEndEvent; } diff --git a/FrmAccessoriesgather.cs b/FrmAccessoriesgather.cs index e1d176e..c36273b 100644 --- a/FrmAccessoriesgather.cs +++ b/FrmAccessoriesgather.cs @@ -118,7 +118,7 @@ { if (clbPipeLine2.Text!="") { - Utility.RemoveFeatureFromName(globeControl1, "trackPolygon"); + FeatureTools.RemoveFeatureFromName(globeControl1, "trackPolygon"); globeControl1.Globe.Action = EnumAction3D.TrackPolygon; globeControl1.Globe.TrackPolygonTool.TrackMode = EnumTrackMode.SpaceTrack; globeControl1.TrackPolygonEndEvent += globeControl1_TrackPolygonEndEvent; @@ -295,7 +295,7 @@ private void FrmAccessoriesgather_FormClosing(object sender, FormClosingEventArgs e) { frm = null; - Utility.RemoveFeatureFromName(globeControl1, "trackPolygon"); + FeatureTools.RemoveFeatureFromName(globeControl1, "trackPolygon"); globeControl1.TrackPolygonEndEvent -= globeControl1_TrackPolygonEndEvent; globeControl1.Globe.Action = EnumAction3D.ActionNull; diff --git a/FrmAddWellShp.cs b/FrmAddWellShp.cs index 7983349..78d8946 100644 --- a/FrmAddWellShp.cs +++ b/FrmAddWellShp.cs @@ -100,7 +100,7 @@ catch (Exception ex) { LogError.PublishError(ex); - LogHelper.WriteLog(typeof(FrmAddWellShp), ex.Message); + LogHelper.Error(ex.Message); } } diff --git a/FrmBSQStatis.cs b/FrmBSQStatis.cs index 5b05926..b5e581d 100644 --- a/FrmBSQStatis.cs +++ b/FrmBSQStatis.cs @@ -97,7 +97,7 @@ } catch (Exception ex) { - LogHelper.WriteLog(typeof(FrmBSQStatis),ex.Message); + LogHelper.Error(ex.Message); } return typeAndCount; } @@ -108,7 +108,7 @@ GSOLayer layer = globeControl1.Globe.Layers.GetLayerByCaption("标识器"); GSOFeatures bsqFs = FeatureStatisticsService.GetLayerFeatures(polygon, layer); if (bsqFs == null || bsqFs.Length <= 0) { - LogHelper.WriteLog(typeof(FrmBSQStatis),"标识器图层下的Feature为空"); + LogHelper.Error("标识器图层下的Feature为空!"); return null; } diff --git a/FrmBasicQuery.cs b/FrmBasicQuery.cs index baeeade..cc8d3ff 100644 --- a/FrmBasicQuery.cs +++ b/FrmBasicQuery.cs @@ -224,7 +224,7 @@ } catch(Exception ex) { - LogHelper.WriteLog(typeof(FrmBasicQuery), ex.Message); + LogHelper.Error(ex.Message); } } else diff --git a/FrmCodingQuery.cs b/FrmCodingQuery.cs index f1ac322..d4ec095 100644 --- a/FrmCodingQuery.cs +++ b/FrmCodingQuery.cs @@ -82,7 +82,7 @@ } catch (Exception ex) { - LogHelper.WriteLog(typeof(FrmCodingQuery), ex.Message); ; + LogHelper.Error(ex.Message); } } diff --git a/FrmDiameterQuery.cs b/FrmDiameterQuery.cs index e7b3657..75d7949 100644 --- a/FrmDiameterQuery.cs +++ b/FrmDiameterQuery.cs @@ -150,7 +150,7 @@ catch (Exception ex) { //LogError.PublishError(ex); - LogHelper.WriteLog(typeof(FrmDiameterQuery), ex.Message); + LogHelper.Error(ex.Message); MessageBox.Show("请输入正确的管径范围！"); return; } diff --git a/FrmFittingQuery.cs b/FrmFittingQuery.cs index 12f6007..8645011 100644 --- a/FrmFittingQuery.cs +++ b/FrmFittingQuery.cs @@ -69,7 +69,7 @@ } catch (Exception ex) { - LogHelper.WriteLog(typeof(FrmFittingQuery), ex.Message); + LogHelper.Error(ex.Message); } } /// diff --git a/FrmKeywordQuery.cs b/FrmKeywordQuery.cs index 405524f..ede0a93 100644 --- a/FrmKeywordQuery.cs +++ b/FrmKeywordQuery.cs @@ -87,7 +87,7 @@ } catch (Exception ex) { - LogHelper.WriteLog(typeof(FrmKeywordQuery), ex.Message); + LogHelper.Error(ex.Message); } } diff --git a/FrmLogin.cs b/FrmLogin.cs index 1172c23..6fbaed9 100644 --- a/FrmLogin.cs +++ b/FrmLogin.cs @@ -2,6 +2,8 @@ using System.Data; using System.Data.OracleClient; using System.IO; +using System.Net; +using System.Text; using System.Windows.Forms; using System.Xml; using DevComponents.DotNetBar; @@ -10,16 +12,15 @@ { public partial class FrmLogin : Office2007Form { + + //登录界面 -- 配置文件的路径 + public static string filename = Application.StartupPath + "\\login.xml"; + + public FrmLogin() { InitializeComponent(); } - public string rolename = "浏览"; - public string username = ""; - public string department = ""; - - //登录界面 -- 配置文件的路径 - public static string filename = Application.StartupPath + "\\login.xml"; /// /// 登录按钮事件处理 /// @@ -28,9 +29,10 @@ private void button1_Click(object sender, EventArgs e) { bool result = ValidateUser(); +// bool result =ValidateFromUrl();//从平台获取用户角色信息，判断是否能登陆成功 if (result) { - username = txtUser.Text.Trim(); + WriteXml(); Utility.userName = txtUser.Text.Trim(); DialogResult = DialogResult.OK; Close(); @@ -43,80 +45,6 @@ } } /// - /// 关闭按钮事件处理 - /// - /// - /// - private void button2_Click(object sender, EventArgs e) - { - Close(); - } - /// - /// 验证端口号 - /// - /// - //private bool ValiPort() - //{ - // Ping p = new Ping();//创建Ping对象p - // PingReply pr = p.Send(Utility.localicenseserverip);//向指定IP或者主机名的计算机发送ICMP协议的ping数据包 - // if (pr.Status == IPStatus.Success)//如果ping成功 - // { - // try - // { - // TcpClient tcpc = new TcpClient(Utility.localicenseserverip, Utility.localicenseserverport);//对IP地址为"192.168.0.105"的计算机的1500端口提出连接申请 - // tcpc.Close(); - // return true; - // } - // catch (Exception ex) - // { - // LogError.PublishError(ex); - // MessageBox.Show("端口连接错误！" + ex.Message); - // return false; - // } - // } - // else - // { - // int times = 0;//重新连接次数; - // int count = 2;//设置尝试次数 - // while (times < count) - // { - // //Thread.Sleep(1000);//等待时间(方便测试的话，你可以改为1000) - // pr = p.Send(Utility.localicenseserverip); - - // if (pr.Status == IPStatus.Success) - // { - // try - // { - // TcpClient tcpc = new TcpClient(Utility.localicenseserverip, Utility.localicenseserverport);//对IP地址为"192.168.0.105"的计算机的1500端口提出连接申请 - // tcpc.Close(); - // return true; - // } - // catch (Exception ex) - // { - // LogError.PublishError(ex); - // MessageBox.Show("端口连接错误！" + ex.Message); - // return false; - // } - // } - // else - // { - // times++; - // if (times < count) - // { - // continue; - // } - // else - // { - // MessageBox.Show("重新尝试连接失败"); - // return false; - // } - // } - - // } - // return false; - // } - //} - /// /// 验证用户名、密码 /// /// @@ -126,24 +54,64 @@ string sql = "select * from casic_userinfotest where USERNAME='" + txtUser.Text.Trim() + "' and PASSWORD='" + passWord + "' and sysname='GHFX' "; DataTable dt = OledbHelper.QueryTable(sql); - if (dt != null && dt.Rows.Count > 0) + if (dt == null || dt.Rows.Count <= 0) return false; + if (String.IsNullOrEmpty(dt.Rows[0]["rid"].ToString())) return true; + sql = "select gid from casic_userroletest where id=" + dt.Rows[0]["rid"] + " and sysname='GHFX' "; + using (OracleDataReader reader = OracleUtils.ExecuteReader(OracleUtils.ConnectionString, CommandType.Text, sql)) { - WriteXML(); - if (!String.IsNullOrEmpty(dt.Rows[0]["rid"].ToString())) + while (reader.Read()) { - sql = "select gid from casic_userroletest where id=" + dt.Rows[0]["rid"] + " and sysname='GHFX' "; - using (OracleDataReader reader = OracleUtils.ExecuteReader(OracleUtils.ConnectionString, CommandType.Text, sql)) - { - while (reader.Read()) - { - Utility.userRole = reader[0].ToString(); - break; - } - } + Utility.userRole = reader[0].ToString(); + LogHelper.Debug("测试一下"); + break; } - return true; } - return false; + return true; + } + + + + private bool ValidateFromUrl() + { + string user = txtUser.Text.Trim(); + string pwd = textBoxPassWord.Text.Trim(); + //做成配置的 + string roleserver = Utility.RoleServer; + if (roleserver == null || roleserver.Trim().Equals("")) + { + MessageBox.Show("请在Config.xml中配置roleurl！"); + return false; + } + HttpWebRequest request = + WebRequest.Create(roleserver+"/rs/authority/user?username=" + user + "&password=" + pwd + "&appId=21") as HttpWebRequest; + if (request == null) return false; + using (HttpWebResponse response = request.GetResponse() as HttpWebResponse) + { + try + { + if (response == null || response.GetResponseStream() == null) return false; + StreamReader reader = new StreamReader(response.GetResponseStream()); + string[] result = reader.ReadToEnd().Split(','); + //解析result + if (result.Length < 5) return false; + StringBuilder userRole = new StringBuilder(""); + for (int i = 4; i < result.Length; i++) + { + string[] tmpStrings = result[i].Split('_'); + if (tmpStrings.Length < 2) continue; + userRole.Append(tmpStrings[1].Trim() + ","); + } + if (userRole.Length < 3) return false; + userRole.Remove(userRole.Length - 3, 3); + // MessageBox.Show(userRole.ToString()); + Utility.userRole = userRole.ToString(); + return Utility.userRole != null && !Utility.userRole.Equals("null"); + } + catch (Exception e) + { + return false; + } + } } private void FrmLogin_Load(object sender, EventArgs e) @@ -153,74 +121,56 @@ StartPosition = FormStartPosition.CenterScreen; - ReadXML(); + ReadXml(); } /// /// 读取上一次登录的用户名和密码 /// - private void ReadXML() + private void ReadXml() { - if (File.Exists(filename)) + if (!File.Exists(filename)) return; + //初始化XML文档操作类 + XmlDocument myDoc = new XmlDocument(); { - if (!File.Exists(filename)) + //加载XML文件 + try { + myDoc.Load(filename); + } + catch (Exception e) + { + LogError.PublishError(e); return; } - - //初始化XML文档操作类 - XmlDocument myDoc = new XmlDocument(); + //搜索指定的节点 + XmlNode serverRootNode = myDoc.SelectSingleNode("Params"); + XmlNodeList nodes = null; + if (serverRootNode != null) { - //加载XML文件 - try + nodes = serverRootNode.ChildNodes; + } + if (nodes == null) return; + foreach (XmlNode xn in nodes) + { + if (xn.Name.Equals("username")) { - myDoc.Load(filename); + txtUser.Text = xn.InnerText.Trim(); } - catch (Exception e) + else if (xn.Name.Equals("password")) { - LogError.PublishError(e); - return; + textBoxPassWord.Text = xn.InnerText.Trim(); } - //搜索指定的节点 - XmlNode serverRootNode = myDoc.SelectSingleNode("Params"); - XmlNodeList nodes = null; - if (serverRootNode != null) + else if (xn.Name.Equals("isremember")) { - nodes = serverRootNode.ChildNodes; - } - if (nodes != null) - { - foreach (XmlNode xn in nodes) - { - if (xn.Name == "username") - { - txtUser.Text = xn.InnerText.Trim(); - } - else if (xn.Name == "password") - { - textBoxPassWord.Text = xn.InnerText.Trim(); - } - else if (xn.Name == "isremember") - { - if (xn.InnerText.Trim() == "true") - { - checkBoxXRememberPassword.Checked = true; - } - else if (xn.InnerText.Trim() == "false") - { - checkBoxXRememberPassword.Checked = false; - } - } - } - + checkBoxXRememberPassword.Checked = xn.InnerText.Trim().Equals("true"); } } } - } /// /// 记录登录的用户名和密码 /// - private void WriteXML() + private void WriteXml() { if (!File.Exists(filename)) { @@ -252,31 +202,17 @@ foreach (XmlNode xn in nodes) { XmlElement xe = (XmlElement)xn; - if (xe.Name == "username") + if (xe.Name.Equals("username")) { xe.InnerText = txtUser.Text.Trim(); } - else if (xe.Name == "password") + else if (xe.Name.Equals("password")) { - if (checkBoxXRememberPassword.Checked) - { - xe.InnerText = textBoxPassWord.Text.Trim(); - } - else - { - xe.InnerText = ""; - } + xe.InnerText = checkBoxXRememberPassword.Checked ? textBoxPassWord.Text.Trim() : ""; } - else if (xe.Name == "isremember") + else if (xe.Name.Equals("isremember")) { - if (checkBoxXRememberPassword.Checked) - { - xe.InnerText = "true"; - } - else - { - xe.InnerText = "false"; - } + xe.InnerText = checkBoxXRememberPassword.Checked ? "true" : "false"; } } } diff --git a/FrmMaterialSel.cs b/FrmMaterialSel.cs index 8645ab3..d23f385 100644 --- a/FrmMaterialSel.cs +++ b/FrmMaterialSel.cs @@ -157,7 +157,7 @@ } catch (Exception ex) { - LogHelper.WriteLog(typeof(FrmMaterialSel), ex.Message); + LogHelper.Error(ex.Message); } } diff --git a/FrmMetadataStat.cs b/FrmMetadataStat.cs index c3c1359..96029a6 100644 --- a/FrmMetadataStat.cs +++ b/FrmMetadataStat.cs @@ -96,7 +96,7 @@ //统计有多少个图层 private int statistLayer() { - List datasrcs = Utility.layerConfig.datasrcs; + List datasrcs = Utility.LayerConfig.datasrcs; return datasrcs.SelectMany(datasrc => datasrc.layertypes).Sum(layerType => layerType.layers.Count); } diff --git a/FrmpipeDeepstatis.cs b/FrmpipeDeepstatis.cs index 6a5c895..8d915a9 100644 --- a/FrmpipeDeepstatis.cs +++ b/FrmpipeDeepstatis.cs @@ -2,6 +2,7 @@ using System.Collections.Generic; using System.Diagnostics; using System.IO; +using System.Reflection; using System.Text; using System.Windows.Forms; using System.Windows.Forms.DataVisualization.Charting; @@ -320,7 +321,7 @@ MessageBox.Show("请添加分段"); return; } - Utility.RemoveFeatureFromName(globeControl1, "trackPolygon"); + FeatureTools.RemoveFeatureFromName(globeControl1, "trackPolygon"); globeControl1.Globe.Action = EnumAction3D.TrackPolygon; globeControl1.Globe.TrackPolygonTool.TrackMode = EnumTrackMode.SpaceTrack; globeControl1.TrackPolygonEndEvent += globeControl1_TrackPolygonEndEvent; @@ -408,12 +409,11 @@ TextBox control; private void dataGridViewX2_EditingControlShowing(object sender, DataGridViewEditingControlShowingEventArgs e) { - if (e.Control.GetType().BaseType.Name == "TextBox") - { - control = new TextBox(); - control = (TextBox)e.Control; - control.KeyPress += control_KeyPress; - } + MemberInfo memberInfo = e.Control.GetType().BaseType; + if (memberInfo != null && !memberInfo.Name.Equals("TextBox")) return; + control = new TextBox(); + control = (TextBox)e.Control; + control.KeyPress += control_KeyPress; } /// /// 键盘按键按下事件处理 @@ -423,28 +423,24 @@ void control_KeyPress(object sender, KeyPressEventArgs e) { TextBox text = sender as TextBox; + if (text == null) return; if ((e.KeyChar < 48 || e.KeyChar > 57) && (e.KeyChar != 8) && e.KeyChar != 46) { e.Handled = true; } - if (e.KeyChar == 46) //小数点 + if (e.KeyChar != 46) return; + if (text.Text.Length <= 0) + e.Handled = true; //小数点不能在第一位 + else //处理不规则的小数点 { - if (text.Text.Length <= 0) - e.Handled = true; //小数点不能在第一位 - else //处理不规则的小数点 + float f; + float oldf; + bool b1 = false, b2 = false; + b1 = float.TryParse(text.Text, out oldf); + b2 = float.TryParse(text.Text + e.KeyChar, out f); + if (!b2) { - float f; - float oldf; - bool b1 = false, b2 = false; - b1 = float.TryParse(text.Text, out oldf); - b2 = float.TryParse(text.Text + e.KeyChar, out f); - if (b2 == false) - { - if (b1) - e.Handled = true; - else - e.Handled = false; - } + e.Handled = b1; } } } @@ -457,7 +453,7 @@ { frm = null; - Utility.RemoveFeatureFromName(globeControl1, "trackPolygon"); + FeatureTools.RemoveFeatureFromName(globeControl1, "trackPolygon"); globeControl1.TrackPolygonEndEvent -= globeControl1_TrackPolygonEndEvent; globeControl1.Globe.Action = EnumAction3D.ActionNull; diff --git a/FrmpipeDiametergather.cs b/FrmpipeDiametergather.cs index a9d96fa..c09aaf1 100644 --- a/FrmpipeDiametergather.cs +++ b/FrmpipeDiametergather.cs @@ -154,7 +154,7 @@ MessageBox.Show("请选择图层！"); return; } - Utility.RemoveFeatureFromName(globeControl1, "trackPolygon"); + FeatureTools.RemoveFeatureFromName(globeControl1, "trackPolygon"); globeControl1.Globe.Action = EnumAction3D.TrackPolygon; globeControl1.Globe.TrackPolygonTool.TrackMode = EnumTrackMode.SpaceTrack; globeControl1.TrackPolygonEndEvent += globeControl1_TrackPolygonEndEvent; @@ -392,7 +392,7 @@ private void FrmpipeDiametergather_FormClosing(object sender, FormClosingEventArgs e) { frm = null; - Utility.RemoveFeatureFromName(globeControl1, "trackPolygon"); + FeatureTools.RemoveFeatureFromName(globeControl1, "trackPolygon"); globeControl1.TrackPolygonEndEvent -= globeControl1_TrackPolygonEndEvent; globeControl1.Globe.Action = EnumAction3D.ActionNull; diff --git a/FrmpipeMaterialGather.cs b/FrmpipeMaterialGather.cs index 44e7f24..5ca8144 100644 --- a/FrmpipeMaterialGather.cs +++ b/FrmpipeMaterialGather.cs @@ -58,10 +58,9 @@ for (int i = 0; i < pipeLayerNames.Count; i++) { clbPipeLine.Items.Add(pipeLayerNames[i]); - GSOLayer layer = globeControl1.Globe.Layers.GetLayerByCaption(pipeLayerNames[i]); - if (layer.Dataset == null || !layer.Dataset.IsFeatureDataset || layer.Type != EnumLayerType.FeatureLayer) continue; + GSOLayer layer = globeControl1.Globe.Layers.GetLayerByCaption(pipeLayerNames[i]); + if (layer == null || layer.Dataset == null || !layer.Dataset.IsFeatureDataset || layer.Type != EnumLayerType.FeatureLayer) continue; - string name = layer.Name; GSOFeatureLayer flayer = layer as GSOFeatureLayer; GSOFeatures feats = flayer.GetAllFeatures(); @@ -205,7 +204,7 @@ { chart1.Series.Add(clbPipeLine.CheckedItems[i].ToString()); GSOLayer layer = globeControl1.Globe.Layers.GetLayerByCaption(clbPipeLine.CheckedItems[i].ToString()); - if (layer != null && layer is GSOFeatureLayer) + if (layer is GSOFeatureLayer) { GSOFeatureLayer flayer = layer as GSOFeatureLayer; GSOFeatures features = flayer.GetAllFeatures(); @@ -240,10 +239,9 @@ labeStyleAxisX.Enabled = true; chart1.ChartAreas["ChartArea1"].AxisX.LabelStyle = labeStyleAxisX; - Dictionary dic1 = new Dictionary(); for (int j = 0; j < chart1.Series.Count; j++) { - dic1 = new Dictionary(); + Dictionary dic1 = new Dictionary(); foreach (string key in dic.Keys) { if (key.Contains(chart1.Series[j].Name)) @@ -304,7 +302,7 @@ MessageBox.Show("请选择材质类型！"); return; } - Utility.RemoveFeatureFromName(globeControl1, "trackPolygon"); + FeatureTools.RemoveFeatureFromName(globeControl1, "trackPolygon"); globeControl1.Globe.Action = EnumAction3D.TrackPolygon; globeControl1.Globe.TrackPolygonTool.TrackMode = EnumTrackMode.SpaceTrack; globeControl1.TrackPolygonEndEvent += globeControl1_TrackPolygonEndEvent; @@ -318,7 +316,7 @@ private void FrmpipeMaterialGather_FormClosing(object sender, FormClosingEventArgs e) { frm = null; - Utility.RemoveFeatureFromName(globeControl1, "trackPolygon"); + FeatureTools.RemoveFeatureFromName(globeControl1, "trackPolygon"); globeControl1.TrackPolygonEndEvent -= globeControl1_TrackPolygonEndEvent; globeControl1.Globe.Action = EnumAction3D.ActionNull; diff --git a/Frmpipediameterstatis.cs b/Frmpipediameterstatis.cs index 4fb25a8..631a996 100644 --- a/Frmpipediameterstatis.cs +++ b/Frmpipediameterstatis.cs @@ -202,8 +202,8 @@ } catch (Exception ex) { - LogHelper.WriteLog(typeof(Frmpipediameterstatis), ex.Message); //MessageBox.Show(ex.Message); + LogHelper.Error(ex.Message); LogError.PublishError(ex); } } @@ -372,7 +372,7 @@ MessageBox.Show("请添加分段！"); return; } - Utility.RemoveFeatureFromName(globeControl1, "trackPolygon"); + FeatureTools.RemoveFeatureFromName(globeControl1, "trackPolygon"); globeControl1.Globe.Action = EnumAction3D.TrackPolygon; globeControl1.Globe.TrackPolygonTool.TrackMode = EnumTrackMode.SpaceTrack; globeControl1.TrackPolygonEndEvent += globeControl1_TrackPolygonEndEvent; @@ -422,7 +422,7 @@ globeControl1.Globe.Action = EnumAction3D.ActionNull; globeControl1.TrackPolygonEndEvent -= globeControl1_TrackPolygonEndEvent; - Utility.RemoveFeatureFromName(globeControl1, "trackPolygon"); + FeatureTools.RemoveFeatureFromName(globeControl1, "trackPolygon"); globeControl1.Globe.MemoryLayer.RemoveAllFeature(); } diff --git a/LineBuilder.cs b/LineBuilder.cs index 33a216c..b6a8516 100644 --- a/LineBuilder.cs +++ b/LineBuilder.cs @@ -43,8 +43,8 @@ GSOGeoPolyline3D lineeee = f.Geometry as GSOGeoPolyline3D; if (lineeee == null || lineeee.GetSpaceLength(true, 6378137) == 0) { - LogHelper.WriteLog(typeof(LineBuilder), "出现数据无法入库:"+f.ID); - continue; //TODO LIST:判断是否会出现部署数据无法入库情况,Log2Net + LogHelper.Error("出现数据无法入库:" + f.ID); + continue; } GSOFeature newFeature = newFeatureSet.CreateFeature(); diff --git a/LogHelper.cs b/LogHelper.cs index 9ef5f27..04573cf 100644 --- a/LogHelper.cs +++ b/LogHelper.cs @@ -1,4 +1,5 @@ using System; +using System.Diagnostics; using log4net; using log4net.Config; @@ -7,35 +8,82 @@ { public class LogHelper { - /// - /// 输出日志到Log4Net - /// - /// - /// - #region static void WriteLog(Type t, Exception ex) - public static void WriteLog(Type t, Exception ex) + private static ILog _logdebug = log4net.LogManager.GetLogger("logdebug"); + private static ILog _loginfo = log4net.LogManager.GetLogger("loginfo"); + private static ILog _logwarn = log4net.LogManager.GetLogger("logwarn"); + private static ILog _logerror = log4net.LogManager.GetLogger("logerror"); + private static ILog _logfatal = log4net.LogManager.GetLogger("logfatal"); + + public static void Debug(string msg) { - ILog log = log4net.LogManager.GetLogger(t); - log.Error("Error", ex); + StackFrame sf = new StackFrame(1); + msg = string.Format("{0}.{1}:{2}", sf.GetMethod().ReflectedType.FullName, sf.GetMethod().Name, msg); + _logdebug.Debug(msg); + } + public static void Debug(string msg, Exception e) + { + StackFrame sf = new StackFrame(1); + msg = string.Format("{0}.{1}:{2}", sf.GetMethod().ReflectedType.FullName, sf.GetMethod().Name, msg); + _logdebug.Debug(msg, e); } - #endregion - /// - /// 输出日志到Log4Net - /// - /// - /// - #region static void WriteLog(Type t, string msg) - - public static void WriteLog(Type t, string msg) + public static void Info(string msg) { - ILog log = log4net.LogManager.GetLogger(t); - log.Error(msg); + StackFrame sf = new StackFrame(1); + msg = string.Format("{0}.{1}:{2}", sf.GetMethod().ReflectedType.FullName, sf.GetMethod().Name, msg); + _loginfo.Info(msg); + } + public static void Info(string msg, Exception e) + { + StackFrame sf = new StackFrame(1); + msg = string.Format("{0}.{1}:{2}", sf.GetMethod().ReflectedType.FullName, sf.GetMethod().Name, msg); + _loginfo.Info(msg, e); } - #endregion + + public static void Warn(string msg) + { + StackFrame sf = new StackFrame(1); + msg = string.Format("{0}.{1}:{2}", sf.GetMethod().ReflectedType.FullName, sf.GetMethod().Name, msg); + _logwarn.Warn(msg); + } + public static void Warn(string msg, Exception e) + { + StackFrame sf = new StackFrame(1); + msg = string.Format("{0}.{1}:{2}", sf.GetMethod().ReflectedType.FullName, sf.GetMethod().Name, msg); + _logwarn.Warn(msg, e); + } + + + public static void Error(string msg) + { + StackFrame sf = new StackFrame(1); + msg = string.Format("{0}.{1}:{2}", sf.GetMethod().ReflectedType.FullName, sf.GetMethod().Name, msg); + _logerror.Error(msg); + } + public static void Error(string msg, Exception e) + { + StackFrame sf = new StackFrame(1); + msg = string.Format("{0}.{1}:{2}", sf.GetMethod().ReflectedType.FullName, sf.GetMethod().Name, msg); + _logerror.Error(msg, e); + } + + + public static void Fatal(string msg) + { + StackFrame sf = new StackFrame(1); + msg = string.Format("{0}.{1}:{2}", sf.GetMethod().ReflectedType.FullName, sf.GetMethod().Name, msg); + _logfatal.Fatal(msg); + } + public static void Fatal(string msg, Exception e) + { + StackFrame sf = new StackFrame(1); + msg = string.Format("{0}.{1}:{2}", sf.GetMethod().ReflectedType.FullName, sf.GetMethod().Name, msg); + _logfatal.Fatal(msg, e); + } + } diff --git a/MainFrm.cs b/MainFrm.cs index 43de664..51f362a 100644 --- a/MainFrm.cs +++ b/MainFrm.cs @@ -18,7 +18,6 @@ using GeoScene.Data; using GeoScene.Engine; using GeoScene.Globe; -using Timer = System.Windows.Forms.Timer; using ToolTip = System.Windows.Forms.ToolTip; namespace Cyberpipe @@ -163,6 +162,7 @@ /// private void AddGZ() { + lendendGZ50 = new GSOHudButton(); lendendGZ50.SetImage(Application.StartupPath + "/Resource/管纵/50.png"); lendendGZ50.SetOffset(0, 0); @@ -1294,18 +1294,19 @@ private void MainFrm_Load(object sender, EventArgs e) { + layerTree.Nodes.Add("正在加载，请稍后……");//树状图加载在图层加载之后，故增加提示 initGlobalControl(); - //initGlobalMap(); - //initLayerTree(); initMarkerTree(); initLayout(); loadData(); - double x = Convert.ToDouble(Utility.Query_Roads["定位"].ToString().Split(',')[0]); - double y = Convert.ToDouble(Utility.Query_Roads["定位"].ToString().Split(',')[1]); - double z = Convert.ToDouble(Utility.Query_Roads["定位"].ToString().Split(',')[2]); + + double x = Convert.ToDouble(Utility.Query_Roads["绿岛"].ToString().Split(',')[0]); + double y = Convert.ToDouble(Utility.Query_Roads["绿岛"].ToString().Split(',')[1]); + double z = Convert.ToDouble(Utility.Query_Roads["绿岛"].ToString().Split(',')[2]); jumpToCameraState(x, y, z); + } #endregion @@ -1315,11 +1316,17 @@ if (e.Layer == null || !e.Layer.Caption.Equals(Utility.roadLayerName)) return; foreach (TreeNode layerTreeNode in layerTree.Nodes) { - foreach (TreeNode node in layerTreeNode.Nodes) + for (int i=0;i dt, DataGridView dataGridView) @@ -7330,7 +7337,7 @@ } catch (Exception ex) { - LogHelper.WriteLog(typeof(MainFrm), ex); + LogHelper.Debug("", ex); } } } @@ -7362,7 +7369,7 @@ GSOLayer layer = globeControl1.Globe.Layers.Add(strDataPath); if (layer == null) {//wxl - LogHelper.WriteLog(typeof(MainFrm), "buttonItemHX1_Click操作中，" + strDataPath + "的layer为空"); + LogHelper.Error("buttonItemHX1_Click操作中，" + strDataPath + "的layer为空"); continue; } GSOFeatures redFeatures = layer.GetAllFeatures(); @@ -7457,17 +7464,12 @@ { try { + globeControl1.BeforeSceneRenderEvent -= globeControl1_BeforeSceneRenderEvent; globeControl2.BeforeSceneRenderEvent -= globeControl2_BeforeSceneRenderEvent; - double x = Convert.ToDouble(Utility.Query_Roads["定位"].ToString().Split(',')[0]); - double y = Convert.ToDouble(Utility.Query_Roads["定位"].ToString().Split(',')[1]); - double z = Convert.ToDouble(Utility.Query_Roads["定位"].ToString().Split(',')[2]); - jumpToCameraState(x, y, z); - /* globeControl1.Globe.FlyToPosition(new GSOPoint3d(120.610963, 31.188121, 50), EnumAltitudeMode.Absolute, -4, 50, 800); globeControl1.Globe.FlyToPointSpeed = 10000000; - * */ globeControl1.Globe.Action = EnumAction3D.SelectObject; globeControl1.Refresh(); @@ -7489,6 +7491,37 @@ } } /// + /// 基础工具 + /// + /// + /// + private void ribbonTabItem1_MouseDown(object sender, MouseEventArgs e) + { + try + { + + globeControl1.BeforeSceneRenderEvent -= globeControl1_BeforeSceneRenderEvent; + globeControl2.BeforeSceneRenderEvent -= globeControl2_BeforeSceneRenderEvent; + + globeControl1.Globe.Action = EnumAction3D.ActionNull; + dataGridViewX1.AutoSizeColumnsMode = DataGridViewAutoSizeColumnsMode.AllCells; + //zhanshi = false; + redSH = false; + splitContainer1.Panel2Collapsed = true; + panelOfTable.Visible = false; + legendSC.Visible = false; + legendSG.Visible = false; + ClearGZData(); + GSOLayer redLayer = globeControl1.Globe.Layers.GetLayerByCaption("红线"); + if (redLayer == null) return; + redLayer.Visible = false; + } + catch (Exception ex) + { + //MessageBox.Show("系统运行错误:" + ex.ToString(), "错误", MessageBoxButtons.OK, MessageBoxIcon.Error); + } + } + /// /// 一键审核 /// /// @@ -7497,6 +7530,7 @@ { try { + globeControl1.BeforeSceneRenderEvent -= globeControl1_BeforeSceneRenderEvent; globeControl2.BeforeSceneRenderEvent -= globeControl2_BeforeSceneRenderEvent; @@ -7518,32 +7552,7 @@ //MessageBox.Show("系统运行错误:" + ex.ToString(), "错误", MessageBoxButtons.OK, MessageBoxIcon.Error); } } - - void ResetRibbonTab() - { - try - { - globeControl1.BeforeSceneRenderEvent -= globeControl1_BeforeSceneRenderEvent; - globeControl2.BeforeSceneRenderEvent -= globeControl2_BeforeSceneRenderEvent; - - globeControl1.Globe.Action = EnumAction3D.ActionNull; - dataGridViewX1.AutoSizeColumnsMode = DataGridViewAutoSizeColumnsMode.AllCells; - //zhanshi = false; - redSH = false; - splitContainer1.Panel2Collapsed = true; - panelOfTable.Visible = false; - legendSC.Visible = false; - legendSG.Visible = false; - ClearGZData(); - GSOLayer redLayer = globeControl1.Globe.Layers.GetLayerByCaption("红线"); - if (redLayer == null) return; - redLayer.Visible = false; - } - catch (Exception ex) - { - LogHelper.WriteLog(typeof(MainFrm), ex); - } - } + /// /// 双屏对比 /// @@ -7553,8 +7562,8 @@ { try { - globeControl1.BeforeSceneRenderEvent += new BeforeSceneRenderEventHandler(globeControl1_BeforeSceneRenderEvent); - globeControl2.BeforeSceneRenderEvent += new BeforeSceneRenderEventHandler(globeControl2_BeforeSceneRenderEvent); + globeControl1.BeforeSceneRenderEvent += globeControl1_BeforeSceneRenderEvent; + globeControl2.BeforeSceneRenderEvent += globeControl2_BeforeSceneRenderEvent; globeControl1.Globe.Action = EnumAction3D.ActionNull; panelOfTable.Visible = false; @@ -7570,32 +7579,43 @@ GSOLayer redLayer = globeControl1.Globe.Layers.GetLayerByCaption("红线"); if (redLayer != null) - { redLayer.Visible = false; - } } catch (Exception ex) { - LogHelper.WriteLog(typeof(MainFrm), ex); + //MessageBox.Show("系统运行错误:" + ex.ToString(), "错误", MessageBoxButtons.OK, MessageBoxIcon.Error); } } /// - /// 基础工具 - /// - /// - /// - private void ribbonTabItem1_MouseDown(object sender, MouseEventArgs e) - { - ResetRibbonTab(); - } - /// /// 文档管理 /// /// /// private void ribbonTabItem4_MouseDown(object sender, MouseEventArgs e) { - ResetRibbonTab(); + try + { + + globeControl1.BeforeSceneRenderEvent -= globeControl1_BeforeSceneRenderEvent; + globeControl2.BeforeSceneRenderEvent -= globeControl2_BeforeSceneRenderEvent; + + globeControl1.Globe.Action = EnumAction3D.ActionNull; + panelOfTable.Visible = false; + //zhanshi = false; + redSH = false; + splitContainer1.Panel2Collapsed = true; + dataGridViewX1.AutoSizeColumnsMode = DataGridViewAutoSizeColumnsMode.AllCells; + legendSC.Visible = false; + legendSG.Visible = false; + ClearGZData(); + GSOLayer redLayer = globeControl1.Globe.Layers.GetLayerByCaption("红线"); + if (redLayer != null) + redLayer.Visible = false; + } + catch (Exception ex) + { + //MessageBox.Show("系统运行错误:" + ex.ToString(), "错误", MessageBoxButtons.OK, MessageBoxIcon.Error); + } } /// /// 基础管理 @@ -7604,7 +7624,29 @@ /// private void ribbonTabItem14_MouseDown(object sender, MouseEventArgs e) { - ResetRibbonTab(); + try + { + globeControl1.BeforeSceneRenderEvent -= globeControl1_BeforeSceneRenderEvent; + globeControl2.BeforeSceneRenderEvent -= globeControl2_BeforeSceneRenderEvent; + + globeControl1.Globe.Action = EnumAction3D.ActionNull; + panelOfTable.Visible = false; + //zhanshi = false; + redSH = false; + splitContainer1.Panel2Collapsed = true; + dataGridViewX1.AutoSizeColumnsMode = DataGridViewAutoSizeColumnsMode.AllCells; + legendSC.Visible = false; + legendSG.Visible = false; + ClearGZData(); + + GSOLayer redLayer = globeControl1.Globe.Layers.GetLayerByCaption("红线"); + if (redLayer != null) + redLayer.Visible = false; + } + catch (Exception ex) + { + //MessageBox.Show("系统运行错误:" + ex.ToString(), "错误", MessageBoxButtons.OK, MessageBoxIcon.Error); + } } /// /// 权限管理 @@ -7613,26 +7655,31 @@ /// private void ribbonTabItem2_MouseDown(object sender, MouseEventArgs e) { - ResetRibbonTab(); + try + { + globeControl1.BeforeSceneRenderEvent -= globeControl1_BeforeSceneRenderEvent; + globeControl2.BeforeSceneRenderEvent -= globeControl2_BeforeSceneRenderEvent; + + globeControl1.Globe.Action = EnumAction3D.ActionNull; + panelOfTable.Visible = false; + //zhanshi = false; + redSH = false; + splitContainer1.Panel2Collapsed = true; + dataGridViewX1.AutoSizeColumnsMode = DataGridViewAutoSizeColumnsMode.AllCells; + legendSC.Visible = false; + legendSG.Visible = false; + ClearGZData(); + + GSOLayer redLayer = globeControl1.Globe.Layers.GetLayerByCaption("红线"); + if (redLayer == null) return; + redLayer.Visible = false; + } + catch (Exception ex) + { + //MessageBox.Show("系统运行错误:" + ex.ToString(), "错误", MessageBoxButtons.OK, MessageBoxIcon.Error); + } } - /// - /// 管线定位 - /// - /// - /// - private void ribbonTabItem7_MouseDown(object sender, MouseEventArgs e) - { - ResetRibbonTab(); - } - /// - /// 标识器管理 - /// - /// - /// - private void ribbonTabItem5_MouseDown(object sender, MouseEventArgs e) - { - ResetRibbonTab(); - } + //GSOFeature dpFeatuer = null; /// /// 双屏分析，点击管段分析 @@ -8017,7 +8064,9 @@ private void btn_flag_Click(object sender, EventArgs e) { if (FrmFlagManagers.IS_OPEN) + { return; + } FrmFlagManagers frm = new FrmFlagManagers(globeControl1); frm.Show(this); } diff --git a/MainFrm.designer.cs b/MainFrm.designer.cs index e3dca41..73398c0 100644 --- a/MainFrm.designer.cs +++ b/MainFrm.designer.cs @@ -4,6 +4,7 @@ using DevComponents.DotNetBar; using DevComponents.DotNetBar.Controls; using DevComponents.Editors; +using System.Drawing; namespace Cyberpipe { @@ -89,6 +90,7 @@ this.sideBar1 = new DevComponents.DotNetBar.SideBar(); this.panelEx3 = new DevComponents.DotNetBar.PanelEx(); this.layerSensorTree = new System.Windows.Forms.TreeView(); + this.layerTree = new Cyberpipe.MyTreeView(); this.sideBarPanelItem3 = new DevComponents.DotNetBar.SideBarPanelItem(); this.controlContainerItem3 = new DevComponents.DotNetBar.ControlContainerItem(); this.sideBarPanelItem4 = new DevComponents.DotNetBar.SideBarPanelItem(); @@ -243,42 +245,18 @@ this.保存ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.定位ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.ribbonControl1 = new DevComponents.DotNetBar.RibbonControl(); - this.ribbonPanel6 = new DevComponents.DotNetBar.RibbonPanel(); - this.ribbonBar6 = new DevComponents.DotNetBar.RibbonBar(); - this.buttonItemSPSZ = new DevComponents.DotNetBar.ButtonItem(); - this.buttonItem8 = new DevComponents.DotNetBar.ButtonItem(); - this.buttonItemLocation = new DevComponents.DotNetBar.ButtonItem(); - this.sliderItem2 = new DevComponents.DotNetBar.SliderItem(); - this.buttonItemGBJC = new DevComponents.DotNetBar.ButtonItem(); - this.ribbonPanel5 = new DevComponents.DotNetBar.RibbonPanel(); - this.ribbonBar2 = new DevComponents.DotNetBar.RibbonBar(); - this.buttonItemHX1 = new DevComponents.DotNetBar.ButtonItem(); - this.buttonItemHX2 = new DevComponents.DotNetBar.ButtonItem(); - this.buttonItemDCTP = new DevComponents.DotNetBar.ButtonItem(); - this.sliderItem3 = new DevComponents.DotNetBar.SliderItem(); - this.ribbonPanel1 = new DevComponents.DotNetBar.RibbonPanel(); - this.ribbonBar21 = new DevComponents.DotNetBar.RibbonBar(); - this.buttonItem87 = new DevComponents.DotNetBar.ButtonItem(); - this.buttonItem88 = new DevComponents.DotNetBar.ButtonItem(); - this.buttonItem27 = new DevComponents.DotNetBar.ButtonItem(); - this.buttonItem91 = new DevComponents.DotNetBar.ButtonItem(); - this.buttonItem1 = new DevComponents.DotNetBar.ButtonItem(); - this.btnlegendSet = new DevComponents.DotNetBar.ButtonItem(); - this.buttonItem89 = new DevComponents.DotNetBar.ButtonItem(); - this.btnOutputJPG = new DevComponents.DotNetBar.ButtonItem(); - this.ribbonPanel12 = new DevComponents.DotNetBar.RibbonPanel(); - this.ribbonBar18 = new DevComponents.DotNetBar.RibbonBar(); - this.buttonItem133 = new DevComponents.DotNetBar.ButtonItem(); - this.ribbonBar13 = new DevComponents.DotNetBar.RibbonBar(); - this.buttonItem127 = new DevComponents.DotNetBar.ButtonItem(); - this.buttonItem128 = new DevComponents.DotNetBar.ButtonItem(); - this.sliderItem1 = new DevComponents.DotNetBar.SliderItem(); - this.buttonItem134 = new DevComponents.DotNetBar.ButtonItem(); - this.buttonItem130 = new DevComponents.DotNetBar.ButtonItem(); - this.btn_check_history = new DevComponents.DotNetBar.ButtonItem(); - this.ribbonPanel4 = new DevComponents.DotNetBar.RibbonPanel(); - this.ribbonBar1 = new DevComponents.DotNetBar.RibbonBar(); - this.btn_document_info = new DevComponents.DotNetBar.ButtonItem(); + this.ribbonPanel3 = new DevComponents.DotNetBar.RibbonPanel(); + this.ribbonBar4 = new DevComponents.DotNetBar.RibbonBar(); + this.btn_flag = new DevComponents.DotNetBar.ButtonItem(); + this.slider4ground = new DevComponents.DotNetBar.SliderItem(); + this.ribbonPanel7 = new DevComponents.DotNetBar.RibbonPanel(); + this.gxdw_ribbonbar = new DevComponents.DotNetBar.RibbonBar(); + this.buttonItem9 = new DevComponents.DotNetBar.ButtonItem(); + this.buttonItem10 = new DevComponents.DotNetBar.ButtonItem(); + this.buttonItem11 = new DevComponents.DotNetBar.ButtonItem(); + this.buttonItem12 = new DevComponents.DotNetBar.ButtonItem(); + this.buttonItem13 = new DevComponents.DotNetBar.ButtonItem(); + this.buttonItem14 = new DevComponents.DotNetBar.ButtonItem(); this.ribbonPanel15 = new DevComponents.DotNetBar.RibbonPanel(); this.ribbonBar20 = new DevComponents.DotNetBar.RibbonBar(); this.buttonItemSH = new DevComponents.DotNetBar.ButtonItem(); @@ -334,18 +312,6 @@ this.buttonItemXT4 = new DevComponents.DotNetBar.ButtonItem(); this.buttonItemXT4_1 = new DevComponents.DotNetBar.ButtonItem(); this.buttonItemXT4_2 = new DevComponents.DotNetBar.ButtonItem(); - this.ribbonPanel3 = new DevComponents.DotNetBar.RibbonPanel(); - this.ribbonBar4 = new DevComponents.DotNetBar.RibbonBar(); - this.btn_flag = new DevComponents.DotNetBar.ButtonItem(); - this.slider4ground = new DevComponents.DotNetBar.SliderItem(); - this.ribbonPanel7 = new DevComponents.DotNetBar.RibbonPanel(); - this.gxdw_ribbonbar = new DevComponents.DotNetBar.RibbonBar(); - this.buttonItem9 = new DevComponents.DotNetBar.ButtonItem(); - this.buttonItem10 = new DevComponents.DotNetBar.ButtonItem(); - this.buttonItem11 = new DevComponents.DotNetBar.ButtonItem(); - this.buttonItem12 = new DevComponents.DotNetBar.ButtonItem(); - this.buttonItem13 = new DevComponents.DotNetBar.ButtonItem(); - this.buttonItem14 = new DevComponents.DotNetBar.ButtonItem(); this.ribbonPanel2 = new DevComponents.DotNetBar.RibbonPanel(); this.ribbonBar3 = new DevComponents.DotNetBar.RibbonBar(); this.btn_user_info = new DevComponents.DotNetBar.ButtonItem(); @@ -355,6 +321,43 @@ this.btn_user_role = new DevComponents.DotNetBar.ButtonItem(); this.btn_password_edit = new DevComponents.DotNetBar.ButtonItem(); this.buttonItemPasswordReset = new DevComponents.DotNetBar.ButtonItem(); + this.ribbonPanel6 = new DevComponents.DotNetBar.RibbonPanel(); + this.ribbonBar6 = new DevComponents.DotNetBar.RibbonBar(); + this.buttonItemSPSZ = new DevComponents.DotNetBar.ButtonItem(); + this.buttonItem8 = new DevComponents.DotNetBar.ButtonItem(); + this.buttonItemLocation = new DevComponents.DotNetBar.ButtonItem(); + this.sliderItem2 = new DevComponents.DotNetBar.SliderItem(); + this.buttonItemGBJC = new DevComponents.DotNetBar.ButtonItem(); + this.ribbonPanel5 = new DevComponents.DotNetBar.RibbonPanel(); + this.ribbonBar2 = new DevComponents.DotNetBar.RibbonBar(); + this.buttonItemHX1 = new DevComponents.DotNetBar.ButtonItem(); + this.buttonItemHX2 = new DevComponents.DotNetBar.ButtonItem(); + this.buttonItemDCTP = new DevComponents.DotNetBar.ButtonItem(); + this.sliderItem3 = new DevComponents.DotNetBar.SliderItem(); + this.ribbonPanel1 = new DevComponents.DotNetBar.RibbonPanel(); + this.ribbonBar21 = new DevComponents.DotNetBar.RibbonBar(); + this.buttonItem87 = new DevComponents.DotNetBar.ButtonItem(); + this.buttonItem88 = new DevComponents.DotNetBar.ButtonItem(); + this.buttonItem27 = new DevComponents.DotNetBar.ButtonItem(); + this.buttonItem91 = new DevComponents.DotNetBar.ButtonItem(); + this.buttonItem1 = new DevComponents.DotNetBar.ButtonItem(); + this.btnlegendSet = new DevComponents.DotNetBar.ButtonItem(); + this.buttonItem89 = new DevComponents.DotNetBar.ButtonItem(); + this.btnOutputJPG = new DevComponents.DotNetBar.ButtonItem(); + this.ribbonPanel12 = new DevComponents.DotNetBar.RibbonPanel(); + this.ribbonBar18 = new DevComponents.DotNetBar.RibbonBar(); + this.buttonItem133 = new DevComponents.DotNetBar.ButtonItem(); + this.buttonItem132 = new DevComponents.DotNetBar.ButtonItem(); + this.ribbonBar13 = new DevComponents.DotNetBar.RibbonBar(); + this.buttonItem127 = new DevComponents.DotNetBar.ButtonItem(); + this.buttonItem128 = new DevComponents.DotNetBar.ButtonItem(); + this.sliderItem1 = new DevComponents.DotNetBar.SliderItem(); + this.buttonItem134 = new DevComponents.DotNetBar.ButtonItem(); + this.buttonItem130 = new DevComponents.DotNetBar.ButtonItem(); + this.btn_check_history = new DevComponents.DotNetBar.ButtonItem(); + this.ribbonPanel4 = new DevComponents.DotNetBar.RibbonPanel(); + this.ribbonBar1 = new DevComponents.DotNetBar.RibbonBar(); + this.btn_document_info = new DevComponents.DotNetBar.ButtonItem(); this.ribbonTabItem1 = new DevComponents.DotNetBar.RibbonTabItem(); this.ribbonTabItem11 = new DevComponents.DotNetBar.RibbonTabItem(); this.ribbonTabItem6 = new DevComponents.DotNetBar.RibbonTabItem(); @@ -516,7 +519,6 @@ this.labelX17 = new DevComponents.DotNetBar.LabelX(); this.panelEx4 = new DevComponents.DotNetBar.PanelEx(); this.pictureBox1 = new System.Windows.Forms.PictureBox(); - this.layerTree = new Cyberpipe.MyTreeView(); this.statusStrip1.SuspendLayout(); this.sideBar1.SuspendLayout(); this.panelEx3.SuspendLayout(); @@ -527,15 +529,15 @@ this.contextMenuStrip3.SuspendLayout(); this.contextMenuStripDeleteLayerNode.SuspendLayout(); this.ribbonControl1.SuspendLayout(); + this.ribbonPanel3.SuspendLayout(); + this.ribbonPanel7.SuspendLayout(); + this.ribbonPanel15.SuspendLayout(); + this.ribbonPanel2.SuspendLayout(); this.ribbonPanel6.SuspendLayout(); this.ribbonPanel5.SuspendLayout(); this.ribbonPanel1.SuspendLayout(); this.ribbonPanel12.SuspendLayout(); this.ribbonPanel4.SuspendLayout(); - this.ribbonPanel15.SuspendLayout(); - this.ribbonPanel3.SuspendLayout(); - this.ribbonPanel7.SuspendLayout(); - this.ribbonPanel2.SuspendLayout(); this.panelOfTable.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.dataGridViewX1)).BeginInit(); this.statusStrip2.SuspendLayout(); @@ -711,7 +713,8 @@ this.statusLabel.Name = "statusLabel"; this.statusLabel.Size = new System.Drawing.Size(1313, 17); this.statusLabel.Spring = true; - this.statusLabel.Text = " ©2014-2015 苏州航天系统工程有限公司 版权所有"; + this.statusLabel.Text = Utility.Copyright; +// this.statusLabel.Text = " ©2014-2015 苏州航天系统工程有限公司 版权所有"; // // toolStripDropDownButton1 // @@ -956,6 +959,18 @@ this.layerSensorTree.NodeMouseClick += new System.Windows.Forms.TreeNodeMouseClickEventHandler(this.layerMarkerTree_NodeMouseClick); this.layerSensorTree.NodeMouseDoubleClick += new System.Windows.Forms.TreeNodeMouseClickEventHandler(this.layerTree_NodeMouseDoubleClick); // + // layerTree + // + this.layerTree.CheckBoxes = true; + this.layerTree.ItemHeight = 18; + this.layerTree.Location = new System.Drawing.Point(30, 78); + this.layerTree.Name = "layerTree"; + this.layerTree.Size = new System.Drawing.Size(121, 97); + this.layerTree.TabIndex = 1; + this.layerTree.AfterCheck += new System.Windows.Forms.TreeViewEventHandler(this.layerTree_AfterCheck); + this.layerTree.NodeMouseClick += new System.Windows.Forms.TreeNodeMouseClickEventHandler(this.layerTree_NodeMouseClick); + this.layerTree.NodeMouseDoubleClick += new System.Windows.Forms.TreeNodeMouseClickEventHandler(this.layerTree_NodeMouseDoubleClick); + // // sideBarPanelItem3 // this.sideBarPanelItem3.FontBold = true; @@ -2150,13 +2165,13 @@ this.ribbonControl1.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.ribbonControl1.Controls.Add(this.ribbonPanel3); this.ribbonControl1.Controls.Add(this.ribbonPanel7); - this.ribbonControl1.Controls.Add(this.ribbonPanel2); this.ribbonControl1.Controls.Add(this.ribbonPanel15); - this.ribbonControl1.Controls.Add(this.ribbonPanel4); - this.ribbonControl1.Controls.Add(this.ribbonPanel1); + this.ribbonControl1.Controls.Add(this.ribbonPanel2); this.ribbonControl1.Controls.Add(this.ribbonPanel6); - this.ribbonControl1.Controls.Add(this.ribbonPanel12); this.ribbonControl1.Controls.Add(this.ribbonPanel5); + this.ribbonControl1.Controls.Add(this.ribbonPanel1); + this.ribbonControl1.Controls.Add(this.ribbonPanel12); + this.ribbonControl1.Controls.Add(this.ribbonPanel4); this.ribbonControl1.Dock = System.Windows.Forms.DockStyle.Top; this.ribbonControl1.ImeMode = System.Windows.Forms.ImeMode.NoControl; this.ribbonControl1.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { @@ -2200,609 +2215,216 @@ this.ribbonControl1.Text = "ribbonControl1"; this.ribbonControl1.UseCustomizeDialog = false; // - // ribbonPanel6 + // ribbonPanel3 // - this.ribbonPanel6.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.ribbonPanel6.Controls.Add(this.ribbonBar6); - this.ribbonPanel6.Dock = System.Windows.Forms.DockStyle.Fill; - this.ribbonPanel6.Location = new System.Drawing.Point(0, 0); - this.ribbonPanel6.Name = "ribbonPanel6"; - this.ribbonPanel6.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); - this.ribbonPanel6.Size = new System.Drawing.Size(1328, 95); + this.ribbonPanel3.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.ribbonPanel3.Controls.Add(this.ribbonBar4); + this.ribbonPanel3.Dock = System.Windows.Forms.DockStyle.Fill; + this.ribbonPanel3.Location = new System.Drawing.Point(0, 33); + this.ribbonPanel3.Name = "ribbonPanel3"; + this.ribbonPanel3.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); + this.ribbonPanel3.Size = new System.Drawing.Size(1328, 62); // // // - this.ribbonPanel6.Style.Class = ""; - this.ribbonPanel6.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonPanel3.Style.Class = ""; + this.ribbonPanel3.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; // // // - this.ribbonPanel6.StyleMouseDown.Class = ""; - this.ribbonPanel6.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonPanel3.StyleMouseDown.Class = ""; + this.ribbonPanel3.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; // // // - this.ribbonPanel6.StyleMouseOver.Class = ""; - this.ribbonPanel6.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonPanel6.TabIndex = 38; - this.ribbonPanel6.Visible = false; + this.ribbonPanel3.StyleMouseOver.Class = ""; + this.ribbonPanel3.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonPanel3.TabIndex = 40; // - // ribbonBar6 + // ribbonBar4 // - this.ribbonBar6.AutoOverflowEnabled = true; + this.ribbonBar4.AutoOverflowEnabled = true; // // // - this.ribbonBar6.BackgroundMouseOverStyle.Class = ""; - this.ribbonBar6.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar4.BackgroundMouseOverStyle.Class = ""; + this.ribbonBar4.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; // // // - this.ribbonBar6.BackgroundStyle.Class = ""; - this.ribbonBar6.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonBar6.ContainerControlProcessDialogKey = true; - this.ribbonBar6.Dock = System.Windows.Forms.DockStyle.Left; - this.ribbonBar6.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { - this.buttonItemSPSZ, - this.buttonItem8, - this.buttonItemLocation, - this.sliderItem2, - this.buttonItemGBJC}); - this.ribbonBar6.Location = new System.Drawing.Point(3, 0); - this.ribbonBar6.Name = "ribbonBar6"; - this.ribbonBar6.Size = new System.Drawing.Size(427, 92); - this.ribbonBar6.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.ribbonBar6.TabIndex = 0; + this.ribbonBar4.BackgroundStyle.Class = ""; + this.ribbonBar4.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar4.ContainerControlProcessDialogKey = true; + this.ribbonBar4.Dock = System.Windows.Forms.DockStyle.Left; + this.ribbonBar4.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { + this.btn_flag, + this.slider4ground}); + this.ribbonBar4.Location = new System.Drawing.Point(3, 0); + this.ribbonBar4.Name = "ribbonBar4"; + this.ribbonBar4.Size = new System.Drawing.Size(634, 59); + this.ribbonBar4.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.ribbonBar4.TabIndex = 0; // // // - this.ribbonBar6.TitleStyle.Class = ""; - this.ribbonBar6.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar4.TitleStyle.Class = ""; + this.ribbonBar4.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; // // // - this.ribbonBar6.TitleStyleMouseOver.Class = ""; - this.ribbonBar6.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonBar6.TitleVisible = false; + this.ribbonBar4.TitleStyleMouseOver.Class = ""; + this.ribbonBar4.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar4.TitleVisible = false; // - // buttonItemSPSZ + // btn_flag // - this.buttonItemSPSZ.Image = ((System.Drawing.Image)(resources.GetObject("buttonItemSPSZ.Image"))); - this.buttonItemSPSZ.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItemSPSZ.Name = "buttonItemSPSZ"; - this.buttonItemSPSZ.SubItemsExpandWidth = 14; - this.buttonItemSPSZ.Text = "双屏设置"; - this.buttonItemSPSZ.Click += new System.EventHandler(this.buttonItemSPSZ_Click); + this.btn_flag.Image = global::Cyberpipe.Properties.Resources._24x24icon_03_hover; + this.btn_flag.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.btn_flag.Name = "btn_flag"; + this.btn_flag.SubItemsExpandWidth = 14; + this.btn_flag.Text = "标识器管理"; + this.btn_flag.Click += new System.EventHandler(this.btn_flag_Click); // - // buttonItem8 + // slider4ground // - this.buttonItem8.Image = ((System.Drawing.Image)(resources.GetObject("buttonItem8.Image"))); - this.buttonItem8.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem8.Name = "buttonItem8"; - this.buttonItem8.SubItemsExpandWidth = 14; - this.buttonItem8.Text = "双屏分析"; - this.buttonItem8.Click += new System.EventHandler(this.buttonItem8_Click); + this.slider4ground.LabelPosition = DevComponents.DotNetBar.eSliderLabelPosition.Top; + this.slider4ground.LabelWidth = 50; + this.slider4ground.Name = "slider4ground"; + this.slider4ground.Text = "地面透明度"; + this.slider4ground.TextColor = System.Drawing.Color.Black; + this.slider4ground.Value = 0; + this.slider4ground.ValueChanged += new System.EventHandler(this.slider4ground_ValueChanged); // - // buttonItemLocation + // ribbonPanel7 // - this.buttonItemLocation.Image = ((System.Drawing.Image)(resources.GetObject("buttonItemLocation.Image"))); - this.buttonItemLocation.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItemLocation.Name = "buttonItemLocation"; - this.buttonItemLocation.SubItemsExpandWidth = 14; - this.buttonItemLocation.Text = "快速定位"; - this.buttonItemLocation.Click += new System.EventHandler(this.buttonItemLocation_Click); + this.ribbonPanel7.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.ribbonPanel7.Controls.Add(this.gxdw_ribbonbar); + this.ribbonPanel7.Dock = System.Windows.Forms.DockStyle.Fill; + this.ribbonPanel7.Location = new System.Drawing.Point(0, 33); + this.ribbonPanel7.Name = "ribbonPanel7"; + this.ribbonPanel7.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); + this.ribbonPanel7.Size = new System.Drawing.Size(1328, 62); // - // sliderItem2 // - this.sliderItem2.LabelPosition = DevComponents.DotNetBar.eSliderLabelPosition.Top; - this.sliderItem2.LabelWidth = 50; - this.sliderItem2.Name = "sliderItem2"; - this.sliderItem2.Text = "地面透明度"; - this.sliderItem2.TextColor = System.Drawing.Color.Black; - this.sliderItem2.Value = 0; - this.sliderItem2.ValueChanged += new System.EventHandler(this.sliderItem2_ValueChanged); // - // buttonItemGBJC + this.ribbonPanel7.Style.Class = ""; + this.ribbonPanel7.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; // - this.buttonItemGBJC.Image = ((System.Drawing.Image)(resources.GetObject("buttonItemGBJC.Image"))); - this.buttonItemGBJC.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItemGBJC.Name = "buttonItemGBJC"; - this.buttonItemGBJC.SubItemsExpandWidth = 14; - this.buttonItemGBJC.Text = "国标检测"; - this.buttonItemGBJC.Click += new System.EventHandler(this.buttonItemGBJC_Click); // - // ribbonPanel5 // - this.ribbonPanel5.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.ribbonPanel5.Controls.Add(this.ribbonBar2); - this.ribbonPanel5.Dock = System.Windows.Forms.DockStyle.Fill; - this.ribbonPanel5.Location = new System.Drawing.Point(0, 0); - this.ribbonPanel5.Name = "ribbonPanel5"; - this.ribbonPanel5.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); - this.ribbonPanel5.Size = new System.Drawing.Size(1328, 95); + this.ribbonPanel7.StyleMouseDown.Class = ""; + this.ribbonPanel7.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; // // // - this.ribbonPanel5.Style.Class = ""; - this.ribbonPanel5.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonPanel7.StyleMouseOver.Class = ""; + this.ribbonPanel7.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonPanel7.TabIndex = 41; + this.ribbonPanel7.Visible = false; // + // gxdw_ribbonbar // + this.gxdw_ribbonbar.AutoOverflowEnabled = true; // - this.ribbonPanel5.StyleMouseDown.Class = ""; - this.ribbonPanel5.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; // // + this.gxdw_ribbonbar.BackgroundMouseOverStyle.Class = ""; + this.gxdw_ribbonbar.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; // - this.ribbonPanel5.StyleMouseOver.Class = ""; - this.ribbonPanel5.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonPanel5.TabIndex = 37; - this.ribbonPanel5.Visible = false; // - // ribbonBar2 // - this.ribbonBar2.AutoOverflowEnabled = true; + this.gxdw_ribbonbar.BackgroundStyle.Class = ""; + this.gxdw_ribbonbar.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.gxdw_ribbonbar.ContainerControlProcessDialogKey = true; + this.gxdw_ribbonbar.Dock = System.Windows.Forms.DockStyle.Left; + this.gxdw_ribbonbar.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { + this.buttonItem9, + this.buttonItem10, + this.buttonItem11, + this.buttonItem12, + this.buttonItem13, + this.buttonItem14}); + this.gxdw_ribbonbar.Location = new System.Drawing.Point(3, 0); + this.gxdw_ribbonbar.Name = "gxdw_ribbonbar"; + this.gxdw_ribbonbar.Size = new System.Drawing.Size(564, 59); + this.gxdw_ribbonbar.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.gxdw_ribbonbar.TabIndex = 0; + this.gxdw_ribbonbar.Text = "ribbonBar5"; // // // - this.ribbonBar2.BackgroundMouseOverStyle.Class = ""; - this.ribbonBar2.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.gxdw_ribbonbar.TitleStyle.Class = ""; + this.gxdw_ribbonbar.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; // // // - this.ribbonBar2.BackgroundStyle.Class = ""; - this.ribbonBar2.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonBar2.ContainerControlProcessDialogKey = true; - this.ribbonBar2.Dock = System.Windows.Forms.DockStyle.Left; - this.ribbonBar2.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { - this.buttonItemHX1, - this.buttonItemHX2, - this.buttonItemDCTP, - this.sliderItem3}); - this.ribbonBar2.Location = new System.Drawing.Point(3, 0); - this.ribbonBar2.Name = "ribbonBar2"; - this.ribbonBar2.Size = new System.Drawing.Size(350, 92); - this.ribbonBar2.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.ribbonBar2.TabIndex = 0; + this.gxdw_ribbonbar.TitleStyleMouseOver.Class = ""; + this.gxdw_ribbonbar.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.gxdw_ribbonbar.TitleVisible = false; // + // buttonItem9 // + this.buttonItem9.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__76; + this.buttonItem9.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem9.Name = "buttonItem9"; + this.buttonItem9.SubItemsExpandWidth = 14; + this.buttonItem9.Text = "工单管理"; + this.buttonItem9.Click += new System.EventHandler(this.buttonItem9_Click); // - this.ribbonBar2.TitleStyle.Class = ""; - this.ribbonBar2.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // buttonItem10 // + this.buttonItem10.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__69; + this.buttonItem10.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem10.Name = "buttonItem10"; + this.buttonItem10.SubItemsExpandWidth = 14; + this.buttonItem10.Text = "在线任务"; + this.buttonItem10.Click += new System.EventHandler(this.buttonItem10_Click); // + // buttonItem11 // - this.ribbonBar2.TitleStyleMouseOver.Class = ""; - this.ribbonBar2.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonBar2.TitleVisible = false; + this.buttonItem11.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__72; + this.buttonItem11.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem11.Name = "buttonItem11"; + this.buttonItem11.SubItemsExpandWidth = 14; + this.buttonItem11.Text = "事件管理"; + this.buttonItem11.Click += new System.EventHandler(this.buttonItem11_Click); // - // buttonItemHX1 + // buttonItem12 // - this.buttonItemHX1.AutoExpandOnClick = true; - this.buttonItemHX1.Image = ((System.Drawing.Image)(resources.GetObject("buttonItemHX1.Image"))); - this.buttonItemHX1.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItemHX1.Name = "buttonItemHX1"; - this.buttonItemHX1.SubItemsExpandWidth = 14; - this.buttonItemHX1.Text = "导入红线"; - this.buttonItemHX1.Click += new System.EventHandler(this.buttonItemHX1_Click); + this.buttonItem12.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__34; + this.buttonItem12.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem12.Name = "buttonItem12"; + this.buttonItem12.SubItemsExpandWidth = 14; + this.buttonItem12.Text = "探测仪管理"; + this.buttonItem12.Click += new System.EventHandler(this.buttonItem12_Click); // - // buttonItemHX2 + // buttonItem13 // - this.buttonItemHX2.Image = ((System.Drawing.Image)(resources.GetObject("buttonItemHX2.Image"))); - this.buttonItemHX2.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItemHX2.Name = "buttonItemHX2"; - this.buttonItemHX2.SubItemsExpandWidth = 14; - this.buttonItemHX2.Text = "红线审核"; - this.buttonItemHX2.Click += new System.EventHandler(this.buttonItemHX2_Click); + this.buttonItem13.Image = global::Cyberpipe.Properties.Resources._24x24icon_13_hover; + this.buttonItem13.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem13.Name = "buttonItem13"; + this.buttonItem13.SubItemsExpandWidth = 14; + this.buttonItem13.Text = "巡检人员维护"; + this.buttonItem13.Click += new System.EventHandler(this.buttonItem13_Click); // - // buttonItemDCTP + // buttonItem14 // - this.buttonItemDCTP.Image = ((System.Drawing.Image)(resources.GetObject("buttonItemDCTP.Image"))); - this.buttonItemDCTP.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItemDCTP.Name = "buttonItemDCTP"; - this.buttonItemDCTP.SubItemsExpandWidth = 14; - this.buttonItemDCTP.Text = "导出图片"; - this.buttonItemDCTP.Click += new System.EventHandler(this.buttonItemDCTP_Click); - // - // sliderItem3 - // - this.sliderItem3.LabelPosition = DevComponents.DotNetBar.eSliderLabelPosition.Top; - this.sliderItem3.LabelWidth = 50; - this.sliderItem3.Name = "sliderItem3"; - this.sliderItem3.Text = "地面透明度"; - this.sliderItem3.TextColor = System.Drawing.Color.Black; - this.sliderItem3.Value = 0; - this.sliderItem3.ValueChanged += new System.EventHandler(this.sliderItem3_ValueChanged); - // - // ribbonPanel1 - // - this.ribbonPanel1.AutoSize = true; - this.ribbonPanel1.CanvasColor = System.Drawing.Color.Gray; - this.ribbonPanel1.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.ribbonPanel1.Controls.Add(this.ribbonBar21); - this.ribbonPanel1.Dock = System.Windows.Forms.DockStyle.Fill; - this.ribbonPanel1.Location = new System.Drawing.Point(0, 0); - this.ribbonPanel1.Name = "ribbonPanel1"; - this.ribbonPanel1.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); - this.ribbonPanel1.Size = new System.Drawing.Size(1328, 95); - // - // - // - this.ribbonPanel1.Style.Class = ""; - this.ribbonPanel1.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonPanel1.StyleMouseDown.Class = ""; - this.ribbonPanel1.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonPanel1.StyleMouseOver.Class = ""; - this.ribbonPanel1.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonPanel1.TabIndex = 1; - this.ribbonPanel1.Visible = false; - // - // ribbonBar21 - // - this.ribbonBar21.AutoOverflowEnabled = true; - this.ribbonBar21.BackColor = System.Drawing.Color.White; - // - // - // - this.ribbonBar21.BackgroundMouseOverStyle.Class = ""; - this.ribbonBar21.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonBar21.BackgroundStyle.Class = ""; - this.ribbonBar21.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonBar21.ContainerControlProcessDialogKey = true; - this.ribbonBar21.Dock = System.Windows.Forms.DockStyle.Left; - this.ribbonBar21.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { - this.buttonItem87, - this.buttonItem88, - this.buttonItem27, - this.sliderGroundTransSet1, - this.buttonItem91, - this.buttonItem1, - this.btnlegendSet, - this.buttonItem89, - this.btnOutputJPG}); - this.ribbonBar21.Location = new System.Drawing.Point(3, 0); - this.ribbonBar21.Name = "ribbonBar21"; - this.ribbonBar21.Size = new System.Drawing.Size(649, 92); - this.ribbonBar21.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.ribbonBar21.TabIndex = 2; - this.ribbonBar21.Text = "浏览模式"; - // - // - // - this.ribbonBar21.TitleStyle.Class = ""; - this.ribbonBar21.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonBar21.TitleStyleMouseOver.Class = ""; - this.ribbonBar21.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonBar21.TitleVisible = false; - // - // buttonItem87 - // - this.buttonItem87.Image = ((System.Drawing.Image)(resources.GetObject("buttonItem87.Image"))); - this.buttonItem87.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem87.Name = "buttonItem87"; - this.buttonItem87.SubItemsExpandWidth = 14; - this.buttonItem87.Text = "地上模式"; - this.buttonItem87.Click += new System.EventHandler(this.buttonItem87_Click); - // - // buttonItem88 - // - this.buttonItem88.Image = ((System.Drawing.Image)(resources.GetObject("buttonItem88.Image"))); - this.buttonItem88.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem88.Name = "buttonItem88"; - this.buttonItem88.SubItemsExpandWidth = 14; - this.buttonItem88.Text = "地下模式"; - this.buttonItem88.Click += new System.EventHandler(this.buttonItem88_Click); - // - // buttonItem27 - // - this.buttonItem27.Image = ((System.Drawing.Image)(resources.GetObject("buttonItem27.Image"))); - this.buttonItem27.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem27.Name = "buttonItem27"; - this.buttonItem27.SubItemsExpandWidth = 14; - this.buttonItem27.Text = "行走模式"; - this.buttonItem27.Click += new System.EventHandler(this.buttonItem27_Click); - // - // buttonItem91 - // - this.buttonItem91.ForeColor = System.Drawing.Color.Black; - this.buttonItem91.Image = ((System.Drawing.Image)(resources.GetObject("buttonItem91.Image"))); - this.buttonItem91.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem91.Name = "buttonItem91"; - this.buttonItem91.SubItemsExpandWidth = 14; - this.buttonItem91.Text = "快速定位"; - this.buttonItem91.Click += new System.EventHandler(this.buttonItem91_Click); - // - // buttonItem1 - // - this.buttonItem1.Image = ((System.Drawing.Image)(resources.GetObject("buttonItem1.Image"))); - this.buttonItem1.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem1.Name = "buttonItem1"; - this.buttonItem1.SubItemsExpandWidth = 14; - this.buttonItem1.Text = "图层管理"; - this.buttonItem1.Click += new System.EventHandler(this.buttonItem1_Click); - // - // btnlegendSet - // - this.btnlegendSet.Image = ((System.Drawing.Image)(resources.GetObject("btnlegendSet.Image"))); - this.btnlegendSet.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.btnlegendSet.Name = "btnlegendSet"; - this.btnlegendSet.SubItemsExpandWidth = 14; - this.btnlegendSet.Text = "图例"; - this.btnlegendSet.Click += new System.EventHandler(this.btnlegendSet_Click); - // - // buttonItem89 - // - this.buttonItem89.Image = ((System.Drawing.Image)(resources.GetObject("buttonItem89.Image"))); - this.buttonItem89.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem89.Name = "buttonItem89"; - this.buttonItem89.SubItemsExpandWidth = 14; - this.buttonItem89.Text = "全屏显示"; - this.buttonItem89.Click += new System.EventHandler(this.buttonItem89_Click); - // - // btnOutputJPG - // - this.btnOutputJPG.Image = ((System.Drawing.Image)(resources.GetObject("btnOutputJPG.Image"))); - this.btnOutputJPG.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.btnOutputJPG.Name = "btnOutputJPG"; - this.btnOutputJPG.SubItemsExpandWidth = 14; - this.btnOutputJPG.Text = "导出图片"; - this.btnOutputJPG.Click += new System.EventHandler(this.btnOutputJPG_Click); - // - // ribbonPanel12 - // - this.ribbonPanel12.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.ribbonPanel12.Controls.Add(this.ribbonBar18); - this.ribbonPanel12.Controls.Add(this.ribbonBar13); - this.ribbonPanel12.Dock = System.Windows.Forms.DockStyle.Fill; - this.ribbonPanel12.Location = new System.Drawing.Point(0, 0); - this.ribbonPanel12.Name = "ribbonPanel12"; - this.ribbonPanel12.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); - this.ribbonPanel12.Size = new System.Drawing.Size(1328, 95); - // - // - // - this.ribbonPanel12.Style.Class = ""; - this.ribbonPanel12.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonPanel12.StyleMouseDown.Class = ""; - this.ribbonPanel12.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonPanel12.StyleMouseOver.Class = ""; - this.ribbonPanel12.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonPanel12.TabIndex = 34; - this.ribbonPanel12.Visible = false; - // - // ribbonBar18 - // - this.ribbonBar18.AutoOverflowEnabled = true; - // - // - // - this.ribbonBar18.BackgroundMouseOverStyle.Class = ""; - this.ribbonBar18.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonBar18.BackgroundStyle.Class = ""; - this.ribbonBar18.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonBar18.ContainerControlProcessDialogKey = true; - this.ribbonBar18.Dock = System.Windows.Forms.DockStyle.Left; - this.ribbonBar18.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { - this.buttonItem133}); - this.ribbonBar18.Location = new System.Drawing.Point(531, 0); - this.ribbonBar18.Name = "ribbonBar18"; - this.ribbonBar18.Size = new System.Drawing.Size(129, 92); - this.ribbonBar18.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.ribbonBar18.TabIndex = 1; - // - // - // - this.ribbonBar18.TitleStyle.Class = ""; - this.ribbonBar18.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonBar18.TitleStyleMouseOver.Class = ""; - this.ribbonBar18.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonBar18.TitleVisible = false; - // - // buttonItem133 - // - this.buttonItem133.Image = ((System.Drawing.Image)(resources.GetObject("buttonItem133.Image"))); - this.buttonItem133.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem133.Name = "buttonItem133"; - this.buttonItem133.SubItemsExpandWidth = 14; - this.buttonItem133.Text = "审核入库"; - this.buttonItem133.Click += new System.EventHandler(this.buttonItem133_Click_1); - // - // ribbonBar13 - // - this.ribbonBar13.AutoOverflowEnabled = true; - // - // - // - this.ribbonBar13.BackgroundMouseOverStyle.Class = ""; - this.ribbonBar13.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonBar13.BackgroundStyle.Class = ""; - this.ribbonBar13.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonBar13.ContainerControlProcessDialogKey = true; - this.ribbonBar13.Dock = System.Windows.Forms.DockStyle.Left; - this.ribbonBar13.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { - this.buttonItem127, - this.buttonItem128, - this.sliderItem1, - this.buttonItem134, - this.buttonItem130, - this.btn_check_history}); - this.ribbonBar13.Location = new System.Drawing.Point(3, 0); - this.ribbonBar13.Name = "ribbonBar13"; - this.ribbonBar13.Size = new System.Drawing.Size(528, 92); - this.ribbonBar13.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.ribbonBar13.TabIndex = 0; - // - // - // - this.ribbonBar13.TitleStyle.Class = ""; - this.ribbonBar13.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonBar13.TitleStyleMouseOver.Class = ""; - this.ribbonBar13.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonBar13.TitleVisible = false; - // - // buttonItem127 - // - this.buttonItem127.Image = ((System.Drawing.Image)(resources.GetObject("buttonItem127.Image"))); - this.buttonItem127.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem127.Name = "buttonItem127"; - this.buttonItem127.SubItemsExpandWidth = 14; - this.buttonItem127.Text = "打开数据"; - this.buttonItem127.Click += new System.EventHandler(this.buttonItem127_Click_2); - // - // buttonItem128 - // - this.buttonItem128.Image = ((System.Drawing.Image)(resources.GetObject("buttonItem128.Image"))); - this.buttonItem128.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem128.Name = "buttonItem128"; - this.buttonItem128.SubItemsExpandWidth = 14; - this.buttonItem128.Text = "一键审核"; - this.buttonItem128.Click += new System.EventHandler(this.buttonItem128_Click); - // - // sliderItem1 - // - this.sliderItem1.LabelPosition = DevComponents.DotNetBar.eSliderLabelPosition.Top; - this.sliderItem1.LabelWidth = 50; - this.sliderItem1.Name = "sliderItem1"; - this.sliderItem1.Text = "地面透明度"; - this.sliderItem1.TextColor = System.Drawing.Color.Black; - this.sliderItem1.Value = 0; - this.sliderItem1.ValueChanged += new System.EventHandler(this.sliderItem1_ValueChanged); - // - // buttonItem134 - // - this.buttonItem134.Image = ((System.Drawing.Image)(resources.GetObject("buttonItem134.Image"))); - this.buttonItem134.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem134.Name = "buttonItem134"; - this.buttonItem134.SubItemsExpandWidth = 14; - this.buttonItem134.Text = "模拟设计修改"; - this.buttonItem134.Click += new System.EventHandler(this.buttonItem134_Click_1); - // - // buttonItem130 - // - this.buttonItem130.Image = ((System.Drawing.Image)(resources.GetObject("buttonItem130.Image"))); - this.buttonItem130.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem130.Name = "buttonItem130"; - this.buttonItem130.SubItemsExpandWidth = 14; - this.buttonItem130.Text = "导出审核图"; - this.buttonItem130.Click += new System.EventHandler(this.buttonItem130_Click_1); - // - // btn_check_history - // - this.btn_check_history.Image = ((System.Drawing.Image)(resources.GetObject("btn_check_history.Image"))); - this.btn_check_history.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.btn_check_history.Name = "btn_check_history"; - this.btn_check_history.SubItemsExpandWidth = 14; - this.btn_check_history.Text = "审核历史"; - this.btn_check_history.Click += new System.EventHandler(this.btn_check_history_Click); - // - // ribbonPanel4 - // - this.ribbonPanel4.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.ribbonPanel4.Controls.Add(this.ribbonBar1); - this.ribbonPanel4.Dock = System.Windows.Forms.DockStyle.Fill; - this.ribbonPanel4.Location = new System.Drawing.Point(0, 0); - this.ribbonPanel4.Name = "ribbonPanel4"; - this.ribbonPanel4.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); - this.ribbonPanel4.Size = new System.Drawing.Size(1328, 95); - // - // - // - this.ribbonPanel4.Style.Class = ""; - this.ribbonPanel4.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonPanel4.StyleMouseDown.Class = ""; - this.ribbonPanel4.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonPanel4.StyleMouseOver.Class = ""; - this.ribbonPanel4.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonPanel4.TabIndex = 36; - this.ribbonPanel4.Visible = false; - // - // ribbonBar1 - // - this.ribbonBar1.AutoOverflowEnabled = true; - // - // - // - this.ribbonBar1.BackgroundMouseOverStyle.Class = ""; - this.ribbonBar1.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonBar1.BackgroundStyle.Class = ""; - this.ribbonBar1.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonBar1.ContainerControlProcessDialogKey = true; - this.ribbonBar1.Dock = System.Windows.Forms.DockStyle.Left; - this.ribbonBar1.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { - this.btn_document_info}); - this.ribbonBar1.Location = new System.Drawing.Point(3, 0); - this.ribbonBar1.Name = "ribbonBar1"; - this.ribbonBar1.Size = new System.Drawing.Size(88, 92); - this.ribbonBar1.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.ribbonBar1.TabIndex = 0; - // - // - // - this.ribbonBar1.TitleStyle.Class = ""; - this.ribbonBar1.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonBar1.TitleStyleMouseOver.Class = ""; - this.ribbonBar1.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonBar1.TitleVisible = false; - // - // btn_document_info - // - this.btn_document_info.Image = ((System.Drawing.Image)(resources.GetObject("btn_document_info.Image"))); - this.btn_document_info.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.btn_document_info.Name = "btn_document_info"; - this.btn_document_info.SubItemsExpandWidth = 14; - this.btn_document_info.Text = "文档管理"; - this.btn_document_info.Click += new System.EventHandler(this.btn_document_info_Click); + this.buttonItem14.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__56; + this.buttonItem14.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem14.Name = "buttonItem14"; + this.buttonItem14.SubItemsExpandWidth = 14; + this.buttonItem14.Text = "导出施工图"; + this.buttonItem14.Click += new System.EventHandler(this.buttonItem14_Click); // // ribbonPanel15 // this.ribbonPanel15.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; this.ribbonPanel15.Controls.Add(this.ribbonBar20); this.ribbonPanel15.Dock = System.Windows.Forms.DockStyle.Fill; - this.ribbonPanel15.Location = new System.Drawing.Point(0, 0); + this.ribbonPanel15.Location = new System.Drawing.Point(0, 33); this.ribbonPanel15.Name = "ribbonPanel15"; this.ribbonPanel15.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); - this.ribbonPanel15.Size = new System.Drawing.Size(1328, 95); + this.ribbonPanel15.Size = new System.Drawing.Size(1328, 62); // // // @@ -2843,7 +2465,7 @@ this.buttonItemXTGL}); this.ribbonBar20.Location = new System.Drawing.Point(3, 0); this.ribbonBar20.Name = "ribbonBar20"; - this.ribbonBar20.Size = new System.Drawing.Size(283, 92); + this.ribbonBar20.Size = new System.Drawing.Size(283, 59); this.ribbonBar20.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; this.ribbonBar20.TabIndex = 0; // @@ -3274,216 +2896,15 @@ this.buttonItemXT4_2.Text = "人员修改"; this.buttonItemXT4_2.Click += new System.EventHandler(this.buttonItemXT4_2_Click); // - // ribbonPanel3 - // - this.ribbonPanel3.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.ribbonPanel3.Controls.Add(this.ribbonBar4); - this.ribbonPanel3.Dock = System.Windows.Forms.DockStyle.Fill; - this.ribbonPanel3.Location = new System.Drawing.Point(0, 33); - this.ribbonPanel3.Name = "ribbonPanel3"; - this.ribbonPanel3.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); - this.ribbonPanel3.Size = new System.Drawing.Size(1328, 62); - // - // - // - this.ribbonPanel3.Style.Class = ""; - this.ribbonPanel3.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonPanel3.StyleMouseDown.Class = ""; - this.ribbonPanel3.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonPanel3.StyleMouseOver.Class = ""; - this.ribbonPanel3.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonPanel3.TabIndex = 40; - // - // ribbonBar4 - // - this.ribbonBar4.AutoOverflowEnabled = true; - // - // - // - this.ribbonBar4.BackgroundMouseOverStyle.Class = ""; - this.ribbonBar4.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonBar4.BackgroundStyle.Class = ""; - this.ribbonBar4.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonBar4.ContainerControlProcessDialogKey = true; - this.ribbonBar4.Dock = System.Windows.Forms.DockStyle.Left; - this.ribbonBar4.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { - this.btn_flag, - this.slider4ground}); - this.ribbonBar4.Location = new System.Drawing.Point(3, 0); - this.ribbonBar4.Name = "ribbonBar4"; - this.ribbonBar4.Size = new System.Drawing.Size(321, 59); - this.ribbonBar4.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.ribbonBar4.TabIndex = 0; - // - // - // - this.ribbonBar4.TitleStyle.Class = ""; - this.ribbonBar4.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonBar4.TitleStyleMouseOver.Class = ""; - this.ribbonBar4.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonBar4.TitleVisible = false; - // - // btn_flag - // - this.btn_flag.Image = global::Cyberpipe.Properties.Resources._24x24icon_03_hover; - this.btn_flag.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.btn_flag.Name = "btn_flag"; - this.btn_flag.SubItemsExpandWidth = 14; - this.btn_flag.Text = "标识器管理"; - this.btn_flag.Click += new System.EventHandler(this.btn_flag_Click); - // - // slider4ground - // - this.slider4ground.LabelPosition = DevComponents.DotNetBar.eSliderLabelPosition.Top; - this.slider4ground.LabelWidth = 50; - this.slider4ground.Name = "slider4ground"; - this.slider4ground.Text = "地面透明度"; - this.slider4ground.TextColor = System.Drawing.Color.Black; - this.slider4ground.Value = 0; - this.slider4ground.ValueChanged += new System.EventHandler(this.slider4ground_ValueChanged); - // - // ribbonPanel7 - // - this.ribbonPanel7.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.ribbonPanel7.Controls.Add(this.gxdw_ribbonbar); - this.ribbonPanel7.Dock = System.Windows.Forms.DockStyle.Fill; - this.ribbonPanel7.Location = new System.Drawing.Point(0, 33); - this.ribbonPanel7.Name = "ribbonPanel7"; - this.ribbonPanel7.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); - this.ribbonPanel7.Size = new System.Drawing.Size(1328, 62); - // - // - // - this.ribbonPanel7.Style.Class = ""; - this.ribbonPanel7.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonPanel7.StyleMouseDown.Class = ""; - this.ribbonPanel7.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonPanel7.StyleMouseOver.Class = ""; - this.ribbonPanel7.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonPanel7.TabIndex = 41; - this.ribbonPanel7.Visible = false; - // - // gxdw_ribbonbar - // - this.gxdw_ribbonbar.AutoOverflowEnabled = true; - // - // - // - this.gxdw_ribbonbar.BackgroundMouseOverStyle.Class = ""; - this.gxdw_ribbonbar.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.gxdw_ribbonbar.BackgroundStyle.Class = ""; - this.gxdw_ribbonbar.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.gxdw_ribbonbar.ContainerControlProcessDialogKey = true; - this.gxdw_ribbonbar.Dock = System.Windows.Forms.DockStyle.Left; - this.gxdw_ribbonbar.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { - this.buttonItem9, - this.buttonItem10, - this.buttonItem11, - this.buttonItem12, - this.buttonItem13, - this.buttonItem14}); - this.gxdw_ribbonbar.Location = new System.Drawing.Point(3, 0); - this.gxdw_ribbonbar.Name = "gxdw_ribbonbar"; - this.gxdw_ribbonbar.Size = new System.Drawing.Size(522, 59); - this.gxdw_ribbonbar.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.gxdw_ribbonbar.TabIndex = 0; - this.gxdw_ribbonbar.Text = "ribbonBar5"; - // - // - // - this.gxdw_ribbonbar.TitleStyle.Class = ""; - this.gxdw_ribbonbar.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.gxdw_ribbonbar.TitleStyleMouseOver.Class = ""; - this.gxdw_ribbonbar.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.gxdw_ribbonbar.TitleVisible = false; - // - // buttonItem9 - // - this.buttonItem9.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__76; - this.buttonItem9.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem9.Name = "buttonItem9"; - this.buttonItem9.SubItemsExpandWidth = 14; - this.buttonItem9.Text = "工单管理"; - this.buttonItem9.Click += new System.EventHandler(this.buttonItem9_Click); - // - // buttonItem10 - // - this.buttonItem10.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__69; - this.buttonItem10.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem10.Name = "buttonItem10"; - this.buttonItem10.SubItemsExpandWidth = 14; - this.buttonItem10.Text = "在线任务"; - this.buttonItem10.Click += new System.EventHandler(this.buttonItem10_Click); - // - // buttonItem11 - // - this.buttonItem11.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__72; - this.buttonItem11.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem11.Name = "buttonItem11"; - this.buttonItem11.SubItemsExpandWidth = 14; - this.buttonItem11.Text = "事件管理"; - this.buttonItem11.Click += new System.EventHandler(this.buttonItem11_Click); - // - // buttonItem12 - // - this.buttonItem12.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__34; - this.buttonItem12.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem12.Name = "buttonItem12"; - this.buttonItem12.SubItemsExpandWidth = 14; - this.buttonItem12.Text = "探测仪管理"; - this.buttonItem12.Click += new System.EventHandler(this.buttonItem12_Click); - // - // buttonItem13 - // - this.buttonItem13.Image = global::Cyberpipe.Properties.Resources._24x24icon_13_hover; - this.buttonItem13.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem13.Name = "buttonItem13"; - this.buttonItem13.SubItemsExpandWidth = 14; - this.buttonItem13.Text = "巡检人员维护"; - this.buttonItem13.Click += new System.EventHandler(this.buttonItem13_Click); - // - // buttonItem14 - // - this.buttonItem14.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__56; - this.buttonItem14.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem14.Name = "buttonItem14"; - this.buttonItem14.SubItemsExpandWidth = 14; - this.buttonItem14.Text = "导出施工图"; - this.buttonItem14.Click += new System.EventHandler(this.buttonItem14_Click); - // // ribbonPanel2 // this.ribbonPanel2.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; this.ribbonPanel2.Controls.Add(this.ribbonBar3); this.ribbonPanel2.Dock = System.Windows.Forms.DockStyle.Fill; - this.ribbonPanel2.Location = new System.Drawing.Point(0, 33); + this.ribbonPanel2.Location = new System.Drawing.Point(0, 0); this.ribbonPanel2.Name = "ribbonPanel2"; this.ribbonPanel2.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); - this.ribbonPanel2.Size = new System.Drawing.Size(1328, 62); + this.ribbonPanel2.Size = new System.Drawing.Size(1328, 95); // // // @@ -3527,7 +2948,7 @@ this.buttonItemPasswordReset}); this.ribbonBar3.Location = new System.Drawing.Point(3, 0); this.ribbonBar3.Name = "ribbonBar3"; - this.ribbonBar3.Size = new System.Drawing.Size(551, 59); + this.ribbonBar3.Size = new System.Drawing.Size(551, 92); this.ribbonBar3.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; this.ribbonBar3.TabIndex = 1; // @@ -3567,6 +2988,7 @@ this.btn_resc_info.Name = "btn_resc_info"; this.btn_resc_info.SubItemsExpandWidth = 14; this.btn_resc_info.Text = "资源管理"; + this.btn_resc_info.Visible = false; this.btn_resc_info.Click += new System.EventHandler(this.btn_resc_info_Click); // // btn_role_resc @@ -3605,6 +3027,605 @@ this.buttonItemPasswordReset.Text = "重置密码"; this.buttonItemPasswordReset.Click += new System.EventHandler(this.buttonItemPasswordReset_Click); // + // ribbonPanel6 + // + this.ribbonPanel6.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.ribbonPanel6.Controls.Add(this.ribbonBar6); + this.ribbonPanel6.Dock = System.Windows.Forms.DockStyle.Fill; + this.ribbonPanel6.Location = new System.Drawing.Point(0, 0); + this.ribbonPanel6.Name = "ribbonPanel6"; + this.ribbonPanel6.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); + this.ribbonPanel6.Size = new System.Drawing.Size(1328, 95); + // + // + // + this.ribbonPanel6.Style.Class = ""; + this.ribbonPanel6.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonPanel6.StyleMouseDown.Class = ""; + this.ribbonPanel6.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonPanel6.StyleMouseOver.Class = ""; + this.ribbonPanel6.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonPanel6.TabIndex = 38; + this.ribbonPanel6.Visible = false; + // + // ribbonBar6 + // + this.ribbonBar6.AutoOverflowEnabled = true; + // + // + // + this.ribbonBar6.BackgroundMouseOverStyle.Class = ""; + this.ribbonBar6.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonBar6.BackgroundStyle.Class = ""; + this.ribbonBar6.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar6.ContainerControlProcessDialogKey = true; + this.ribbonBar6.Dock = System.Windows.Forms.DockStyle.Left; + this.ribbonBar6.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { + this.buttonItemSPSZ, + this.buttonItem8, + this.buttonItemLocation, + this.sliderItem2, + this.buttonItemGBJC}); + this.ribbonBar6.Location = new System.Drawing.Point(3, 0); + this.ribbonBar6.Name = "ribbonBar6"; + this.ribbonBar6.Size = new System.Drawing.Size(427, 92); + this.ribbonBar6.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.ribbonBar6.TabIndex = 0; + // + // + // + this.ribbonBar6.TitleStyle.Class = ""; + this.ribbonBar6.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonBar6.TitleStyleMouseOver.Class = ""; + this.ribbonBar6.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar6.TitleVisible = false; + // + // buttonItemSPSZ + // + this.buttonItemSPSZ.Image = ((System.Drawing.Image)(resources.GetObject("buttonItemSPSZ.Image"))); + this.buttonItemSPSZ.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItemSPSZ.Name = "buttonItemSPSZ"; + this.buttonItemSPSZ.SubItemsExpandWidth = 14; + this.buttonItemSPSZ.Text = "双屏设置"; + this.buttonItemSPSZ.Click += new System.EventHandler(this.buttonItemSPSZ_Click); + // + // buttonItem8 + // + this.buttonItem8.Image = ((System.Drawing.Image)(resources.GetObject("buttonItem8.Image"))); + this.buttonItem8.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem8.Name = "buttonItem8"; + this.buttonItem8.SubItemsExpandWidth = 14; + this.buttonItem8.Text = "双屏分析"; + this.buttonItem8.Click += new System.EventHandler(this.buttonItem8_Click); + // + // buttonItemLocation + // + this.buttonItemLocation.Image = ((System.Drawing.Image)(resources.GetObject("buttonItemLocation.Image"))); + this.buttonItemLocation.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItemLocation.Name = "buttonItemLocation"; + this.buttonItemLocation.SubItemsExpandWidth = 14; + this.buttonItemLocation.Text = "快速定位"; + this.buttonItemLocation.Click += new System.EventHandler(this.buttonItemLocation_Click); + // + // sliderItem2 + // + this.sliderItem2.LabelPosition = DevComponents.DotNetBar.eSliderLabelPosition.Top; + this.sliderItem2.LabelWidth = 50; + this.sliderItem2.Name = "sliderItem2"; + this.sliderItem2.Text = "地面透明度"; + this.sliderItem2.TextColor = System.Drawing.Color.Black; + this.sliderItem2.Value = 0; + this.sliderItem2.ValueChanged += new System.EventHandler(this.sliderItem2_ValueChanged); + // + // buttonItemGBJC + // + this.buttonItemGBJC.Image = ((System.Drawing.Image)(resources.GetObject("buttonItemGBJC.Image"))); + this.buttonItemGBJC.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItemGBJC.Name = "buttonItemGBJC"; + this.buttonItemGBJC.SubItemsExpandWidth = 14; + this.buttonItemGBJC.Text = "国标检测"; + this.buttonItemGBJC.Click += new System.EventHandler(this.buttonItemGBJC_Click); + // + // ribbonPanel5 + // + this.ribbonPanel5.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.ribbonPanel5.Controls.Add(this.ribbonBar2); + this.ribbonPanel5.Dock = System.Windows.Forms.DockStyle.Fill; + this.ribbonPanel5.Location = new System.Drawing.Point(0, 33); + this.ribbonPanel5.Name = "ribbonPanel5"; + this.ribbonPanel5.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); + this.ribbonPanel5.Size = new System.Drawing.Size(1328, 62); + // + // + // + this.ribbonPanel5.Style.Class = ""; + this.ribbonPanel5.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonPanel5.StyleMouseDown.Class = ""; + this.ribbonPanel5.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonPanel5.StyleMouseOver.Class = ""; + this.ribbonPanel5.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonPanel5.TabIndex = 37; + this.ribbonPanel5.Visible = false; + // + // ribbonBar2 + // + this.ribbonBar2.AutoOverflowEnabled = true; + // + // + // + this.ribbonBar2.BackgroundMouseOverStyle.Class = ""; + this.ribbonBar2.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonBar2.BackgroundStyle.Class = ""; + this.ribbonBar2.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar2.ContainerControlProcessDialogKey = true; + this.ribbonBar2.Dock = System.Windows.Forms.DockStyle.Left; + this.ribbonBar2.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { + this.buttonItemHX1, + this.buttonItemHX2, + this.buttonItemDCTP, + this.sliderItem3}); + this.ribbonBar2.Location = new System.Drawing.Point(3, 0); + this.ribbonBar2.Name = "ribbonBar2"; + this.ribbonBar2.Size = new System.Drawing.Size(350, 59); + this.ribbonBar2.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.ribbonBar2.TabIndex = 0; + // + // + // + this.ribbonBar2.TitleStyle.Class = ""; + this.ribbonBar2.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonBar2.TitleStyleMouseOver.Class = ""; + this.ribbonBar2.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar2.TitleVisible = false; + // + // buttonItemHX1 + // + this.buttonItemHX1.AutoExpandOnClick = true; + this.buttonItemHX1.Image = ((System.Drawing.Image)(resources.GetObject("buttonItemHX1.Image"))); + this.buttonItemHX1.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItemHX1.Name = "buttonItemHX1"; + this.buttonItemHX1.SubItemsExpandWidth = 14; + this.buttonItemHX1.Text = "导入红线"; + this.buttonItemHX1.Click += new System.EventHandler(this.buttonItemHX1_Click); + // + // buttonItemHX2 + // + this.buttonItemHX2.Image = ((System.Drawing.Image)(resources.GetObject("buttonItemHX2.Image"))); + this.buttonItemHX2.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItemHX2.Name = "buttonItemHX2"; + this.buttonItemHX2.SubItemsExpandWidth = 14; + this.buttonItemHX2.Text = "红线审核"; + this.buttonItemHX2.Click += new System.EventHandler(this.buttonItemHX2_Click); + // + // buttonItemDCTP + // + this.buttonItemDCTP.Image = ((System.Drawing.Image)(resources.GetObject("buttonItemDCTP.Image"))); + this.buttonItemDCTP.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItemDCTP.Name = "buttonItemDCTP"; + this.buttonItemDCTP.SubItemsExpandWidth = 14; + this.buttonItemDCTP.Text = "导出图片"; + this.buttonItemDCTP.Click += new System.EventHandler(this.buttonItemDCTP_Click); + // + // sliderItem3 + // + this.sliderItem3.LabelPosition = DevComponents.DotNetBar.eSliderLabelPosition.Top; + this.sliderItem3.LabelWidth = 50; + this.sliderItem3.Name = "sliderItem3"; + this.sliderItem3.Text = "地面透明度"; + this.sliderItem3.TextColor = System.Drawing.Color.Black; + this.sliderItem3.Value = 0; + this.sliderItem3.ValueChanged += new System.EventHandler(this.sliderItem3_ValueChanged); + // + // ribbonPanel1 + // + this.ribbonPanel1.AutoSize = true; + this.ribbonPanel1.CanvasColor = System.Drawing.Color.Gray; + this.ribbonPanel1.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.ribbonPanel1.Controls.Add(this.ribbonBar21); + this.ribbonPanel1.Dock = System.Windows.Forms.DockStyle.Fill; + this.ribbonPanel1.Location = new System.Drawing.Point(0, 33); + this.ribbonPanel1.Name = "ribbonPanel1"; + this.ribbonPanel1.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); + this.ribbonPanel1.Size = new System.Drawing.Size(1328, 62); + // + // + // + this.ribbonPanel1.Style.Class = ""; + this.ribbonPanel1.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonPanel1.StyleMouseDown.Class = ""; + this.ribbonPanel1.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonPanel1.StyleMouseOver.Class = ""; + this.ribbonPanel1.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonPanel1.TabIndex = 1; + this.ribbonPanel1.Visible = false; + // + // ribbonBar21 + // + this.ribbonBar21.AutoOverflowEnabled = true; + this.ribbonBar21.BackColor = System.Drawing.Color.White; + // + // + // + this.ribbonBar21.BackgroundMouseOverStyle.Class = ""; + this.ribbonBar21.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonBar21.BackgroundStyle.Class = ""; + this.ribbonBar21.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar21.ContainerControlProcessDialogKey = true; + this.ribbonBar21.Dock = System.Windows.Forms.DockStyle.Left; + this.ribbonBar21.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { + this.buttonItem87, + this.buttonItem88, + this.buttonItem27, + this.sliderGroundTransSet1, + this.buttonItem91, + this.buttonItem1, + this.btnlegendSet, + this.buttonItem89, + this.btnOutputJPG}); + this.ribbonBar21.Location = new System.Drawing.Point(3, 0); + this.ribbonBar21.Name = "ribbonBar21"; + this.ribbonBar21.Size = new System.Drawing.Size(649, 59); + this.ribbonBar21.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.ribbonBar21.TabIndex = 2; + this.ribbonBar21.Text = "浏览模式"; + // + // + // + this.ribbonBar21.TitleStyle.Class = ""; + this.ribbonBar21.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonBar21.TitleStyleMouseOver.Class = ""; + this.ribbonBar21.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar21.TitleVisible = false; + // + // buttonItem87 + // + this.buttonItem87.Image = ((System.Drawing.Image)(resources.GetObject("buttonItem87.Image"))); + this.buttonItem87.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem87.Name = "buttonItem87"; + this.buttonItem87.SubItemsExpandWidth = 14; + this.buttonItem87.Text = "地上模式"; + this.buttonItem87.Click += new System.EventHandler(this.buttonItem87_Click); + // + // buttonItem88 + // + this.buttonItem88.Image = ((System.Drawing.Image)(resources.GetObject("buttonItem88.Image"))); + this.buttonItem88.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem88.Name = "buttonItem88"; + this.buttonItem88.SubItemsExpandWidth = 14; + this.buttonItem88.Text = "地下模式"; + this.buttonItem88.Click += new System.EventHandler(this.buttonItem88_Click); + // + // buttonItem27 + // + this.buttonItem27.Image = ((System.Drawing.Image)(resources.GetObject("buttonItem27.Image"))); + this.buttonItem27.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem27.Name = "buttonItem27"; + this.buttonItem27.SubItemsExpandWidth = 14; + this.buttonItem27.Text = "行走模式"; + this.buttonItem27.Click += new System.EventHandler(this.buttonItem27_Click); + // + // buttonItem91 + // + this.buttonItem91.ForeColor = System.Drawing.Color.Black; + this.buttonItem91.Image = ((System.Drawing.Image)(resources.GetObject("buttonItem91.Image"))); + this.buttonItem91.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem91.Name = "buttonItem91"; + this.buttonItem91.SubItemsExpandWidth = 14; + this.buttonItem91.Text = "快速定位"; + this.buttonItem91.Click += new System.EventHandler(this.buttonItem91_Click); + // + // buttonItem1 + // + this.buttonItem1.Image = ((System.Drawing.Image)(resources.GetObject("buttonItem1.Image"))); + this.buttonItem1.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem1.Name = "buttonItem1"; + this.buttonItem1.SubItemsExpandWidth = 14; + this.buttonItem1.Text = "图层管理"; + this.buttonItem1.Click += new System.EventHandler(this.buttonItem1_Click); + // + // btnlegendSet + // + this.btnlegendSet.Image = ((System.Drawing.Image)(resources.GetObject("btnlegendSet.Image"))); + this.btnlegendSet.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.btnlegendSet.Name = "btnlegendSet"; + this.btnlegendSet.SubItemsExpandWidth = 14; + this.btnlegendSet.Text = "图例"; + this.btnlegendSet.Click += new System.EventHandler(this.btnlegendSet_Click); + // + // buttonItem89 + // + this.buttonItem89.Image = ((System.Drawing.Image)(resources.GetObject("buttonItem89.Image"))); + this.buttonItem89.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem89.Name = "buttonItem89"; + this.buttonItem89.SubItemsExpandWidth = 14; + this.buttonItem89.Text = "全屏显示"; + this.buttonItem89.Click += new System.EventHandler(this.buttonItem89_Click); + // + // btnOutputJPG + // + this.btnOutputJPG.Image = ((System.Drawing.Image)(resources.GetObject("btnOutputJPG.Image"))); + this.btnOutputJPG.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.btnOutputJPG.Name = "btnOutputJPG"; + this.btnOutputJPG.SubItemsExpandWidth = 14; + this.btnOutputJPG.Text = "导出图片"; + this.btnOutputJPG.Click += new System.EventHandler(this.btnOutputJPG_Click); + // + // ribbonPanel12 + // + this.ribbonPanel12.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.ribbonPanel12.Controls.Add(this.ribbonBar18); + this.ribbonPanel12.Controls.Add(this.ribbonBar13); + this.ribbonPanel12.Dock = System.Windows.Forms.DockStyle.Fill; + this.ribbonPanel12.Location = new System.Drawing.Point(0, 33); + this.ribbonPanel12.Name = "ribbonPanel12"; + this.ribbonPanel12.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); + this.ribbonPanel12.Size = new System.Drawing.Size(1328, 62); + // + // + // + this.ribbonPanel12.Style.Class = ""; + this.ribbonPanel12.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonPanel12.StyleMouseDown.Class = ""; + this.ribbonPanel12.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonPanel12.StyleMouseOver.Class = ""; + this.ribbonPanel12.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonPanel12.TabIndex = 34; + this.ribbonPanel12.Visible = false; + // + // ribbonBar18 + // + this.ribbonBar18.AutoOverflowEnabled = true; + // + // + // + this.ribbonBar18.BackgroundMouseOverStyle.Class = ""; + this.ribbonBar18.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonBar18.BackgroundStyle.Class = ""; + this.ribbonBar18.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar18.ContainerControlProcessDialogKey = true; + this.ribbonBar18.Dock = System.Windows.Forms.DockStyle.Left; + this.ribbonBar18.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { + this.buttonItem133, + this.buttonItem132}); + this.ribbonBar18.Location = new System.Drawing.Point(508, 0); + this.ribbonBar18.Name = "ribbonBar18"; + this.ribbonBar18.Size = new System.Drawing.Size(75, 59); + this.ribbonBar18.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.ribbonBar18.TabIndex = 1; + // + // + // + this.ribbonBar18.TitleStyle.Class = ""; + this.ribbonBar18.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonBar18.TitleStyleMouseOver.Class = ""; + this.ribbonBar18.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar18.TitleVisible = false; + // + // buttonItem133 + // + this.buttonItem133.Image = ((System.Drawing.Image)(resources.GetObject("buttonItem133.Image"))); + this.buttonItem133.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem133.Name = "buttonItem133"; + this.buttonItem133.SubItemsExpandWidth = 14; + this.buttonItem133.Text = "审核入库"; + this.buttonItem133.Click += new System.EventHandler(this.buttonItem133_Click_1); + // + // buttonItem132 + // + this.buttonItem132.Name = "buttonItem132"; + // + // ribbonBar13 + // + this.ribbonBar13.AutoOverflowEnabled = true; + // + // + // + this.ribbonBar13.BackgroundMouseOverStyle.Class = ""; + this.ribbonBar13.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonBar13.BackgroundStyle.Class = ""; + this.ribbonBar13.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar13.ContainerControlProcessDialogKey = true; + this.ribbonBar13.Dock = System.Windows.Forms.DockStyle.Left; + this.ribbonBar13.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { + this.buttonItem127, + this.buttonItem128, + this.sliderItem1, + this.buttonItem134, + this.buttonItem130, + this.btn_check_history}); + this.ribbonBar13.Location = new System.Drawing.Point(3, 0); + this.ribbonBar13.Name = "ribbonBar13"; + this.ribbonBar13.Size = new System.Drawing.Size(505, 59); + this.ribbonBar13.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.ribbonBar13.TabIndex = 0; + // + // + // + this.ribbonBar13.TitleStyle.Class = ""; + this.ribbonBar13.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonBar13.TitleStyleMouseOver.Class = ""; + this.ribbonBar13.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar13.TitleVisible = false; + // + // buttonItem127 + // + this.buttonItem127.Image = ((System.Drawing.Image)(resources.GetObject("buttonItem127.Image"))); + this.buttonItem127.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem127.Name = "buttonItem127"; + this.buttonItem127.SubItemsExpandWidth = 14; + this.buttonItem127.Text = "打开数据"; + this.buttonItem127.Click += new System.EventHandler(this.buttonItem127_Click_2); + // + // buttonItem128 + // + this.buttonItem128.Image = ((System.Drawing.Image)(resources.GetObject("buttonItem128.Image"))); + this.buttonItem128.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem128.Name = "buttonItem128"; + this.buttonItem128.SubItemsExpandWidth = 14; + this.buttonItem128.Text = "一键审核"; + this.buttonItem128.Click += new System.EventHandler(this.buttonItem128_Click); + // + // sliderItem1 + // + this.sliderItem1.LabelPosition = DevComponents.DotNetBar.eSliderLabelPosition.Top; + this.sliderItem1.LabelWidth = 50; + this.sliderItem1.Name = "sliderItem1"; + this.sliderItem1.Text = "地面透明度"; + this.sliderItem1.TextColor = System.Drawing.Color.Black; + this.sliderItem1.Value = 0; + this.sliderItem1.ValueChanged += new System.EventHandler(this.sliderItem1_ValueChanged); + // + // buttonItem134 + // + this.buttonItem134.Image = ((System.Drawing.Image)(resources.GetObject("buttonItem134.Image"))); + this.buttonItem134.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem134.Name = "buttonItem134"; + this.buttonItem134.SubItemsExpandWidth = 14; + this.buttonItem134.Text = "模拟设计修改"; + this.buttonItem134.Click += new System.EventHandler(this.buttonItem134_Click_1); + // + // buttonItem130 + // + this.buttonItem130.Image = ((System.Drawing.Image)(resources.GetObject("buttonItem130.Image"))); + this.buttonItem130.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem130.Name = "buttonItem130"; + this.buttonItem130.SubItemsExpandWidth = 14; + this.buttonItem130.Text = "导出审核图"; + this.buttonItem130.Click += new System.EventHandler(this.buttonItem130_Click_1); + // + // btn_check_history + // + this.btn_check_history.Image = ((System.Drawing.Image)(resources.GetObject("btn_check_history.Image"))); + this.btn_check_history.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.btn_check_history.Name = "btn_check_history"; + this.btn_check_history.SubItemsExpandWidth = 14; + this.btn_check_history.Text = "审核历史"; + this.btn_check_history.Click += new System.EventHandler(this.btn_check_history_Click); + // + // ribbonPanel4 + // + this.ribbonPanel4.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.ribbonPanel4.Controls.Add(this.ribbonBar1); + this.ribbonPanel4.Dock = System.Windows.Forms.DockStyle.Fill; + this.ribbonPanel4.Location = new System.Drawing.Point(0, 33); + this.ribbonPanel4.Name = "ribbonPanel4"; + this.ribbonPanel4.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); + this.ribbonPanel4.Size = new System.Drawing.Size(1328, 62); + // + // + // + this.ribbonPanel4.Style.Class = ""; + this.ribbonPanel4.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonPanel4.StyleMouseDown.Class = ""; + this.ribbonPanel4.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonPanel4.StyleMouseOver.Class = ""; + this.ribbonPanel4.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonPanel4.TabIndex = 36; + this.ribbonPanel4.Visible = false; + // + // ribbonBar1 + // + this.ribbonBar1.AutoOverflowEnabled = true; + // + // + // + this.ribbonBar1.BackgroundMouseOverStyle.Class = ""; + this.ribbonBar1.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonBar1.BackgroundStyle.Class = ""; + this.ribbonBar1.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar1.ContainerControlProcessDialogKey = true; + this.ribbonBar1.Dock = System.Windows.Forms.DockStyle.Left; + this.ribbonBar1.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { + this.btn_document_info}); + this.ribbonBar1.Location = new System.Drawing.Point(3, 0); + this.ribbonBar1.Name = "ribbonBar1"; + this.ribbonBar1.Size = new System.Drawing.Size(88, 59); + this.ribbonBar1.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.ribbonBar1.TabIndex = 0; + // + // + // + this.ribbonBar1.TitleStyle.Class = ""; + this.ribbonBar1.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonBar1.TitleStyleMouseOver.Class = ""; + this.ribbonBar1.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar1.TitleVisible = false; + // + // btn_document_info + // + this.btn_document_info.Image = ((System.Drawing.Image)(resources.GetObject("btn_document_info.Image"))); + this.btn_document_info.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.btn_document_info.Name = "btn_document_info"; + this.btn_document_info.SubItemsExpandWidth = 14; + this.btn_document_info.Text = "文档管理"; + this.btn_document_info.Click += new System.EventHandler(this.btn_document_info_Click); + // // ribbonTabItem1 // this.ribbonTabItem1.ButtonStyle = DevComponents.DotNetBar.eButtonStyle.ImageAndText; @@ -3673,7 +3694,6 @@ this.ribbonTabItem7.Name = "ribbonTabItem7"; this.ribbonTabItem7.Panel = this.ribbonPanel7; this.ribbonTabItem7.Text = "管线定位"; - this.ribbonTabItem7.MouseDown += new System.Windows.Forms.MouseEventHandler(this.ribbonTabItem7_MouseDown); // // ribbonTabItem5 // @@ -3684,7 +3704,6 @@ this.ribbonTabItem5.Name = "ribbonTabItem5"; this.ribbonTabItem5.Panel = this.ribbonPanel3; this.ribbonTabItem5.Text = "标识器管理"; - this.ribbonTabItem5.MouseDown += new System.Windows.Forms.MouseEventHandler(this.ribbonTabItem5_MouseDown); // // ribbonTabItem2 // @@ -4451,7 +4470,7 @@ this.dataGridViewX2.ReadOnly = true; this.dataGridViewX2.RowHeadersVisible = false; this.dataGridViewX2.RowTemplate.Height = 23; - this.dataGridViewX2.Size = new System.Drawing.Size(31081, 92); + this.dataGridViewX2.Size = new System.Drawing.Size(31378, 92); this.dataGridViewX2.TabIndex = 11; // // dataGridViewTextBoxColumn10 @@ -4545,7 +4564,7 @@ this.dataGridViewX3.ReadOnly = true; this.dataGridViewX3.RowHeadersVisible = false; this.dataGridViewX3.RowTemplate.Height = 23; - this.dataGridViewX3.Size = new System.Drawing.Size(31080, 127); + this.dataGridViewX3.Size = new System.Drawing.Size(31377, 127); this.dataGridViewX3.TabIndex = 5; this.dataGridViewX3.MouseDoubleClick += new System.Windows.Forms.MouseEventHandler(this.dataGridViewX3_MouseDoubleClick); // @@ -5722,7 +5741,8 @@ // pictureBox1 // this.pictureBox1.Dock = System.Windows.Forms.DockStyle.Top; - this.pictureBox1.Image = ((System.Drawing.Image)(resources.GetObject("pictureBox1.Image"))); +// this.pictureBox1.Image = ((System.Drawing.Image)(resources.GetObject("pictureBox1.Image"))); + this.pictureBox1.Image = Image.FromFile(Application.StartupPath + Utility.TitleImagePath); this.pictureBox1.Location = new System.Drawing.Point(0, 0); this.pictureBox1.Margin = new System.Windows.Forms.Padding(0); this.pictureBox1.Name = "pictureBox1"; @@ -5732,18 +5752,6 @@ this.pictureBox1.TabStop = false; this.pictureBox1.Paint += new System.Windows.Forms.PaintEventHandler(this.pictureBox1_Paint); // - // layerTree - // - this.layerTree.CheckBoxes = true; - this.layerTree.ItemHeight = 18; - this.layerTree.Location = new System.Drawing.Point(30, 78); - this.layerTree.Name = "layerTree"; - this.layerTree.Size = new System.Drawing.Size(121, 97); - this.layerTree.TabIndex = 1; - this.layerTree.AfterCheck += new System.Windows.Forms.TreeViewEventHandler(this.layerTree_AfterCheck); - this.layerTree.NodeMouseClick += new System.Windows.Forms.TreeNodeMouseClickEventHandler(this.layerTree_NodeMouseClick); - this.layerTree.NodeMouseDoubleClick += new System.Windows.Forms.TreeNodeMouseClickEventHandler(this.layerTree_NodeMouseDoubleClick); - // // MainFrm // this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Inherit; @@ -5770,7 +5778,8 @@ this.KeyPreview = true; this.Name = "MainFrm"; this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen; - this.Text = "智慧太湖新城管网规划分析系统6.0"; +// this.Text = "智慧太湖新城管网规划分析系统6.0"; + this.Text = Utility.SysnameVersion; this.WindowState = System.Windows.Forms.FormWindowState.Maximized; this.FormClosing += new System.Windows.Forms.FormClosingEventHandler(this.MainFrm_FormClosing); this.Load += new System.EventHandler(this.MainFrm_Load); @@ -5787,15 +5796,15 @@ this.contextMenuStripDeleteLayerNode.ResumeLayout(false); this.ribbonControl1.ResumeLayout(false); this.ribbonControl1.PerformLayout(); + this.ribbonPanel3.ResumeLayout(false); + this.ribbonPanel7.ResumeLayout(false); + this.ribbonPanel15.ResumeLayout(false); + this.ribbonPanel2.ResumeLayout(false); this.ribbonPanel6.ResumeLayout(false); this.ribbonPanel5.ResumeLayout(false); this.ribbonPanel1.ResumeLayout(false); this.ribbonPanel12.ResumeLayout(false); this.ribbonPanel4.ResumeLayout(false); - this.ribbonPanel15.ResumeLayout(false); - this.ribbonPanel3.ResumeLayout(false); - this.ribbonPanel7.ResumeLayout(false); - this.ribbonPanel2.ResumeLayout(false); this.panelOfTable.ResumeLayout(false); this.panelOfTable.PerformLayout(); ((System.ComponentModel.ISupportInitialize)(this.dataGridViewX1)).EndInit(); @@ -5955,6 +5964,7 @@ private RibbonTabItem ribbonTabItem11; private ButtonItem buttonItem130; private RibbonBar ribbonBar18; + private ButtonItem buttonItem132; private SliderItem sliderItem1; private ButtonItem buttonItem133; private ButtonItem buttonItem134; diff --git a/MainFrm.resx b/MainFrm.resx index 9f9bba4..ce490c1 100644 --- a/MainFrm.resx +++ b/MainFrm.resx @@ -351,6 +351,146 @@ 766, 54 + + + iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 + YQUAAAAZdEVYdFNvZnR3YXJlAEFkb2JlIEltYWdlUmVhZHlxyWU8AAADZmlUWHRYTUw6Y29tLmFkb2Jl + LnhtcAAAAAAAPD94cGFja2V0IGJlZ2luPSLvu78iIGlkPSJXNU0wTXBDZWhpSHpyZVN6TlRjemtjOWQi + Pz4gPHg6eG1wbWV0YSB4bWxuczp4PSJhZG9iZTpuczptZXRhLyIgeDp4bXB0az0iQWRvYmUgWE1QIENv + cmUgNS4zLWMwMTEgNjYuMTQ1NjYxLCAyMDEyLzAyLzA2LTE0OjU2OjI3ICAgICAgICAiPiA8cmRmOlJE + RiB4bWxuczpyZGY9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkvMDIvMjItcmRmLXN5bnRheC1ucyMiPiA8 + cmRmOkRlc2NyaXB0aW9uIHJkZjphYm91dD0iIiB4bWxuczp4bXBNTT0iaHR0cDovL25zLmFkb2JlLmNv + bS94YXAvMS4wL21tLyIgeG1sbnM6c3RSZWY9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlw + ZS9SZXNvdXJjZVJlZiMiIHhtbG5zOnhtcD0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wLyIgeG1w + TU06T3JpZ2luYWxEb2N1bWVudElEPSJ4bXAuZGlkOjYzQTM5NEY4Mjg0OUU0MTE5NDBEQTc4ODZEQzk5 + N0NGIiB4bXBNTTpEb2N1bWVudElEPSJ4bXAuZGlkOjEwQ0IxNzBBNEM1QzExRTRBNkNGQzRBMjhDQzI0 + MkY4IiB4bXBNTTpJbnN0YW5jZUlEPSJ4bXAuaWlkOjEwQ0IxNzA5NEM1QzExRTRBNkNGQzRBMjhDQzI0 + MkY4IiB4bXA6Q3JlYXRvclRvb2w9IkFkb2JlIFBob3Rvc2hvcCBDUzYgKFdpbmRvd3MpIj4gPHhtcE1N + OkRlcml2ZWRGcm9tIHN0UmVmOmluc3RhbmNlSUQ9InhtcC5paWQ6NTEzMDNDMjA1QjRDRTQxMTg4NERE + MUVBOEQ4QTgyNTUiIHN0UmVmOmRvY3VtZW50SUQ9InhtcC5kaWQ6NjNBMzk0RjgyODQ5RTQxMTk0MERB + Nzg4NkRDOTk3Q0YiLz4gPC9yZGY6RGVzY3JpcHRpb24+IDwvcmRmOlJERj4gPC94OnhtcG1ldGE+IDw/ + eHBhY2tldCBlbmQ9InIiPz43wa2/AAAFaUlEQVRIS6WUC0xTVxzGKy0UkSmlFGjBFilSkNpSaAWRh63y + sIiAArKs4spLRLQoiEJlSMGoMCc6CBOnYHzMOHUqqOhEHOqCbjNu6kCd6KYje5mZ6KbObd/OuVL3cEzj + /skv997/+b7v39PTW9aj3/BM+OKxPEIZoW/gyrOuPbP+GvRPSNBQQqXYLwSW1etw7cYt5kqfaZ+uD8QM + Xg8f/f4UxGhHMHv4qlG6vAb9394G6T+BPpdV1oCuUx3VD8Q9XT8//PUJRMghlLhLg1C41IK+r/pB+oNC + 16mO6qmP+gdi/6y793+hwTYEk9uoQOSaStHzxQ2Q/nND9XMKy0D9NIfmDcSzaLhI4KXE7LwinLtwGXfu + PXhhqJ/m0DyS62EdUGWpqcf3P97DD3d++t/QnKraBjpghXWAiC+WN0ZNScOe1mP45vbdF2ZvWwdoDs/D + b6ejs6ecxHPoAG/l+Fhkzy+FyCcY0YkG7D/yAW5+d+e5oXrqo36aQ/McnNyjyAAuHWA05pfgzPlehhyT + mflV6FOMaDt2Ctf7bw8KXac6qqc+a4Zx3hLwRLJCZgcJjcPIEPkyIZmeX1SB7vOX0dn9KQy5jw8r8eVc + HOrsxidXP0d9hxlzd4QgeYMzEt7kQVvOR0pFFNpOHmd81E9znIS+dSTc1foVGWfNKUZjyy6Ex6SQl0cD + 09IVxHAFh0+cReqr+QjK8ERqEw+VHWOwoycSR/v1OHwzDlsvhcNCeqkbedAYxQiPm87kZOQVw0nkW0QG + 2DFnIA+JRm3DFpzr/RKNW3ZDE5UAsX8ocizZiFs7DEUHvPFunw4Hb05B+y09jn49lYHe0x5doxqqLVlf + DJrnyB+pIQNs6QAhf6R8tZu3CqpwPdZu2I6PLl3HwnV5iHv9JVSeUOKdqzq81xeDvddiYG73R0aLEIZm + IRa1jUbjxQnYRHa17YqW0VJPwHT3LocRbirrDiymspXo6L6AgiXV8JSNQ2i6GpNWOqK4U4n1n0Vge68W + 9ecmIKnBBSqDCIp4P2RWGDB/QxqS6l1QcToIld3BqDobgsXEQ73+Se5HrGcgdJEokGzIx66DXXi7dRvC + yx2Q2RqApR+GoPbjCag8pUZ6sxjqWRKEldljRr07ZjaKmHt5qpBZKzkeiIJ2BbIPKmA8MIbJUC/ghrM0 + RfYsDtdhqJNIVulK/ku0BQokbfZGZrsKBR3BmEsMOfvl0FY7o7ypDPo1brCcGc+QUCdExabXEFsjQO4B + ObL2BSBlqx8SWwibvBE0334nK3Ael+yEbIW81DZszlhZ2oieuAYvpO5VIHGzP9J2+CN9pz/CzDwExMox + eZUbFnZpkEc+gLZagJjMWOiqXZDVqmC0+kZf6Nb4IHKFCPIsu92sgCw7BlJswjBJLCdenmuPyFUS6Gp9 + oG/yRdJWGSKqhYjKDgLRImK5ACGlzsy9d/zwXn2DBMZDSkZLPaHlnpBncyGO5kxj+Rps/wYdJE2xzfOb + zcU4sye0b0gRu3E0Ypt8ELTICRFGNcShUgjHuZyWxNu2096sdiXS9o1ltNQjyyDhes4SkuXEGpXC+Ve8 + kjlzpDPtoCkVQrdOihgyIHmXP6LryGEX86Ba6ISJNR7IeF+JV8gAfbOM0XoTj8dktpmEOxM4rJHTBscz + njNNnMiBagEfU98ajRnbZMg7GojCk2oGU1cw5nUGw7BHAZWJD6oVhLFzSDCPCacljGP/J7xAm6Hu0ew6 + STIXkcvckN7ig8XHVCjvUiNvdwAmW0Twms6FayS7meM4REoihxPoeT4u10nsZ0LKhhdsIxZEsVcLtOyL + pHffVcd+IJjI7uGHsRscJEPURMMn2FMtNTwuFusPrjFl48ji7nIAAAAASUVORK5CYII= + + + + + iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 + YQUAAAAZdEVYdFNvZnR3YXJlAEFkb2JlIEltYWdlUmVhZHlxyWU8AAADZmlUWHRYTUw6Y29tLmFkb2Jl + LnhtcAAAAAAAPD94cGFja2V0IGJlZ2luPSLvu78iIGlkPSJXNU0wTXBDZWhpSHpyZVN6TlRjemtjOWQi + Pz4gPHg6eG1wbWV0YSB4bWxuczp4PSJhZG9iZTpuczptZXRhLyIgeDp4bXB0az0iQWRvYmUgWE1QIENv + cmUgNS4zLWMwMTEgNjYuMTQ1NjYxLCAyMDEyLzAyLzA2LTE0OjU2OjI3ICAgICAgICAiPiA8cmRmOlJE + RiB4bWxuczpyZGY9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkvMDIvMjItcmRmLXN5bnRheC1ucyMiPiA8 + cmRmOkRlc2NyaXB0aW9uIHJkZjphYm91dD0iIiB4bWxuczp4bXBNTT0iaHR0cDovL25zLmFkb2JlLmNv + bS94YXAvMS4wL21tLyIgeG1sbnM6c3RSZWY9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlw + ZS9SZXNvdXJjZVJlZiMiIHhtbG5zOnhtcD0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wLyIgeG1w + TU06T3JpZ2luYWxEb2N1bWVudElEPSJ4bXAuZGlkOjYzQTM5NEY4Mjg0OUU0MTE5NDBEQTc4ODZEQzk5 + N0NGIiB4bXBNTTpEb2N1bWVudElEPSJ4bXAuZGlkOkUyMTg3NjEyNDlEODExRTQ4NjNGQjM2Mzk1QkNB + RkQwIiB4bXBNTTpJbnN0YW5jZUlEPSJ4bXAuaWlkOkUyMTg3NjExNDlEODExRTQ4NjNGQjM2Mzk1QkNB + RkQwIiB4bXA6Q3JlYXRvclRvb2w9IkFkb2JlIFBob3Rvc2hvcCBDUzYgKFdpbmRvd3MpIj4gPHhtcE1N + OkRlcml2ZWRGcm9tIHN0UmVmOmluc3RhbmNlSUQ9InhtcC5paWQ6NkJCNTE0NDlEODQ5RTQxMUE0QzNB + MjdEOTJBQzc3QkMiIHN0UmVmOmRvY3VtZW50SUQ9InhtcC5kaWQ6NjNBMzk0RjgyODQ5RTQxMTk0MERB + Nzg4NkRDOTk3Q0YiLz4gPC9yZGY6RGVzY3JpcHRpb24+IDwvcmRmOlJERj4gPC94OnhtcG1ldGE+IDw/ + eHBhY2tldCBlbmQ9InIiPz5e5MstAAADiUlEQVRIS+2UW0yTdxjGcePwtYyVVpAUCi1tv9ImrVbxhAei + kjGphAgFT4jzEJ0gGuJhDk0sml0sglmWmC1hqHNKWwI4srgNh3phpjg1O1yIN5DMbFHQZUu42O76+D4f + 3Fl6Z7ILn+SXvH3f533++X/98iUBeKW81v9Uwx1G1+1240EhfKfdeE/4U3qTAqaZZO/2aeN9IXLrY+Ph + wVOZHll9YyohgYZOGS4JsYdXVDy+NQ8Tvy3BP6OlmPyjDP9OBDRYs8cZPfRy5/uQISIRqcIsLSye+j7I + wN+PluOvhyWY+NmL8fsOjP9kxdN7BRh/YJHfFjy5m48nd4ThQjy968bEgwV49usicFciTEKKFhZPXXv1 + eHxtLsYGPBjttwsWjF0xY+ybOfj9uylYs8cZPfQS7kpEnqDTwuLp9GYlfKZeifUfzcb1j/Iw/IkNv3Q6 + MfKVC6O9bg3W7HFGD73cORlMG5AIizDzAaVtunD5ESXWfNSEY/tNCO00oG1zOkJBBSeqUjVYh6R3Qmat + zSY0Hjah7IASW7hPuSoRvIGihcVTSauCppvFODRUjJZvPWgaKMTuXgt2RHOxLTwHDd3EjPfCudgesWJX + jxM7eryo7/Ni8SGFj8gp6LWwePLvS0Og043A5y5UdtkQOJeLivM5ePf8bJSfM04zG2u7chDoysW6Thsq + zqpY0+GAvymNB/gEgxYWT64tKdGihpSYv8WEpSEzVp0pwDuf2SVQReCiS4M1e5zRQy937NXJ1yRirjDz + AVmVJyNZa9+PObauh7ptKdR6FY6N2SisTYe1OlmDNXtqvRNqwxLYt1TCVLY1ZijZOSQRbuEtLSyeTOXH + sfLDH1EauoFFx6/Cd6Qf7pYI1ObLsO+9iMLdF+DccwEuqd2Nl+Br6sbCxiiKd/XBuPogH1HiAzJXHMC8 + YA98td1wb4rCuaEH1roo8oMR5JGaMPIFa10Ejtowiuouw1vzJTwVXyBz+X4ekPgRZfgbohkLtsfMy47B + tqYdakUnPFUM6YUv+LUGa/Y4o8e8rBXcSffWDkpE4j9ZpEvNmb9KsZV16BzrBnVq1YjeVf1MX1Tzn74o + iCmkdq1/LrNHOkfgB6Vg9afJRrVOdv2ClRkMmklvCnyPs4V8ge81v5RegddnCGHNHmf00JslcJcZCcWv + IU1pAhcyhLcFXj1zGtbscUYPvdyZ+Uv6Wi8rKekFBjoX2627by8AAAAASUVORK5CYII= + + + + + iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 + YQUAAAAZdEVYdFNvZnR3YXJlAEFkb2JlIEltYWdlUmVhZHlxyWU8AAADZmlUWHRYTUw6Y29tLmFkb2Jl + LnhtcAAAAAAAPD94cGFja2V0IGJlZ2luPSLvu78iIGlkPSJXNU0wTXBDZWhpSHpyZVN6TlRjemtjOWQi + Pz4gPHg6eG1wbWV0YSB4bWxuczp4PSJhZG9iZTpuczptZXRhLyIgeDp4bXB0az0iQWRvYmUgWE1QIENv + cmUgNS4zLWMwMTEgNjYuMTQ1NjYxLCAyMDEyLzAyLzA2LTE0OjU2OjI3ICAgICAgICAiPiA8cmRmOlJE + RiB4bWxuczpyZGY9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkvMDIvMjItcmRmLXN5bnRheC1ucyMiPiA8 + cmRmOkRlc2NyaXB0aW9uIHJkZjphYm91dD0iIiB4bWxuczp4bXBNTT0iaHR0cDovL25zLmFkb2JlLmNv + bS94YXAvMS4wL21tLyIgeG1sbnM6c3RSZWY9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlw + ZS9SZXNvdXJjZVJlZiMiIHhtbG5zOnhtcD0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wLyIgeG1w + TU06T3JpZ2luYWxEb2N1bWVudElEPSJ4bXAuZGlkOjYzQTM5NEY4Mjg0OUU0MTE5NDBEQTc4ODZEQzk5 + N0NGIiB4bXBNTTpEb2N1bWVudElEPSJ4bXAuZGlkOkE2Q0VGMDE2NDlEQTExRTQ4NTlCQTI3NTMyOEY5 + NEU2IiB4bXBNTTpJbnN0YW5jZUlEPSJ4bXAuaWlkOkE2Q0VGMDE1NDlEQTExRTQ4NTlCQTI3NTMyOEY5 + NEU2IiB4bXA6Q3JlYXRvclRvb2w9IkFkb2JlIFBob3Rvc2hvcCBDUzYgKFdpbmRvd3MpIj4gPHhtcE1N + OkRlcml2ZWRGcm9tIHN0UmVmOmluc3RhbmNlSUQ9InhtcC5paWQ6NjA1MjM3NzFEOTQ5RTQxMUE0QzNB + MjdEOTJBQzc3QkMiIHN0UmVmOmRvY3VtZW50SUQ9InhtcC5kaWQ6NjNBMzk0RjgyODQ5RTQxMTk0MERB + Nzg4NkRDOTk3Q0YiLz4gPC9yZGY6RGVzY3JpcHRpb24+IDwvcmRmOlJERj4gPC94OnhtcG1ldGE+IDw/ + eHBhY2tldCBlbmQ9InIiPz6UH16BAAABrElEQVRIS63N70tTURzH8fsnKSGCCEIQCBKISMq2iILCgQOL + JUxQAoVKdMGQuwgWFepsMGjFZCMuorsIJV4WFatpvzdr1ZAFsaIHn8559v1eDsI91wevJ/ee7/tjbMRH + fAFwJOWRF6oopTzyQhWlVEdBwRbgUhICAnuvilKGtXDGzW6WV/CvbjE/xTfxr+R6q4xSxtP5YTf8rVn4 + s5dG+809Rv5zvVVGKaNwfYgyBfhksoH83CCF9seiL7LBBnLXTlP4/W4dza0ZLS0nCdlgA9npAQq/qk/Q + sKa0NJ8nIBtsIBPrp9CqPMJBYVLLj+04ZIMNrF49ReHwVRafH1/R8m3zJmSDDdy/fJJC88Ua3mcjWurW + LGSDDaQifRS+O8uopsNaPhVnIBts4E64l0Jj5y4qDy5q+ZCPQTbYgHmph8LXZ0m8TJ3Xsp+LQjbYQOJC + N4XadgLl22e1vM1OQDbYwK1zXRS+lBbhmEHsLgU8kTeVh+OQDTawEDpB2U4mitfpMS22GYJssIH5QCcV + FGwBmuRtkA3cGO3whcZUlEdeqKKU8sgLVZRSfjw+MP4DJ2GPpDR9OIsAAAAASUVORK5CYII= + + + + + iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 + YQUAAAAZdEVYdFNvZnR3YXJlAEFkb2JlIEltYWdlUmVhZHlxyWU8AAADZmlUWHRYTUw6Y29tLmFkb2Jl + LnhtcAAAAAAAPD94cGFja2V0IGJlZ2luPSLvu78iIGlkPSJXNU0wTXBDZWhpSHpyZVN6TlRjemtjOWQi + Pz4gPHg6eG1wbWV0YSB4bWxuczp4PSJhZG9iZTpuczptZXRhLyIgeDp4bXB0az0iQWRvYmUgWE1QIENv + cmUgNS4zLWMwMTEgNjYuMTQ1NjYxLCAyMDEyLzAyLzA2LTE0OjU2OjI3ICAgICAgICAiPiA8cmRmOlJE + RiB4bWxuczpyZGY9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkvMDIvMjItcmRmLXN5bnRheC1ucyMiPiA8 + cmRmOkRlc2NyaXB0aW9uIHJkZjphYm91dD0iIiB4bWxuczp4bXBNTT0iaHR0cDovL25zLmFkb2JlLmNv + bS94YXAvMS4wL21tLyIgeG1sbnM6c3RSZWY9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlw + ZS9SZXNvdXJjZVJlZiMiIHhtbG5zOnhtcD0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wLyIgeG1w + TU06T3JpZ2luYWxEb2N1bWVudElEPSJ4bXAuZGlkOjYzQTM5NEY4Mjg0OUU0MTE5NDBEQTc4ODZEQzk5 + N0NGIiB4bXBNTTpEb2N1bWVudElEPSJ4bXAuZGlkOjJGRTU5OEQ1NDlEQjExRTRBRUVDOTkyMjQ5NzEw + REUwIiB4bXBNTTpJbnN0YW5jZUlEPSJ4bXAuaWlkOjJGRTU5OEQ0NDlEQjExRTRBRUVDOTkyMjQ5NzEw + REUwIiB4bXA6Q3JlYXRvclRvb2w9IkFkb2JlIFBob3Rvc2hvcCBDUzYgKFdpbmRvd3MpIj4gPHhtcE1N + OkRlcml2ZWRGcm9tIHN0UmVmOmluc3RhbmNlSUQ9InhtcC5paWQ6MTY0MkI1RjlEQTQ5RTQxMUE0QzNB + MjdEOTJBQzc3QkMiIHN0UmVmOmRvY3VtZW50SUQ9InhtcC5kaWQ6NjNBMzk0RjgyODQ5RTQxMTk0MERB + Nzg4NkRDOTk3Q0YiLz4gPC9yZGY6RGVzY3JpcHRpb24+IDwvcmRmOlJERj4gPC94OnhtcG1ldGE+IDw/ + eHBhY2tldCBlbmQ9InIiPz6B5sF9AAACe0lEQVRIS7WVb2jMcRzHL7UHanF/Mts5prE/1li3kAfu5Ak7 + 5IHNobBkSC2UIuGJkrrSWRvTmHQWK8U1T8jqUtYwkZpaGjV/Js6to5YwfXze39+fu/v23f36hXe9us+f + 7/v9rd/dr3MQ0X/F4Zm3+K9QhWajNNlBFZqN0mQHS6lMdrCUyqSgimllUsy4XmOmp+QRDllQWbygjjq6 + uimZStOX8a+ixox3pXrM1JLCDAqYJmY7c669M0bff07mcLbtEl9QE8k6V6BH5ooXMsHZZX7ae+AY7W45 + SrPm19LbsSR9m/iRA2bYGefggVePzUgKBzeu9sQpmZ4QcG/WMtk7eLjv0WMz0kOz+TX6MUXvP6cFeNbD + bz6YvQFm2Bk9PPByZO6jksLB5KvRTzTyLikIrG2ktsvXzd4g2hGjYP1ms4eHvb850qkl65LCQW/ntVs0 + 9HpMcPx0K1X4V1Ff/3NzhnphbVDsjBk8Lm/VE44s0ZJ1KS4Ie8uXUvPBE7Tn0ElCzTMqrV5BO/cfEaDG + TD5X6PFFONLygsTF7jj1vxihyPkYNTS1iFrFxm37KHIhJmp43L7qZxzp0pJ1SeHhQGgLJQaH6fb9R1QX + 2EB3Ek9FryLe95j8K9eLT/TB0FZcskOP1iRdkIh23aR7Ay9pzaZddKY9Jup8nIpeoXXhZlHD655b85Bj + p2npLOmCML+dD/iTZhaX3+UvbRB1PpzeygFnSUUvatecRUMzisoOc+x0LZ3FixxYhQyK1cxyZhkTYhqY + RgnM6hmcwVl4ljDI0KS4AC+Kmyli8Jv2MF7GNwXY4QzOwgNv5mWTL7CLpVQmO1hKZbKDpVR/1P8OcvwB + lh7gOXXZq9sAAAAASUVORK5CYII= + + iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 @@ -598,147 +738,7 @@ 1BGxz38BvCwLsyQ3iHgAAAAASUVORK5CYII= - - - iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAZdEVYdFNvZnR3YXJlAEFkb2JlIEltYWdlUmVhZHlxyWU8AAADZmlUWHRYTUw6Y29tLmFkb2Jl - LnhtcAAAAAAAPD94cGFja2V0IGJlZ2luPSLvu78iIGlkPSJXNU0wTXBDZWhpSHpyZVN6TlRjemtjOWQi - Pz4gPHg6eG1wbWV0YSB4bWxuczp4PSJhZG9iZTpuczptZXRhLyIgeDp4bXB0az0iQWRvYmUgWE1QIENv - cmUgNS4zLWMwMTEgNjYuMTQ1NjYxLCAyMDEyLzAyLzA2LTE0OjU2OjI3ICAgICAgICAiPiA8cmRmOlJE - RiB4bWxuczpyZGY9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkvMDIvMjItcmRmLXN5bnRheC1ucyMiPiA8 - cmRmOkRlc2NyaXB0aW9uIHJkZjphYm91dD0iIiB4bWxuczp4bXBNTT0iaHR0cDovL25zLmFkb2JlLmNv - bS94YXAvMS4wL21tLyIgeG1sbnM6c3RSZWY9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlw - ZS9SZXNvdXJjZVJlZiMiIHhtbG5zOnhtcD0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wLyIgeG1w - TU06T3JpZ2luYWxEb2N1bWVudElEPSJ4bXAuZGlkOjYzQTM5NEY4Mjg0OUU0MTE5NDBEQTc4ODZEQzk5 - N0NGIiB4bXBNTTpEb2N1bWVudElEPSJ4bXAuZGlkOjEwQ0IxNzBBNEM1QzExRTRBNkNGQzRBMjhDQzI0 - MkY4IiB4bXBNTTpJbnN0YW5jZUlEPSJ4bXAuaWlkOjEwQ0IxNzA5NEM1QzExRTRBNkNGQzRBMjhDQzI0 - MkY4IiB4bXA6Q3JlYXRvclRvb2w9IkFkb2JlIFBob3Rvc2hvcCBDUzYgKFdpbmRvd3MpIj4gPHhtcE1N - OkRlcml2ZWRGcm9tIHN0UmVmOmluc3RhbmNlSUQ9InhtcC5paWQ6NTEzMDNDMjA1QjRDRTQxMTg4NERE - MUVBOEQ4QTgyNTUiIHN0UmVmOmRvY3VtZW50SUQ9InhtcC5kaWQ6NjNBMzk0RjgyODQ5RTQxMTk0MERB - Nzg4NkRDOTk3Q0YiLz4gPC9yZGY6RGVzY3JpcHRpb24+IDwvcmRmOlJERj4gPC94OnhtcG1ldGE+IDw/ - eHBhY2tldCBlbmQ9InIiPz43wa2/AAAFaUlEQVRIS6WUC0xTVxzGKy0UkSmlFGjBFilSkNpSaAWRh63y - sIiAArKs4spLRLQoiEJlSMGoMCc6CBOnYHzMOHUqqOhEHOqCbjNu6kCd6KYje5mZ6KbObd/OuVL3cEzj - /skv997/+b7v39PTW9aj3/BM+OKxPEIZoW/gyrOuPbP+GvRPSNBQQqXYLwSW1etw7cYt5kqfaZ+uD8QM - Xg8f/f4UxGhHMHv4qlG6vAb9394G6T+BPpdV1oCuUx3VD8Q9XT8//PUJRMghlLhLg1C41IK+r/pB+oNC - 16mO6qmP+gdi/6y793+hwTYEk9uoQOSaStHzxQ2Q/nND9XMKy0D9NIfmDcSzaLhI4KXE7LwinLtwGXfu - PXhhqJ/m0DyS62EdUGWpqcf3P97DD3d++t/QnKraBjpghXWAiC+WN0ZNScOe1mP45vbdF2ZvWwdoDs/D - b6ejs6ecxHPoAG/l+Fhkzy+FyCcY0YkG7D/yAW5+d+e5oXrqo36aQ/McnNyjyAAuHWA05pfgzPlehhyT - mflV6FOMaDt2Ctf7bw8KXac6qqc+a4Zx3hLwRLJCZgcJjcPIEPkyIZmeX1SB7vOX0dn9KQy5jw8r8eVc - HOrsxidXP0d9hxlzd4QgeYMzEt7kQVvOR0pFFNpOHmd81E9znIS+dSTc1foVGWfNKUZjyy6Ex6SQl0cD - 09IVxHAFh0+cReqr+QjK8ERqEw+VHWOwoycSR/v1OHwzDlsvhcNCeqkbedAYxQiPm87kZOQVw0nkW0QG - 2DFnIA+JRm3DFpzr/RKNW3ZDE5UAsX8ocizZiFs7DEUHvPFunw4Hb05B+y09jn49lYHe0x5doxqqLVlf - DJrnyB+pIQNs6QAhf6R8tZu3CqpwPdZu2I6PLl3HwnV5iHv9JVSeUOKdqzq81xeDvddiYG73R0aLEIZm - IRa1jUbjxQnYRHa17YqW0VJPwHT3LocRbirrDiymspXo6L6AgiXV8JSNQ2i6GpNWOqK4U4n1n0Vge68W - 9ecmIKnBBSqDCIp4P2RWGDB/QxqS6l1QcToIld3BqDobgsXEQ73+Se5HrGcgdJEokGzIx66DXXi7dRvC - yx2Q2RqApR+GoPbjCag8pUZ6sxjqWRKEldljRr07ZjaKmHt5qpBZKzkeiIJ2BbIPKmA8MIbJUC/ghrM0 - RfYsDtdhqJNIVulK/ku0BQokbfZGZrsKBR3BmEsMOfvl0FY7o7ypDPo1brCcGc+QUCdExabXEFsjQO4B - ObL2BSBlqx8SWwibvBE0334nK3Ael+yEbIW81DZszlhZ2oieuAYvpO5VIHGzP9J2+CN9pz/CzDwExMox - eZUbFnZpkEc+gLZagJjMWOiqXZDVqmC0+kZf6Nb4IHKFCPIsu92sgCw7BlJswjBJLCdenmuPyFUS6Gp9 - oG/yRdJWGSKqhYjKDgLRImK5ACGlzsy9d/zwXn2DBMZDSkZLPaHlnpBncyGO5kxj+Rps/wYdJE2xzfOb - zcU4sye0b0gRu3E0Ypt8ELTICRFGNcShUgjHuZyWxNu2096sdiXS9o1ltNQjyyDhes4SkuXEGpXC+Ve8 - kjlzpDPtoCkVQrdOihgyIHmXP6LryGEX86Ba6ISJNR7IeF+JV8gAfbOM0XoTj8dktpmEOxM4rJHTBscz - njNNnMiBagEfU98ajRnbZMg7GojCk2oGU1cw5nUGw7BHAZWJD6oVhLFzSDCPCacljGP/J7xAm6Hu0ew6 - STIXkcvckN7ig8XHVCjvUiNvdwAmW0Twms6FayS7meM4REoihxPoeT4u10nsZ0LKhhdsIxZEsVcLtOyL - pHffVcd+IJjI7uGHsRscJEPURMMn2FMtNTwuFusPrjFl48ji7nIAAAAASUVORK5CYII= - - - - - iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAZdEVYdFNvZnR3YXJlAEFkb2JlIEltYWdlUmVhZHlxyWU8AAADZmlUWHRYTUw6Y29tLmFkb2Jl - LnhtcAAAAAAAPD94cGFja2V0IGJlZ2luPSLvu78iIGlkPSJXNU0wTXBDZWhpSHpyZVN6TlRjemtjOWQi - Pz4gPHg6eG1wbWV0YSB4bWxuczp4PSJhZG9iZTpuczptZXRhLyIgeDp4bXB0az0iQWRvYmUgWE1QIENv - cmUgNS4zLWMwMTEgNjYuMTQ1NjYxLCAyMDEyLzAyLzA2LTE0OjU2OjI3ICAgICAgICAiPiA8cmRmOlJE - RiB4bWxuczpyZGY9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkvMDIvMjItcmRmLXN5bnRheC1ucyMiPiA8 - cmRmOkRlc2NyaXB0aW9uIHJkZjphYm91dD0iIiB4bWxuczp4bXBNTT0iaHR0cDovL25zLmFkb2JlLmNv - bS94YXAvMS4wL21tLyIgeG1sbnM6c3RSZWY9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlw - ZS9SZXNvdXJjZVJlZiMiIHhtbG5zOnhtcD0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wLyIgeG1w - TU06T3JpZ2luYWxEb2N1bWVudElEPSJ4bXAuZGlkOjYzQTM5NEY4Mjg0OUU0MTE5NDBEQTc4ODZEQzk5 - N0NGIiB4bXBNTTpEb2N1bWVudElEPSJ4bXAuZGlkOkUyMTg3NjEyNDlEODExRTQ4NjNGQjM2Mzk1QkNB - RkQwIiB4bXBNTTpJbnN0YW5jZUlEPSJ4bXAuaWlkOkUyMTg3NjExNDlEODExRTQ4NjNGQjM2Mzk1QkNB - RkQwIiB4bXA6Q3JlYXRvclRvb2w9IkFkb2JlIFBob3Rvc2hvcCBDUzYgKFdpbmRvd3MpIj4gPHhtcE1N - OkRlcml2ZWRGcm9tIHN0UmVmOmluc3RhbmNlSUQ9InhtcC5paWQ6NkJCNTE0NDlEODQ5RTQxMUE0QzNB - MjdEOTJBQzc3QkMiIHN0UmVmOmRvY3VtZW50SUQ9InhtcC5kaWQ6NjNBMzk0RjgyODQ5RTQxMTk0MERB - Nzg4NkRDOTk3Q0YiLz4gPC9yZGY6RGVzY3JpcHRpb24+IDwvcmRmOlJERj4gPC94OnhtcG1ldGE+IDw/ - eHBhY2tldCBlbmQ9InIiPz5e5MstAAADiUlEQVRIS+2UW0yTdxjGcePwtYyVVpAUCi1tv9ImrVbxhAei - kjGphAgFT4jzEJ0gGuJhDk0sml0sglmWmC1hqHNKWwI4srgNh3phpjg1O1yIN5DMbFHQZUu42O76+D4f - 3Fl6Z7ILn+SXvH3f533++X/98iUBeKW81v9Uwx1G1+1240EhfKfdeE/4U3qTAqaZZO/2aeN9IXLrY+Ph - wVOZHll9YyohgYZOGS4JsYdXVDy+NQ8Tvy3BP6OlmPyjDP9OBDRYs8cZPfRy5/uQISIRqcIsLSye+j7I - wN+PluOvhyWY+NmL8fsOjP9kxdN7BRh/YJHfFjy5m48nd4ThQjy968bEgwV49usicFciTEKKFhZPXXv1 - eHxtLsYGPBjttwsWjF0xY+ybOfj9uylYs8cZPfQS7kpEnqDTwuLp9GYlfKZeifUfzcb1j/Iw/IkNv3Q6 - MfKVC6O9bg3W7HFGD73cORlMG5AIizDzAaVtunD5ESXWfNSEY/tNCO00oG1zOkJBBSeqUjVYh6R3Qmat - zSY0Hjah7IASW7hPuSoRvIGihcVTSauCppvFODRUjJZvPWgaKMTuXgt2RHOxLTwHDd3EjPfCudgesWJX - jxM7eryo7/Ni8SGFj8gp6LWwePLvS0Og043A5y5UdtkQOJeLivM5ePf8bJSfM04zG2u7chDoysW6Thsq - zqpY0+GAvymNB/gEgxYWT64tKdGihpSYv8WEpSEzVp0pwDuf2SVQReCiS4M1e5zRQy937NXJ1yRirjDz - AVmVJyNZa9+PObauh7ptKdR6FY6N2SisTYe1OlmDNXtqvRNqwxLYt1TCVLY1ZijZOSQRbuEtLSyeTOXH - sfLDH1EauoFFx6/Cd6Qf7pYI1ObLsO+9iMLdF+DccwEuqd2Nl+Br6sbCxiiKd/XBuPogH1HiAzJXHMC8 - YA98td1wb4rCuaEH1roo8oMR5JGaMPIFa10Ejtowiuouw1vzJTwVXyBz+X4ekPgRZfgbohkLtsfMy47B - tqYdakUnPFUM6YUv+LUGa/Y4o8e8rBXcSffWDkpE4j9ZpEvNmb9KsZV16BzrBnVq1YjeVf1MX1Tzn74o - iCmkdq1/LrNHOkfgB6Vg9afJRrVOdv2ClRkMmklvCnyPs4V8ge81v5RegddnCGHNHmf00JslcJcZCcWv - IU1pAhcyhLcFXj1zGtbscUYPvdyZ+Uv6Wi8rKekFBjoX2627by8AAAAASUVORK5CYII= - - - - - iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAZdEVYdFNvZnR3YXJlAEFkb2JlIEltYWdlUmVhZHlxyWU8AAADZmlUWHRYTUw6Y29tLmFkb2Jl - LnhtcAAAAAAAPD94cGFja2V0IGJlZ2luPSLvu78iIGlkPSJXNU0wTXBDZWhpSHpyZVN6TlRjemtjOWQi - Pz4gPHg6eG1wbWV0YSB4bWxuczp4PSJhZG9iZTpuczptZXRhLyIgeDp4bXB0az0iQWRvYmUgWE1QIENv - cmUgNS4zLWMwMTEgNjYuMTQ1NjYxLCAyMDEyLzAyLzA2LTE0OjU2OjI3ICAgICAgICAiPiA8cmRmOlJE - RiB4bWxuczpyZGY9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkvMDIvMjItcmRmLXN5bnRheC1ucyMiPiA8 - cmRmOkRlc2NyaXB0aW9uIHJkZjphYm91dD0iIiB4bWxuczp4bXBNTT0iaHR0cDovL25zLmFkb2JlLmNv - bS94YXAvMS4wL21tLyIgeG1sbnM6c3RSZWY9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlw - ZS9SZXNvdXJjZVJlZiMiIHhtbG5zOnhtcD0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wLyIgeG1w - TU06T3JpZ2luYWxEb2N1bWVudElEPSJ4bXAuZGlkOjYzQTM5NEY4Mjg0OUU0MTE5NDBEQTc4ODZEQzk5 - N0NGIiB4bXBNTTpEb2N1bWVudElEPSJ4bXAuZGlkOkE2Q0VGMDE2NDlEQTExRTQ4NTlCQTI3NTMyOEY5 - NEU2IiB4bXBNTTpJbnN0YW5jZUlEPSJ4bXAuaWlkOkE2Q0VGMDE1NDlEQTExRTQ4NTlCQTI3NTMyOEY5 - NEU2IiB4bXA6Q3JlYXRvclRvb2w9IkFkb2JlIFBob3Rvc2hvcCBDUzYgKFdpbmRvd3MpIj4gPHhtcE1N - OkRlcml2ZWRGcm9tIHN0UmVmOmluc3RhbmNlSUQ9InhtcC5paWQ6NjA1MjM3NzFEOTQ5RTQxMUE0QzNB - MjdEOTJBQzc3QkMiIHN0UmVmOmRvY3VtZW50SUQ9InhtcC5kaWQ6NjNBMzk0RjgyODQ5RTQxMTk0MERB - Nzg4NkRDOTk3Q0YiLz4gPC9yZGY6RGVzY3JpcHRpb24+IDwvcmRmOlJERj4gPC94OnhtcG1ldGE+IDw/ - eHBhY2tldCBlbmQ9InIiPz6UH16BAAABrElEQVRIS63N70tTURzH8fsnKSGCCEIQCBKISMq2iILCgQOL - JUxQAoVKdMGQuwgWFepsMGjFZCMuorsIJV4WFatpvzdr1ZAFsaIHn8559v1eDsI91wevJ/ee7/tjbMRH - fAFwJOWRF6oopTzyQhWlVEdBwRbgUhICAnuvilKGtXDGzW6WV/CvbjE/xTfxr+R6q4xSxtP5YTf8rVn4 - s5dG+809Rv5zvVVGKaNwfYgyBfhksoH83CCF9seiL7LBBnLXTlP4/W4dza0ZLS0nCdlgA9npAQq/qk/Q - sKa0NJ8nIBtsIBPrp9CqPMJBYVLLj+04ZIMNrF49ReHwVRafH1/R8m3zJmSDDdy/fJJC88Ua3mcjWurW - LGSDDaQifRS+O8uopsNaPhVnIBts4E64l0Jj5y4qDy5q+ZCPQTbYgHmph8LXZ0m8TJ3Xsp+LQjbYQOJC - N4XadgLl22e1vM1OQDbYwK1zXRS+lBbhmEHsLgU8kTeVh+OQDTawEDpB2U4mitfpMS22GYJssIH5QCcV - FGwBmuRtkA3cGO3whcZUlEdeqKKU8sgLVZRSfjw+MP4DJ2GPpDR9OIsAAAAASUVORK5CYII= - - - - - iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAZdEVYdFNvZnR3YXJlAEFkb2JlIEltYWdlUmVhZHlxyWU8AAADZmlUWHRYTUw6Y29tLmFkb2Jl - LnhtcAAAAAAAPD94cGFja2V0IGJlZ2luPSLvu78iIGlkPSJXNU0wTXBDZWhpSHpyZVN6TlRjemtjOWQi - Pz4gPHg6eG1wbWV0YSB4bWxuczp4PSJhZG9iZTpuczptZXRhLyIgeDp4bXB0az0iQWRvYmUgWE1QIENv - cmUgNS4zLWMwMTEgNjYuMTQ1NjYxLCAyMDEyLzAyLzA2LTE0OjU2OjI3ICAgICAgICAiPiA8cmRmOlJE - RiB4bWxuczpyZGY9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkvMDIvMjItcmRmLXN5bnRheC1ucyMiPiA8 - cmRmOkRlc2NyaXB0aW9uIHJkZjphYm91dD0iIiB4bWxuczp4bXBNTT0iaHR0cDovL25zLmFkb2JlLmNv - bS94YXAvMS4wL21tLyIgeG1sbnM6c3RSZWY9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlw - ZS9SZXNvdXJjZVJlZiMiIHhtbG5zOnhtcD0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wLyIgeG1w - TU06T3JpZ2luYWxEb2N1bWVudElEPSJ4bXAuZGlkOjYzQTM5NEY4Mjg0OUU0MTE5NDBEQTc4ODZEQzk5 - N0NGIiB4bXBNTTpEb2N1bWVudElEPSJ4bXAuZGlkOjJGRTU5OEQ1NDlEQjExRTRBRUVDOTkyMjQ5NzEw - REUwIiB4bXBNTTpJbnN0YW5jZUlEPSJ4bXAuaWlkOjJGRTU5OEQ0NDlEQjExRTRBRUVDOTkyMjQ5NzEw - REUwIiB4bXA6Q3JlYXRvclRvb2w9IkFkb2JlIFBob3Rvc2hvcCBDUzYgKFdpbmRvd3MpIj4gPHhtcE1N - OkRlcml2ZWRGcm9tIHN0UmVmOmluc3RhbmNlSUQ9InhtcC5paWQ6MTY0MkI1RjlEQTQ5RTQxMUE0QzNB - MjdEOTJBQzc3QkMiIHN0UmVmOmRvY3VtZW50SUQ9InhtcC5kaWQ6NjNBMzk0RjgyODQ5RTQxMTk0MERB - Nzg4NkRDOTk3Q0YiLz4gPC9yZGY6RGVzY3JpcHRpb24+IDwvcmRmOlJERj4gPC94OnhtcG1ldGE+IDw/ - eHBhY2tldCBlbmQ9InIiPz6B5sF9AAACe0lEQVRIS7WVb2jMcRzHL7UHanF/Mts5prE/1li3kAfu5Ak7 - 5IHNobBkSC2UIuGJkrrSWRvTmHQWK8U1T8jqUtYwkZpaGjV/Js6to5YwfXze39+fu/v23f36hXe9us+f - 7/v9rd/dr3MQ0X/F4Zm3+K9QhWajNNlBFZqN0mQHS6lMdrCUyqSgimllUsy4XmOmp+QRDllQWbygjjq6 - uimZStOX8a+ixox3pXrM1JLCDAqYJmY7c669M0bff07mcLbtEl9QE8k6V6BH5ooXMsHZZX7ae+AY7W45 - SrPm19LbsSR9m/iRA2bYGefggVePzUgKBzeu9sQpmZ4QcG/WMtk7eLjv0WMz0kOz+TX6MUXvP6cFeNbD - bz6YvQFm2Bk9PPByZO6jksLB5KvRTzTyLikIrG2ktsvXzd4g2hGjYP1ms4eHvb850qkl65LCQW/ntVs0 - 9HpMcPx0K1X4V1Ff/3NzhnphbVDsjBk8Lm/VE44s0ZJ1KS4Ie8uXUvPBE7Tn0ElCzTMqrV5BO/cfEaDG - TD5X6PFFONLygsTF7jj1vxihyPkYNTS1iFrFxm37KHIhJmp43L7qZxzp0pJ1SeHhQGgLJQaH6fb9R1QX - 2EB3Ek9FryLe95j8K9eLT/TB0FZcskOP1iRdkIh23aR7Ay9pzaZddKY9Jup8nIpeoXXhZlHD655b85Bj - p2npLOmCML+dD/iTZhaX3+UvbRB1PpzeygFnSUUvatecRUMzisoOc+x0LZ3FixxYhQyK1cxyZhkTYhqY - RgnM6hmcwVl4ljDI0KS4AC+Kmyli8Jv2MF7GNwXY4QzOwgNv5mWTL7CLpVQmO1hKZbKDpVR/1P8OcvwB - lh7gOXXZq9sAAAAASUVORK5CYII= - - - + iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 YQUAAAAZdEVYdFNvZnR3YXJlAEFkb2JlIEltYWdlUmVhZHlxyWU8AAADZmlUWHRYTUw6Y29tLmFkb2Jl @@ -750,26 +750,244 @@ bS94YXAvMS4wL21tLyIgeG1sbnM6c3RSZWY9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlw ZS9SZXNvdXJjZVJlZiMiIHhtbG5zOnhtcD0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wLyIgeG1w TU06T3JpZ2luYWxEb2N1bWVudElEPSJ4bXAuZGlkOjJGQzkyMzc0Rjk0OUU0MTE5NjNCQjRENDMzQjlC - MUM4IiB4bXBNTTpEb2N1bWVudElEPSJ4bXAuZGlkOjJERjY3MEZENEQyMzExRTRCNDlGQUMwMzk0OTAw - Qzc4IiB4bXBNTTpJbnN0YW5jZUlEPSJ4bXAuaWlkOjJERjY3MEZDNEQyMzExRTRCNDlGQUMwMzk0OTAw - Qzc4IiB4bXA6Q3JlYXRvclRvb2w9IkFkb2JlIFBob3Rvc2hvcCBDUzYgKFdpbmRvd3MpIj4gPHhtcE1N - OkRlcml2ZWRGcm9tIHN0UmVmOmluc3RhbmNlSUQ9InhtcC5paWQ6NjhGOUEyRDEyMTRERTQxMUIzNkJE + MUM4IiB4bXBNTTpEb2N1bWVudElEPSJ4bXAuZGlkOjlDMzFEOUI4NEFBRjExRTQ4OTA5OUYwQ0QzM0Q2 + NEI4IiB4bXBNTTpJbnN0YW5jZUlEPSJ4bXAuaWlkOjlDMzFEOUI3NEFBRjExRTQ4OTA5OUYwQ0QzM0Q2 + NEI4IiB4bXA6Q3JlYXRvclRvb2w9IkFkb2JlIFBob3Rvc2hvcCBDUzYgKFdpbmRvd3MpIj4gPHhtcE1N + OkRlcml2ZWRGcm9tIHN0UmVmOmluc3RhbmNlSUQ9InhtcC5paWQ6MDk5Mzk2NTZBRjRBRTQxMTk3NEFD + QUFFQjRCMzVENkUiIHN0UmVmOmRvY3VtZW50SUQ9InhtcC5kaWQ6MkZDOTIzNzRGOTQ5RTQxMTk2M0JC + NEQ0MzNCOUIxQzgiLz4gPC9yZGY6RGVzY3JpcHRpb24+IDwvcmRmOlJERj4gPC94OnhtcG1ldGE+IDw/ + eHBhY2tldCBlbmQ9InIiPz73sIMwAAADIElEQVRIS7WVa0iTYRTH56Uiysvm3TkvpLl5DRIvQYWVWl+6 + iNEVg0yhQqloQZHkLT+Y0YdAs75IpEUhzERZoZhsRpZlS7soblotsRwoxhqWeTrnYZtv+u7NsB74cZ5z + zv89/z17HzYRAPxXeIv/EpFXcOyi4BvKhfehv4FvKBfeh+ayqIUDlIgBgT8whpRYoT2fhgvNVJKBQT9s + hB8/QZDPpnEIjEhg0J5Pw4Vm0mwygG9T06BSqQQhTUhUMoRGpyxYT7OZwfhXC6jVakFIYzNYqN5uMGKa + BI1GIwhpghXJaJJi13d0dEB2bj74hsWzSDlXbzfQG02g0+kEIU2wIomdovzKdVifngnFFytBeb4cLN+n + WaSc6hfKKqB/eHTWoHfwExgMBkFII5MnQUD4WlAWloO26wVs35MDmifPmQFFyqlO/aKKqlmDp31DYDKZ + BCGNTJ4IPqHx8LJvACbNUw7p6e2HuJQMNIhhBuaHj3vBYrEI0tb1BoIiE9kJ9h7Oh7EJM+g/jEJuwVlY + s24ri5RTnfo5BedAIoueIYPumvomuHzjzm9cq2uCq7UNUH2rEarr7kNd0yP26Y+eKoSWtk4wfpmAg7kn + ITY5DUorq1g8cOQEqze3aplOEhRtJoMcL1mMTixV9IgD5a/tSBVDYql8AKOBQLEJtTP08gY/jjFiktKg + 5FIV21Ok3NazvmR2AvrFkCAJyGYk1comZAuHDM/AyLvHThfBveZ26NOPwI59eey7LsbhFCmnOvVJ5+Ef + rrYZLEU8EZ85+HLwW7ZCLMVTFWdkHoLut+/hgbYHaE9XN31XNsupTrWV3jKVs+uS3cyAD0cLe331jW3Q + qRt0CPUlQVHDKI+fN9iGo4W90uNnyuA2vvRtWTlQgxeg/dk7FimnOvU9/CNqUe47b7ANRwt7AfjpKvAK + Gt18Qur35ymhRfsKKLr5hN7EyzDq7humWrrcfSfKxbz/QlwcLDck1snZJdUzYHUDmk57+K1qdXJyzsL6 + RmQD9ZmObygXB8sVIRO6fXQB4hC6eRQppzr1XXmHclnAckFomLc1Um5dItEvhZ97MQXP9N0AAAAASUVO + RK5CYII= + + + + + iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 + YQUAAAAZdEVYdFNvZnR3YXJlAEFkb2JlIEltYWdlUmVhZHlxyWU8AAADZmlUWHRYTUw6Y29tLmFkb2Jl + LnhtcAAAAAAAPD94cGFja2V0IGJlZ2luPSLvu78iIGlkPSJXNU0wTXBDZWhpSHpyZVN6TlRjemtjOWQi + Pz4gPHg6eG1wbWV0YSB4bWxuczp4PSJhZG9iZTpuczptZXRhLyIgeDp4bXB0az0iQWRvYmUgWE1QIENv + cmUgNS4zLWMwMTEgNjYuMTQ1NjYxLCAyMDEyLzAyLzA2LTE0OjU2OjI3ICAgICAgICAiPiA8cmRmOlJE + RiB4bWxuczpyZGY9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkvMDIvMjItcmRmLXN5bnRheC1ucyMiPiA8 + cmRmOkRlc2NyaXB0aW9uIHJkZjphYm91dD0iIiB4bWxuczp4bXBNTT0iaHR0cDovL25zLmFkb2JlLmNv + bS94YXAvMS4wL21tLyIgeG1sbnM6c3RSZWY9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlw + ZS9SZXNvdXJjZVJlZiMiIHhtbG5zOnhtcD0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wLyIgeG1w + TU06T3JpZ2luYWxEb2N1bWVudElEPSJ4bXAuZGlkOjJGQzkyMzc0Rjk0OUU0MTE5NjNCQjRENDMzQjlC + MUM4IiB4bXBNTTpEb2N1bWVudElEPSJ4bXAuZGlkOjhDMTdBQjRENEFBRTExRTQ4QjQyODY0MDNBNTJE + NzNCIiB4bXBNTTpJbnN0YW5jZUlEPSJ4bXAuaWlkOjhDMTdBQjRDNEFBRTExRTQ4QjQyODY0MDNBNTJE + NzNCIiB4bXA6Q3JlYXRvclRvb2w9IkFkb2JlIFBob3Rvc2hvcCBDUzYgKFdpbmRvd3MpIj4gPHhtcE1N + OkRlcml2ZWRGcm9tIHN0UmVmOmluc3RhbmNlSUQ9InhtcC5paWQ6NUQyMjc4QTlBQjRBRTQxMTk3NEFD + QUFFQjRCMzVENkUiIHN0UmVmOmRvY3VtZW50SUQ9InhtcC5kaWQ6MkZDOTIzNzRGOTQ5RTQxMTk2M0JC + NEQ0MzNCOUIxQzgiLz4gPC9yZGY6RGVzY3JpcHRpb24+IDwvcmRmOlJERj4gPC94OnhtcG1ldGE+IDw/ + eHBhY2tldCBlbmQ9InIiPz4eHsDfAAAB00lEQVRIS7XVWytEURQH8HniTTNHLs0NCXNcXjTN5dH9g/gM + 3jx590QhFDJS0gyTGmpqaqJIMW4hzlAoOaWISS7LWifntI3ddnTGrl92e/57/We/DBsA/CvuYSHZSr0t + lvCGsriX/oI3lMW9lM/SwgF9SEHwizs08IX2vAyLZvZRgXJ+cQWv7yB0q96Ds86voT0vw6KZNJsK4Pnl + DWKxmBBlqhpDUN0UNp2n2VrB/WMOEomEEGX0ArN5o+BGfYB0Oi1EGa8cwpKw6bxRcH6lQiaTEaKMVw5q + rzCbNwr2z65BURQhynh8Qe0VZvNGwdZBFlRVFaKMxxfQXmE2rxc8rW3sQy6XE0puHoG7IaC9YnV9j5th + pbZPqOCDCrbH5uIwOD7/zWgkDkNTizAyuwQjkWWIxFNQWduqmVxI/MiPz6/A8HTUuDMTTYLkbrqhgt5S + T3PG4ZJ3HE7focElZx0u3yn+VQiG1ZLymmm7s74f88f42S6bl9zyJZ6d6Xckd+Mt5ieogH4xJORHHajt + SzvqZPSgECpHZSiA2DztuxBlad+NgnpBEbIjusiiYboKRF+kGFHegUR5ImkFv7G0eAPzWVq8gfksLd5/ + oULiHhYS97BwwPYJlSCUgVubViQAAAAASUVORK5CYII= + + + + + iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 + YQUAAAAZdEVYdFNvZnR3YXJlAEFkb2JlIEltYWdlUmVhZHlxyWU8AAADZmlUWHRYTUw6Y29tLmFkb2Jl + LnhtcAAAAAAAPD94cGFja2V0IGJlZ2luPSLvu78iIGlkPSJXNU0wTXBDZWhpSHpyZVN6TlRjemtjOWQi + Pz4gPHg6eG1wbWV0YSB4bWxuczp4PSJhZG9iZTpuczptZXRhLyIgeDp4bXB0az0iQWRvYmUgWE1QIENv + cmUgNS4zLWMwMTEgNjYuMTQ1NjYxLCAyMDEyLzAyLzA2LTE0OjU2OjI3ICAgICAgICAiPiA8cmRmOlJE + RiB4bWxuczpyZGY9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkvMDIvMjItcmRmLXN5bnRheC1ucyMiPiA8 + cmRmOkRlc2NyaXB0aW9uIHJkZjphYm91dD0iIiB4bWxuczp4bXBNTT0iaHR0cDovL25zLmFkb2JlLmNv + bS94YXAvMS4wL21tLyIgeG1sbnM6c3RSZWY9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlw + ZS9SZXNvdXJjZVJlZiMiIHhtbG5zOnhtcD0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wLyIgeG1w + TU06T3JpZ2luYWxEb2N1bWVudElEPSJ4bXAuZGlkOjJGQzkyMzc0Rjk0OUU0MTE5NjNCQjRENDMzQjlC + MUM4IiB4bXBNTTpEb2N1bWVudElEPSJ4bXAuZGlkOjJEMDQyOEZBNEFEMjExRTRBN0MxRDBCNzJGRUND + MDEzIiB4bXBNTTpJbnN0YW5jZUlEPSJ4bXAuaWlkOjJEMDQyOEY5NEFEMjExRTRBN0MxRDBCNzJGRUND + MDEzIiB4bXA6Q3JlYXRvclRvb2w9IkFkb2JlIFBob3Rvc2hvcCBDUzYgKFdpbmRvd3MpIj4gPHhtcE1N + OkRlcml2ZWRGcm9tIHN0UmVmOmluc3RhbmNlSUQ9InhtcC5paWQ6QkRDRkI1RDVEMTRBRTQxMTk3NEFD + QUFFQjRCMzVENkUiIHN0UmVmOmRvY3VtZW50SUQ9InhtcC5kaWQ6MkZDOTIzNzRGOTQ5RTQxMTk2M0JC + NEQ0MzNCOUIxQzgiLz4gPC9yZGY6RGVzY3JpcHRpb24+IDwvcmRmOlJERj4gPC94OnhtcG1ldGE+IDw/ + eHBhY2tldCBlbmQ9InIiPz59jfe3AAAEbUlEQVRIS8WTeUybZRzHF48/pnFOuQRajkFLgQFb5iRLNJr4 + l/EPgsniUI4xZDAY1zyxwApsMJyIME61rByl3DfoYGBrgbWUY06FcZSCha4rQ8jYxkqPr2/fvkv8o2Sg + S/wkT970eb6/T5/39z7Prv8dt/Oql4mR4HZJ3ccoXFxhVCzB9DT9JueJdSq6c1wzVZFupepVzxu34XVj + CaEDi1jX6hF8ZQoeokl4iBVwzV9YdU1XRlIl28eVo8phCdXwGltEeOUsro6psaHVwcSDh5volc4iOO8X + 7KuVwb1hEi7J8myq9PEQO//I85oafr0KtEpUpNSETm+AwWDAvfv3YTQaybnm/t/AyO6Ga+UonJOnIijF + 1hA9tWI2qle9RxcI+RIpmZpTIfBULhIyyqHVahHPKcN70TmYnFFCp9OhqXcc9KwW0DOHVl3YU1aUyjJu + F1SpfhO3EM6bMMsVt+D8Zhz2HIpC4oU6bG5uIu4cD3tfTwAjIBNypQYbGxsISquBU34PaDHiVEplGXee + SuIjVaBv3Lz7gJg8vHg4FlZvc+ATVoLipiHsD8qCXWAO7IPK8MG5FjLXKboOeoYADkldUkplGWb7vOb4 + 4BzxIXXQE/1m59WDXdgBvxPfwz6UC4eQUth/WIBDZ2qQXj+K7IYRImeE5s5fOFrcDPvPapcJzVNmmwVY + VxWG9U09uau1tTVymPpc0iYFLew7OEUJ4BwtALfvJpl5xMrKCu6s3cUrn5YbCM1us80CrJZZVWjXr7j3 + 4CE0y8v4IrcaH+cK4Bv+DRyPl8ApphYuia3wZ3eCUzOA1PIfcVuzjHnlIgK/vgy7mHzTG+w12yzA5E53 + edYPo1c2i/X1dQTEfwvbwDQ4hhXg8OcN4P48Df+UTrgkNIAeW4Hg3Hbo9Xq0iGSgs4ls5CUhoXnObLOA + S8pkhG/bdZzgDZJnffT3GXieLAA9XgB2/RjZjuQqMWhxfBw824H55XWyhcfy+HDNqoB1SH4Codn6G7iw + p3d78EaVPlXX0CaZgkqlgly1gpCiK0htHCH/IL6oFcEF3ZjT3CUvXqv0DzDSS0FPq1a/8EbYS5Rqa+if + SAJ8KoeNR7gitEsnoVQqSbGOkJmYX1ggxaY70SabwIGMUrjn8I3WIXnBRPnWu/8nDnE9Sd7cAaP/ZSES + 6/rRKJRArpiHXC7HzekZNIukiCyrhW9mGZgXa4w2kUVnibJnzdXbxP5URzyDO4QjxGl5i9uNpMZeKP5U + IrywAq9yCnGAOGGMonbYxpVnEPGdyR9BO/MTj8kfgXeNFPt5IngVtoF1kQ9WcTs8qgfgmNreQMS21xZL + 0E6Ln6ef75tg8sfgXT8O77oReAkkYNXJ4PRV/4ztyfo9VPTf4xjdf9CpQKzdxxuGe6UMbhXEmc8V6mze + r3qNivx3HGN7UmglQ6CVDMIxXwybo5UcaunJQD8te9rhyx4JrWwItlGNUut3y5+hlp4cDhFCpl14k9jq + nR+Y1NTjIe7NlmMnWKoHsOtvjWYcKpheqFQAAAAASUVORK5CYII= + + + + + iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 + YQUAAAAZdEVYdFNvZnR3YXJlAEFkb2JlIEltYWdlUmVhZHlxyWU8AAADZmlUWHRYTUw6Y29tLmFkb2Jl + LnhtcAAAAAAAPD94cGFja2V0IGJlZ2luPSLvu78iIGlkPSJXNU0wTXBDZWhpSHpyZVN6TlRjemtjOWQi + Pz4gPHg6eG1wbWV0YSB4bWxuczp4PSJhZG9iZTpuczptZXRhLyIgeDp4bXB0az0iQWRvYmUgWE1QIENv + cmUgNS4zLWMwMTEgNjYuMTQ1NjYxLCAyMDEyLzAyLzA2LTE0OjU2OjI3ICAgICAgICAiPiA8cmRmOlJE + RiB4bWxuczpyZGY9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkvMDIvMjItcmRmLXN5bnRheC1ucyMiPiA8 + cmRmOkRlc2NyaXB0aW9uIHJkZjphYm91dD0iIiB4bWxuczp4bXBNTT0iaHR0cDovL25zLmFkb2JlLmNv + bS94YXAvMS4wL21tLyIgeG1sbnM6c3RSZWY9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlw + ZS9SZXNvdXJjZVJlZiMiIHhtbG5zOnhtcD0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wLyIgeG1w + TU06T3JpZ2luYWxEb2N1bWVudElEPSJ4bXAuZGlkOjJGQzkyMzc0Rjk0OUU0MTE5NjNCQjRENDMzQjlC + MUM4IiB4bXBNTTpEb2N1bWVudElEPSJ4bXAuZGlkOjJERTg4QTFENEQyMjExRTRBODEyODk0M0RBMTc5 + Qjg3IiB4bXBNTTpJbnN0YW5jZUlEPSJ4bXAuaWlkOjJERTg4QTFDNEQyMjExRTRBODEyODk0M0RBMTc5 + Qjg3IiB4bXA6Q3JlYXRvclRvb2w9IkFkb2JlIFBob3Rvc2hvcCBDUzYgKFdpbmRvd3MpIj4gPHhtcE1N + OkRlcml2ZWRGcm9tIHN0UmVmOmluc3RhbmNlSUQ9InhtcC5paWQ6NjJGOUEyRDEyMTRERTQxMUIzNkJE NUVDQjU5MzE1NjIiIHN0UmVmOmRvY3VtZW50SUQ9InhtcC5kaWQ6MkZDOTIzNzRGOTQ5RTQxMTk2M0JC NEQ0MzNCOUIxQzgiLz4gPC9yZGY6RGVzY3JpcHRpb24+IDwvcmRmOlJERj4gPC94OnhtcG1ldGE+IDw/ - eHBhY2tldCBlbmQ9InIiPz6GKmpFAAAC+UlEQVRIS63T20vTYRzH8Yforj/Ei24UiSgKIygKi8oyxZQo - cvNYeXaesmzqPGu2POd0ulSsnIdaurTSTJ3O6UxTPGya5vCQx5AuPn39RbHop7nZxQt+z3ie93e/Z4w1 - p7nsCoBt8R6yBF/UHPv+Wb0rfFFzm99CRIwEW1gnqXzxTXxRc0ydctm4OlID2sxrw6iCtiwItC+A2P/D - frLnjwGNSZdMq6N1WOvLwFpP4l/WdRlY6Jaio9Ab7QXba8sVoDHZGdT8PYS9THDqMGnLsKpNw0qXGCua - BO55VZdNQ6U/DRRibVCGb+N1pH5bukoRqHmDHOIG1N8/X2F4I8WyNhtf2+9hqSsZxqZ4upbb6HsSZLHO - Im90ym6hNVcIaktYTexZyUelGEvaHMy/jcFiZxo0xX5Y7ivGcn8JkVmA9uvlWBmqwpJeAWovs+poR99O - eRgWtQWYVUdgrj0FH+i+F3XF3NoappZYGJrEoLaOVYpOOTY/FGJB+xjTqnDMtMTTAC/Ma/Ix/TLUKl9e - x0JfFQpql7PykBP7lWIXzPeUYLIhHCPKCLr/AMy2ZsKoDLTKdNNdvM8TgNpRTBZwfJ885CTmaIChPhwa - mS+GnkdhqjEWY9X+VplqvIMXEhdQ24mZeuSs0N/BNNWWj4k6EdSZHhhXxWH0aSCGFd4c4Tk7zk7XBlUM - FKLToK4Nm+0qYnneRzqGGiSYaIiiyZdhVCdgqFSIwRJPjucZW85O1pvnRmvDkO9zFNTdy2Y6HjGp4HCF - 5kk4xhoiURd/EROv4tBfeM0qAyUC9Mp9QM0+7o829T6LZV0/mNycS6+nFKFWfAGj9ZHozfGwil7miZYH - 7qCmghsw+S6VpV894KuUuKFbfhNNqa749CwY3dm0toK+VABl3HlQM5obYHybwFLc7W1y/Y5BlX6FfgNn - DNcEY0DhZZX+MiGKbh0DNR24AYYWMSfJzc6GZBApwS5skIzNODcg0dV2V36FtsJ7yBJ8UXO8hyzBFzXH - ++H/A/YDv9/V87iOlrYAAAAASUVORK5CYII= + eHBhY2tldCBlbmQ9InIiPz6wJF34AAACl0lEQVRIS62Vy08TURSH73/QhQtXVnBhxEcMiUkhbEg0hB1R + Q1i68C8wIW5cEqMLN7ho2Ji4YiEhWq0prYUhfULbadN3obTaChobtZEUsFY9nnPS6WM6HYowyZf87j33 + nG/amaai9geOBYA+4pTxihmBE8DcTQB4J8em/9IwSQyagmrtL+z9rMFmvnhkKvtV7tcVHPz6DVsftulA + AckdhUg8zf19eoLKAd597iMLMItewfOxUDTN/bqCH3tVSG8VWIBZ9AoJApEk9+sKvu/uQ2IjzwJkGtH8 + OrTwy3Hu77vIAnV9mgWlcgWiqRwLjAMmkOMbPbNTKnN/JJntqJGEBZ++7oKcyLLgLN4JrU8Cms2C4pcy + BKKZumCI18temQ/8DzSLZlBmQX7nG/jCKdpgAa0driCtY5iFHuqHSjNoFtaags1iCdzBBG+QgNY2aZ0F + mIUe6osENAtrTUEq/7kDq9PHAszU5yYoq9f1i9cUSCD5ozxDEeTsrhAoONwyxLLb8MrhYQFmZYCHsnpd + v3hNgQROb5hnKIK29944MAThTBEWbS4WYBZ6qC/sKSy5ZJ6BGUQg8b4Bbhjod4AZXlhXWdBa10LrIVul + AM9ggS+aa6AIMMO8ZYUO0KeyIOMtZyaQpXpNi4LFucYzMINwhbMNcMNw5oIJMMNKIA0LNg88mZuH/ssj + dPgBMnN+cBRmny1wrRtSMMMzWCCFMg0UAeY2Fh0+GL5xG8Zu3oHXUrCj3g0WONdTbeBm21/o1N17gPtg + 98Xh3VoS3qzKMDI22agfglnY/Uld8NDc/ZlZwAwvl4Ngun6LGh8rdfVDViNs3rguOOzq6XOD8PDpc7g2 + OkHDH7XWtYa2It66Y4eCQ8cRfpvUNa2hTUD8A6JMaBvCyTdJAAAAAElFTkSuQmCC + + + + + iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 + YQUAAAAZdEVYdFNvZnR3YXJlAEFkb2JlIEltYWdlUmVhZHlxyWU8AAADZmlUWHRYTUw6Y29tLmFkb2Jl + LnhtcAAAAAAAPD94cGFja2V0IGJlZ2luPSLvu78iIGlkPSJXNU0wTXBDZWhpSHpyZVN6TlRjemtjOWQi + Pz4gPHg6eG1wbWV0YSB4bWxuczp4PSJhZG9iZTpuczptZXRhLyIgeDp4bXB0az0iQWRvYmUgWE1QIENv + cmUgNS4zLWMwMTEgNjYuMTQ1NjYxLCAyMDEyLzAyLzA2LTE0OjU2OjI3ICAgICAgICAiPiA8cmRmOlJE + RiB4bWxuczpyZGY9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkvMDIvMjItcmRmLXN5bnRheC1ucyMiPiA8 + cmRmOkRlc2NyaXB0aW9uIHJkZjphYm91dD0iIiB4bWxuczp4bXBNTT0iaHR0cDovL25zLmFkb2JlLmNv + bS94YXAvMS4wL21tLyIgeG1sbnM6c3RSZWY9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlw + ZS9SZXNvdXJjZVJlZiMiIHhtbG5zOnhtcD0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wLyIgeG1w + TU06T3JpZ2luYWxEb2N1bWVudElEPSJ4bXAuZGlkOjJGQzkyMzc0Rjk0OUU0MTE5NjNCQjRENDMzQjlC + MUM4IiB4bXBNTTpEb2N1bWVudElEPSJ4bXAuZGlkOkUzNzJDMjE3NEFENjExRTRCNjE0OEVEQzI4MEM0 + RTZDIiB4bXBNTTpJbnN0YW5jZUlEPSJ4bXAuaWlkOkUzNzJDMjE2NEFENjExRTRCNjE0OEVEQzI4MEM0 + RTZDIiB4bXA6Q3JlYXRvclRvb2w9IkFkb2JlIFBob3Rvc2hvcCBDUzYgKFdpbmRvd3MpIj4gPHhtcE1N + OkRlcml2ZWRGcm9tIHN0UmVmOmluc3RhbmNlSUQ9InhtcC5paWQ6RkI3NUQ0QkNENDRBRTQxMTk3NEFD + QUFFQjRCMzVENkUiIHN0UmVmOmRvY3VtZW50SUQ9InhtcC5kaWQ6MkZDOTIzNzRGOTQ5RTQxMTk2M0JC + NEQ0MzNCOUIxQzgiLz4gPC9yZGY6RGVzY3JpcHRpb24+IDwvcmRmOlJERj4gPC94OnhtcG1ldGE+IDw/ + eHBhY2tldCBlbmQ9InIiPz6PyaLfAAADMElEQVRIS6VUXUiTYRT+vi3Tzd+ps23+3KRigtiPkolEQReG + UYTkhWatpWlWGkRdddfdSPImqUAJjSIT00oxLJIk0cR+tFSyzDJtgaMkDEPkdM7ZPvm2vS6jBx6es3Pe + 8zzvtm+TohLS/ov+AACStLgEQuJyLRJWYK1yzh/+FgCoQrpnfM4fOGBhcUlIMkEVkma4H4i1y2kFcMD8 + wqKQZILKZqTqmlTAWrfvMjhgbv63Dwm0hLWQohn1eNEbzrlfPiTQAtZCKjP1GXdAIC+r4XD+9CGBFrDm + RVJ1re6pZ0GyHHMvIawauYVNCFPfvvuQQAtYC6meKXU0amNsaGN/ZR60xIf9aIgN3cpGE9OzZCZ85nEm + pGiWlLABmuJCnUOXrNB7chdct4TUo32ANDbp4NuielDpqWfePdaPX6GrohSK4uLhlCEo96YlZLbOFHzH + oJXjMSBcGn4/zQGovEDqXXtzeTb+BTrKj0J3+Q54djYP7EZdTU2MPjFSK8eieQR9QtLg6GcOQPWgqKeQ + ZyOfoK30CDw+lg2Ot3Z4VLoNqo269mCNHIa2WjYn9A1PcAAqU6m9VV3TF9psOwwPS3JgZugCdNoyocwU + jU+RlImWBpezGz0vxzkA1YOiHvPFO7Ca1kGHLQtmXp2HdutmqN+/F6JiU+h3kOpyVeHJwBgHoLIpqajm + 189HoaG4CNqsGTA1UAWth9Lg6r490PygGyLjUikgzuWqQlffCAegelDdUwLqigqhpXgjTPYeh+bCFCg2 + RkEk3vxuVz/P0c43oLP3DQegLhspNalSFxiNcLswHT48LYNbBUlQk7ebzenmyhm08w1o7xmiAP6hRZiT + 70eYkzpctUuJWdHmwWs74+F1Uz7cyE+E4ohQB5mHm9a3GywpTXzektyKduIAIsKI3ISkL4rIdYle05C9 + VrZVBmvtl7eboUyv7V4jSQdwRn8FdI72iErtCUxnIuifkJ5hUqUOq9Jr7OeCNU6bTpNVqtMcDJSldOwn + KnOk+jypJ5QANRWc0cs5SEelXr54QidfwVYAMoiHq4W/gNM6OaNCJ+diaUIqN/43+Atwg27t+9ZXBUn6 + A2MdqQeVc5pWAAAAAElFTkSuQmCC + + + + + iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAIAAABvFaqvAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 + YQUAAAAZdEVYdFNvZnR3YXJlAEFkb2JlIEltYWdlUmVhZHlxyWU8AAADZmlUWHRYTUw6Y29tLmFkb2Jl + LnhtcAAAAAAAPD94cGFja2V0IGJlZ2luPSLvu78iIGlkPSJXNU0wTXBDZWhpSHpyZVN6TlRjemtjOWQi + Pz4gPHg6eG1wbWV0YSB4bWxuczp4PSJhZG9iZTpuczptZXRhLyIgeDp4bXB0az0iQWRvYmUgWE1QIENv + cmUgNS4zLWMwMTEgNjYuMTQ1NjYxLCAyMDEyLzAyLzA2LTE0OjU2OjI3ICAgICAgICAiPiA8cmRmOlJE + RiB4bWxuczpyZGY9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkvMDIvMjItcmRmLXN5bnRheC1ucyMiPiA8 + cmRmOkRlc2NyaXB0aW9uIHJkZjphYm91dD0iIiB4bWxuczp4bXBNTT0iaHR0cDovL25zLmFkb2JlLmNv + bS94YXAvMS4wL21tLyIgeG1sbnM6c3RSZWY9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlw + ZS9SZXNvdXJjZVJlZiMiIHhtbG5zOnhtcD0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wLyIgeG1w + TU06T3JpZ2luYWxEb2N1bWVudElEPSJ4bXAuZGlkOjJGQzkyMzc0Rjk0OUU0MTE5NjNCQjRENDMzQjlC + MUM4IiB4bXBNTTpEb2N1bWVudElEPSJ4bXAuZGlkOjUzQzNGNDI5NEQyQzExRTQ4QkE1QUNCMEVDRDZF + MDVEIiB4bXBNTTpJbnN0YW5jZUlEPSJ4bXAuaWlkOjUzQzNGNDI4NEQyQzExRTQ4QkE1QUNCMEVDRDZF + MDVEIiB4bXA6Q3JlYXRvclRvb2w9IkFkb2JlIFBob3Rvc2hvcCBDUzYgKFdpbmRvd3MpIj4gPHhtcE1N + OkRlcml2ZWRGcm9tIHN0UmVmOmluc3RhbmNlSUQ9InhtcC5paWQ6RkI1NUY4OTYyQTRERTQxMUIzNkJE + NUVDQjU5MzE1NjIiIHN0UmVmOmRvY3VtZW50SUQ9InhtcC5kaWQ6MkZDOTIzNzRGOTQ5RTQxMTk2M0JC + NEQ0MzNCOUIxQzgiLz4gPC9yZGY6RGVzY3JpcHRpb24+IDwvcmRmOlJERj4gPC94OnhtcG1ldGE+IDw/ + eHBhY2tldCBlbmQ9InIiPz6IsaOmAAADF0lEQVQ4T62U/UuTURTH+0nICqRI1ERMMyNQe8N0ChqBwQhN + yvwhEgJjVCqJ/qCibZo6tzQ339h6Nre5prapUzc1XzItX1ilzuWMLLVAen+xf6DTuTxjdxsFVj58ebjc + c+7nnud7z3228DbpIaDFH/CfoqCn72DIDvNfPDM2KAqyr8PcJxqY+QBTb8kkjocXQTsKigGwfqYJHqIg + 1OxHGHvlWPx4hXB1YyA3g4CBhqst+piEnrDA3rA95vBAY1x8d7lq/DVZwm5PQZNvoKYdypSgHgbVEIh1 + cLOZzOCbSSsyRQRba6uWtcpVLbPcwlglInNUCJNWWKqABqMLCGvGlfpJELaQ/V1Vd1lujAhe0chtUrH5 + ZExnmJ85MdomEa+qZMbIEF2BHGunILSjdZwYgTt4gJqjjj0Rltml1Zq9AeL0Mn71Wn2mtDU80MIvsFTw + O+KPIoWC8BNYRIUaqrRQroJKjQOk9N+xLBF2pXJFKfnsDGYa8gS6xOO2whyMuoHaHpGzZ/pBM0IMrtXD + nT4HqNHXe0lYoogMFeQP4jbSDkCPTUyXmnNoPutSo+9WN5DEQDyeWCWnhqm4p7Oimt3b54rzmmKPVHKz + 0Xg0AU1pz87VJp+yXOfd9t3mBmLXsGrsJhSsDtF4iOWxKdpzyQNnuRW7vEUp13obFG05OVUBPtO5V1Sn + k5q4SX8ENfWA6C7xHsP981Bb2sf38ZKd4JhSuXUJHPHhg/WJnAeZFw0Xzt/w8erRtLmBnB/CSmaC599I + 2PYVRl+CXigu3R9SfCC0Pf1MZ1oqvqvjogX7gtRFJfb1n24g7GblfQcFP2fkBYm5anxqQcbLKgzyK/Df + WRTkV5+RMTg84ZrgAOHo4ZIDVNdJw67CpsVLZ5gifj97Typlq2ZFQXj8LKh5EHpnaIar8N+Al5l9Y9Vs + T7OiIAzjqaMsa6QJnBkeWvgOHdPkAuIV67PSeQpCYYZplsZ+KyyWLRyFF8D553EDbURY770J0rrYJbda + SYE4iWb9NcgpRKDrOMAWwYP6d5BTaC52zyaAWDlAm/DweL8AX9zXukfxHsIAAAAASUVORK5CYII= + + + + + iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 + YQUAAAAZdEVYdFNvZnR3YXJlAEFkb2JlIEltYWdlUmVhZHlxyWU8AAADZmlUWHRYTUw6Y29tLmFkb2Jl + LnhtcAAAAAAAPD94cGFja2V0IGJlZ2luPSLvu78iIGlkPSJXNU0wTXBDZWhpSHpyZVN6TlRjemtjOWQi + Pz4gPHg6eG1wbWV0YSB4bWxuczp4PSJhZG9iZTpuczptZXRhLyIgeDp4bXB0az0iQWRvYmUgWE1QIENv + cmUgNS4zLWMwMTEgNjYuMTQ1NjYxLCAyMDEyLzAyLzA2LTE0OjU2OjI3ICAgICAgICAiPiA8cmRmOlJE + RiB4bWxuczpyZGY9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkvMDIvMjItcmRmLXN5bnRheC1ucyMiPiA8 + cmRmOkRlc2NyaXB0aW9uIHJkZjphYm91dD0iIiB4bWxuczp4bXBNTT0iaHR0cDovL25zLmFkb2JlLmNv + bS94YXAvMS4wL21tLyIgeG1sbnM6c3RSZWY9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlw + ZS9SZXNvdXJjZVJlZiMiIHhtbG5zOnhtcD0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wLyIgeG1w + TU06T3JpZ2luYWxEb2N1bWVudElEPSJ4bXAuZGlkOjJGQzkyMzc0Rjk0OUU0MTE5NjNCQjRENDMzQjlC + MUM4IiB4bXBNTTpEb2N1bWVudElEPSJ4bXAuZGlkOkVENUYwQThBNEQyOTExRTQ5QzUzQzdFMkFGQkQy + NTA1IiB4bXBNTTpJbnN0YW5jZUlEPSJ4bXAuaWlkOkVENUYwQTg5NEQyOTExRTQ5QzUzQzdFMkFGQkQy + NTA1IiB4bXA6Q3JlYXRvclRvb2w9IkFkb2JlIFBob3Rvc2hvcCBDUzYgKFdpbmRvd3MpIj4gPHhtcE1N + OkRlcml2ZWRGcm9tIHN0UmVmOmluc3RhbmNlSUQ9InhtcC5paWQ6MkRGNkEzOUYyOTRERTQxMUIzNkJE + NUVDQjU5MzE1NjIiIHN0UmVmOmRvY3VtZW50SUQ9InhtcC5kaWQ6MkZDOTIzNzRGOTQ5RTQxMTk2M0JC + NEQ0MzNCOUIxQzgiLz4gPC9yZGY6RGVzY3JpcHRpb24+IDwvcmRmOlJERj4gPC94OnhtcG1ldGE+IDw/ + eHBhY2tldCBlbmQ9InIiPz6npMy1AAAGEUlEQVRIS7WVeVDUZRjHf7Ase8ECu+wl4LIXcqyyHC783AWW + 5QaRFTHkMi9SQvE+UhLzwk0BUcQSgQBBgcYDzStMSzOPcpqcmo5pmqk/+rOapqb+iG/PbzfFcSz/6pn5 + zPN739/7fp/nvZn/3TSLjj+XJy2/RaItPCT5vaBd8m1+q2Qku1lcrcvki+iXr7fFU6ZZeOx5KDU1b7jU + 1Z2bVPMPWNMbRXrXkWAc+ywVLbcS8fKwFjlu8VdpW0XzSc6f8PEIPzJ19dFnU3WEJdHL9P3X9O1nkdB8 + CQrX7i3mKn9zfqsUq29ZsPfjRBx5aMO2cTMy94gm7FuF7XyJTwDJTo5GVdHxNALVgsPd5Ceye+9g8b0f + UXbjB8RtH4Msd+MeXS7f6twjxbILZiy7pEHDtTBsvG7BqivTUXpsClLWCbtJNpDwBlGVH3ySIFV520eW + nedRcf0HVJGwbeRrOHs/h2n1CGRZDe7wND/W1hiI8sEYlJ4KRcVpJcrfVqByNBILhqLh3KeA+UXBOpL2 + jkRZduARPGXZ/vH4pnMou/gd7INfIPn4QyQc/RSOzk9hrBtEiKPerUn1Y5PXBaDojWlwdgUjr0+G/H4Z + cnpCUNJrQNZ+LeLrBD/LYnixFEDAKFz7vJQ0r49dO4zikS8x8/ADxLd9jIT2B5ix/z7SX78Pw+K3EJy2 + wq1M4rEz6sRwthgw82Ag2KNS2I5JPZ4rZx00ImGNHIZSfisFkDGhxbs5AkKLd/3kaLkDlgTjXrsNc/Md + mPfeQeyOD2HbcRu6yi4E2Wrd8ngeG71IBPtePWa4JUhsD0DykQAkHQqApUWCFLcGyZvDoZ/P/5oCTGXk + hU2MvGB7rbGmG47dd2Fa+x6iX/kAMa/eQvS2m4jaeAPspvcROb8TQexid3CcL2usFCJjnwE5nQYU9RhR + PGDC7D4TCrqMyDqkR9oePbRz/SZEKh8rI8vdyshyXhmzLD8DS/1VGOquwtgw7glkXH0Nhvp3kbL2GrSl + hyC11ril03xZfbkQKZuVsDeq4NihRtYuDbJ2auBoUsO2TQXrJiWMlWIExflWMiHOjRzfJy0bg776HCKX + vANd7WXol1/xeN3Si7A2XIXW1YbAxAq3UO0zPTSd1yG38bplLK//vxBrffKY4PQ1HH9aKk8jonQUUyvO + Qlt9HtqaCx4/tXIMyXWXMXXOAQTEv+D2zCvDhBBTCN1zCGOCZq3k+DXO1YcpRYOY4hpF2LzTCCs74/VE + 3IvnEVd1EhGFblBbWot6BKXWQZq64tlYa2+TuJwQM9KU5cRL35hyOxCe2w913hA0hcPQFI16KRzxEFtO + a1Q9htSVN5C+5S5x7x/uIm3DR7CvuomUReOImt1FU7nwEolHECImMGkJE5i46EJkejNM+X1QOPqhzBqC + KvskVDmnJuHKT/K4bgjKzBMItXcjJv84NOwWiKPndJK40TOCgPgaRmIur1dZ1yM6txvyWT0ITR+AImOQ + gg39N1ybDBJP60PorC5My3oTwQm18FdNryBxbq0EJL6AEUTYZBTkF0NGKyKdvZDb3qJOAxSIOqcP/jtp + JyC3D1BSvYgp6EN4aiNlP/cTEk4gFASPEUeXkWd8RaY5jcrEBkTn9UCT4Q3gzfBfRvJE9rrsfpicHSRe + NsFXmJeSXhTBXXY+jMjk8uArVkpExuKb6pkbYJ7L7Ria37xTUBeMeCkcncRTN0z/TyLKNYy4khNQJq2G + IMLBXdUWQkXwCYYR6md7IPP1k8WEC3UFDzSpG2BZeAZJtXQWFpyls3HOC50JzkdQnbFqDInLLiC2rBcq + 6xoSzzzP+NDVwDBaQkx4XzahNv8xZH48sVotCHeOUnnCWNJG18Q4UjddB7vlfbBbPwC7+YannLTyIrS5 + OyHU5v3hr07poL7JBHe4Jh8bzgQROY8h46IKCAVfbi73D3PcpfoJlX0VtEVN0JXsQlj2ZoRaaynj7N/8 + NfZLPLFmHrXnpiWSCCL8iMl32T/M6YGMq+R+covD7QADwfoIgqt4QVGtfvIZJ4lRv5CY4zypbjfjy+eE + M4l4gtuSwYSQ4DS4EZAew/wNiCYQJlvQU3cAAAAASUVORK5CYII= @@ -1054,142 +1272,6 @@ R2K5fxKLWbbp/7Dc0CBY8Q+pPmOq0VkzzQAAAABJRU5ErkJggg== - - - iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAZdEVYdFNvZnR3YXJlAEFkb2JlIEltYWdlUmVhZHlxyWU8AAADZmlUWHRYTUw6Y29tLmFkb2Jl - LnhtcAAAAAAAPD94cGFja2V0IGJlZ2luPSLvu78iIGlkPSJXNU0wTXBDZWhpSHpyZVN6TlRjemtjOWQi - Pz4gPHg6eG1wbWV0YSB4bWxuczp4PSJhZG9iZTpuczptZXRhLyIgeDp4bXB0az0iQWRvYmUgWE1QIENv - cmUgNS4zLWMwMTEgNjYuMTQ1NjYxLCAyMDEyLzAyLzA2LTE0OjU2OjI3ICAgICAgICAiPiA8cmRmOlJE - RiB4bWxuczpyZGY9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkvMDIvMjItcmRmLXN5bnRheC1ucyMiPiA8 - cmRmOkRlc2NyaXB0aW9uIHJkZjphYm91dD0iIiB4bWxuczp4bXBNTT0iaHR0cDovL25zLmFkb2JlLmNv - bS94YXAvMS4wL21tLyIgeG1sbnM6c3RSZWY9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlw - ZS9SZXNvdXJjZVJlZiMiIHhtbG5zOnhtcD0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wLyIgeG1w - TU06T3JpZ2luYWxEb2N1bWVudElEPSJ4bXAuZGlkOjJGQzkyMzc0Rjk0OUU0MTE5NjNCQjRENDMzQjlC - MUM4IiB4bXBNTTpEb2N1bWVudElEPSJ4bXAuZGlkOjlDMzFEOUI4NEFBRjExRTQ4OTA5OUYwQ0QzM0Q2 - NEI4IiB4bXBNTTpJbnN0YW5jZUlEPSJ4bXAuaWlkOjlDMzFEOUI3NEFBRjExRTQ4OTA5OUYwQ0QzM0Q2 - NEI4IiB4bXA6Q3JlYXRvclRvb2w9IkFkb2JlIFBob3Rvc2hvcCBDUzYgKFdpbmRvd3MpIj4gPHhtcE1N - OkRlcml2ZWRGcm9tIHN0UmVmOmluc3RhbmNlSUQ9InhtcC5paWQ6MDk5Mzk2NTZBRjRBRTQxMTk3NEFD - QUFFQjRCMzVENkUiIHN0UmVmOmRvY3VtZW50SUQ9InhtcC5kaWQ6MkZDOTIzNzRGOTQ5RTQxMTk2M0JC - NEQ0MzNCOUIxQzgiLz4gPC9yZGY6RGVzY3JpcHRpb24+IDwvcmRmOlJERj4gPC94OnhtcG1ldGE+IDw/ - eHBhY2tldCBlbmQ9InIiPz73sIMwAAADIElEQVRIS7WVa0iTYRTH56Uiysvm3TkvpLl5DRIvQYWVWl+6 - iNEVg0yhQqloQZHkLT+Y0YdAs75IpEUhzERZoZhsRpZlS7soblotsRwoxhqWeTrnYZtv+u7NsB74cZ5z - zv89/z17HzYRAPxXeIv/EpFXcOyi4BvKhfehv4FvKBfeh+ayqIUDlIgBgT8whpRYoT2fhgvNVJKBQT9s - hB8/QZDPpnEIjEhg0J5Pw4Vm0mwygG9T06BSqQQhTUhUMoRGpyxYT7OZwfhXC6jVakFIYzNYqN5uMGKa - BI1GIwhpghXJaJJi13d0dEB2bj74hsWzSDlXbzfQG02g0+kEIU2wIomdovzKdVifngnFFytBeb4cLN+n - WaSc6hfKKqB/eHTWoHfwExgMBkFII5MnQUD4WlAWloO26wVs35MDmifPmQFFyqlO/aKKqlmDp31DYDKZ - BCGNTJ4IPqHx8LJvACbNUw7p6e2HuJQMNIhhBuaHj3vBYrEI0tb1BoIiE9kJ9h7Oh7EJM+g/jEJuwVlY - s24ri5RTnfo5BedAIoueIYPumvomuHzjzm9cq2uCq7UNUH2rEarr7kNd0yP26Y+eKoSWtk4wfpmAg7kn - ITY5DUorq1g8cOQEqze3aplOEhRtJoMcL1mMTixV9IgD5a/tSBVDYql8AKOBQLEJtTP08gY/jjFiktKg - 5FIV21Ok3NazvmR2AvrFkCAJyGYk1comZAuHDM/AyLvHThfBveZ26NOPwI59eey7LsbhFCmnOvVJ5+Ef - rrYZLEU8EZ85+HLwW7ZCLMVTFWdkHoLut+/hgbYHaE9XN31XNsupTrWV3jKVs+uS3cyAD0cLe331jW3Q - qRt0CPUlQVHDKI+fN9iGo4W90uNnyuA2vvRtWTlQgxeg/dk7FimnOvU9/CNqUe47b7ANRwt7AfjpKvAK - Gt18Qur35ymhRfsKKLr5hN7EyzDq7humWrrcfSfKxbz/QlwcLDck1snZJdUzYHUDmk57+K1qdXJyzsL6 - RmQD9ZmObygXB8sVIRO6fXQB4hC6eRQppzr1XXmHclnAckFomLc1Um5dItEvhZ97MQXP9N0AAAAASUVO - RK5CYII= - - - - - iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAZdEVYdFNvZnR3YXJlAEFkb2JlIEltYWdlUmVhZHlxyWU8AAADZmlUWHRYTUw6Y29tLmFkb2Jl - LnhtcAAAAAAAPD94cGFja2V0IGJlZ2luPSLvu78iIGlkPSJXNU0wTXBDZWhpSHpyZVN6TlRjemtjOWQi - Pz4gPHg6eG1wbWV0YSB4bWxuczp4PSJhZG9iZTpuczptZXRhLyIgeDp4bXB0az0iQWRvYmUgWE1QIENv - cmUgNS4zLWMwMTEgNjYuMTQ1NjYxLCAyMDEyLzAyLzA2LTE0OjU2OjI3ICAgICAgICAiPiA8cmRmOlJE - RiB4bWxuczpyZGY9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkvMDIvMjItcmRmLXN5bnRheC1ucyMiPiA8 - cmRmOkRlc2NyaXB0aW9uIHJkZjphYm91dD0iIiB4bWxuczp4bXBNTT0iaHR0cDovL25zLmFkb2JlLmNv - bS94YXAvMS4wL21tLyIgeG1sbnM6c3RSZWY9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlw - ZS9SZXNvdXJjZVJlZiMiIHhtbG5zOnhtcD0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wLyIgeG1w - TU06T3JpZ2luYWxEb2N1bWVudElEPSJ4bXAuZGlkOjJGQzkyMzc0Rjk0OUU0MTE5NjNCQjRENDMzQjlC - MUM4IiB4bXBNTTpEb2N1bWVudElEPSJ4bXAuZGlkOjhDMTdBQjRENEFBRTExRTQ4QjQyODY0MDNBNTJE - NzNCIiB4bXBNTTpJbnN0YW5jZUlEPSJ4bXAuaWlkOjhDMTdBQjRDNEFBRTExRTQ4QjQyODY0MDNBNTJE - NzNCIiB4bXA6Q3JlYXRvclRvb2w9IkFkb2JlIFBob3Rvc2hvcCBDUzYgKFdpbmRvd3MpIj4gPHhtcE1N - OkRlcml2ZWRGcm9tIHN0UmVmOmluc3RhbmNlSUQ9InhtcC5paWQ6NUQyMjc4QTlBQjRBRTQxMTk3NEFD - QUFFQjRCMzVENkUiIHN0UmVmOmRvY3VtZW50SUQ9InhtcC5kaWQ6MkZDOTIzNzRGOTQ5RTQxMTk2M0JC - NEQ0MzNCOUIxQzgiLz4gPC9yZGY6RGVzY3JpcHRpb24+IDwvcmRmOlJERj4gPC94OnhtcG1ldGE+IDw/ - eHBhY2tldCBlbmQ9InIiPz4eHsDfAAAB00lEQVRIS7XVWytEURQH8HniTTNHLs0NCXNcXjTN5dH9g/gM - 3jx590QhFDJS0gyTGmpqaqJIMW4hzlAoOaWISS7LWifntI3ddnTGrl92e/57/We/DBsA/CvuYSHZSr0t - lvCGsriX/oI3lMW9lM/SwgF9SEHwizs08IX2vAyLZvZRgXJ+cQWv7yB0q96Ds86voT0vw6KZNJsK4Pnl - DWKxmBBlqhpDUN0UNp2n2VrB/WMOEomEEGX0ArN5o+BGfYB0Oi1EGa8cwpKw6bxRcH6lQiaTEaKMVw5q - rzCbNwr2z65BURQhynh8Qe0VZvNGwdZBFlRVFaKMxxfQXmE2rxc8rW3sQy6XE0puHoG7IaC9YnV9j5th - pbZPqOCDCrbH5uIwOD7/zWgkDkNTizAyuwQjkWWIxFNQWduqmVxI/MiPz6/A8HTUuDMTTYLkbrqhgt5S - T3PG4ZJ3HE7focElZx0u3yn+VQiG1ZLymmm7s74f88f42S6bl9zyJZ6d6Xckd+Mt5ieogH4xJORHHajt - SzvqZPSgECpHZSiA2DztuxBlad+NgnpBEbIjusiiYboKRF+kGFHegUR5ImkFv7G0eAPzWVq8gfksLd5/ - oULiHhYS97BwwPYJlSCUgVubViQAAAAASUVORK5CYII= - - - - - iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAZdEVYdFNvZnR3YXJlAEFkb2JlIEltYWdlUmVhZHlxyWU8AAADZmlUWHRYTUw6Y29tLmFkb2Jl - LnhtcAAAAAAAPD94cGFja2V0IGJlZ2luPSLvu78iIGlkPSJXNU0wTXBDZWhpSHpyZVN6TlRjemtjOWQi - Pz4gPHg6eG1wbWV0YSB4bWxuczp4PSJhZG9iZTpuczptZXRhLyIgeDp4bXB0az0iQWRvYmUgWE1QIENv - cmUgNS4zLWMwMTEgNjYuMTQ1NjYxLCAyMDEyLzAyLzA2LTE0OjU2OjI3ICAgICAgICAiPiA8cmRmOlJE - RiB4bWxuczpyZGY9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkvMDIvMjItcmRmLXN5bnRheC1ucyMiPiA8 - cmRmOkRlc2NyaXB0aW9uIHJkZjphYm91dD0iIiB4bWxuczp4bXBNTT0iaHR0cDovL25zLmFkb2JlLmNv - bS94YXAvMS4wL21tLyIgeG1sbnM6c3RSZWY9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlw - ZS9SZXNvdXJjZVJlZiMiIHhtbG5zOnhtcD0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wLyIgeG1w - TU06T3JpZ2luYWxEb2N1bWVudElEPSJ4bXAuZGlkOjJGQzkyMzc0Rjk0OUU0MTE5NjNCQjRENDMzQjlC - MUM4IiB4bXBNTTpEb2N1bWVudElEPSJ4bXAuZGlkOjJEMDQyOEZBNEFEMjExRTRBN0MxRDBCNzJGRUND - MDEzIiB4bXBNTTpJbnN0YW5jZUlEPSJ4bXAuaWlkOjJEMDQyOEY5NEFEMjExRTRBN0MxRDBCNzJGRUND - MDEzIiB4bXA6Q3JlYXRvclRvb2w9IkFkb2JlIFBob3Rvc2hvcCBDUzYgKFdpbmRvd3MpIj4gPHhtcE1N - OkRlcml2ZWRGcm9tIHN0UmVmOmluc3RhbmNlSUQ9InhtcC5paWQ6QkRDRkI1RDVEMTRBRTQxMTk3NEFD - QUFFQjRCMzVENkUiIHN0UmVmOmRvY3VtZW50SUQ9InhtcC5kaWQ6MkZDOTIzNzRGOTQ5RTQxMTk2M0JC - NEQ0MzNCOUIxQzgiLz4gPC9yZGY6RGVzY3JpcHRpb24+IDwvcmRmOlJERj4gPC94OnhtcG1ldGE+IDw/ - eHBhY2tldCBlbmQ9InIiPz59jfe3AAAEbUlEQVRIS8WTeUybZRzHF48/pnFOuQRajkFLgQFb5iRLNJr4 - l/EPgsniUI4xZDAY1zyxwApsMJyIME61rByl3DfoYGBrgbWUY06FcZSCha4rQ8jYxkqPr2/fvkv8o2Sg - S/wkT970eb6/T5/39z7Prv8dt/Oql4mR4HZJ3ccoXFxhVCzB9DT9JueJdSq6c1wzVZFupepVzxu34XVj - CaEDi1jX6hF8ZQoeokl4iBVwzV9YdU1XRlIl28eVo8phCdXwGltEeOUsro6psaHVwcSDh5volc4iOO8X - 7KuVwb1hEi7J8myq9PEQO//I85oafr0KtEpUpNSETm+AwWDAvfv3YTQaybnm/t/AyO6Ga+UonJOnIijF - 1hA9tWI2qle9RxcI+RIpmZpTIfBULhIyyqHVahHPKcN70TmYnFFCp9OhqXcc9KwW0DOHVl3YU1aUyjJu - F1SpfhO3EM6bMMsVt+D8Zhz2HIpC4oU6bG5uIu4cD3tfTwAjIBNypQYbGxsISquBU34PaDHiVEplGXee - SuIjVaBv3Lz7gJg8vHg4FlZvc+ATVoLipiHsD8qCXWAO7IPK8MG5FjLXKboOeoYADkldUkplGWb7vOb4 - 4BzxIXXQE/1m59WDXdgBvxPfwz6UC4eQUth/WIBDZ2qQXj+K7IYRImeE5s5fOFrcDPvPapcJzVNmmwVY - VxWG9U09uau1tTVymPpc0iYFLew7OEUJ4BwtALfvJpl5xMrKCu6s3cUrn5YbCM1us80CrJZZVWjXr7j3 - 4CE0y8v4IrcaH+cK4Bv+DRyPl8ApphYuia3wZ3eCUzOA1PIfcVuzjHnlIgK/vgy7mHzTG+w12yzA5E53 - edYPo1c2i/X1dQTEfwvbwDQ4hhXg8OcN4P48Df+UTrgkNIAeW4Hg3Hbo9Xq0iGSgs4ls5CUhoXnObLOA - S8pkhG/bdZzgDZJnffT3GXieLAA9XgB2/RjZjuQqMWhxfBw824H55XWyhcfy+HDNqoB1SH4Codn6G7iw - p3d78EaVPlXX0CaZgkqlgly1gpCiK0htHCH/IL6oFcEF3ZjT3CUvXqv0DzDSS0FPq1a/8EbYS5Rqa+if - SAJ8KoeNR7gitEsnoVQqSbGOkJmYX1ggxaY70SabwIGMUrjn8I3WIXnBRPnWu/8nDnE9Sd7cAaP/ZSES - 6/rRKJRArpiHXC7HzekZNIukiCyrhW9mGZgXa4w2kUVnibJnzdXbxP5URzyDO4QjxGl5i9uNpMZeKP5U - IrywAq9yCnGAOGGMonbYxpVnEPGdyR9BO/MTj8kfgXeNFPt5IngVtoF1kQ9WcTs8qgfgmNreQMS21xZL - 0E6Ln6ef75tg8sfgXT8O77oReAkkYNXJ4PRV/4ztyfo9VPTf4xjdf9CpQKzdxxuGe6UMbhXEmc8V6mze - r3qNivx3HGN7UmglQ6CVDMIxXwybo5UcaunJQD8te9rhyx4JrWwItlGNUut3y5+hlp4cDhFCpl14k9jq - nR+Y1NTjIe7NlmMnWKoHsOtvjWYcKpheqFQAAAAASUVORK5CYII= - - - - - iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAZdEVYdFNvZnR3YXJlAEFkb2JlIEltYWdlUmVhZHlxyWU8AAADZmlUWHRYTUw6Y29tLmFkb2Jl - LnhtcAAAAAAAPD94cGFja2V0IGJlZ2luPSLvu78iIGlkPSJXNU0wTXBDZWhpSHpyZVN6TlRjemtjOWQi - Pz4gPHg6eG1wbWV0YSB4bWxuczp4PSJhZG9iZTpuczptZXRhLyIgeDp4bXB0az0iQWRvYmUgWE1QIENv - cmUgNS4zLWMwMTEgNjYuMTQ1NjYxLCAyMDEyLzAyLzA2LTE0OjU2OjI3ICAgICAgICAiPiA8cmRmOlJE - RiB4bWxuczpyZGY9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkvMDIvMjItcmRmLXN5bnRheC1ucyMiPiA8 - cmRmOkRlc2NyaXB0aW9uIHJkZjphYm91dD0iIiB4bWxuczp4bXBNTT0iaHR0cDovL25zLmFkb2JlLmNv - bS94YXAvMS4wL21tLyIgeG1sbnM6c3RSZWY9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlw - ZS9SZXNvdXJjZVJlZiMiIHhtbG5zOnhtcD0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wLyIgeG1w - TU06T3JpZ2luYWxEb2N1bWVudElEPSJ4bXAuZGlkOjJGQzkyMzc0Rjk0OUU0MTE5NjNCQjRENDMzQjlC - MUM4IiB4bXBNTTpEb2N1bWVudElEPSJ4bXAuZGlkOjJERTg4QTFENEQyMjExRTRBODEyODk0M0RBMTc5 - Qjg3IiB4bXBNTTpJbnN0YW5jZUlEPSJ4bXAuaWlkOjJERTg4QTFDNEQyMjExRTRBODEyODk0M0RBMTc5 - Qjg3IiB4bXA6Q3JlYXRvclRvb2w9IkFkb2JlIFBob3Rvc2hvcCBDUzYgKFdpbmRvd3MpIj4gPHhtcE1N - OkRlcml2ZWRGcm9tIHN0UmVmOmluc3RhbmNlSUQ9InhtcC5paWQ6NjJGOUEyRDEyMTRERTQxMUIzNkJE - NUVDQjU5MzE1NjIiIHN0UmVmOmRvY3VtZW50SUQ9InhtcC5kaWQ6MkZDOTIzNzRGOTQ5RTQxMTk2M0JC - NEQ0MzNCOUIxQzgiLz4gPC9yZGY6RGVzY3JpcHRpb24+IDwvcmRmOlJERj4gPC94OnhtcG1ldGE+IDw/ - eHBhY2tldCBlbmQ9InIiPz6wJF34AAACl0lEQVRIS62Vy08TURSH73/QhQtXVnBhxEcMiUkhbEg0hB1R - Q1i68C8wIW5cEqMLN7ho2Ji4YiEhWq0prYUhfULbadN3obTaChobtZEUsFY9nnPS6WM6HYowyZf87j33 - nG/amaai9geOBYA+4pTxihmBE8DcTQB4J8em/9IwSQyagmrtL+z9rMFmvnhkKvtV7tcVHPz6DVsftulA - AckdhUg8zf19eoLKAd597iMLMItewfOxUDTN/bqCH3tVSG8VWIBZ9AoJApEk9+sKvu/uQ2IjzwJkGtH8 - OrTwy3Hu77vIAnV9mgWlcgWiqRwLjAMmkOMbPbNTKnN/JJntqJGEBZ++7oKcyLLgLN4JrU8Cms2C4pcy - BKKZumCI18temQ/8DzSLZlBmQX7nG/jCKdpgAa0driCtY5iFHuqHSjNoFtaags1iCdzBBG+QgNY2aZ0F - mIUe6osENAtrTUEq/7kDq9PHAszU5yYoq9f1i9cUSCD5ozxDEeTsrhAoONwyxLLb8MrhYQFmZYCHsnpd - v3hNgQROb5hnKIK29944MAThTBEWbS4WYBZ6qC/sKSy5ZJ6BGUQg8b4Bbhjod4AZXlhXWdBa10LrIVul - AM9ggS+aa6AIMMO8ZYUO0KeyIOMtZyaQpXpNi4LFucYzMINwhbMNcMNw5oIJMMNKIA0LNg88mZuH/ssj - dPgBMnN+cBRmny1wrRtSMMMzWCCFMg0UAeY2Fh0+GL5xG8Zu3oHXUrCj3g0WONdTbeBm21/o1N17gPtg - 98Xh3VoS3qzKMDI22agfglnY/Uld8NDc/ZlZwAwvl4Ngun6LGh8rdfVDViNs3rguOOzq6XOD8PDpc7g2 - OkHDH7XWtYa2It66Y4eCQ8cRfpvUNa2hTUD8A6JMaBvCyTdJAAAAAElFTkSuQmCC - - iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 @@ -1403,7 +1485,7 @@ AAAASUVORK5CYII= - + iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 YQUAAAAZdEVYdFNvZnR3YXJlAEFkb2JlIEltYWdlUmVhZHlxyWU8AAADZmlUWHRYTUw6Y29tLmFkb2Jl @@ -1415,108 +1497,26 @@ bS94YXAvMS4wL21tLyIgeG1sbnM6c3RSZWY9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlw ZS9SZXNvdXJjZVJlZiMiIHhtbG5zOnhtcD0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wLyIgeG1w TU06T3JpZ2luYWxEb2N1bWVudElEPSJ4bXAuZGlkOjJGQzkyMzc0Rjk0OUU0MTE5NjNCQjRENDMzQjlC - MUM4IiB4bXBNTTpEb2N1bWVudElEPSJ4bXAuZGlkOkUzNzJDMjE3NEFENjExRTRCNjE0OEVEQzI4MEM0 - RTZDIiB4bXBNTTpJbnN0YW5jZUlEPSJ4bXAuaWlkOkUzNzJDMjE2NEFENjExRTRCNjE0OEVEQzI4MEM0 - RTZDIiB4bXA6Q3JlYXRvclRvb2w9IkFkb2JlIFBob3Rvc2hvcCBDUzYgKFdpbmRvd3MpIj4gPHhtcE1N - OkRlcml2ZWRGcm9tIHN0UmVmOmluc3RhbmNlSUQ9InhtcC5paWQ6RkI3NUQ0QkNENDRBRTQxMTk3NEFD - QUFFQjRCMzVENkUiIHN0UmVmOmRvY3VtZW50SUQ9InhtcC5kaWQ6MkZDOTIzNzRGOTQ5RTQxMTk2M0JC - NEQ0MzNCOUIxQzgiLz4gPC9yZGY6RGVzY3JpcHRpb24+IDwvcmRmOlJERj4gPC94OnhtcG1ldGE+IDw/ - eHBhY2tldCBlbmQ9InIiPz6PyaLfAAADMElEQVRIS6VUXUiTYRT+vi3Tzd+ps23+3KRigtiPkolEQReG - UYTkhWatpWlWGkRdddfdSPImqUAJjSIT00oxLJIk0cR+tFSyzDJtgaMkDEPkdM7ZPvm2vS6jBx6es3Pe - 8zzvtm+TohLS/ov+AACStLgEQuJyLRJWYK1yzh/+FgCoQrpnfM4fOGBhcUlIMkEVkma4H4i1y2kFcMD8 - wqKQZILKZqTqmlTAWrfvMjhgbv63Dwm0hLWQohn1eNEbzrlfPiTQAtZCKjP1GXdAIC+r4XD+9CGBFrDm - RVJ1re6pZ0GyHHMvIawauYVNCFPfvvuQQAtYC6meKXU0amNsaGN/ZR60xIf9aIgN3cpGE9OzZCZ85nEm - pGiWlLABmuJCnUOXrNB7chdct4TUo32ANDbp4NuielDpqWfePdaPX6GrohSK4uLhlCEo96YlZLbOFHzH - oJXjMSBcGn4/zQGovEDqXXtzeTb+BTrKj0J3+Q54djYP7EZdTU2MPjFSK8eieQR9QtLg6GcOQPWgqKeQ - ZyOfoK30CDw+lg2Ot3Z4VLoNqo269mCNHIa2WjYn9A1PcAAqU6m9VV3TF9psOwwPS3JgZugCdNoyocwU - jU+RlImWBpezGz0vxzkA1YOiHvPFO7Ca1kGHLQtmXp2HdutmqN+/F6JiU+h3kOpyVeHJwBgHoLIpqajm - 189HoaG4CNqsGTA1UAWth9Lg6r490PygGyLjUikgzuWqQlffCAegelDdUwLqigqhpXgjTPYeh+bCFCg2 - RkEk3vxuVz/P0c43oLP3DQegLhspNalSFxiNcLswHT48LYNbBUlQk7ebzenmyhm08w1o7xmiAP6hRZiT - 70eYkzpctUuJWdHmwWs74+F1Uz7cyE+E4ohQB5mHm9a3GywpTXzektyKduIAIsKI3ISkL4rIdYle05C9 - VrZVBmvtl7eboUyv7V4jSQdwRn8FdI72iErtCUxnIuifkJ5hUqUOq9Jr7OeCNU6bTpNVqtMcDJSldOwn - KnOk+jypJ5QANRWc0cs5SEelXr54QidfwVYAMoiHq4W/gNM6OaNCJ+diaUIqN/43+Atwg27t+9ZXBUn6 - A2MdqQeVc5pWAAAAAElFTkSuQmCC - - - - - iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAIAAABvFaqvAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAZdEVYdFNvZnR3YXJlAEFkb2JlIEltYWdlUmVhZHlxyWU8AAADZmlUWHRYTUw6Y29tLmFkb2Jl - LnhtcAAAAAAAPD94cGFja2V0IGJlZ2luPSLvu78iIGlkPSJXNU0wTXBDZWhpSHpyZVN6TlRjemtjOWQi - Pz4gPHg6eG1wbWV0YSB4bWxuczp4PSJhZG9iZTpuczptZXRhLyIgeDp4bXB0az0iQWRvYmUgWE1QIENv - cmUgNS4zLWMwMTEgNjYuMTQ1NjYxLCAyMDEyLzAyLzA2LTE0OjU2OjI3ICAgICAgICAiPiA8cmRmOlJE - RiB4bWxuczpyZGY9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkvMDIvMjItcmRmLXN5bnRheC1ucyMiPiA8 - cmRmOkRlc2NyaXB0aW9uIHJkZjphYm91dD0iIiB4bWxuczp4bXBNTT0iaHR0cDovL25zLmFkb2JlLmNv - bS94YXAvMS4wL21tLyIgeG1sbnM6c3RSZWY9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlw - ZS9SZXNvdXJjZVJlZiMiIHhtbG5zOnhtcD0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wLyIgeG1w - TU06T3JpZ2luYWxEb2N1bWVudElEPSJ4bXAuZGlkOjJGQzkyMzc0Rjk0OUU0MTE5NjNCQjRENDMzQjlC - MUM4IiB4bXBNTTpEb2N1bWVudElEPSJ4bXAuZGlkOjUzQzNGNDI5NEQyQzExRTQ4QkE1QUNCMEVDRDZF - MDVEIiB4bXBNTTpJbnN0YW5jZUlEPSJ4bXAuaWlkOjUzQzNGNDI4NEQyQzExRTQ4QkE1QUNCMEVDRDZF - MDVEIiB4bXA6Q3JlYXRvclRvb2w9IkFkb2JlIFBob3Rvc2hvcCBDUzYgKFdpbmRvd3MpIj4gPHhtcE1N - OkRlcml2ZWRGcm9tIHN0UmVmOmluc3RhbmNlSUQ9InhtcC5paWQ6RkI1NUY4OTYyQTRERTQxMUIzNkJE + MUM4IiB4bXBNTTpEb2N1bWVudElEPSJ4bXAuZGlkOjJERjY3MEZENEQyMzExRTRCNDlGQUMwMzk0OTAw + Qzc4IiB4bXBNTTpJbnN0YW5jZUlEPSJ4bXAuaWlkOjJERjY3MEZDNEQyMzExRTRCNDlGQUMwMzk0OTAw + Qzc4IiB4bXA6Q3JlYXRvclRvb2w9IkFkb2JlIFBob3Rvc2hvcCBDUzYgKFdpbmRvd3MpIj4gPHhtcE1N + OkRlcml2ZWRGcm9tIHN0UmVmOmluc3RhbmNlSUQ9InhtcC5paWQ6NjhGOUEyRDEyMTRERTQxMUIzNkJE NUVDQjU5MzE1NjIiIHN0UmVmOmRvY3VtZW50SUQ9InhtcC5kaWQ6MkZDOTIzNzRGOTQ5RTQxMTk2M0JC NEQ0MzNCOUIxQzgiLz4gPC9yZGY6RGVzY3JpcHRpb24+IDwvcmRmOlJERj4gPC94OnhtcG1ldGE+IDw/ - eHBhY2tldCBlbmQ9InIiPz6IsaOmAAADF0lEQVQ4T62U/UuTURTH+0nICqRI1ERMMyNQe8N0ChqBwQhN - yvwhEgJjVCqJ/qCibZo6tzQ339h6Nre5prapUzc1XzItX1ilzuWMLLVAen+xf6DTuTxjdxsFVj58ebjc - c+7nnud7z3228DbpIaDFH/CfoqCn72DIDvNfPDM2KAqyr8PcJxqY+QBTb8kkjocXQTsKigGwfqYJHqIg - 1OxHGHvlWPx4hXB1YyA3g4CBhqst+piEnrDA3rA95vBAY1x8d7lq/DVZwm5PQZNvoKYdypSgHgbVEIh1 - cLOZzOCbSSsyRQRba6uWtcpVLbPcwlglInNUCJNWWKqABqMLCGvGlfpJELaQ/V1Vd1lujAhe0chtUrH5 - ZExnmJ85MdomEa+qZMbIEF2BHGunILSjdZwYgTt4gJqjjj0Rltml1Zq9AeL0Mn71Wn2mtDU80MIvsFTw - O+KPIoWC8BNYRIUaqrRQroJKjQOk9N+xLBF2pXJFKfnsDGYa8gS6xOO2whyMuoHaHpGzZ/pBM0IMrtXD - nT4HqNHXe0lYoogMFeQP4jbSDkCPTUyXmnNoPutSo+9WN5DEQDyeWCWnhqm4p7Oimt3b54rzmmKPVHKz - 0Xg0AU1pz87VJp+yXOfd9t3mBmLXsGrsJhSsDtF4iOWxKdpzyQNnuRW7vEUp13obFG05OVUBPtO5V1Sn - k5q4SX8ENfWA6C7xHsP981Bb2sf38ZKd4JhSuXUJHPHhg/WJnAeZFw0Xzt/w8erRtLmBnB/CSmaC599I - 2PYVRl+CXigu3R9SfCC0Pf1MZ1oqvqvjogX7gtRFJfb1n24g7GblfQcFP2fkBYm5anxqQcbLKgzyK/Df - WRTkV5+RMTg84ZrgAOHo4ZIDVNdJw67CpsVLZ5gifj97Typlq2ZFQXj8LKh5EHpnaIar8N+Al5l9Y9Vs - T7OiIAzjqaMsa6QJnBkeWvgOHdPkAuIV67PSeQpCYYZplsZ+KyyWLRyFF8D553EDbURY770J0rrYJbda - SYE4iWb9NcgpRKDrOMAWwYP6d5BTaC52zyaAWDlAm/DweL8AX9zXukfxHsIAAAAASUVORK5CYII= - - - - - iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAZdEVYdFNvZnR3YXJlAEFkb2JlIEltYWdlUmVhZHlxyWU8AAADZmlUWHRYTUw6Y29tLmFkb2Jl - LnhtcAAAAAAAPD94cGFja2V0IGJlZ2luPSLvu78iIGlkPSJXNU0wTXBDZWhpSHpyZVN6TlRjemtjOWQi - Pz4gPHg6eG1wbWV0YSB4bWxuczp4PSJhZG9iZTpuczptZXRhLyIgeDp4bXB0az0iQWRvYmUgWE1QIENv - cmUgNS4zLWMwMTEgNjYuMTQ1NjYxLCAyMDEyLzAyLzA2LTE0OjU2OjI3ICAgICAgICAiPiA8cmRmOlJE - RiB4bWxuczpyZGY9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkvMDIvMjItcmRmLXN5bnRheC1ucyMiPiA8 - cmRmOkRlc2NyaXB0aW9uIHJkZjphYm91dD0iIiB4bWxuczp4bXBNTT0iaHR0cDovL25zLmFkb2JlLmNv - bS94YXAvMS4wL21tLyIgeG1sbnM6c3RSZWY9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlw - ZS9SZXNvdXJjZVJlZiMiIHhtbG5zOnhtcD0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wLyIgeG1w - TU06T3JpZ2luYWxEb2N1bWVudElEPSJ4bXAuZGlkOjJGQzkyMzc0Rjk0OUU0MTE5NjNCQjRENDMzQjlC - MUM4IiB4bXBNTTpEb2N1bWVudElEPSJ4bXAuZGlkOkVENUYwQThBNEQyOTExRTQ5QzUzQzdFMkFGQkQy - NTA1IiB4bXBNTTpJbnN0YW5jZUlEPSJ4bXAuaWlkOkVENUYwQTg5NEQyOTExRTQ5QzUzQzdFMkFGQkQy - NTA1IiB4bXA6Q3JlYXRvclRvb2w9IkFkb2JlIFBob3Rvc2hvcCBDUzYgKFdpbmRvd3MpIj4gPHhtcE1N - OkRlcml2ZWRGcm9tIHN0UmVmOmluc3RhbmNlSUQ9InhtcC5paWQ6MkRGNkEzOUYyOTRERTQxMUIzNkJE - NUVDQjU5MzE1NjIiIHN0UmVmOmRvY3VtZW50SUQ9InhtcC5kaWQ6MkZDOTIzNzRGOTQ5RTQxMTk2M0JC - NEQ0MzNCOUIxQzgiLz4gPC9yZGY6RGVzY3JpcHRpb24+IDwvcmRmOlJERj4gPC94OnhtcG1ldGE+IDw/ - eHBhY2tldCBlbmQ9InIiPz6npMy1AAAGEUlEQVRIS7WVeVDUZRjHf7Ase8ECu+wl4LIXcqyyHC783AWW - 5QaRFTHkMi9SQvE+UhLzwk0BUcQSgQBBgcYDzStMSzOPcpqcmo5pmqk/+rOapqb+iG/PbzfFcSz/6pn5 - zPN739/7fp/nvZn/3TSLjj+XJy2/RaItPCT5vaBd8m1+q2Qku1lcrcvki+iXr7fFU6ZZeOx5KDU1b7jU - 1Z2bVPMPWNMbRXrXkWAc+ywVLbcS8fKwFjlu8VdpW0XzSc6f8PEIPzJ19dFnU3WEJdHL9P3X9O1nkdB8 - CQrX7i3mKn9zfqsUq29ZsPfjRBx5aMO2cTMy94gm7FuF7XyJTwDJTo5GVdHxNALVgsPd5Ceye+9g8b0f - UXbjB8RtH4Msd+MeXS7f6twjxbILZiy7pEHDtTBsvG7BqivTUXpsClLWCbtJNpDwBlGVH3ySIFV520eW - nedRcf0HVJGwbeRrOHs/h2n1CGRZDe7wND/W1hiI8sEYlJ4KRcVpJcrfVqByNBILhqLh3KeA+UXBOpL2 - jkRZduARPGXZ/vH4pnMou/gd7INfIPn4QyQc/RSOzk9hrBtEiKPerUn1Y5PXBaDojWlwdgUjr0+G/H4Z - cnpCUNJrQNZ+LeLrBD/LYnixFEDAKFz7vJQ0r49dO4zikS8x8/ADxLd9jIT2B5ix/z7SX78Pw+K3EJy2 - wq1M4rEz6sRwthgw82Ag2KNS2I5JPZ4rZx00ImGNHIZSfisFkDGhxbs5AkKLd/3kaLkDlgTjXrsNc/Md - mPfeQeyOD2HbcRu6yi4E2Wrd8ngeG71IBPtePWa4JUhsD0DykQAkHQqApUWCFLcGyZvDoZ/P/5oCTGXk - hU2MvGB7rbGmG47dd2Fa+x6iX/kAMa/eQvS2m4jaeAPspvcROb8TQexid3CcL2usFCJjnwE5nQYU9RhR - PGDC7D4TCrqMyDqkR9oePbRz/SZEKh8rI8vdyshyXhmzLD8DS/1VGOquwtgw7glkXH0Nhvp3kbL2GrSl - hyC11ril03xZfbkQKZuVsDeq4NihRtYuDbJ2auBoUsO2TQXrJiWMlWIExflWMiHOjRzfJy0bg776HCKX - vANd7WXol1/xeN3Si7A2XIXW1YbAxAq3UO0zPTSd1yG38bplLK//vxBrffKY4PQ1HH9aKk8jonQUUyvO - Qlt9HtqaCx4/tXIMyXWXMXXOAQTEv+D2zCvDhBBTCN1zCGOCZq3k+DXO1YcpRYOY4hpF2LzTCCs74/VE - 3IvnEVd1EhGFblBbWot6BKXWQZq64tlYa2+TuJwQM9KU5cRL35hyOxCe2w913hA0hcPQFI16KRzxEFtO - a1Q9htSVN5C+5S5x7x/uIm3DR7CvuomUReOImt1FU7nwEolHECImMGkJE5i46EJkejNM+X1QOPqhzBqC - KvskVDmnJuHKT/K4bgjKzBMItXcjJv84NOwWiKPndJK40TOCgPgaRmIur1dZ1yM6txvyWT0ITR+AImOQ - gg39N1ybDBJP60PorC5My3oTwQm18FdNryBxbq0EJL6AEUTYZBTkF0NGKyKdvZDb3qJOAxSIOqcP/jtp - JyC3D1BSvYgp6EN4aiNlP/cTEk4gFASPEUeXkWd8RaY5jcrEBkTn9UCT4Q3gzfBfRvJE9rrsfpicHSRe - NsFXmJeSXhTBXXY+jMjk8uArVkpExuKb6pkbYJ7L7Ria37xTUBeMeCkcncRTN0z/TyLKNYy4khNQJq2G - IMLBXdUWQkXwCYYR6md7IPP1k8WEC3UFDzSpG2BZeAZJtXQWFpyls3HOC50JzkdQnbFqDInLLiC2rBcq - 6xoSzzzP+NDVwDBaQkx4XzahNv8xZH48sVotCHeOUnnCWNJG18Q4UjddB7vlfbBbPwC7+YannLTyIrS5 - OyHU5v3hr07poL7JBHe4Jh8bzgQROY8h46IKCAVfbi73D3PcpfoJlX0VtEVN0JXsQlj2ZoRaaynj7N/8 - NfZLPLFmHrXnpiWSCCL8iMl32T/M6YGMq+R+covD7QADwfoIgqt4QVGtfvIZJ4lRv5CY4zypbjfjy+eE - M4l4gtuSwYSQ4DS4EZAew/wNiCYQJlvQU3cAAAAASUVORK5CYII= + eHBhY2tldCBlbmQ9InIiPz6GKmpFAAAC+UlEQVRIS63T20vTYRzH8Yforj/Ei24UiSgKIygKi8oyxZQo + cvNYeXaesmzqPGu2POd0ulSsnIdaurTSTJ3O6UxTPGya5vCQx5AuPn39RbHop7nZxQt+z3ie93e/Z4w1 + p7nsCoBt8R6yBF/UHPv+Wb0rfFFzm99CRIwEW1gnqXzxTXxRc0ydctm4OlID2sxrw6iCtiwItC+A2P/D + frLnjwGNSZdMq6N1WOvLwFpP4l/WdRlY6Jaio9Ab7QXba8sVoDHZGdT8PYS9THDqMGnLsKpNw0qXGCua + BO55VZdNQ6U/DRRibVCGb+N1pH5bukoRqHmDHOIG1N8/X2F4I8WyNhtf2+9hqSsZxqZ4upbb6HsSZLHO + Im90ym6hNVcIaktYTexZyUelGEvaHMy/jcFiZxo0xX5Y7ivGcn8JkVmA9uvlWBmqwpJeAWovs+poR99O + eRgWtQWYVUdgrj0FH+i+F3XF3NoappZYGJrEoLaOVYpOOTY/FGJB+xjTqnDMtMTTAC/Ma/Ix/TLUKl9e + x0JfFQpql7PykBP7lWIXzPeUYLIhHCPKCLr/AMy2ZsKoDLTKdNNdvM8TgNpRTBZwfJ885CTmaIChPhwa + mS+GnkdhqjEWY9X+VplqvIMXEhdQ24mZeuSs0N/BNNWWj4k6EdSZHhhXxWH0aSCGFd4c4Tk7zk7XBlUM + FKLToK4Nm+0qYnneRzqGGiSYaIiiyZdhVCdgqFSIwRJPjucZW85O1pvnRmvDkO9zFNTdy2Y6HjGp4HCF + 5kk4xhoiURd/EROv4tBfeM0qAyUC9Mp9QM0+7o829T6LZV0/mNycS6+nFKFWfAGj9ZHozfGwil7miZYH + 7qCmghsw+S6VpV894KuUuKFbfhNNqa749CwY3dm0toK+VABl3HlQM5obYHybwFLc7W1y/Y5BlX6FfgNn + DNcEY0DhZZX+MiGKbh0DNR24AYYWMSfJzc6GZBApwS5skIzNODcg0dV2V36FtsJ7yBJ8UXO8hyzBFzXH + ++H/A/YDv9/V87iOlrYAAAAASUVORK5CYII= @@ -3164,9 +3164,6 @@ 864, 17 - - 864, 17 - iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 diff --git a/Program.cs b/Program.cs index e38f7b8..a76d0d4 100644 --- a/Program.cs +++ b/Program.cs @@ -16,14 +16,14 @@ [STAThread] static void Main() { - ValidateInfo validateInfo = ValidateConfig.LoadConfig(); + ValidateConfig.LoadConfig(); string localConfigPath = Application.StartupPath + "/Config.xml"; //获取程序及版本信息 string currentVersionCode = Assembly.GetExecutingAssembly().GetName().Version.ToString(); //获取文件版本信息 FileVersionInfo.GetVersionInfo(Application.ExecutablePath); - + Utility.SysInfoConfig(); string configUrl = getProgramUrl(localConfigPath, "configurl"); if (configUrl != "") { diff --git a/TreeUtils.cs b/TreeUtils.cs index 1f055b5..ad39643 100644 --- a/TreeUtils.cs +++ b/TreeUtils.cs @@ -19,7 +19,7 @@ public static void InitLayerTree(GSOGlobeControl gsoGlobeControl, TreeView treeView, string viewDatasrc) { // treeView.Nodes.Clear(); - LayerConfig layerConfig = Utility.layerConfig;//layertree所在的配置文件 + LayerConfig layerConfig = Utility.LayerConfig;//layertree所在的配置文件 List datasrcs = layerConfig.datasrcs; foreach (DataSrc datasrc in datasrcs) { diff --git a/Utility.cs b/Utility.cs index c03e405..ab947a3 100644 --- a/Utility.cs +++ b/Utility.cs @@ -20,7 +20,7 @@ public static string dbdatabase; public static string userID; - public static Hashtable Pipe_QueryFields; +// public static Hashtable Pipe_QueryFields; public static string DBPassword; public static string DBServer; public static string DBBackUp; @@ -38,7 +38,7 @@ public static List listPipelineType; public static string PicRootURL; public static string PicDefaultURL; - public static double dFlyAboveLine = 2; +// public static double dFlyAboveLine = 2; public static string userName; public static string projectStr; public static string userRole; @@ -85,12 +85,17 @@ public static List pipefittingLayerNames = new List();//管件图层名称 public static List sgPipeLayersNames = new List();//施工管线图层名称 -// public static Dictionary dictionaryNetLayerNameAndCaption = new Dictionary(); - public static HashSet layerNameSet = new HashSet(); + public static HashSet layerNameSet = new HashSet();//记录有哪些图层要显示 public static string roadLayerName = ""; #endregion wxl - public static LayerConfig layerConfig; + public static LayerConfig LayerConfig; + + public static string RoleServer; + public static string TitleImagePath; + public static string SysnameVersion; + public static string Copyright; + public static void SetBallons(GSOBalloon featureTooltip, GSOBalloonEx balloonEx) { featureTooltip.CacheFilePath = Application.StartupPath + "/GeoScene/Globe/Temp"; @@ -188,25 +193,6 @@ } return s.ToString(); } - public static GSOFeatures Table2Features(DataTable table, string currentQueryLayer, GSOGlobeControl globeControl1) - { - GSOFeatures features = new GSOFeatures(); - for (int i = 0; i < table.Rows.Count; i++) - { - DataRow row = table.Rows[i]; - - string featureName = row["编号"].ToString(); - featureName = featureName.Trim(); - GSOLayer layer = globeControl1.Globe.Layers.GetLayerByCaption(currentQueryLayer); - GSOFeatures tempfeatures = layer.GetFeatureByName(featureName, false); - if (tempfeatures.Length > 0) - { - features.Add(tempfeatures[0]); - } - } - return features; - } - //程序启动的时候读取配置文件 public static void SetParams() @@ -358,8 +344,8 @@ #region wxl 从layerconfig.xml中读取 - layerConfig = XmlTools.DeserializeFromXml(layerConfigFile); - List dataSrcs = layerConfig.datasrcs; + LayerConfig = XmlTools.DeserializeFromXml(layerConfigFile); + List dataSrcs = LayerConfig.datasrcs; foreach (var dataSrc in dataSrcs) { @@ -598,76 +584,49 @@ #endregion } - /* - //判断网络是否连接 - public static bool isNetworkConnectionSuccess(string ipAdress) + /// + /// 获取Config.xml配置文件中的roleurl配置，并返回 + /// + /// 请求综合信息平台的服务地址 + public static void SysInfoConfig() { - //return true; - if (ipAdress == null) - { - return false; - } - if (ipAdress.Contains("\\")) - { - ipAdress = ipAdress.Substring(0, ipAdress.LastIndexOf('\\')); - } - if (ipAdress.Trim() == "localhost" || ipAdress.Trim() == "127.0.0.1" || ipAdress.Trim() == Dns.GetHostName()) - { - return true; - } - Ping ping = new Ping(); + if (!File.Exists(filename)) return; + + XmlTextReader xmlReader = new XmlTextReader(filename); try { - PingReply pr = ping.Send(ipAdress.Trim(), 3000); - if (pr.Status == IPStatus.Success) + while (xmlReader.Read()) { - return true; + if (xmlReader.Name.Equals("roleurl")) + { + RoleServer = xmlReader.ReadElementString(); + } + else if (xmlReader.Name.Equals("titleimgpath")) + { + TitleImagePath = xmlReader.ReadElementString(); + } + else if (xmlReader.Name.Equals("sysname")) + { + SysnameVersion = xmlReader.ReadElementString(); + } + else if (xmlReader.Name.Equals("copyright")) + { + Copyright = xmlReader.ReadElementString(); + } } - else - { - return false; - } + } catch (Exception ex) { - LogError.PublishError(ex); - return false; + + LogHelper.Error("在config.xml配置文件中读取roleurl时出错"); } - } - */ - - - //TODO LIST:下面两个方法移到featueTools.cs中 - //根据附属物图层名字得到里面含有的附属物 - public static string[] getAccStrsByLayer(string layername) - { - string[] accStrs = null; - string sql = "select 附属物名称 from " + layername + " group by 附属物名称"; - DataSet dataset = OledbHelper.getDataSet(sql, layername); - if (dataset == null) return null; - accStrs = new string[dataset.Tables[0].Rows.Count]; - for (int i = 0; i < dataset.Tables[0].Rows.Count; i++) + finally { - accStrs[i] = dataset.Tables[0].Rows[i][0].ToString(); + xmlReader.Close(); } - return accStrs; } - //删除内存图层中指定名称的feature - public static void RemoveFeatureFromName(GSOGlobeControl globeControl1, string featureName) - { - GSOFeatures features = globeControl1.Globe.MemoryLayer.GetFeatureByName(featureName, true); - if (features != null) - { - for (int i = features.Length - 1; i >= 0; i--) - { - GSOFeature feature = features[i]; - if (feature != null) - { - globeControl1.Globe.MemoryLayer.RemoveFeatureByID(feature.ID); - } - } - } - globeControl1.Refresh(); - } + + } } diff --git a/ValidateInfo.cs b/ValidateInfo.cs index de75391..01546da 100644 --- a/ValidateInfo.cs +++ b/ValidateInfo.cs @@ -192,7 +192,7 @@ } if (!isSuccess) { - LogHelper.WriteLog(typeof(FieldUniqueValidate), logStr); + LogHelper.Error(logStr); } return isSuccess; } @@ -247,7 +247,7 @@ err += "未找到字段或其类型匹配:" + unFoundField.label + ":" + unFoundField.type + "\r\n"; } - LogHelper.WriteLog(typeof(FieldCountValidate), err); + LogHelper.Error(err); return false; } return true; @@ -316,7 +316,7 @@ { err += "字段:" + field.label + "出错\r\n"; } - LogHelper.WriteLog(typeof(FieldOrderValidate), err); + LogHelper.Error(err); return false; } return true; @@ -388,8 +388,7 @@ } if (isSuccess == false) { - LogHelper.WriteLog(typeof(FieldEmptyValidate), - "字段为空检查失败:\r\n" + err); + LogHelper.Error("字段为空检查失败:\r\n" + err); } return isSuccess; } diff --git a/bin/x86/Debug/Config.xml b/bin/x86/Debug/Config.xml index 6995f64..6a453a3 100644 --- a/bin/x86/Debug/Config.xml +++ b/bin/x86/Debug/Config.xml @@ -25,6 +25,11 @@ http://127.0.0.1/Cyberpipe.msi http://127.0.0.1/Config.xml + http://192.168.0.102:8080/ctrl + /Resource/title.jpg + 智慧太湖新城管网规划分析系统6.0 + @2014-2015 苏州航天系统工程有限公司 版权所有 + 编号,管线编码,管径_毫米,材质,埋设方式,起始地面高程,起始埋深,终止地面高程,终止埋深,建设年代,使用年限,权属单位,设计单位,设计负责人,施工单位,施工负责人,监理单位,监理负责人,业务负责人,备注 编号,管线编码,管径_毫米,材质,埋设方式,起始地面高程,起始埋深,终止地面高程,终止埋深,建设年代,使用年限,权属单位,设计单位,设计负责人,施工单位,施工负责人,监理单位,监理负责人,业务负责人,备注 diff --git a/bin/x86/Debug/config/log4net.config b/bin/x86/Debug/config/log4net.config index 80f9b25..6fbcfa7 100644 --- a/bin/x86/Debug/config/log4net.config +++ b/bin/x86/Debug/config/log4net.config @@ -3,29 +3,118 @@
- - - - - - - - - - - - - - - + + + -property: [%property{NDC}] - %n错误描述：%message%newline %n"/> - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/bin/x86/Debug/glVersion.txt b/bin/x86/Debug/glVersion.txt index cd82eca..755455e 100644 --- a/bin/x86/Debug/glVersion.txt +++ b/bin/x86/Debug/glVersion.txt Binary files differ diff --git a/bin/x86/Debug/log.txt b/bin/x86/Debug/log.txt index a4966d3..2112642 100644 --- a/bin/x86/Debug/log.txt +++ b/bin/x86/Debug/log.txt @@ -430,3 +430,43 @@ exception over ------------------------------------------------------------ + + exception begin -----------------2016/11/29 18:54:54--------------------- + + + + e.Message:第 29 行，位置 4 上的开始标记“titleimagpath”与结束标记“titleimagepath”不匹配。 第 29 行，位置 39。 + + e.Source:System.Xml + + e.TargetSite:Void Throw(System.String, System.String[]) + + e.StackTrace: 在 System.Xml.XmlTextReaderImpl.Throw(String res, String[] args) + 在 System.Xml.XmlTextReaderImpl.ThrowTagMismatch(NodeData startTag) + 在 System.Xml.XmlTextReaderImpl.ParseEndElement() + 在 System.Xml.XmlTextReaderImpl.ParseElementContent() + 在 Cyberpipe.Utility.SetParams() 位置 E:\wxl\work\GHFX_REFACTOR\Utility.cs:行号 208 + + + + exception over ------------------------------------------------------------ + + exception begin -----------------2016/11/29 18:57:17--------------------- + + + + e.Message:第 29 行，位置 4 上的开始标记“titleimagpath”与结束标记“titleimagepath”不匹配。 第 29 行，位置 39。 + + e.Source:System.Xml + + e.TargetSite:Void Throw(System.String, System.String[]) + + e.StackTrace: 在 System.Xml.XmlTextReaderImpl.Throw(String res, String[] args) + 在 System.Xml.XmlTextReaderImpl.ThrowTagMismatch(NodeData startTag) + 在 System.Xml.XmlTextReaderImpl.ParseEndElement() + 在 System.Xml.XmlTextReaderImpl.ParseElementContent() + 在 Cyberpipe.Utility.SetParams() 位置 E:\wxl\work\GHFX_REFACTOR\Utility.cs:行号 208 + + + + exception over ------------------------------------------------------------ diff --git a/FeatureStatisticsService.cs b/FeatureStatisticsService.cs index 331ee47..b127fe3 100644 --- a/FeatureStatisticsService.cs +++ b/FeatureStatisticsService.cs @@ -190,7 +190,7 @@ List result = new List(); //layer.Name是表名 - string[] accessStrs = Utility.getAccStrsByLayer(layer.Name); + string[] accessStrs = FeatureTools.GetAccStrsByLayer(layer.Name); foreach (string accssname in accessStrs) { diff --git a/FeatureTools.cs b/FeatureTools.cs index be4b469..3c08f34 100644 --- a/FeatureTools.cs +++ b/FeatureTools.cs @@ -1,5 +1,6 @@ using System; using System.Collections.Generic; +using System.Data; using System.Linq; using System.Text; using System.Windows.Forms; @@ -43,7 +44,7 @@ } feature.Delete();//地球上删除该feature string sql = "delete from " + layerName + " where LSSYS_ID =" + feature.ID + " and (编号 is null or substr(编号,length(编号)-2)='TMP')"; - OledbHelper.sqlExecuteNonQuery(sql);//目前无法取到LSSYS_ID，所以这个判断条件不太合适，会导致把该类所有新建的都删除了 + OledbHelper.sqlExecuteNonQuery(sql); } catch (Exception) { @@ -106,5 +107,46 @@ } return value; } + + /// + /// 根据附属物图层名字得到里面含有的附属物 + /// + /// + /// + public static string[] GetAccStrsByLayer(string layername) + { + string[] accStrs = null; + string sql = "select 附属物名称 from " + layername + " group by 附属物名称"; + DataSet dataset = OledbHelper.getDataSet(sql, layername); + if (dataset == null) return null; + accStrs = new string[dataset.Tables[0].Rows.Count]; + for (int i = 0; i < dataset.Tables[0].Rows.Count; i++) + { + accStrs[i] = dataset.Tables[0].Rows[i][0].ToString(); + } + return accStrs; + } + + /// + /// 删除内存图层中指定名称的feature + /// + /// + /// + public static void RemoveFeatureFromName(GSOGlobeControl globeControl1, string featureName) + { + GSOFeatures features = globeControl1.Globe.MemoryLayer.GetFeatureByName(featureName, true); + if (features != null) + { + for (int i = features.Length - 1; i >= 0; i--) + { + GSOFeature feature = features[i]; + if (feature != null) + { + globeControl1.Globe.MemoryLayer.RemoveFeatureByID(feature.ID); + } + } + } + globeControl1.Refresh(); + } } } diff --git a/Forms/FrmPipelineModelDataBase.cs b/Forms/FrmPipelineModelDataBase.cs index b577fd8..bc1e479 100644 --- a/Forms/FrmPipelineModelDataBase.cs +++ b/Forms/FrmPipelineModelDataBase.cs @@ -149,7 +149,7 @@ catch (Exception ex) { LogError.PublishError(ex); - LogHelper.WriteLog(typeof(FrmPipelineModelDB), ex.Message); + LogHelper.Error(ex.Message); } } diff --git a/FrmAccessoriesSensor.cs b/FrmAccessoriesSensor.cs index 98aa1cf..542f19a 100644 --- a/FrmAccessoriesSensor.cs +++ b/FrmAccessoriesSensor.cs @@ -240,7 +240,7 @@ { if (clbPipeLine.CheckedItems.Count > 0) { - Utility.RemoveFeatureFromName(globeControl1, "trackPolygon"); + FeatureTools.RemoveFeatureFromName(globeControl1, "trackPolygon"); globeControl1.Globe.Action = EnumAction3D.TrackPolygon; globeControl1.TrackPolygonEndEvent += globeControl1_TrackPolygonEndEvent; } @@ -259,7 +259,7 @@ private void FrmAccessoriesgather_FormClosing(object sender, FormClosingEventArgs e) { frm = null; - Utility.RemoveFeatureFromName(globeControl1, "trackPolygon"); + FeatureTools.RemoveFeatureFromName(globeControl1, "trackPolygon"); globeControl1.Globe.Action = EnumAction3D.ActionNull; globeControl1.TrackPolygonEndEvent -= globeControl1_TrackPolygonEndEvent; } diff --git a/FrmAccessoriesgather.cs b/FrmAccessoriesgather.cs index e1d176e..c36273b 100644 --- a/FrmAccessoriesgather.cs +++ b/FrmAccessoriesgather.cs @@ -118,7 +118,7 @@ { if (clbPipeLine2.Text!="") { - Utility.RemoveFeatureFromName(globeControl1, "trackPolygon"); + FeatureTools.RemoveFeatureFromName(globeControl1, "trackPolygon"); globeControl1.Globe.Action = EnumAction3D.TrackPolygon; globeControl1.Globe.TrackPolygonTool.TrackMode = EnumTrackMode.SpaceTrack; globeControl1.TrackPolygonEndEvent += globeControl1_TrackPolygonEndEvent; @@ -295,7 +295,7 @@ private void FrmAccessoriesgather_FormClosing(object sender, FormClosingEventArgs e) { frm = null; - Utility.RemoveFeatureFromName(globeControl1, "trackPolygon"); + FeatureTools.RemoveFeatureFromName(globeControl1, "trackPolygon"); globeControl1.TrackPolygonEndEvent -= globeControl1_TrackPolygonEndEvent; globeControl1.Globe.Action = EnumAction3D.ActionNull; diff --git a/FrmAddWellShp.cs b/FrmAddWellShp.cs index 7983349..78d8946 100644 --- a/FrmAddWellShp.cs +++ b/FrmAddWellShp.cs @@ -100,7 +100,7 @@ catch (Exception ex) { LogError.PublishError(ex); - LogHelper.WriteLog(typeof(FrmAddWellShp), ex.Message); + LogHelper.Error(ex.Message); } } diff --git a/FrmBSQStatis.cs b/FrmBSQStatis.cs index 5b05926..b5e581d 100644 --- a/FrmBSQStatis.cs +++ b/FrmBSQStatis.cs @@ -97,7 +97,7 @@ } catch (Exception ex) { - LogHelper.WriteLog(typeof(FrmBSQStatis),ex.Message); + LogHelper.Error(ex.Message); } return typeAndCount; } @@ -108,7 +108,7 @@ GSOLayer layer = globeControl1.Globe.Layers.GetLayerByCaption("标识器"); GSOFeatures bsqFs = FeatureStatisticsService.GetLayerFeatures(polygon, layer); if (bsqFs == null || bsqFs.Length <= 0) { - LogHelper.WriteLog(typeof(FrmBSQStatis),"标识器图层下的Feature为空"); + LogHelper.Error("标识器图层下的Feature为空!"); return null; } diff --git a/FrmBasicQuery.cs b/FrmBasicQuery.cs index baeeade..cc8d3ff 100644 --- a/FrmBasicQuery.cs +++ b/FrmBasicQuery.cs @@ -224,7 +224,7 @@ } catch(Exception ex) { - LogHelper.WriteLog(typeof(FrmBasicQuery), ex.Message); + LogHelper.Error(ex.Message); } } else diff --git a/FrmCodingQuery.cs b/FrmCodingQuery.cs index f1ac322..d4ec095 100644 --- a/FrmCodingQuery.cs +++ b/FrmCodingQuery.cs @@ -82,7 +82,7 @@ } catch (Exception ex) { - LogHelper.WriteLog(typeof(FrmCodingQuery), ex.Message); ; + LogHelper.Error(ex.Message); } } diff --git a/FrmDiameterQuery.cs b/FrmDiameterQuery.cs index e7b3657..75d7949 100644 --- a/FrmDiameterQuery.cs +++ b/FrmDiameterQuery.cs @@ -150,7 +150,7 @@ catch (Exception ex) { //LogError.PublishError(ex); - LogHelper.WriteLog(typeof(FrmDiameterQuery), ex.Message); + LogHelper.Error(ex.Message); MessageBox.Show("请输入正确的管径范围！"); return; } diff --git a/FrmFittingQuery.cs b/FrmFittingQuery.cs index 12f6007..8645011 100644 --- a/FrmFittingQuery.cs +++ b/FrmFittingQuery.cs @@ -69,7 +69,7 @@ } catch (Exception ex) { - LogHelper.WriteLog(typeof(FrmFittingQuery), ex.Message); + LogHelper.Error(ex.Message); } } /// diff --git a/FrmKeywordQuery.cs b/FrmKeywordQuery.cs index 405524f..ede0a93 100644 --- a/FrmKeywordQuery.cs +++ b/FrmKeywordQuery.cs @@ -87,7 +87,7 @@ } catch (Exception ex) { - LogHelper.WriteLog(typeof(FrmKeywordQuery), ex.Message); + LogHelper.Error(ex.Message); } } diff --git a/FrmLogin.cs b/FrmLogin.cs index 1172c23..6fbaed9 100644 --- a/FrmLogin.cs +++ b/FrmLogin.cs @@ -2,6 +2,8 @@ using System.Data; using System.Data.OracleClient; using System.IO; +using System.Net; +using System.Text; using System.Windows.Forms; using System.Xml; using DevComponents.DotNetBar; @@ -10,16 +12,15 @@ { public partial class FrmLogin : Office2007Form { + + //登录界面 -- 配置文件的路径 + public static string filename = Application.StartupPath + "\\login.xml"; + + public FrmLogin() { InitializeComponent(); } - public string rolename = "浏览"; - public string username = ""; - public string department = ""; - - //登录界面 -- 配置文件的路径 - public static string filename = Application.StartupPath + "\\login.xml"; /// /// 登录按钮事件处理 /// @@ -28,9 +29,10 @@ private void button1_Click(object sender, EventArgs e) { bool result = ValidateUser(); +// bool result =ValidateFromUrl();//从平台获取用户角色信息，判断是否能登陆成功 if (result) { - username = txtUser.Text.Trim(); + WriteXml(); Utility.userName = txtUser.Text.Trim(); DialogResult = DialogResult.OK; Close(); @@ -43,80 +45,6 @@ } } /// - /// 关闭按钮事件处理 - /// - /// - /// - private void button2_Click(object sender, EventArgs e) - { - Close(); - } - /// - /// 验证端口号 - /// - /// - //private bool ValiPort() - //{ - // Ping p = new Ping();//创建Ping对象p - // PingReply pr = p.Send(Utility.localicenseserverip);//向指定IP或者主机名的计算机发送ICMP协议的ping数据包 - // if (pr.Status == IPStatus.Success)//如果ping成功 - // { - // try - // { - // TcpClient tcpc = new TcpClient(Utility.localicenseserverip, Utility.localicenseserverport);//对IP地址为"192.168.0.105"的计算机的1500端口提出连接申请 - // tcpc.Close(); - // return true; - // } - // catch (Exception ex) - // { - // LogError.PublishError(ex); - // MessageBox.Show("端口连接错误！" + ex.Message); - // return false; - // } - // } - // else - // { - // int times = 0;//重新连接次数; - // int count = 2;//设置尝试次数 - // while (times < count) - // { - // //Thread.Sleep(1000);//等待时间(方便测试的话，你可以改为1000) - // pr = p.Send(Utility.localicenseserverip); - - // if (pr.Status == IPStatus.Success) - // { - // try - // { - // TcpClient tcpc = new TcpClient(Utility.localicenseserverip, Utility.localicenseserverport);//对IP地址为"192.168.0.105"的计算机的1500端口提出连接申请 - // tcpc.Close(); - // return true; - // } - // catch (Exception ex) - // { - // LogError.PublishError(ex); - // MessageBox.Show("端口连接错误！" + ex.Message); - // return false; - // } - // } - // else - // { - // times++; - // if (times < count) - // { - // continue; - // } - // else - // { - // MessageBox.Show("重新尝试连接失败"); - // return false; - // } - // } - - // } - // return false; - // } - //} - /// /// 验证用户名、密码 /// /// @@ -126,24 +54,64 @@ string sql = "select * from casic_userinfotest where USERNAME='" + txtUser.Text.Trim() + "' and PASSWORD='" + passWord + "' and sysname='GHFX' "; DataTable dt = OledbHelper.QueryTable(sql); - if (dt != null && dt.Rows.Count > 0) + if (dt == null || dt.Rows.Count <= 0) return false; + if (String.IsNullOrEmpty(dt.Rows[0]["rid"].ToString())) return true; + sql = "select gid from casic_userroletest where id=" + dt.Rows[0]["rid"] + " and sysname='GHFX' "; + using (OracleDataReader reader = OracleUtils.ExecuteReader(OracleUtils.ConnectionString, CommandType.Text, sql)) { - WriteXML(); - if (!String.IsNullOrEmpty(dt.Rows[0]["rid"].ToString())) + while (reader.Read()) { - sql = "select gid from casic_userroletest where id=" + dt.Rows[0]["rid"] + " and sysname='GHFX' "; - using (OracleDataReader reader = OracleUtils.ExecuteReader(OracleUtils.ConnectionString, CommandType.Text, sql)) - { - while (reader.Read()) - { - Utility.userRole = reader[0].ToString(); - break; - } - } + Utility.userRole = reader[0].ToString(); + LogHelper.Debug("测试一下"); + break; } - return true; } - return false; + return true; + } + + + + private bool ValidateFromUrl() + { + string user = txtUser.Text.Trim(); + string pwd = textBoxPassWord.Text.Trim(); + //做成配置的 + string roleserver = Utility.RoleServer; + if (roleserver == null || roleserver.Trim().Equals("")) + { + MessageBox.Show("请在Config.xml中配置roleurl！"); + return false; + } + HttpWebRequest request = + WebRequest.Create(roleserver+"/rs/authority/user?username=" + user + "&password=" + pwd + "&appId=21") as HttpWebRequest; + if (request == null) return false; + using (HttpWebResponse response = request.GetResponse() as HttpWebResponse) + { + try + { + if (response == null || response.GetResponseStream() == null) return false; + StreamReader reader = new StreamReader(response.GetResponseStream()); + string[] result = reader.ReadToEnd().Split(','); + //解析result + if (result.Length < 5) return false; + StringBuilder userRole = new StringBuilder(""); + for (int i = 4; i < result.Length; i++) + { + string[] tmpStrings = result[i].Split('_'); + if (tmpStrings.Length < 2) continue; + userRole.Append(tmpStrings[1].Trim() + ","); + } + if (userRole.Length < 3) return false; + userRole.Remove(userRole.Length - 3, 3); + // MessageBox.Show(userRole.ToString()); + Utility.userRole = userRole.ToString(); + return Utility.userRole != null && !Utility.userRole.Equals("null"); + } + catch (Exception e) + { + return false; + } + } } private void FrmLogin_Load(object sender, EventArgs e) @@ -153,74 +121,56 @@ StartPosition = FormStartPosition.CenterScreen; - ReadXML(); + ReadXml(); } /// /// 读取上一次登录的用户名和密码 /// - private void ReadXML() + private void ReadXml() { - if (File.Exists(filename)) + if (!File.Exists(filename)) return; + //初始化XML文档操作类 + XmlDocument myDoc = new XmlDocument(); { - if (!File.Exists(filename)) + //加载XML文件 + try { + myDoc.Load(filename); + } + catch (Exception e) + { + LogError.PublishError(e); return; } - - //初始化XML文档操作类 - XmlDocument myDoc = new XmlDocument(); + //搜索指定的节点 + XmlNode serverRootNode = myDoc.SelectSingleNode("Params"); + XmlNodeList nodes = null; + if (serverRootNode != null) { - //加载XML文件 - try + nodes = serverRootNode.ChildNodes; + } + if (nodes == null) return; + foreach (XmlNode xn in nodes) + { + if (xn.Name.Equals("username")) { - myDoc.Load(filename); + txtUser.Text = xn.InnerText.Trim(); } - catch (Exception e) + else if (xn.Name.Equals("password")) { - LogError.PublishError(e); - return; + textBoxPassWord.Text = xn.InnerText.Trim(); } - //搜索指定的节点 - XmlNode serverRootNode = myDoc.SelectSingleNode("Params"); - XmlNodeList nodes = null; - if (serverRootNode != null) + else if (xn.Name.Equals("isremember")) { - nodes = serverRootNode.ChildNodes; - } - if (nodes != null) - { - foreach (XmlNode xn in nodes) - { - if (xn.Name == "username") - { - txtUser.Text = xn.InnerText.Trim(); - } - else if (xn.Name == "password") - { - textBoxPassWord.Text = xn.InnerText.Trim(); - } - else if (xn.Name == "isremember") - { - if (xn.InnerText.Trim() == "true") - { - checkBoxXRememberPassword.Checked = true; - } - else if (xn.InnerText.Trim() == "false") - { - checkBoxXRememberPassword.Checked = false; - } - } - } - + checkBoxXRememberPassword.Checked = xn.InnerText.Trim().Equals("true"); } } } - } /// /// 记录登录的用户名和密码 /// - private void WriteXML() + private void WriteXml() { if (!File.Exists(filename)) { @@ -252,31 +202,17 @@ foreach (XmlNode xn in nodes) { XmlElement xe = (XmlElement)xn; - if (xe.Name == "username") + if (xe.Name.Equals("username")) { xe.InnerText = txtUser.Text.Trim(); } - else if (xe.Name == "password") + else if (xe.Name.Equals("password")) { - if (checkBoxXRememberPassword.Checked) - { - xe.InnerText = textBoxPassWord.Text.Trim(); - } - else - { - xe.InnerText = ""; - } + xe.InnerText = checkBoxXRememberPassword.Checked ? textBoxPassWord.Text.Trim() : ""; } - else if (xe.Name == "isremember") + else if (xe.Name.Equals("isremember")) { - if (checkBoxXRememberPassword.Checked) - { - xe.InnerText = "true"; - } - else - { - xe.InnerText = "false"; - } + xe.InnerText = checkBoxXRememberPassword.Checked ? "true" : "false"; } } } diff --git a/FrmMaterialSel.cs b/FrmMaterialSel.cs index 8645ab3..d23f385 100644 --- a/FrmMaterialSel.cs +++ b/FrmMaterialSel.cs @@ -157,7 +157,7 @@ } catch (Exception ex) { - LogHelper.WriteLog(typeof(FrmMaterialSel), ex.Message); + LogHelper.Error(ex.Message); } } diff --git a/FrmMetadataStat.cs b/FrmMetadataStat.cs index c3c1359..96029a6 100644 --- a/FrmMetadataStat.cs +++ b/FrmMetadataStat.cs @@ -96,7 +96,7 @@ //统计有多少个图层 private int statistLayer() { - List datasrcs = Utility.layerConfig.datasrcs; + List datasrcs = Utility.LayerConfig.datasrcs; return datasrcs.SelectMany(datasrc => datasrc.layertypes).Sum(layerType => layerType.layers.Count); } diff --git a/FrmpipeDeepstatis.cs b/FrmpipeDeepstatis.cs index 6a5c895..8d915a9 100644 --- a/FrmpipeDeepstatis.cs +++ b/FrmpipeDeepstatis.cs @@ -2,6 +2,7 @@ using System.Collections.Generic; using System.Diagnostics; using System.IO; +using System.Reflection; using System.Text; using System.Windows.Forms; using System.Windows.Forms.DataVisualization.Charting; @@ -320,7 +321,7 @@ MessageBox.Show("请添加分段"); return; } - Utility.RemoveFeatureFromName(globeControl1, "trackPolygon"); + FeatureTools.RemoveFeatureFromName(globeControl1, "trackPolygon"); globeControl1.Globe.Action = EnumAction3D.TrackPolygon; globeControl1.Globe.TrackPolygonTool.TrackMode = EnumTrackMode.SpaceTrack; globeControl1.TrackPolygonEndEvent += globeControl1_TrackPolygonEndEvent; @@ -408,12 +409,11 @@ TextBox control; private void dataGridViewX2_EditingControlShowing(object sender, DataGridViewEditingControlShowingEventArgs e) { - if (e.Control.GetType().BaseType.Name == "TextBox") - { - control = new TextBox(); - control = (TextBox)e.Control; - control.KeyPress += control_KeyPress; - } + MemberInfo memberInfo = e.Control.GetType().BaseType; + if (memberInfo != null && !memberInfo.Name.Equals("TextBox")) return; + control = new TextBox(); + control = (TextBox)e.Control; + control.KeyPress += control_KeyPress; } /// /// 键盘按键按下事件处理 @@ -423,28 +423,24 @@ void control_KeyPress(object sender, KeyPressEventArgs e) { TextBox text = sender as TextBox; + if (text == null) return; if ((e.KeyChar < 48 || e.KeyChar > 57) && (e.KeyChar != 8) && e.KeyChar != 46) { e.Handled = true; } - if (e.KeyChar == 46) //小数点 + if (e.KeyChar != 46) return; + if (text.Text.Length <= 0) + e.Handled = true; //小数点不能在第一位 + else //处理不规则的小数点 { - if (text.Text.Length <= 0) - e.Handled = true; //小数点不能在第一位 - else //处理不规则的小数点 + float f; + float oldf; + bool b1 = false, b2 = false; + b1 = float.TryParse(text.Text, out oldf); + b2 = float.TryParse(text.Text + e.KeyChar, out f); + if (!b2) { - float f; - float oldf; - bool b1 = false, b2 = false; - b1 = float.TryParse(text.Text, out oldf); - b2 = float.TryParse(text.Text + e.KeyChar, out f); - if (b2 == false) - { - if (b1) - e.Handled = true; - else - e.Handled = false; - } + e.Handled = b1; } } } @@ -457,7 +453,7 @@ { frm = null; - Utility.RemoveFeatureFromName(globeControl1, "trackPolygon"); + FeatureTools.RemoveFeatureFromName(globeControl1, "trackPolygon"); globeControl1.TrackPolygonEndEvent -= globeControl1_TrackPolygonEndEvent; globeControl1.Globe.Action = EnumAction3D.ActionNull; diff --git a/FrmpipeDiametergather.cs b/FrmpipeDiametergather.cs index a9d96fa..c09aaf1 100644 --- a/FrmpipeDiametergather.cs +++ b/FrmpipeDiametergather.cs @@ -154,7 +154,7 @@ MessageBox.Show("请选择图层！"); return; } - Utility.RemoveFeatureFromName(globeControl1, "trackPolygon"); + FeatureTools.RemoveFeatureFromName(globeControl1, "trackPolygon"); globeControl1.Globe.Action = EnumAction3D.TrackPolygon; globeControl1.Globe.TrackPolygonTool.TrackMode = EnumTrackMode.SpaceTrack; globeControl1.TrackPolygonEndEvent += globeControl1_TrackPolygonEndEvent; @@ -392,7 +392,7 @@ private void FrmpipeDiametergather_FormClosing(object sender, FormClosingEventArgs e) { frm = null; - Utility.RemoveFeatureFromName(globeControl1, "trackPolygon"); + FeatureTools.RemoveFeatureFromName(globeControl1, "trackPolygon"); globeControl1.TrackPolygonEndEvent -= globeControl1_TrackPolygonEndEvent; globeControl1.Globe.Action = EnumAction3D.ActionNull; diff --git a/FrmpipeMaterialGather.cs b/FrmpipeMaterialGather.cs index 44e7f24..5ca8144 100644 --- a/FrmpipeMaterialGather.cs +++ b/FrmpipeMaterialGather.cs @@ -58,10 +58,9 @@ for (int i = 0; i < pipeLayerNames.Count; i++) { clbPipeLine.Items.Add(pipeLayerNames[i]); - GSOLayer layer = globeControl1.Globe.Layers.GetLayerByCaption(pipeLayerNames[i]); - if (layer.Dataset == null || !layer.Dataset.IsFeatureDataset || layer.Type != EnumLayerType.FeatureLayer) continue; + GSOLayer layer = globeControl1.Globe.Layers.GetLayerByCaption(pipeLayerNames[i]); + if (layer == null || layer.Dataset == null || !layer.Dataset.IsFeatureDataset || layer.Type != EnumLayerType.FeatureLayer) continue; - string name = layer.Name; GSOFeatureLayer flayer = layer as GSOFeatureLayer; GSOFeatures feats = flayer.GetAllFeatures(); @@ -205,7 +204,7 @@ { chart1.Series.Add(clbPipeLine.CheckedItems[i].ToString()); GSOLayer layer = globeControl1.Globe.Layers.GetLayerByCaption(clbPipeLine.CheckedItems[i].ToString()); - if (layer != null && layer is GSOFeatureLayer) + if (layer is GSOFeatureLayer) { GSOFeatureLayer flayer = layer as GSOFeatureLayer; GSOFeatures features = flayer.GetAllFeatures(); @@ -240,10 +239,9 @@ labeStyleAxisX.Enabled = true; chart1.ChartAreas["ChartArea1"].AxisX.LabelStyle = labeStyleAxisX; - Dictionary dic1 = new Dictionary(); for (int j = 0; j < chart1.Series.Count; j++) { - dic1 = new Dictionary(); + Dictionary dic1 = new Dictionary(); foreach (string key in dic.Keys) { if (key.Contains(chart1.Series[j].Name)) @@ -304,7 +302,7 @@ MessageBox.Show("请选择材质类型！"); return; } - Utility.RemoveFeatureFromName(globeControl1, "trackPolygon"); + FeatureTools.RemoveFeatureFromName(globeControl1, "trackPolygon"); globeControl1.Globe.Action = EnumAction3D.TrackPolygon; globeControl1.Globe.TrackPolygonTool.TrackMode = EnumTrackMode.SpaceTrack; globeControl1.TrackPolygonEndEvent += globeControl1_TrackPolygonEndEvent; @@ -318,7 +316,7 @@ private void FrmpipeMaterialGather_FormClosing(object sender, FormClosingEventArgs e) { frm = null; - Utility.RemoveFeatureFromName(globeControl1, "trackPolygon"); + FeatureTools.RemoveFeatureFromName(globeControl1, "trackPolygon"); globeControl1.TrackPolygonEndEvent -= globeControl1_TrackPolygonEndEvent; globeControl1.Globe.Action = EnumAction3D.ActionNull; diff --git a/Frmpipediameterstatis.cs b/Frmpipediameterstatis.cs index 4fb25a8..631a996 100644 --- a/Frmpipediameterstatis.cs +++ b/Frmpipediameterstatis.cs @@ -202,8 +202,8 @@ } catch (Exception ex) { - LogHelper.WriteLog(typeof(Frmpipediameterstatis), ex.Message); //MessageBox.Show(ex.Message); + LogHelper.Error(ex.Message); LogError.PublishError(ex); } } @@ -372,7 +372,7 @@ MessageBox.Show("请添加分段！"); return; } - Utility.RemoveFeatureFromName(globeControl1, "trackPolygon"); + FeatureTools.RemoveFeatureFromName(globeControl1, "trackPolygon"); globeControl1.Globe.Action = EnumAction3D.TrackPolygon; globeControl1.Globe.TrackPolygonTool.TrackMode = EnumTrackMode.SpaceTrack; globeControl1.TrackPolygonEndEvent += globeControl1_TrackPolygonEndEvent; @@ -422,7 +422,7 @@ globeControl1.Globe.Action = EnumAction3D.ActionNull; globeControl1.TrackPolygonEndEvent -= globeControl1_TrackPolygonEndEvent; - Utility.RemoveFeatureFromName(globeControl1, "trackPolygon"); + FeatureTools.RemoveFeatureFromName(globeControl1, "trackPolygon"); globeControl1.Globe.MemoryLayer.RemoveAllFeature(); } diff --git a/LineBuilder.cs b/LineBuilder.cs index 33a216c..b6a8516 100644 --- a/LineBuilder.cs +++ b/LineBuilder.cs @@ -43,8 +43,8 @@ GSOGeoPolyline3D lineeee = f.Geometry as GSOGeoPolyline3D; if (lineeee == null || lineeee.GetSpaceLength(true, 6378137) == 0) { - LogHelper.WriteLog(typeof(LineBuilder), "出现数据无法入库:"+f.ID); - continue; //TODO LIST:判断是否会出现部署数据无法入库情况,Log2Net + LogHelper.Error("出现数据无法入库:" + f.ID); + continue; } GSOFeature newFeature = newFeatureSet.CreateFeature(); diff --git a/LogHelper.cs b/LogHelper.cs index 9ef5f27..04573cf 100644 --- a/LogHelper.cs +++ b/LogHelper.cs @@ -1,4 +1,5 @@ using System; +using System.Diagnostics; using log4net; using log4net.Config; @@ -7,35 +8,82 @@ { public class LogHelper { - /// - /// 输出日志到Log4Net - /// - /// - /// - #region static void WriteLog(Type t, Exception ex) - public static void WriteLog(Type t, Exception ex) + private static ILog _logdebug = log4net.LogManager.GetLogger("logdebug"); + private static ILog _loginfo = log4net.LogManager.GetLogger("loginfo"); + private static ILog _logwarn = log4net.LogManager.GetLogger("logwarn"); + private static ILog _logerror = log4net.LogManager.GetLogger("logerror"); + private static ILog _logfatal = log4net.LogManager.GetLogger("logfatal"); + + public static void Debug(string msg) { - ILog log = log4net.LogManager.GetLogger(t); - log.Error("Error", ex); + StackFrame sf = new StackFrame(1); + msg = string.Format("{0}.{1}:{2}", sf.GetMethod().ReflectedType.FullName, sf.GetMethod().Name, msg); + _logdebug.Debug(msg); + } + public static void Debug(string msg, Exception e) + { + StackFrame sf = new StackFrame(1); + msg = string.Format("{0}.{1}:{2}", sf.GetMethod().ReflectedType.FullName, sf.GetMethod().Name, msg); + _logdebug.Debug(msg, e); } - #endregion - /// - /// 输出日志到Log4Net - /// - /// - /// - #region static void WriteLog(Type t, string msg) - - public static void WriteLog(Type t, string msg) + public static void Info(string msg) { - ILog log = log4net.LogManager.GetLogger(t); - log.Error(msg); + StackFrame sf = new StackFrame(1); + msg = string.Format("{0}.{1}:{2}", sf.GetMethod().ReflectedType.FullName, sf.GetMethod().Name, msg); + _loginfo.Info(msg); + } + public static void Info(string msg, Exception e) + { + StackFrame sf = new StackFrame(1); + msg = string.Format("{0}.{1}:{2}", sf.GetMethod().ReflectedType.FullName, sf.GetMethod().Name, msg); + _loginfo.Info(msg, e); } - #endregion + + public static void Warn(string msg) + { + StackFrame sf = new StackFrame(1); + msg = string.Format("{0}.{1}:{2}", sf.GetMethod().ReflectedType.FullName, sf.GetMethod().Name, msg); + _logwarn.Warn(msg); + } + public static void Warn(string msg, Exception e) + { + StackFrame sf = new StackFrame(1); + msg = string.Format("{0}.{1}:{2}", sf.GetMethod().ReflectedType.FullName, sf.GetMethod().Name, msg); + _logwarn.Warn(msg, e); + } + + + public static void Error(string msg) + { + StackFrame sf = new StackFrame(1); + msg = string.Format("{0}.{1}:{2}", sf.GetMethod().ReflectedType.FullName, sf.GetMethod().Name, msg); + _logerror.Error(msg); + } + public static void Error(string msg, Exception e) + { + StackFrame sf = new StackFrame(1); + msg = string.Format("{0}.{1}:{2}", sf.GetMethod().ReflectedType.FullName, sf.GetMethod().Name, msg); + _logerror.Error(msg, e); + } + + + public static void Fatal(string msg) + { + StackFrame sf = new StackFrame(1); + msg = string.Format("{0}.{1}:{2}", sf.GetMethod().ReflectedType.FullName, sf.GetMethod().Name, msg); + _logfatal.Fatal(msg); + } + public static void Fatal(string msg, Exception e) + { + StackFrame sf = new StackFrame(1); + msg = string.Format("{0}.{1}:{2}", sf.GetMethod().ReflectedType.FullName, sf.GetMethod().Name, msg); + _logfatal.Fatal(msg, e); + } + } diff --git a/MainFrm.cs b/MainFrm.cs index 43de664..51f362a 100644 --- a/MainFrm.cs +++ b/MainFrm.cs @@ -18,7 +18,6 @@ using GeoScene.Data; using GeoScene.Engine; using GeoScene.Globe; -using Timer = System.Windows.Forms.Timer; using ToolTip = System.Windows.Forms.ToolTip; namespace Cyberpipe @@ -163,6 +162,7 @@ /// private void AddGZ() { + lendendGZ50 = new GSOHudButton(); lendendGZ50.SetImage(Application.StartupPath + "/Resource/管纵/50.png"); lendendGZ50.SetOffset(0, 0); @@ -1294,18 +1294,19 @@ private void MainFrm_Load(object sender, EventArgs e) { + layerTree.Nodes.Add("正在加载，请稍后……");//树状图加载在图层加载之后，故增加提示 initGlobalControl(); - //initGlobalMap(); - //initLayerTree(); initMarkerTree(); initLayout(); loadData(); - double x = Convert.ToDouble(Utility.Query_Roads["定位"].ToString().Split(',')[0]); - double y = Convert.ToDouble(Utility.Query_Roads["定位"].ToString().Split(',')[1]); - double z = Convert.ToDouble(Utility.Query_Roads["定位"].ToString().Split(',')[2]); + + double x = Convert.ToDouble(Utility.Query_Roads["绿岛"].ToString().Split(',')[0]); + double y = Convert.ToDouble(Utility.Query_Roads["绿岛"].ToString().Split(',')[1]); + double z = Convert.ToDouble(Utility.Query_Roads["绿岛"].ToString().Split(',')[2]); jumpToCameraState(x, y, z); + } #endregion @@ -1315,11 +1316,17 @@ if (e.Layer == null || !e.Layer.Caption.Equals(Utility.roadLayerName)) return; foreach (TreeNode layerTreeNode in layerTree.Nodes) { - foreach (TreeNode node in layerTreeNode.Nodes) + for (int i=0;i dt, DataGridView dataGridView) @@ -7330,7 +7337,7 @@ } catch (Exception ex) { - LogHelper.WriteLog(typeof(MainFrm), ex); + LogHelper.Debug("", ex); } } } @@ -7362,7 +7369,7 @@ GSOLayer layer = globeControl1.Globe.Layers.Add(strDataPath); if (layer == null) {//wxl - LogHelper.WriteLog(typeof(MainFrm), "buttonItemHX1_Click操作中，" + strDataPath + "的layer为空"); + LogHelper.Error("buttonItemHX1_Click操作中，" + strDataPath + "的layer为空"); continue; } GSOFeatures redFeatures = layer.GetAllFeatures(); @@ -7457,17 +7464,12 @@ { try { + globeControl1.BeforeSceneRenderEvent -= globeControl1_BeforeSceneRenderEvent; globeControl2.BeforeSceneRenderEvent -= globeControl2_BeforeSceneRenderEvent; - double x = Convert.ToDouble(Utility.Query_Roads["定位"].ToString().Split(',')[0]); - double y = Convert.ToDouble(Utility.Query_Roads["定位"].ToString().Split(',')[1]); - double z = Convert.ToDouble(Utility.Query_Roads["定位"].ToString().Split(',')[2]); - jumpToCameraState(x, y, z); - /* globeControl1.Globe.FlyToPosition(new GSOPoint3d(120.610963, 31.188121, 50), EnumAltitudeMode.Absolute, -4, 50, 800); globeControl1.Globe.FlyToPointSpeed = 10000000; - * */ globeControl1.Globe.Action = EnumAction3D.SelectObject; globeControl1.Refresh(); @@ -7489,6 +7491,37 @@ } } /// + /// 基础工具 + /// + /// + /// + private void ribbonTabItem1_MouseDown(object sender, MouseEventArgs e) + { + try + { + + globeControl1.BeforeSceneRenderEvent -= globeControl1_BeforeSceneRenderEvent; + globeControl2.BeforeSceneRenderEvent -= globeControl2_BeforeSceneRenderEvent; + + globeControl1.Globe.Action = EnumAction3D.ActionNull; + dataGridViewX1.AutoSizeColumnsMode = DataGridViewAutoSizeColumnsMode.AllCells; + //zhanshi = false; + redSH = false; + splitContainer1.Panel2Collapsed = true; + panelOfTable.Visible = false; + legendSC.Visible = false; + legendSG.Visible = false; + ClearGZData(); + GSOLayer redLayer = globeControl1.Globe.Layers.GetLayerByCaption("红线"); + if (redLayer == null) return; + redLayer.Visible = false; + } + catch (Exception ex) + { + //MessageBox.Show("系统运行错误:" + ex.ToString(), "错误", MessageBoxButtons.OK, MessageBoxIcon.Error); + } + } + /// /// 一键审核 /// /// @@ -7497,6 +7530,7 @@ { try { + globeControl1.BeforeSceneRenderEvent -= globeControl1_BeforeSceneRenderEvent; globeControl2.BeforeSceneRenderEvent -= globeControl2_BeforeSceneRenderEvent; @@ -7518,32 +7552,7 @@ //MessageBox.Show("系统运行错误:" + ex.ToString(), "错误", MessageBoxButtons.OK, MessageBoxIcon.Error); } } - - void ResetRibbonTab() - { - try - { - globeControl1.BeforeSceneRenderEvent -= globeControl1_BeforeSceneRenderEvent; - globeControl2.BeforeSceneRenderEvent -= globeControl2_BeforeSceneRenderEvent; - - globeControl1.Globe.Action = EnumAction3D.ActionNull; - dataGridViewX1.AutoSizeColumnsMode = DataGridViewAutoSizeColumnsMode.AllCells; - //zhanshi = false; - redSH = false; - splitContainer1.Panel2Collapsed = true; - panelOfTable.Visible = false; - legendSC.Visible = false; - legendSG.Visible = false; - ClearGZData(); - GSOLayer redLayer = globeControl1.Globe.Layers.GetLayerByCaption("红线"); - if (redLayer == null) return; - redLayer.Visible = false; - } - catch (Exception ex) - { - LogHelper.WriteLog(typeof(MainFrm), ex); - } - } + /// /// 双屏对比 /// @@ -7553,8 +7562,8 @@ { try { - globeControl1.BeforeSceneRenderEvent += new BeforeSceneRenderEventHandler(globeControl1_BeforeSceneRenderEvent); - globeControl2.BeforeSceneRenderEvent += new BeforeSceneRenderEventHandler(globeControl2_BeforeSceneRenderEvent); + globeControl1.BeforeSceneRenderEvent += globeControl1_BeforeSceneRenderEvent; + globeControl2.BeforeSceneRenderEvent += globeControl2_BeforeSceneRenderEvent; globeControl1.Globe.Action = EnumAction3D.ActionNull; panelOfTable.Visible = false; @@ -7570,32 +7579,43 @@ GSOLayer redLayer = globeControl1.Globe.Layers.GetLayerByCaption("红线"); if (redLayer != null) - { redLayer.Visible = false; - } } catch (Exception ex) { - LogHelper.WriteLog(typeof(MainFrm), ex); + //MessageBox.Show("系统运行错误:" + ex.ToString(), "错误", MessageBoxButtons.OK, MessageBoxIcon.Error); } } /// - /// 基础工具 - /// - /// - /// - private void ribbonTabItem1_MouseDown(object sender, MouseEventArgs e) - { - ResetRibbonTab(); - } - /// /// 文档管理 /// /// /// private void ribbonTabItem4_MouseDown(object sender, MouseEventArgs e) { - ResetRibbonTab(); + try + { + + globeControl1.BeforeSceneRenderEvent -= globeControl1_BeforeSceneRenderEvent; + globeControl2.BeforeSceneRenderEvent -= globeControl2_BeforeSceneRenderEvent; + + globeControl1.Globe.Action = EnumAction3D.ActionNull; + panelOfTable.Visible = false; + //zhanshi = false; + redSH = false; + splitContainer1.Panel2Collapsed = true; + dataGridViewX1.AutoSizeColumnsMode = DataGridViewAutoSizeColumnsMode.AllCells; + legendSC.Visible = false; + legendSG.Visible = false; + ClearGZData(); + GSOLayer redLayer = globeControl1.Globe.Layers.GetLayerByCaption("红线"); + if (redLayer != null) + redLayer.Visible = false; + } + catch (Exception ex) + { + //MessageBox.Show("系统运行错误:" + ex.ToString(), "错误", MessageBoxButtons.OK, MessageBoxIcon.Error); + } } /// /// 基础管理 @@ -7604,7 +7624,29 @@ /// private void ribbonTabItem14_MouseDown(object sender, MouseEventArgs e) { - ResetRibbonTab(); + try + { + globeControl1.BeforeSceneRenderEvent -= globeControl1_BeforeSceneRenderEvent; + globeControl2.BeforeSceneRenderEvent -= globeControl2_BeforeSceneRenderEvent; + + globeControl1.Globe.Action = EnumAction3D.ActionNull; + panelOfTable.Visible = false; + //zhanshi = false; + redSH = false; + splitContainer1.Panel2Collapsed = true; + dataGridViewX1.AutoSizeColumnsMode = DataGridViewAutoSizeColumnsMode.AllCells; + legendSC.Visible = false; + legendSG.Visible = false; + ClearGZData(); + + GSOLayer redLayer = globeControl1.Globe.Layers.GetLayerByCaption("红线"); + if (redLayer != null) + redLayer.Visible = false; + } + catch (Exception ex) + { + //MessageBox.Show("系统运行错误:" + ex.ToString(), "错误", MessageBoxButtons.OK, MessageBoxIcon.Error); + } } /// /// 权限管理 @@ -7613,26 +7655,31 @@ /// private void ribbonTabItem2_MouseDown(object sender, MouseEventArgs e) { - ResetRibbonTab(); + try + { + globeControl1.BeforeSceneRenderEvent -= globeControl1_BeforeSceneRenderEvent; + globeControl2.BeforeSceneRenderEvent -= globeControl2_BeforeSceneRenderEvent; + + globeControl1.Globe.Action = EnumAction3D.ActionNull; + panelOfTable.Visible = false; + //zhanshi = false; + redSH = false; + splitContainer1.Panel2Collapsed = true; + dataGridViewX1.AutoSizeColumnsMode = DataGridViewAutoSizeColumnsMode.AllCells; + legendSC.Visible = false; + legendSG.Visible = false; + ClearGZData(); + + GSOLayer redLayer = globeControl1.Globe.Layers.GetLayerByCaption("红线"); + if (redLayer == null) return; + redLayer.Visible = false; + } + catch (Exception ex) + { + //MessageBox.Show("系统运行错误:" + ex.ToString(), "错误", MessageBoxButtons.OK, MessageBoxIcon.Error); + } } - /// - /// 管线定位 - /// - /// - /// - private void ribbonTabItem7_MouseDown(object sender, MouseEventArgs e) - { - ResetRibbonTab(); - } - /// - /// 标识器管理 - /// - /// - /// - private void ribbonTabItem5_MouseDown(object sender, MouseEventArgs e) - { - ResetRibbonTab(); - } + //GSOFeature dpFeatuer = null; /// /// 双屏分析，点击管段分析 @@ -8017,7 +8064,9 @@ private void btn_flag_Click(object sender, EventArgs e) { if (FrmFlagManagers.IS_OPEN) + { return; + } FrmFlagManagers frm = new FrmFlagManagers(globeControl1); frm.Show(this); } diff --git a/MainFrm.designer.cs b/MainFrm.designer.cs index e3dca41..73398c0 100644 --- a/MainFrm.designer.cs +++ b/MainFrm.designer.cs @@ -4,6 +4,7 @@ using DevComponents.DotNetBar; using DevComponents.DotNetBar.Controls; using DevComponents.Editors; +using System.Drawing; namespace Cyberpipe { @@ -89,6 +90,7 @@ this.sideBar1 = new DevComponents.DotNetBar.SideBar(); this.panelEx3 = new DevComponents.DotNetBar.PanelEx(); this.layerSensorTree = new System.Windows.Forms.TreeView(); + this.layerTree = new Cyberpipe.MyTreeView(); this.sideBarPanelItem3 = new DevComponents.DotNetBar.SideBarPanelItem(); this.controlContainerItem3 = new DevComponents.DotNetBar.ControlContainerItem(); this.sideBarPanelItem4 = new DevComponents.DotNetBar.SideBarPanelItem(); @@ -243,42 +245,18 @@ this.保存ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.定位ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.ribbonControl1 = new DevComponents.DotNetBar.RibbonControl(); - this.ribbonPanel6 = new DevComponents.DotNetBar.RibbonPanel(); - this.ribbonBar6 = new DevComponents.DotNetBar.RibbonBar(); - this.buttonItemSPSZ = new DevComponents.DotNetBar.ButtonItem(); - this.buttonItem8 = new DevComponents.DotNetBar.ButtonItem(); - this.buttonItemLocation = new DevComponents.DotNetBar.ButtonItem(); - this.sliderItem2 = new DevComponents.DotNetBar.SliderItem(); - this.buttonItemGBJC = new DevComponents.DotNetBar.ButtonItem(); - this.ribbonPanel5 = new DevComponents.DotNetBar.RibbonPanel(); - this.ribbonBar2 = new DevComponents.DotNetBar.RibbonBar(); - this.buttonItemHX1 = new DevComponents.DotNetBar.ButtonItem(); - this.buttonItemHX2 = new DevComponents.DotNetBar.ButtonItem(); - this.buttonItemDCTP = new DevComponents.DotNetBar.ButtonItem(); - this.sliderItem3 = new DevComponents.DotNetBar.SliderItem(); - this.ribbonPanel1 = new DevComponents.DotNetBar.RibbonPanel(); - this.ribbonBar21 = new DevComponents.DotNetBar.RibbonBar(); - this.buttonItem87 = new DevComponents.DotNetBar.ButtonItem(); - this.buttonItem88 = new DevComponents.DotNetBar.ButtonItem(); - this.buttonItem27 = new DevComponents.DotNetBar.ButtonItem(); - this.buttonItem91 = new DevComponents.DotNetBar.ButtonItem(); - this.buttonItem1 = new DevComponents.DotNetBar.ButtonItem(); - this.btnlegendSet = new DevComponents.DotNetBar.ButtonItem(); - this.buttonItem89 = new DevComponents.DotNetBar.ButtonItem(); - this.btnOutputJPG = new DevComponents.DotNetBar.ButtonItem(); - this.ribbonPanel12 = new DevComponents.DotNetBar.RibbonPanel(); - this.ribbonBar18 = new DevComponents.DotNetBar.RibbonBar(); - this.buttonItem133 = new DevComponents.DotNetBar.ButtonItem(); - this.ribbonBar13 = new DevComponents.DotNetBar.RibbonBar(); - this.buttonItem127 = new DevComponents.DotNetBar.ButtonItem(); - this.buttonItem128 = new DevComponents.DotNetBar.ButtonItem(); - this.sliderItem1 = new DevComponents.DotNetBar.SliderItem(); - this.buttonItem134 = new DevComponents.DotNetBar.ButtonItem(); - this.buttonItem130 = new DevComponents.DotNetBar.ButtonItem(); - this.btn_check_history = new DevComponents.DotNetBar.ButtonItem(); - this.ribbonPanel4 = new DevComponents.DotNetBar.RibbonPanel(); - this.ribbonBar1 = new DevComponents.DotNetBar.RibbonBar(); - this.btn_document_info = new DevComponents.DotNetBar.ButtonItem(); + this.ribbonPanel3 = new DevComponents.DotNetBar.RibbonPanel(); + this.ribbonBar4 = new DevComponents.DotNetBar.RibbonBar(); + this.btn_flag = new DevComponents.DotNetBar.ButtonItem(); + this.slider4ground = new DevComponents.DotNetBar.SliderItem(); + this.ribbonPanel7 = new DevComponents.DotNetBar.RibbonPanel(); + this.gxdw_ribbonbar = new DevComponents.DotNetBar.RibbonBar(); + this.buttonItem9 = new DevComponents.DotNetBar.ButtonItem(); + this.buttonItem10 = new DevComponents.DotNetBar.ButtonItem(); + this.buttonItem11 = new DevComponents.DotNetBar.ButtonItem(); + this.buttonItem12 = new DevComponents.DotNetBar.ButtonItem(); + this.buttonItem13 = new DevComponents.DotNetBar.ButtonItem(); + this.buttonItem14 = new DevComponents.DotNetBar.ButtonItem(); this.ribbonPanel15 = new DevComponents.DotNetBar.RibbonPanel(); this.ribbonBar20 = new DevComponents.DotNetBar.RibbonBar(); this.buttonItemSH = new DevComponents.DotNetBar.ButtonItem(); @@ -334,18 +312,6 @@ this.buttonItemXT4 = new DevComponents.DotNetBar.ButtonItem(); this.buttonItemXT4_1 = new DevComponents.DotNetBar.ButtonItem(); this.buttonItemXT4_2 = new DevComponents.DotNetBar.ButtonItem(); - this.ribbonPanel3 = new DevComponents.DotNetBar.RibbonPanel(); - this.ribbonBar4 = new DevComponents.DotNetBar.RibbonBar(); - this.btn_flag = new DevComponents.DotNetBar.ButtonItem(); - this.slider4ground = new DevComponents.DotNetBar.SliderItem(); - this.ribbonPanel7 = new DevComponents.DotNetBar.RibbonPanel(); - this.gxdw_ribbonbar = new DevComponents.DotNetBar.RibbonBar(); - this.buttonItem9 = new DevComponents.DotNetBar.ButtonItem(); - this.buttonItem10 = new DevComponents.DotNetBar.ButtonItem(); - this.buttonItem11 = new DevComponents.DotNetBar.ButtonItem(); - this.buttonItem12 = new DevComponents.DotNetBar.ButtonItem(); - this.buttonItem13 = new DevComponents.DotNetBar.ButtonItem(); - this.buttonItem14 = new DevComponents.DotNetBar.ButtonItem(); this.ribbonPanel2 = new DevComponents.DotNetBar.RibbonPanel(); this.ribbonBar3 = new DevComponents.DotNetBar.RibbonBar(); this.btn_user_info = new DevComponents.DotNetBar.ButtonItem(); @@ -355,6 +321,43 @@ this.btn_user_role = new DevComponents.DotNetBar.ButtonItem(); this.btn_password_edit = new DevComponents.DotNetBar.ButtonItem(); this.buttonItemPasswordReset = new DevComponents.DotNetBar.ButtonItem(); + this.ribbonPanel6 = new DevComponents.DotNetBar.RibbonPanel(); + this.ribbonBar6 = new DevComponents.DotNetBar.RibbonBar(); + this.buttonItemSPSZ = new DevComponents.DotNetBar.ButtonItem(); + this.buttonItem8 = new DevComponents.DotNetBar.ButtonItem(); + this.buttonItemLocation = new DevComponents.DotNetBar.ButtonItem(); + this.sliderItem2 = new DevComponents.DotNetBar.SliderItem(); + this.buttonItemGBJC = new DevComponents.DotNetBar.ButtonItem(); + this.ribbonPanel5 = new DevComponents.DotNetBar.RibbonPanel(); + this.ribbonBar2 = new DevComponents.DotNetBar.RibbonBar(); + this.buttonItemHX1 = new DevComponents.DotNetBar.ButtonItem(); + this.buttonItemHX2 = new DevComponents.DotNetBar.ButtonItem(); + this.buttonItemDCTP = new DevComponents.DotNetBar.ButtonItem(); + this.sliderItem3 = new DevComponents.DotNetBar.SliderItem(); + this.ribbonPanel1 = new DevComponents.DotNetBar.RibbonPanel(); + this.ribbonBar21 = new DevComponents.DotNetBar.RibbonBar(); + this.buttonItem87 = new DevComponents.DotNetBar.ButtonItem(); + this.buttonItem88 = new DevComponents.DotNetBar.ButtonItem(); + this.buttonItem27 = new DevComponents.DotNetBar.ButtonItem(); + this.buttonItem91 = new DevComponents.DotNetBar.ButtonItem(); + this.buttonItem1 = new DevComponents.DotNetBar.ButtonItem(); + this.btnlegendSet = new DevComponents.DotNetBar.ButtonItem(); + this.buttonItem89 = new DevComponents.DotNetBar.ButtonItem(); + this.btnOutputJPG = new DevComponents.DotNetBar.ButtonItem(); + this.ribbonPanel12 = new DevComponents.DotNetBar.RibbonPanel(); + this.ribbonBar18 = new DevComponents.DotNetBar.RibbonBar(); + this.buttonItem133 = new DevComponents.DotNetBar.ButtonItem(); + this.buttonItem132 = new DevComponents.DotNetBar.ButtonItem(); + this.ribbonBar13 = new DevComponents.DotNetBar.RibbonBar(); + this.buttonItem127 = new DevComponents.DotNetBar.ButtonItem(); + this.buttonItem128 = new DevComponents.DotNetBar.ButtonItem(); + this.sliderItem1 = new DevComponents.DotNetBar.SliderItem(); + this.buttonItem134 = new DevComponents.DotNetBar.ButtonItem(); + this.buttonItem130 = new DevComponents.DotNetBar.ButtonItem(); + this.btn_check_history = new DevComponents.DotNetBar.ButtonItem(); + this.ribbonPanel4 = new DevComponents.DotNetBar.RibbonPanel(); + this.ribbonBar1 = new DevComponents.DotNetBar.RibbonBar(); + this.btn_document_info = new DevComponents.DotNetBar.ButtonItem(); this.ribbonTabItem1 = new DevComponents.DotNetBar.RibbonTabItem(); this.ribbonTabItem11 = new DevComponents.DotNetBar.RibbonTabItem(); this.ribbonTabItem6 = new DevComponents.DotNetBar.RibbonTabItem(); @@ -516,7 +519,6 @@ this.labelX17 = new DevComponents.DotNetBar.LabelX(); this.panelEx4 = new DevComponents.DotNetBar.PanelEx(); this.pictureBox1 = new System.Windows.Forms.PictureBox(); - this.layerTree = new Cyberpipe.MyTreeView(); this.statusStrip1.SuspendLayout(); this.sideBar1.SuspendLayout(); this.panelEx3.SuspendLayout(); @@ -527,15 +529,15 @@ this.contextMenuStrip3.SuspendLayout(); this.contextMenuStripDeleteLayerNode.SuspendLayout(); this.ribbonControl1.SuspendLayout(); + this.ribbonPanel3.SuspendLayout(); + this.ribbonPanel7.SuspendLayout(); + this.ribbonPanel15.SuspendLayout(); + this.ribbonPanel2.SuspendLayout(); this.ribbonPanel6.SuspendLayout(); this.ribbonPanel5.SuspendLayout(); this.ribbonPanel1.SuspendLayout(); this.ribbonPanel12.SuspendLayout(); this.ribbonPanel4.SuspendLayout(); - this.ribbonPanel15.SuspendLayout(); - this.ribbonPanel3.SuspendLayout(); - this.ribbonPanel7.SuspendLayout(); - this.ribbonPanel2.SuspendLayout(); this.panelOfTable.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.dataGridViewX1)).BeginInit(); this.statusStrip2.SuspendLayout(); @@ -711,7 +713,8 @@ this.statusLabel.Name = "statusLabel"; this.statusLabel.Size = new System.Drawing.Size(1313, 17); this.statusLabel.Spring = true; - this.statusLabel.Text = " ©2014-2015 苏州航天系统工程有限公司 版权所有"; + this.statusLabel.Text = Utility.Copyright; +// this.statusLabel.Text = " ©2014-2015 苏州航天系统工程有限公司 版权所有"; // // toolStripDropDownButton1 // @@ -956,6 +959,18 @@ this.layerSensorTree.NodeMouseClick += new System.Windows.Forms.TreeNodeMouseClickEventHandler(this.layerMarkerTree_NodeMouseClick); this.layerSensorTree.NodeMouseDoubleClick += new System.Windows.Forms.TreeNodeMouseClickEventHandler(this.layerTree_NodeMouseDoubleClick); // + // layerTree + // + this.layerTree.CheckBoxes = true; + this.layerTree.ItemHeight = 18; + this.layerTree.Location = new System.Drawing.Point(30, 78); + this.layerTree.Name = "layerTree"; + this.layerTree.Size = new System.Drawing.Size(121, 97); + this.layerTree.TabIndex = 1; + this.layerTree.AfterCheck += new System.Windows.Forms.TreeViewEventHandler(this.layerTree_AfterCheck); + this.layerTree.NodeMouseClick += new System.Windows.Forms.TreeNodeMouseClickEventHandler(this.layerTree_NodeMouseClick); + this.layerTree.NodeMouseDoubleClick += new System.Windows.Forms.TreeNodeMouseClickEventHandler(this.layerTree_NodeMouseDoubleClick); + // // sideBarPanelItem3 // this.sideBarPanelItem3.FontBold = true; @@ -2150,13 +2165,13 @@ this.ribbonControl1.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.ribbonControl1.Controls.Add(this.ribbonPanel3); this.ribbonControl1.Controls.Add(this.ribbonPanel7); - this.ribbonControl1.Controls.Add(this.ribbonPanel2); this.ribbonControl1.Controls.Add(this.ribbonPanel15); - this.ribbonControl1.Controls.Add(this.ribbonPanel4); - this.ribbonControl1.Controls.Add(this.ribbonPanel1); + this.ribbonControl1.Controls.Add(this.ribbonPanel2); this.ribbonControl1.Controls.Add(this.ribbonPanel6); - this.ribbonControl1.Controls.Add(this.ribbonPanel12); this.ribbonControl1.Controls.Add(this.ribbonPanel5); + this.ribbonControl1.Controls.Add(this.ribbonPanel1); + this.ribbonControl1.Controls.Add(this.ribbonPanel12); + this.ribbonControl1.Controls.Add(this.ribbonPanel4); this.ribbonControl1.Dock = System.Windows.Forms.DockStyle.Top; this.ribbonControl1.ImeMode = System.Windows.Forms.ImeMode.NoControl; this.ribbonControl1.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { @@ -2200,609 +2215,216 @@ this.ribbonControl1.Text = "ribbonControl1"; this.ribbonControl1.UseCustomizeDialog = false; // - // ribbonPanel6 + // ribbonPanel3 // - this.ribbonPanel6.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.ribbonPanel6.Controls.Add(this.ribbonBar6); - this.ribbonPanel6.Dock = System.Windows.Forms.DockStyle.Fill; - this.ribbonPanel6.Location = new System.Drawing.Point(0, 0); - this.ribbonPanel6.Name = "ribbonPanel6"; - this.ribbonPanel6.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); - this.ribbonPanel6.Size = new System.Drawing.Size(1328, 95); + this.ribbonPanel3.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.ribbonPanel3.Controls.Add(this.ribbonBar4); + this.ribbonPanel3.Dock = System.Windows.Forms.DockStyle.Fill; + this.ribbonPanel3.Location = new System.Drawing.Point(0, 33); + this.ribbonPanel3.Name = "ribbonPanel3"; + this.ribbonPanel3.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); + this.ribbonPanel3.Size = new System.Drawing.Size(1328, 62); // // // - this.ribbonPanel6.Style.Class = ""; - this.ribbonPanel6.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonPanel3.Style.Class = ""; + this.ribbonPanel3.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; // // // - this.ribbonPanel6.StyleMouseDown.Class = ""; - this.ribbonPanel6.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonPanel3.StyleMouseDown.Class = ""; + this.ribbonPanel3.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; // // // - this.ribbonPanel6.StyleMouseOver.Class = ""; - this.ribbonPanel6.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonPanel6.TabIndex = 38; - this.ribbonPanel6.Visible = false; + this.ribbonPanel3.StyleMouseOver.Class = ""; + this.ribbonPanel3.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonPanel3.TabIndex = 40; // - // ribbonBar6 + // ribbonBar4 // - this.ribbonBar6.AutoOverflowEnabled = true; + this.ribbonBar4.AutoOverflowEnabled = true; // // // - this.ribbonBar6.BackgroundMouseOverStyle.Class = ""; - this.ribbonBar6.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar4.BackgroundMouseOverStyle.Class = ""; + this.ribbonBar4.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; // // // - this.ribbonBar6.BackgroundStyle.Class = ""; - this.ribbonBar6.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonBar6.ContainerControlProcessDialogKey = true; - this.ribbonBar6.Dock = System.Windows.Forms.DockStyle.Left; - this.ribbonBar6.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { - this.buttonItemSPSZ, - this.buttonItem8, - this.buttonItemLocation, - this.sliderItem2, - this.buttonItemGBJC}); - this.ribbonBar6.Location = new System.Drawing.Point(3, 0); - this.ribbonBar6.Name = "ribbonBar6"; - this.ribbonBar6.Size = new System.Drawing.Size(427, 92); - this.ribbonBar6.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.ribbonBar6.TabIndex = 0; + this.ribbonBar4.BackgroundStyle.Class = ""; + this.ribbonBar4.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar4.ContainerControlProcessDialogKey = true; + this.ribbonBar4.Dock = System.Windows.Forms.DockStyle.Left; + this.ribbonBar4.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { + this.btn_flag, + this.slider4ground}); + this.ribbonBar4.Location = new System.Drawing.Point(3, 0); + this.ribbonBar4.Name = "ribbonBar4"; + this.ribbonBar4.Size = new System.Drawing.Size(634, 59); + this.ribbonBar4.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.ribbonBar4.TabIndex = 0; // // // - this.ribbonBar6.TitleStyle.Class = ""; - this.ribbonBar6.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar4.TitleStyle.Class = ""; + this.ribbonBar4.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; // // // - this.ribbonBar6.TitleStyleMouseOver.Class = ""; - this.ribbonBar6.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonBar6.TitleVisible = false; + this.ribbonBar4.TitleStyleMouseOver.Class = ""; + this.ribbonBar4.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar4.TitleVisible = false; // - // buttonItemSPSZ + // btn_flag // - this.buttonItemSPSZ.Image = ((System.Drawing.Image)(resources.GetObject("buttonItemSPSZ.Image"))); - this.buttonItemSPSZ.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItemSPSZ.Name = "buttonItemSPSZ"; - this.buttonItemSPSZ.SubItemsExpandWidth = 14; - this.buttonItemSPSZ.Text = "双屏设置"; - this.buttonItemSPSZ.Click += new System.EventHandler(this.buttonItemSPSZ_Click); + this.btn_flag.Image = global::Cyberpipe.Properties.Resources._24x24icon_03_hover; + this.btn_flag.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.btn_flag.Name = "btn_flag"; + this.btn_flag.SubItemsExpandWidth = 14; + this.btn_flag.Text = "标识器管理"; + this.btn_flag.Click += new System.EventHandler(this.btn_flag_Click); // - // buttonItem8 + // slider4ground // - this.buttonItem8.Image = ((System.Drawing.Image)(resources.GetObject("buttonItem8.Image"))); - this.buttonItem8.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem8.Name = "buttonItem8"; - this.buttonItem8.SubItemsExpandWidth = 14; - this.buttonItem8.Text = "双屏分析"; - this.buttonItem8.Click += new System.EventHandler(this.buttonItem8_Click); + this.slider4ground.LabelPosition = DevComponents.DotNetBar.eSliderLabelPosition.Top; + this.slider4ground.LabelWidth = 50; + this.slider4ground.Name = "slider4ground"; + this.slider4ground.Text = "地面透明度"; + this.slider4ground.TextColor = System.Drawing.Color.Black; + this.slider4ground.Value = 0; + this.slider4ground.ValueChanged += new System.EventHandler(this.slider4ground_ValueChanged); // - // buttonItemLocation + // ribbonPanel7 // - this.buttonItemLocation.Image = ((System.Drawing.Image)(resources.GetObject("buttonItemLocation.Image"))); - this.buttonItemLocation.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItemLocation.Name = "buttonItemLocation"; - this.buttonItemLocation.SubItemsExpandWidth = 14; - this.buttonItemLocation.Text = "快速定位"; - this.buttonItemLocation.Click += new System.EventHandler(this.buttonItemLocation_Click); + this.ribbonPanel7.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.ribbonPanel7.Controls.Add(this.gxdw_ribbonbar); + this.ribbonPanel7.Dock = System.Windows.Forms.DockStyle.Fill; + this.ribbonPanel7.Location = new System.Drawing.Point(0, 33); + this.ribbonPanel7.Name = "ribbonPanel7"; + this.ribbonPanel7.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); + this.ribbonPanel7.Size = new System.Drawing.Size(1328, 62); // - // sliderItem2 // - this.sliderItem2.LabelPosition = DevComponents.DotNetBar.eSliderLabelPosition.Top; - this.sliderItem2.LabelWidth = 50; - this.sliderItem2.Name = "sliderItem2"; - this.sliderItem2.Text = "地面透明度"; - this.sliderItem2.TextColor = System.Drawing.Color.Black; - this.sliderItem2.Value = 0; - this.sliderItem2.ValueChanged += new System.EventHandler(this.sliderItem2_ValueChanged); // - // buttonItemGBJC + this.ribbonPanel7.Style.Class = ""; + this.ribbonPanel7.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; // - this.buttonItemGBJC.Image = ((System.Drawing.Image)(resources.GetObject("buttonItemGBJC.Image"))); - this.buttonItemGBJC.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItemGBJC.Name = "buttonItemGBJC"; - this.buttonItemGBJC.SubItemsExpandWidth = 14; - this.buttonItemGBJC.Text = "国标检测"; - this.buttonItemGBJC.Click += new System.EventHandler(this.buttonItemGBJC_Click); // - // ribbonPanel5 // - this.ribbonPanel5.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.ribbonPanel5.Controls.Add(this.ribbonBar2); - this.ribbonPanel5.Dock = System.Windows.Forms.DockStyle.Fill; - this.ribbonPanel5.Location = new System.Drawing.Point(0, 0); - this.ribbonPanel5.Name = "ribbonPanel5"; - this.ribbonPanel5.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); - this.ribbonPanel5.Size = new System.Drawing.Size(1328, 95); + this.ribbonPanel7.StyleMouseDown.Class = ""; + this.ribbonPanel7.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; // // // - this.ribbonPanel5.Style.Class = ""; - this.ribbonPanel5.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonPanel7.StyleMouseOver.Class = ""; + this.ribbonPanel7.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonPanel7.TabIndex = 41; + this.ribbonPanel7.Visible = false; // + // gxdw_ribbonbar // + this.gxdw_ribbonbar.AutoOverflowEnabled = true; // - this.ribbonPanel5.StyleMouseDown.Class = ""; - this.ribbonPanel5.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; // // + this.gxdw_ribbonbar.BackgroundMouseOverStyle.Class = ""; + this.gxdw_ribbonbar.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; // - this.ribbonPanel5.StyleMouseOver.Class = ""; - this.ribbonPanel5.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonPanel5.TabIndex = 37; - this.ribbonPanel5.Visible = false; // - // ribbonBar2 // - this.ribbonBar2.AutoOverflowEnabled = true; + this.gxdw_ribbonbar.BackgroundStyle.Class = ""; + this.gxdw_ribbonbar.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.gxdw_ribbonbar.ContainerControlProcessDialogKey = true; + this.gxdw_ribbonbar.Dock = System.Windows.Forms.DockStyle.Left; + this.gxdw_ribbonbar.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { + this.buttonItem9, + this.buttonItem10, + this.buttonItem11, + this.buttonItem12, + this.buttonItem13, + this.buttonItem14}); + this.gxdw_ribbonbar.Location = new System.Drawing.Point(3, 0); + this.gxdw_ribbonbar.Name = "gxdw_ribbonbar"; + this.gxdw_ribbonbar.Size = new System.Drawing.Size(564, 59); + this.gxdw_ribbonbar.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.gxdw_ribbonbar.TabIndex = 0; + this.gxdw_ribbonbar.Text = "ribbonBar5"; // // // - this.ribbonBar2.BackgroundMouseOverStyle.Class = ""; - this.ribbonBar2.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.gxdw_ribbonbar.TitleStyle.Class = ""; + this.gxdw_ribbonbar.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; // // // - this.ribbonBar2.BackgroundStyle.Class = ""; - this.ribbonBar2.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonBar2.ContainerControlProcessDialogKey = true; - this.ribbonBar2.Dock = System.Windows.Forms.DockStyle.Left; - this.ribbonBar2.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { - this.buttonItemHX1, - this.buttonItemHX2, - this.buttonItemDCTP, - this.sliderItem3}); - this.ribbonBar2.Location = new System.Drawing.Point(3, 0); - this.ribbonBar2.Name = "ribbonBar2"; - this.ribbonBar2.Size = new System.Drawing.Size(350, 92); - this.ribbonBar2.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.ribbonBar2.TabIndex = 0; + this.gxdw_ribbonbar.TitleStyleMouseOver.Class = ""; + this.gxdw_ribbonbar.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.gxdw_ribbonbar.TitleVisible = false; // + // buttonItem9 // + this.buttonItem9.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__76; + this.buttonItem9.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem9.Name = "buttonItem9"; + this.buttonItem9.SubItemsExpandWidth = 14; + this.buttonItem9.Text = "工单管理"; + this.buttonItem9.Click += new System.EventHandler(this.buttonItem9_Click); // - this.ribbonBar2.TitleStyle.Class = ""; - this.ribbonBar2.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // buttonItem10 // + this.buttonItem10.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__69; + this.buttonItem10.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem10.Name = "buttonItem10"; + this.buttonItem10.SubItemsExpandWidth = 14; + this.buttonItem10.Text = "在线任务"; + this.buttonItem10.Click += new System.EventHandler(this.buttonItem10_Click); // + // buttonItem11 // - this.ribbonBar2.TitleStyleMouseOver.Class = ""; - this.ribbonBar2.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonBar2.TitleVisible = false; + this.buttonItem11.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__72; + this.buttonItem11.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem11.Name = "buttonItem11"; + this.buttonItem11.SubItemsExpandWidth = 14; + this.buttonItem11.Text = "事件管理"; + this.buttonItem11.Click += new System.EventHandler(this.buttonItem11_Click); // - // buttonItemHX1 + // buttonItem12 // - this.buttonItemHX1.AutoExpandOnClick = true; - this.buttonItemHX1.Image = ((System.Drawing.Image)(resources.GetObject("buttonItemHX1.Image"))); - this.buttonItemHX1.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItemHX1.Name = "buttonItemHX1"; - this.buttonItemHX1.SubItemsExpandWidth = 14; - this.buttonItemHX1.Text = "导入红线"; - this.buttonItemHX1.Click += new System.EventHandler(this.buttonItemHX1_Click); + this.buttonItem12.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__34; + this.buttonItem12.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem12.Name = "buttonItem12"; + this.buttonItem12.SubItemsExpandWidth = 14; + this.buttonItem12.Text = "探测仪管理"; + this.buttonItem12.Click += new System.EventHandler(this.buttonItem12_Click); // - // buttonItemHX2 + // buttonItem13 // - this.buttonItemHX2.Image = ((System.Drawing.Image)(resources.GetObject("buttonItemHX2.Image"))); - this.buttonItemHX2.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItemHX2.Name = "buttonItemHX2"; - this.buttonItemHX2.SubItemsExpandWidth = 14; - this.buttonItemHX2.Text = "红线审核"; - this.buttonItemHX2.Click += new System.EventHandler(this.buttonItemHX2_Click); + this.buttonItem13.Image = global::Cyberpipe.Properties.Resources._24x24icon_13_hover; + this.buttonItem13.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem13.Name = "buttonItem13"; + this.buttonItem13.SubItemsExpandWidth = 14; + this.buttonItem13.Text = "巡检人员维护"; + this.buttonItem13.Click += new System.EventHandler(this.buttonItem13_Click); // - // buttonItemDCTP + // buttonItem14 // - this.buttonItemDCTP.Image = ((System.Drawing.Image)(resources.GetObject("buttonItemDCTP.Image"))); - this.buttonItemDCTP.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItemDCTP.Name = "buttonItemDCTP"; - this.buttonItemDCTP.SubItemsExpandWidth = 14; - this.buttonItemDCTP.Text = "导出图片"; - this.buttonItemDCTP.Click += new System.EventHandler(this.buttonItemDCTP_Click); - // - // sliderItem3 - // - this.sliderItem3.LabelPosition = DevComponents.DotNetBar.eSliderLabelPosition.Top; - this.sliderItem3.LabelWidth = 50; - this.sliderItem3.Name = "sliderItem3"; - this.sliderItem3.Text = "地面透明度"; - this.sliderItem3.TextColor = System.Drawing.Color.Black; - this.sliderItem3.Value = 0; - this.sliderItem3.ValueChanged += new System.EventHandler(this.sliderItem3_ValueChanged); - // - // ribbonPanel1 - // - this.ribbonPanel1.AutoSize = true; - this.ribbonPanel1.CanvasColor = System.Drawing.Color.Gray; - this.ribbonPanel1.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.ribbonPanel1.Controls.Add(this.ribbonBar21); - this.ribbonPanel1.Dock = System.Windows.Forms.DockStyle.Fill; - this.ribbonPanel1.Location = new System.Drawing.Point(0, 0); - this.ribbonPanel1.Name = "ribbonPanel1"; - this.ribbonPanel1.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); - this.ribbonPanel1.Size = new System.Drawing.Size(1328, 95); - // - // - // - this.ribbonPanel1.Style.Class = ""; - this.ribbonPanel1.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonPanel1.StyleMouseDown.Class = ""; - this.ribbonPanel1.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonPanel1.StyleMouseOver.Class = ""; - this.ribbonPanel1.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonPanel1.TabIndex = 1; - this.ribbonPanel1.Visible = false; - // - // ribbonBar21 - // - this.ribbonBar21.AutoOverflowEnabled = true; - this.ribbonBar21.BackColor = System.Drawing.Color.White; - // - // - // - this.ribbonBar21.BackgroundMouseOverStyle.Class = ""; - this.ribbonBar21.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonBar21.BackgroundStyle.Class = ""; - this.ribbonBar21.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonBar21.ContainerControlProcessDialogKey = true; - this.ribbonBar21.Dock = System.Windows.Forms.DockStyle.Left; - this.ribbonBar21.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { - this.buttonItem87, - this.buttonItem88, - this.buttonItem27, - this.sliderGroundTransSet1, - this.buttonItem91, - this.buttonItem1, - this.btnlegendSet, - this.buttonItem89, - this.btnOutputJPG}); - this.ribbonBar21.Location = new System.Drawing.Point(3, 0); - this.ribbonBar21.Name = "ribbonBar21"; - this.ribbonBar21.Size = new System.Drawing.Size(649, 92); - this.ribbonBar21.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.ribbonBar21.TabIndex = 2; - this.ribbonBar21.Text = "浏览模式"; - // - // - // - this.ribbonBar21.TitleStyle.Class = ""; - this.ribbonBar21.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonBar21.TitleStyleMouseOver.Class = ""; - this.ribbonBar21.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonBar21.TitleVisible = false; - // - // buttonItem87 - // - this.buttonItem87.Image = ((System.Drawing.Image)(resources.GetObject("buttonItem87.Image"))); - this.buttonItem87.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem87.Name = "buttonItem87"; - this.buttonItem87.SubItemsExpandWidth = 14; - this.buttonItem87.Text = "地上模式"; - this.buttonItem87.Click += new System.EventHandler(this.buttonItem87_Click); - // - // buttonItem88 - // - this.buttonItem88.Image = ((System.Drawing.Image)(resources.GetObject("buttonItem88.Image"))); - this.buttonItem88.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem88.Name = "buttonItem88"; - this.buttonItem88.SubItemsExpandWidth = 14; - this.buttonItem88.Text = "地下模式"; - this.buttonItem88.Click += new System.EventHandler(this.buttonItem88_Click); - // - // buttonItem27 - // - this.buttonItem27.Image = ((System.Drawing.Image)(resources.GetObject("buttonItem27.Image"))); - this.buttonItem27.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem27.Name = "buttonItem27"; - this.buttonItem27.SubItemsExpandWidth = 14; - this.buttonItem27.Text = "行走模式"; - this.buttonItem27.Click += new System.EventHandler(this.buttonItem27_Click); - // - // buttonItem91 - // - this.buttonItem91.ForeColor = System.Drawing.Color.Black; - this.buttonItem91.Image = ((System.Drawing.Image)(resources.GetObject("buttonItem91.Image"))); - this.buttonItem91.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem91.Name = "buttonItem91"; - this.buttonItem91.SubItemsExpandWidth = 14; - this.buttonItem91.Text = "快速定位"; - this.buttonItem91.Click += new System.EventHandler(this.buttonItem91_Click); - // - // buttonItem1 - // - this.buttonItem1.Image = ((System.Drawing.Image)(resources.GetObject("buttonItem1.Image"))); - this.buttonItem1.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem1.Name = "buttonItem1"; - this.buttonItem1.SubItemsExpandWidth = 14; - this.buttonItem1.Text = "图层管理"; - this.buttonItem1.Click += new System.EventHandler(this.buttonItem1_Click); - // - // btnlegendSet - // - this.btnlegendSet.Image = ((System.Drawing.Image)(resources.GetObject("btnlegendSet.Image"))); - this.btnlegendSet.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.btnlegendSet.Name = "btnlegendSet"; - this.btnlegendSet.SubItemsExpandWidth = 14; - this.btnlegendSet.Text = "图例"; - this.btnlegendSet.Click += new System.EventHandler(this.btnlegendSet_Click); - // - // buttonItem89 - // - this.buttonItem89.Image = ((System.Drawing.Image)(resources.GetObject("buttonItem89.Image"))); - this.buttonItem89.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem89.Name = "buttonItem89"; - this.buttonItem89.SubItemsExpandWidth = 14; - this.buttonItem89.Text = "全屏显示"; - this.buttonItem89.Click += new System.EventHandler(this.buttonItem89_Click); - // - // btnOutputJPG - // - this.btnOutputJPG.Image = ((System.Drawing.Image)(resources.GetObject("btnOutputJPG.Image"))); - this.btnOutputJPG.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.btnOutputJPG.Name = "btnOutputJPG"; - this.btnOutputJPG.SubItemsExpandWidth = 14; - this.btnOutputJPG.Text = "导出图片"; - this.btnOutputJPG.Click += new System.EventHandler(this.btnOutputJPG_Click); - // - // ribbonPanel12 - // - this.ribbonPanel12.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.ribbonPanel12.Controls.Add(this.ribbonBar18); - this.ribbonPanel12.Controls.Add(this.ribbonBar13); - this.ribbonPanel12.Dock = System.Windows.Forms.DockStyle.Fill; - this.ribbonPanel12.Location = new System.Drawing.Point(0, 0); - this.ribbonPanel12.Name = "ribbonPanel12"; - this.ribbonPanel12.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); - this.ribbonPanel12.Size = new System.Drawing.Size(1328, 95); - // - // - // - this.ribbonPanel12.Style.Class = ""; - this.ribbonPanel12.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonPanel12.StyleMouseDown.Class = ""; - this.ribbonPanel12.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonPanel12.StyleMouseOver.Class = ""; - this.ribbonPanel12.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonPanel12.TabIndex = 34; - this.ribbonPanel12.Visible = false; - // - // ribbonBar18 - // - this.ribbonBar18.AutoOverflowEnabled = true; - // - // - // - this.ribbonBar18.BackgroundMouseOverStyle.Class = ""; - this.ribbonBar18.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonBar18.BackgroundStyle.Class = ""; - this.ribbonBar18.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonBar18.ContainerControlProcessDialogKey = true; - this.ribbonBar18.Dock = System.Windows.Forms.DockStyle.Left; - this.ribbonBar18.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { - this.buttonItem133}); - this.ribbonBar18.Location = new System.Drawing.Point(531, 0); - this.ribbonBar18.Name = "ribbonBar18"; - this.ribbonBar18.Size = new System.Drawing.Size(129, 92); - this.ribbonBar18.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.ribbonBar18.TabIndex = 1; - // - // - // - this.ribbonBar18.TitleStyle.Class = ""; - this.ribbonBar18.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonBar18.TitleStyleMouseOver.Class = ""; - this.ribbonBar18.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonBar18.TitleVisible = false; - // - // buttonItem133 - // - this.buttonItem133.Image = ((System.Drawing.Image)(resources.GetObject("buttonItem133.Image"))); - this.buttonItem133.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem133.Name = "buttonItem133"; - this.buttonItem133.SubItemsExpandWidth = 14; - this.buttonItem133.Text = "审核入库"; - this.buttonItem133.Click += new System.EventHandler(this.buttonItem133_Click_1); - // - // ribbonBar13 - // - this.ribbonBar13.AutoOverflowEnabled = true; - // - // - // - this.ribbonBar13.BackgroundMouseOverStyle.Class = ""; - this.ribbonBar13.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonBar13.BackgroundStyle.Class = ""; - this.ribbonBar13.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonBar13.ContainerControlProcessDialogKey = true; - this.ribbonBar13.Dock = System.Windows.Forms.DockStyle.Left; - this.ribbonBar13.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { - this.buttonItem127, - this.buttonItem128, - this.sliderItem1, - this.buttonItem134, - this.buttonItem130, - this.btn_check_history}); - this.ribbonBar13.Location = new System.Drawing.Point(3, 0); - this.ribbonBar13.Name = "ribbonBar13"; - this.ribbonBar13.Size = new System.Drawing.Size(528, 92); - this.ribbonBar13.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.ribbonBar13.TabIndex = 0; - // - // - // - this.ribbonBar13.TitleStyle.Class = ""; - this.ribbonBar13.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonBar13.TitleStyleMouseOver.Class = ""; - this.ribbonBar13.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonBar13.TitleVisible = false; - // - // buttonItem127 - // - this.buttonItem127.Image = ((System.Drawing.Image)(resources.GetObject("buttonItem127.Image"))); - this.buttonItem127.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem127.Name = "buttonItem127"; - this.buttonItem127.SubItemsExpandWidth = 14; - this.buttonItem127.Text = "打开数据"; - this.buttonItem127.Click += new System.EventHandler(this.buttonItem127_Click_2); - // - // buttonItem128 - // - this.buttonItem128.Image = ((System.Drawing.Image)(resources.GetObject("buttonItem128.Image"))); - this.buttonItem128.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem128.Name = "buttonItem128"; - this.buttonItem128.SubItemsExpandWidth = 14; - this.buttonItem128.Text = "一键审核"; - this.buttonItem128.Click += new System.EventHandler(this.buttonItem128_Click); - // - // sliderItem1 - // - this.sliderItem1.LabelPosition = DevComponents.DotNetBar.eSliderLabelPosition.Top; - this.sliderItem1.LabelWidth = 50; - this.sliderItem1.Name = "sliderItem1"; - this.sliderItem1.Text = "地面透明度"; - this.sliderItem1.TextColor = System.Drawing.Color.Black; - this.sliderItem1.Value = 0; - this.sliderItem1.ValueChanged += new System.EventHandler(this.sliderItem1_ValueChanged); - // - // buttonItem134 - // - this.buttonItem134.Image = ((System.Drawing.Image)(resources.GetObject("buttonItem134.Image"))); - this.buttonItem134.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem134.Name = "buttonItem134"; - this.buttonItem134.SubItemsExpandWidth = 14; - this.buttonItem134.Text = "模拟设计修改"; - this.buttonItem134.Click += new System.EventHandler(this.buttonItem134_Click_1); - // - // buttonItem130 - // - this.buttonItem130.Image = ((System.Drawing.Image)(resources.GetObject("buttonItem130.Image"))); - this.buttonItem130.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem130.Name = "buttonItem130"; - this.buttonItem130.SubItemsExpandWidth = 14; - this.buttonItem130.Text = "导出审核图"; - this.buttonItem130.Click += new System.EventHandler(this.buttonItem130_Click_1); - // - // btn_check_history - // - this.btn_check_history.Image = ((System.Drawing.Image)(resources.GetObject("btn_check_history.Image"))); - this.btn_check_history.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.btn_check_history.Name = "btn_check_history"; - this.btn_check_history.SubItemsExpandWidth = 14; - this.btn_check_history.Text = "审核历史"; - this.btn_check_history.Click += new System.EventHandler(this.btn_check_history_Click); - // - // ribbonPanel4 - // - this.ribbonPanel4.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.ribbonPanel4.Controls.Add(this.ribbonBar1); - this.ribbonPanel4.Dock = System.Windows.Forms.DockStyle.Fill; - this.ribbonPanel4.Location = new System.Drawing.Point(0, 0); - this.ribbonPanel4.Name = "ribbonPanel4"; - this.ribbonPanel4.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); - this.ribbonPanel4.Size = new System.Drawing.Size(1328, 95); - // - // - // - this.ribbonPanel4.Style.Class = ""; - this.ribbonPanel4.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonPanel4.StyleMouseDown.Class = ""; - this.ribbonPanel4.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonPanel4.StyleMouseOver.Class = ""; - this.ribbonPanel4.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonPanel4.TabIndex = 36; - this.ribbonPanel4.Visible = false; - // - // ribbonBar1 - // - this.ribbonBar1.AutoOverflowEnabled = true; - // - // - // - this.ribbonBar1.BackgroundMouseOverStyle.Class = ""; - this.ribbonBar1.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonBar1.BackgroundStyle.Class = ""; - this.ribbonBar1.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonBar1.ContainerControlProcessDialogKey = true; - this.ribbonBar1.Dock = System.Windows.Forms.DockStyle.Left; - this.ribbonBar1.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { - this.btn_document_info}); - this.ribbonBar1.Location = new System.Drawing.Point(3, 0); - this.ribbonBar1.Name = "ribbonBar1"; - this.ribbonBar1.Size = new System.Drawing.Size(88, 92); - this.ribbonBar1.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.ribbonBar1.TabIndex = 0; - // - // - // - this.ribbonBar1.TitleStyle.Class = ""; - this.ribbonBar1.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonBar1.TitleStyleMouseOver.Class = ""; - this.ribbonBar1.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonBar1.TitleVisible = false; - // - // btn_document_info - // - this.btn_document_info.Image = ((System.Drawing.Image)(resources.GetObject("btn_document_info.Image"))); - this.btn_document_info.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.btn_document_info.Name = "btn_document_info"; - this.btn_document_info.SubItemsExpandWidth = 14; - this.btn_document_info.Text = "文档管理"; - this.btn_document_info.Click += new System.EventHandler(this.btn_document_info_Click); + this.buttonItem14.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__56; + this.buttonItem14.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem14.Name = "buttonItem14"; + this.buttonItem14.SubItemsExpandWidth = 14; + this.buttonItem14.Text = "导出施工图"; + this.buttonItem14.Click += new System.EventHandler(this.buttonItem14_Click); // // ribbonPanel15 // this.ribbonPanel15.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; this.ribbonPanel15.Controls.Add(this.ribbonBar20); this.ribbonPanel15.Dock = System.Windows.Forms.DockStyle.Fill; - this.ribbonPanel15.Location = new System.Drawing.Point(0, 0); + this.ribbonPanel15.Location = new System.Drawing.Point(0, 33); this.ribbonPanel15.Name = "ribbonPanel15"; this.ribbonPanel15.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); - this.ribbonPanel15.Size = new System.Drawing.Size(1328, 95); + this.ribbonPanel15.Size = new System.Drawing.Size(1328, 62); // // // @@ -2843,7 +2465,7 @@ this.buttonItemXTGL}); this.ribbonBar20.Location = new System.Drawing.Point(3, 0); this.ribbonBar20.Name = "ribbonBar20"; - this.ribbonBar20.Size = new System.Drawing.Size(283, 92); + this.ribbonBar20.Size = new System.Drawing.Size(283, 59); this.ribbonBar20.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; this.ribbonBar20.TabIndex = 0; // @@ -3274,216 +2896,15 @@ this.buttonItemXT4_2.Text = "人员修改"; this.buttonItemXT4_2.Click += new System.EventHandler(this.buttonItemXT4_2_Click); // - // ribbonPanel3 - // - this.ribbonPanel3.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.ribbonPanel3.Controls.Add(this.ribbonBar4); - this.ribbonPanel3.Dock = System.Windows.Forms.DockStyle.Fill; - this.ribbonPanel3.Location = new System.Drawing.Point(0, 33); - this.ribbonPanel3.Name = "ribbonPanel3"; - this.ribbonPanel3.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); - this.ribbonPanel3.Size = new System.Drawing.Size(1328, 62); - // - // - // - this.ribbonPanel3.Style.Class = ""; - this.ribbonPanel3.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonPanel3.StyleMouseDown.Class = ""; - this.ribbonPanel3.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonPanel3.StyleMouseOver.Class = ""; - this.ribbonPanel3.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonPanel3.TabIndex = 40; - // - // ribbonBar4 - // - this.ribbonBar4.AutoOverflowEnabled = true; - // - // - // - this.ribbonBar4.BackgroundMouseOverStyle.Class = ""; - this.ribbonBar4.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonBar4.BackgroundStyle.Class = ""; - this.ribbonBar4.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonBar4.ContainerControlProcessDialogKey = true; - this.ribbonBar4.Dock = System.Windows.Forms.DockStyle.Left; - this.ribbonBar4.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { - this.btn_flag, - this.slider4ground}); - this.ribbonBar4.Location = new System.Drawing.Point(3, 0); - this.ribbonBar4.Name = "ribbonBar4"; - this.ribbonBar4.Size = new System.Drawing.Size(321, 59); - this.ribbonBar4.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.ribbonBar4.TabIndex = 0; - // - // - // - this.ribbonBar4.TitleStyle.Class = ""; - this.ribbonBar4.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonBar4.TitleStyleMouseOver.Class = ""; - this.ribbonBar4.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonBar4.TitleVisible = false; - // - // btn_flag - // - this.btn_flag.Image = global::Cyberpipe.Properties.Resources._24x24icon_03_hover; - this.btn_flag.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.btn_flag.Name = "btn_flag"; - this.btn_flag.SubItemsExpandWidth = 14; - this.btn_flag.Text = "标识器管理"; - this.btn_flag.Click += new System.EventHandler(this.btn_flag_Click); - // - // slider4ground - // - this.slider4ground.LabelPosition = DevComponents.DotNetBar.eSliderLabelPosition.Top; - this.slider4ground.LabelWidth = 50; - this.slider4ground.Name = "slider4ground"; - this.slider4ground.Text = "地面透明度"; - this.slider4ground.TextColor = System.Drawing.Color.Black; - this.slider4ground.Value = 0; - this.slider4ground.ValueChanged += new System.EventHandler(this.slider4ground_ValueChanged); - // - // ribbonPanel7 - // - this.ribbonPanel7.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.ribbonPanel7.Controls.Add(this.gxdw_ribbonbar); - this.ribbonPanel7.Dock = System.Windows.Forms.DockStyle.Fill; - this.ribbonPanel7.Location = new System.Drawing.Point(0, 33); - this.ribbonPanel7.Name = "ribbonPanel7"; - this.ribbonPanel7.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); - this.ribbonPanel7.Size = new System.Drawing.Size(1328, 62); - // - // - // - this.ribbonPanel7.Style.Class = ""; - this.ribbonPanel7.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonPanel7.StyleMouseDown.Class = ""; - this.ribbonPanel7.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonPanel7.StyleMouseOver.Class = ""; - this.ribbonPanel7.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonPanel7.TabIndex = 41; - this.ribbonPanel7.Visible = false; - // - // gxdw_ribbonbar - // - this.gxdw_ribbonbar.AutoOverflowEnabled = true; - // - // - // - this.gxdw_ribbonbar.BackgroundMouseOverStyle.Class = ""; - this.gxdw_ribbonbar.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.gxdw_ribbonbar.BackgroundStyle.Class = ""; - this.gxdw_ribbonbar.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.gxdw_ribbonbar.ContainerControlProcessDialogKey = true; - this.gxdw_ribbonbar.Dock = System.Windows.Forms.DockStyle.Left; - this.gxdw_ribbonbar.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { - this.buttonItem9, - this.buttonItem10, - this.buttonItem11, - this.buttonItem12, - this.buttonItem13, - this.buttonItem14}); - this.gxdw_ribbonbar.Location = new System.Drawing.Point(3, 0); - this.gxdw_ribbonbar.Name = "gxdw_ribbonbar"; - this.gxdw_ribbonbar.Size = new System.Drawing.Size(522, 59); - this.gxdw_ribbonbar.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.gxdw_ribbonbar.TabIndex = 0; - this.gxdw_ribbonbar.Text = "ribbonBar5"; - // - // - // - this.gxdw_ribbonbar.TitleStyle.Class = ""; - this.gxdw_ribbonbar.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.gxdw_ribbonbar.TitleStyleMouseOver.Class = ""; - this.gxdw_ribbonbar.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.gxdw_ribbonbar.TitleVisible = false; - // - // buttonItem9 - // - this.buttonItem9.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__76; - this.buttonItem9.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem9.Name = "buttonItem9"; - this.buttonItem9.SubItemsExpandWidth = 14; - this.buttonItem9.Text = "工单管理"; - this.buttonItem9.Click += new System.EventHandler(this.buttonItem9_Click); - // - // buttonItem10 - // - this.buttonItem10.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__69; - this.buttonItem10.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem10.Name = "buttonItem10"; - this.buttonItem10.SubItemsExpandWidth = 14; - this.buttonItem10.Text = "在线任务"; - this.buttonItem10.Click += new System.EventHandler(this.buttonItem10_Click); - // - // buttonItem11 - // - this.buttonItem11.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__72; - this.buttonItem11.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem11.Name = "buttonItem11"; - this.buttonItem11.SubItemsExpandWidth = 14; - this.buttonItem11.Text = "事件管理"; - this.buttonItem11.Click += new System.EventHandler(this.buttonItem11_Click); - // - // buttonItem12 - // - this.buttonItem12.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__34; - this.buttonItem12.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem12.Name = "buttonItem12"; - this.buttonItem12.SubItemsExpandWidth = 14; - this.buttonItem12.Text = "探测仪管理"; - this.buttonItem12.Click += new System.EventHandler(this.buttonItem12_Click); - // - // buttonItem13 - // - this.buttonItem13.Image = global::Cyberpipe.Properties.Resources._24x24icon_13_hover; - this.buttonItem13.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem13.Name = "buttonItem13"; - this.buttonItem13.SubItemsExpandWidth = 14; - this.buttonItem13.Text = "巡检人员维护"; - this.buttonItem13.Click += new System.EventHandler(this.buttonItem13_Click); - // - // buttonItem14 - // - this.buttonItem14.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__56; - this.buttonItem14.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem14.Name = "buttonItem14"; - this.buttonItem14.SubItemsExpandWidth = 14; - this.buttonItem14.Text = "导出施工图"; - this.buttonItem14.Click += new System.EventHandler(this.buttonItem14_Click); - // // ribbonPanel2 // this.ribbonPanel2.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; this.ribbonPanel2.Controls.Add(this.ribbonBar3); this.ribbonPanel2.Dock = System.Windows.Forms.DockStyle.Fill; - this.ribbonPanel2.Location = new System.Drawing.Point(0, 33); + this.ribbonPanel2.Location = new System.Drawing.Point(0, 0); this.ribbonPanel2.Name = "ribbonPanel2"; this.ribbonPanel2.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); - this.ribbonPanel2.Size = new System.Drawing.Size(1328, 62); + this.ribbonPanel2.Size = new System.Drawing.Size(1328, 95); // // // @@ -3527,7 +2948,7 @@ this.buttonItemPasswordReset}); this.ribbonBar3.Location = new System.Drawing.Point(3, 0); this.ribbonBar3.Name = "ribbonBar3"; - this.ribbonBar3.Size = new System.Drawing.Size(551, 59); + this.ribbonBar3.Size = new System.Drawing.Size(551, 92); this.ribbonBar3.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; this.ribbonBar3.TabIndex = 1; // @@ -3567,6 +2988,7 @@ this.btn_resc_info.Name = "btn_resc_info"; this.btn_resc_info.SubItemsExpandWidth = 14; this.btn_resc_info.Text = "资源管理"; + this.btn_resc_info.Visible = false; this.btn_resc_info.Click += new System.EventHandler(this.btn_resc_info_Click); // // btn_role_resc @@ -3605,6 +3027,605 @@ this.buttonItemPasswordReset.Text = "重置密码"; this.buttonItemPasswordReset.Click += new System.EventHandler(this.buttonItemPasswordReset_Click); // + // ribbonPanel6 + // + this.ribbonPanel6.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.ribbonPanel6.Controls.Add(this.ribbonBar6); + this.ribbonPanel6.Dock = System.Windows.Forms.DockStyle.Fill; + this.ribbonPanel6.Location = new System.Drawing.Point(0, 0); + this.ribbonPanel6.Name = "ribbonPanel6"; + this.ribbonPanel6.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); + this.ribbonPanel6.Size = new System.Drawing.Size(1328, 95); + // + // + // + this.ribbonPanel6.Style.Class = ""; + this.ribbonPanel6.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonPanel6.StyleMouseDown.Class = ""; + this.ribbonPanel6.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonPanel6.StyleMouseOver.Class = ""; + this.ribbonPanel6.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonPanel6.TabIndex = 38; + this.ribbonPanel6.Visible = false; + // + // ribbonBar6 + // + this.ribbonBar6.AutoOverflowEnabled = true; + // + // + // + this.ribbonBar6.BackgroundMouseOverStyle.Class = ""; + this.ribbonBar6.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonBar6.BackgroundStyle.Class = ""; + this.ribbonBar6.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar6.ContainerControlProcessDialogKey = true; + this.ribbonBar6.Dock = System.Windows.Forms.DockStyle.Left; + this.ribbonBar6.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { + this.buttonItemSPSZ, + this.buttonItem8, + this.buttonItemLocation, + this.sliderItem2, + this.buttonItemGBJC}); + this.ribbonBar6.Location = new System.Drawing.Point(3, 0); + this.ribbonBar6.Name = "ribbonBar6"; + this.ribbonBar6.Size = new System.Drawing.Size(427, 92); + this.ribbonBar6.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.ribbonBar6.TabIndex = 0; + // + // + // + this.ribbonBar6.TitleStyle.Class = ""; + this.ribbonBar6.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonBar6.TitleStyleMouseOver.Class = ""; + this.ribbonBar6.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar6.TitleVisible = false; + // + // buttonItemSPSZ + // + this.buttonItemSPSZ.Image = ((System.Drawing.Image)(resources.GetObject("buttonItemSPSZ.Image"))); + this.buttonItemSPSZ.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItemSPSZ.Name = "buttonItemSPSZ"; + this.buttonItemSPSZ.SubItemsExpandWidth = 14; + this.buttonItemSPSZ.Text = "双屏设置"; + this.buttonItemSPSZ.Click += new System.EventHandler(this.buttonItemSPSZ_Click); + // + // buttonItem8 + // + this.buttonItem8.Image = ((System.Drawing.Image)(resources.GetObject("buttonItem8.Image"))); + this.buttonItem8.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem8.Name = "buttonItem8"; + this.buttonItem8.SubItemsExpandWidth = 14; + this.buttonItem8.Text = "双屏分析"; + this.buttonItem8.Click += new System.EventHandler(this.buttonItem8_Click); + // + // buttonItemLocation + // + this.buttonItemLocation.Image = ((System.Drawing.Image)(resources.GetObject("buttonItemLocation.Image"))); + this.buttonItemLocation.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItemLocation.Name = "buttonItemLocation"; + this.buttonItemLocation.SubItemsExpandWidth = 14; + this.buttonItemLocation.Text = "快速定位"; + this.buttonItemLocation.Click += new System.EventHandler(this.buttonItemLocation_Click); + // + // sliderItem2 + // + this.sliderItem2.LabelPosition = DevComponents.DotNetBar.eSliderLabelPosition.Top; + this.sliderItem2.LabelWidth = 50; + this.sliderItem2.Name = "sliderItem2"; + this.sliderItem2.Text = "地面透明度"; + this.sliderItem2.TextColor = System.Drawing.Color.Black; + this.sliderItem2.Value = 0; + this.sliderItem2.ValueChanged += new System.EventHandler(this.sliderItem2_ValueChanged); + // + // buttonItemGBJC + // + this.buttonItemGBJC.Image = ((System.Drawing.Image)(resources.GetObject("buttonItemGBJC.Image"))); + this.buttonItemGBJC.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItemGBJC.Name = "buttonItemGBJC"; + this.buttonItemGBJC.SubItemsExpandWidth = 14; + this.buttonItemGBJC.Text = "国标检测"; + this.buttonItemGBJC.Click += new System.EventHandler(this.buttonItemGBJC_Click); + // + // ribbonPanel5 + // + this.ribbonPanel5.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.ribbonPanel5.Controls.Add(this.ribbonBar2); + this.ribbonPanel5.Dock = System.Windows.Forms.DockStyle.Fill; + this.ribbonPanel5.Location = new System.Drawing.Point(0, 33); + this.ribbonPanel5.Name = "ribbonPanel5"; + this.ribbonPanel5.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); + this.ribbonPanel5.Size = new System.Drawing.Size(1328, 62); + // + // + // + this.ribbonPanel5.Style.Class = ""; + this.ribbonPanel5.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonPanel5.StyleMouseDown.Class = ""; + this.ribbonPanel5.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonPanel5.StyleMouseOver.Class = ""; + this.ribbonPanel5.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonPanel5.TabIndex = 37; + this.ribbonPanel5.Visible = false; + // + // ribbonBar2 + // + this.ribbonBar2.AutoOverflowEnabled = true; + // + // + // + this.ribbonBar2.BackgroundMouseOverStyle.Class = ""; + this.ribbonBar2.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonBar2.BackgroundStyle.Class = ""; + this.ribbonBar2.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar2.ContainerControlProcessDialogKey = true; + this.ribbonBar2.Dock = System.Windows.Forms.DockStyle.Left; + this.ribbonBar2.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { + this.buttonItemHX1, + this.buttonItemHX2, + this.buttonItemDCTP, + this.sliderItem3}); + this.ribbonBar2.Location = new System.Drawing.Point(3, 0); + this.ribbonBar2.Name = "ribbonBar2"; + this.ribbonBar2.Size = new System.Drawing.Size(350, 59); + this.ribbonBar2.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.ribbonBar2.TabIndex = 0; + // + // + // + this.ribbonBar2.TitleStyle.Class = ""; + this.ribbonBar2.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonBar2.TitleStyleMouseOver.Class = ""; + this.ribbonBar2.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar2.TitleVisible = false; + // + // buttonItemHX1 + // + this.buttonItemHX1.AutoExpandOnClick = true; + this.buttonItemHX1.Image = ((System.Drawing.Image)(resources.GetObject("buttonItemHX1.Image"))); + this.buttonItemHX1.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItemHX1.Name = "buttonItemHX1"; + this.buttonItemHX1.SubItemsExpandWidth = 14; + this.buttonItemHX1.Text = "导入红线"; + this.buttonItemHX1.Click += new System.EventHandler(this.buttonItemHX1_Click); + // + // buttonItemHX2 + // + this.buttonItemHX2.Image = ((System.Drawing.Image)(resources.GetObject("buttonItemHX2.Image"))); + this.buttonItemHX2.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItemHX2.Name = "buttonItemHX2"; + this.buttonItemHX2.SubItemsExpandWidth = 14; + this.buttonItemHX2.Text = "红线审核"; + this.buttonItemHX2.Click += new System.EventHandler(this.buttonItemHX2_Click); + // + // buttonItemDCTP + // + this.buttonItemDCTP.Image = ((System.Drawing.Image)(resources.GetObject("buttonItemDCTP.Image"))); + this.buttonItemDCTP.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItemDCTP.Name = "buttonItemDCTP"; + this.buttonItemDCTP.SubItemsExpandWidth = 14; + this.buttonItemDCTP.Text = "导出图片"; + this.buttonItemDCTP.Click += new System.EventHandler(this.buttonItemDCTP_Click); + // + // sliderItem3 + // + this.sliderItem3.LabelPosition = DevComponents.DotNetBar.eSliderLabelPosition.Top; + this.sliderItem3.LabelWidth = 50; + this.sliderItem3.Name = "sliderItem3"; + this.sliderItem3.Text = "地面透明度"; + this.sliderItem3.TextColor = System.Drawing.Color.Black; + this.sliderItem3.Value = 0; + this.sliderItem3.ValueChanged += new System.EventHandler(this.sliderItem3_ValueChanged); + // + // ribbonPanel1 + // + this.ribbonPanel1.AutoSize = true; + this.ribbonPanel1.CanvasColor = System.Drawing.Color.Gray; + this.ribbonPanel1.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.ribbonPanel1.Controls.Add(this.ribbonBar21); + this.ribbonPanel1.Dock = System.Windows.Forms.DockStyle.Fill; + this.ribbonPanel1.Location = new System.Drawing.Point(0, 33); + this.ribbonPanel1.Name = "ribbonPanel1"; + this.ribbonPanel1.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); + this.ribbonPanel1.Size = new System.Drawing.Size(1328, 62); + // + // + // + this.ribbonPanel1.Style.Class = ""; + this.ribbonPanel1.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonPanel1.StyleMouseDown.Class = ""; + this.ribbonPanel1.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonPanel1.StyleMouseOver.Class = ""; + this.ribbonPanel1.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonPanel1.TabIndex = 1; + this.ribbonPanel1.Visible = false; + // + // ribbonBar21 + // + this.ribbonBar21.AutoOverflowEnabled = true; + this.ribbonBar21.BackColor = System.Drawing.Color.White; + // + // + // + this.ribbonBar21.BackgroundMouseOverStyle.Class = ""; + this.ribbonBar21.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonBar21.BackgroundStyle.Class = ""; + this.ribbonBar21.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar21.ContainerControlProcessDialogKey = true; + this.ribbonBar21.Dock = System.Windows.Forms.DockStyle.Left; + this.ribbonBar21.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { + this.buttonItem87, + this.buttonItem88, + this.buttonItem27, + this.sliderGroundTransSet1, + this.buttonItem91, + this.buttonItem1, + this.btnlegendSet, + this.buttonItem89, + this.btnOutputJPG}); + this.ribbonBar21.Location = new System.Drawing.Point(3, 0); + this.ribbonBar21.Name = "ribbonBar21"; + this.ribbonBar21.Size = new System.Drawing.Size(649, 59); + this.ribbonBar21.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.ribbonBar21.TabIndex = 2; + this.ribbonBar21.Text = "浏览模式"; + // + // + // + this.ribbonBar21.TitleStyle.Class = ""; + this.ribbonBar21.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonBar21.TitleStyleMouseOver.Class = ""; + this.ribbonBar21.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar21.TitleVisible = false; + // + // buttonItem87 + // + this.buttonItem87.Image = ((System.Drawing.Image)(resources.GetObject("buttonItem87.Image"))); + this.buttonItem87.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem87.Name = "buttonItem87"; + this.buttonItem87.SubItemsExpandWidth = 14; + this.buttonItem87.Text = "地上模式"; + this.buttonItem87.Click += new System.EventHandler(this.buttonItem87_Click); + // + // buttonItem88 + // + this.buttonItem88.Image = ((System.Drawing.Image)(resources.GetObject("buttonItem88.Image"))); + this.buttonItem88.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem88.Name = "buttonItem88"; + this.buttonItem88.SubItemsExpandWidth = 14; + this.buttonItem88.Text = "地下模式"; + this.buttonItem88.Click += new System.EventHandler(this.buttonItem88_Click); + // + // buttonItem27 + // + this.buttonItem27.Image = ((System.Drawing.Image)(resources.GetObject("buttonItem27.Image"))); + this.buttonItem27.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem27.Name = "buttonItem27"; + this.buttonItem27.SubItemsExpandWidth = 14; + this.buttonItem27.Text = "行走模式"; + this.buttonItem27.Click += new System.EventHandler(this.buttonItem27_Click); + // + // buttonItem91 + // + this.buttonItem91.ForeColor = System.Drawing.Color.Black; + this.buttonItem91.Image = ((System.Drawing.Image)(resources.GetObject("buttonItem91.Image"))); + this.buttonItem91.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem91.Name = "buttonItem91"; + this.buttonItem91.SubItemsExpandWidth = 14; + this.buttonItem91.Text = "快速定位"; + this.buttonItem91.Click += new System.EventHandler(this.buttonItem91_Click); + // + // buttonItem1 + // + this.buttonItem1.Image = ((System.Drawing.Image)(resources.GetObject("buttonItem1.Image"))); + this.buttonItem1.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem1.Name = "buttonItem1"; + this.buttonItem1.SubItemsExpandWidth = 14; + this.buttonItem1.Text = "图层管理"; + this.buttonItem1.Click += new System.EventHandler(this.buttonItem1_Click); + // + // btnlegendSet + // + this.btnlegendSet.Image = ((System.Drawing.Image)(resources.GetObject("btnlegendSet.Image"))); + this.btnlegendSet.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.btnlegendSet.Name = "btnlegendSet"; + this.btnlegendSet.SubItemsExpandWidth = 14; + this.btnlegendSet.Text = "图例"; + this.btnlegendSet.Click += new System.EventHandler(this.btnlegendSet_Click); + // + // buttonItem89 + // + this.buttonItem89.Image = ((System.Drawing.Image)(resources.GetObject("buttonItem89.Image"))); + this.buttonItem89.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem89.Name = "buttonItem89"; + this.buttonItem89.SubItemsExpandWidth = 14; + this.buttonItem89.Text = "全屏显示"; + this.buttonItem89.Click += new System.EventHandler(this.buttonItem89_Click); + // + // btnOutputJPG + // + this.btnOutputJPG.Image = ((System.Drawing.Image)(resources.GetObject("btnOutputJPG.Image"))); + this.btnOutputJPG.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.btnOutputJPG.Name = "btnOutputJPG"; + this.btnOutputJPG.SubItemsExpandWidth = 14; + this.btnOutputJPG.Text = "导出图片"; + this.btnOutputJPG.Click += new System.EventHandler(this.btnOutputJPG_Click); + // + // ribbonPanel12 + // + this.ribbonPanel12.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.ribbonPanel12.Controls.Add(this.ribbonBar18); + this.ribbonPanel12.Controls.Add(this.ribbonBar13); + this.ribbonPanel12.Dock = System.Windows.Forms.DockStyle.Fill; + this.ribbonPanel12.Location = new System.Drawing.Point(0, 33); + this.ribbonPanel12.Name = "ribbonPanel12"; + this.ribbonPanel12.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); + this.ribbonPanel12.Size = new System.Drawing.Size(1328, 62); + // + // + // + this.ribbonPanel12.Style.Class = ""; + this.ribbonPanel12.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonPanel12.StyleMouseDown.Class = ""; + this.ribbonPanel12.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonPanel12.StyleMouseOver.Class = ""; + this.ribbonPanel12.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonPanel12.TabIndex = 34; + this.ribbonPanel12.Visible = false; + // + // ribbonBar18 + // + this.ribbonBar18.AutoOverflowEnabled = true; + // + // + // + this.ribbonBar18.BackgroundMouseOverStyle.Class = ""; + this.ribbonBar18.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonBar18.BackgroundStyle.Class = ""; + this.ribbonBar18.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar18.ContainerControlProcessDialogKey = true; + this.ribbonBar18.Dock = System.Windows.Forms.DockStyle.Left; + this.ribbonBar18.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { + this.buttonItem133, + this.buttonItem132}); + this.ribbonBar18.Location = new System.Drawing.Point(508, 0); + this.ribbonBar18.Name = "ribbonBar18"; + this.ribbonBar18.Size = new System.Drawing.Size(75, 59); + this.ribbonBar18.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.ribbonBar18.TabIndex = 1; + // + // + // + this.ribbonBar18.TitleStyle.Class = ""; + this.ribbonBar18.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonBar18.TitleStyleMouseOver.Class = ""; + this.ribbonBar18.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar18.TitleVisible = false; + // + // buttonItem133 + // + this.buttonItem133.Image = ((System.Drawing.Image)(resources.GetObject("buttonItem133.Image"))); + this.buttonItem133.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem133.Name = "buttonItem133"; + this.buttonItem133.SubItemsExpandWidth = 14; + this.buttonItem133.Text = "审核入库"; + this.buttonItem133.Click += new System.EventHandler(this.buttonItem133_Click_1); + // + // buttonItem132 + // + this.buttonItem132.Name = "buttonItem132"; + // + // ribbonBar13 + // + this.ribbonBar13.AutoOverflowEnabled = true; + // + // + // + this.ribbonBar13.BackgroundMouseOverStyle.Class = ""; + this.ribbonBar13.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonBar13.BackgroundStyle.Class = ""; + this.ribbonBar13.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar13.ContainerControlProcessDialogKey = true; + this.ribbonBar13.Dock = System.Windows.Forms.DockStyle.Left; + this.ribbonBar13.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { + this.buttonItem127, + this.buttonItem128, + this.sliderItem1, + this.buttonItem134, + this.buttonItem130, + this.btn_check_history}); + this.ribbonBar13.Location = new System.Drawing.Point(3, 0); + this.ribbonBar13.Name = "ribbonBar13"; + this.ribbonBar13.Size = new System.Drawing.Size(505, 59); + this.ribbonBar13.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.ribbonBar13.TabIndex = 0; + // + // + // + this.ribbonBar13.TitleStyle.Class = ""; + this.ribbonBar13.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonBar13.TitleStyleMouseOver.Class = ""; + this.ribbonBar13.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar13.TitleVisible = false; + // + // buttonItem127 + // + this.buttonItem127.Image = ((System.Drawing.Image)(resources.GetObject("buttonItem127.Image"))); + this.buttonItem127.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem127.Name = "buttonItem127"; + this.buttonItem127.SubItemsExpandWidth = 14; + this.buttonItem127.Text = "打开数据"; + this.buttonItem127.Click += new System.EventHandler(this.buttonItem127_Click_2); + // + // buttonItem128 + // + this.buttonItem128.Image = ((System.Drawing.Image)(resources.GetObject("buttonItem128.Image"))); + this.buttonItem128.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem128.Name = "buttonItem128"; + this.buttonItem128.SubItemsExpandWidth = 14; + this.buttonItem128.Text = "一键审核"; + this.buttonItem128.Click += new System.EventHandler(this.buttonItem128_Click); + // + // sliderItem1 + // + this.sliderItem1.LabelPosition = DevComponents.DotNetBar.eSliderLabelPosition.Top; + this.sliderItem1.LabelWidth = 50; + this.sliderItem1.Name = "sliderItem1"; + this.sliderItem1.Text = "地面透明度"; + this.sliderItem1.TextColor = System.Drawing.Color.Black; + this.sliderItem1.Value = 0; + this.sliderItem1.ValueChanged += new System.EventHandler(this.sliderItem1_ValueChanged); + // + // buttonItem134 + // + this.buttonItem134.Image = ((System.Drawing.Image)(resources.GetObject("buttonItem134.Image"))); + this.buttonItem134.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem134.Name = "buttonItem134"; + this.buttonItem134.SubItemsExpandWidth = 14; + this.buttonItem134.Text = "模拟设计修改"; + this.buttonItem134.Click += new System.EventHandler(this.buttonItem134_Click_1); + // + // buttonItem130 + // + this.buttonItem130.Image = ((System.Drawing.Image)(resources.GetObject("buttonItem130.Image"))); + this.buttonItem130.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem130.Name = "buttonItem130"; + this.buttonItem130.SubItemsExpandWidth = 14; + this.buttonItem130.Text = "导出审核图"; + this.buttonItem130.Click += new System.EventHandler(this.buttonItem130_Click_1); + // + // btn_check_history + // + this.btn_check_history.Image = ((System.Drawing.Image)(resources.GetObject("btn_check_history.Image"))); + this.btn_check_history.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.btn_check_history.Name = "btn_check_history"; + this.btn_check_history.SubItemsExpandWidth = 14; + this.btn_check_history.Text = "审核历史"; + this.btn_check_history.Click += new System.EventHandler(this.btn_check_history_Click); + // + // ribbonPanel4 + // + this.ribbonPanel4.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.ribbonPanel4.Controls.Add(this.ribbonBar1); + this.ribbonPanel4.Dock = System.Windows.Forms.DockStyle.Fill; + this.ribbonPanel4.Location = new System.Drawing.Point(0, 33); + this.ribbonPanel4.Name = "ribbonPanel4"; + this.ribbonPanel4.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); + this.ribbonPanel4.Size = new System.Drawing.Size(1328, 62); + // + // + // + this.ribbonPanel4.Style.Class = ""; + this.ribbonPanel4.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonPanel4.StyleMouseDown.Class = ""; + this.ribbonPanel4.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonPanel4.StyleMouseOver.Class = ""; + this.ribbonPanel4.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonPanel4.TabIndex = 36; + this.ribbonPanel4.Visible = false; + // + // ribbonBar1 + // + this.ribbonBar1.AutoOverflowEnabled = true; + // + // + // + this.ribbonBar1.BackgroundMouseOverStyle.Class = ""; + this.ribbonBar1.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonBar1.BackgroundStyle.Class = ""; + this.ribbonBar1.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar1.ContainerControlProcessDialogKey = true; + this.ribbonBar1.Dock = System.Windows.Forms.DockStyle.Left; + this.ribbonBar1.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { + this.btn_document_info}); + this.ribbonBar1.Location = new System.Drawing.Point(3, 0); + this.ribbonBar1.Name = "ribbonBar1"; + this.ribbonBar1.Size = new System.Drawing.Size(88, 59); + this.ribbonBar1.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.ribbonBar1.TabIndex = 0; + // + // + // + this.ribbonBar1.TitleStyle.Class = ""; + this.ribbonBar1.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonBar1.TitleStyleMouseOver.Class = ""; + this.ribbonBar1.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar1.TitleVisible = false; + // + // btn_document_info + // + this.btn_document_info.Image = ((System.Drawing.Image)(resources.GetObject("btn_document_info.Image"))); + this.btn_document_info.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.btn_document_info.Name = "btn_document_info"; + this.btn_document_info.SubItemsExpandWidth = 14; + this.btn_document_info.Text = "文档管理"; + this.btn_document_info.Click += new System.EventHandler(this.btn_document_info_Click); + // // ribbonTabItem1 // this.ribbonTabItem1.ButtonStyle = DevComponents.DotNetBar.eButtonStyle.ImageAndText; @@ -3673,7 +3694,6 @@ this.ribbonTabItem7.Name = "ribbonTabItem7"; this.ribbonTabItem7.Panel = this.ribbonPanel7; this.ribbonTabItem7.Text = "管线定位"; - this.ribbonTabItem7.MouseDown += new System.Windows.Forms.MouseEventHandler(this.ribbonTabItem7_MouseDown); // // ribbonTabItem5 // @@ -3684,7 +3704,6 @@ this.ribbonTabItem5.Name = "ribbonTabItem5"; this.ribbonTabItem5.Panel = this.ribbonPanel3; this.ribbonTabItem5.Text = "标识器管理"; - this.ribbonTabItem5.MouseDown += new System.Windows.Forms.MouseEventHandler(this.ribbonTabItem5_MouseDown); // // ribbonTabItem2 // @@ -4451,7 +4470,7 @@ this.dataGridViewX2.ReadOnly = true; this.dataGridViewX2.RowHeadersVisible = false; this.dataGridViewX2.RowTemplate.Height = 23; - this.dataGridViewX2.Size = new System.Drawing.Size(31081, 92); + this.dataGridViewX2.Size = new System.Drawing.Size(31378, 92); this.dataGridViewX2.TabIndex = 11; // // dataGridViewTextBoxColumn10 @@ -4545,7 +4564,7 @@ this.dataGridViewX3.ReadOnly = true; this.dataGridViewX3.RowHeadersVisible = false; this.dataGridViewX3.RowTemplate.Height = 23; - this.dataGridViewX3.Size = new System.Drawing.Size(31080, 127); + this.dataGridViewX3.Size = new System.Drawing.Size(31377, 127); this.dataGridViewX3.TabIndex = 5; this.dataGridViewX3.MouseDoubleClick += new System.Windows.Forms.MouseEventHandler(this.dataGridViewX3_MouseDoubleClick); // @@ -5722,7 +5741,8 @@ // pictureBox1 // this.pictureBox1.Dock = System.Windows.Forms.DockStyle.Top; - this.pictureBox1.Image = ((System.Drawing.Image)(resources.GetObject("pictureBox1.Image"))); +// this.pictureBox1.Image = ((System.Drawing.Image)(resources.GetObject("pictureBox1.Image"))); + this.pictureBox1.Image = Image.FromFile(Application.StartupPath + Utility.TitleImagePath); this.pictureBox1.Location = new System.Drawing.Point(0, 0); this.pictureBox1.Margin = new System.Windows.Forms.Padding(0); this.pictureBox1.Name = "pictureBox1"; @@ -5732,18 +5752,6 @@ this.pictureBox1.TabStop = false; this.pictureBox1.Paint += new System.Windows.Forms.PaintEventHandler(this.pictureBox1_Paint); // - // layerTree - // - this.layerTree.CheckBoxes = true; - this.layerTree.ItemHeight = 18; - this.layerTree.Location = new System.Drawing.Point(30, 78); - this.layerTree.Name = "layerTree"; - this.layerTree.Size = new System.Drawing.Size(121, 97); - this.layerTree.TabIndex = 1; - this.layerTree.AfterCheck += new System.Windows.Forms.TreeViewEventHandler(this.layerTree_AfterCheck); - this.layerTree.NodeMouseClick += new System.Windows.Forms.TreeNodeMouseClickEventHandler(this.layerTree_NodeMouseClick); - this.layerTree.NodeMouseDoubleClick += new System.Windows.Forms.TreeNodeMouseClickEventHandler(this.layerTree_NodeMouseDoubleClick); - // // MainFrm // this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Inherit; @@ -5770,7 +5778,8 @@ this.KeyPreview = true; this.Name = "MainFrm"; this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen; - this.Text = "智慧太湖新城管网规划分析系统6.0"; +// this.Text = "智慧太湖新城管网规划分析系统6.0"; + this.Text = Utility.SysnameVersion; this.WindowState = System.Windows.Forms.FormWindowState.Maximized; this.FormClosing += new System.Windows.Forms.FormClosingEventHandler(this.MainFrm_FormClosing); this.Load += new System.EventHandler(this.MainFrm_Load); @@ -5787,15 +5796,15 @@ this.contextMenuStripDeleteLayerNode.ResumeLayout(false); this.ribbonControl1.ResumeLayout(false); this.ribbonControl1.PerformLayout(); + this.ribbonPanel3.ResumeLayout(false); + this.ribbonPanel7.ResumeLayout(false); + this.ribbonPanel15.ResumeLayout(false); + this.ribbonPanel2.ResumeLayout(false); this.ribbonPanel6.ResumeLayout(false); this.ribbonPanel5.ResumeLayout(false); this.ribbonPanel1.ResumeLayout(false); this.ribbonPanel12.ResumeLayout(false); this.ribbonPanel4.ResumeLayout(false); - this.ribbonPanel15.ResumeLayout(false); - this.ribbonPanel3.ResumeLayout(false); - this.ribbonPanel7.ResumeLayout(false); - this.ribbonPanel2.ResumeLayout(false); this.panelOfTable.ResumeLayout(false); this.panelOfTable.PerformLayout(); ((System.ComponentModel.ISupportInitialize)(this.dataGridViewX1)).EndInit(); @@ -5955,6 +5964,7 @@ private RibbonTabItem ribbonTabItem11; private ButtonItem buttonItem130; private RibbonBar ribbonBar18; + private ButtonItem buttonItem132; private SliderItem sliderItem1; private ButtonItem buttonItem133; private ButtonItem buttonItem134; diff --git a/MainFrm.resx b/MainFrm.resx index 9f9bba4..ce490c1 100644 --- a/MainFrm.resx +++ b/MainFrm.resx @@ -351,6 +351,146 @@ 766, 54 + + + iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 + YQUAAAAZdEVYdFNvZnR3YXJlAEFkb2JlIEltYWdlUmVhZHlxyWU8AAADZmlUWHRYTUw6Y29tLmFkb2Jl + LnhtcAAAAAAAPD94cGFja2V0IGJlZ2luPSLvu78iIGlkPSJXNU0wTXBDZWhpSHpyZVN6TlRjemtjOWQi + Pz4gPHg6eG1wbWV0YSB4bWxuczp4PSJhZG9iZTpuczptZXRhLyIgeDp4bXB0az0iQWRvYmUgWE1QIENv + cmUgNS4zLWMwMTEgNjYuMTQ1NjYxLCAyMDEyLzAyLzA2LTE0OjU2OjI3ICAgICAgICAiPiA8cmRmOlJE + RiB4bWxuczpyZGY9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkvMDIvMjItcmRmLXN5bnRheC1ucyMiPiA8 + cmRmOkRlc2NyaXB0aW9uIHJkZjphYm91dD0iIiB4bWxuczp4bXBNTT0iaHR0cDovL25zLmFkb2JlLmNv + bS94YXAvMS4wL21tLyIgeG1sbnM6c3RSZWY9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlw + ZS9SZXNvdXJjZVJlZiMiIHhtbG5zOnhtcD0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wLyIgeG1w + TU06T3JpZ2luYWxEb2N1bWVudElEPSJ4bXAuZGlkOjYzQTM5NEY4Mjg0OUU0MTE5NDBEQTc4ODZEQzk5 + N0NGIiB4bXBNTTpEb2N1bWVudElEPSJ4bXAuZGlkOjEwQ0IxNzBBNEM1QzExRTRBNkNGQzRBMjhDQzI0 + MkY4IiB4bXBNTTpJbnN0YW5jZUlEPSJ4bXAuaWlkOjEwQ0IxNzA5NEM1QzExRTRBNkNGQzRBMjhDQzI0 + MkY4IiB4bXA6Q3JlYXRvclRvb2w9IkFkb2JlIFBob3Rvc2hvcCBDUzYgKFdpbmRvd3MpIj4gPHhtcE1N + OkRlcml2ZWRGcm9tIHN0UmVmOmluc3RhbmNlSUQ9InhtcC5paWQ6NTEzMDNDMjA1QjRDRTQxMTg4NERE + MUVBOEQ4QTgyNTUiIHN0UmVmOmRvY3VtZW50SUQ9InhtcC5kaWQ6NjNBMzk0RjgyODQ5RTQxMTk0MERB + Nzg4NkRDOTk3Q0YiLz4gPC9yZGY6RGVzY3JpcHRpb24+IDwvcmRmOlJERj4gPC94OnhtcG1ldGE+IDw/ + eHBhY2tldCBlbmQ9InIiPz43wa2/AAAFaUlEQVRIS6WUC0xTVxzGKy0UkSmlFGjBFilSkNpSaAWRh63y + sIiAArKs4spLRLQoiEJlSMGoMCc6CBOnYHzMOHUqqOhEHOqCbjNu6kCd6KYje5mZ6KbObd/OuVL3cEzj + /skv997/+b7v39PTW9aj3/BM+OKxPEIZoW/gyrOuPbP+GvRPSNBQQqXYLwSW1etw7cYt5kqfaZ+uD8QM + Xg8f/f4UxGhHMHv4qlG6vAb9394G6T+BPpdV1oCuUx3VD8Q9XT8//PUJRMghlLhLg1C41IK+r/pB+oNC + 16mO6qmP+gdi/6y793+hwTYEk9uoQOSaStHzxQ2Q/nND9XMKy0D9NIfmDcSzaLhI4KXE7LwinLtwGXfu + PXhhqJ/m0DyS62EdUGWpqcf3P97DD3d++t/QnKraBjpghXWAiC+WN0ZNScOe1mP45vbdF2ZvWwdoDs/D + b6ejs6ecxHPoAG/l+Fhkzy+FyCcY0YkG7D/yAW5+d+e5oXrqo36aQ/McnNyjyAAuHWA05pfgzPlehhyT + mflV6FOMaDt2Ctf7bw8KXac6qqc+a4Zx3hLwRLJCZgcJjcPIEPkyIZmeX1SB7vOX0dn9KQy5jw8r8eVc + HOrsxidXP0d9hxlzd4QgeYMzEt7kQVvOR0pFFNpOHmd81E9znIS+dSTc1foVGWfNKUZjyy6Ex6SQl0cD + 09IVxHAFh0+cReqr+QjK8ERqEw+VHWOwoycSR/v1OHwzDlsvhcNCeqkbedAYxQiPm87kZOQVw0nkW0QG + 2DFnIA+JRm3DFpzr/RKNW3ZDE5UAsX8ocizZiFs7DEUHvPFunw4Hb05B+y09jn49lYHe0x5doxqqLVlf + DJrnyB+pIQNs6QAhf6R8tZu3CqpwPdZu2I6PLl3HwnV5iHv9JVSeUOKdqzq81xeDvddiYG73R0aLEIZm + IRa1jUbjxQnYRHa17YqW0VJPwHT3LocRbirrDiymspXo6L6AgiXV8JSNQ2i6GpNWOqK4U4n1n0Vge68W + 9ecmIKnBBSqDCIp4P2RWGDB/QxqS6l1QcToIld3BqDobgsXEQ73+Se5HrGcgdJEokGzIx66DXXi7dRvC + yx2Q2RqApR+GoPbjCag8pUZ6sxjqWRKEldljRr07ZjaKmHt5qpBZKzkeiIJ2BbIPKmA8MIbJUC/ghrM0 + RfYsDtdhqJNIVulK/ku0BQokbfZGZrsKBR3BmEsMOfvl0FY7o7ypDPo1brCcGc+QUCdExabXEFsjQO4B + ObL2BSBlqx8SWwibvBE0334nK3Ael+yEbIW81DZszlhZ2oieuAYvpO5VIHGzP9J2+CN9pz/CzDwExMox + eZUbFnZpkEc+gLZagJjMWOiqXZDVqmC0+kZf6Nb4IHKFCPIsu92sgCw7BlJswjBJLCdenmuPyFUS6Gp9 + oG/yRdJWGSKqhYjKDgLRImK5ACGlzsy9d/zwXn2DBMZDSkZLPaHlnpBncyGO5kxj+Rps/wYdJE2xzfOb + zcU4sye0b0gRu3E0Ypt8ELTICRFGNcShUgjHuZyWxNu2096sdiXS9o1ltNQjyyDhes4SkuXEGpXC+Ve8 + kjlzpDPtoCkVQrdOihgyIHmXP6LryGEX86Ba6ISJNR7IeF+JV8gAfbOM0XoTj8dktpmEOxM4rJHTBscz + njNNnMiBagEfU98ajRnbZMg7GojCk2oGU1cw5nUGw7BHAZWJD6oVhLFzSDCPCacljGP/J7xAm6Hu0ew6 + STIXkcvckN7ig8XHVCjvUiNvdwAmW0Twms6FayS7meM4REoihxPoeT4u10nsZ0LKhhdsIxZEsVcLtOyL + pHffVcd+IJjI7uGHsRscJEPURMMn2FMtNTwuFusPrjFl48ji7nIAAAAASUVORK5CYII= + + + + + iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 + YQUAAAAZdEVYdFNvZnR3YXJlAEFkb2JlIEltYWdlUmVhZHlxyWU8AAADZmlUWHRYTUw6Y29tLmFkb2Jl + LnhtcAAAAAAAPD94cGFja2V0IGJlZ2luPSLvu78iIGlkPSJXNU0wTXBDZWhpSHpyZVN6TlRjemtjOWQi + Pz4gPHg6eG1wbWV0YSB4bWxuczp4PSJhZG9iZTpuczptZXRhLyIgeDp4bXB0az0iQWRvYmUgWE1QIENv + cmUgNS4zLWMwMTEgNjYuMTQ1NjYxLCAyMDEyLzAyLzA2LTE0OjU2OjI3ICAgICAgICAiPiA8cmRmOlJE + RiB4bWxuczpyZGY9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkvMDIvMjItcmRmLXN5bnRheC1ucyMiPiA8 + cmRmOkRlc2NyaXB0aW9uIHJkZjphYm91dD0iIiB4bWxuczp4bXBNTT0iaHR0cDovL25zLmFkb2JlLmNv + bS94YXAvMS4wL21tLyIgeG1sbnM6c3RSZWY9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlw + ZS9SZXNvdXJjZVJlZiMiIHhtbG5zOnhtcD0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wLyIgeG1w + TU06T3JpZ2luYWxEb2N1bWVudElEPSJ4bXAuZGlkOjYzQTM5NEY4Mjg0OUU0MTE5NDBEQTc4ODZEQzk5 + N0NGIiB4bXBNTTpEb2N1bWVudElEPSJ4bXAuZGlkOkUyMTg3NjEyNDlEODExRTQ4NjNGQjM2Mzk1QkNB + RkQwIiB4bXBNTTpJbnN0YW5jZUlEPSJ4bXAuaWlkOkUyMTg3NjExNDlEODExRTQ4NjNGQjM2Mzk1QkNB + RkQwIiB4bXA6Q3JlYXRvclRvb2w9IkFkb2JlIFBob3Rvc2hvcCBDUzYgKFdpbmRvd3MpIj4gPHhtcE1N + OkRlcml2ZWRGcm9tIHN0UmVmOmluc3RhbmNlSUQ9InhtcC5paWQ6NkJCNTE0NDlEODQ5RTQxMUE0QzNB + MjdEOTJBQzc3QkMiIHN0UmVmOmRvY3VtZW50SUQ9InhtcC5kaWQ6NjNBMzk0RjgyODQ5RTQxMTk0MERB + Nzg4NkRDOTk3Q0YiLz4gPC9yZGY6RGVzY3JpcHRpb24+IDwvcmRmOlJERj4gPC94OnhtcG1ldGE+IDw/ + eHBhY2tldCBlbmQ9InIiPz5e5MstAAADiUlEQVRIS+2UW0yTdxjGcePwtYyVVpAUCi1tv9ImrVbxhAei + kjGphAgFT4jzEJ0gGuJhDk0sml0sglmWmC1hqHNKWwI4srgNh3phpjg1O1yIN5DMbFHQZUu42O76+D4f + 3Fl6Z7ILn+SXvH3f533++X/98iUBeKW81v9Uwx1G1+1240EhfKfdeE/4U3qTAqaZZO/2aeN9IXLrY+Ph + wVOZHll9YyohgYZOGS4JsYdXVDy+NQ8Tvy3BP6OlmPyjDP9OBDRYs8cZPfRy5/uQISIRqcIsLSye+j7I + wN+PluOvhyWY+NmL8fsOjP9kxdN7BRh/YJHfFjy5m48nd4ThQjy968bEgwV49usicFciTEKKFhZPXXv1 + eHxtLsYGPBjttwsWjF0xY+ybOfj9uylYs8cZPfQS7kpEnqDTwuLp9GYlfKZeifUfzcb1j/Iw/IkNv3Q6 + MfKVC6O9bg3W7HFGD73cORlMG5AIizDzAaVtunD5ESXWfNSEY/tNCO00oG1zOkJBBSeqUjVYh6R3Qmat + zSY0Hjah7IASW7hPuSoRvIGihcVTSauCppvFODRUjJZvPWgaKMTuXgt2RHOxLTwHDd3EjPfCudgesWJX + jxM7eryo7/Ni8SGFj8gp6LWwePLvS0Og043A5y5UdtkQOJeLivM5ePf8bJSfM04zG2u7chDoysW6Thsq + zqpY0+GAvymNB/gEgxYWT64tKdGihpSYv8WEpSEzVp0pwDuf2SVQReCiS4M1e5zRQy937NXJ1yRirjDz + AVmVJyNZa9+PObauh7ptKdR6FY6N2SisTYe1OlmDNXtqvRNqwxLYt1TCVLY1ZijZOSQRbuEtLSyeTOXH + sfLDH1EauoFFx6/Cd6Qf7pYI1ObLsO+9iMLdF+DccwEuqd2Nl+Br6sbCxiiKd/XBuPogH1HiAzJXHMC8 + YA98td1wb4rCuaEH1roo8oMR5JGaMPIFa10Ejtowiuouw1vzJTwVXyBz+X4ekPgRZfgbohkLtsfMy47B + tqYdakUnPFUM6YUv+LUGa/Y4o8e8rBXcSffWDkpE4j9ZpEvNmb9KsZV16BzrBnVq1YjeVf1MX1Tzn74o + iCmkdq1/LrNHOkfgB6Vg9afJRrVOdv2ClRkMmklvCnyPs4V8ge81v5RegddnCGHNHmf00JslcJcZCcWv + IU1pAhcyhLcFXj1zGtbscUYPvdyZ+Uv6Wi8rKekFBjoX2627by8AAAAASUVORK5CYII= + + + + + iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 + YQUAAAAZdEVYdFNvZnR3YXJlAEFkb2JlIEltYWdlUmVhZHlxyWU8AAADZmlUWHRYTUw6Y29tLmFkb2Jl + LnhtcAAAAAAAPD94cGFja2V0IGJlZ2luPSLvu78iIGlkPSJXNU0wTXBDZWhpSHpyZVN6TlRjemtjOWQi + Pz4gPHg6eG1wbWV0YSB4bWxuczp4PSJhZG9iZTpuczptZXRhLyIgeDp4bXB0az0iQWRvYmUgWE1QIENv + cmUgNS4zLWMwMTEgNjYuMTQ1NjYxLCAyMDEyLzAyLzA2LTE0OjU2OjI3ICAgICAgICAiPiA8cmRmOlJE + RiB4bWxuczpyZGY9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkvMDIvMjItcmRmLXN5bnRheC1ucyMiPiA8 + cmRmOkRlc2NyaXB0aW9uIHJkZjphYm91dD0iIiB4bWxuczp4bXBNTT0iaHR0cDovL25zLmFkb2JlLmNv + bS94YXAvMS4wL21tLyIgeG1sbnM6c3RSZWY9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlw + ZS9SZXNvdXJjZVJlZiMiIHhtbG5zOnhtcD0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wLyIgeG1w + TU06T3JpZ2luYWxEb2N1bWVudElEPSJ4bXAuZGlkOjYzQTM5NEY4Mjg0OUU0MTE5NDBEQTc4ODZEQzk5 + N0NGIiB4bXBNTTpEb2N1bWVudElEPSJ4bXAuZGlkOkE2Q0VGMDE2NDlEQTExRTQ4NTlCQTI3NTMyOEY5 + NEU2IiB4bXBNTTpJbnN0YW5jZUlEPSJ4bXAuaWlkOkE2Q0VGMDE1NDlEQTExRTQ4NTlCQTI3NTMyOEY5 + NEU2IiB4bXA6Q3JlYXRvclRvb2w9IkFkb2JlIFBob3Rvc2hvcCBDUzYgKFdpbmRvd3MpIj4gPHhtcE1N + OkRlcml2ZWRGcm9tIHN0UmVmOmluc3RhbmNlSUQ9InhtcC5paWQ6NjA1MjM3NzFEOTQ5RTQxMUE0QzNB + MjdEOTJBQzc3QkMiIHN0UmVmOmRvY3VtZW50SUQ9InhtcC5kaWQ6NjNBMzk0RjgyODQ5RTQxMTk0MERB + Nzg4NkRDOTk3Q0YiLz4gPC9yZGY6RGVzY3JpcHRpb24+IDwvcmRmOlJERj4gPC94OnhtcG1ldGE+IDw/ + eHBhY2tldCBlbmQ9InIiPz6UH16BAAABrElEQVRIS63N70tTURzH8fsnKSGCCEIQCBKISMq2iILCgQOL + JUxQAoVKdMGQuwgWFepsMGjFZCMuorsIJV4WFatpvzdr1ZAFsaIHn8559v1eDsI91wevJ/ee7/tjbMRH + fAFwJOWRF6oopTzyQhWlVEdBwRbgUhICAnuvilKGtXDGzW6WV/CvbjE/xTfxr+R6q4xSxtP5YTf8rVn4 + s5dG+809Rv5zvVVGKaNwfYgyBfhksoH83CCF9seiL7LBBnLXTlP4/W4dza0ZLS0nCdlgA9npAQq/qk/Q + sKa0NJ8nIBtsIBPrp9CqPMJBYVLLj+04ZIMNrF49ReHwVRafH1/R8m3zJmSDDdy/fJJC88Ua3mcjWurW + LGSDDaQifRS+O8uopsNaPhVnIBts4E64l0Jj5y4qDy5q+ZCPQTbYgHmph8LXZ0m8TJ3Xsp+LQjbYQOJC + N4XadgLl22e1vM1OQDbYwK1zXRS+lBbhmEHsLgU8kTeVh+OQDTawEDpB2U4mitfpMS22GYJssIH5QCcV + FGwBmuRtkA3cGO3whcZUlEdeqKKU8sgLVZRSfjw+MP4DJ2GPpDR9OIsAAAAASUVORK5CYII= + + + + + iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 + YQUAAAAZdEVYdFNvZnR3YXJlAEFkb2JlIEltYWdlUmVhZHlxyWU8AAADZmlUWHRYTUw6Y29tLmFkb2Jl + LnhtcAAAAAAAPD94cGFja2V0IGJlZ2luPSLvu78iIGlkPSJXNU0wTXBDZWhpSHpyZVN6TlRjemtjOWQi + Pz4gPHg6eG1wbWV0YSB4bWxuczp4PSJhZG9iZTpuczptZXRhLyIgeDp4bXB0az0iQWRvYmUgWE1QIENv + cmUgNS4zLWMwMTEgNjYuMTQ1NjYxLCAyMDEyLzAyLzA2LTE0OjU2OjI3ICAgICAgICAiPiA8cmRmOlJE + RiB4bWxuczpyZGY9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkvMDIvMjItcmRmLXN5bnRheC1ucyMiPiA8 + cmRmOkRlc2NyaXB0aW9uIHJkZjphYm91dD0iIiB4bWxuczp4bXBNTT0iaHR0cDovL25zLmFkb2JlLmNv + bS94YXAvMS4wL21tLyIgeG1sbnM6c3RSZWY9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlw + ZS9SZXNvdXJjZVJlZiMiIHhtbG5zOnhtcD0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wLyIgeG1w + TU06T3JpZ2luYWxEb2N1bWVudElEPSJ4bXAuZGlkOjYzQTM5NEY4Mjg0OUU0MTE5NDBEQTc4ODZEQzk5 + N0NGIiB4bXBNTTpEb2N1bWVudElEPSJ4bXAuZGlkOjJGRTU5OEQ1NDlEQjExRTRBRUVDOTkyMjQ5NzEw + REUwIiB4bXBNTTpJbnN0YW5jZUlEPSJ4bXAuaWlkOjJGRTU5OEQ0NDlEQjExRTRBRUVDOTkyMjQ5NzEw + REUwIiB4bXA6Q3JlYXRvclRvb2w9IkFkb2JlIFBob3Rvc2hvcCBDUzYgKFdpbmRvd3MpIj4gPHhtcE1N + OkRlcml2ZWRGcm9tIHN0UmVmOmluc3RhbmNlSUQ9InhtcC5paWQ6MTY0MkI1RjlEQTQ5RTQxMUE0QzNB + MjdEOTJBQzc3QkMiIHN0UmVmOmRvY3VtZW50SUQ9InhtcC5kaWQ6NjNBMzk0RjgyODQ5RTQxMTk0MERB + Nzg4NkRDOTk3Q0YiLz4gPC9yZGY6RGVzY3JpcHRpb24+IDwvcmRmOlJERj4gPC94OnhtcG1ldGE+IDw/ + eHBhY2tldCBlbmQ9InIiPz6B5sF9AAACe0lEQVRIS7WVb2jMcRzHL7UHanF/Mts5prE/1li3kAfu5Ak7 + 5IHNobBkSC2UIuGJkrrSWRvTmHQWK8U1T8jqUtYwkZpaGjV/Js6to5YwfXze39+fu/v23f36hXe9us+f + 7/v9rd/dr3MQ0X/F4Zm3+K9QhWajNNlBFZqN0mQHS6lMdrCUyqSgimllUsy4XmOmp+QRDllQWbygjjq6 + uimZStOX8a+ixox3pXrM1JLCDAqYJmY7c669M0bff07mcLbtEl9QE8k6V6BH5ooXMsHZZX7ae+AY7W45 + SrPm19LbsSR9m/iRA2bYGefggVePzUgKBzeu9sQpmZ4QcG/WMtk7eLjv0WMz0kOz+TX6MUXvP6cFeNbD + bz6YvQFm2Bk9PPByZO6jksLB5KvRTzTyLikIrG2ktsvXzd4g2hGjYP1ms4eHvb850qkl65LCQW/ntVs0 + 9HpMcPx0K1X4V1Ff/3NzhnphbVDsjBk8Lm/VE44s0ZJ1KS4Ie8uXUvPBE7Tn0ElCzTMqrV5BO/cfEaDG + TD5X6PFFONLygsTF7jj1vxihyPkYNTS1iFrFxm37KHIhJmp43L7qZxzp0pJ1SeHhQGgLJQaH6fb9R1QX + 2EB3Ek9FryLe95j8K9eLT/TB0FZcskOP1iRdkIh23aR7Ay9pzaZddKY9Jup8nIpeoXXhZlHD655b85Bj + p2npLOmCML+dD/iTZhaX3+UvbRB1PpzeygFnSUUvatecRUMzisoOc+x0LZ3FixxYhQyK1cxyZhkTYhqY + RgnM6hmcwVl4ljDI0KS4AC+Kmyli8Jv2MF7GNwXY4QzOwgNv5mWTL7CLpVQmO1hKZbKDpVR/1P8OcvwB + lh7gOXXZq9sAAAAASUVORK5CYII= + + iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 @@ -598,147 +738,7 @@ 1BGxz38BvCwLsyQ3iHgAAAAASUVORK5CYII= - - - iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAZdEVYdFNvZnR3YXJlAEFkb2JlIEltYWdlUmVhZHlxyWU8AAADZmlUWHRYTUw6Y29tLmFkb2Jl - LnhtcAAAAAAAPD94cGFja2V0IGJlZ2luPSLvu78iIGlkPSJXNU0wTXBDZWhpSHpyZVN6TlRjemtjOWQi - Pz4gPHg6eG1wbWV0YSB4bWxuczp4PSJhZG9iZTpuczptZXRhLyIgeDp4bXB0az0iQWRvYmUgWE1QIENv - cmUgNS4zLWMwMTEgNjYuMTQ1NjYxLCAyMDEyLzAyLzA2LTE0OjU2OjI3ICAgICAgICAiPiA8cmRmOlJE - RiB4bWxuczpyZGY9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkvMDIvMjItcmRmLXN5bnRheC1ucyMiPiA8 - cmRmOkRlc2NyaXB0aW9uIHJkZjphYm91dD0iIiB4bWxuczp4bXBNTT0iaHR0cDovL25zLmFkb2JlLmNv - bS94YXAvMS4wL21tLyIgeG1sbnM6c3RSZWY9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlw - ZS9SZXNvdXJjZVJlZiMiIHhtbG5zOnhtcD0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wLyIgeG1w - TU06T3JpZ2luYWxEb2N1bWVudElEPSJ4bXAuZGlkOjYzQTM5NEY4Mjg0OUU0MTE5NDBEQTc4ODZEQzk5 - N0NGIiB4bXBNTTpEb2N1bWVudElEPSJ4bXAuZGlkOjEwQ0IxNzBBNEM1QzExRTRBNkNGQzRBMjhDQzI0 - MkY4IiB4bXBNTTpJbnN0YW5jZUlEPSJ4bXAuaWlkOjEwQ0IxNzA5NEM1QzExRTRBNkNGQzRBMjhDQzI0 - MkY4IiB4bXA6Q3JlYXRvclRvb2w9IkFkb2JlIFBob3Rvc2hvcCBDUzYgKFdpbmRvd3MpIj4gPHhtcE1N - OkRlcml2ZWRGcm9tIHN0UmVmOmluc3RhbmNlSUQ9InhtcC5paWQ6NTEzMDNDMjA1QjRDRTQxMTg4NERE - MUVBOEQ4QTgyNTUiIHN0UmVmOmRvY3VtZW50SUQ9InhtcC5kaWQ6NjNBMzk0RjgyODQ5RTQxMTk0MERB - Nzg4NkRDOTk3Q0YiLz4gPC9yZGY6RGVzY3JpcHRpb24+IDwvcmRmOlJERj4gPC94OnhtcG1ldGE+IDw/ - eHBhY2tldCBlbmQ9InIiPz43wa2/AAAFaUlEQVRIS6WUC0xTVxzGKy0UkSmlFGjBFilSkNpSaAWRh63y - sIiAArKs4spLRLQoiEJlSMGoMCc6CBOnYHzMOHUqqOhEHOqCbjNu6kCd6KYje5mZ6KbObd/OuVL3cEzj - /skv997/+b7v39PTW9aj3/BM+OKxPEIZoW/gyrOuPbP+GvRPSNBQQqXYLwSW1etw7cYt5kqfaZ+uD8QM - Xg8f/f4UxGhHMHv4qlG6vAb9394G6T+BPpdV1oCuUx3VD8Q9XT8//PUJRMghlLhLg1C41IK+r/pB+oNC - 16mO6qmP+gdi/6y793+hwTYEk9uoQOSaStHzxQ2Q/nND9XMKy0D9NIfmDcSzaLhI4KXE7LwinLtwGXfu - PXhhqJ/m0DyS62EdUGWpqcf3P97DD3d++t/QnKraBjpghXWAiC+WN0ZNScOe1mP45vbdF2ZvWwdoDs/D - b6ejs6ecxHPoAG/l+Fhkzy+FyCcY0YkG7D/yAW5+d+e5oXrqo36aQ/McnNyjyAAuHWA05pfgzPlehhyT - mflV6FOMaDt2Ctf7bw8KXac6qqc+a4Zx3hLwRLJCZgcJjcPIEPkyIZmeX1SB7vOX0dn9KQy5jw8r8eVc - HOrsxidXP0d9hxlzd4QgeYMzEt7kQVvOR0pFFNpOHmd81E9znIS+dSTc1foVGWfNKUZjyy6Ex6SQl0cD - 09IVxHAFh0+cReqr+QjK8ERqEw+VHWOwoycSR/v1OHwzDlsvhcNCeqkbedAYxQiPm87kZOQVw0nkW0QG - 2DFnIA+JRm3DFpzr/RKNW3ZDE5UAsX8ocizZiFs7DEUHvPFunw4Hb05B+y09jn49lYHe0x5doxqqLVlf - DJrnyB+pIQNs6QAhf6R8tZu3CqpwPdZu2I6PLl3HwnV5iHv9JVSeUOKdqzq81xeDvddiYG73R0aLEIZm - IRa1jUbjxQnYRHa17YqW0VJPwHT3LocRbirrDiymspXo6L6AgiXV8JSNQ2i6GpNWOqK4U4n1n0Vge68W - 9ecmIKnBBSqDCIp4P2RWGDB/QxqS6l1QcToIld3BqDobgsXEQ73+Se5HrGcgdJEokGzIx66DXXi7dRvC - yx2Q2RqApR+GoPbjCag8pUZ6sxjqWRKEldljRr07ZjaKmHt5qpBZKzkeiIJ2BbIPKmA8MIbJUC/ghrM0 - RfYsDtdhqJNIVulK/ku0BQokbfZGZrsKBR3BmEsMOfvl0FY7o7ypDPo1brCcGc+QUCdExabXEFsjQO4B - ObL2BSBlqx8SWwibvBE0334nK3Ael+yEbIW81DZszlhZ2oieuAYvpO5VIHGzP9J2+CN9pz/CzDwExMox - eZUbFnZpkEc+gLZagJjMWOiqXZDVqmC0+kZf6Nb4IHKFCPIsu92sgCw7BlJswjBJLCdenmuPyFUS6Gp9 - oG/yRdJWGSKqhYjKDgLRImK5ACGlzsy9d/zwXn2DBMZDSkZLPaHlnpBncyGO5kxj+Rps/wYdJE2xzfOb - zcU4sye0b0gRu3E0Ypt8ELTICRFGNcShUgjHuZyWxNu2096sdiXS9o1ltNQjyyDhes4SkuXEGpXC+Ve8 - kjlzpDPtoCkVQrdOihgyIHmXP6LryGEX86Ba6ISJNR7IeF+JV8gAfbOM0XoTj8dktpmEOxM4rJHTBscz - njNNnMiBagEfU98ajRnbZMg7GojCk2oGU1cw5nUGw7BHAZWJD6oVhLFzSDCPCacljGP/J7xAm6Hu0ew6 - STIXkcvckN7ig8XHVCjvUiNvdwAmW0Twms6FayS7meM4REoihxPoeT4u10nsZ0LKhhdsIxZEsVcLtOyL - pHffVcd+IJjI7uGHsRscJEPURMMn2FMtNTwuFusPrjFl48ji7nIAAAAASUVORK5CYII= - - - - - iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAZdEVYdFNvZnR3YXJlAEFkb2JlIEltYWdlUmVhZHlxyWU8AAADZmlUWHRYTUw6Y29tLmFkb2Jl - LnhtcAAAAAAAPD94cGFja2V0IGJlZ2luPSLvu78iIGlkPSJXNU0wTXBDZWhpSHpyZVN6TlRjemtjOWQi - Pz4gPHg6eG1wbWV0YSB4bWxuczp4PSJhZG9iZTpuczptZXRhLyIgeDp4bXB0az0iQWRvYmUgWE1QIENv - cmUgNS4zLWMwMTEgNjYuMTQ1NjYxLCAyMDEyLzAyLzA2LTE0OjU2OjI3ICAgICAgICAiPiA8cmRmOlJE - RiB4bWxuczpyZGY9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkvMDIvMjItcmRmLXN5bnRheC1ucyMiPiA8 - cmRmOkRlc2NyaXB0aW9uIHJkZjphYm91dD0iIiB4bWxuczp4bXBNTT0iaHR0cDovL25zLmFkb2JlLmNv - bS94YXAvMS4wL21tLyIgeG1sbnM6c3RSZWY9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlw - ZS9SZXNvdXJjZVJlZiMiIHhtbG5zOnhtcD0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wLyIgeG1w - TU06T3JpZ2luYWxEb2N1bWVudElEPSJ4bXAuZGlkOjYzQTM5NEY4Mjg0OUU0MTE5NDBEQTc4ODZEQzk5 - N0NGIiB4bXBNTTpEb2N1bWVudElEPSJ4bXAuZGlkOkUyMTg3NjEyNDlEODExRTQ4NjNGQjM2Mzk1QkNB - RkQwIiB4bXBNTTpJbnN0YW5jZUlEPSJ4bXAuaWlkOkUyMTg3NjExNDlEODExRTQ4NjNGQjM2Mzk1QkNB - RkQwIiB4bXA6Q3JlYXRvclRvb2w9IkFkb2JlIFBob3Rvc2hvcCBDUzYgKFdpbmRvd3MpIj4gPHhtcE1N - OkRlcml2ZWRGcm9tIHN0UmVmOmluc3RhbmNlSUQ9InhtcC5paWQ6NkJCNTE0NDlEODQ5RTQxMUE0QzNB - MjdEOTJBQzc3QkMiIHN0UmVmOmRvY3VtZW50SUQ9InhtcC5kaWQ6NjNBMzk0RjgyODQ5RTQxMTk0MERB - Nzg4NkRDOTk3Q0YiLz4gPC9yZGY6RGVzY3JpcHRpb24+IDwvcmRmOlJERj4gPC94OnhtcG1ldGE+IDw/ - eHBhY2tldCBlbmQ9InIiPz5e5MstAAADiUlEQVRIS+2UW0yTdxjGcePwtYyVVpAUCi1tv9ImrVbxhAei - kjGphAgFT4jzEJ0gGuJhDk0sml0sglmWmC1hqHNKWwI4srgNh3phpjg1O1yIN5DMbFHQZUu42O76+D4f - 3Fl6Z7ILn+SXvH3f533++X/98iUBeKW81v9Uwx1G1+1240EhfKfdeE/4U3qTAqaZZO/2aeN9IXLrY+Ph - wVOZHll9YyohgYZOGS4JsYdXVDy+NQ8Tvy3BP6OlmPyjDP9OBDRYs8cZPfRy5/uQISIRqcIsLSye+j7I - wN+PluOvhyWY+NmL8fsOjP9kxdN7BRh/YJHfFjy5m48nd4ThQjy968bEgwV49usicFciTEKKFhZPXXv1 - eHxtLsYGPBjttwsWjF0xY+ybOfj9uylYs8cZPfQS7kpEnqDTwuLp9GYlfKZeifUfzcb1j/Iw/IkNv3Q6 - MfKVC6O9bg3W7HFGD73cORlMG5AIizDzAaVtunD5ESXWfNSEY/tNCO00oG1zOkJBBSeqUjVYh6R3Qmat - zSY0Hjah7IASW7hPuSoRvIGihcVTSauCppvFODRUjJZvPWgaKMTuXgt2RHOxLTwHDd3EjPfCudgesWJX - jxM7eryo7/Ni8SGFj8gp6LWwePLvS0Og043A5y5UdtkQOJeLivM5ePf8bJSfM04zG2u7chDoysW6Thsq - zqpY0+GAvymNB/gEgxYWT64tKdGihpSYv8WEpSEzVp0pwDuf2SVQReCiS4M1e5zRQy937NXJ1yRirjDz - AVmVJyNZa9+PObauh7ptKdR6FY6N2SisTYe1OlmDNXtqvRNqwxLYt1TCVLY1ZijZOSQRbuEtLSyeTOXH - sfLDH1EauoFFx6/Cd6Qf7pYI1ObLsO+9iMLdF+DccwEuqd2Nl+Br6sbCxiiKd/XBuPogH1HiAzJXHMC8 - YA98td1wb4rCuaEH1roo8oMR5JGaMPIFa10Ejtowiuouw1vzJTwVXyBz+X4ekPgRZfgbohkLtsfMy47B - tqYdakUnPFUM6YUv+LUGa/Y4o8e8rBXcSffWDkpE4j9ZpEvNmb9KsZV16BzrBnVq1YjeVf1MX1Tzn74o - iCmkdq1/LrNHOkfgB6Vg9afJRrVOdv2ClRkMmklvCnyPs4V8ge81v5RegddnCGHNHmf00JslcJcZCcWv - IU1pAhcyhLcFXj1zGtbscUYPvdyZ+Uv6Wi8rKekFBjoX2627by8AAAAASUVORK5CYII= - - - - - iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAZdEVYdFNvZnR3YXJlAEFkb2JlIEltYWdlUmVhZHlxyWU8AAADZmlUWHRYTUw6Y29tLmFkb2Jl - LnhtcAAAAAAAPD94cGFja2V0IGJlZ2luPSLvu78iIGlkPSJXNU0wTXBDZWhpSHpyZVN6TlRjemtjOWQi - Pz4gPHg6eG1wbWV0YSB4bWxuczp4PSJhZG9iZTpuczptZXRhLyIgeDp4bXB0az0iQWRvYmUgWE1QIENv - cmUgNS4zLWMwMTEgNjYuMTQ1NjYxLCAyMDEyLzAyLzA2LTE0OjU2OjI3ICAgICAgICAiPiA8cmRmOlJE - RiB4bWxuczpyZGY9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkvMDIvMjItcmRmLXN5bnRheC1ucyMiPiA8 - cmRmOkRlc2NyaXB0aW9uIHJkZjphYm91dD0iIiB4bWxuczp4bXBNTT0iaHR0cDovL25zLmFkb2JlLmNv - bS94YXAvMS4wL21tLyIgeG1sbnM6c3RSZWY9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlw - ZS9SZXNvdXJjZVJlZiMiIHhtbG5zOnhtcD0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wLyIgeG1w - TU06T3JpZ2luYWxEb2N1bWVudElEPSJ4bXAuZGlkOjYzQTM5NEY4Mjg0OUU0MTE5NDBEQTc4ODZEQzk5 - N0NGIiB4bXBNTTpEb2N1bWVudElEPSJ4bXAuZGlkOkE2Q0VGMDE2NDlEQTExRTQ4NTlCQTI3NTMyOEY5 - NEU2IiB4bXBNTTpJbnN0YW5jZUlEPSJ4bXAuaWlkOkE2Q0VGMDE1NDlEQTExRTQ4NTlCQTI3NTMyOEY5 - NEU2IiB4bXA6Q3JlYXRvclRvb2w9IkFkb2JlIFBob3Rvc2hvcCBDUzYgKFdpbmRvd3MpIj4gPHhtcE1N - OkRlcml2ZWRGcm9tIHN0UmVmOmluc3RhbmNlSUQ9InhtcC5paWQ6NjA1MjM3NzFEOTQ5RTQxMUE0QzNB - MjdEOTJBQzc3QkMiIHN0UmVmOmRvY3VtZW50SUQ9InhtcC5kaWQ6NjNBMzk0RjgyODQ5RTQxMTk0MERB - Nzg4NkRDOTk3Q0YiLz4gPC9yZGY6RGVzY3JpcHRpb24+IDwvcmRmOlJERj4gPC94OnhtcG1ldGE+IDw/ - eHBhY2tldCBlbmQ9InIiPz6UH16BAAABrElEQVRIS63N70tTURzH8fsnKSGCCEIQCBKISMq2iILCgQOL - JUxQAoVKdMGQuwgWFepsMGjFZCMuorsIJV4WFatpvzdr1ZAFsaIHn8559v1eDsI91wevJ/ee7/tjbMRH - fAFwJOWRF6oopTzyQhWlVEdBwRbgUhICAnuvilKGtXDGzW6WV/CvbjE/xTfxr+R6q4xSxtP5YTf8rVn4 - s5dG+809Rv5zvVVGKaNwfYgyBfhksoH83CCF9seiL7LBBnLXTlP4/W4dza0ZLS0nCdlgA9npAQq/qk/Q - sKa0NJ8nIBtsIBPrp9CqPMJBYVLLj+04ZIMNrF49ReHwVRafH1/R8m3zJmSDDdy/fJJC88Ua3mcjWurW - LGSDDaQifRS+O8uopsNaPhVnIBts4E64l0Jj5y4qDy5q+ZCPQTbYgHmph8LXZ0m8TJ3Xsp+LQjbYQOJC - N4XadgLl22e1vM1OQDbYwK1zXRS+lBbhmEHsLgU8kTeVh+OQDTawEDpB2U4mitfpMS22GYJssIH5QCcV - FGwBmuRtkA3cGO3whcZUlEdeqKKU8sgLVZRSfjw+MP4DJ2GPpDR9OIsAAAAASUVORK5CYII= - - - - - iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAZdEVYdFNvZnR3YXJlAEFkb2JlIEltYWdlUmVhZHlxyWU8AAADZmlUWHRYTUw6Y29tLmFkb2Jl - LnhtcAAAAAAAPD94cGFja2V0IGJlZ2luPSLvu78iIGlkPSJXNU0wTXBDZWhpSHpyZVN6TlRjemtjOWQi - Pz4gPHg6eG1wbWV0YSB4bWxuczp4PSJhZG9iZTpuczptZXRhLyIgeDp4bXB0az0iQWRvYmUgWE1QIENv - cmUgNS4zLWMwMTEgNjYuMTQ1NjYxLCAyMDEyLzAyLzA2LTE0OjU2OjI3ICAgICAgICAiPiA8cmRmOlJE - RiB4bWxuczpyZGY9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkvMDIvMjItcmRmLXN5bnRheC1ucyMiPiA8 - cmRmOkRlc2NyaXB0aW9uIHJkZjphYm91dD0iIiB4bWxuczp4bXBNTT0iaHR0cDovL25zLmFkb2JlLmNv - bS94YXAvMS4wL21tLyIgeG1sbnM6c3RSZWY9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlw - ZS9SZXNvdXJjZVJlZiMiIHhtbG5zOnhtcD0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wLyIgeG1w - TU06T3JpZ2luYWxEb2N1bWVudElEPSJ4bXAuZGlkOjYzQTM5NEY4Mjg0OUU0MTE5NDBEQTc4ODZEQzk5 - N0NGIiB4bXBNTTpEb2N1bWVudElEPSJ4bXAuZGlkOjJGRTU5OEQ1NDlEQjExRTRBRUVDOTkyMjQ5NzEw - REUwIiB4bXBNTTpJbnN0YW5jZUlEPSJ4bXAuaWlkOjJGRTU5OEQ0NDlEQjExRTRBRUVDOTkyMjQ5NzEw - REUwIiB4bXA6Q3JlYXRvclRvb2w9IkFkb2JlIFBob3Rvc2hvcCBDUzYgKFdpbmRvd3MpIj4gPHhtcE1N - OkRlcml2ZWRGcm9tIHN0UmVmOmluc3RhbmNlSUQ9InhtcC5paWQ6MTY0MkI1RjlEQTQ5RTQxMUE0QzNB - MjdEOTJBQzc3QkMiIHN0UmVmOmRvY3VtZW50SUQ9InhtcC5kaWQ6NjNBMzk0RjgyODQ5RTQxMTk0MERB - Nzg4NkRDOTk3Q0YiLz4gPC9yZGY6RGVzY3JpcHRpb24+IDwvcmRmOlJERj4gPC94OnhtcG1ldGE+IDw/ - eHBhY2tldCBlbmQ9InIiPz6B5sF9AAACe0lEQVRIS7WVb2jMcRzHL7UHanF/Mts5prE/1li3kAfu5Ak7 - 5IHNobBkSC2UIuGJkrrSWRvTmHQWK8U1T8jqUtYwkZpaGjV/Js6to5YwfXze39+fu/v23f36hXe9us+f - 7/v9rd/dr3MQ0X/F4Zm3+K9QhWajNNlBFZqN0mQHS6lMdrCUyqSgimllUsy4XmOmp+QRDllQWbygjjq6 - uimZStOX8a+ixox3pXrM1JLCDAqYJmY7c669M0bff07mcLbtEl9QE8k6V6BH5ooXMsHZZX7ae+AY7W45 - SrPm19LbsSR9m/iRA2bYGefggVePzUgKBzeu9sQpmZ4QcG/WMtk7eLjv0WMz0kOz+TX6MUXvP6cFeNbD - bz6YvQFm2Bk9PPByZO6jksLB5KvRTzTyLikIrG2ktsvXzd4g2hGjYP1ms4eHvb850qkl65LCQW/ntVs0 - 9HpMcPx0K1X4V1Ff/3NzhnphbVDsjBk8Lm/VE44s0ZJ1KS4Ie8uXUvPBE7Tn0ElCzTMqrV5BO/cfEaDG - TD5X6PFFONLygsTF7jj1vxihyPkYNTS1iFrFxm37KHIhJmp43L7qZxzp0pJ1SeHhQGgLJQaH6fb9R1QX - 2EB3Ek9FryLe95j8K9eLT/TB0FZcskOP1iRdkIh23aR7Ay9pzaZddKY9Jup8nIpeoXXhZlHD655b85Bj - p2npLOmCML+dD/iTZhaX3+UvbRB1PpzeygFnSUUvatecRUMzisoOc+x0LZ3FixxYhQyK1cxyZhkTYhqY - RgnM6hmcwVl4ljDI0KS4AC+Kmyli8Jv2MF7GNwXY4QzOwgNv5mWTL7CLpVQmO1hKZbKDpVR/1P8OcvwB - lh7gOXXZq9sAAAAASUVORK5CYII= - - - + iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 YQUAAAAZdEVYdFNvZnR3YXJlAEFkb2JlIEltYWdlUmVhZHlxyWU8AAADZmlUWHRYTUw6Y29tLmFkb2Jl @@ -750,26 +750,244 @@ bS94YXAvMS4wL21tLyIgeG1sbnM6c3RSZWY9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlw ZS9SZXNvdXJjZVJlZiMiIHhtbG5zOnhtcD0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wLyIgeG1w TU06T3JpZ2luYWxEb2N1bWVudElEPSJ4bXAuZGlkOjJGQzkyMzc0Rjk0OUU0MTE5NjNCQjRENDMzQjlC - MUM4IiB4bXBNTTpEb2N1bWVudElEPSJ4bXAuZGlkOjJERjY3MEZENEQyMzExRTRCNDlGQUMwMzk0OTAw - Qzc4IiB4bXBNTTpJbnN0YW5jZUlEPSJ4bXAuaWlkOjJERjY3MEZDNEQyMzExRTRCNDlGQUMwMzk0OTAw - Qzc4IiB4bXA6Q3JlYXRvclRvb2w9IkFkb2JlIFBob3Rvc2hvcCBDUzYgKFdpbmRvd3MpIj4gPHhtcE1N - OkRlcml2ZWRGcm9tIHN0UmVmOmluc3RhbmNlSUQ9InhtcC5paWQ6NjhGOUEyRDEyMTRERTQxMUIzNkJE + MUM4IiB4bXBNTTpEb2N1bWVudElEPSJ4bXAuZGlkOjlDMzFEOUI4NEFBRjExRTQ4OTA5OUYwQ0QzM0Q2 + NEI4IiB4bXBNTTpJbnN0YW5jZUlEPSJ4bXAuaWlkOjlDMzFEOUI3NEFBRjExRTQ4OTA5OUYwQ0QzM0Q2 + NEI4IiB4bXA6Q3JlYXRvclRvb2w9IkFkb2JlIFBob3Rvc2hvcCBDUzYgKFdpbmRvd3MpIj4gPHhtcE1N + OkRlcml2ZWRGcm9tIHN0UmVmOmluc3RhbmNlSUQ9InhtcC5paWQ6MDk5Mzk2NTZBRjRBRTQxMTk3NEFD + QUFFQjRCMzVENkUiIHN0UmVmOmRvY3VtZW50SUQ9InhtcC5kaWQ6MkZDOTIzNzRGOTQ5RTQxMTk2M0JC + NEQ0MzNCOUIxQzgiLz4gPC9yZGY6RGVzY3JpcHRpb24+IDwvcmRmOlJERj4gPC94OnhtcG1ldGE+IDw/ + eHBhY2tldCBlbmQ9InIiPz73sIMwAAADIElEQVRIS7WVa0iTYRTH56Uiysvm3TkvpLl5DRIvQYWVWl+6 + iNEVg0yhQqloQZHkLT+Y0YdAs75IpEUhzERZoZhsRpZlS7soblotsRwoxhqWeTrnYZtv+u7NsB74cZ5z + zv89/z17HzYRAPxXeIv/EpFXcOyi4BvKhfehv4FvKBfeh+ayqIUDlIgBgT8whpRYoT2fhgvNVJKBQT9s + hB8/QZDPpnEIjEhg0J5Pw4Vm0mwygG9T06BSqQQhTUhUMoRGpyxYT7OZwfhXC6jVakFIYzNYqN5uMGKa + BI1GIwhpghXJaJJi13d0dEB2bj74hsWzSDlXbzfQG02g0+kEIU2wIomdovzKdVifngnFFytBeb4cLN+n + WaSc6hfKKqB/eHTWoHfwExgMBkFII5MnQUD4WlAWloO26wVs35MDmifPmQFFyqlO/aKKqlmDp31DYDKZ + BCGNTJ4IPqHx8LJvACbNUw7p6e2HuJQMNIhhBuaHj3vBYrEI0tb1BoIiE9kJ9h7Oh7EJM+g/jEJuwVlY + s24ri5RTnfo5BedAIoueIYPumvomuHzjzm9cq2uCq7UNUH2rEarr7kNd0yP26Y+eKoSWtk4wfpmAg7kn + ITY5DUorq1g8cOQEqze3aplOEhRtJoMcL1mMTixV9IgD5a/tSBVDYql8AKOBQLEJtTP08gY/jjFiktKg + 5FIV21Ok3NazvmR2AvrFkCAJyGYk1comZAuHDM/AyLvHThfBveZ26NOPwI59eey7LsbhFCmnOvVJ5+Ef + rrYZLEU8EZ85+HLwW7ZCLMVTFWdkHoLut+/hgbYHaE9XN31XNsupTrWV3jKVs+uS3cyAD0cLe331jW3Q + qRt0CPUlQVHDKI+fN9iGo4W90uNnyuA2vvRtWTlQgxeg/dk7FimnOvU9/CNqUe47b7ANRwt7AfjpKvAK + Gt18Qur35ymhRfsKKLr5hN7EyzDq7humWrrcfSfKxbz/QlwcLDck1snZJdUzYHUDmk57+K1qdXJyzsL6 + RmQD9ZmObygXB8sVIRO6fXQB4hC6eRQppzr1XXmHclnAckFomLc1Um5dItEvhZ97MQXP9N0AAAAASUVO + RK5CYII= + + + + + iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 + YQUAAAAZdEVYdFNvZnR3YXJlAEFkb2JlIEltYWdlUmVhZHlxyWU8AAADZmlUWHRYTUw6Y29tLmFkb2Jl + LnhtcAAAAAAAPD94cGFja2V0IGJlZ2luPSLvu78iIGlkPSJXNU0wTXBDZWhpSHpyZVN6TlRjemtjOWQi + Pz4gPHg6eG1wbWV0YSB4bWxuczp4PSJhZG9iZTpuczptZXRhLyIgeDp4bXB0az0iQWRvYmUgWE1QIENv + cmUgNS4zLWMwMTEgNjYuMTQ1NjYxLCAyMDEyLzAyLzA2LTE0OjU2OjI3ICAgICAgICAiPiA8cmRmOlJE + RiB4bWxuczpyZGY9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkvMDIvMjItcmRmLXN5bnRheC1ucyMiPiA8 + cmRmOkRlc2NyaXB0aW9uIHJkZjphYm91dD0iIiB4bWxuczp4bXBNTT0iaHR0cDovL25zLmFkb2JlLmNv + bS94YXAvMS4wL21tLyIgeG1sbnM6c3RSZWY9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlw + ZS9SZXNvdXJjZVJlZiMiIHhtbG5zOnhtcD0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wLyIgeG1w + TU06T3JpZ2luYWxEb2N1bWVudElEPSJ4bXAuZGlkOjJGQzkyMzc0Rjk0OUU0MTE5NjNCQjRENDMzQjlC + MUM4IiB4bXBNTTpEb2N1bWVudElEPSJ4bXAuZGlkOjhDMTdBQjRENEFBRTExRTQ4QjQyODY0MDNBNTJE + NzNCIiB4bXBNTTpJbnN0YW5jZUlEPSJ4bXAuaWlkOjhDMTdBQjRDNEFBRTExRTQ4QjQyODY0MDNBNTJE + NzNCIiB4bXA6Q3JlYXRvclRvb2w9IkFkb2JlIFBob3Rvc2hvcCBDUzYgKFdpbmRvd3MpIj4gPHhtcE1N + OkRlcml2ZWRGcm9tIHN0UmVmOmluc3RhbmNlSUQ9InhtcC5paWQ6NUQyMjc4QTlBQjRBRTQxMTk3NEFD + QUFFQjRCMzVENkUiIHN0UmVmOmRvY3VtZW50SUQ9InhtcC5kaWQ6MkZDOTIzNzRGOTQ5RTQxMTk2M0JC + NEQ0MzNCOUIxQzgiLz4gPC9yZGY6RGVzY3JpcHRpb24+IDwvcmRmOlJERj4gPC94OnhtcG1ldGE+IDw/ + eHBhY2tldCBlbmQ9InIiPz4eHsDfAAAB00lEQVRIS7XVWytEURQH8HniTTNHLs0NCXNcXjTN5dH9g/gM + 3jx590QhFDJS0gyTGmpqaqJIMW4hzlAoOaWISS7LWifntI3ddnTGrl92e/57/We/DBsA/CvuYSHZSr0t + lvCGsriX/oI3lMW9lM/SwgF9SEHwizs08IX2vAyLZvZRgXJ+cQWv7yB0q96Ds86voT0vw6KZNJsK4Pnl + DWKxmBBlqhpDUN0UNp2n2VrB/WMOEomEEGX0ArN5o+BGfYB0Oi1EGa8cwpKw6bxRcH6lQiaTEaKMVw5q + rzCbNwr2z65BURQhynh8Qe0VZvNGwdZBFlRVFaKMxxfQXmE2rxc8rW3sQy6XE0puHoG7IaC9YnV9j5th + pbZPqOCDCrbH5uIwOD7/zWgkDkNTizAyuwQjkWWIxFNQWduqmVxI/MiPz6/A8HTUuDMTTYLkbrqhgt5S + T3PG4ZJ3HE7focElZx0u3yn+VQiG1ZLymmm7s74f88f42S6bl9zyJZ6d6Xckd+Mt5ieogH4xJORHHajt + SzvqZPSgECpHZSiA2DztuxBlad+NgnpBEbIjusiiYboKRF+kGFHegUR5ImkFv7G0eAPzWVq8gfksLd5/ + oULiHhYS97BwwPYJlSCUgVubViQAAAAASUVORK5CYII= + + + + + iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 + YQUAAAAZdEVYdFNvZnR3YXJlAEFkb2JlIEltYWdlUmVhZHlxyWU8AAADZmlUWHRYTUw6Y29tLmFkb2Jl + LnhtcAAAAAAAPD94cGFja2V0IGJlZ2luPSLvu78iIGlkPSJXNU0wTXBDZWhpSHpyZVN6TlRjemtjOWQi + Pz4gPHg6eG1wbWV0YSB4bWxuczp4PSJhZG9iZTpuczptZXRhLyIgeDp4bXB0az0iQWRvYmUgWE1QIENv + cmUgNS4zLWMwMTEgNjYuMTQ1NjYxLCAyMDEyLzAyLzA2LTE0OjU2OjI3ICAgICAgICAiPiA8cmRmOlJE + RiB4bWxuczpyZGY9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkvMDIvMjItcmRmLXN5bnRheC1ucyMiPiA8 + cmRmOkRlc2NyaXB0aW9uIHJkZjphYm91dD0iIiB4bWxuczp4bXBNTT0iaHR0cDovL25zLmFkb2JlLmNv + bS94YXAvMS4wL21tLyIgeG1sbnM6c3RSZWY9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlw + ZS9SZXNvdXJjZVJlZiMiIHhtbG5zOnhtcD0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wLyIgeG1w + TU06T3JpZ2luYWxEb2N1bWVudElEPSJ4bXAuZGlkOjJGQzkyMzc0Rjk0OUU0MTE5NjNCQjRENDMzQjlC + MUM4IiB4bXBNTTpEb2N1bWVudElEPSJ4bXAuZGlkOjJEMDQyOEZBNEFEMjExRTRBN0MxRDBCNzJGRUND + MDEzIiB4bXBNTTpJbnN0YW5jZUlEPSJ4bXAuaWlkOjJEMDQyOEY5NEFEMjExRTRBN0MxRDBCNzJGRUND + MDEzIiB4bXA6Q3JlYXRvclRvb2w9IkFkb2JlIFBob3Rvc2hvcCBDUzYgKFdpbmRvd3MpIj4gPHhtcE1N + OkRlcml2ZWRGcm9tIHN0UmVmOmluc3RhbmNlSUQ9InhtcC5paWQ6QkRDRkI1RDVEMTRBRTQxMTk3NEFD + QUFFQjRCMzVENkUiIHN0UmVmOmRvY3VtZW50SUQ9InhtcC5kaWQ6MkZDOTIzNzRGOTQ5RTQxMTk2M0JC + NEQ0MzNCOUIxQzgiLz4gPC9yZGY6RGVzY3JpcHRpb24+IDwvcmRmOlJERj4gPC94OnhtcG1ldGE+IDw/ + eHBhY2tldCBlbmQ9InIiPz59jfe3AAAEbUlEQVRIS8WTeUybZRzHF48/pnFOuQRajkFLgQFb5iRLNJr4 + l/EPgsniUI4xZDAY1zyxwApsMJyIME61rByl3DfoYGBrgbWUY06FcZSCha4rQ8jYxkqPr2/fvkv8o2Sg + S/wkT970eb6/T5/39z7Prv8dt/Oql4mR4HZJ3ccoXFxhVCzB9DT9JueJdSq6c1wzVZFupepVzxu34XVj + CaEDi1jX6hF8ZQoeokl4iBVwzV9YdU1XRlIl28eVo8phCdXwGltEeOUsro6psaHVwcSDh5volc4iOO8X + 7KuVwb1hEi7J8myq9PEQO//I85oafr0KtEpUpNSETm+AwWDAvfv3YTQaybnm/t/AyO6Ga+UonJOnIijF + 1hA9tWI2qle9RxcI+RIpmZpTIfBULhIyyqHVahHPKcN70TmYnFFCp9OhqXcc9KwW0DOHVl3YU1aUyjJu + F1SpfhO3EM6bMMsVt+D8Zhz2HIpC4oU6bG5uIu4cD3tfTwAjIBNypQYbGxsISquBU34PaDHiVEplGXee + SuIjVaBv3Lz7gJg8vHg4FlZvc+ATVoLipiHsD8qCXWAO7IPK8MG5FjLXKboOeoYADkldUkplGWb7vOb4 + 4BzxIXXQE/1m59WDXdgBvxPfwz6UC4eQUth/WIBDZ2qQXj+K7IYRImeE5s5fOFrcDPvPapcJzVNmmwVY + VxWG9U09uau1tTVymPpc0iYFLew7OEUJ4BwtALfvJpl5xMrKCu6s3cUrn5YbCM1us80CrJZZVWjXr7j3 + 4CE0y8v4IrcaH+cK4Bv+DRyPl8ApphYuia3wZ3eCUzOA1PIfcVuzjHnlIgK/vgy7mHzTG+w12yzA5E53 + edYPo1c2i/X1dQTEfwvbwDQ4hhXg8OcN4P48Df+UTrgkNIAeW4Hg3Hbo9Xq0iGSgs4ls5CUhoXnObLOA + S8pkhG/bdZzgDZJnffT3GXieLAA9XgB2/RjZjuQqMWhxfBw824H55XWyhcfy+HDNqoB1SH4Codn6G7iw + p3d78EaVPlXX0CaZgkqlgly1gpCiK0htHCH/IL6oFcEF3ZjT3CUvXqv0DzDSS0FPq1a/8EbYS5Rqa+if + SAJ8KoeNR7gitEsnoVQqSbGOkJmYX1ggxaY70SabwIGMUrjn8I3WIXnBRPnWu/8nDnE9Sd7cAaP/ZSES + 6/rRKJRArpiHXC7HzekZNIukiCyrhW9mGZgXa4w2kUVnibJnzdXbxP5URzyDO4QjxGl5i9uNpMZeKP5U + IrywAq9yCnGAOGGMonbYxpVnEPGdyR9BO/MTj8kfgXeNFPt5IngVtoF1kQ9WcTs8qgfgmNreQMS21xZL + 0E6Ln6ef75tg8sfgXT8O77oReAkkYNXJ4PRV/4ztyfo9VPTf4xjdf9CpQKzdxxuGe6UMbhXEmc8V6mze + r3qNivx3HGN7UmglQ6CVDMIxXwybo5UcaunJQD8te9rhyx4JrWwItlGNUut3y5+hlp4cDhFCpl14k9jq + nR+Y1NTjIe7NlmMnWKoHsOtvjWYcKpheqFQAAAAASUVORK5CYII= + + + + + iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 + YQUAAAAZdEVYdFNvZnR3YXJlAEFkb2JlIEltYWdlUmVhZHlxyWU8AAADZmlUWHRYTUw6Y29tLmFkb2Jl + LnhtcAAAAAAAPD94cGFja2V0IGJlZ2luPSLvu78iIGlkPSJXNU0wTXBDZWhpSHpyZVN6TlRjemtjOWQi + Pz4gPHg6eG1wbWV0YSB4bWxuczp4PSJhZG9iZTpuczptZXRhLyIgeDp4bXB0az0iQWRvYmUgWE1QIENv + cmUgNS4zLWMwMTEgNjYuMTQ1NjYxLCAyMDEyLzAyLzA2LTE0OjU2OjI3ICAgICAgICAiPiA8cmRmOlJE + RiB4bWxuczpyZGY9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkvMDIvMjItcmRmLXN5bnRheC1ucyMiPiA8 + cmRmOkRlc2NyaXB0aW9uIHJkZjphYm91dD0iIiB4bWxuczp4bXBNTT0iaHR0cDovL25zLmFkb2JlLmNv + bS94YXAvMS4wL21tLyIgeG1sbnM6c3RSZWY9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlw + ZS9SZXNvdXJjZVJlZiMiIHhtbG5zOnhtcD0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wLyIgeG1w + TU06T3JpZ2luYWxEb2N1bWVudElEPSJ4bXAuZGlkOjJGQzkyMzc0Rjk0OUU0MTE5NjNCQjRENDMzQjlC + MUM4IiB4bXBNTTpEb2N1bWVudElEPSJ4bXAuZGlkOjJERTg4QTFENEQyMjExRTRBODEyODk0M0RBMTc5 + Qjg3IiB4bXBNTTpJbnN0YW5jZUlEPSJ4bXAuaWlkOjJERTg4QTFDNEQyMjExRTRBODEyODk0M0RBMTc5 + Qjg3IiB4bXA6Q3JlYXRvclRvb2w9IkFkb2JlIFBob3Rvc2hvcCBDUzYgKFdpbmRvd3MpIj4gPHhtcE1N + OkRlcml2ZWRGcm9tIHN0UmVmOmluc3RhbmNlSUQ9InhtcC5paWQ6NjJGOUEyRDEyMTRERTQxMUIzNkJE NUVDQjU5MzE1NjIiIHN0UmVmOmRvY3VtZW50SUQ9InhtcC5kaWQ6MkZDOTIzNzRGOTQ5RTQxMTk2M0JC NEQ0MzNCOUIxQzgiLz4gPC9yZGY6RGVzY3JpcHRpb24+IDwvcmRmOlJERj4gPC94OnhtcG1ldGE+IDw/ - eHBhY2tldCBlbmQ9InIiPz6GKmpFAAAC+UlEQVRIS63T20vTYRzH8Yforj/Ei24UiSgKIygKi8oyxZQo - cvNYeXaesmzqPGu2POd0ulSsnIdaurTSTJ3O6UxTPGya5vCQx5AuPn39RbHop7nZxQt+z3ie93e/Z4w1 - p7nsCoBt8R6yBF/UHPv+Wb0rfFFzm99CRIwEW1gnqXzxTXxRc0ydctm4OlID2sxrw6iCtiwItC+A2P/D - frLnjwGNSZdMq6N1WOvLwFpP4l/WdRlY6Jaio9Ab7QXba8sVoDHZGdT8PYS9THDqMGnLsKpNw0qXGCua - BO55VZdNQ6U/DRRibVCGb+N1pH5bukoRqHmDHOIG1N8/X2F4I8WyNhtf2+9hqSsZxqZ4upbb6HsSZLHO - Im90ym6hNVcIaktYTexZyUelGEvaHMy/jcFiZxo0xX5Y7ivGcn8JkVmA9uvlWBmqwpJeAWovs+poR99O - eRgWtQWYVUdgrj0FH+i+F3XF3NoappZYGJrEoLaOVYpOOTY/FGJB+xjTqnDMtMTTAC/Ma/Ix/TLUKl9e - x0JfFQpql7PykBP7lWIXzPeUYLIhHCPKCLr/AMy2ZsKoDLTKdNNdvM8TgNpRTBZwfJ885CTmaIChPhwa - mS+GnkdhqjEWY9X+VplqvIMXEhdQ24mZeuSs0N/BNNWWj4k6EdSZHhhXxWH0aSCGFd4c4Tk7zk7XBlUM - FKLToK4Nm+0qYnneRzqGGiSYaIiiyZdhVCdgqFSIwRJPjucZW85O1pvnRmvDkO9zFNTdy2Y6HjGp4HCF - 5kk4xhoiURd/EROv4tBfeM0qAyUC9Mp9QM0+7o829T6LZV0/mNycS6+nFKFWfAGj9ZHozfGwil7miZYH - 7qCmghsw+S6VpV894KuUuKFbfhNNqa749CwY3dm0toK+VABl3HlQM5obYHybwFLc7W1y/Y5BlX6FfgNn - DNcEY0DhZZX+MiGKbh0DNR24AYYWMSfJzc6GZBApwS5skIzNODcg0dV2V36FtsJ7yBJ8UXO8hyzBFzXH - ++H/A/YDv9/V87iOlrYAAAAASUVORK5CYII= + eHBhY2tldCBlbmQ9InIiPz6wJF34AAACl0lEQVRIS62Vy08TURSH73/QhQtXVnBhxEcMiUkhbEg0hB1R + Q1i68C8wIW5cEqMLN7ho2Ji4YiEhWq0prYUhfULbadN3obTaChobtZEUsFY9nnPS6WM6HYowyZf87j33 + nG/amaai9geOBYA+4pTxihmBE8DcTQB4J8em/9IwSQyagmrtL+z9rMFmvnhkKvtV7tcVHPz6DVsftulA + AckdhUg8zf19eoLKAd597iMLMItewfOxUDTN/bqCH3tVSG8VWIBZ9AoJApEk9+sKvu/uQ2IjzwJkGtH8 + OrTwy3Hu77vIAnV9mgWlcgWiqRwLjAMmkOMbPbNTKnN/JJntqJGEBZ++7oKcyLLgLN4JrU8Cms2C4pcy + BKKZumCI18temQ/8DzSLZlBmQX7nG/jCKdpgAa0driCtY5iFHuqHSjNoFtaags1iCdzBBG+QgNY2aZ0F + mIUe6osENAtrTUEq/7kDq9PHAszU5yYoq9f1i9cUSCD5ozxDEeTsrhAoONwyxLLb8MrhYQFmZYCHsnpd + v3hNgQROb5hnKIK29944MAThTBEWbS4WYBZ6qC/sKSy5ZJ6BGUQg8b4Bbhjod4AZXlhXWdBa10LrIVul + AM9ggS+aa6AIMMO8ZYUO0KeyIOMtZyaQpXpNi4LFucYzMINwhbMNcMNw5oIJMMNKIA0LNg88mZuH/ssj + dPgBMnN+cBRmny1wrRtSMMMzWCCFMg0UAeY2Fh0+GL5xG8Zu3oHXUrCj3g0WONdTbeBm21/o1N17gPtg + 98Xh3VoS3qzKMDI22agfglnY/Uld8NDc/ZlZwAwvl4Ngun6LGh8rdfVDViNs3rguOOzq6XOD8PDpc7g2 + OkHDH7XWtYa2It66Y4eCQ8cRfpvUNa2hTUD8A6JMaBvCyTdJAAAAAElFTkSuQmCC + + + + + iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 + YQUAAAAZdEVYdFNvZnR3YXJlAEFkb2JlIEltYWdlUmVhZHlxyWU8AAADZmlUWHRYTUw6Y29tLmFkb2Jl + LnhtcAAAAAAAPD94cGFja2V0IGJlZ2luPSLvu78iIGlkPSJXNU0wTXBDZWhpSHpyZVN6TlRjemtjOWQi + Pz4gPHg6eG1wbWV0YSB4bWxuczp4PSJhZG9iZTpuczptZXRhLyIgeDp4bXB0az0iQWRvYmUgWE1QIENv + cmUgNS4zLWMwMTEgNjYuMTQ1NjYxLCAyMDEyLzAyLzA2LTE0OjU2OjI3ICAgICAgICAiPiA8cmRmOlJE + RiB4bWxuczpyZGY9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkvMDIvMjItcmRmLXN5bnRheC1ucyMiPiA8 + cmRmOkRlc2NyaXB0aW9uIHJkZjphYm91dD0iIiB4bWxuczp4bXBNTT0iaHR0cDovL25zLmFkb2JlLmNv + bS94YXAvMS4wL21tLyIgeG1sbnM6c3RSZWY9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlw + ZS9SZXNvdXJjZVJlZiMiIHhtbG5zOnhtcD0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wLyIgeG1w + TU06T3JpZ2luYWxEb2N1bWVudElEPSJ4bXAuZGlkOjJGQzkyMzc0Rjk0OUU0MTE5NjNCQjRENDMzQjlC + MUM4IiB4bXBNTTpEb2N1bWVudElEPSJ4bXAuZGlkOkUzNzJDMjE3NEFENjExRTRCNjE0OEVEQzI4MEM0 + RTZDIiB4bXBNTTpJbnN0YW5jZUlEPSJ4bXAuaWlkOkUzNzJDMjE2NEFENjExRTRCNjE0OEVEQzI4MEM0 + RTZDIiB4bXA6Q3JlYXRvclRvb2w9IkFkb2JlIFBob3Rvc2hvcCBDUzYgKFdpbmRvd3MpIj4gPHhtcE1N + OkRlcml2ZWRGcm9tIHN0UmVmOmluc3RhbmNlSUQ9InhtcC5paWQ6RkI3NUQ0QkNENDRBRTQxMTk3NEFD + QUFFQjRCMzVENkUiIHN0UmVmOmRvY3VtZW50SUQ9InhtcC5kaWQ6MkZDOTIzNzRGOTQ5RTQxMTk2M0JC + NEQ0MzNCOUIxQzgiLz4gPC9yZGY6RGVzY3JpcHRpb24+IDwvcmRmOlJERj4gPC94OnhtcG1ldGE+IDw/ + eHBhY2tldCBlbmQ9InIiPz6PyaLfAAADMElEQVRIS6VUXUiTYRT+vi3Tzd+ps23+3KRigtiPkolEQReG + UYTkhWatpWlWGkRdddfdSPImqUAJjSIT00oxLJIk0cR+tFSyzDJtgaMkDEPkdM7ZPvm2vS6jBx6es3Pe + 8zzvtm+TohLS/ov+AACStLgEQuJyLRJWYK1yzh/+FgCoQrpnfM4fOGBhcUlIMkEVkma4H4i1y2kFcMD8 + wqKQZILKZqTqmlTAWrfvMjhgbv63Dwm0hLWQohn1eNEbzrlfPiTQAtZCKjP1GXdAIC+r4XD+9CGBFrDm + RVJ1re6pZ0GyHHMvIawauYVNCFPfvvuQQAtYC6meKXU0amNsaGN/ZR60xIf9aIgN3cpGE9OzZCZ85nEm + pGiWlLABmuJCnUOXrNB7chdct4TUo32ANDbp4NuielDpqWfePdaPX6GrohSK4uLhlCEo96YlZLbOFHzH + oJXjMSBcGn4/zQGovEDqXXtzeTb+BTrKj0J3+Q54djYP7EZdTU2MPjFSK8eieQR9QtLg6GcOQPWgqKeQ + ZyOfoK30CDw+lg2Ot3Z4VLoNqo269mCNHIa2WjYn9A1PcAAqU6m9VV3TF9psOwwPS3JgZugCdNoyocwU + jU+RlImWBpezGz0vxzkA1YOiHvPFO7Ca1kGHLQtmXp2HdutmqN+/F6JiU+h3kOpyVeHJwBgHoLIpqajm + 189HoaG4CNqsGTA1UAWth9Lg6r490PygGyLjUikgzuWqQlffCAegelDdUwLqigqhpXgjTPYeh+bCFCg2 + RkEk3vxuVz/P0c43oLP3DQegLhspNalSFxiNcLswHT48LYNbBUlQk7ebzenmyhm08w1o7xmiAP6hRZiT + 70eYkzpctUuJWdHmwWs74+F1Uz7cyE+E4ohQB5mHm9a3GywpTXzektyKduIAIsKI3ISkL4rIdYle05C9 + VrZVBmvtl7eboUyv7V4jSQdwRn8FdI72iErtCUxnIuifkJ5hUqUOq9Jr7OeCNU6bTpNVqtMcDJSldOwn + KnOk+jypJ5QANRWc0cs5SEelXr54QidfwVYAMoiHq4W/gNM6OaNCJ+diaUIqN/43+Atwg27t+9ZXBUn6 + A2MdqQeVc5pWAAAAAElFTkSuQmCC + + + + + iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAIAAABvFaqvAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 + YQUAAAAZdEVYdFNvZnR3YXJlAEFkb2JlIEltYWdlUmVhZHlxyWU8AAADZmlUWHRYTUw6Y29tLmFkb2Jl + LnhtcAAAAAAAPD94cGFja2V0IGJlZ2luPSLvu78iIGlkPSJXNU0wTXBDZWhpSHpyZVN6TlRjemtjOWQi + Pz4gPHg6eG1wbWV0YSB4bWxuczp4PSJhZG9iZTpuczptZXRhLyIgeDp4bXB0az0iQWRvYmUgWE1QIENv + cmUgNS4zLWMwMTEgNjYuMTQ1NjYxLCAyMDEyLzAyLzA2LTE0OjU2OjI3ICAgICAgICAiPiA8cmRmOlJE + RiB4bWxuczpyZGY9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkvMDIvMjItcmRmLXN5bnRheC1ucyMiPiA8 + cmRmOkRlc2NyaXB0aW9uIHJkZjphYm91dD0iIiB4bWxuczp4bXBNTT0iaHR0cDovL25zLmFkb2JlLmNv + bS94YXAvMS4wL21tLyIgeG1sbnM6c3RSZWY9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlw + ZS9SZXNvdXJjZVJlZiMiIHhtbG5zOnhtcD0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wLyIgeG1w + TU06T3JpZ2luYWxEb2N1bWVudElEPSJ4bXAuZGlkOjJGQzkyMzc0Rjk0OUU0MTE5NjNCQjRENDMzQjlC + MUM4IiB4bXBNTTpEb2N1bWVudElEPSJ4bXAuZGlkOjUzQzNGNDI5NEQyQzExRTQ4QkE1QUNCMEVDRDZF + MDVEIiB4bXBNTTpJbnN0YW5jZUlEPSJ4bXAuaWlkOjUzQzNGNDI4NEQyQzExRTQ4QkE1QUNCMEVDRDZF + MDVEIiB4bXA6Q3JlYXRvclRvb2w9IkFkb2JlIFBob3Rvc2hvcCBDUzYgKFdpbmRvd3MpIj4gPHhtcE1N + OkRlcml2ZWRGcm9tIHN0UmVmOmluc3RhbmNlSUQ9InhtcC5paWQ6RkI1NUY4OTYyQTRERTQxMUIzNkJE + NUVDQjU5MzE1NjIiIHN0UmVmOmRvY3VtZW50SUQ9InhtcC5kaWQ6MkZDOTIzNzRGOTQ5RTQxMTk2M0JC + NEQ0MzNCOUIxQzgiLz4gPC9yZGY6RGVzY3JpcHRpb24+IDwvcmRmOlJERj4gPC94OnhtcG1ldGE+IDw/ + eHBhY2tldCBlbmQ9InIiPz6IsaOmAAADF0lEQVQ4T62U/UuTURTH+0nICqRI1ERMMyNQe8N0ChqBwQhN + yvwhEgJjVCqJ/qCibZo6tzQ339h6Nre5prapUzc1XzItX1ilzuWMLLVAen+xf6DTuTxjdxsFVj58ebjc + c+7nnud7z3228DbpIaDFH/CfoqCn72DIDvNfPDM2KAqyr8PcJxqY+QBTb8kkjocXQTsKigGwfqYJHqIg + 1OxHGHvlWPx4hXB1YyA3g4CBhqst+piEnrDA3rA95vBAY1x8d7lq/DVZwm5PQZNvoKYdypSgHgbVEIh1 + cLOZzOCbSSsyRQRba6uWtcpVLbPcwlglInNUCJNWWKqABqMLCGvGlfpJELaQ/V1Vd1lujAhe0chtUrH5 + ZExnmJ85MdomEa+qZMbIEF2BHGunILSjdZwYgTt4gJqjjj0Rltml1Zq9AeL0Mn71Wn2mtDU80MIvsFTw + O+KPIoWC8BNYRIUaqrRQroJKjQOk9N+xLBF2pXJFKfnsDGYa8gS6xOO2whyMuoHaHpGzZ/pBM0IMrtXD + nT4HqNHXe0lYoogMFeQP4jbSDkCPTUyXmnNoPutSo+9WN5DEQDyeWCWnhqm4p7Oimt3b54rzmmKPVHKz + 0Xg0AU1pz87VJp+yXOfd9t3mBmLXsGrsJhSsDtF4iOWxKdpzyQNnuRW7vEUp13obFG05OVUBPtO5V1Sn + k5q4SX8ENfWA6C7xHsP981Bb2sf38ZKd4JhSuXUJHPHhg/WJnAeZFw0Xzt/w8erRtLmBnB/CSmaC599I + 2PYVRl+CXigu3R9SfCC0Pf1MZ1oqvqvjogX7gtRFJfb1n24g7GblfQcFP2fkBYm5anxqQcbLKgzyK/Df + WRTkV5+RMTg84ZrgAOHo4ZIDVNdJw67CpsVLZ5gifj97Typlq2ZFQXj8LKh5EHpnaIar8N+Al5l9Y9Vs + T7OiIAzjqaMsa6QJnBkeWvgOHdPkAuIV67PSeQpCYYZplsZ+KyyWLRyFF8D553EDbURY770J0rrYJbda + SYE4iWb9NcgpRKDrOMAWwYP6d5BTaC52zyaAWDlAm/DweL8AX9zXukfxHsIAAAAASUVORK5CYII= + + + + + iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 + YQUAAAAZdEVYdFNvZnR3YXJlAEFkb2JlIEltYWdlUmVhZHlxyWU8AAADZmlUWHRYTUw6Y29tLmFkb2Jl + LnhtcAAAAAAAPD94cGFja2V0IGJlZ2luPSLvu78iIGlkPSJXNU0wTXBDZWhpSHpyZVN6TlRjemtjOWQi + Pz4gPHg6eG1wbWV0YSB4bWxuczp4PSJhZG9iZTpuczptZXRhLyIgeDp4bXB0az0iQWRvYmUgWE1QIENv + cmUgNS4zLWMwMTEgNjYuMTQ1NjYxLCAyMDEyLzAyLzA2LTE0OjU2OjI3ICAgICAgICAiPiA8cmRmOlJE + RiB4bWxuczpyZGY9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkvMDIvMjItcmRmLXN5bnRheC1ucyMiPiA8 + cmRmOkRlc2NyaXB0aW9uIHJkZjphYm91dD0iIiB4bWxuczp4bXBNTT0iaHR0cDovL25zLmFkb2JlLmNv + bS94YXAvMS4wL21tLyIgeG1sbnM6c3RSZWY9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlw + ZS9SZXNvdXJjZVJlZiMiIHhtbG5zOnhtcD0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wLyIgeG1w + TU06T3JpZ2luYWxEb2N1bWVudElEPSJ4bXAuZGlkOjJGQzkyMzc0Rjk0OUU0MTE5NjNCQjRENDMzQjlC + MUM4IiB4bXBNTTpEb2N1bWVudElEPSJ4bXAuZGlkOkVENUYwQThBNEQyOTExRTQ5QzUzQzdFMkFGQkQy + NTA1IiB4bXBNTTpJbnN0YW5jZUlEPSJ4bXAuaWlkOkVENUYwQTg5NEQyOTExRTQ5QzUzQzdFMkFGQkQy + NTA1IiB4bXA6Q3JlYXRvclRvb2w9IkFkb2JlIFBob3Rvc2hvcCBDUzYgKFdpbmRvd3MpIj4gPHhtcE1N + OkRlcml2ZWRGcm9tIHN0UmVmOmluc3RhbmNlSUQ9InhtcC5paWQ6MkRGNkEzOUYyOTRERTQxMUIzNkJE + NUVDQjU5MzE1NjIiIHN0UmVmOmRvY3VtZW50SUQ9InhtcC5kaWQ6MkZDOTIzNzRGOTQ5RTQxMTk2M0JC + NEQ0MzNCOUIxQzgiLz4gPC9yZGY6RGVzY3JpcHRpb24+IDwvcmRmOlJERj4gPC94OnhtcG1ldGE+IDw/ + eHBhY2tldCBlbmQ9InIiPz6npMy1AAAGEUlEQVRIS7WVeVDUZRjHf7Ase8ECu+wl4LIXcqyyHC783AWW + 5QaRFTHkMi9SQvE+UhLzwk0BUcQSgQBBgcYDzStMSzOPcpqcmo5pmqk/+rOapqb+iG/PbzfFcSz/6pn5 + zPN739/7fp/nvZn/3TSLjj+XJy2/RaItPCT5vaBd8m1+q2Qku1lcrcvki+iXr7fFU6ZZeOx5KDU1b7jU + 1Z2bVPMPWNMbRXrXkWAc+ywVLbcS8fKwFjlu8VdpW0XzSc6f8PEIPzJ19dFnU3WEJdHL9P3X9O1nkdB8 + CQrX7i3mKn9zfqsUq29ZsPfjRBx5aMO2cTMy94gm7FuF7XyJTwDJTo5GVdHxNALVgsPd5Ceye+9g8b0f + UXbjB8RtH4Msd+MeXS7f6twjxbILZiy7pEHDtTBsvG7BqivTUXpsClLWCbtJNpDwBlGVH3ySIFV520eW + nedRcf0HVJGwbeRrOHs/h2n1CGRZDe7wND/W1hiI8sEYlJ4KRcVpJcrfVqByNBILhqLh3KeA+UXBOpL2 + jkRZduARPGXZ/vH4pnMou/gd7INfIPn4QyQc/RSOzk9hrBtEiKPerUn1Y5PXBaDojWlwdgUjr0+G/H4Z + cnpCUNJrQNZ+LeLrBD/LYnixFEDAKFz7vJQ0r49dO4zikS8x8/ADxLd9jIT2B5ix/z7SX78Pw+K3EJy2 + wq1M4rEz6sRwthgw82Ag2KNS2I5JPZ4rZx00ImGNHIZSfisFkDGhxbs5AkKLd/3kaLkDlgTjXrsNc/Md + mPfeQeyOD2HbcRu6yi4E2Wrd8ngeG71IBPtePWa4JUhsD0DykQAkHQqApUWCFLcGyZvDoZ/P/5oCTGXk + hU2MvGB7rbGmG47dd2Fa+x6iX/kAMa/eQvS2m4jaeAPspvcROb8TQexid3CcL2usFCJjnwE5nQYU9RhR + PGDC7D4TCrqMyDqkR9oePbRz/SZEKh8rI8vdyshyXhmzLD8DS/1VGOquwtgw7glkXH0Nhvp3kbL2GrSl + hyC11ril03xZfbkQKZuVsDeq4NihRtYuDbJ2auBoUsO2TQXrJiWMlWIExflWMiHOjRzfJy0bg776HCKX + vANd7WXol1/xeN3Si7A2XIXW1YbAxAq3UO0zPTSd1yG38bplLK//vxBrffKY4PQ1HH9aKk8jonQUUyvO + Qlt9HtqaCx4/tXIMyXWXMXXOAQTEv+D2zCvDhBBTCN1zCGOCZq3k+DXO1YcpRYOY4hpF2LzTCCs74/VE + 3IvnEVd1EhGFblBbWot6BKXWQZq64tlYa2+TuJwQM9KU5cRL35hyOxCe2w913hA0hcPQFI16KRzxEFtO + a1Q9htSVN5C+5S5x7x/uIm3DR7CvuomUReOImt1FU7nwEolHECImMGkJE5i46EJkejNM+X1QOPqhzBqC + KvskVDmnJuHKT/K4bgjKzBMItXcjJv84NOwWiKPndJK40TOCgPgaRmIur1dZ1yM6txvyWT0ITR+AImOQ + gg39N1ybDBJP60PorC5My3oTwQm18FdNryBxbq0EJL6AEUTYZBTkF0NGKyKdvZDb3qJOAxSIOqcP/jtp + JyC3D1BSvYgp6EN4aiNlP/cTEk4gFASPEUeXkWd8RaY5jcrEBkTn9UCT4Q3gzfBfRvJE9rrsfpicHSRe + NsFXmJeSXhTBXXY+jMjk8uArVkpExuKb6pkbYJ7L7Ria37xTUBeMeCkcncRTN0z/TyLKNYy4khNQJq2G + IMLBXdUWQkXwCYYR6md7IPP1k8WEC3UFDzSpG2BZeAZJtXQWFpyls3HOC50JzkdQnbFqDInLLiC2rBcq + 6xoSzzzP+NDVwDBaQkx4XzahNv8xZH48sVotCHeOUnnCWNJG18Q4UjddB7vlfbBbPwC7+YannLTyIrS5 + OyHU5v3hr07poL7JBHe4Jh8bzgQROY8h46IKCAVfbi73D3PcpfoJlX0VtEVN0JXsQlj2ZoRaaynj7N/8 + NfZLPLFmHrXnpiWSCCL8iMl32T/M6YGMq+R+covD7QADwfoIgqt4QVGtfvIZJ4lRv5CY4zypbjfjy+eE + M4l4gtuSwYSQ4DS4EZAew/wNiCYQJlvQU3cAAAAASUVORK5CYII= @@ -1054,142 +1272,6 @@ R2K5fxKLWbbp/7Dc0CBY8Q+pPmOq0VkzzQAAAABJRU5ErkJggg== - - - iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAZdEVYdFNvZnR3YXJlAEFkb2JlIEltYWdlUmVhZHlxyWU8AAADZmlUWHRYTUw6Y29tLmFkb2Jl - LnhtcAAAAAAAPD94cGFja2V0IGJlZ2luPSLvu78iIGlkPSJXNU0wTXBDZWhpSHpyZVN6TlRjemtjOWQi - Pz4gPHg6eG1wbWV0YSB4bWxuczp4PSJhZG9iZTpuczptZXRhLyIgeDp4bXB0az0iQWRvYmUgWE1QIENv - cmUgNS4zLWMwMTEgNjYuMTQ1NjYxLCAyMDEyLzAyLzA2LTE0OjU2OjI3ICAgICAgICAiPiA8cmRmOlJE - RiB4bWxuczpyZGY9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkvMDIvMjItcmRmLXN5bnRheC1ucyMiPiA8 - cmRmOkRlc2NyaXB0aW9uIHJkZjphYm91dD0iIiB4bWxuczp4bXBNTT0iaHR0cDovL25zLmFkb2JlLmNv - bS94YXAvMS4wL21tLyIgeG1sbnM6c3RSZWY9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlw - ZS9SZXNvdXJjZVJlZiMiIHhtbG5zOnhtcD0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wLyIgeG1w - TU06T3JpZ2luYWxEb2N1bWVudElEPSJ4bXAuZGlkOjJGQzkyMzc0Rjk0OUU0MTE5NjNCQjRENDMzQjlC - MUM4IiB4bXBNTTpEb2N1bWVudElEPSJ4bXAuZGlkOjlDMzFEOUI4NEFBRjExRTQ4OTA5OUYwQ0QzM0Q2 - NEI4IiB4bXBNTTpJbnN0YW5jZUlEPSJ4bXAuaWlkOjlDMzFEOUI3NEFBRjExRTQ4OTA5OUYwQ0QzM0Q2 - NEI4IiB4bXA6Q3JlYXRvclRvb2w9IkFkb2JlIFBob3Rvc2hvcCBDUzYgKFdpbmRvd3MpIj4gPHhtcE1N - OkRlcml2ZWRGcm9tIHN0UmVmOmluc3RhbmNlSUQ9InhtcC5paWQ6MDk5Mzk2NTZBRjRBRTQxMTk3NEFD - QUFFQjRCMzVENkUiIHN0UmVmOmRvY3VtZW50SUQ9InhtcC5kaWQ6MkZDOTIzNzRGOTQ5RTQxMTk2M0JC - NEQ0MzNCOUIxQzgiLz4gPC9yZGY6RGVzY3JpcHRpb24+IDwvcmRmOlJERj4gPC94OnhtcG1ldGE+IDw/ - eHBhY2tldCBlbmQ9InIiPz73sIMwAAADIElEQVRIS7WVa0iTYRTH56Uiysvm3TkvpLl5DRIvQYWVWl+6 - iNEVg0yhQqloQZHkLT+Y0YdAs75IpEUhzERZoZhsRpZlS7soblotsRwoxhqWeTrnYZtv+u7NsB74cZ5z - zv89/z17HzYRAPxXeIv/EpFXcOyi4BvKhfehv4FvKBfeh+ayqIUDlIgBgT8whpRYoT2fhgvNVJKBQT9s - hB8/QZDPpnEIjEhg0J5Pw4Vm0mwygG9T06BSqQQhTUhUMoRGpyxYT7OZwfhXC6jVakFIYzNYqN5uMGKa - BI1GIwhpghXJaJJi13d0dEB2bj74hsWzSDlXbzfQG02g0+kEIU2wIomdovzKdVifngnFFytBeb4cLN+n - WaSc6hfKKqB/eHTWoHfwExgMBkFII5MnQUD4WlAWloO26wVs35MDmifPmQFFyqlO/aKKqlmDp31DYDKZ - BCGNTJ4IPqHx8LJvACbNUw7p6e2HuJQMNIhhBuaHj3vBYrEI0tb1BoIiE9kJ9h7Oh7EJM+g/jEJuwVlY - s24ri5RTnfo5BedAIoueIYPumvomuHzjzm9cq2uCq7UNUH2rEarr7kNd0yP26Y+eKoSWtk4wfpmAg7kn - ITY5DUorq1g8cOQEqze3aplOEhRtJoMcL1mMTixV9IgD5a/tSBVDYql8AKOBQLEJtTP08gY/jjFiktKg - 5FIV21Ok3NazvmR2AvrFkCAJyGYk1comZAuHDM/AyLvHThfBveZ26NOPwI59eey7LsbhFCmnOvVJ5+Ef - rrYZLEU8EZ85+HLwW7ZCLMVTFWdkHoLut+/hgbYHaE9XN31XNsupTrWV3jKVs+uS3cyAD0cLe331jW3Q - qRt0CPUlQVHDKI+fN9iGo4W90uNnyuA2vvRtWTlQgxeg/dk7FimnOvU9/CNqUe47b7ANRwt7AfjpKvAK - Gt18Qur35ymhRfsKKLr5hN7EyzDq7humWrrcfSfKxbz/QlwcLDck1snZJdUzYHUDmk57+K1qdXJyzsL6 - RmQD9ZmObygXB8sVIRO6fXQB4hC6eRQppzr1XXmHclnAckFomLc1Um5dItEvhZ97MQXP9N0AAAAASUVO - RK5CYII= - - - - - iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAZdEVYdFNvZnR3YXJlAEFkb2JlIEltYWdlUmVhZHlxyWU8AAADZmlUWHRYTUw6Y29tLmFkb2Jl - LnhtcAAAAAAAPD94cGFja2V0IGJlZ2luPSLvu78iIGlkPSJXNU0wTXBDZWhpSHpyZVN6TlRjemtjOWQi - Pz4gPHg6eG1wbWV0YSB4bWxuczp4PSJhZG9iZTpuczptZXRhLyIgeDp4bXB0az0iQWRvYmUgWE1QIENv - cmUgNS4zLWMwMTEgNjYuMTQ1NjYxLCAyMDEyLzAyLzA2LTE0OjU2OjI3ICAgICAgICAiPiA8cmRmOlJE - RiB4bWxuczpyZGY9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkvMDIvMjItcmRmLXN5bnRheC1ucyMiPiA8 - cmRmOkRlc2NyaXB0aW9uIHJkZjphYm91dD0iIiB4bWxuczp4bXBNTT0iaHR0cDovL25zLmFkb2JlLmNv - bS94YXAvMS4wL21tLyIgeG1sbnM6c3RSZWY9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlw - ZS9SZXNvdXJjZVJlZiMiIHhtbG5zOnhtcD0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wLyIgeG1w - TU06T3JpZ2luYWxEb2N1bWVudElEPSJ4bXAuZGlkOjJGQzkyMzc0Rjk0OUU0MTE5NjNCQjRENDMzQjlC - MUM4IiB4bXBNTTpEb2N1bWVudElEPSJ4bXAuZGlkOjhDMTdBQjRENEFBRTExRTQ4QjQyODY0MDNBNTJE - NzNCIiB4bXBNTTpJbnN0YW5jZUlEPSJ4bXAuaWlkOjhDMTdBQjRDNEFBRTExRTQ4QjQyODY0MDNBNTJE - NzNCIiB4bXA6Q3JlYXRvclRvb2w9IkFkb2JlIFBob3Rvc2hvcCBDUzYgKFdpbmRvd3MpIj4gPHhtcE1N - OkRlcml2ZWRGcm9tIHN0UmVmOmluc3RhbmNlSUQ9InhtcC5paWQ6NUQyMjc4QTlBQjRBRTQxMTk3NEFD - QUFFQjRCMzVENkUiIHN0UmVmOmRvY3VtZW50SUQ9InhtcC5kaWQ6MkZDOTIzNzRGOTQ5RTQxMTk2M0JC - NEQ0MzNCOUIxQzgiLz4gPC9yZGY6RGVzY3JpcHRpb24+IDwvcmRmOlJERj4gPC94OnhtcG1ldGE+IDw/ - eHBhY2tldCBlbmQ9InIiPz4eHsDfAAAB00lEQVRIS7XVWytEURQH8HniTTNHLs0NCXNcXjTN5dH9g/gM - 3jx590QhFDJS0gyTGmpqaqJIMW4hzlAoOaWISS7LWifntI3ddnTGrl92e/57/We/DBsA/CvuYSHZSr0t - lvCGsriX/oI3lMW9lM/SwgF9SEHwizs08IX2vAyLZvZRgXJ+cQWv7yB0q96Ds86voT0vw6KZNJsK4Pnl - DWKxmBBlqhpDUN0UNp2n2VrB/WMOEomEEGX0ArN5o+BGfYB0Oi1EGa8cwpKw6bxRcH6lQiaTEaKMVw5q - rzCbNwr2z65BURQhynh8Qe0VZvNGwdZBFlRVFaKMxxfQXmE2rxc8rW3sQy6XE0puHoG7IaC9YnV9j5th - pbZPqOCDCrbH5uIwOD7/zWgkDkNTizAyuwQjkWWIxFNQWduqmVxI/MiPz6/A8HTUuDMTTYLkbrqhgt5S - T3PG4ZJ3HE7focElZx0u3yn+VQiG1ZLymmm7s74f88f42S6bl9zyJZ6d6Xckd+Mt5ieogH4xJORHHajt - SzvqZPSgECpHZSiA2DztuxBlad+NgnpBEbIjusiiYboKRF+kGFHegUR5ImkFv7G0eAPzWVq8gfksLd5/ - oULiHhYS97BwwPYJlSCUgVubViQAAAAASUVORK5CYII= - - - - - iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAZdEVYdFNvZnR3YXJlAEFkb2JlIEltYWdlUmVhZHlxyWU8AAADZmlUWHRYTUw6Y29tLmFkb2Jl - LnhtcAAAAAAAPD94cGFja2V0IGJlZ2luPSLvu78iIGlkPSJXNU0wTXBDZWhpSHpyZVN6TlRjemtjOWQi - Pz4gPHg6eG1wbWV0YSB4bWxuczp4PSJhZG9iZTpuczptZXRhLyIgeDp4bXB0az0iQWRvYmUgWE1QIENv - cmUgNS4zLWMwMTEgNjYuMTQ1NjYxLCAyMDEyLzAyLzA2LTE0OjU2OjI3ICAgICAgICAiPiA8cmRmOlJE - RiB4bWxuczpyZGY9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkvMDIvMjItcmRmLXN5bnRheC1ucyMiPiA8 - cmRmOkRlc2NyaXB0aW9uIHJkZjphYm91dD0iIiB4bWxuczp4bXBNTT0iaHR0cDovL25zLmFkb2JlLmNv - bS94YXAvMS4wL21tLyIgeG1sbnM6c3RSZWY9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlw - ZS9SZXNvdXJjZVJlZiMiIHhtbG5zOnhtcD0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wLyIgeG1w - TU06T3JpZ2luYWxEb2N1bWVudElEPSJ4bXAuZGlkOjJGQzkyMzc0Rjk0OUU0MTE5NjNCQjRENDMzQjlC - MUM4IiB4bXBNTTpEb2N1bWVudElEPSJ4bXAuZGlkOjJEMDQyOEZBNEFEMjExRTRBN0MxRDBCNzJGRUND - MDEzIiB4bXBNTTpJbnN0YW5jZUlEPSJ4bXAuaWlkOjJEMDQyOEY5NEFEMjExRTRBN0MxRDBCNzJGRUND - MDEzIiB4bXA6Q3JlYXRvclRvb2w9IkFkb2JlIFBob3Rvc2hvcCBDUzYgKFdpbmRvd3MpIj4gPHhtcE1N - OkRlcml2ZWRGcm9tIHN0UmVmOmluc3RhbmNlSUQ9InhtcC5paWQ6QkRDRkI1RDVEMTRBRTQxMTk3NEFD - QUFFQjRCMzVENkUiIHN0UmVmOmRvY3VtZW50SUQ9InhtcC5kaWQ6MkZDOTIzNzRGOTQ5RTQxMTk2M0JC - NEQ0MzNCOUIxQzgiLz4gPC9yZGY6RGVzY3JpcHRpb24+IDwvcmRmOlJERj4gPC94OnhtcG1ldGE+IDw/ - eHBhY2tldCBlbmQ9InIiPz59jfe3AAAEbUlEQVRIS8WTeUybZRzHF48/pnFOuQRajkFLgQFb5iRLNJr4 - l/EPgsniUI4xZDAY1zyxwApsMJyIME61rByl3DfoYGBrgbWUY06FcZSCha4rQ8jYxkqPr2/fvkv8o2Sg - S/wkT970eb6/T5/39z7Prv8dt/Oql4mR4HZJ3ccoXFxhVCzB9DT9JueJdSq6c1wzVZFupepVzxu34XVj - CaEDi1jX6hF8ZQoeokl4iBVwzV9YdU1XRlIl28eVo8phCdXwGltEeOUsro6psaHVwcSDh5volc4iOO8X - 7KuVwb1hEi7J8myq9PEQO//I85oafr0KtEpUpNSETm+AwWDAvfv3YTQaybnm/t/AyO6Ga+UonJOnIijF - 1hA9tWI2qle9RxcI+RIpmZpTIfBULhIyyqHVahHPKcN70TmYnFFCp9OhqXcc9KwW0DOHVl3YU1aUyjJu - F1SpfhO3EM6bMMsVt+D8Zhz2HIpC4oU6bG5uIu4cD3tfTwAjIBNypQYbGxsISquBU34PaDHiVEplGXee - SuIjVaBv3Lz7gJg8vHg4FlZvc+ATVoLipiHsD8qCXWAO7IPK8MG5FjLXKboOeoYADkldUkplGWb7vOb4 - 4BzxIXXQE/1m59WDXdgBvxPfwz6UC4eQUth/WIBDZ2qQXj+K7IYRImeE5s5fOFrcDPvPapcJzVNmmwVY - VxWG9U09uau1tTVymPpc0iYFLew7OEUJ4BwtALfvJpl5xMrKCu6s3cUrn5YbCM1us80CrJZZVWjXr7j3 - 4CE0y8v4IrcaH+cK4Bv+DRyPl8ApphYuia3wZ3eCUzOA1PIfcVuzjHnlIgK/vgy7mHzTG+w12yzA5E53 - edYPo1c2i/X1dQTEfwvbwDQ4hhXg8OcN4P48Df+UTrgkNIAeW4Hg3Hbo9Xq0iGSgs4ls5CUhoXnObLOA - S8pkhG/bdZzgDZJnffT3GXieLAA9XgB2/RjZjuQqMWhxfBw824H55XWyhcfy+HDNqoB1SH4Codn6G7iw - p3d78EaVPlXX0CaZgkqlgly1gpCiK0htHCH/IL6oFcEF3ZjT3CUvXqv0DzDSS0FPq1a/8EbYS5Rqa+if - SAJ8KoeNR7gitEsnoVQqSbGOkJmYX1ggxaY70SabwIGMUrjn8I3WIXnBRPnWu/8nDnE9Sd7cAaP/ZSES - 6/rRKJRArpiHXC7HzekZNIukiCyrhW9mGZgXa4w2kUVnibJnzdXbxP5URzyDO4QjxGl5i9uNpMZeKP5U - IrywAq9yCnGAOGGMonbYxpVnEPGdyR9BO/MTj8kfgXeNFPt5IngVtoF1kQ9WcTs8qgfgmNreQMS21xZL - 0E6Ln6ef75tg8sfgXT8O77oReAkkYNXJ4PRV/4ztyfo9VPTf4xjdf9CpQKzdxxuGe6UMbhXEmc8V6mze - r3qNivx3HGN7UmglQ6CVDMIxXwybo5UcaunJQD8te9rhyx4JrWwItlGNUut3y5+hlp4cDhFCpl14k9jq - nR+Y1NTjIe7NlmMnWKoHsOtvjWYcKpheqFQAAAAASUVORK5CYII= - - - - - iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAZdEVYdFNvZnR3YXJlAEFkb2JlIEltYWdlUmVhZHlxyWU8AAADZmlUWHRYTUw6Y29tLmFkb2Jl - LnhtcAAAAAAAPD94cGFja2V0IGJlZ2luPSLvu78iIGlkPSJXNU0wTXBDZWhpSHpyZVN6TlRjemtjOWQi - Pz4gPHg6eG1wbWV0YSB4bWxuczp4PSJhZG9iZTpuczptZXRhLyIgeDp4bXB0az0iQWRvYmUgWE1QIENv - cmUgNS4zLWMwMTEgNjYuMTQ1NjYxLCAyMDEyLzAyLzA2LTE0OjU2OjI3ICAgICAgICAiPiA8cmRmOlJE - RiB4bWxuczpyZGY9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkvMDIvMjItcmRmLXN5bnRheC1ucyMiPiA8 - cmRmOkRlc2NyaXB0aW9uIHJkZjphYm91dD0iIiB4bWxuczp4bXBNTT0iaHR0cDovL25zLmFkb2JlLmNv - bS94YXAvMS4wL21tLyIgeG1sbnM6c3RSZWY9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlw - ZS9SZXNvdXJjZVJlZiMiIHhtbG5zOnhtcD0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wLyIgeG1w - TU06T3JpZ2luYWxEb2N1bWVudElEPSJ4bXAuZGlkOjJGQzkyMzc0Rjk0OUU0MTE5NjNCQjRENDMzQjlC - MUM4IiB4bXBNTTpEb2N1bWVudElEPSJ4bXAuZGlkOjJERTg4QTFENEQyMjExRTRBODEyODk0M0RBMTc5 - Qjg3IiB4bXBNTTpJbnN0YW5jZUlEPSJ4bXAuaWlkOjJERTg4QTFDNEQyMjExRTRBODEyODk0M0RBMTc5 - Qjg3IiB4bXA6Q3JlYXRvclRvb2w9IkFkb2JlIFBob3Rvc2hvcCBDUzYgKFdpbmRvd3MpIj4gPHhtcE1N - OkRlcml2ZWRGcm9tIHN0UmVmOmluc3RhbmNlSUQ9InhtcC5paWQ6NjJGOUEyRDEyMTRERTQxMUIzNkJE - NUVDQjU5MzE1NjIiIHN0UmVmOmRvY3VtZW50SUQ9InhtcC5kaWQ6MkZDOTIzNzRGOTQ5RTQxMTk2M0JC - NEQ0MzNCOUIxQzgiLz4gPC9yZGY6RGVzY3JpcHRpb24+IDwvcmRmOlJERj4gPC94OnhtcG1ldGE+IDw/ - eHBhY2tldCBlbmQ9InIiPz6wJF34AAACl0lEQVRIS62Vy08TURSH73/QhQtXVnBhxEcMiUkhbEg0hB1R - Q1i68C8wIW5cEqMLN7ho2Ji4YiEhWq0prYUhfULbadN3obTaChobtZEUsFY9nnPS6WM6HYowyZf87j33 - nG/amaai9geOBYA+4pTxihmBE8DcTQB4J8em/9IwSQyagmrtL+z9rMFmvnhkKvtV7tcVHPz6DVsftulA - AckdhUg8zf19eoLKAd597iMLMItewfOxUDTN/bqCH3tVSG8VWIBZ9AoJApEk9+sKvu/uQ2IjzwJkGtH8 - OrTwy3Hu77vIAnV9mgWlcgWiqRwLjAMmkOMbPbNTKnN/JJntqJGEBZ++7oKcyLLgLN4JrU8Cms2C4pcy - BKKZumCI18temQ/8DzSLZlBmQX7nG/jCKdpgAa0driCtY5iFHuqHSjNoFtaags1iCdzBBG+QgNY2aZ0F - mIUe6osENAtrTUEq/7kDq9PHAszU5yYoq9f1i9cUSCD5ozxDEeTsrhAoONwyxLLb8MrhYQFmZYCHsnpd - v3hNgQROb5hnKIK29944MAThTBEWbS4WYBZ6qC/sKSy5ZJ6BGUQg8b4Bbhjod4AZXlhXWdBa10LrIVul - AM9ggS+aa6AIMMO8ZYUO0KeyIOMtZyaQpXpNi4LFucYzMINwhbMNcMNw5oIJMMNKIA0LNg88mZuH/ssj - dPgBMnN+cBRmny1wrRtSMMMzWCCFMg0UAeY2Fh0+GL5xG8Zu3oHXUrCj3g0WONdTbeBm21/o1N17gPtg - 98Xh3VoS3qzKMDI22agfglnY/Uld8NDc/ZlZwAwvl4Ngun6LGh8rdfVDViNs3rguOOzq6XOD8PDpc7g2 - OkHDH7XWtYa2It66Y4eCQ8cRfpvUNa2hTUD8A6JMaBvCyTdJAAAAAElFTkSuQmCC - - iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 @@ -1403,7 +1485,7 @@ AAAASUVORK5CYII= - + iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 YQUAAAAZdEVYdFNvZnR3YXJlAEFkb2JlIEltYWdlUmVhZHlxyWU8AAADZmlUWHRYTUw6Y29tLmFkb2Jl @@ -1415,108 +1497,26 @@ bS94YXAvMS4wL21tLyIgeG1sbnM6c3RSZWY9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlw ZS9SZXNvdXJjZVJlZiMiIHhtbG5zOnhtcD0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wLyIgeG1w TU06T3JpZ2luYWxEb2N1bWVudElEPSJ4bXAuZGlkOjJGQzkyMzc0Rjk0OUU0MTE5NjNCQjRENDMzQjlC - MUM4IiB4bXBNTTpEb2N1bWVudElEPSJ4bXAuZGlkOkUzNzJDMjE3NEFENjExRTRCNjE0OEVEQzI4MEM0 - RTZDIiB4bXBNTTpJbnN0YW5jZUlEPSJ4bXAuaWlkOkUzNzJDMjE2NEFENjExRTRCNjE0OEVEQzI4MEM0 - RTZDIiB4bXA6Q3JlYXRvclRvb2w9IkFkb2JlIFBob3Rvc2hvcCBDUzYgKFdpbmRvd3MpIj4gPHhtcE1N - OkRlcml2ZWRGcm9tIHN0UmVmOmluc3RhbmNlSUQ9InhtcC5paWQ6RkI3NUQ0QkNENDRBRTQxMTk3NEFD - QUFFQjRCMzVENkUiIHN0UmVmOmRvY3VtZW50SUQ9InhtcC5kaWQ6MkZDOTIzNzRGOTQ5RTQxMTk2M0JC - NEQ0MzNCOUIxQzgiLz4gPC9yZGY6RGVzY3JpcHRpb24+IDwvcmRmOlJERj4gPC94OnhtcG1ldGE+IDw/ - eHBhY2tldCBlbmQ9InIiPz6PyaLfAAADMElEQVRIS6VUXUiTYRT+vi3Tzd+ps23+3KRigtiPkolEQReG - UYTkhWatpWlWGkRdddfdSPImqUAJjSIT00oxLJIk0cR+tFSyzDJtgaMkDEPkdM7ZPvm2vS6jBx6es3Pe - 8zzvtm+TohLS/ov+AACStLgEQuJyLRJWYK1yzh/+FgCoQrpnfM4fOGBhcUlIMkEVkma4H4i1y2kFcMD8 - wqKQZILKZqTqmlTAWrfvMjhgbv63Dwm0hLWQohn1eNEbzrlfPiTQAtZCKjP1GXdAIC+r4XD+9CGBFrDm - RVJ1re6pZ0GyHHMvIawauYVNCFPfvvuQQAtYC6meKXU0amNsaGN/ZR60xIf9aIgN3cpGE9OzZCZ85nEm - pGiWlLABmuJCnUOXrNB7chdct4TUo32ANDbp4NuielDpqWfePdaPX6GrohSK4uLhlCEo96YlZLbOFHzH - oJXjMSBcGn4/zQGovEDqXXtzeTb+BTrKj0J3+Q54djYP7EZdTU2MPjFSK8eieQR9QtLg6GcOQPWgqKeQ - ZyOfoK30CDw+lg2Ot3Z4VLoNqo269mCNHIa2WjYn9A1PcAAqU6m9VV3TF9psOwwPS3JgZugCdNoyocwU - jU+RlImWBpezGz0vxzkA1YOiHvPFO7Ca1kGHLQtmXp2HdutmqN+/F6JiU+h3kOpyVeHJwBgHoLIpqajm - 189HoaG4CNqsGTA1UAWth9Lg6r490PygGyLjUikgzuWqQlffCAegelDdUwLqigqhpXgjTPYeh+bCFCg2 - RkEk3vxuVz/P0c43oLP3DQegLhspNalSFxiNcLswHT48LYNbBUlQk7ebzenmyhm08w1o7xmiAP6hRZiT - 70eYkzpctUuJWdHmwWs74+F1Uz7cyE+E4ohQB5mHm9a3GywpTXzektyKduIAIsKI3ISkL4rIdYle05C9 - VrZVBmvtl7eboUyv7V4jSQdwRn8FdI72iErtCUxnIuifkJ5hUqUOq9Jr7OeCNU6bTpNVqtMcDJSldOwn - KnOk+jypJ5QANRWc0cs5SEelXr54QidfwVYAMoiHq4W/gNM6OaNCJ+diaUIqN/43+Atwg27t+9ZXBUn6 - A2MdqQeVc5pWAAAAAElFTkSuQmCC - - - - - iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAIAAABvFaqvAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAZdEVYdFNvZnR3YXJlAEFkb2JlIEltYWdlUmVhZHlxyWU8AAADZmlUWHRYTUw6Y29tLmFkb2Jl - LnhtcAAAAAAAPD94cGFja2V0IGJlZ2luPSLvu78iIGlkPSJXNU0wTXBDZWhpSHpyZVN6TlRjemtjOWQi - Pz4gPHg6eG1wbWV0YSB4bWxuczp4PSJhZG9iZTpuczptZXRhLyIgeDp4bXB0az0iQWRvYmUgWE1QIENv - cmUgNS4zLWMwMTEgNjYuMTQ1NjYxLCAyMDEyLzAyLzA2LTE0OjU2OjI3ICAgICAgICAiPiA8cmRmOlJE - RiB4bWxuczpyZGY9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkvMDIvMjItcmRmLXN5bnRheC1ucyMiPiA8 - cmRmOkRlc2NyaXB0aW9uIHJkZjphYm91dD0iIiB4bWxuczp4bXBNTT0iaHR0cDovL25zLmFkb2JlLmNv - bS94YXAvMS4wL21tLyIgeG1sbnM6c3RSZWY9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlw - ZS9SZXNvdXJjZVJlZiMiIHhtbG5zOnhtcD0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wLyIgeG1w - TU06T3JpZ2luYWxEb2N1bWVudElEPSJ4bXAuZGlkOjJGQzkyMzc0Rjk0OUU0MTE5NjNCQjRENDMzQjlC - MUM4IiB4bXBNTTpEb2N1bWVudElEPSJ4bXAuZGlkOjUzQzNGNDI5NEQyQzExRTQ4QkE1QUNCMEVDRDZF - MDVEIiB4bXBNTTpJbnN0YW5jZUlEPSJ4bXAuaWlkOjUzQzNGNDI4NEQyQzExRTQ4QkE1QUNCMEVDRDZF - MDVEIiB4bXA6Q3JlYXRvclRvb2w9IkFkb2JlIFBob3Rvc2hvcCBDUzYgKFdpbmRvd3MpIj4gPHhtcE1N - OkRlcml2ZWRGcm9tIHN0UmVmOmluc3RhbmNlSUQ9InhtcC5paWQ6RkI1NUY4OTYyQTRERTQxMUIzNkJE + MUM4IiB4bXBNTTpEb2N1bWVudElEPSJ4bXAuZGlkOjJERjY3MEZENEQyMzExRTRCNDlGQUMwMzk0OTAw + Qzc4IiB4bXBNTTpJbnN0YW5jZUlEPSJ4bXAuaWlkOjJERjY3MEZDNEQyMzExRTRCNDlGQUMwMzk0OTAw + Qzc4IiB4bXA6Q3JlYXRvclRvb2w9IkFkb2JlIFBob3Rvc2hvcCBDUzYgKFdpbmRvd3MpIj4gPHhtcE1N + OkRlcml2ZWRGcm9tIHN0UmVmOmluc3RhbmNlSUQ9InhtcC5paWQ6NjhGOUEyRDEyMTRERTQxMUIzNkJE NUVDQjU5MzE1NjIiIHN0UmVmOmRvY3VtZW50SUQ9InhtcC5kaWQ6MkZDOTIzNzRGOTQ5RTQxMTk2M0JC NEQ0MzNCOUIxQzgiLz4gPC9yZGY6RGVzY3JpcHRpb24+IDwvcmRmOlJERj4gPC94OnhtcG1ldGE+IDw/ - eHBhY2tldCBlbmQ9InIiPz6IsaOmAAADF0lEQVQ4T62U/UuTURTH+0nICqRI1ERMMyNQe8N0ChqBwQhN - yvwhEgJjVCqJ/qCibZo6tzQ339h6Nre5prapUzc1XzItX1ilzuWMLLVAen+xf6DTuTxjdxsFVj58ebjc - c+7nnud7z3228DbpIaDFH/CfoqCn72DIDvNfPDM2KAqyr8PcJxqY+QBTb8kkjocXQTsKigGwfqYJHqIg - 1OxHGHvlWPx4hXB1YyA3g4CBhqst+piEnrDA3rA95vBAY1x8d7lq/DVZwm5PQZNvoKYdypSgHgbVEIh1 - cLOZzOCbSSsyRQRba6uWtcpVLbPcwlglInNUCJNWWKqABqMLCGvGlfpJELaQ/V1Vd1lujAhe0chtUrH5 - ZExnmJ85MdomEa+qZMbIEF2BHGunILSjdZwYgTt4gJqjjj0Rltml1Zq9AeL0Mn71Wn2mtDU80MIvsFTw - O+KPIoWC8BNYRIUaqrRQroJKjQOk9N+xLBF2pXJFKfnsDGYa8gS6xOO2whyMuoHaHpGzZ/pBM0IMrtXD - nT4HqNHXe0lYoogMFeQP4jbSDkCPTUyXmnNoPutSo+9WN5DEQDyeWCWnhqm4p7Oimt3b54rzmmKPVHKz - 0Xg0AU1pz87VJp+yXOfd9t3mBmLXsGrsJhSsDtF4iOWxKdpzyQNnuRW7vEUp13obFG05OVUBPtO5V1Sn - k5q4SX8ENfWA6C7xHsP981Bb2sf38ZKd4JhSuXUJHPHhg/WJnAeZFw0Xzt/w8erRtLmBnB/CSmaC599I - 2PYVRl+CXigu3R9SfCC0Pf1MZ1oqvqvjogX7gtRFJfb1n24g7GblfQcFP2fkBYm5anxqQcbLKgzyK/Df - WRTkV5+RMTg84ZrgAOHo4ZIDVNdJw67CpsVLZ5gifj97Typlq2ZFQXj8LKh5EHpnaIar8N+Al5l9Y9Vs - T7OiIAzjqaMsa6QJnBkeWvgOHdPkAuIV67PSeQpCYYZplsZ+KyyWLRyFF8D553EDbURY770J0rrYJbda - SYE4iWb9NcgpRKDrOMAWwYP6d5BTaC52zyaAWDlAm/DweL8AX9zXukfxHsIAAAAASUVORK5CYII= - - - - - iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAZdEVYdFNvZnR3YXJlAEFkb2JlIEltYWdlUmVhZHlxyWU8AAADZmlUWHRYTUw6Y29tLmFkb2Jl - LnhtcAAAAAAAPD94cGFja2V0IGJlZ2luPSLvu78iIGlkPSJXNU0wTXBDZWhpSHpyZVN6TlRjemtjOWQi - Pz4gPHg6eG1wbWV0YSB4bWxuczp4PSJhZG9iZTpuczptZXRhLyIgeDp4bXB0az0iQWRvYmUgWE1QIENv - cmUgNS4zLWMwMTEgNjYuMTQ1NjYxLCAyMDEyLzAyLzA2LTE0OjU2OjI3ICAgICAgICAiPiA8cmRmOlJE - RiB4bWxuczpyZGY9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkvMDIvMjItcmRmLXN5bnRheC1ucyMiPiA8 - cmRmOkRlc2NyaXB0aW9uIHJkZjphYm91dD0iIiB4bWxuczp4bXBNTT0iaHR0cDovL25zLmFkb2JlLmNv - bS94YXAvMS4wL21tLyIgeG1sbnM6c3RSZWY9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlw - ZS9SZXNvdXJjZVJlZiMiIHhtbG5zOnhtcD0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wLyIgeG1w - TU06T3JpZ2luYWxEb2N1bWVudElEPSJ4bXAuZGlkOjJGQzkyMzc0Rjk0OUU0MTE5NjNCQjRENDMzQjlC - MUM4IiB4bXBNTTpEb2N1bWVudElEPSJ4bXAuZGlkOkVENUYwQThBNEQyOTExRTQ5QzUzQzdFMkFGQkQy - NTA1IiB4bXBNTTpJbnN0YW5jZUlEPSJ4bXAuaWlkOkVENUYwQTg5NEQyOTExRTQ5QzUzQzdFMkFGQkQy - NTA1IiB4bXA6Q3JlYXRvclRvb2w9IkFkb2JlIFBob3Rvc2hvcCBDUzYgKFdpbmRvd3MpIj4gPHhtcE1N - OkRlcml2ZWRGcm9tIHN0UmVmOmluc3RhbmNlSUQ9InhtcC5paWQ6MkRGNkEzOUYyOTRERTQxMUIzNkJE - NUVDQjU5MzE1NjIiIHN0UmVmOmRvY3VtZW50SUQ9InhtcC5kaWQ6MkZDOTIzNzRGOTQ5RTQxMTk2M0JC - NEQ0MzNCOUIxQzgiLz4gPC9yZGY6RGVzY3JpcHRpb24+IDwvcmRmOlJERj4gPC94OnhtcG1ldGE+IDw/ - eHBhY2tldCBlbmQ9InIiPz6npMy1AAAGEUlEQVRIS7WVeVDUZRjHf7Ase8ECu+wl4LIXcqyyHC783AWW - 5QaRFTHkMi9SQvE+UhLzwk0BUcQSgQBBgcYDzStMSzOPcpqcmo5pmqk/+rOapqb+iG/PbzfFcSz/6pn5 - zPN739/7fp/nvZn/3TSLjj+XJy2/RaItPCT5vaBd8m1+q2Qku1lcrcvki+iXr7fFU6ZZeOx5KDU1b7jU - 1Z2bVPMPWNMbRXrXkWAc+ywVLbcS8fKwFjlu8VdpW0XzSc6f8PEIPzJ19dFnU3WEJdHL9P3X9O1nkdB8 - CQrX7i3mKn9zfqsUq29ZsPfjRBx5aMO2cTMy94gm7FuF7XyJTwDJTo5GVdHxNALVgsPd5Ceye+9g8b0f - UXbjB8RtH4Msd+MeXS7f6twjxbILZiy7pEHDtTBsvG7BqivTUXpsClLWCbtJNpDwBlGVH3ySIFV520eW - nedRcf0HVJGwbeRrOHs/h2n1CGRZDe7wND/W1hiI8sEYlJ4KRcVpJcrfVqByNBILhqLh3KeA+UXBOpL2 - jkRZduARPGXZ/vH4pnMou/gd7INfIPn4QyQc/RSOzk9hrBtEiKPerUn1Y5PXBaDojWlwdgUjr0+G/H4Z - cnpCUNJrQNZ+LeLrBD/LYnixFEDAKFz7vJQ0r49dO4zikS8x8/ADxLd9jIT2B5ix/z7SX78Pw+K3EJy2 - wq1M4rEz6sRwthgw82Ag2KNS2I5JPZ4rZx00ImGNHIZSfisFkDGhxbs5AkKLd/3kaLkDlgTjXrsNc/Md - mPfeQeyOD2HbcRu6yi4E2Wrd8ngeG71IBPtePWa4JUhsD0DykQAkHQqApUWCFLcGyZvDoZ/P/5oCTGXk - hU2MvGB7rbGmG47dd2Fa+x6iX/kAMa/eQvS2m4jaeAPspvcROb8TQexid3CcL2usFCJjnwE5nQYU9RhR - PGDC7D4TCrqMyDqkR9oePbRz/SZEKh8rI8vdyshyXhmzLD8DS/1VGOquwtgw7glkXH0Nhvp3kbL2GrSl - hyC11ril03xZfbkQKZuVsDeq4NihRtYuDbJ2auBoUsO2TQXrJiWMlWIExflWMiHOjRzfJy0bg776HCKX - vANd7WXol1/xeN3Si7A2XIXW1YbAxAq3UO0zPTSd1yG38bplLK//vxBrffKY4PQ1HH9aKk8jonQUUyvO - Qlt9HtqaCx4/tXIMyXWXMXXOAQTEv+D2zCvDhBBTCN1zCGOCZq3k+DXO1YcpRYOY4hpF2LzTCCs74/VE - 3IvnEVd1EhGFblBbWot6BKXWQZq64tlYa2+TuJwQM9KU5cRL35hyOxCe2w913hA0hcPQFI16KRzxEFtO - a1Q9htSVN5C+5S5x7x/uIm3DR7CvuomUReOImt1FU7nwEolHECImMGkJE5i46EJkejNM+X1QOPqhzBqC - KvskVDmnJuHKT/K4bgjKzBMItXcjJv84NOwWiKPndJK40TOCgPgaRmIur1dZ1yM6txvyWT0ITR+AImOQ - gg39N1ybDBJP60PorC5My3oTwQm18FdNryBxbq0EJL6AEUTYZBTkF0NGKyKdvZDb3qJOAxSIOqcP/jtp - JyC3D1BSvYgp6EN4aiNlP/cTEk4gFASPEUeXkWd8RaY5jcrEBkTn9UCT4Q3gzfBfRvJE9rrsfpicHSRe - NsFXmJeSXhTBXXY+jMjk8uArVkpExuKb6pkbYJ7L7Ria37xTUBeMeCkcncRTN0z/TyLKNYy4khNQJq2G - IMLBXdUWQkXwCYYR6md7IPP1k8WEC3UFDzSpG2BZeAZJtXQWFpyls3HOC50JzkdQnbFqDInLLiC2rBcq - 6xoSzzzP+NDVwDBaQkx4XzahNv8xZH48sVotCHeOUnnCWNJG18Q4UjddB7vlfbBbPwC7+YannLTyIrS5 - OyHU5v3hr07poL7JBHe4Jh8bzgQROY8h46IKCAVfbi73D3PcpfoJlX0VtEVN0JXsQlj2ZoRaaynj7N/8 - NfZLPLFmHrXnpiWSCCL8iMl32T/M6YGMq+R+covD7QADwfoIgqt4QVGtfvIZJ4lRv5CY4zypbjfjy+eE - M4l4gtuSwYSQ4DS4EZAew/wNiCYQJlvQU3cAAAAASUVORK5CYII= + eHBhY2tldCBlbmQ9InIiPz6GKmpFAAAC+UlEQVRIS63T20vTYRzH8Yforj/Ei24UiSgKIygKi8oyxZQo + cvNYeXaesmzqPGu2POd0ulSsnIdaurTSTJ3O6UxTPGya5vCQx5AuPn39RbHop7nZxQt+z3ie93e/Z4w1 + p7nsCoBt8R6yBF/UHPv+Wb0rfFFzm99CRIwEW1gnqXzxTXxRc0ydctm4OlID2sxrw6iCtiwItC+A2P/D + frLnjwGNSZdMq6N1WOvLwFpP4l/WdRlY6Jaio9Ab7QXba8sVoDHZGdT8PYS9THDqMGnLsKpNw0qXGCua + BO55VZdNQ6U/DRRibVCGb+N1pH5bukoRqHmDHOIG1N8/X2F4I8WyNhtf2+9hqSsZxqZ4upbb6HsSZLHO + Im90ym6hNVcIaktYTexZyUelGEvaHMy/jcFiZxo0xX5Y7ivGcn8JkVmA9uvlWBmqwpJeAWovs+poR99O + eRgWtQWYVUdgrj0FH+i+F3XF3NoappZYGJrEoLaOVYpOOTY/FGJB+xjTqnDMtMTTAC/Ma/Ix/TLUKl9e + x0JfFQpql7PykBP7lWIXzPeUYLIhHCPKCLr/AMy2ZsKoDLTKdNNdvM8TgNpRTBZwfJ885CTmaIChPhwa + mS+GnkdhqjEWY9X+VplqvIMXEhdQ24mZeuSs0N/BNNWWj4k6EdSZHhhXxWH0aSCGFd4c4Tk7zk7XBlUM + FKLToK4Nm+0qYnneRzqGGiSYaIiiyZdhVCdgqFSIwRJPjucZW85O1pvnRmvDkO9zFNTdy2Y6HjGp4HCF + 5kk4xhoiURd/EROv4tBfeM0qAyUC9Mp9QM0+7o829T6LZV0/mNycS6+nFKFWfAGj9ZHozfGwil7miZYH + 7qCmghsw+S6VpV894KuUuKFbfhNNqa749CwY3dm0toK+VABl3HlQM5obYHybwFLc7W1y/Y5BlX6FfgNn + DNcEY0DhZZX+MiGKbh0DNR24AYYWMSfJzc6GZBApwS5skIzNODcg0dV2V36FtsJ7yBJ8UXO8hyzBFzXH + ++H/A/YDv9/V87iOlrYAAAAASUVORK5CYII= @@ -3164,9 +3164,6 @@ 864, 17 - - 864, 17 - iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 diff --git a/Program.cs b/Program.cs index e38f7b8..a76d0d4 100644 --- a/Program.cs +++ b/Program.cs @@ -16,14 +16,14 @@ [STAThread] static void Main() { - ValidateInfo validateInfo = ValidateConfig.LoadConfig(); + ValidateConfig.LoadConfig(); string localConfigPath = Application.StartupPath + "/Config.xml"; //获取程序及版本信息 string currentVersionCode = Assembly.GetExecutingAssembly().GetName().Version.ToString(); //获取文件版本信息 FileVersionInfo.GetVersionInfo(Application.ExecutablePath); - + Utility.SysInfoConfig(); string configUrl = getProgramUrl(localConfigPath, "configurl"); if (configUrl != "") { diff --git a/TreeUtils.cs b/TreeUtils.cs index 1f055b5..ad39643 100644 --- a/TreeUtils.cs +++ b/TreeUtils.cs @@ -19,7 +19,7 @@ public static void InitLayerTree(GSOGlobeControl gsoGlobeControl, TreeView treeView, string viewDatasrc) { // treeView.Nodes.Clear(); - LayerConfig layerConfig = Utility.layerConfig;//layertree所在的配置文件 + LayerConfig layerConfig = Utility.LayerConfig;//layertree所在的配置文件 List datasrcs = layerConfig.datasrcs; foreach (DataSrc datasrc in datasrcs) { diff --git a/Utility.cs b/Utility.cs index c03e405..ab947a3 100644 --- a/Utility.cs +++ b/Utility.cs @@ -20,7 +20,7 @@ public static string dbdatabase; public static string userID; - public static Hashtable Pipe_QueryFields; +// public static Hashtable Pipe_QueryFields; public static string DBPassword; public static string DBServer; public static string DBBackUp; @@ -38,7 +38,7 @@ public static List listPipelineType; public static string PicRootURL; public static string PicDefaultURL; - public static double dFlyAboveLine = 2; +// public static double dFlyAboveLine = 2; public static string userName; public static string projectStr; public static string userRole; @@ -85,12 +85,17 @@ public static List pipefittingLayerNames = new List();//管件图层名称 public static List sgPipeLayersNames = new List();//施工管线图层名称 -// public static Dictionary dictionaryNetLayerNameAndCaption = new Dictionary(); - public static HashSet layerNameSet = new HashSet(); + public static HashSet layerNameSet = new HashSet();//记录有哪些图层要显示 public static string roadLayerName = ""; #endregion wxl - public static LayerConfig layerConfig; + public static LayerConfig LayerConfig; + + public static string RoleServer; + public static string TitleImagePath; + public static string SysnameVersion; + public static string Copyright; + public static void SetBallons(GSOBalloon featureTooltip, GSOBalloonEx balloonEx) { featureTooltip.CacheFilePath = Application.StartupPath + "/GeoScene/Globe/Temp"; @@ -188,25 +193,6 @@ } return s.ToString(); } - public static GSOFeatures Table2Features(DataTable table, string currentQueryLayer, GSOGlobeControl globeControl1) - { - GSOFeatures features = new GSOFeatures(); - for (int i = 0; i < table.Rows.Count; i++) - { - DataRow row = table.Rows[i]; - - string featureName = row["编号"].ToString(); - featureName = featureName.Trim(); - GSOLayer layer = globeControl1.Globe.Layers.GetLayerByCaption(currentQueryLayer); - GSOFeatures tempfeatures = layer.GetFeatureByName(featureName, false); - if (tempfeatures.Length > 0) - { - features.Add(tempfeatures[0]); - } - } - return features; - } - //程序启动的时候读取配置文件 public static void SetParams() @@ -358,8 +344,8 @@ #region wxl 从layerconfig.xml中读取 - layerConfig = XmlTools.DeserializeFromXml(layerConfigFile); - List dataSrcs = layerConfig.datasrcs; + LayerConfig = XmlTools.DeserializeFromXml(layerConfigFile); + List dataSrcs = LayerConfig.datasrcs; foreach (var dataSrc in dataSrcs) { @@ -598,76 +584,49 @@ #endregion } - /* - //判断网络是否连接 - public static bool isNetworkConnectionSuccess(string ipAdress) + /// + /// 获取Config.xml配置文件中的roleurl配置，并返回 + /// + /// 请求综合信息平台的服务地址 + public static void SysInfoConfig() { - //return true; - if (ipAdress == null) - { - return false; - } - if (ipAdress.Contains("\\")) - { - ipAdress = ipAdress.Substring(0, ipAdress.LastIndexOf('\\')); - } - if (ipAdress.Trim() == "localhost" || ipAdress.Trim() == "127.0.0.1" || ipAdress.Trim() == Dns.GetHostName()) - { - return true; - } - Ping ping = new Ping(); + if (!File.Exists(filename)) return; + + XmlTextReader xmlReader = new XmlTextReader(filename); try { - PingReply pr = ping.Send(ipAdress.Trim(), 3000); - if (pr.Status == IPStatus.Success) + while (xmlReader.Read()) { - return true; + if (xmlReader.Name.Equals("roleurl")) + { + RoleServer = xmlReader.ReadElementString(); + } + else if (xmlReader.Name.Equals("titleimgpath")) + { + TitleImagePath = xmlReader.ReadElementString(); + } + else if (xmlReader.Name.Equals("sysname")) + { + SysnameVersion = xmlReader.ReadElementString(); + } + else if (xmlReader.Name.Equals("copyright")) + { + Copyright = xmlReader.ReadElementString(); + } } - else - { - return false; - } + } catch (Exception ex) { - LogError.PublishError(ex); - return false; + + LogHelper.Error("在config.xml配置文件中读取roleurl时出错"); } - } - */ - - - //TODO LIST:下面两个方法移到featueTools.cs中 - //根据附属物图层名字得到里面含有的附属物 - public static string[] getAccStrsByLayer(string layername) - { - string[] accStrs = null; - string sql = "select 附属物名称 from " + layername + " group by 附属物名称"; - DataSet dataset = OledbHelper.getDataSet(sql, layername); - if (dataset == null) return null; - accStrs = new string[dataset.Tables[0].Rows.Count]; - for (int i = 0; i < dataset.Tables[0].Rows.Count; i++) + finally { - accStrs[i] = dataset.Tables[0].Rows[i][0].ToString(); + xmlReader.Close(); } - return accStrs; } - //删除内存图层中指定名称的feature - public static void RemoveFeatureFromName(GSOGlobeControl globeControl1, string featureName) - { - GSOFeatures features = globeControl1.Globe.MemoryLayer.GetFeatureByName(featureName, true); - if (features != null) - { - for (int i = features.Length - 1; i >= 0; i--) - { - GSOFeature feature = features[i]; - if (feature != null) - { - globeControl1.Globe.MemoryLayer.RemoveFeatureByID(feature.ID); - } - } - } - globeControl1.Refresh(); - } + + } } diff --git a/ValidateInfo.cs b/ValidateInfo.cs index de75391..01546da 100644 --- a/ValidateInfo.cs +++ b/ValidateInfo.cs @@ -192,7 +192,7 @@ } if (!isSuccess) { - LogHelper.WriteLog(typeof(FieldUniqueValidate), logStr); + LogHelper.Error(logStr); } return isSuccess; } @@ -247,7 +247,7 @@ err += "未找到字段或其类型匹配:" + unFoundField.label + ":" + unFoundField.type + "\r\n"; } - LogHelper.WriteLog(typeof(FieldCountValidate), err); + LogHelper.Error(err); return false; } return true; @@ -316,7 +316,7 @@ { err += "字段:" + field.label + "出错\r\n"; } - LogHelper.WriteLog(typeof(FieldOrderValidate), err); + LogHelper.Error(err); return false; } return true; @@ -388,8 +388,7 @@ } if (isSuccess == false) { - LogHelper.WriteLog(typeof(FieldEmptyValidate), - "字段为空检查失败:\r\n" + err); + LogHelper.Error("字段为空检查失败:\r\n" + err); } return isSuccess; } diff --git a/bin/x86/Debug/Config.xml b/bin/x86/Debug/Config.xml index 6995f64..6a453a3 100644 --- a/bin/x86/Debug/Config.xml +++ b/bin/x86/Debug/Config.xml @@ -25,6 +25,11 @@ http://127.0.0.1/Cyberpipe.msi http://127.0.0.1/Config.xml + http://192.168.0.102:8080/ctrl + /Resource/title.jpg + 智慧太湖新城管网规划分析系统6.0 + @2014-2015 苏州航天系统工程有限公司 版权所有 + 编号,管线编码,管径_毫米,材质,埋设方式,起始地面高程,起始埋深,终止地面高程,终止埋深,建设年代,使用年限,权属单位,设计单位,设计负责人,施工单位,施工负责人,监理单位,监理负责人,业务负责人,备注 编号,管线编码,管径_毫米,材质,埋设方式,起始地面高程,起始埋深,终止地面高程,终止埋深,建设年代,使用年限,权属单位,设计单位,设计负责人,施工单位,施工负责人,监理单位,监理负责人,业务负责人,备注 diff --git a/bin/x86/Debug/config/log4net.config b/bin/x86/Debug/config/log4net.config index 80f9b25..6fbcfa7 100644 --- a/bin/x86/Debug/config/log4net.config +++ b/bin/x86/Debug/config/log4net.config @@ -3,29 +3,118 @@
- - - - - - - - - - - - - - - + + + -property: [%property{NDC}] - %n错误描述：%message%newline %n"/> - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/bin/x86/Debug/glVersion.txt b/bin/x86/Debug/glVersion.txt index cd82eca..755455e 100644 --- a/bin/x86/Debug/glVersion.txt +++ b/bin/x86/Debug/glVersion.txt Binary files differ diff --git a/bin/x86/Debug/log.txt b/bin/x86/Debug/log.txt index a4966d3..2112642 100644 --- a/bin/x86/Debug/log.txt +++ b/bin/x86/Debug/log.txt @@ -430,3 +430,43 @@ exception over ------------------------------------------------------------ + + exception begin -----------------2016/11/29 18:54:54--------------------- + + + + e.Message:第 29 行，位置 4 上的开始标记“titleimagpath”与结束标记“titleimagepath”不匹配。 第 29 行，位置 39。 + + e.Source:System.Xml + + e.TargetSite:Void Throw(System.String, System.String[]) + + e.StackTrace: 在 System.Xml.XmlTextReaderImpl.Throw(String res, String[] args) + 在 System.Xml.XmlTextReaderImpl.ThrowTagMismatch(NodeData startTag) + 在 System.Xml.XmlTextReaderImpl.ParseEndElement() + 在 System.Xml.XmlTextReaderImpl.ParseElementContent() + 在 Cyberpipe.Utility.SetParams() 位置 E:\wxl\work\GHFX_REFACTOR\Utility.cs:行号 208 + + + + exception over ------------------------------------------------------------ + + exception begin -----------------2016/11/29 18:57:17--------------------- + + + + e.Message:第 29 行，位置 4 上的开始标记“titleimagpath”与结束标记“titleimagepath”不匹配。 第 29 行，位置 39。 + + e.Source:System.Xml + + e.TargetSite:Void Throw(System.String, System.String[]) + + e.StackTrace: 在 System.Xml.XmlTextReaderImpl.Throw(String res, String[] args) + 在 System.Xml.XmlTextReaderImpl.ThrowTagMismatch(NodeData startTag) + 在 System.Xml.XmlTextReaderImpl.ParseEndElement() + 在 System.Xml.XmlTextReaderImpl.ParseElementContent() + 在 Cyberpipe.Utility.SetParams() 位置 E:\wxl\work\GHFX_REFACTOR\Utility.cs:行号 208 + + + + exception over ------------------------------------------------------------ diff --git a/bin/x86/Debug/log/2016/201611/20161107.txt b/bin/x86/Debug/log/2016/201611/20161107.txt deleted file mode 100644 index cd32fa6..0000000 --- a/bin/x86/Debug/log/2016/201611/20161107.txt +++ /dev/null @@ -1,152 +0,0 @@ - - -��¼ʱ�䣺2016-11-07 10:30:22,327 -�߳�ID:[9] -��־���� ERROR -�����ࣺCyberpipe.FrmBSQStatis property: [(null)] - -����������1 - - - -��¼ʱ�䣺2016-11-07 10:30:40,660 -�߳�ID:[9] -��־���� ERROR -�����ࣺCyberpipe.FrmBSQStatis property: [(null)] - -����������0 - - - -��¼ʱ�䣺2016-11-07 14:00:27,070 -�߳�ID:[8] -��־���� ERROR -�����ࣺCyberpipe.Forms.FrmPipelineModelDB property: [(null)] - -����������δ�������������õ������ʵ���� - - - -��¼ʱ�䣺2016-11-07 14:00:36,154 -�߳�ID:[8] -��־���� ERROR -�����ࣺCyberpipe.Forms.FrmPipelineModelDB property: [(null)] - -����������δ�������������õ������ʵ���� - - - -��¼ʱ�䣺2016-11-07 14:00:40,186 -�߳�ID:[8] -��־���� ERROR -�����ࣺCyberpipe.Forms.FrmPipelineModelDB property: [(null)] - -����������δ�������������õ������ʵ���� - - - -��¼ʱ�䣺2016-11-07 14:05:46,422 -�߳�ID:[9] -��־���� ERROR -�����ࣺCyberpipe.Forms.FrmPipelineModelDB property: [(null)] - -����������δ�������������õ������ʵ���� - - - -��¼ʱ�䣺2016-11-07 14:06:34,633 -�߳�ID:[10] -��־���� ERROR -�����ࣺCyberpipe.Forms.FrmPipelineModelDB property: [(null)] - -����������δ�������������õ������ʵ���� - - - -��¼ʱ�䣺2016-11-07 14:06:36,301 -�߳�ID:[10] -��־���� ERROR -�����ࣺCyberpipe.Forms.FrmPipelineModelDB property: [(null)] - -����������δ�������������õ������ʵ���� - - - -��¼ʱ�䣺2016-11-07 14:06:44,800 -�߳�ID:[10] -��־���� ERROR -�����ࣺCyberpipe.Forms.FrmPipelineModelDB property: [(null)] - -����������δ�������������õ������ʵ���� - - - -��¼ʱ�䣺2016-11-07 14:07:03,449 -�߳�ID:[10] -��־���� ERROR -�����ࣺCyberpipe.Forms.FrmPipelineModelDB property: [(null)] - -����������δ�������������õ������ʵ���� - - - -��¼ʱ�䣺2016-11-07 14:07:05,165 -�߳�ID:[10] -��־���� ERROR -�����ࣺCyberpipe.Forms.FrmPipelineModelDB property: [(null)] - -����������δ�������������õ������ʵ���� - - - -��¼ʱ�䣺2016-11-07 17:58:24,384 -�߳�ID:[10] -��־���� ERROR -�����ࣺCyberpipe.Forms.FrmPipelineModelDB property: [(null)] - -����������δ�������������õ������ʵ���� - - - -��¼ʱ�䣺2016-11-07 18:11:22,114 -�߳�ID:[8] -��־���� ERROR -�����ࣺCyberpipe.Forms.FrmPipelineModelDB property: [(null)] - -����������δ�������������õ������ʵ���� - - - -��¼ʱ�䣺2016-11-07 18:12:13,619 -�߳�ID:[8] -��־���� ERROR -�����ࣺCyberpipe.Forms.FrmPipelineModelDB property: [(null)] - -����������δ�������������õ������ʵ���� - - - -��¼ʱ�䣺2016-11-07 18:12:33,268 -�߳�ID:[8] -��־���� ERROR -�����ࣺCyberpipe.Forms.FrmPipelineModelDB property: [(null)] - -����������δ�������������õ������ʵ���� - - - -��¼ʱ�䣺2016-11-07 18:12:43,628 -�߳�ID:[8] -��־���� ERROR -�����ࣺCyberpipe.Forms.FrmPipelineModelDB property: [(null)] - -����������δ�������������õ������ʵ���� - - - -��¼ʱ�䣺2016-11-07 18:12:53,488 -�߳�ID:[8] -��־���� ERROR -�����ࣺCyberpipe.Forms.FrmPipelineModelDB property: [(null)] - -����������δ�������������õ������ʵ���� - - - -��¼ʱ�䣺2016-11-07 18:13:31,996 -�߳�ID:[8] -��־���� ERROR -�����ࣺCyberpipe.Forms.FrmPipelineModelDB property: [(null)] - -����������δ�������������õ������ʵ���� - - - -��¼ʱ�䣺2016-11-07 18:16:05,234 -�߳�ID:[9] -��־���� ERROR -�����ࣺCyberpipe.Forms.FrmPipelineModelDB property: [(null)] - -����������δ�������������õ������ʵ���� - diff --git a/FeatureStatisticsService.cs b/FeatureStatisticsService.cs index 331ee47..b127fe3 100644 --- a/FeatureStatisticsService.cs +++ b/FeatureStatisticsService.cs @@ -190,7 +190,7 @@ List result = new List(); //layer.Name是表名 - string[] accessStrs = Utility.getAccStrsByLayer(layer.Name); + string[] accessStrs = FeatureTools.GetAccStrsByLayer(layer.Name); foreach (string accssname in accessStrs) { diff --git a/FeatureTools.cs b/FeatureTools.cs index be4b469..3c08f34 100644 --- a/FeatureTools.cs +++ b/FeatureTools.cs @@ -1,5 +1,6 @@ using System; using System.Collections.Generic; +using System.Data; using System.Linq; using System.Text; using System.Windows.Forms; @@ -43,7 +44,7 @@ } feature.Delete();//地球上删除该feature string sql = "delete from " + layerName + " where LSSYS_ID =" + feature.ID + " and (编号 is null or substr(编号,length(编号)-2)='TMP')"; - OledbHelper.sqlExecuteNonQuery(sql);//目前无法取到LSSYS_ID，所以这个判断条件不太合适，会导致把该类所有新建的都删除了 + OledbHelper.sqlExecuteNonQuery(sql); } catch (Exception) { @@ -106,5 +107,46 @@ } return value; } + + /// + /// 根据附属物图层名字得到里面含有的附属物 + /// + /// + /// + public static string[] GetAccStrsByLayer(string layername) + { + string[] accStrs = null; + string sql = "select 附属物名称 from " + layername + " group by 附属物名称"; + DataSet dataset = OledbHelper.getDataSet(sql, layername); + if (dataset == null) return null; + accStrs = new string[dataset.Tables[0].Rows.Count]; + for (int i = 0; i < dataset.Tables[0].Rows.Count; i++) + { + accStrs[i] = dataset.Tables[0].Rows[i][0].ToString(); + } + return accStrs; + } + + /// + /// 删除内存图层中指定名称的feature + /// + /// + /// + public static void RemoveFeatureFromName(GSOGlobeControl globeControl1, string featureName) + { + GSOFeatures features = globeControl1.Globe.MemoryLayer.GetFeatureByName(featureName, true); + if (features != null) + { + for (int i = features.Length - 1; i >= 0; i--) + { + GSOFeature feature = features[i]; + if (feature != null) + { + globeControl1.Globe.MemoryLayer.RemoveFeatureByID(feature.ID); + } + } + } + globeControl1.Refresh(); + } } } diff --git a/Forms/FrmPipelineModelDataBase.cs b/Forms/FrmPipelineModelDataBase.cs index b577fd8..bc1e479 100644 --- a/Forms/FrmPipelineModelDataBase.cs +++ b/Forms/FrmPipelineModelDataBase.cs @@ -149,7 +149,7 @@ catch (Exception ex) { LogError.PublishError(ex); - LogHelper.WriteLog(typeof(FrmPipelineModelDB), ex.Message); + LogHelper.Error(ex.Message); } } diff --git a/FrmAccessoriesSensor.cs b/FrmAccessoriesSensor.cs index 98aa1cf..542f19a 100644 --- a/FrmAccessoriesSensor.cs +++ b/FrmAccessoriesSensor.cs @@ -240,7 +240,7 @@ { if (clbPipeLine.CheckedItems.Count > 0) { - Utility.RemoveFeatureFromName(globeControl1, "trackPolygon"); + FeatureTools.RemoveFeatureFromName(globeControl1, "trackPolygon"); globeControl1.Globe.Action = EnumAction3D.TrackPolygon; globeControl1.TrackPolygonEndEvent += globeControl1_TrackPolygonEndEvent; } @@ -259,7 +259,7 @@ private void FrmAccessoriesgather_FormClosing(object sender, FormClosingEventArgs e) { frm = null; - Utility.RemoveFeatureFromName(globeControl1, "trackPolygon"); + FeatureTools.RemoveFeatureFromName(globeControl1, "trackPolygon"); globeControl1.Globe.Action = EnumAction3D.ActionNull; globeControl1.TrackPolygonEndEvent -= globeControl1_TrackPolygonEndEvent; } diff --git a/FrmAccessoriesgather.cs b/FrmAccessoriesgather.cs index e1d176e..c36273b 100644 --- a/FrmAccessoriesgather.cs +++ b/FrmAccessoriesgather.cs @@ -118,7 +118,7 @@ { if (clbPipeLine2.Text!="") { - Utility.RemoveFeatureFromName(globeControl1, "trackPolygon"); + FeatureTools.RemoveFeatureFromName(globeControl1, "trackPolygon"); globeControl1.Globe.Action = EnumAction3D.TrackPolygon; globeControl1.Globe.TrackPolygonTool.TrackMode = EnumTrackMode.SpaceTrack; globeControl1.TrackPolygonEndEvent += globeControl1_TrackPolygonEndEvent; @@ -295,7 +295,7 @@ private void FrmAccessoriesgather_FormClosing(object sender, FormClosingEventArgs e) { frm = null; - Utility.RemoveFeatureFromName(globeControl1, "trackPolygon"); + FeatureTools.RemoveFeatureFromName(globeControl1, "trackPolygon"); globeControl1.TrackPolygonEndEvent -= globeControl1_TrackPolygonEndEvent; globeControl1.Globe.Action = EnumAction3D.ActionNull; diff --git a/FrmAddWellShp.cs b/FrmAddWellShp.cs index 7983349..78d8946 100644 --- a/FrmAddWellShp.cs +++ b/FrmAddWellShp.cs @@ -100,7 +100,7 @@ catch (Exception ex) { LogError.PublishError(ex); - LogHelper.WriteLog(typeof(FrmAddWellShp), ex.Message); + LogHelper.Error(ex.Message); } } diff --git a/FrmBSQStatis.cs b/FrmBSQStatis.cs index 5b05926..b5e581d 100644 --- a/FrmBSQStatis.cs +++ b/FrmBSQStatis.cs @@ -97,7 +97,7 @@ } catch (Exception ex) { - LogHelper.WriteLog(typeof(FrmBSQStatis),ex.Message); + LogHelper.Error(ex.Message); } return typeAndCount; } @@ -108,7 +108,7 @@ GSOLayer layer = globeControl1.Globe.Layers.GetLayerByCaption("标识器"); GSOFeatures bsqFs = FeatureStatisticsService.GetLayerFeatures(polygon, layer); if (bsqFs == null || bsqFs.Length <= 0) { - LogHelper.WriteLog(typeof(FrmBSQStatis),"标识器图层下的Feature为空"); + LogHelper.Error("标识器图层下的Feature为空!"); return null; } diff --git a/FrmBasicQuery.cs b/FrmBasicQuery.cs index baeeade..cc8d3ff 100644 --- a/FrmBasicQuery.cs +++ b/FrmBasicQuery.cs @@ -224,7 +224,7 @@ } catch(Exception ex) { - LogHelper.WriteLog(typeof(FrmBasicQuery), ex.Message); + LogHelper.Error(ex.Message); } } else diff --git a/FrmCodingQuery.cs b/FrmCodingQuery.cs index f1ac322..d4ec095 100644 --- a/FrmCodingQuery.cs +++ b/FrmCodingQuery.cs @@ -82,7 +82,7 @@ } catch (Exception ex) { - LogHelper.WriteLog(typeof(FrmCodingQuery), ex.Message); ; + LogHelper.Error(ex.Message); } } diff --git a/FrmDiameterQuery.cs b/FrmDiameterQuery.cs index e7b3657..75d7949 100644 --- a/FrmDiameterQuery.cs +++ b/FrmDiameterQuery.cs @@ -150,7 +150,7 @@ catch (Exception ex) { //LogError.PublishError(ex); - LogHelper.WriteLog(typeof(FrmDiameterQuery), ex.Message); + LogHelper.Error(ex.Message); MessageBox.Show("请输入正确的管径范围！"); return; } diff --git a/FrmFittingQuery.cs b/FrmFittingQuery.cs index 12f6007..8645011 100644 --- a/FrmFittingQuery.cs +++ b/FrmFittingQuery.cs @@ -69,7 +69,7 @@ } catch (Exception ex) { - LogHelper.WriteLog(typeof(FrmFittingQuery), ex.Message); + LogHelper.Error(ex.Message); } } /// diff --git a/FrmKeywordQuery.cs b/FrmKeywordQuery.cs index 405524f..ede0a93 100644 --- a/FrmKeywordQuery.cs +++ b/FrmKeywordQuery.cs @@ -87,7 +87,7 @@ } catch (Exception ex) { - LogHelper.WriteLog(typeof(FrmKeywordQuery), ex.Message); + LogHelper.Error(ex.Message); } } diff --git a/FrmLogin.cs b/FrmLogin.cs index 1172c23..6fbaed9 100644 --- a/FrmLogin.cs +++ b/FrmLogin.cs @@ -2,6 +2,8 @@ using System.Data; using System.Data.OracleClient; using System.IO; +using System.Net; +using System.Text; using System.Windows.Forms; using System.Xml; using DevComponents.DotNetBar; @@ -10,16 +12,15 @@ { public partial class FrmLogin : Office2007Form { + + //登录界面 -- 配置文件的路径 + public static string filename = Application.StartupPath + "\\login.xml"; + + public FrmLogin() { InitializeComponent(); } - public string rolename = "浏览"; - public string username = ""; - public string department = ""; - - //登录界面 -- 配置文件的路径 - public static string filename = Application.StartupPath + "\\login.xml"; /// /// 登录按钮事件处理 /// @@ -28,9 +29,10 @@ private void button1_Click(object sender, EventArgs e) { bool result = ValidateUser(); +// bool result =ValidateFromUrl();//从平台获取用户角色信息，判断是否能登陆成功 if (result) { - username = txtUser.Text.Trim(); + WriteXml(); Utility.userName = txtUser.Text.Trim(); DialogResult = DialogResult.OK; Close(); @@ -43,80 +45,6 @@ } } /// - /// 关闭按钮事件处理 - /// - /// - /// - private void button2_Click(object sender, EventArgs e) - { - Close(); - } - /// - /// 验证端口号 - /// - /// - //private bool ValiPort() - //{ - // Ping p = new Ping();//创建Ping对象p - // PingReply pr = p.Send(Utility.localicenseserverip);//向指定IP或者主机名的计算机发送ICMP协议的ping数据包 - // if (pr.Status == IPStatus.Success)//如果ping成功 - // { - // try - // { - // TcpClient tcpc = new TcpClient(Utility.localicenseserverip, Utility.localicenseserverport);//对IP地址为"192.168.0.105"的计算机的1500端口提出连接申请 - // tcpc.Close(); - // return true; - // } - // catch (Exception ex) - // { - // LogError.PublishError(ex); - // MessageBox.Show("端口连接错误！" + ex.Message); - // return false; - // } - // } - // else - // { - // int times = 0;//重新连接次数; - // int count = 2;//设置尝试次数 - // while (times < count) - // { - // //Thread.Sleep(1000);//等待时间(方便测试的话，你可以改为1000) - // pr = p.Send(Utility.localicenseserverip); - - // if (pr.Status == IPStatus.Success) - // { - // try - // { - // TcpClient tcpc = new TcpClient(Utility.localicenseserverip, Utility.localicenseserverport);//对IP地址为"192.168.0.105"的计算机的1500端口提出连接申请 - // tcpc.Close(); - // return true; - // } - // catch (Exception ex) - // { - // LogError.PublishError(ex); - // MessageBox.Show("端口连接错误！" + ex.Message); - // return false; - // } - // } - // else - // { - // times++; - // if (times < count) - // { - // continue; - // } - // else - // { - // MessageBox.Show("重新尝试连接失败"); - // return false; - // } - // } - - // } - // return false; - // } - //} - /// /// 验证用户名、密码 /// /// @@ -126,24 +54,64 @@ string sql = "select * from casic_userinfotest where USERNAME='" + txtUser.Text.Trim() + "' and PASSWORD='" + passWord + "' and sysname='GHFX' "; DataTable dt = OledbHelper.QueryTable(sql); - if (dt != null && dt.Rows.Count > 0) + if (dt == null || dt.Rows.Count <= 0) return false; + if (String.IsNullOrEmpty(dt.Rows[0]["rid"].ToString())) return true; + sql = "select gid from casic_userroletest where id=" + dt.Rows[0]["rid"] + " and sysname='GHFX' "; + using (OracleDataReader reader = OracleUtils.ExecuteReader(OracleUtils.ConnectionString, CommandType.Text, sql)) { - WriteXML(); - if (!String.IsNullOrEmpty(dt.Rows[0]["rid"].ToString())) + while (reader.Read()) { - sql = "select gid from casic_userroletest where id=" + dt.Rows[0]["rid"] + " and sysname='GHFX' "; - using (OracleDataReader reader = OracleUtils.ExecuteReader(OracleUtils.ConnectionString, CommandType.Text, sql)) - { - while (reader.Read()) - { - Utility.userRole = reader[0].ToString(); - break; - } - } + Utility.userRole = reader[0].ToString(); + LogHelper.Debug("测试一下"); + break; } - return true; } - return false; + return true; + } + + + + private bool ValidateFromUrl() + { + string user = txtUser.Text.Trim(); + string pwd = textBoxPassWord.Text.Trim(); + //做成配置的 + string roleserver = Utility.RoleServer; + if (roleserver == null || roleserver.Trim().Equals("")) + { + MessageBox.Show("请在Config.xml中配置roleurl！"); + return false; + } + HttpWebRequest request = + WebRequest.Create(roleserver+"/rs/authority/user?username=" + user + "&password=" + pwd + "&appId=21") as HttpWebRequest; + if (request == null) return false; + using (HttpWebResponse response = request.GetResponse() as HttpWebResponse) + { + try + { + if (response == null || response.GetResponseStream() == null) return false; + StreamReader reader = new StreamReader(response.GetResponseStream()); + string[] result = reader.ReadToEnd().Split(','); + //解析result + if (result.Length < 5) return false; + StringBuilder userRole = new StringBuilder(""); + for (int i = 4; i < result.Length; i++) + { + string[] tmpStrings = result[i].Split('_'); + if (tmpStrings.Length < 2) continue; + userRole.Append(tmpStrings[1].Trim() + ","); + } + if (userRole.Length < 3) return false; + userRole.Remove(userRole.Length - 3, 3); + // MessageBox.Show(userRole.ToString()); + Utility.userRole = userRole.ToString(); + return Utility.userRole != null && !Utility.userRole.Equals("null"); + } + catch (Exception e) + { + return false; + } + } } private void FrmLogin_Load(object sender, EventArgs e) @@ -153,74 +121,56 @@ StartPosition = FormStartPosition.CenterScreen; - ReadXML(); + ReadXml(); } /// /// 读取上一次登录的用户名和密码 /// - private void ReadXML() + private void ReadXml() { - if (File.Exists(filename)) + if (!File.Exists(filename)) return; + //初始化XML文档操作类 + XmlDocument myDoc = new XmlDocument(); { - if (!File.Exists(filename)) + //加载XML文件 + try { + myDoc.Load(filename); + } + catch (Exception e) + { + LogError.PublishError(e); return; } - - //初始化XML文档操作类 - XmlDocument myDoc = new XmlDocument(); + //搜索指定的节点 + XmlNode serverRootNode = myDoc.SelectSingleNode("Params"); + XmlNodeList nodes = null; + if (serverRootNode != null) { - //加载XML文件 - try + nodes = serverRootNode.ChildNodes; + } + if (nodes == null) return; + foreach (XmlNode xn in nodes) + { + if (xn.Name.Equals("username")) { - myDoc.Load(filename); + txtUser.Text = xn.InnerText.Trim(); } - catch (Exception e) + else if (xn.Name.Equals("password")) { - LogError.PublishError(e); - return; + textBoxPassWord.Text = xn.InnerText.Trim(); } - //搜索指定的节点 - XmlNode serverRootNode = myDoc.SelectSingleNode("Params"); - XmlNodeList nodes = null; - if (serverRootNode != null) + else if (xn.Name.Equals("isremember")) { - nodes = serverRootNode.ChildNodes; - } - if (nodes != null) - { - foreach (XmlNode xn in nodes) - { - if (xn.Name == "username") - { - txtUser.Text = xn.InnerText.Trim(); - } - else if (xn.Name == "password") - { - textBoxPassWord.Text = xn.InnerText.Trim(); - } - else if (xn.Name == "isremember") - { - if (xn.InnerText.Trim() == "true") - { - checkBoxXRememberPassword.Checked = true; - } - else if (xn.InnerText.Trim() == "false") - { - checkBoxXRememberPassword.Checked = false; - } - } - } - + checkBoxXRememberPassword.Checked = xn.InnerText.Trim().Equals("true"); } } } - } /// /// 记录登录的用户名和密码 /// - private void WriteXML() + private void WriteXml() { if (!File.Exists(filename)) { @@ -252,31 +202,17 @@ foreach (XmlNode xn in nodes) { XmlElement xe = (XmlElement)xn; - if (xe.Name == "username") + if (xe.Name.Equals("username")) { xe.InnerText = txtUser.Text.Trim(); } - else if (xe.Name == "password") + else if (xe.Name.Equals("password")) { - if (checkBoxXRememberPassword.Checked) - { - xe.InnerText = textBoxPassWord.Text.Trim(); - } - else - { - xe.InnerText = ""; - } + xe.InnerText = checkBoxXRememberPassword.Checked ? textBoxPassWord.Text.Trim() : ""; } - else if (xe.Name == "isremember") + else if (xe.Name.Equals("isremember")) { - if (checkBoxXRememberPassword.Checked) - { - xe.InnerText = "true"; - } - else - { - xe.InnerText = "false"; - } + xe.InnerText = checkBoxXRememberPassword.Checked ? "true" : "false"; } } } diff --git a/FrmMaterialSel.cs b/FrmMaterialSel.cs index 8645ab3..d23f385 100644 --- a/FrmMaterialSel.cs +++ b/FrmMaterialSel.cs @@ -157,7 +157,7 @@ } catch (Exception ex) { - LogHelper.WriteLog(typeof(FrmMaterialSel), ex.Message); + LogHelper.Error(ex.Message); } } diff --git a/FrmMetadataStat.cs b/FrmMetadataStat.cs index c3c1359..96029a6 100644 --- a/FrmMetadataStat.cs +++ b/FrmMetadataStat.cs @@ -96,7 +96,7 @@ //统计有多少个图层 private int statistLayer() { - List datasrcs = Utility.layerConfig.datasrcs; + List datasrcs = Utility.LayerConfig.datasrcs; return datasrcs.SelectMany(datasrc => datasrc.layertypes).Sum(layerType => layerType.layers.Count); } diff --git a/FrmpipeDeepstatis.cs b/FrmpipeDeepstatis.cs index 6a5c895..8d915a9 100644 --- a/FrmpipeDeepstatis.cs +++ b/FrmpipeDeepstatis.cs @@ -2,6 +2,7 @@ using System.Collections.Generic; using System.Diagnostics; using System.IO; +using System.Reflection; using System.Text; using System.Windows.Forms; using System.Windows.Forms.DataVisualization.Charting; @@ -320,7 +321,7 @@ MessageBox.Show("请添加分段"); return; } - Utility.RemoveFeatureFromName(globeControl1, "trackPolygon"); + FeatureTools.RemoveFeatureFromName(globeControl1, "trackPolygon"); globeControl1.Globe.Action = EnumAction3D.TrackPolygon; globeControl1.Globe.TrackPolygonTool.TrackMode = EnumTrackMode.SpaceTrack; globeControl1.TrackPolygonEndEvent += globeControl1_TrackPolygonEndEvent; @@ -408,12 +409,11 @@ TextBox control; private void dataGridViewX2_EditingControlShowing(object sender, DataGridViewEditingControlShowingEventArgs e) { - if (e.Control.GetType().BaseType.Name == "TextBox") - { - control = new TextBox(); - control = (TextBox)e.Control; - control.KeyPress += control_KeyPress; - } + MemberInfo memberInfo = e.Control.GetType().BaseType; + if (memberInfo != null && !memberInfo.Name.Equals("TextBox")) return; + control = new TextBox(); + control = (TextBox)e.Control; + control.KeyPress += control_KeyPress; } /// /// 键盘按键按下事件处理 @@ -423,28 +423,24 @@ void control_KeyPress(object sender, KeyPressEventArgs e) { TextBox text = sender as TextBox; + if (text == null) return; if ((e.KeyChar < 48 || e.KeyChar > 57) && (e.KeyChar != 8) && e.KeyChar != 46) { e.Handled = true; } - if (e.KeyChar == 46) //小数点 + if (e.KeyChar != 46) return; + if (text.Text.Length <= 0) + e.Handled = true; //小数点不能在第一位 + else //处理不规则的小数点 { - if (text.Text.Length <= 0) - e.Handled = true; //小数点不能在第一位 - else //处理不规则的小数点 + float f; + float oldf; + bool b1 = false, b2 = false; + b1 = float.TryParse(text.Text, out oldf); + b2 = float.TryParse(text.Text + e.KeyChar, out f); + if (!b2) { - float f; - float oldf; - bool b1 = false, b2 = false; - b1 = float.TryParse(text.Text, out oldf); - b2 = float.TryParse(text.Text + e.KeyChar, out f); - if (b2 == false) - { - if (b1) - e.Handled = true; - else - e.Handled = false; - } + e.Handled = b1; } } } @@ -457,7 +453,7 @@ { frm = null; - Utility.RemoveFeatureFromName(globeControl1, "trackPolygon"); + FeatureTools.RemoveFeatureFromName(globeControl1, "trackPolygon"); globeControl1.TrackPolygonEndEvent -= globeControl1_TrackPolygonEndEvent; globeControl1.Globe.Action = EnumAction3D.ActionNull; diff --git a/FrmpipeDiametergather.cs b/FrmpipeDiametergather.cs index a9d96fa..c09aaf1 100644 --- a/FrmpipeDiametergather.cs +++ b/FrmpipeDiametergather.cs @@ -154,7 +154,7 @@ MessageBox.Show("请选择图层！"); return; } - Utility.RemoveFeatureFromName(globeControl1, "trackPolygon"); + FeatureTools.RemoveFeatureFromName(globeControl1, "trackPolygon"); globeControl1.Globe.Action = EnumAction3D.TrackPolygon; globeControl1.Globe.TrackPolygonTool.TrackMode = EnumTrackMode.SpaceTrack; globeControl1.TrackPolygonEndEvent += globeControl1_TrackPolygonEndEvent; @@ -392,7 +392,7 @@ private void FrmpipeDiametergather_FormClosing(object sender, FormClosingEventArgs e) { frm = null; - Utility.RemoveFeatureFromName(globeControl1, "trackPolygon"); + FeatureTools.RemoveFeatureFromName(globeControl1, "trackPolygon"); globeControl1.TrackPolygonEndEvent -= globeControl1_TrackPolygonEndEvent; globeControl1.Globe.Action = EnumAction3D.ActionNull; diff --git a/FrmpipeMaterialGather.cs b/FrmpipeMaterialGather.cs index 44e7f24..5ca8144 100644 --- a/FrmpipeMaterialGather.cs +++ b/FrmpipeMaterialGather.cs @@ -58,10 +58,9 @@ for (int i = 0; i < pipeLayerNames.Count; i++) { clbPipeLine.Items.Add(pipeLayerNames[i]); - GSOLayer layer = globeControl1.Globe.Layers.GetLayerByCaption(pipeLayerNames[i]); - if (layer.Dataset == null || !layer.Dataset.IsFeatureDataset || layer.Type != EnumLayerType.FeatureLayer) continue; + GSOLayer layer = globeControl1.Globe.Layers.GetLayerByCaption(pipeLayerNames[i]); + if (layer == null || layer.Dataset == null || !layer.Dataset.IsFeatureDataset || layer.Type != EnumLayerType.FeatureLayer) continue; - string name = layer.Name; GSOFeatureLayer flayer = layer as GSOFeatureLayer; GSOFeatures feats = flayer.GetAllFeatures(); @@ -205,7 +204,7 @@ { chart1.Series.Add(clbPipeLine.CheckedItems[i].ToString()); GSOLayer layer = globeControl1.Globe.Layers.GetLayerByCaption(clbPipeLine.CheckedItems[i].ToString()); - if (layer != null && layer is GSOFeatureLayer) + if (layer is GSOFeatureLayer) { GSOFeatureLayer flayer = layer as GSOFeatureLayer; GSOFeatures features = flayer.GetAllFeatures(); @@ -240,10 +239,9 @@ labeStyleAxisX.Enabled = true; chart1.ChartAreas["ChartArea1"].AxisX.LabelStyle = labeStyleAxisX; - Dictionary dic1 = new Dictionary(); for (int j = 0; j < chart1.Series.Count; j++) { - dic1 = new Dictionary(); + Dictionary dic1 = new Dictionary(); foreach (string key in dic.Keys) { if (key.Contains(chart1.Series[j].Name)) @@ -304,7 +302,7 @@ MessageBox.Show("请选择材质类型！"); return; } - Utility.RemoveFeatureFromName(globeControl1, "trackPolygon"); + FeatureTools.RemoveFeatureFromName(globeControl1, "trackPolygon"); globeControl1.Globe.Action = EnumAction3D.TrackPolygon; globeControl1.Globe.TrackPolygonTool.TrackMode = EnumTrackMode.SpaceTrack; globeControl1.TrackPolygonEndEvent += globeControl1_TrackPolygonEndEvent; @@ -318,7 +316,7 @@ private void FrmpipeMaterialGather_FormClosing(object sender, FormClosingEventArgs e) { frm = null; - Utility.RemoveFeatureFromName(globeControl1, "trackPolygon"); + FeatureTools.RemoveFeatureFromName(globeControl1, "trackPolygon"); globeControl1.TrackPolygonEndEvent -= globeControl1_TrackPolygonEndEvent; globeControl1.Globe.Action = EnumAction3D.ActionNull; diff --git a/Frmpipediameterstatis.cs b/Frmpipediameterstatis.cs index 4fb25a8..631a996 100644 --- a/Frmpipediameterstatis.cs +++ b/Frmpipediameterstatis.cs @@ -202,8 +202,8 @@ } catch (Exception ex) { - LogHelper.WriteLog(typeof(Frmpipediameterstatis), ex.Message); //MessageBox.Show(ex.Message); + LogHelper.Error(ex.Message); LogError.PublishError(ex); } } @@ -372,7 +372,7 @@ MessageBox.Show("请添加分段！"); return; } - Utility.RemoveFeatureFromName(globeControl1, "trackPolygon"); + FeatureTools.RemoveFeatureFromName(globeControl1, "trackPolygon"); globeControl1.Globe.Action = EnumAction3D.TrackPolygon; globeControl1.Globe.TrackPolygonTool.TrackMode = EnumTrackMode.SpaceTrack; globeControl1.TrackPolygonEndEvent += globeControl1_TrackPolygonEndEvent; @@ -422,7 +422,7 @@ globeControl1.Globe.Action = EnumAction3D.ActionNull; globeControl1.TrackPolygonEndEvent -= globeControl1_TrackPolygonEndEvent; - Utility.RemoveFeatureFromName(globeControl1, "trackPolygon"); + FeatureTools.RemoveFeatureFromName(globeControl1, "trackPolygon"); globeControl1.Globe.MemoryLayer.RemoveAllFeature(); } diff --git a/LineBuilder.cs b/LineBuilder.cs index 33a216c..b6a8516 100644 --- a/LineBuilder.cs +++ b/LineBuilder.cs @@ -43,8 +43,8 @@ GSOGeoPolyline3D lineeee = f.Geometry as GSOGeoPolyline3D; if (lineeee == null || lineeee.GetSpaceLength(true, 6378137) == 0) { - LogHelper.WriteLog(typeof(LineBuilder), "出现数据无法入库:"+f.ID); - continue; //TODO LIST:判断是否会出现部署数据无法入库情况,Log2Net + LogHelper.Error("出现数据无法入库:" + f.ID); + continue; } GSOFeature newFeature = newFeatureSet.CreateFeature(); diff --git a/LogHelper.cs b/LogHelper.cs index 9ef5f27..04573cf 100644 --- a/LogHelper.cs +++ b/LogHelper.cs @@ -1,4 +1,5 @@ using System; +using System.Diagnostics; using log4net; using log4net.Config; @@ -7,35 +8,82 @@ { public class LogHelper { - /// - /// 输出日志到Log4Net - /// - /// - /// - #region static void WriteLog(Type t, Exception ex) - public static void WriteLog(Type t, Exception ex) + private static ILog _logdebug = log4net.LogManager.GetLogger("logdebug"); + private static ILog _loginfo = log4net.LogManager.GetLogger("loginfo"); + private static ILog _logwarn = log4net.LogManager.GetLogger("logwarn"); + private static ILog _logerror = log4net.LogManager.GetLogger("logerror"); + private static ILog _logfatal = log4net.LogManager.GetLogger("logfatal"); + + public static void Debug(string msg) { - ILog log = log4net.LogManager.GetLogger(t); - log.Error("Error", ex); + StackFrame sf = new StackFrame(1); + msg = string.Format("{0}.{1}:{2}", sf.GetMethod().ReflectedType.FullName, sf.GetMethod().Name, msg); + _logdebug.Debug(msg); + } + public static void Debug(string msg, Exception e) + { + StackFrame sf = new StackFrame(1); + msg = string.Format("{0}.{1}:{2}", sf.GetMethod().ReflectedType.FullName, sf.GetMethod().Name, msg); + _logdebug.Debug(msg, e); } - #endregion - /// - /// 输出日志到Log4Net - /// - /// - /// - #region static void WriteLog(Type t, string msg) - - public static void WriteLog(Type t, string msg) + public static void Info(string msg) { - ILog log = log4net.LogManager.GetLogger(t); - log.Error(msg); + StackFrame sf = new StackFrame(1); + msg = string.Format("{0}.{1}:{2}", sf.GetMethod().ReflectedType.FullName, sf.GetMethod().Name, msg); + _loginfo.Info(msg); + } + public static void Info(string msg, Exception e) + { + StackFrame sf = new StackFrame(1); + msg = string.Format("{0}.{1}:{2}", sf.GetMethod().ReflectedType.FullName, sf.GetMethod().Name, msg); + _loginfo.Info(msg, e); } - #endregion + + public static void Warn(string msg) + { + StackFrame sf = new StackFrame(1); + msg = string.Format("{0}.{1}:{2}", sf.GetMethod().ReflectedType.FullName, sf.GetMethod().Name, msg); + _logwarn.Warn(msg); + } + public static void Warn(string msg, Exception e) + { + StackFrame sf = new StackFrame(1); + msg = string.Format("{0}.{1}:{2}", sf.GetMethod().ReflectedType.FullName, sf.GetMethod().Name, msg); + _logwarn.Warn(msg, e); + } + + + public static void Error(string msg) + { + StackFrame sf = new StackFrame(1); + msg = string.Format("{0}.{1}:{2}", sf.GetMethod().ReflectedType.FullName, sf.GetMethod().Name, msg); + _logerror.Error(msg); + } + public static void Error(string msg, Exception e) + { + StackFrame sf = new StackFrame(1); + msg = string.Format("{0}.{1}:{2}", sf.GetMethod().ReflectedType.FullName, sf.GetMethod().Name, msg); + _logerror.Error(msg, e); + } + + + public static void Fatal(string msg) + { + StackFrame sf = new StackFrame(1); + msg = string.Format("{0}.{1}:{2}", sf.GetMethod().ReflectedType.FullName, sf.GetMethod().Name, msg); + _logfatal.Fatal(msg); + } + public static void Fatal(string msg, Exception e) + { + StackFrame sf = new StackFrame(1); + msg = string.Format("{0}.{1}:{2}", sf.GetMethod().ReflectedType.FullName, sf.GetMethod().Name, msg); + _logfatal.Fatal(msg, e); + } + } diff --git a/MainFrm.cs b/MainFrm.cs index 43de664..51f362a 100644 --- a/MainFrm.cs +++ b/MainFrm.cs @@ -18,7 +18,6 @@ using GeoScene.Data; using GeoScene.Engine; using GeoScene.Globe; -using Timer = System.Windows.Forms.Timer; using ToolTip = System.Windows.Forms.ToolTip; namespace Cyberpipe @@ -163,6 +162,7 @@ /// private void AddGZ() { + lendendGZ50 = new GSOHudButton(); lendendGZ50.SetImage(Application.StartupPath + "/Resource/管纵/50.png"); lendendGZ50.SetOffset(0, 0); @@ -1294,18 +1294,19 @@ private void MainFrm_Load(object sender, EventArgs e) { + layerTree.Nodes.Add("正在加载，请稍后……");//树状图加载在图层加载之后，故增加提示 initGlobalControl(); - //initGlobalMap(); - //initLayerTree(); initMarkerTree(); initLayout(); loadData(); - double x = Convert.ToDouble(Utility.Query_Roads["定位"].ToString().Split(',')[0]); - double y = Convert.ToDouble(Utility.Query_Roads["定位"].ToString().Split(',')[1]); - double z = Convert.ToDouble(Utility.Query_Roads["定位"].ToString().Split(',')[2]); + + double x = Convert.ToDouble(Utility.Query_Roads["绿岛"].ToString().Split(',')[0]); + double y = Convert.ToDouble(Utility.Query_Roads["绿岛"].ToString().Split(',')[1]); + double z = Convert.ToDouble(Utility.Query_Roads["绿岛"].ToString().Split(',')[2]); jumpToCameraState(x, y, z); + } #endregion @@ -1315,11 +1316,17 @@ if (e.Layer == null || !e.Layer.Caption.Equals(Utility.roadLayerName)) return; foreach (TreeNode layerTreeNode in layerTree.Nodes) { - foreach (TreeNode node in layerTreeNode.Nodes) + for (int i=0;i dt, DataGridView dataGridView) @@ -7330,7 +7337,7 @@ } catch (Exception ex) { - LogHelper.WriteLog(typeof(MainFrm), ex); + LogHelper.Debug("", ex); } } } @@ -7362,7 +7369,7 @@ GSOLayer layer = globeControl1.Globe.Layers.Add(strDataPath); if (layer == null) {//wxl - LogHelper.WriteLog(typeof(MainFrm), "buttonItemHX1_Click操作中，" + strDataPath + "的layer为空"); + LogHelper.Error("buttonItemHX1_Click操作中，" + strDataPath + "的layer为空"); continue; } GSOFeatures redFeatures = layer.GetAllFeatures(); @@ -7457,17 +7464,12 @@ { try { + globeControl1.BeforeSceneRenderEvent -= globeControl1_BeforeSceneRenderEvent; globeControl2.BeforeSceneRenderEvent -= globeControl2_BeforeSceneRenderEvent; - double x = Convert.ToDouble(Utility.Query_Roads["定位"].ToString().Split(',')[0]); - double y = Convert.ToDouble(Utility.Query_Roads["定位"].ToString().Split(',')[1]); - double z = Convert.ToDouble(Utility.Query_Roads["定位"].ToString().Split(',')[2]); - jumpToCameraState(x, y, z); - /* globeControl1.Globe.FlyToPosition(new GSOPoint3d(120.610963, 31.188121, 50), EnumAltitudeMode.Absolute, -4, 50, 800); globeControl1.Globe.FlyToPointSpeed = 10000000; - * */ globeControl1.Globe.Action = EnumAction3D.SelectObject; globeControl1.Refresh(); @@ -7489,6 +7491,37 @@ } } /// + /// 基础工具 + /// + /// + /// + private void ribbonTabItem1_MouseDown(object sender, MouseEventArgs e) + { + try + { + + globeControl1.BeforeSceneRenderEvent -= globeControl1_BeforeSceneRenderEvent; + globeControl2.BeforeSceneRenderEvent -= globeControl2_BeforeSceneRenderEvent; + + globeControl1.Globe.Action = EnumAction3D.ActionNull; + dataGridViewX1.AutoSizeColumnsMode = DataGridViewAutoSizeColumnsMode.AllCells; + //zhanshi = false; + redSH = false; + splitContainer1.Panel2Collapsed = true; + panelOfTable.Visible = false; + legendSC.Visible = false; + legendSG.Visible = false; + ClearGZData(); + GSOLayer redLayer = globeControl1.Globe.Layers.GetLayerByCaption("红线"); + if (redLayer == null) return; + redLayer.Visible = false; + } + catch (Exception ex) + { + //MessageBox.Show("系统运行错误:" + ex.ToString(), "错误", MessageBoxButtons.OK, MessageBoxIcon.Error); + } + } + /// /// 一键审核 /// /// @@ -7497,6 +7530,7 @@ { try { + globeControl1.BeforeSceneRenderEvent -= globeControl1_BeforeSceneRenderEvent; globeControl2.BeforeSceneRenderEvent -= globeControl2_BeforeSceneRenderEvent; @@ -7518,32 +7552,7 @@ //MessageBox.Show("系统运行错误:" + ex.ToString(), "错误", MessageBoxButtons.OK, MessageBoxIcon.Error); } } - - void ResetRibbonTab() - { - try - { - globeControl1.BeforeSceneRenderEvent -= globeControl1_BeforeSceneRenderEvent; - globeControl2.BeforeSceneRenderEvent -= globeControl2_BeforeSceneRenderEvent; - - globeControl1.Globe.Action = EnumAction3D.ActionNull; - dataGridViewX1.AutoSizeColumnsMode = DataGridViewAutoSizeColumnsMode.AllCells; - //zhanshi = false; - redSH = false; - splitContainer1.Panel2Collapsed = true; - panelOfTable.Visible = false; - legendSC.Visible = false; - legendSG.Visible = false; - ClearGZData(); - GSOLayer redLayer = globeControl1.Globe.Layers.GetLayerByCaption("红线"); - if (redLayer == null) return; - redLayer.Visible = false; - } - catch (Exception ex) - { - LogHelper.WriteLog(typeof(MainFrm), ex); - } - } + /// /// 双屏对比 /// @@ -7553,8 +7562,8 @@ { try { - globeControl1.BeforeSceneRenderEvent += new BeforeSceneRenderEventHandler(globeControl1_BeforeSceneRenderEvent); - globeControl2.BeforeSceneRenderEvent += new BeforeSceneRenderEventHandler(globeControl2_BeforeSceneRenderEvent); + globeControl1.BeforeSceneRenderEvent += globeControl1_BeforeSceneRenderEvent; + globeControl2.BeforeSceneRenderEvent += globeControl2_BeforeSceneRenderEvent; globeControl1.Globe.Action = EnumAction3D.ActionNull; panelOfTable.Visible = false; @@ -7570,32 +7579,43 @@ GSOLayer redLayer = globeControl1.Globe.Layers.GetLayerByCaption("红线"); if (redLayer != null) - { redLayer.Visible = false; - } } catch (Exception ex) { - LogHelper.WriteLog(typeof(MainFrm), ex); + //MessageBox.Show("系统运行错误:" + ex.ToString(), "错误", MessageBoxButtons.OK, MessageBoxIcon.Error); } } /// - /// 基础工具 - /// - /// - /// - private void ribbonTabItem1_MouseDown(object sender, MouseEventArgs e) - { - ResetRibbonTab(); - } - /// /// 文档管理 /// /// /// private void ribbonTabItem4_MouseDown(object sender, MouseEventArgs e) { - ResetRibbonTab(); + try + { + + globeControl1.BeforeSceneRenderEvent -= globeControl1_BeforeSceneRenderEvent; + globeControl2.BeforeSceneRenderEvent -= globeControl2_BeforeSceneRenderEvent; + + globeControl1.Globe.Action = EnumAction3D.ActionNull; + panelOfTable.Visible = false; + //zhanshi = false; + redSH = false; + splitContainer1.Panel2Collapsed = true; + dataGridViewX1.AutoSizeColumnsMode = DataGridViewAutoSizeColumnsMode.AllCells; + legendSC.Visible = false; + legendSG.Visible = false; + ClearGZData(); + GSOLayer redLayer = globeControl1.Globe.Layers.GetLayerByCaption("红线"); + if (redLayer != null) + redLayer.Visible = false; + } + catch (Exception ex) + { + //MessageBox.Show("系统运行错误:" + ex.ToString(), "错误", MessageBoxButtons.OK, MessageBoxIcon.Error); + } } /// /// 基础管理 @@ -7604,7 +7624,29 @@ /// private void ribbonTabItem14_MouseDown(object sender, MouseEventArgs e) { - ResetRibbonTab(); + try + { + globeControl1.BeforeSceneRenderEvent -= globeControl1_BeforeSceneRenderEvent; + globeControl2.BeforeSceneRenderEvent -= globeControl2_BeforeSceneRenderEvent; + + globeControl1.Globe.Action = EnumAction3D.ActionNull; + panelOfTable.Visible = false; + //zhanshi = false; + redSH = false; + splitContainer1.Panel2Collapsed = true; + dataGridViewX1.AutoSizeColumnsMode = DataGridViewAutoSizeColumnsMode.AllCells; + legendSC.Visible = false; + legendSG.Visible = false; + ClearGZData(); + + GSOLayer redLayer = globeControl1.Globe.Layers.GetLayerByCaption("红线"); + if (redLayer != null) + redLayer.Visible = false; + } + catch (Exception ex) + { + //MessageBox.Show("系统运行错误:" + ex.ToString(), "错误", MessageBoxButtons.OK, MessageBoxIcon.Error); + } } /// /// 权限管理 @@ -7613,26 +7655,31 @@ /// private void ribbonTabItem2_MouseDown(object sender, MouseEventArgs e) { - ResetRibbonTab(); + try + { + globeControl1.BeforeSceneRenderEvent -= globeControl1_BeforeSceneRenderEvent; + globeControl2.BeforeSceneRenderEvent -= globeControl2_BeforeSceneRenderEvent; + + globeControl1.Globe.Action = EnumAction3D.ActionNull; + panelOfTable.Visible = false; + //zhanshi = false; + redSH = false; + splitContainer1.Panel2Collapsed = true; + dataGridViewX1.AutoSizeColumnsMode = DataGridViewAutoSizeColumnsMode.AllCells; + legendSC.Visible = false; + legendSG.Visible = false; + ClearGZData(); + + GSOLayer redLayer = globeControl1.Globe.Layers.GetLayerByCaption("红线"); + if (redLayer == null) return; + redLayer.Visible = false; + } + catch (Exception ex) + { + //MessageBox.Show("系统运行错误:" + ex.ToString(), "错误", MessageBoxButtons.OK, MessageBoxIcon.Error); + } } - /// - /// 管线定位 - /// - /// - /// - private void ribbonTabItem7_MouseDown(object sender, MouseEventArgs e) - { - ResetRibbonTab(); - } - /// - /// 标识器管理 - /// - /// - /// - private void ribbonTabItem5_MouseDown(object sender, MouseEventArgs e) - { - ResetRibbonTab(); - } + //GSOFeature dpFeatuer = null; /// /// 双屏分析，点击管段分析 @@ -8017,7 +8064,9 @@ private void btn_flag_Click(object sender, EventArgs e) { if (FrmFlagManagers.IS_OPEN) + { return; + } FrmFlagManagers frm = new FrmFlagManagers(globeControl1); frm.Show(this); } diff --git a/MainFrm.designer.cs b/MainFrm.designer.cs index e3dca41..73398c0 100644 --- a/MainFrm.designer.cs +++ b/MainFrm.designer.cs @@ -4,6 +4,7 @@ using DevComponents.DotNetBar; using DevComponents.DotNetBar.Controls; using DevComponents.Editors; +using System.Drawing; namespace Cyberpipe { @@ -89,6 +90,7 @@ this.sideBar1 = new DevComponents.DotNetBar.SideBar(); this.panelEx3 = new DevComponents.DotNetBar.PanelEx(); this.layerSensorTree = new System.Windows.Forms.TreeView(); + this.layerTree = new Cyberpipe.MyTreeView(); this.sideBarPanelItem3 = new DevComponents.DotNetBar.SideBarPanelItem(); this.controlContainerItem3 = new DevComponents.DotNetBar.ControlContainerItem(); this.sideBarPanelItem4 = new DevComponents.DotNetBar.SideBarPanelItem(); @@ -243,42 +245,18 @@ this.保存ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.定位ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.ribbonControl1 = new DevComponents.DotNetBar.RibbonControl(); - this.ribbonPanel6 = new DevComponents.DotNetBar.RibbonPanel(); - this.ribbonBar6 = new DevComponents.DotNetBar.RibbonBar(); - this.buttonItemSPSZ = new DevComponents.DotNetBar.ButtonItem(); - this.buttonItem8 = new DevComponents.DotNetBar.ButtonItem(); - this.buttonItemLocation = new DevComponents.DotNetBar.ButtonItem(); - this.sliderItem2 = new DevComponents.DotNetBar.SliderItem(); - this.buttonItemGBJC = new DevComponents.DotNetBar.ButtonItem(); - this.ribbonPanel5 = new DevComponents.DotNetBar.RibbonPanel(); - this.ribbonBar2 = new DevComponents.DotNetBar.RibbonBar(); - this.buttonItemHX1 = new DevComponents.DotNetBar.ButtonItem(); - this.buttonItemHX2 = new DevComponents.DotNetBar.ButtonItem(); - this.buttonItemDCTP = new DevComponents.DotNetBar.ButtonItem(); - this.sliderItem3 = new DevComponents.DotNetBar.SliderItem(); - this.ribbonPanel1 = new DevComponents.DotNetBar.RibbonPanel(); - this.ribbonBar21 = new DevComponents.DotNetBar.RibbonBar(); - this.buttonItem87 = new DevComponents.DotNetBar.ButtonItem(); - this.buttonItem88 = new DevComponents.DotNetBar.ButtonItem(); - this.buttonItem27 = new DevComponents.DotNetBar.ButtonItem(); - this.buttonItem91 = new DevComponents.DotNetBar.ButtonItem(); - this.buttonItem1 = new DevComponents.DotNetBar.ButtonItem(); - this.btnlegendSet = new DevComponents.DotNetBar.ButtonItem(); - this.buttonItem89 = new DevComponents.DotNetBar.ButtonItem(); - this.btnOutputJPG = new DevComponents.DotNetBar.ButtonItem(); - this.ribbonPanel12 = new DevComponents.DotNetBar.RibbonPanel(); - this.ribbonBar18 = new DevComponents.DotNetBar.RibbonBar(); - this.buttonItem133 = new DevComponents.DotNetBar.ButtonItem(); - this.ribbonBar13 = new DevComponents.DotNetBar.RibbonBar(); - this.buttonItem127 = new DevComponents.DotNetBar.ButtonItem(); - this.buttonItem128 = new DevComponents.DotNetBar.ButtonItem(); - this.sliderItem1 = new DevComponents.DotNetBar.SliderItem(); - this.buttonItem134 = new DevComponents.DotNetBar.ButtonItem(); - this.buttonItem130 = new DevComponents.DotNetBar.ButtonItem(); - this.btn_check_history = new DevComponents.DotNetBar.ButtonItem(); - this.ribbonPanel4 = new DevComponents.DotNetBar.RibbonPanel(); - this.ribbonBar1 = new DevComponents.DotNetBar.RibbonBar(); - this.btn_document_info = new DevComponents.DotNetBar.ButtonItem(); + this.ribbonPanel3 = new DevComponents.DotNetBar.RibbonPanel(); + this.ribbonBar4 = new DevComponents.DotNetBar.RibbonBar(); + this.btn_flag = new DevComponents.DotNetBar.ButtonItem(); + this.slider4ground = new DevComponents.DotNetBar.SliderItem(); + this.ribbonPanel7 = new DevComponents.DotNetBar.RibbonPanel(); + this.gxdw_ribbonbar = new DevComponents.DotNetBar.RibbonBar(); + this.buttonItem9 = new DevComponents.DotNetBar.ButtonItem(); + this.buttonItem10 = new DevComponents.DotNetBar.ButtonItem(); + this.buttonItem11 = new DevComponents.DotNetBar.ButtonItem(); + this.buttonItem12 = new DevComponents.DotNetBar.ButtonItem(); + this.buttonItem13 = new DevComponents.DotNetBar.ButtonItem(); + this.buttonItem14 = new DevComponents.DotNetBar.ButtonItem(); this.ribbonPanel15 = new DevComponents.DotNetBar.RibbonPanel(); this.ribbonBar20 = new DevComponents.DotNetBar.RibbonBar(); this.buttonItemSH = new DevComponents.DotNetBar.ButtonItem(); @@ -334,18 +312,6 @@ this.buttonItemXT4 = new DevComponents.DotNetBar.ButtonItem(); this.buttonItemXT4_1 = new DevComponents.DotNetBar.ButtonItem(); this.buttonItemXT4_2 = new DevComponents.DotNetBar.ButtonItem(); - this.ribbonPanel3 = new DevComponents.DotNetBar.RibbonPanel(); - this.ribbonBar4 = new DevComponents.DotNetBar.RibbonBar(); - this.btn_flag = new DevComponents.DotNetBar.ButtonItem(); - this.slider4ground = new DevComponents.DotNetBar.SliderItem(); - this.ribbonPanel7 = new DevComponents.DotNetBar.RibbonPanel(); - this.gxdw_ribbonbar = new DevComponents.DotNetBar.RibbonBar(); - this.buttonItem9 = new DevComponents.DotNetBar.ButtonItem(); - this.buttonItem10 = new DevComponents.DotNetBar.ButtonItem(); - this.buttonItem11 = new DevComponents.DotNetBar.ButtonItem(); - this.buttonItem12 = new DevComponents.DotNetBar.ButtonItem(); - this.buttonItem13 = new DevComponents.DotNetBar.ButtonItem(); - this.buttonItem14 = new DevComponents.DotNetBar.ButtonItem(); this.ribbonPanel2 = new DevComponents.DotNetBar.RibbonPanel(); this.ribbonBar3 = new DevComponents.DotNetBar.RibbonBar(); this.btn_user_info = new DevComponents.DotNetBar.ButtonItem(); @@ -355,6 +321,43 @@ this.btn_user_role = new DevComponents.DotNetBar.ButtonItem(); this.btn_password_edit = new DevComponents.DotNetBar.ButtonItem(); this.buttonItemPasswordReset = new DevComponents.DotNetBar.ButtonItem(); + this.ribbonPanel6 = new DevComponents.DotNetBar.RibbonPanel(); + this.ribbonBar6 = new DevComponents.DotNetBar.RibbonBar(); + this.buttonItemSPSZ = new DevComponents.DotNetBar.ButtonItem(); + this.buttonItem8 = new DevComponents.DotNetBar.ButtonItem(); + this.buttonItemLocation = new DevComponents.DotNetBar.ButtonItem(); + this.sliderItem2 = new DevComponents.DotNetBar.SliderItem(); + this.buttonItemGBJC = new DevComponents.DotNetBar.ButtonItem(); + this.ribbonPanel5 = new DevComponents.DotNetBar.RibbonPanel(); + this.ribbonBar2 = new DevComponents.DotNetBar.RibbonBar(); + this.buttonItemHX1 = new DevComponents.DotNetBar.ButtonItem(); + this.buttonItemHX2 = new DevComponents.DotNetBar.ButtonItem(); + this.buttonItemDCTP = new DevComponents.DotNetBar.ButtonItem(); + this.sliderItem3 = new DevComponents.DotNetBar.SliderItem(); + this.ribbonPanel1 = new DevComponents.DotNetBar.RibbonPanel(); + this.ribbonBar21 = new DevComponents.DotNetBar.RibbonBar(); + this.buttonItem87 = new DevComponents.DotNetBar.ButtonItem(); + this.buttonItem88 = new DevComponents.DotNetBar.ButtonItem(); + this.buttonItem27 = new DevComponents.DotNetBar.ButtonItem(); + this.buttonItem91 = new DevComponents.DotNetBar.ButtonItem(); + this.buttonItem1 = new DevComponents.DotNetBar.ButtonItem(); + this.btnlegendSet = new DevComponents.DotNetBar.ButtonItem(); + this.buttonItem89 = new DevComponents.DotNetBar.ButtonItem(); + this.btnOutputJPG = new DevComponents.DotNetBar.ButtonItem(); + this.ribbonPanel12 = new DevComponents.DotNetBar.RibbonPanel(); + this.ribbonBar18 = new DevComponents.DotNetBar.RibbonBar(); + this.buttonItem133 = new DevComponents.DotNetBar.ButtonItem(); + this.buttonItem132 = new DevComponents.DotNetBar.ButtonItem(); + this.ribbonBar13 = new DevComponents.DotNetBar.RibbonBar(); + this.buttonItem127 = new DevComponents.DotNetBar.ButtonItem(); + this.buttonItem128 = new DevComponents.DotNetBar.ButtonItem(); + this.sliderItem1 = new DevComponents.DotNetBar.SliderItem(); + this.buttonItem134 = new DevComponents.DotNetBar.ButtonItem(); + this.buttonItem130 = new DevComponents.DotNetBar.ButtonItem(); + this.btn_check_history = new DevComponents.DotNetBar.ButtonItem(); + this.ribbonPanel4 = new DevComponents.DotNetBar.RibbonPanel(); + this.ribbonBar1 = new DevComponents.DotNetBar.RibbonBar(); + this.btn_document_info = new DevComponents.DotNetBar.ButtonItem(); this.ribbonTabItem1 = new DevComponents.DotNetBar.RibbonTabItem(); this.ribbonTabItem11 = new DevComponents.DotNetBar.RibbonTabItem(); this.ribbonTabItem6 = new DevComponents.DotNetBar.RibbonTabItem(); @@ -516,7 +519,6 @@ this.labelX17 = new DevComponents.DotNetBar.LabelX(); this.panelEx4 = new DevComponents.DotNetBar.PanelEx(); this.pictureBox1 = new System.Windows.Forms.PictureBox(); - this.layerTree = new Cyberpipe.MyTreeView(); this.statusStrip1.SuspendLayout(); this.sideBar1.SuspendLayout(); this.panelEx3.SuspendLayout(); @@ -527,15 +529,15 @@ this.contextMenuStrip3.SuspendLayout(); this.contextMenuStripDeleteLayerNode.SuspendLayout(); this.ribbonControl1.SuspendLayout(); + this.ribbonPanel3.SuspendLayout(); + this.ribbonPanel7.SuspendLayout(); + this.ribbonPanel15.SuspendLayout(); + this.ribbonPanel2.SuspendLayout(); this.ribbonPanel6.SuspendLayout(); this.ribbonPanel5.SuspendLayout(); this.ribbonPanel1.SuspendLayout(); this.ribbonPanel12.SuspendLayout(); this.ribbonPanel4.SuspendLayout(); - this.ribbonPanel15.SuspendLayout(); - this.ribbonPanel3.SuspendLayout(); - this.ribbonPanel7.SuspendLayout(); - this.ribbonPanel2.SuspendLayout(); this.panelOfTable.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.dataGridViewX1)).BeginInit(); this.statusStrip2.SuspendLayout(); @@ -711,7 +713,8 @@ this.statusLabel.Name = "statusLabel"; this.statusLabel.Size = new System.Drawing.Size(1313, 17); this.statusLabel.Spring = true; - this.statusLabel.Text = " ©2014-2015 苏州航天系统工程有限公司 版权所有"; + this.statusLabel.Text = Utility.Copyright; +// this.statusLabel.Text = " ©2014-2015 苏州航天系统工程有限公司 版权所有"; // // toolStripDropDownButton1 // @@ -956,6 +959,18 @@ this.layerSensorTree.NodeMouseClick += new System.Windows.Forms.TreeNodeMouseClickEventHandler(this.layerMarkerTree_NodeMouseClick); this.layerSensorTree.NodeMouseDoubleClick += new System.Windows.Forms.TreeNodeMouseClickEventHandler(this.layerTree_NodeMouseDoubleClick); // + // layerTree + // + this.layerTree.CheckBoxes = true; + this.layerTree.ItemHeight = 18; + this.layerTree.Location = new System.Drawing.Point(30, 78); + this.layerTree.Name = "layerTree"; + this.layerTree.Size = new System.Drawing.Size(121, 97); + this.layerTree.TabIndex = 1; + this.layerTree.AfterCheck += new System.Windows.Forms.TreeViewEventHandler(this.layerTree_AfterCheck); + this.layerTree.NodeMouseClick += new System.Windows.Forms.TreeNodeMouseClickEventHandler(this.layerTree_NodeMouseClick); + this.layerTree.NodeMouseDoubleClick += new System.Windows.Forms.TreeNodeMouseClickEventHandler(this.layerTree_NodeMouseDoubleClick); + // // sideBarPanelItem3 // this.sideBarPanelItem3.FontBold = true; @@ -2150,13 +2165,13 @@ this.ribbonControl1.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.ribbonControl1.Controls.Add(this.ribbonPanel3); this.ribbonControl1.Controls.Add(this.ribbonPanel7); - this.ribbonControl1.Controls.Add(this.ribbonPanel2); this.ribbonControl1.Controls.Add(this.ribbonPanel15); - this.ribbonControl1.Controls.Add(this.ribbonPanel4); - this.ribbonControl1.Controls.Add(this.ribbonPanel1); + this.ribbonControl1.Controls.Add(this.ribbonPanel2); this.ribbonControl1.Controls.Add(this.ribbonPanel6); - this.ribbonControl1.Controls.Add(this.ribbonPanel12); this.ribbonControl1.Controls.Add(this.ribbonPanel5); + this.ribbonControl1.Controls.Add(this.ribbonPanel1); + this.ribbonControl1.Controls.Add(this.ribbonPanel12); + this.ribbonControl1.Controls.Add(this.ribbonPanel4); this.ribbonControl1.Dock = System.Windows.Forms.DockStyle.Top; this.ribbonControl1.ImeMode = System.Windows.Forms.ImeMode.NoControl; this.ribbonControl1.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { @@ -2200,609 +2215,216 @@ this.ribbonControl1.Text = "ribbonControl1"; this.ribbonControl1.UseCustomizeDialog = false; // - // ribbonPanel6 + // ribbonPanel3 // - this.ribbonPanel6.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.ribbonPanel6.Controls.Add(this.ribbonBar6); - this.ribbonPanel6.Dock = System.Windows.Forms.DockStyle.Fill; - this.ribbonPanel6.Location = new System.Drawing.Point(0, 0); - this.ribbonPanel6.Name = "ribbonPanel6"; - this.ribbonPanel6.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); - this.ribbonPanel6.Size = new System.Drawing.Size(1328, 95); + this.ribbonPanel3.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.ribbonPanel3.Controls.Add(this.ribbonBar4); + this.ribbonPanel3.Dock = System.Windows.Forms.DockStyle.Fill; + this.ribbonPanel3.Location = new System.Drawing.Point(0, 33); + this.ribbonPanel3.Name = "ribbonPanel3"; + this.ribbonPanel3.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); + this.ribbonPanel3.Size = new System.Drawing.Size(1328, 62); // // // - this.ribbonPanel6.Style.Class = ""; - this.ribbonPanel6.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonPanel3.Style.Class = ""; + this.ribbonPanel3.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; // // // - this.ribbonPanel6.StyleMouseDown.Class = ""; - this.ribbonPanel6.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonPanel3.StyleMouseDown.Class = ""; + this.ribbonPanel3.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; // // // - this.ribbonPanel6.StyleMouseOver.Class = ""; - this.ribbonPanel6.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonPanel6.TabIndex = 38; - this.ribbonPanel6.Visible = false; + this.ribbonPanel3.StyleMouseOver.Class = ""; + this.ribbonPanel3.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonPanel3.TabIndex = 40; // - // ribbonBar6 + // ribbonBar4 // - this.ribbonBar6.AutoOverflowEnabled = true; + this.ribbonBar4.AutoOverflowEnabled = true; // // // - this.ribbonBar6.BackgroundMouseOverStyle.Class = ""; - this.ribbonBar6.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar4.BackgroundMouseOverStyle.Class = ""; + this.ribbonBar4.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; // // // - this.ribbonBar6.BackgroundStyle.Class = ""; - this.ribbonBar6.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonBar6.ContainerControlProcessDialogKey = true; - this.ribbonBar6.Dock = System.Windows.Forms.DockStyle.Left; - this.ribbonBar6.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { - this.buttonItemSPSZ, - this.buttonItem8, - this.buttonItemLocation, - this.sliderItem2, - this.buttonItemGBJC}); - this.ribbonBar6.Location = new System.Drawing.Point(3, 0); - this.ribbonBar6.Name = "ribbonBar6"; - this.ribbonBar6.Size = new System.Drawing.Size(427, 92); - this.ribbonBar6.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.ribbonBar6.TabIndex = 0; + this.ribbonBar4.BackgroundStyle.Class = ""; + this.ribbonBar4.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar4.ContainerControlProcessDialogKey = true; + this.ribbonBar4.Dock = System.Windows.Forms.DockStyle.Left; + this.ribbonBar4.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { + this.btn_flag, + this.slider4ground}); + this.ribbonBar4.Location = new System.Drawing.Point(3, 0); + this.ribbonBar4.Name = "ribbonBar4"; + this.ribbonBar4.Size = new System.Drawing.Size(634, 59); + this.ribbonBar4.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.ribbonBar4.TabIndex = 0; // // // - this.ribbonBar6.TitleStyle.Class = ""; - this.ribbonBar6.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar4.TitleStyle.Class = ""; + this.ribbonBar4.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; // // // - this.ribbonBar6.TitleStyleMouseOver.Class = ""; - this.ribbonBar6.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonBar6.TitleVisible = false; + this.ribbonBar4.TitleStyleMouseOver.Class = ""; + this.ribbonBar4.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar4.TitleVisible = false; // - // buttonItemSPSZ + // btn_flag // - this.buttonItemSPSZ.Image = ((System.Drawing.Image)(resources.GetObject("buttonItemSPSZ.Image"))); - this.buttonItemSPSZ.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItemSPSZ.Name = "buttonItemSPSZ"; - this.buttonItemSPSZ.SubItemsExpandWidth = 14; - this.buttonItemSPSZ.Text = "双屏设置"; - this.buttonItemSPSZ.Click += new System.EventHandler(this.buttonItemSPSZ_Click); + this.btn_flag.Image = global::Cyberpipe.Properties.Resources._24x24icon_03_hover; + this.btn_flag.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.btn_flag.Name = "btn_flag"; + this.btn_flag.SubItemsExpandWidth = 14; + this.btn_flag.Text = "标识器管理"; + this.btn_flag.Click += new System.EventHandler(this.btn_flag_Click); // - // buttonItem8 + // slider4ground // - this.buttonItem8.Image = ((System.Drawing.Image)(resources.GetObject("buttonItem8.Image"))); - this.buttonItem8.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem8.Name = "buttonItem8"; - this.buttonItem8.SubItemsExpandWidth = 14; - this.buttonItem8.Text = "双屏分析"; - this.buttonItem8.Click += new System.EventHandler(this.buttonItem8_Click); + this.slider4ground.LabelPosition = DevComponents.DotNetBar.eSliderLabelPosition.Top; + this.slider4ground.LabelWidth = 50; + this.slider4ground.Name = "slider4ground"; + this.slider4ground.Text = "地面透明度"; + this.slider4ground.TextColor = System.Drawing.Color.Black; + this.slider4ground.Value = 0; + this.slider4ground.ValueChanged += new System.EventHandler(this.slider4ground_ValueChanged); // - // buttonItemLocation + // ribbonPanel7 // - this.buttonItemLocation.Image = ((System.Drawing.Image)(resources.GetObject("buttonItemLocation.Image"))); - this.buttonItemLocation.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItemLocation.Name = "buttonItemLocation"; - this.buttonItemLocation.SubItemsExpandWidth = 14; - this.buttonItemLocation.Text = "快速定位"; - this.buttonItemLocation.Click += new System.EventHandler(this.buttonItemLocation_Click); + this.ribbonPanel7.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.ribbonPanel7.Controls.Add(this.gxdw_ribbonbar); + this.ribbonPanel7.Dock = System.Windows.Forms.DockStyle.Fill; + this.ribbonPanel7.Location = new System.Drawing.Point(0, 33); + this.ribbonPanel7.Name = "ribbonPanel7"; + this.ribbonPanel7.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); + this.ribbonPanel7.Size = new System.Drawing.Size(1328, 62); // - // sliderItem2 // - this.sliderItem2.LabelPosition = DevComponents.DotNetBar.eSliderLabelPosition.Top; - this.sliderItem2.LabelWidth = 50; - this.sliderItem2.Name = "sliderItem2"; - this.sliderItem2.Text = "地面透明度"; - this.sliderItem2.TextColor = System.Drawing.Color.Black; - this.sliderItem2.Value = 0; - this.sliderItem2.ValueChanged += new System.EventHandler(this.sliderItem2_ValueChanged); // - // buttonItemGBJC + this.ribbonPanel7.Style.Class = ""; + this.ribbonPanel7.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; // - this.buttonItemGBJC.Image = ((System.Drawing.Image)(resources.GetObject("buttonItemGBJC.Image"))); - this.buttonItemGBJC.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItemGBJC.Name = "buttonItemGBJC"; - this.buttonItemGBJC.SubItemsExpandWidth = 14; - this.buttonItemGBJC.Text = "国标检测"; - this.buttonItemGBJC.Click += new System.EventHandler(this.buttonItemGBJC_Click); // - // ribbonPanel5 // - this.ribbonPanel5.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.ribbonPanel5.Controls.Add(this.ribbonBar2); - this.ribbonPanel5.Dock = System.Windows.Forms.DockStyle.Fill; - this.ribbonPanel5.Location = new System.Drawing.Point(0, 0); - this.ribbonPanel5.Name = "ribbonPanel5"; - this.ribbonPanel5.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); - this.ribbonPanel5.Size = new System.Drawing.Size(1328, 95); + this.ribbonPanel7.StyleMouseDown.Class = ""; + this.ribbonPanel7.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; // // // - this.ribbonPanel5.Style.Class = ""; - this.ribbonPanel5.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonPanel7.StyleMouseOver.Class = ""; + this.ribbonPanel7.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonPanel7.TabIndex = 41; + this.ribbonPanel7.Visible = false; // + // gxdw_ribbonbar // + this.gxdw_ribbonbar.AutoOverflowEnabled = true; // - this.ribbonPanel5.StyleMouseDown.Class = ""; - this.ribbonPanel5.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; // // + this.gxdw_ribbonbar.BackgroundMouseOverStyle.Class = ""; + this.gxdw_ribbonbar.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; // - this.ribbonPanel5.StyleMouseOver.Class = ""; - this.ribbonPanel5.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonPanel5.TabIndex = 37; - this.ribbonPanel5.Visible = false; // - // ribbonBar2 // - this.ribbonBar2.AutoOverflowEnabled = true; + this.gxdw_ribbonbar.BackgroundStyle.Class = ""; + this.gxdw_ribbonbar.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.gxdw_ribbonbar.ContainerControlProcessDialogKey = true; + this.gxdw_ribbonbar.Dock = System.Windows.Forms.DockStyle.Left; + this.gxdw_ribbonbar.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { + this.buttonItem9, + this.buttonItem10, + this.buttonItem11, + this.buttonItem12, + this.buttonItem13, + this.buttonItem14}); + this.gxdw_ribbonbar.Location = new System.Drawing.Point(3, 0); + this.gxdw_ribbonbar.Name = "gxdw_ribbonbar"; + this.gxdw_ribbonbar.Size = new System.Drawing.Size(564, 59); + this.gxdw_ribbonbar.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.gxdw_ribbonbar.TabIndex = 0; + this.gxdw_ribbonbar.Text = "ribbonBar5"; // // // - this.ribbonBar2.BackgroundMouseOverStyle.Class = ""; - this.ribbonBar2.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.gxdw_ribbonbar.TitleStyle.Class = ""; + this.gxdw_ribbonbar.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; // // // - this.ribbonBar2.BackgroundStyle.Class = ""; - this.ribbonBar2.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonBar2.ContainerControlProcessDialogKey = true; - this.ribbonBar2.Dock = System.Windows.Forms.DockStyle.Left; - this.ribbonBar2.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { - this.buttonItemHX1, - this.buttonItemHX2, - this.buttonItemDCTP, - this.sliderItem3}); - this.ribbonBar2.Location = new System.Drawing.Point(3, 0); - this.ribbonBar2.Name = "ribbonBar2"; - this.ribbonBar2.Size = new System.Drawing.Size(350, 92); - this.ribbonBar2.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.ribbonBar2.TabIndex = 0; + this.gxdw_ribbonbar.TitleStyleMouseOver.Class = ""; + this.gxdw_ribbonbar.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.gxdw_ribbonbar.TitleVisible = false; // + // buttonItem9 // + this.buttonItem9.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__76; + this.buttonItem9.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem9.Name = "buttonItem9"; + this.buttonItem9.SubItemsExpandWidth = 14; + this.buttonItem9.Text = "工单管理"; + this.buttonItem9.Click += new System.EventHandler(this.buttonItem9_Click); // - this.ribbonBar2.TitleStyle.Class = ""; - this.ribbonBar2.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // buttonItem10 // + this.buttonItem10.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__69; + this.buttonItem10.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem10.Name = "buttonItem10"; + this.buttonItem10.SubItemsExpandWidth = 14; + this.buttonItem10.Text = "在线任务"; + this.buttonItem10.Click += new System.EventHandler(this.buttonItem10_Click); // + // buttonItem11 // - this.ribbonBar2.TitleStyleMouseOver.Class = ""; - this.ribbonBar2.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonBar2.TitleVisible = false; + this.buttonItem11.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__72; + this.buttonItem11.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem11.Name = "buttonItem11"; + this.buttonItem11.SubItemsExpandWidth = 14; + this.buttonItem11.Text = "事件管理"; + this.buttonItem11.Click += new System.EventHandler(this.buttonItem11_Click); // - // buttonItemHX1 + // buttonItem12 // - this.buttonItemHX1.AutoExpandOnClick = true; - this.buttonItemHX1.Image = ((System.Drawing.Image)(resources.GetObject("buttonItemHX1.Image"))); - this.buttonItemHX1.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItemHX1.Name = "buttonItemHX1"; - this.buttonItemHX1.SubItemsExpandWidth = 14; - this.buttonItemHX1.Text = "导入红线"; - this.buttonItemHX1.Click += new System.EventHandler(this.buttonItemHX1_Click); + this.buttonItem12.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__34; + this.buttonItem12.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem12.Name = "buttonItem12"; + this.buttonItem12.SubItemsExpandWidth = 14; + this.buttonItem12.Text = "探测仪管理"; + this.buttonItem12.Click += new System.EventHandler(this.buttonItem12_Click); // - // buttonItemHX2 + // buttonItem13 // - this.buttonItemHX2.Image = ((System.Drawing.Image)(resources.GetObject("buttonItemHX2.Image"))); - this.buttonItemHX2.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItemHX2.Name = "buttonItemHX2"; - this.buttonItemHX2.SubItemsExpandWidth = 14; - this.buttonItemHX2.Text = "红线审核"; - this.buttonItemHX2.Click += new System.EventHandler(this.buttonItemHX2_Click); + this.buttonItem13.Image = global::Cyberpipe.Properties.Resources._24x24icon_13_hover; + this.buttonItem13.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem13.Name = "buttonItem13"; + this.buttonItem13.SubItemsExpandWidth = 14; + this.buttonItem13.Text = "巡检人员维护"; + this.buttonItem13.Click += new System.EventHandler(this.buttonItem13_Click); // - // buttonItemDCTP + // buttonItem14 // - this.buttonItemDCTP.Image = ((System.Drawing.Image)(resources.GetObject("buttonItemDCTP.Image"))); - this.buttonItemDCTP.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItemDCTP.Name = "buttonItemDCTP"; - this.buttonItemDCTP.SubItemsExpandWidth = 14; - this.buttonItemDCTP.Text = "导出图片"; - this.buttonItemDCTP.Click += new System.EventHandler(this.buttonItemDCTP_Click); - // - // sliderItem3 - // - this.sliderItem3.LabelPosition = DevComponents.DotNetBar.eSliderLabelPosition.Top; - this.sliderItem3.LabelWidth = 50; - this.sliderItem3.Name = "sliderItem3"; - this.sliderItem3.Text = "地面透明度"; - this.sliderItem3.TextColor = System.Drawing.Color.Black; - this.sliderItem3.Value = 0; - this.sliderItem3.ValueChanged += new System.EventHandler(this.sliderItem3_ValueChanged); - // - // ribbonPanel1 - // - this.ribbonPanel1.AutoSize = true; - this.ribbonPanel1.CanvasColor = System.Drawing.Color.Gray; - this.ribbonPanel1.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.ribbonPanel1.Controls.Add(this.ribbonBar21); - this.ribbonPanel1.Dock = System.Windows.Forms.DockStyle.Fill; - this.ribbonPanel1.Location = new System.Drawing.Point(0, 0); - this.ribbonPanel1.Name = "ribbonPanel1"; - this.ribbonPanel1.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); - this.ribbonPanel1.Size = new System.Drawing.Size(1328, 95); - // - // - // - this.ribbonPanel1.Style.Class = ""; - this.ribbonPanel1.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonPanel1.StyleMouseDown.Class = ""; - this.ribbonPanel1.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonPanel1.StyleMouseOver.Class = ""; - this.ribbonPanel1.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonPanel1.TabIndex = 1; - this.ribbonPanel1.Visible = false; - // - // ribbonBar21 - // - this.ribbonBar21.AutoOverflowEnabled = true; - this.ribbonBar21.BackColor = System.Drawing.Color.White; - // - // - // - this.ribbonBar21.BackgroundMouseOverStyle.Class = ""; - this.ribbonBar21.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonBar21.BackgroundStyle.Class = ""; - this.ribbonBar21.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonBar21.ContainerControlProcessDialogKey = true; - this.ribbonBar21.Dock = System.Windows.Forms.DockStyle.Left; - this.ribbonBar21.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { - this.buttonItem87, - this.buttonItem88, - this.buttonItem27, - this.sliderGroundTransSet1, - this.buttonItem91, - this.buttonItem1, - this.btnlegendSet, - this.buttonItem89, - this.btnOutputJPG}); - this.ribbonBar21.Location = new System.Drawing.Point(3, 0); - this.ribbonBar21.Name = "ribbonBar21"; - this.ribbonBar21.Size = new System.Drawing.Size(649, 92); - this.ribbonBar21.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.ribbonBar21.TabIndex = 2; - this.ribbonBar21.Text = "浏览模式"; - // - // - // - this.ribbonBar21.TitleStyle.Class = ""; - this.ribbonBar21.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonBar21.TitleStyleMouseOver.Class = ""; - this.ribbonBar21.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonBar21.TitleVisible = false; - // - // buttonItem87 - // - this.buttonItem87.Image = ((System.Drawing.Image)(resources.GetObject("buttonItem87.Image"))); - this.buttonItem87.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem87.Name = "buttonItem87"; - this.buttonItem87.SubItemsExpandWidth = 14; - this.buttonItem87.Text = "地上模式"; - this.buttonItem87.Click += new System.EventHandler(this.buttonItem87_Click); - // - // buttonItem88 - // - this.buttonItem88.Image = ((System.Drawing.Image)(resources.GetObject("buttonItem88.Image"))); - this.buttonItem88.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem88.Name = "buttonItem88"; - this.buttonItem88.SubItemsExpandWidth = 14; - this.buttonItem88.Text = "地下模式"; - this.buttonItem88.Click += new System.EventHandler(this.buttonItem88_Click); - // - // buttonItem27 - // - this.buttonItem27.Image = ((System.Drawing.Image)(resources.GetObject("buttonItem27.Image"))); - this.buttonItem27.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem27.Name = "buttonItem27"; - this.buttonItem27.SubItemsExpandWidth = 14; - this.buttonItem27.Text = "行走模式"; - this.buttonItem27.Click += new System.EventHandler(this.buttonItem27_Click); - // - // buttonItem91 - // - this.buttonItem91.ForeColor = System.Drawing.Color.Black; - this.buttonItem91.Image = ((System.Drawing.Image)(resources.GetObject("buttonItem91.Image"))); - this.buttonItem91.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem91.Name = "buttonItem91"; - this.buttonItem91.SubItemsExpandWidth = 14; - this.buttonItem91.Text = "快速定位"; - this.buttonItem91.Click += new System.EventHandler(this.buttonItem91_Click); - // - // buttonItem1 - // - this.buttonItem1.Image = ((System.Drawing.Image)(resources.GetObject("buttonItem1.Image"))); - this.buttonItem1.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem1.Name = "buttonItem1"; - this.buttonItem1.SubItemsExpandWidth = 14; - this.buttonItem1.Text = "图层管理"; - this.buttonItem1.Click += new System.EventHandler(this.buttonItem1_Click); - // - // btnlegendSet - // - this.btnlegendSet.Image = ((System.Drawing.Image)(resources.GetObject("btnlegendSet.Image"))); - this.btnlegendSet.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.btnlegendSet.Name = "btnlegendSet"; - this.btnlegendSet.SubItemsExpandWidth = 14; - this.btnlegendSet.Text = "图例"; - this.btnlegendSet.Click += new System.EventHandler(this.btnlegendSet_Click); - // - // buttonItem89 - // - this.buttonItem89.Image = ((System.Drawing.Image)(resources.GetObject("buttonItem89.Image"))); - this.buttonItem89.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem89.Name = "buttonItem89"; - this.buttonItem89.SubItemsExpandWidth = 14; - this.buttonItem89.Text = "全屏显示"; - this.buttonItem89.Click += new System.EventHandler(this.buttonItem89_Click); - // - // btnOutputJPG - // - this.btnOutputJPG.Image = ((System.Drawing.Image)(resources.GetObject("btnOutputJPG.Image"))); - this.btnOutputJPG.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.btnOutputJPG.Name = "btnOutputJPG"; - this.btnOutputJPG.SubItemsExpandWidth = 14; - this.btnOutputJPG.Text = "导出图片"; - this.btnOutputJPG.Click += new System.EventHandler(this.btnOutputJPG_Click); - // - // ribbonPanel12 - // - this.ribbonPanel12.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.ribbonPanel12.Controls.Add(this.ribbonBar18); - this.ribbonPanel12.Controls.Add(this.ribbonBar13); - this.ribbonPanel12.Dock = System.Windows.Forms.DockStyle.Fill; - this.ribbonPanel12.Location = new System.Drawing.Point(0, 0); - this.ribbonPanel12.Name = "ribbonPanel12"; - this.ribbonPanel12.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); - this.ribbonPanel12.Size = new System.Drawing.Size(1328, 95); - // - // - // - this.ribbonPanel12.Style.Class = ""; - this.ribbonPanel12.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonPanel12.StyleMouseDown.Class = ""; - this.ribbonPanel12.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonPanel12.StyleMouseOver.Class = ""; - this.ribbonPanel12.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonPanel12.TabIndex = 34; - this.ribbonPanel12.Visible = false; - // - // ribbonBar18 - // - this.ribbonBar18.AutoOverflowEnabled = true; - // - // - // - this.ribbonBar18.BackgroundMouseOverStyle.Class = ""; - this.ribbonBar18.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonBar18.BackgroundStyle.Class = ""; - this.ribbonBar18.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonBar18.ContainerControlProcessDialogKey = true; - this.ribbonBar18.Dock = System.Windows.Forms.DockStyle.Left; - this.ribbonBar18.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { - this.buttonItem133}); - this.ribbonBar18.Location = new System.Drawing.Point(531, 0); - this.ribbonBar18.Name = "ribbonBar18"; - this.ribbonBar18.Size = new System.Drawing.Size(129, 92); - this.ribbonBar18.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.ribbonBar18.TabIndex = 1; - // - // - // - this.ribbonBar18.TitleStyle.Class = ""; - this.ribbonBar18.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonBar18.TitleStyleMouseOver.Class = ""; - this.ribbonBar18.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonBar18.TitleVisible = false; - // - // buttonItem133 - // - this.buttonItem133.Image = ((System.Drawing.Image)(resources.GetObject("buttonItem133.Image"))); - this.buttonItem133.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem133.Name = "buttonItem133"; - this.buttonItem133.SubItemsExpandWidth = 14; - this.buttonItem133.Text = "审核入库"; - this.buttonItem133.Click += new System.EventHandler(this.buttonItem133_Click_1); - // - // ribbonBar13 - // - this.ribbonBar13.AutoOverflowEnabled = true; - // - // - // - this.ribbonBar13.BackgroundMouseOverStyle.Class = ""; - this.ribbonBar13.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonBar13.BackgroundStyle.Class = ""; - this.ribbonBar13.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonBar13.ContainerControlProcessDialogKey = true; - this.ribbonBar13.Dock = System.Windows.Forms.DockStyle.Left; - this.ribbonBar13.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { - this.buttonItem127, - this.buttonItem128, - this.sliderItem1, - this.buttonItem134, - this.buttonItem130, - this.btn_check_history}); - this.ribbonBar13.Location = new System.Drawing.Point(3, 0); - this.ribbonBar13.Name = "ribbonBar13"; - this.ribbonBar13.Size = new System.Drawing.Size(528, 92); - this.ribbonBar13.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.ribbonBar13.TabIndex = 0; - // - // - // - this.ribbonBar13.TitleStyle.Class = ""; - this.ribbonBar13.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonBar13.TitleStyleMouseOver.Class = ""; - this.ribbonBar13.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonBar13.TitleVisible = false; - // - // buttonItem127 - // - this.buttonItem127.Image = ((System.Drawing.Image)(resources.GetObject("buttonItem127.Image"))); - this.buttonItem127.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem127.Name = "buttonItem127"; - this.buttonItem127.SubItemsExpandWidth = 14; - this.buttonItem127.Text = "打开数据"; - this.buttonItem127.Click += new System.EventHandler(this.buttonItem127_Click_2); - // - // buttonItem128 - // - this.buttonItem128.Image = ((System.Drawing.Image)(resources.GetObject("buttonItem128.Image"))); - this.buttonItem128.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem128.Name = "buttonItem128"; - this.buttonItem128.SubItemsExpandWidth = 14; - this.buttonItem128.Text = "一键审核"; - this.buttonItem128.Click += new System.EventHandler(this.buttonItem128_Click); - // - // sliderItem1 - // - this.sliderItem1.LabelPosition = DevComponents.DotNetBar.eSliderLabelPosition.Top; - this.sliderItem1.LabelWidth = 50; - this.sliderItem1.Name = "sliderItem1"; - this.sliderItem1.Text = "地面透明度"; - this.sliderItem1.TextColor = System.Drawing.Color.Black; - this.sliderItem1.Value = 0; - this.sliderItem1.ValueChanged += new System.EventHandler(this.sliderItem1_ValueChanged); - // - // buttonItem134 - // - this.buttonItem134.Image = ((System.Drawing.Image)(resources.GetObject("buttonItem134.Image"))); - this.buttonItem134.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem134.Name = "buttonItem134"; - this.buttonItem134.SubItemsExpandWidth = 14; - this.buttonItem134.Text = "模拟设计修改"; - this.buttonItem134.Click += new System.EventHandler(this.buttonItem134_Click_1); - // - // buttonItem130 - // - this.buttonItem130.Image = ((System.Drawing.Image)(resources.GetObject("buttonItem130.Image"))); - this.buttonItem130.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem130.Name = "buttonItem130"; - this.buttonItem130.SubItemsExpandWidth = 14; - this.buttonItem130.Text = "导出审核图"; - this.buttonItem130.Click += new System.EventHandler(this.buttonItem130_Click_1); - // - // btn_check_history - // - this.btn_check_history.Image = ((System.Drawing.Image)(resources.GetObject("btn_check_history.Image"))); - this.btn_check_history.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.btn_check_history.Name = "btn_check_history"; - this.btn_check_history.SubItemsExpandWidth = 14; - this.btn_check_history.Text = "审核历史"; - this.btn_check_history.Click += new System.EventHandler(this.btn_check_history_Click); - // - // ribbonPanel4 - // - this.ribbonPanel4.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.ribbonPanel4.Controls.Add(this.ribbonBar1); - this.ribbonPanel4.Dock = System.Windows.Forms.DockStyle.Fill; - this.ribbonPanel4.Location = new System.Drawing.Point(0, 0); - this.ribbonPanel4.Name = "ribbonPanel4"; - this.ribbonPanel4.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); - this.ribbonPanel4.Size = new System.Drawing.Size(1328, 95); - // - // - // - this.ribbonPanel4.Style.Class = ""; - this.ribbonPanel4.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonPanel4.StyleMouseDown.Class = ""; - this.ribbonPanel4.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonPanel4.StyleMouseOver.Class = ""; - this.ribbonPanel4.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonPanel4.TabIndex = 36; - this.ribbonPanel4.Visible = false; - // - // ribbonBar1 - // - this.ribbonBar1.AutoOverflowEnabled = true; - // - // - // - this.ribbonBar1.BackgroundMouseOverStyle.Class = ""; - this.ribbonBar1.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonBar1.BackgroundStyle.Class = ""; - this.ribbonBar1.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonBar1.ContainerControlProcessDialogKey = true; - this.ribbonBar1.Dock = System.Windows.Forms.DockStyle.Left; - this.ribbonBar1.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { - this.btn_document_info}); - this.ribbonBar1.Location = new System.Drawing.Point(3, 0); - this.ribbonBar1.Name = "ribbonBar1"; - this.ribbonBar1.Size = new System.Drawing.Size(88, 92); - this.ribbonBar1.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.ribbonBar1.TabIndex = 0; - // - // - // - this.ribbonBar1.TitleStyle.Class = ""; - this.ribbonBar1.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonBar1.TitleStyleMouseOver.Class = ""; - this.ribbonBar1.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonBar1.TitleVisible = false; - // - // btn_document_info - // - this.btn_document_info.Image = ((System.Drawing.Image)(resources.GetObject("btn_document_info.Image"))); - this.btn_document_info.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.btn_document_info.Name = "btn_document_info"; - this.btn_document_info.SubItemsExpandWidth = 14; - this.btn_document_info.Text = "文档管理"; - this.btn_document_info.Click += new System.EventHandler(this.btn_document_info_Click); + this.buttonItem14.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__56; + this.buttonItem14.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem14.Name = "buttonItem14"; + this.buttonItem14.SubItemsExpandWidth = 14; + this.buttonItem14.Text = "导出施工图"; + this.buttonItem14.Click += new System.EventHandler(this.buttonItem14_Click); // // ribbonPanel15 // this.ribbonPanel15.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; this.ribbonPanel15.Controls.Add(this.ribbonBar20); this.ribbonPanel15.Dock = System.Windows.Forms.DockStyle.Fill; - this.ribbonPanel15.Location = new System.Drawing.Point(0, 0); + this.ribbonPanel15.Location = new System.Drawing.Point(0, 33); this.ribbonPanel15.Name = "ribbonPanel15"; this.ribbonPanel15.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); - this.ribbonPanel15.Size = new System.Drawing.Size(1328, 95); + this.ribbonPanel15.Size = new System.Drawing.Size(1328, 62); // // // @@ -2843,7 +2465,7 @@ this.buttonItemXTGL}); this.ribbonBar20.Location = new System.Drawing.Point(3, 0); this.ribbonBar20.Name = "ribbonBar20"; - this.ribbonBar20.Size = new System.Drawing.Size(283, 92); + this.ribbonBar20.Size = new System.Drawing.Size(283, 59); this.ribbonBar20.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; this.ribbonBar20.TabIndex = 0; // @@ -3274,216 +2896,15 @@ this.buttonItemXT4_2.Text = "人员修改"; this.buttonItemXT4_2.Click += new System.EventHandler(this.buttonItemXT4_2_Click); // - // ribbonPanel3 - // - this.ribbonPanel3.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.ribbonPanel3.Controls.Add(this.ribbonBar4); - this.ribbonPanel3.Dock = System.Windows.Forms.DockStyle.Fill; - this.ribbonPanel3.Location = new System.Drawing.Point(0, 33); - this.ribbonPanel3.Name = "ribbonPanel3"; - this.ribbonPanel3.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); - this.ribbonPanel3.Size = new System.Drawing.Size(1328, 62); - // - // - // - this.ribbonPanel3.Style.Class = ""; - this.ribbonPanel3.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonPanel3.StyleMouseDown.Class = ""; - this.ribbonPanel3.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonPanel3.StyleMouseOver.Class = ""; - this.ribbonPanel3.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonPanel3.TabIndex = 40; - // - // ribbonBar4 - // - this.ribbonBar4.AutoOverflowEnabled = true; - // - // - // - this.ribbonBar4.BackgroundMouseOverStyle.Class = ""; - this.ribbonBar4.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonBar4.BackgroundStyle.Class = ""; - this.ribbonBar4.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonBar4.ContainerControlProcessDialogKey = true; - this.ribbonBar4.Dock = System.Windows.Forms.DockStyle.Left; - this.ribbonBar4.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { - this.btn_flag, - this.slider4ground}); - this.ribbonBar4.Location = new System.Drawing.Point(3, 0); - this.ribbonBar4.Name = "ribbonBar4"; - this.ribbonBar4.Size = new System.Drawing.Size(321, 59); - this.ribbonBar4.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.ribbonBar4.TabIndex = 0; - // - // - // - this.ribbonBar4.TitleStyle.Class = ""; - this.ribbonBar4.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonBar4.TitleStyleMouseOver.Class = ""; - this.ribbonBar4.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonBar4.TitleVisible = false; - // - // btn_flag - // - this.btn_flag.Image = global::Cyberpipe.Properties.Resources._24x24icon_03_hover; - this.btn_flag.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.btn_flag.Name = "btn_flag"; - this.btn_flag.SubItemsExpandWidth = 14; - this.btn_flag.Text = "标识器管理"; - this.btn_flag.Click += new System.EventHandler(this.btn_flag_Click); - // - // slider4ground - // - this.slider4ground.LabelPosition = DevComponents.DotNetBar.eSliderLabelPosition.Top; - this.slider4ground.LabelWidth = 50; - this.slider4ground.Name = "slider4ground"; - this.slider4ground.Text = "地面透明度"; - this.slider4ground.TextColor = System.Drawing.Color.Black; - this.slider4ground.Value = 0; - this.slider4ground.ValueChanged += new System.EventHandler(this.slider4ground_ValueChanged); - // - // ribbonPanel7 - // - this.ribbonPanel7.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.ribbonPanel7.Controls.Add(this.gxdw_ribbonbar); - this.ribbonPanel7.Dock = System.Windows.Forms.DockStyle.Fill; - this.ribbonPanel7.Location = new System.Drawing.Point(0, 33); - this.ribbonPanel7.Name = "ribbonPanel7"; - this.ribbonPanel7.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); - this.ribbonPanel7.Size = new System.Drawing.Size(1328, 62); - // - // - // - this.ribbonPanel7.Style.Class = ""; - this.ribbonPanel7.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonPanel7.StyleMouseDown.Class = ""; - this.ribbonPanel7.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonPanel7.StyleMouseOver.Class = ""; - this.ribbonPanel7.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonPanel7.TabIndex = 41; - this.ribbonPanel7.Visible = false; - // - // gxdw_ribbonbar - // - this.gxdw_ribbonbar.AutoOverflowEnabled = true; - // - // - // - this.gxdw_ribbonbar.BackgroundMouseOverStyle.Class = ""; - this.gxdw_ribbonbar.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.gxdw_ribbonbar.BackgroundStyle.Class = ""; - this.gxdw_ribbonbar.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.gxdw_ribbonbar.ContainerControlProcessDialogKey = true; - this.gxdw_ribbonbar.Dock = System.Windows.Forms.DockStyle.Left; - this.gxdw_ribbonbar.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { - this.buttonItem9, - this.buttonItem10, - this.buttonItem11, - this.buttonItem12, - this.buttonItem13, - this.buttonItem14}); - this.gxdw_ribbonbar.Location = new System.Drawing.Point(3, 0); - this.gxdw_ribbonbar.Name = "gxdw_ribbonbar"; - this.gxdw_ribbonbar.Size = new System.Drawing.Size(522, 59); - this.gxdw_ribbonbar.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.gxdw_ribbonbar.TabIndex = 0; - this.gxdw_ribbonbar.Text = "ribbonBar5"; - // - // - // - this.gxdw_ribbonbar.TitleStyle.Class = ""; - this.gxdw_ribbonbar.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.gxdw_ribbonbar.TitleStyleMouseOver.Class = ""; - this.gxdw_ribbonbar.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.gxdw_ribbonbar.TitleVisible = false; - // - // buttonItem9 - // - this.buttonItem9.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__76; - this.buttonItem9.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem9.Name = "buttonItem9"; - this.buttonItem9.SubItemsExpandWidth = 14; - this.buttonItem9.Text = "工单管理"; - this.buttonItem9.Click += new System.EventHandler(this.buttonItem9_Click); - // - // buttonItem10 - // - this.buttonItem10.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__69; - this.buttonItem10.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem10.Name = "buttonItem10"; - this.buttonItem10.SubItemsExpandWidth = 14; - this.buttonItem10.Text = "在线任务"; - this.buttonItem10.Click += new System.EventHandler(this.buttonItem10_Click); - // - // buttonItem11 - // - this.buttonItem11.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__72; - this.buttonItem11.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem11.Name = "buttonItem11"; - this.buttonItem11.SubItemsExpandWidth = 14; - this.buttonItem11.Text = "事件管理"; - this.buttonItem11.Click += new System.EventHandler(this.buttonItem11_Click); - // - // buttonItem12 - // - this.buttonItem12.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__34; - this.buttonItem12.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem12.Name = "buttonItem12"; - this.buttonItem12.SubItemsExpandWidth = 14; - this.buttonItem12.Text = "探测仪管理"; - this.buttonItem12.Click += new System.EventHandler(this.buttonItem12_Click); - // - // buttonItem13 - // - this.buttonItem13.Image = global::Cyberpipe.Properties.Resources._24x24icon_13_hover; - this.buttonItem13.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem13.Name = "buttonItem13"; - this.buttonItem13.SubItemsExpandWidth = 14; - this.buttonItem13.Text = "巡检人员维护"; - this.buttonItem13.Click += new System.EventHandler(this.buttonItem13_Click); - // - // buttonItem14 - // - this.buttonItem14.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__56; - this.buttonItem14.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem14.Name = "buttonItem14"; - this.buttonItem14.SubItemsExpandWidth = 14; - this.buttonItem14.Text = "导出施工图"; - this.buttonItem14.Click += new System.EventHandler(this.buttonItem14_Click); - // // ribbonPanel2 // this.ribbonPanel2.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; this.ribbonPanel2.Controls.Add(this.ribbonBar3); this.ribbonPanel2.Dock = System.Windows.Forms.DockStyle.Fill; - this.ribbonPanel2.Location = new System.Drawing.Point(0, 33); + this.ribbonPanel2.Location = new System.Drawing.Point(0, 0); this.ribbonPanel2.Name = "ribbonPanel2"; this.ribbonPanel2.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); - this.ribbonPanel2.Size = new System.Drawing.Size(1328, 62); + this.ribbonPanel2.Size = new System.Drawing.Size(1328, 95); // // // @@ -3527,7 +2948,7 @@ this.buttonItemPasswordReset}); this.ribbonBar3.Location = new System.Drawing.Point(3, 0); this.ribbonBar3.Name = "ribbonBar3"; - this.ribbonBar3.Size = new System.Drawing.Size(551, 59); + this.ribbonBar3.Size = new System.Drawing.Size(551, 92); this.ribbonBar3.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; this.ribbonBar3.TabIndex = 1; // @@ -3567,6 +2988,7 @@ this.btn_resc_info.Name = "btn_resc_info"; this.btn_resc_info.SubItemsExpandWidth = 14; this.btn_resc_info.Text = "资源管理"; + this.btn_resc_info.Visible = false; this.btn_resc_info.Click += new System.EventHandler(this.btn_resc_info_Click); // // btn_role_resc @@ -3605,6 +3027,605 @@ this.buttonItemPasswordReset.Text = "重置密码"; this.buttonItemPasswordReset.Click += new System.EventHandler(this.buttonItemPasswordReset_Click); // + // ribbonPanel6 + // + this.ribbonPanel6.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.ribbonPanel6.Controls.Add(this.ribbonBar6); + this.ribbonPanel6.Dock = System.Windows.Forms.DockStyle.Fill; + this.ribbonPanel6.Location = new System.Drawing.Point(0, 0); + this.ribbonPanel6.Name = "ribbonPanel6"; + this.ribbonPanel6.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); + this.ribbonPanel6.Size = new System.Drawing.Size(1328, 95); + // + // + // + this.ribbonPanel6.Style.Class = ""; + this.ribbonPanel6.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonPanel6.StyleMouseDown.Class = ""; + this.ribbonPanel6.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonPanel6.StyleMouseOver.Class = ""; + this.ribbonPanel6.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonPanel6.TabIndex = 38; + this.ribbonPanel6.Visible = false; + // + // ribbonBar6 + // + this.ribbonBar6.AutoOverflowEnabled = true; + // + // + // + this.ribbonBar6.BackgroundMouseOverStyle.Class = ""; + this.ribbonBar6.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonBar6.BackgroundStyle.Class = ""; + this.ribbonBar6.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar6.ContainerControlProcessDialogKey = true; + this.ribbonBar6.Dock = System.Windows.Forms.DockStyle.Left; + this.ribbonBar6.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { + this.buttonItemSPSZ, + this.buttonItem8, + this.buttonItemLocation, + this.sliderItem2, + this.buttonItemGBJC}); + this.ribbonBar6.Location = new System.Drawing.Point(3, 0); + this.ribbonBar6.Name = "ribbonBar6"; + this.ribbonBar6.Size = new System.Drawing.Size(427, 92); + this.ribbonBar6.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.ribbonBar6.TabIndex = 0; + // + // + // + this.ribbonBar6.TitleStyle.Class = ""; + this.ribbonBar6.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonBar6.TitleStyleMouseOver.Class = ""; + this.ribbonBar6.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar6.TitleVisible = false; + // + // buttonItemSPSZ + // + this.buttonItemSPSZ.Image = ((System.Drawing.Image)(resources.GetObject("buttonItemSPSZ.Image"))); + this.buttonItemSPSZ.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItemSPSZ.Name = "buttonItemSPSZ"; + this.buttonItemSPSZ.SubItemsExpandWidth = 14; + this.buttonItemSPSZ.Text = "双屏设置"; + this.buttonItemSPSZ.Click += new System.EventHandler(this.buttonItemSPSZ_Click); + // + // buttonItem8 + // + this.buttonItem8.Image = ((System.Drawing.Image)(resources.GetObject("buttonItem8.Image"))); + this.buttonItem8.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem8.Name = "buttonItem8"; + this.buttonItem8.SubItemsExpandWidth = 14; + this.buttonItem8.Text = "双屏分析"; + this.buttonItem8.Click += new System.EventHandler(this.buttonItem8_Click); + // + // buttonItemLocation + // + this.buttonItemLocation.Image = ((System.Drawing.Image)(resources.GetObject("buttonItemLocation.Image"))); + this.buttonItemLocation.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItemLocation.Name = "buttonItemLocation"; + this.buttonItemLocation.SubItemsExpandWidth = 14; + this.buttonItemLocation.Text = "快速定位"; + this.buttonItemLocation.Click += new System.EventHandler(this.buttonItemLocation_Click); + // + // sliderItem2 + // + this.sliderItem2.LabelPosition = DevComponents.DotNetBar.eSliderLabelPosition.Top; + this.sliderItem2.LabelWidth = 50; + this.sliderItem2.Name = "sliderItem2"; + this.sliderItem2.Text = "地面透明度"; + this.sliderItem2.TextColor = System.Drawing.Color.Black; + this.sliderItem2.Value = 0; + this.sliderItem2.ValueChanged += new System.EventHandler(this.sliderItem2_ValueChanged); + // + // buttonItemGBJC + // + this.buttonItemGBJC.Image = ((System.Drawing.Image)(resources.GetObject("buttonItemGBJC.Image"))); + this.buttonItemGBJC.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItemGBJC.Name = "buttonItemGBJC"; + this.buttonItemGBJC.SubItemsExpandWidth = 14; + this.buttonItemGBJC.Text = "国标检测"; + this.buttonItemGBJC.Click += new System.EventHandler(this.buttonItemGBJC_Click); + // + // ribbonPanel5 + // + this.ribbonPanel5.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.ribbonPanel5.Controls.Add(this.ribbonBar2); + this.ribbonPanel5.Dock = System.Windows.Forms.DockStyle.Fill; + this.ribbonPanel5.Location = new System.Drawing.Point(0, 33); + this.ribbonPanel5.Name = "ribbonPanel5"; + this.ribbonPanel5.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); + this.ribbonPanel5.Size = new System.Drawing.Size(1328, 62); + // + // + // + this.ribbonPanel5.Style.Class = ""; + this.ribbonPanel5.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonPanel5.StyleMouseDown.Class = ""; + this.ribbonPanel5.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonPanel5.StyleMouseOver.Class = ""; + this.ribbonPanel5.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonPanel5.TabIndex = 37; + this.ribbonPanel5.Visible = false; + // + // ribbonBar2 + // + this.ribbonBar2.AutoOverflowEnabled = true; + // + // + // + this.ribbonBar2.BackgroundMouseOverStyle.Class = ""; + this.ribbonBar2.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonBar2.BackgroundStyle.Class = ""; + this.ribbonBar2.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar2.ContainerControlProcessDialogKey = true; + this.ribbonBar2.Dock = System.Windows.Forms.DockStyle.Left; + this.ribbonBar2.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { + this.buttonItemHX1, + this.buttonItemHX2, + this.buttonItemDCTP, + this.sliderItem3}); + this.ribbonBar2.Location = new System.Drawing.Point(3, 0); + this.ribbonBar2.Name = "ribbonBar2"; + this.ribbonBar2.Size = new System.Drawing.Size(350, 59); + this.ribbonBar2.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.ribbonBar2.TabIndex = 0; + // + // + // + this.ribbonBar2.TitleStyle.Class = ""; + this.ribbonBar2.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonBar2.TitleStyleMouseOver.Class = ""; + this.ribbonBar2.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar2.TitleVisible = false; + // + // buttonItemHX1 + // + this.buttonItemHX1.AutoExpandOnClick = true; + this.buttonItemHX1.Image = ((System.Drawing.Image)(resources.GetObject("buttonItemHX1.Image"))); + this.buttonItemHX1.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItemHX1.Name = "buttonItemHX1"; + this.buttonItemHX1.SubItemsExpandWidth = 14; + this.buttonItemHX1.Text = "导入红线"; + this.buttonItemHX1.Click += new System.EventHandler(this.buttonItemHX1_Click); + // + // buttonItemHX2 + // + this.buttonItemHX2.Image = ((System.Drawing.Image)(resources.GetObject("buttonItemHX2.Image"))); + this.buttonItemHX2.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItemHX2.Name = "buttonItemHX2"; + this.buttonItemHX2.SubItemsExpandWidth = 14; + this.buttonItemHX2.Text = "红线审核"; + this.buttonItemHX2.Click += new System.EventHandler(this.buttonItemHX2_Click); + // + // buttonItemDCTP + // + this.buttonItemDCTP.Image = ((System.Drawing.Image)(resources.GetObject("buttonItemDCTP.Image"))); + this.buttonItemDCTP.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItemDCTP.Name = "buttonItemDCTP"; + this.buttonItemDCTP.SubItemsExpandWidth = 14; + this.buttonItemDCTP.Text = "导出图片"; + this.buttonItemDCTP.Click += new System.EventHandler(this.buttonItemDCTP_Click); + // + // sliderItem3 + // + this.sliderItem3.LabelPosition = DevComponents.DotNetBar.eSliderLabelPosition.Top; + this.sliderItem3.LabelWidth = 50; + this.sliderItem3.Name = "sliderItem3"; + this.sliderItem3.Text = "地面透明度"; + this.sliderItem3.TextColor = System.Drawing.Color.Black; + this.sliderItem3.Value = 0; + this.sliderItem3.ValueChanged += new System.EventHandler(this.sliderItem3_ValueChanged); + // + // ribbonPanel1 + // + this.ribbonPanel1.AutoSize = true; + this.ribbonPanel1.CanvasColor = System.Drawing.Color.Gray; + this.ribbonPanel1.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.ribbonPanel1.Controls.Add(this.ribbonBar21); + this.ribbonPanel1.Dock = System.Windows.Forms.DockStyle.Fill; + this.ribbonPanel1.Location = new System.Drawing.Point(0, 33); + this.ribbonPanel1.Name = "ribbonPanel1"; + this.ribbonPanel1.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); + this.ribbonPanel1.Size = new System.Drawing.Size(1328, 62); + // + // + // + this.ribbonPanel1.Style.Class = ""; + this.ribbonPanel1.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonPanel1.StyleMouseDown.Class = ""; + this.ribbonPanel1.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonPanel1.StyleMouseOver.Class = ""; + this.ribbonPanel1.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonPanel1.TabIndex = 1; + this.ribbonPanel1.Visible = false; + // + // ribbonBar21 + // + this.ribbonBar21.AutoOverflowEnabled = true; + this.ribbonBar21.BackColor = System.Drawing.Color.White; + // + // + // + this.ribbonBar21.BackgroundMouseOverStyle.Class = ""; + this.ribbonBar21.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonBar21.BackgroundStyle.Class = ""; + this.ribbonBar21.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar21.ContainerControlProcessDialogKey = true; + this.ribbonBar21.Dock = System.Windows.Forms.DockStyle.Left; + this.ribbonBar21.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { + this.buttonItem87, + this.buttonItem88, + this.buttonItem27, + this.sliderGroundTransSet1, + this.buttonItem91, + this.buttonItem1, + this.btnlegendSet, + this.buttonItem89, + this.btnOutputJPG}); + this.ribbonBar21.Location = new System.Drawing.Point(3, 0); + this.ribbonBar21.Name = "ribbonBar21"; + this.ribbonBar21.Size = new System.Drawing.Size(649, 59); + this.ribbonBar21.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.ribbonBar21.TabIndex = 2; + this.ribbonBar21.Text = "浏览模式"; + // + // + // + this.ribbonBar21.TitleStyle.Class = ""; + this.ribbonBar21.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonBar21.TitleStyleMouseOver.Class = ""; + this.ribbonBar21.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar21.TitleVisible = false; + // + // buttonItem87 + // + this.buttonItem87.Image = ((System.Drawing.Image)(resources.GetObject("buttonItem87.Image"))); + this.buttonItem87.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem87.Name = "buttonItem87"; + this.buttonItem87.SubItemsExpandWidth = 14; + this.buttonItem87.Text = "地上模式"; + this.buttonItem87.Click += new System.EventHandler(this.buttonItem87_Click); + // + // buttonItem88 + // + this.buttonItem88.Image = ((System.Drawing.Image)(resources.GetObject("buttonItem88.Image"))); + this.buttonItem88.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem88.Name = "buttonItem88"; + this.buttonItem88.SubItemsExpandWidth = 14; + this.buttonItem88.Text = "地下模式"; + this.buttonItem88.Click += new System.EventHandler(this.buttonItem88_Click); + // + // buttonItem27 + // + this.buttonItem27.Image = ((System.Drawing.Image)(resources.GetObject("buttonItem27.Image"))); + this.buttonItem27.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem27.Name = "buttonItem27"; + this.buttonItem27.SubItemsExpandWidth = 14; + this.buttonItem27.Text = "行走模式"; + this.buttonItem27.Click += new System.EventHandler(this.buttonItem27_Click); + // + // buttonItem91 + // + this.buttonItem91.ForeColor = System.Drawing.Color.Black; + this.buttonItem91.Image = ((System.Drawing.Image)(resources.GetObject("buttonItem91.Image"))); + this.buttonItem91.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem91.Name = "buttonItem91"; + this.buttonItem91.SubItemsExpandWidth = 14; + this.buttonItem91.Text = "快速定位"; + this.buttonItem91.Click += new System.EventHandler(this.buttonItem91_Click); + // + // buttonItem1 + // + this.buttonItem1.Image = ((System.Drawing.Image)(resources.GetObject("buttonItem1.Image"))); + this.buttonItem1.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem1.Name = "buttonItem1"; + this.buttonItem1.SubItemsExpandWidth = 14; + this.buttonItem1.Text = "图层管理"; + this.buttonItem1.Click += new System.EventHandler(this.buttonItem1_Click); + // + // btnlegendSet + // + this.btnlegendSet.Image = ((System.Drawing.Image)(resources.GetObject("btnlegendSet.Image"))); + this.btnlegendSet.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.btnlegendSet.Name = "btnlegendSet"; + this.btnlegendSet.SubItemsExpandWidth = 14; + this.btnlegendSet.Text = "图例"; + this.btnlegendSet.Click += new System.EventHandler(this.btnlegendSet_Click); + // + // buttonItem89 + // + this.buttonItem89.Image = ((System.Drawing.Image)(resources.GetObject("buttonItem89.Image"))); + this.buttonItem89.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem89.Name = "buttonItem89"; + this.buttonItem89.SubItemsExpandWidth = 14; + this.buttonItem89.Text = "全屏显示"; + this.buttonItem89.Click += new System.EventHandler(this.buttonItem89_Click); + // + // btnOutputJPG + // + this.btnOutputJPG.Image = ((System.Drawing.Image)(resources.GetObject("btnOutputJPG.Image"))); + this.btnOutputJPG.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.btnOutputJPG.Name = "btnOutputJPG"; + this.btnOutputJPG.SubItemsExpandWidth = 14; + this.btnOutputJPG.Text = "导出图片"; + this.btnOutputJPG.Click += new System.EventHandler(this.btnOutputJPG_Click); + // + // ribbonPanel12 + // + this.ribbonPanel12.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.ribbonPanel12.Controls.Add(this.ribbonBar18); + this.ribbonPanel12.Controls.Add(this.ribbonBar13); + this.ribbonPanel12.Dock = System.Windows.Forms.DockStyle.Fill; + this.ribbonPanel12.Location = new System.Drawing.Point(0, 33); + this.ribbonPanel12.Name = "ribbonPanel12"; + this.ribbonPanel12.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); + this.ribbonPanel12.Size = new System.Drawing.Size(1328, 62); + // + // + // + this.ribbonPanel12.Style.Class = ""; + this.ribbonPanel12.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonPanel12.StyleMouseDown.Class = ""; + this.ribbonPanel12.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonPanel12.StyleMouseOver.Class = ""; + this.ribbonPanel12.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonPanel12.TabIndex = 34; + this.ribbonPanel12.Visible = false; + // + // ribbonBar18 + // + this.ribbonBar18.AutoOverflowEnabled = true; + // + // + // + this.ribbonBar18.BackgroundMouseOverStyle.Class = ""; + this.ribbonBar18.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonBar18.BackgroundStyle.Class = ""; + this.ribbonBar18.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar18.ContainerControlProcessDialogKey = true; + this.ribbonBar18.Dock = System.Windows.Forms.DockStyle.Left; + this.ribbonBar18.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { + this.buttonItem133, + this.buttonItem132}); + this.ribbonBar18.Location = new System.Drawing.Point(508, 0); + this.ribbonBar18.Name = "ribbonBar18"; + this.ribbonBar18.Size = new System.Drawing.Size(75, 59); + this.ribbonBar18.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.ribbonBar18.TabIndex = 1; + // + // + // + this.ribbonBar18.TitleStyle.Class = ""; + this.ribbonBar18.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonBar18.TitleStyleMouseOver.Class = ""; + this.ribbonBar18.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar18.TitleVisible = false; + // + // buttonItem133 + // + this.buttonItem133.Image = ((System.Drawing.Image)(resources.GetObject("buttonItem133.Image"))); + this.buttonItem133.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem133.Name = "buttonItem133"; + this.buttonItem133.SubItemsExpandWidth = 14; + this.buttonItem133.Text = "审核入库"; + this.buttonItem133.Click += new System.EventHandler(this.buttonItem133_Click_1); + // + // buttonItem132 + // + this.buttonItem132.Name = "buttonItem132"; + // + // ribbonBar13 + // + this.ribbonBar13.AutoOverflowEnabled = true; + // + // + // + this.ribbonBar13.BackgroundMouseOverStyle.Class = ""; + this.ribbonBar13.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonBar13.BackgroundStyle.Class = ""; + this.ribbonBar13.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar13.ContainerControlProcessDialogKey = true; + this.ribbonBar13.Dock = System.Windows.Forms.DockStyle.Left; + this.ribbonBar13.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { + this.buttonItem127, + this.buttonItem128, + this.sliderItem1, + this.buttonItem134, + this.buttonItem130, + this.btn_check_history}); + this.ribbonBar13.Location = new System.Drawing.Point(3, 0); + this.ribbonBar13.Name = "ribbonBar13"; + this.ribbonBar13.Size = new System.Drawing.Size(505, 59); + this.ribbonBar13.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.ribbonBar13.TabIndex = 0; + // + // + // + this.ribbonBar13.TitleStyle.Class = ""; + this.ribbonBar13.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonBar13.TitleStyleMouseOver.Class = ""; + this.ribbonBar13.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar13.TitleVisible = false; + // + // buttonItem127 + // + this.buttonItem127.Image = ((System.Drawing.Image)(resources.GetObject("buttonItem127.Image"))); + this.buttonItem127.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem127.Name = "buttonItem127"; + this.buttonItem127.SubItemsExpandWidth = 14; + this.buttonItem127.Text = "打开数据"; + this.buttonItem127.Click += new System.EventHandler(this.buttonItem127_Click_2); + // + // buttonItem128 + // + this.buttonItem128.Image = ((System.Drawing.Image)(resources.GetObject("buttonItem128.Image"))); + this.buttonItem128.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem128.Name = "buttonItem128"; + this.buttonItem128.SubItemsExpandWidth = 14; + this.buttonItem128.Text = "一键审核"; + this.buttonItem128.Click += new System.EventHandler(this.buttonItem128_Click); + // + // sliderItem1 + // + this.sliderItem1.LabelPosition = DevComponents.DotNetBar.eSliderLabelPosition.Top; + this.sliderItem1.LabelWidth = 50; + this.sliderItem1.Name = "sliderItem1"; + this.sliderItem1.Text = "地面透明度"; + this.sliderItem1.TextColor = System.Drawing.Color.Black; + this.sliderItem1.Value = 0; + this.sliderItem1.ValueChanged += new System.EventHandler(this.sliderItem1_ValueChanged); + // + // buttonItem134 + // + this.buttonItem134.Image = ((System.Drawing.Image)(resources.GetObject("buttonItem134.Image"))); + this.buttonItem134.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem134.Name = "buttonItem134"; + this.buttonItem134.SubItemsExpandWidth = 14; + this.buttonItem134.Text = "模拟设计修改"; + this.buttonItem134.Click += new System.EventHandler(this.buttonItem134_Click_1); + // + // buttonItem130 + // + this.buttonItem130.Image = ((System.Drawing.Image)(resources.GetObject("buttonItem130.Image"))); + this.buttonItem130.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem130.Name = "buttonItem130"; + this.buttonItem130.SubItemsExpandWidth = 14; + this.buttonItem130.Text = "导出审核图"; + this.buttonItem130.Click += new System.EventHandler(this.buttonItem130_Click_1); + // + // btn_check_history + // + this.btn_check_history.Image = ((System.Drawing.Image)(resources.GetObject("btn_check_history.Image"))); + this.btn_check_history.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.btn_check_history.Name = "btn_check_history"; + this.btn_check_history.SubItemsExpandWidth = 14; + this.btn_check_history.Text = "审核历史"; + this.btn_check_history.Click += new System.EventHandler(this.btn_check_history_Click); + // + // ribbonPanel4 + // + this.ribbonPanel4.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.ribbonPanel4.Controls.Add(this.ribbonBar1); + this.ribbonPanel4.Dock = System.Windows.Forms.DockStyle.Fill; + this.ribbonPanel4.Location = new System.Drawing.Point(0, 33); + this.ribbonPanel4.Name = "ribbonPanel4"; + this.ribbonPanel4.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); + this.ribbonPanel4.Size = new System.Drawing.Size(1328, 62); + // + // + // + this.ribbonPanel4.Style.Class = ""; + this.ribbonPanel4.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonPanel4.StyleMouseDown.Class = ""; + this.ribbonPanel4.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonPanel4.StyleMouseOver.Class = ""; + this.ribbonPanel4.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonPanel4.TabIndex = 36; + this.ribbonPanel4.Visible = false; + // + // ribbonBar1 + // + this.ribbonBar1.AutoOverflowEnabled = true; + // + // + // + this.ribbonBar1.BackgroundMouseOverStyle.Class = ""; + this.ribbonBar1.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonBar1.BackgroundStyle.Class = ""; + this.ribbonBar1.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar1.ContainerControlProcessDialogKey = true; + this.ribbonBar1.Dock = System.Windows.Forms.DockStyle.Left; + this.ribbonBar1.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { + this.btn_document_info}); + this.ribbonBar1.Location = new System.Drawing.Point(3, 0); + this.ribbonBar1.Name = "ribbonBar1"; + this.ribbonBar1.Size = new System.Drawing.Size(88, 59); + this.ribbonBar1.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.ribbonBar1.TabIndex = 0; + // + // + // + this.ribbonBar1.TitleStyle.Class = ""; + this.ribbonBar1.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonBar1.TitleStyleMouseOver.Class = ""; + this.ribbonBar1.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar1.TitleVisible = false; + // + // btn_document_info + // + this.btn_document_info.Image = ((System.Drawing.Image)(resources.GetObject("btn_document_info.Image"))); + this.btn_document_info.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.btn_document_info.Name = "btn_document_info"; + this.btn_document_info.SubItemsExpandWidth = 14; + this.btn_document_info.Text = "文档管理"; + this.btn_document_info.Click += new System.EventHandler(this.btn_document_info_Click); + // // ribbonTabItem1 // this.ribbonTabItem1.ButtonStyle = DevComponents.DotNetBar.eButtonStyle.ImageAndText; @@ -3673,7 +3694,6 @@ this.ribbonTabItem7.Name = "ribbonTabItem7"; this.ribbonTabItem7.Panel = this.ribbonPanel7; this.ribbonTabItem7.Text = "管线定位"; - this.ribbonTabItem7.MouseDown += new System.Windows.Forms.MouseEventHandler(this.ribbonTabItem7_MouseDown); // // ribbonTabItem5 // @@ -3684,7 +3704,6 @@ this.ribbonTabItem5.Name = "ribbonTabItem5"; this.ribbonTabItem5.Panel = this.ribbonPanel3; this.ribbonTabItem5.Text = "标识器管理"; - this.ribbonTabItem5.MouseDown += new System.Windows.Forms.MouseEventHandler(this.ribbonTabItem5_MouseDown); // // ribbonTabItem2 // @@ -4451,7 +4470,7 @@ this.dataGridViewX2.ReadOnly = true; this.dataGridViewX2.RowHeadersVisible = false; this.dataGridViewX2.RowTemplate.Height = 23; - this.dataGridViewX2.Size = new System.Drawing.Size(31081, 92); + this.dataGridViewX2.Size = new System.Drawing.Size(31378, 92); this.dataGridViewX2.TabIndex = 11; // // dataGridViewTextBoxColumn10 @@ -4545,7 +4564,7 @@ this.dataGridViewX3.ReadOnly = true; this.dataGridViewX3.RowHeadersVisible = false; this.dataGridViewX3.RowTemplate.Height = 23; - this.dataGridViewX3.Size = new System.Drawing.Size(31080, 127); + this.dataGridViewX3.Size = new System.Drawing.Size(31377, 127); this.dataGridViewX3.TabIndex = 5; this.dataGridViewX3.MouseDoubleClick += new System.Windows.Forms.MouseEventHandler(this.dataGridViewX3_MouseDoubleClick); // @@ -5722,7 +5741,8 @@ // pictureBox1 // this.pictureBox1.Dock = System.Windows.Forms.DockStyle.Top; - this.pictureBox1.Image = ((System.Drawing.Image)(resources.GetObject("pictureBox1.Image"))); +// this.pictureBox1.Image = ((System.Drawing.Image)(resources.GetObject("pictureBox1.Image"))); + this.pictureBox1.Image = Image.FromFile(Application.StartupPath + Utility.TitleImagePath); this.pictureBox1.Location = new System.Drawing.Point(0, 0); this.pictureBox1.Margin = new System.Windows.Forms.Padding(0); this.pictureBox1.Name = "pictureBox1"; @@ -5732,18 +5752,6 @@ this.pictureBox1.TabStop = false; this.pictureBox1.Paint += new System.Windows.Forms.PaintEventHandler(this.pictureBox1_Paint); // - // layerTree - // - this.layerTree.CheckBoxes = true; - this.layerTree.ItemHeight = 18; - this.layerTree.Location = new System.Drawing.Point(30, 78); - this.layerTree.Name = "layerTree"; - this.layerTree.Size = new System.Drawing.Size(121, 97); - this.layerTree.TabIndex = 1; - this.layerTree.AfterCheck += new System.Windows.Forms.TreeViewEventHandler(this.layerTree_AfterCheck); - this.layerTree.NodeMouseClick += new System.Windows.Forms.TreeNodeMouseClickEventHandler(this.layerTree_NodeMouseClick); - this.layerTree.NodeMouseDoubleClick += new System.Windows.Forms.TreeNodeMouseClickEventHandler(this.layerTree_NodeMouseDoubleClick); - // // MainFrm // this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Inherit; @@ -5770,7 +5778,8 @@ this.KeyPreview = true; this.Name = "MainFrm"; this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen; - this.Text = "智慧太湖新城管网规划分析系统6.0"; +// this.Text = "智慧太湖新城管网规划分析系统6.0"; + this.Text = Utility.SysnameVersion; this.WindowState = System.Windows.Forms.FormWindowState.Maximized; this.FormClosing += new System.Windows.Forms.FormClosingEventHandler(this.MainFrm_FormClosing); this.Load += new System.EventHandler(this.MainFrm_Load); @@ -5787,15 +5796,15 @@ this.contextMenuStripDeleteLayerNode.ResumeLayout(false); this.ribbonControl1.ResumeLayout(false); this.ribbonControl1.PerformLayout(); + this.ribbonPanel3.ResumeLayout(false); + this.ribbonPanel7.ResumeLayout(false); + this.ribbonPanel15.ResumeLayout(false); + this.ribbonPanel2.ResumeLayout(false); this.ribbonPanel6.ResumeLayout(false); this.ribbonPanel5.ResumeLayout(false); this.ribbonPanel1.ResumeLayout(false); this.ribbonPanel12.ResumeLayout(false); this.ribbonPanel4.ResumeLayout(false); - this.ribbonPanel15.ResumeLayout(false); - this.ribbonPanel3.ResumeLayout(false); - this.ribbonPanel7.ResumeLayout(false); - this.ribbonPanel2.ResumeLayout(false); this.panelOfTable.ResumeLayout(false); this.panelOfTable.PerformLayout(); ((System.ComponentModel.ISupportInitialize)(this.dataGridViewX1)).EndInit(); @@ -5955,6 +5964,7 @@ private RibbonTabItem ribbonTabItem11; private ButtonItem buttonItem130; private RibbonBar ribbonBar18; + private ButtonItem buttonItem132; private SliderItem sliderItem1; private ButtonItem buttonItem133; private ButtonItem buttonItem134; diff --git a/MainFrm.resx b/MainFrm.resx index 9f9bba4..ce490c1 100644 --- a/MainFrm.resx +++ b/MainFrm.resx @@ -351,6 +351,146 @@ 766, 54 + + + iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 + YQUAAAAZdEVYdFNvZnR3YXJlAEFkb2JlIEltYWdlUmVhZHlxyWU8AAADZmlUWHRYTUw6Y29tLmFkb2Jl + LnhtcAAAAAAAPD94cGFja2V0IGJlZ2luPSLvu78iIGlkPSJXNU0wTXBDZWhpSHpyZVN6TlRjemtjOWQi + Pz4gPHg6eG1wbWV0YSB4bWxuczp4PSJhZG9iZTpuczptZXRhLyIgeDp4bXB0az0iQWRvYmUgWE1QIENv + cmUgNS4zLWMwMTEgNjYuMTQ1NjYxLCAyMDEyLzAyLzA2LTE0OjU2OjI3ICAgICAgICAiPiA8cmRmOlJE + RiB4bWxuczpyZGY9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkvMDIvMjItcmRmLXN5bnRheC1ucyMiPiA8 + cmRmOkRlc2NyaXB0aW9uIHJkZjphYm91dD0iIiB4bWxuczp4bXBNTT0iaHR0cDovL25zLmFkb2JlLmNv + bS94YXAvMS4wL21tLyIgeG1sbnM6c3RSZWY9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlw + ZS9SZXNvdXJjZVJlZiMiIHhtbG5zOnhtcD0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wLyIgeG1w + TU06T3JpZ2luYWxEb2N1bWVudElEPSJ4bXAuZGlkOjYzQTM5NEY4Mjg0OUU0MTE5NDBEQTc4ODZEQzk5 + N0NGIiB4bXBNTTpEb2N1bWVudElEPSJ4bXAuZGlkOjEwQ0IxNzBBNEM1QzExRTRBNkNGQzRBMjhDQzI0 + MkY4IiB4bXBNTTpJbnN0YW5jZUlEPSJ4bXAuaWlkOjEwQ0IxNzA5NEM1QzExRTRBNkNGQzRBMjhDQzI0 + MkY4IiB4bXA6Q3JlYXRvclRvb2w9IkFkb2JlIFBob3Rvc2hvcCBDUzYgKFdpbmRvd3MpIj4gPHhtcE1N + OkRlcml2ZWRGcm9tIHN0UmVmOmluc3RhbmNlSUQ9InhtcC5paWQ6NTEzMDNDMjA1QjRDRTQxMTg4NERE + MUVBOEQ4QTgyNTUiIHN0UmVmOmRvY3VtZW50SUQ9InhtcC5kaWQ6NjNBMzk0RjgyODQ5RTQxMTk0MERB + Nzg4NkRDOTk3Q0YiLz4gPC9yZGY6RGVzY3JpcHRpb24+IDwvcmRmOlJERj4gPC94OnhtcG1ldGE+IDw/ + eHBhY2tldCBlbmQ9InIiPz43wa2/AAAFaUlEQVRIS6WUC0xTVxzGKy0UkSmlFGjBFilSkNpSaAWRh63y + sIiAArKs4spLRLQoiEJlSMGoMCc6CBOnYHzMOHUqqOhEHOqCbjNu6kCd6KYje5mZ6KbObd/OuVL3cEzj + /skv997/+b7v39PTW9aj3/BM+OKxPEIZoW/gyrOuPbP+GvRPSNBQQqXYLwSW1etw7cYt5kqfaZ+uD8QM + Xg8f/f4UxGhHMHv4qlG6vAb9394G6T+BPpdV1oCuUx3VD8Q9XT8//PUJRMghlLhLg1C41IK+r/pB+oNC + 16mO6qmP+gdi/6y793+hwTYEk9uoQOSaStHzxQ2Q/nND9XMKy0D9NIfmDcSzaLhI4KXE7LwinLtwGXfu + PXhhqJ/m0DyS62EdUGWpqcf3P97DD3d++t/QnKraBjpghXWAiC+WN0ZNScOe1mP45vbdF2ZvWwdoDs/D + b6ejs6ecxHPoAG/l+Fhkzy+FyCcY0YkG7D/yAW5+d+e5oXrqo36aQ/McnNyjyAAuHWA05pfgzPlehhyT + mflV6FOMaDt2Ctf7bw8KXac6qqc+a4Zx3hLwRLJCZgcJjcPIEPkyIZmeX1SB7vOX0dn9KQy5jw8r8eVc + HOrsxidXP0d9hxlzd4QgeYMzEt7kQVvOR0pFFNpOHmd81E9znIS+dSTc1foVGWfNKUZjyy6Ex6SQl0cD + 09IVxHAFh0+cReqr+QjK8ERqEw+VHWOwoycSR/v1OHwzDlsvhcNCeqkbedAYxQiPm87kZOQVw0nkW0QG + 2DFnIA+JRm3DFpzr/RKNW3ZDE5UAsX8ocizZiFs7DEUHvPFunw4Hb05B+y09jn49lYHe0x5doxqqLVlf + DJrnyB+pIQNs6QAhf6R8tZu3CqpwPdZu2I6PLl3HwnV5iHv9JVSeUOKdqzq81xeDvddiYG73R0aLEIZm + IRa1jUbjxQnYRHa17YqW0VJPwHT3LocRbirrDiymspXo6L6AgiXV8JSNQ2i6GpNWOqK4U4n1n0Vge68W + 9ecmIKnBBSqDCIp4P2RWGDB/QxqS6l1QcToIld3BqDobgsXEQ73+Se5HrGcgdJEokGzIx66DXXi7dRvC + yx2Q2RqApR+GoPbjCag8pUZ6sxjqWRKEldljRr07ZjaKmHt5qpBZKzkeiIJ2BbIPKmA8MIbJUC/ghrM0 + RfYsDtdhqJNIVulK/ku0BQokbfZGZrsKBR3BmEsMOfvl0FY7o7ypDPo1brCcGc+QUCdExabXEFsjQO4B + ObL2BSBlqx8SWwibvBE0334nK3Ael+yEbIW81DZszlhZ2oieuAYvpO5VIHGzP9J2+CN9pz/CzDwExMox + eZUbFnZpkEc+gLZagJjMWOiqXZDVqmC0+kZf6Nb4IHKFCPIsu92sgCw7BlJswjBJLCdenmuPyFUS6Gp9 + oG/yRdJWGSKqhYjKDgLRImK5ACGlzsy9d/zwXn2DBMZDSkZLPaHlnpBncyGO5kxj+Rps/wYdJE2xzfOb + zcU4sye0b0gRu3E0Ypt8ELTICRFGNcShUgjHuZyWxNu2096sdiXS9o1ltNQjyyDhes4SkuXEGpXC+Ve8 + kjlzpDPtoCkVQrdOihgyIHmXP6LryGEX86Ba6ISJNR7IeF+JV8gAfbOM0XoTj8dktpmEOxM4rJHTBscz + njNNnMiBagEfU98ajRnbZMg7GojCk2oGU1cw5nUGw7BHAZWJD6oVhLFzSDCPCacljGP/J7xAm6Hu0ew6 + STIXkcvckN7ig8XHVCjvUiNvdwAmW0Twms6FayS7meM4REoihxPoeT4u10nsZ0LKhhdsIxZEsVcLtOyL + pHffVcd+IJjI7uGHsRscJEPURMMn2FMtNTwuFusPrjFl48ji7nIAAAAASUVORK5CYII= + + + + + iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 + YQUAAAAZdEVYdFNvZnR3YXJlAEFkb2JlIEltYWdlUmVhZHlxyWU8AAADZmlUWHRYTUw6Y29tLmFkb2Jl + LnhtcAAAAAAAPD94cGFja2V0IGJlZ2luPSLvu78iIGlkPSJXNU0wTXBDZWhpSHpyZVN6TlRjemtjOWQi + Pz4gPHg6eG1wbWV0YSB4bWxuczp4PSJhZG9iZTpuczptZXRhLyIgeDp4bXB0az0iQWRvYmUgWE1QIENv + cmUgNS4zLWMwMTEgNjYuMTQ1NjYxLCAyMDEyLzAyLzA2LTE0OjU2OjI3ICAgICAgICAiPiA8cmRmOlJE + RiB4bWxuczpyZGY9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkvMDIvMjItcmRmLXN5bnRheC1ucyMiPiA8 + cmRmOkRlc2NyaXB0aW9uIHJkZjphYm91dD0iIiB4bWxuczp4bXBNTT0iaHR0cDovL25zLmFkb2JlLmNv + bS94YXAvMS4wL21tLyIgeG1sbnM6c3RSZWY9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlw + ZS9SZXNvdXJjZVJlZiMiIHhtbG5zOnhtcD0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wLyIgeG1w + TU06T3JpZ2luYWxEb2N1bWVudElEPSJ4bXAuZGlkOjYzQTM5NEY4Mjg0OUU0MTE5NDBEQTc4ODZEQzk5 + N0NGIiB4bXBNTTpEb2N1bWVudElEPSJ4bXAuZGlkOkUyMTg3NjEyNDlEODExRTQ4NjNGQjM2Mzk1QkNB + RkQwIiB4bXBNTTpJbnN0YW5jZUlEPSJ4bXAuaWlkOkUyMTg3NjExNDlEODExRTQ4NjNGQjM2Mzk1QkNB + RkQwIiB4bXA6Q3JlYXRvclRvb2w9IkFkb2JlIFBob3Rvc2hvcCBDUzYgKFdpbmRvd3MpIj4gPHhtcE1N + OkRlcml2ZWRGcm9tIHN0UmVmOmluc3RhbmNlSUQ9InhtcC5paWQ6NkJCNTE0NDlEODQ5RTQxMUE0QzNB + MjdEOTJBQzc3QkMiIHN0UmVmOmRvY3VtZW50SUQ9InhtcC5kaWQ6NjNBMzk0RjgyODQ5RTQxMTk0MERB + Nzg4NkRDOTk3Q0YiLz4gPC9yZGY6RGVzY3JpcHRpb24+IDwvcmRmOlJERj4gPC94OnhtcG1ldGE+IDw/ + eHBhY2tldCBlbmQ9InIiPz5e5MstAAADiUlEQVRIS+2UW0yTdxjGcePwtYyVVpAUCi1tv9ImrVbxhAei + kjGphAgFT4jzEJ0gGuJhDk0sml0sglmWmC1hqHNKWwI4srgNh3phpjg1O1yIN5DMbFHQZUu42O76+D4f + 3Fl6Z7ILn+SXvH3f533++X/98iUBeKW81v9Uwx1G1+1240EhfKfdeE/4U3qTAqaZZO/2aeN9IXLrY+Ph + wVOZHll9YyohgYZOGS4JsYdXVDy+NQ8Tvy3BP6OlmPyjDP9OBDRYs8cZPfRy5/uQISIRqcIsLSye+j7I + wN+PluOvhyWY+NmL8fsOjP9kxdN7BRh/YJHfFjy5m48nd4ThQjy968bEgwV49usicFciTEKKFhZPXXv1 + eHxtLsYGPBjttwsWjF0xY+ybOfj9uylYs8cZPfQS7kpEnqDTwuLp9GYlfKZeifUfzcb1j/Iw/IkNv3Q6 + MfKVC6O9bg3W7HFGD73cORlMG5AIizDzAaVtunD5ESXWfNSEY/tNCO00oG1zOkJBBSeqUjVYh6R3Qmat + zSY0Hjah7IASW7hPuSoRvIGihcVTSauCppvFODRUjJZvPWgaKMTuXgt2RHOxLTwHDd3EjPfCudgesWJX + jxM7eryo7/Ni8SGFj8gp6LWwePLvS0Og043A5y5UdtkQOJeLivM5ePf8bJSfM04zG2u7chDoysW6Thsq + zqpY0+GAvymNB/gEgxYWT64tKdGihpSYv8WEpSEzVp0pwDuf2SVQReCiS4M1e5zRQy937NXJ1yRirjDz + AVmVJyNZa9+PObauh7ptKdR6FY6N2SisTYe1OlmDNXtqvRNqwxLYt1TCVLY1ZijZOSQRbuEtLSyeTOXH + sfLDH1EauoFFx6/Cd6Qf7pYI1ObLsO+9iMLdF+DccwEuqd2Nl+Br6sbCxiiKd/XBuPogH1HiAzJXHMC8 + YA98td1wb4rCuaEH1roo8oMR5JGaMPIFa10Ejtowiuouw1vzJTwVXyBz+X4ekPgRZfgbohkLtsfMy47B + tqYdakUnPFUM6YUv+LUGa/Y4o8e8rBXcSffWDkpE4j9ZpEvNmb9KsZV16BzrBnVq1YjeVf1MX1Tzn74o + iCmkdq1/LrNHOkfgB6Vg9afJRrVOdv2ClRkMmklvCnyPs4V8ge81v5RegddnCGHNHmf00JslcJcZCcWv + IU1pAhcyhLcFXj1zGtbscUYPvdyZ+Uv6Wi8rKekFBjoX2627by8AAAAASUVORK5CYII= + + + + + iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 + YQUAAAAZdEVYdFNvZnR3YXJlAEFkb2JlIEltYWdlUmVhZHlxyWU8AAADZmlUWHRYTUw6Y29tLmFkb2Jl + LnhtcAAAAAAAPD94cGFja2V0IGJlZ2luPSLvu78iIGlkPSJXNU0wTXBDZWhpSHpyZVN6TlRjemtjOWQi + Pz4gPHg6eG1wbWV0YSB4bWxuczp4PSJhZG9iZTpuczptZXRhLyIgeDp4bXB0az0iQWRvYmUgWE1QIENv + cmUgNS4zLWMwMTEgNjYuMTQ1NjYxLCAyMDEyLzAyLzA2LTE0OjU2OjI3ICAgICAgICAiPiA8cmRmOlJE + RiB4bWxuczpyZGY9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkvMDIvMjItcmRmLXN5bnRheC1ucyMiPiA8 + cmRmOkRlc2NyaXB0aW9uIHJkZjphYm91dD0iIiB4bWxuczp4bXBNTT0iaHR0cDovL25zLmFkb2JlLmNv + bS94YXAvMS4wL21tLyIgeG1sbnM6c3RSZWY9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlw + ZS9SZXNvdXJjZVJlZiMiIHhtbG5zOnhtcD0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wLyIgeG1w + TU06T3JpZ2luYWxEb2N1bWVudElEPSJ4bXAuZGlkOjYzQTM5NEY4Mjg0OUU0MTE5NDBEQTc4ODZEQzk5 + N0NGIiB4bXBNTTpEb2N1bWVudElEPSJ4bXAuZGlkOkE2Q0VGMDE2NDlEQTExRTQ4NTlCQTI3NTMyOEY5 + NEU2IiB4bXBNTTpJbnN0YW5jZUlEPSJ4bXAuaWlkOkE2Q0VGMDE1NDlEQTExRTQ4NTlCQTI3NTMyOEY5 + NEU2IiB4bXA6Q3JlYXRvclRvb2w9IkFkb2JlIFBob3Rvc2hvcCBDUzYgKFdpbmRvd3MpIj4gPHhtcE1N + OkRlcml2ZWRGcm9tIHN0UmVmOmluc3RhbmNlSUQ9InhtcC5paWQ6NjA1MjM3NzFEOTQ5RTQxMUE0QzNB + MjdEOTJBQzc3QkMiIHN0UmVmOmRvY3VtZW50SUQ9InhtcC5kaWQ6NjNBMzk0RjgyODQ5RTQxMTk0MERB + Nzg4NkRDOTk3Q0YiLz4gPC9yZGY6RGVzY3JpcHRpb24+IDwvcmRmOlJERj4gPC94OnhtcG1ldGE+IDw/ + eHBhY2tldCBlbmQ9InIiPz6UH16BAAABrElEQVRIS63N70tTURzH8fsnKSGCCEIQCBKISMq2iILCgQOL + JUxQAoVKdMGQuwgWFepsMGjFZCMuorsIJV4WFatpvzdr1ZAFsaIHn8559v1eDsI91wevJ/ee7/tjbMRH + fAFwJOWRF6oopTzyQhWlVEdBwRbgUhICAnuvilKGtXDGzW6WV/CvbjE/xTfxr+R6q4xSxtP5YTf8rVn4 + s5dG+809Rv5zvVVGKaNwfYgyBfhksoH83CCF9seiL7LBBnLXTlP4/W4dza0ZLS0nCdlgA9npAQq/qk/Q + sKa0NJ8nIBtsIBPrp9CqPMJBYVLLj+04ZIMNrF49ReHwVRafH1/R8m3zJmSDDdy/fJJC88Ua3mcjWurW + LGSDDaQifRS+O8uopsNaPhVnIBts4E64l0Jj5y4qDy5q+ZCPQTbYgHmph8LXZ0m8TJ3Xsp+LQjbYQOJC + N4XadgLl22e1vM1OQDbYwK1zXRS+lBbhmEHsLgU8kTeVh+OQDTawEDpB2U4mitfpMS22GYJssIH5QCcV + FGwBmuRtkA3cGO3whcZUlEdeqKKU8sgLVZRSfjw+MP4DJ2GPpDR9OIsAAAAASUVORK5CYII= + + + + + iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 + YQUAAAAZdEVYdFNvZnR3YXJlAEFkb2JlIEltYWdlUmVhZHlxyWU8AAADZmlUWHRYTUw6Y29tLmFkb2Jl + LnhtcAAAAAAAPD94cGFja2V0IGJlZ2luPSLvu78iIGlkPSJXNU0wTXBDZWhpSHpyZVN6TlRjemtjOWQi + Pz4gPHg6eG1wbWV0YSB4bWxuczp4PSJhZG9iZTpuczptZXRhLyIgeDp4bXB0az0iQWRvYmUgWE1QIENv + cmUgNS4zLWMwMTEgNjYuMTQ1NjYxLCAyMDEyLzAyLzA2LTE0OjU2OjI3ICAgICAgICAiPiA8cmRmOlJE + RiB4bWxuczpyZGY9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkvMDIvMjItcmRmLXN5bnRheC1ucyMiPiA8 + cmRmOkRlc2NyaXB0aW9uIHJkZjphYm91dD0iIiB4bWxuczp4bXBNTT0iaHR0cDovL25zLmFkb2JlLmNv + bS94YXAvMS4wL21tLyIgeG1sbnM6c3RSZWY9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlw + ZS9SZXNvdXJjZVJlZiMiIHhtbG5zOnhtcD0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wLyIgeG1w + TU06T3JpZ2luYWxEb2N1bWVudElEPSJ4bXAuZGlkOjYzQTM5NEY4Mjg0OUU0MTE5NDBEQTc4ODZEQzk5 + N0NGIiB4bXBNTTpEb2N1bWVudElEPSJ4bXAuZGlkOjJGRTU5OEQ1NDlEQjExRTRBRUVDOTkyMjQ5NzEw + REUwIiB4bXBNTTpJbnN0YW5jZUlEPSJ4bXAuaWlkOjJGRTU5OEQ0NDlEQjExRTRBRUVDOTkyMjQ5NzEw + REUwIiB4bXA6Q3JlYXRvclRvb2w9IkFkb2JlIFBob3Rvc2hvcCBDUzYgKFdpbmRvd3MpIj4gPHhtcE1N + OkRlcml2ZWRGcm9tIHN0UmVmOmluc3RhbmNlSUQ9InhtcC5paWQ6MTY0MkI1RjlEQTQ5RTQxMUE0QzNB + MjdEOTJBQzc3QkMiIHN0UmVmOmRvY3VtZW50SUQ9InhtcC5kaWQ6NjNBMzk0RjgyODQ5RTQxMTk0MERB + Nzg4NkRDOTk3Q0YiLz4gPC9yZGY6RGVzY3JpcHRpb24+IDwvcmRmOlJERj4gPC94OnhtcG1ldGE+IDw/ + eHBhY2tldCBlbmQ9InIiPz6B5sF9AAACe0lEQVRIS7WVb2jMcRzHL7UHanF/Mts5prE/1li3kAfu5Ak7 + 5IHNobBkSC2UIuGJkrrSWRvTmHQWK8U1T8jqUtYwkZpaGjV/Js6to5YwfXze39+fu/v23f36hXe9us+f + 7/v9rd/dr3MQ0X/F4Zm3+K9QhWajNNlBFZqN0mQHS6lMdrCUyqSgimllUsy4XmOmp+QRDllQWbygjjq6 + uimZStOX8a+ixox3pXrM1JLCDAqYJmY7c669M0bff07mcLbtEl9QE8k6V6BH5ooXMsHZZX7ae+AY7W45 + SrPm19LbsSR9m/iRA2bYGefggVePzUgKBzeu9sQpmZ4QcG/WMtk7eLjv0WMz0kOz+TX6MUXvP6cFeNbD + bz6YvQFm2Bk9PPByZO6jksLB5KvRTzTyLikIrG2ktsvXzd4g2hGjYP1ms4eHvb850qkl65LCQW/ntVs0 + 9HpMcPx0K1X4V1Ff/3NzhnphbVDsjBk8Lm/VE44s0ZJ1KS4Ie8uXUvPBE7Tn0ElCzTMqrV5BO/cfEaDG + TD5X6PFFONLygsTF7jj1vxihyPkYNTS1iFrFxm37KHIhJmp43L7qZxzp0pJ1SeHhQGgLJQaH6fb9R1QX + 2EB3Ek9FryLe95j8K9eLT/TB0FZcskOP1iRdkIh23aR7Ay9pzaZddKY9Jup8nIpeoXXhZlHD655b85Bj + p2npLOmCML+dD/iTZhaX3+UvbRB1PpzeygFnSUUvatecRUMzisoOc+x0LZ3FixxYhQyK1cxyZhkTYhqY + RgnM6hmcwVl4ljDI0KS4AC+Kmyli8Jv2MF7GNwXY4QzOwgNv5mWTL7CLpVQmO1hKZbKDpVR/1P8OcvwB + lh7gOXXZq9sAAAAASUVORK5CYII= + + iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 @@ -598,147 +738,7 @@ 1BGxz38BvCwLsyQ3iHgAAAAASUVORK5CYII= - - - iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAZdEVYdFNvZnR3YXJlAEFkb2JlIEltYWdlUmVhZHlxyWU8AAADZmlUWHRYTUw6Y29tLmFkb2Jl - LnhtcAAAAAAAPD94cGFja2V0IGJlZ2luPSLvu78iIGlkPSJXNU0wTXBDZWhpSHpyZVN6TlRjemtjOWQi - Pz4gPHg6eG1wbWV0YSB4bWxuczp4PSJhZG9iZTpuczptZXRhLyIgeDp4bXB0az0iQWRvYmUgWE1QIENv - cmUgNS4zLWMwMTEgNjYuMTQ1NjYxLCAyMDEyLzAyLzA2LTE0OjU2OjI3ICAgICAgICAiPiA8cmRmOlJE - RiB4bWxuczpyZGY9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkvMDIvMjItcmRmLXN5bnRheC1ucyMiPiA8 - cmRmOkRlc2NyaXB0aW9uIHJkZjphYm91dD0iIiB4bWxuczp4bXBNTT0iaHR0cDovL25zLmFkb2JlLmNv - bS94YXAvMS4wL21tLyIgeG1sbnM6c3RSZWY9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlw - ZS9SZXNvdXJjZVJlZiMiIHhtbG5zOnhtcD0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wLyIgeG1w - TU06T3JpZ2luYWxEb2N1bWVudElEPSJ4bXAuZGlkOjYzQTM5NEY4Mjg0OUU0MTE5NDBEQTc4ODZEQzk5 - N0NGIiB4bXBNTTpEb2N1bWVudElEPSJ4bXAuZGlkOjEwQ0IxNzBBNEM1QzExRTRBNkNGQzRBMjhDQzI0 - MkY4IiB4bXBNTTpJbnN0YW5jZUlEPSJ4bXAuaWlkOjEwQ0IxNzA5NEM1QzExRTRBNkNGQzRBMjhDQzI0 - MkY4IiB4bXA6Q3JlYXRvclRvb2w9IkFkb2JlIFBob3Rvc2hvcCBDUzYgKFdpbmRvd3MpIj4gPHhtcE1N - OkRlcml2ZWRGcm9tIHN0UmVmOmluc3RhbmNlSUQ9InhtcC5paWQ6NTEzMDNDMjA1QjRDRTQxMTg4NERE - MUVBOEQ4QTgyNTUiIHN0UmVmOmRvY3VtZW50SUQ9InhtcC5kaWQ6NjNBMzk0RjgyODQ5RTQxMTk0MERB - Nzg4NkRDOTk3Q0YiLz4gPC9yZGY6RGVzY3JpcHRpb24+IDwvcmRmOlJERj4gPC94OnhtcG1ldGE+IDw/ - eHBhY2tldCBlbmQ9InIiPz43wa2/AAAFaUlEQVRIS6WUC0xTVxzGKy0UkSmlFGjBFilSkNpSaAWRh63y - sIiAArKs4spLRLQoiEJlSMGoMCc6CBOnYHzMOHUqqOhEHOqCbjNu6kCd6KYje5mZ6KbObd/OuVL3cEzj - /skv997/+b7v39PTW9aj3/BM+OKxPEIZoW/gyrOuPbP+GvRPSNBQQqXYLwSW1etw7cYt5kqfaZ+uD8QM - Xg8f/f4UxGhHMHv4qlG6vAb9394G6T+BPpdV1oCuUx3VD8Q9XT8//PUJRMghlLhLg1C41IK+r/pB+oNC - 16mO6qmP+gdi/6y793+hwTYEk9uoQOSaStHzxQ2Q/nND9XMKy0D9NIfmDcSzaLhI4KXE7LwinLtwGXfu - PXhhqJ/m0DyS62EdUGWpqcf3P97DD3d++t/QnKraBjpghXWAiC+WN0ZNScOe1mP45vbdF2ZvWwdoDs/D - b6ejs6ecxHPoAG/l+Fhkzy+FyCcY0YkG7D/yAW5+d+e5oXrqo36aQ/McnNyjyAAuHWA05pfgzPlehhyT - mflV6FOMaDt2Ctf7bw8KXac6qqc+a4Zx3hLwRLJCZgcJjcPIEPkyIZmeX1SB7vOX0dn9KQy5jw8r8eVc - HOrsxidXP0d9hxlzd4QgeYMzEt7kQVvOR0pFFNpOHmd81E9znIS+dSTc1foVGWfNKUZjyy6Ex6SQl0cD - 09IVxHAFh0+cReqr+QjK8ERqEw+VHWOwoycSR/v1OHwzDlsvhcNCeqkbedAYxQiPm87kZOQVw0nkW0QG - 2DFnIA+JRm3DFpzr/RKNW3ZDE5UAsX8ocizZiFs7DEUHvPFunw4Hb05B+y09jn49lYHe0x5doxqqLVlf - DJrnyB+pIQNs6QAhf6R8tZu3CqpwPdZu2I6PLl3HwnV5iHv9JVSeUOKdqzq81xeDvddiYG73R0aLEIZm - IRa1jUbjxQnYRHa17YqW0VJPwHT3LocRbirrDiymspXo6L6AgiXV8JSNQ2i6GpNWOqK4U4n1n0Vge68W - 9ecmIKnBBSqDCIp4P2RWGDB/QxqS6l1QcToIld3BqDobgsXEQ73+Se5HrGcgdJEokGzIx66DXXi7dRvC - yx2Q2RqApR+GoPbjCag8pUZ6sxjqWRKEldljRr07ZjaKmHt5qpBZKzkeiIJ2BbIPKmA8MIbJUC/ghrM0 - RfYsDtdhqJNIVulK/ku0BQokbfZGZrsKBR3BmEsMOfvl0FY7o7ypDPo1brCcGc+QUCdExabXEFsjQO4B - ObL2BSBlqx8SWwibvBE0334nK3Ael+yEbIW81DZszlhZ2oieuAYvpO5VIHGzP9J2+CN9pz/CzDwExMox - eZUbFnZpkEc+gLZagJjMWOiqXZDVqmC0+kZf6Nb4IHKFCPIsu92sgCw7BlJswjBJLCdenmuPyFUS6Gp9 - oG/yRdJWGSKqhYjKDgLRImK5ACGlzsy9d/zwXn2DBMZDSkZLPaHlnpBncyGO5kxj+Rps/wYdJE2xzfOb - zcU4sye0b0gRu3E0Ypt8ELTICRFGNcShUgjHuZyWxNu2096sdiXS9o1ltNQjyyDhes4SkuXEGpXC+Ve8 - kjlzpDPtoCkVQrdOihgyIHmXP6LryGEX86Ba6ISJNR7IeF+JV8gAfbOM0XoTj8dktpmEOxM4rJHTBscz - njNNnMiBagEfU98ajRnbZMg7GojCk2oGU1cw5nUGw7BHAZWJD6oVhLFzSDCPCacljGP/J7xAm6Hu0ew6 - STIXkcvckN7ig8XHVCjvUiNvdwAmW0Twms6FayS7meM4REoihxPoeT4u10nsZ0LKhhdsIxZEsVcLtOyL - pHffVcd+IJjI7uGHsRscJEPURMMn2FMtNTwuFusPrjFl48ji7nIAAAAASUVORK5CYII= - - - - - iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAZdEVYdFNvZnR3YXJlAEFkb2JlIEltYWdlUmVhZHlxyWU8AAADZmlUWHRYTUw6Y29tLmFkb2Jl - LnhtcAAAAAAAPD94cGFja2V0IGJlZ2luPSLvu78iIGlkPSJXNU0wTXBDZWhpSHpyZVN6TlRjemtjOWQi - Pz4gPHg6eG1wbWV0YSB4bWxuczp4PSJhZG9iZTpuczptZXRhLyIgeDp4bXB0az0iQWRvYmUgWE1QIENv - cmUgNS4zLWMwMTEgNjYuMTQ1NjYxLCAyMDEyLzAyLzA2LTE0OjU2OjI3ICAgICAgICAiPiA8cmRmOlJE - RiB4bWxuczpyZGY9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkvMDIvMjItcmRmLXN5bnRheC1ucyMiPiA8 - cmRmOkRlc2NyaXB0aW9uIHJkZjphYm91dD0iIiB4bWxuczp4bXBNTT0iaHR0cDovL25zLmFkb2JlLmNv - bS94YXAvMS4wL21tLyIgeG1sbnM6c3RSZWY9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlw - ZS9SZXNvdXJjZVJlZiMiIHhtbG5zOnhtcD0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wLyIgeG1w - TU06T3JpZ2luYWxEb2N1bWVudElEPSJ4bXAuZGlkOjYzQTM5NEY4Mjg0OUU0MTE5NDBEQTc4ODZEQzk5 - N0NGIiB4bXBNTTpEb2N1bWVudElEPSJ4bXAuZGlkOkUyMTg3NjEyNDlEODExRTQ4NjNGQjM2Mzk1QkNB - RkQwIiB4bXBNTTpJbnN0YW5jZUlEPSJ4bXAuaWlkOkUyMTg3NjExNDlEODExRTQ4NjNGQjM2Mzk1QkNB - RkQwIiB4bXA6Q3JlYXRvclRvb2w9IkFkb2JlIFBob3Rvc2hvcCBDUzYgKFdpbmRvd3MpIj4gPHhtcE1N - OkRlcml2ZWRGcm9tIHN0UmVmOmluc3RhbmNlSUQ9InhtcC5paWQ6NkJCNTE0NDlEODQ5RTQxMUE0QzNB - MjdEOTJBQzc3QkMiIHN0UmVmOmRvY3VtZW50SUQ9InhtcC5kaWQ6NjNBMzk0RjgyODQ5RTQxMTk0MERB - Nzg4NkRDOTk3Q0YiLz4gPC9yZGY6RGVzY3JpcHRpb24+IDwvcmRmOlJERj4gPC94OnhtcG1ldGE+IDw/ - eHBhY2tldCBlbmQ9InIiPz5e5MstAAADiUlEQVRIS+2UW0yTdxjGcePwtYyVVpAUCi1tv9ImrVbxhAei - kjGphAgFT4jzEJ0gGuJhDk0sml0sglmWmC1hqHNKWwI4srgNh3phpjg1O1yIN5DMbFHQZUu42O76+D4f - 3Fl6Z7ILn+SXvH3f533++X/98iUBeKW81v9Uwx1G1+1240EhfKfdeE/4U3qTAqaZZO/2aeN9IXLrY+Ph - wVOZHll9YyohgYZOGS4JsYdXVDy+NQ8Tvy3BP6OlmPyjDP9OBDRYs8cZPfRy5/uQISIRqcIsLSye+j7I - wN+PluOvhyWY+NmL8fsOjP9kxdN7BRh/YJHfFjy5m48nd4ThQjy968bEgwV49usicFciTEKKFhZPXXv1 - eHxtLsYGPBjttwsWjF0xY+ybOfj9uylYs8cZPfQS7kpEnqDTwuLp9GYlfKZeifUfzcb1j/Iw/IkNv3Q6 - MfKVC6O9bg3W7HFGD73cORlMG5AIizDzAaVtunD5ESXWfNSEY/tNCO00oG1zOkJBBSeqUjVYh6R3Qmat - zSY0Hjah7IASW7hPuSoRvIGihcVTSauCppvFODRUjJZvPWgaKMTuXgt2RHOxLTwHDd3EjPfCudgesWJX - jxM7eryo7/Ni8SGFj8gp6LWwePLvS0Og043A5y5UdtkQOJeLivM5ePf8bJSfM04zG2u7chDoysW6Thsq - zqpY0+GAvymNB/gEgxYWT64tKdGihpSYv8WEpSEzVp0pwDuf2SVQReCiS4M1e5zRQy937NXJ1yRirjDz - AVmVJyNZa9+PObauh7ptKdR6FY6N2SisTYe1OlmDNXtqvRNqwxLYt1TCVLY1ZijZOSQRbuEtLSyeTOXH - sfLDH1EauoFFx6/Cd6Qf7pYI1ObLsO+9iMLdF+DccwEuqd2Nl+Br6sbCxiiKd/XBuPogH1HiAzJXHMC8 - YA98td1wb4rCuaEH1roo8oMR5JGaMPIFa10Ejtowiuouw1vzJTwVXyBz+X4ekPgRZfgbohkLtsfMy47B - tqYdakUnPFUM6YUv+LUGa/Y4o8e8rBXcSffWDkpE4j9ZpEvNmb9KsZV16BzrBnVq1YjeVf1MX1Tzn74o - iCmkdq1/LrNHOkfgB6Vg9afJRrVOdv2ClRkMmklvCnyPs4V8ge81v5RegddnCGHNHmf00JslcJcZCcWv - IU1pAhcyhLcFXj1zGtbscUYPvdyZ+Uv6Wi8rKekFBjoX2627by8AAAAASUVORK5CYII= - - - - - iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAZdEVYdFNvZnR3YXJlAEFkb2JlIEltYWdlUmVhZHlxyWU8AAADZmlUWHRYTUw6Y29tLmFkb2Jl - LnhtcAAAAAAAPD94cGFja2V0IGJlZ2luPSLvu78iIGlkPSJXNU0wTXBDZWhpSHpyZVN6TlRjemtjOWQi - Pz4gPHg6eG1wbWV0YSB4bWxuczp4PSJhZG9iZTpuczptZXRhLyIgeDp4bXB0az0iQWRvYmUgWE1QIENv - cmUgNS4zLWMwMTEgNjYuMTQ1NjYxLCAyMDEyLzAyLzA2LTE0OjU2OjI3ICAgICAgICAiPiA8cmRmOlJE - RiB4bWxuczpyZGY9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkvMDIvMjItcmRmLXN5bnRheC1ucyMiPiA8 - cmRmOkRlc2NyaXB0aW9uIHJkZjphYm91dD0iIiB4bWxuczp4bXBNTT0iaHR0cDovL25zLmFkb2JlLmNv - bS94YXAvMS4wL21tLyIgeG1sbnM6c3RSZWY9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlw - ZS9SZXNvdXJjZVJlZiMiIHhtbG5zOnhtcD0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wLyIgeG1w - TU06T3JpZ2luYWxEb2N1bWVudElEPSJ4bXAuZGlkOjYzQTM5NEY4Mjg0OUU0MTE5NDBEQTc4ODZEQzk5 - N0NGIiB4bXBNTTpEb2N1bWVudElEPSJ4bXAuZGlkOkE2Q0VGMDE2NDlEQTExRTQ4NTlCQTI3NTMyOEY5 - NEU2IiB4bXBNTTpJbnN0YW5jZUlEPSJ4bXAuaWlkOkE2Q0VGMDE1NDlEQTExRTQ4NTlCQTI3NTMyOEY5 - NEU2IiB4bXA6Q3JlYXRvclRvb2w9IkFkb2JlIFBob3Rvc2hvcCBDUzYgKFdpbmRvd3MpIj4gPHhtcE1N - OkRlcml2ZWRGcm9tIHN0UmVmOmluc3RhbmNlSUQ9InhtcC5paWQ6NjA1MjM3NzFEOTQ5RTQxMUE0QzNB - MjdEOTJBQzc3QkMiIHN0UmVmOmRvY3VtZW50SUQ9InhtcC5kaWQ6NjNBMzk0RjgyODQ5RTQxMTk0MERB - Nzg4NkRDOTk3Q0YiLz4gPC9yZGY6RGVzY3JpcHRpb24+IDwvcmRmOlJERj4gPC94OnhtcG1ldGE+IDw/ - eHBhY2tldCBlbmQ9InIiPz6UH16BAAABrElEQVRIS63N70tTURzH8fsnKSGCCEIQCBKISMq2iILCgQOL - JUxQAoVKdMGQuwgWFepsMGjFZCMuorsIJV4WFatpvzdr1ZAFsaIHn8559v1eDsI91wevJ/ee7/tjbMRH - fAFwJOWRF6oopTzyQhWlVEdBwRbgUhICAnuvilKGtXDGzW6WV/CvbjE/xTfxr+R6q4xSxtP5YTf8rVn4 - s5dG+809Rv5zvVVGKaNwfYgyBfhksoH83CCF9seiL7LBBnLXTlP4/W4dza0ZLS0nCdlgA9npAQq/qk/Q - sKa0NJ8nIBtsIBPrp9CqPMJBYVLLj+04ZIMNrF49ReHwVRafH1/R8m3zJmSDDdy/fJJC88Ua3mcjWurW - LGSDDaQifRS+O8uopsNaPhVnIBts4E64l0Jj5y4qDy5q+ZCPQTbYgHmph8LXZ0m8TJ3Xsp+LQjbYQOJC - N4XadgLl22e1vM1OQDbYwK1zXRS+lBbhmEHsLgU8kTeVh+OQDTawEDpB2U4mitfpMS22GYJssIH5QCcV - FGwBmuRtkA3cGO3whcZUlEdeqKKU8sgLVZRSfjw+MP4DJ2GPpDR9OIsAAAAASUVORK5CYII= - - - - - iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAZdEVYdFNvZnR3YXJlAEFkb2JlIEltYWdlUmVhZHlxyWU8AAADZmlUWHRYTUw6Y29tLmFkb2Jl - LnhtcAAAAAAAPD94cGFja2V0IGJlZ2luPSLvu78iIGlkPSJXNU0wTXBDZWhpSHpyZVN6TlRjemtjOWQi - Pz4gPHg6eG1wbWV0YSB4bWxuczp4PSJhZG9iZTpuczptZXRhLyIgeDp4bXB0az0iQWRvYmUgWE1QIENv - cmUgNS4zLWMwMTEgNjYuMTQ1NjYxLCAyMDEyLzAyLzA2LTE0OjU2OjI3ICAgICAgICAiPiA8cmRmOlJE - RiB4bWxuczpyZGY9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkvMDIvMjItcmRmLXN5bnRheC1ucyMiPiA8 - cmRmOkRlc2NyaXB0aW9uIHJkZjphYm91dD0iIiB4bWxuczp4bXBNTT0iaHR0cDovL25zLmFkb2JlLmNv - bS94YXAvMS4wL21tLyIgeG1sbnM6c3RSZWY9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlw - ZS9SZXNvdXJjZVJlZiMiIHhtbG5zOnhtcD0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wLyIgeG1w - TU06T3JpZ2luYWxEb2N1bWVudElEPSJ4bXAuZGlkOjYzQTM5NEY4Mjg0OUU0MTE5NDBEQTc4ODZEQzk5 - N0NGIiB4bXBNTTpEb2N1bWVudElEPSJ4bXAuZGlkOjJGRTU5OEQ1NDlEQjExRTRBRUVDOTkyMjQ5NzEw - REUwIiB4bXBNTTpJbnN0YW5jZUlEPSJ4bXAuaWlkOjJGRTU5OEQ0NDlEQjExRTRBRUVDOTkyMjQ5NzEw - REUwIiB4bXA6Q3JlYXRvclRvb2w9IkFkb2JlIFBob3Rvc2hvcCBDUzYgKFdpbmRvd3MpIj4gPHhtcE1N - OkRlcml2ZWRGcm9tIHN0UmVmOmluc3RhbmNlSUQ9InhtcC5paWQ6MTY0MkI1RjlEQTQ5RTQxMUE0QzNB - MjdEOTJBQzc3QkMiIHN0UmVmOmRvY3VtZW50SUQ9InhtcC5kaWQ6NjNBMzk0RjgyODQ5RTQxMTk0MERB - Nzg4NkRDOTk3Q0YiLz4gPC9yZGY6RGVzY3JpcHRpb24+IDwvcmRmOlJERj4gPC94OnhtcG1ldGE+IDw/ - eHBhY2tldCBlbmQ9InIiPz6B5sF9AAACe0lEQVRIS7WVb2jMcRzHL7UHanF/Mts5prE/1li3kAfu5Ak7 - 5IHNobBkSC2UIuGJkrrSWRvTmHQWK8U1T8jqUtYwkZpaGjV/Js6to5YwfXze39+fu/v23f36hXe9us+f - 7/v9rd/dr3MQ0X/F4Zm3+K9QhWajNNlBFZqN0mQHS6lMdrCUyqSgimllUsy4XmOmp+QRDllQWbygjjq6 - uimZStOX8a+ixox3pXrM1JLCDAqYJmY7c669M0bff07mcLbtEl9QE8k6V6BH5ooXMsHZZX7ae+AY7W45 - SrPm19LbsSR9m/iRA2bYGefggVePzUgKBzeu9sQpmZ4QcG/WMtk7eLjv0WMz0kOz+TX6MUXvP6cFeNbD - bz6YvQFm2Bk9PPByZO6jksLB5KvRTzTyLikIrG2ktsvXzd4g2hGjYP1ms4eHvb850qkl65LCQW/ntVs0 - 9HpMcPx0K1X4V1Ff/3NzhnphbVDsjBk8Lm/VE44s0ZJ1KS4Ie8uXUvPBE7Tn0ElCzTMqrV5BO/cfEaDG - TD5X6PFFONLygsTF7jj1vxihyPkYNTS1iFrFxm37KHIhJmp43L7qZxzp0pJ1SeHhQGgLJQaH6fb9R1QX - 2EB3Ek9FryLe95j8K9eLT/TB0FZcskOP1iRdkIh23aR7Ay9pzaZddKY9Jup8nIpeoXXhZlHD655b85Bj - p2npLOmCML+dD/iTZhaX3+UvbRB1PpzeygFnSUUvatecRUMzisoOc+x0LZ3FixxYhQyK1cxyZhkTYhqY - RgnM6hmcwVl4ljDI0KS4AC+Kmyli8Jv2MF7GNwXY4QzOwgNv5mWTL7CLpVQmO1hKZbKDpVR/1P8OcvwB - lh7gOXXZq9sAAAAASUVORK5CYII= - - - + iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 YQUAAAAZdEVYdFNvZnR3YXJlAEFkb2JlIEltYWdlUmVhZHlxyWU8AAADZmlUWHRYTUw6Y29tLmFkb2Jl @@ -750,26 +750,244 @@ bS94YXAvMS4wL21tLyIgeG1sbnM6c3RSZWY9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlw ZS9SZXNvdXJjZVJlZiMiIHhtbG5zOnhtcD0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wLyIgeG1w TU06T3JpZ2luYWxEb2N1bWVudElEPSJ4bXAuZGlkOjJGQzkyMzc0Rjk0OUU0MTE5NjNCQjRENDMzQjlC - MUM4IiB4bXBNTTpEb2N1bWVudElEPSJ4bXAuZGlkOjJERjY3MEZENEQyMzExRTRCNDlGQUMwMzk0OTAw - Qzc4IiB4bXBNTTpJbnN0YW5jZUlEPSJ4bXAuaWlkOjJERjY3MEZDNEQyMzExRTRCNDlGQUMwMzk0OTAw - Qzc4IiB4bXA6Q3JlYXRvclRvb2w9IkFkb2JlIFBob3Rvc2hvcCBDUzYgKFdpbmRvd3MpIj4gPHhtcE1N - OkRlcml2ZWRGcm9tIHN0UmVmOmluc3RhbmNlSUQ9InhtcC5paWQ6NjhGOUEyRDEyMTRERTQxMUIzNkJE + MUM4IiB4bXBNTTpEb2N1bWVudElEPSJ4bXAuZGlkOjlDMzFEOUI4NEFBRjExRTQ4OTA5OUYwQ0QzM0Q2 + NEI4IiB4bXBNTTpJbnN0YW5jZUlEPSJ4bXAuaWlkOjlDMzFEOUI3NEFBRjExRTQ4OTA5OUYwQ0QzM0Q2 + NEI4IiB4bXA6Q3JlYXRvclRvb2w9IkFkb2JlIFBob3Rvc2hvcCBDUzYgKFdpbmRvd3MpIj4gPHhtcE1N + OkRlcml2ZWRGcm9tIHN0UmVmOmluc3RhbmNlSUQ9InhtcC5paWQ6MDk5Mzk2NTZBRjRBRTQxMTk3NEFD + QUFFQjRCMzVENkUiIHN0UmVmOmRvY3VtZW50SUQ9InhtcC5kaWQ6MkZDOTIzNzRGOTQ5RTQxMTk2M0JC + NEQ0MzNCOUIxQzgiLz4gPC9yZGY6RGVzY3JpcHRpb24+IDwvcmRmOlJERj4gPC94OnhtcG1ldGE+IDw/ + eHBhY2tldCBlbmQ9InIiPz73sIMwAAADIElEQVRIS7WVa0iTYRTH56Uiysvm3TkvpLl5DRIvQYWVWl+6 + iNEVg0yhQqloQZHkLT+Y0YdAs75IpEUhzERZoZhsRpZlS7soblotsRwoxhqWeTrnYZtv+u7NsB74cZ5z + zv89/z17HzYRAPxXeIv/EpFXcOyi4BvKhfehv4FvKBfeh+ayqIUDlIgBgT8whpRYoT2fhgvNVJKBQT9s + hB8/QZDPpnEIjEhg0J5Pw4Vm0mwygG9T06BSqQQhTUhUMoRGpyxYT7OZwfhXC6jVakFIYzNYqN5uMGKa + BI1GIwhpghXJaJJi13d0dEB2bj74hsWzSDlXbzfQG02g0+kEIU2wIomdovzKdVifngnFFytBeb4cLN+n + WaSc6hfKKqB/eHTWoHfwExgMBkFII5MnQUD4WlAWloO26wVs35MDmifPmQFFyqlO/aKKqlmDp31DYDKZ + BCGNTJ4IPqHx8LJvACbNUw7p6e2HuJQMNIhhBuaHj3vBYrEI0tb1BoIiE9kJ9h7Oh7EJM+g/jEJuwVlY + s24ri5RTnfo5BedAIoueIYPumvomuHzjzm9cq2uCq7UNUH2rEarr7kNd0yP26Y+eKoSWtk4wfpmAg7kn + ITY5DUorq1g8cOQEqze3aplOEhRtJoMcL1mMTixV9IgD5a/tSBVDYql8AKOBQLEJtTP08gY/jjFiktKg + 5FIV21Ok3NazvmR2AvrFkCAJyGYk1comZAuHDM/AyLvHThfBveZ26NOPwI59eey7LsbhFCmnOvVJ5+Ef + rrYZLEU8EZ85+HLwW7ZCLMVTFWdkHoLut+/hgbYHaE9XN31XNsupTrWV3jKVs+uS3cyAD0cLe331jW3Q + qRt0CPUlQVHDKI+fN9iGo4W90uNnyuA2vvRtWTlQgxeg/dk7FimnOvU9/CNqUe47b7ANRwt7AfjpKvAK + Gt18Qur35ymhRfsKKLr5hN7EyzDq7humWrrcfSfKxbz/QlwcLDck1snZJdUzYHUDmk57+K1qdXJyzsL6 + RmQD9ZmObygXB8sVIRO6fXQB4hC6eRQppzr1XXmHclnAckFomLc1Um5dItEvhZ97MQXP9N0AAAAASUVO + RK5CYII= + + + + + iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 + YQUAAAAZdEVYdFNvZnR3YXJlAEFkb2JlIEltYWdlUmVhZHlxyWU8AAADZmlUWHRYTUw6Y29tLmFkb2Jl + LnhtcAAAAAAAPD94cGFja2V0IGJlZ2luPSLvu78iIGlkPSJXNU0wTXBDZWhpSHpyZVN6TlRjemtjOWQi + Pz4gPHg6eG1wbWV0YSB4bWxuczp4PSJhZG9iZTpuczptZXRhLyIgeDp4bXB0az0iQWRvYmUgWE1QIENv + cmUgNS4zLWMwMTEgNjYuMTQ1NjYxLCAyMDEyLzAyLzA2LTE0OjU2OjI3ICAgICAgICAiPiA8cmRmOlJE + RiB4bWxuczpyZGY9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkvMDIvMjItcmRmLXN5bnRheC1ucyMiPiA8 + cmRmOkRlc2NyaXB0aW9uIHJkZjphYm91dD0iIiB4bWxuczp4bXBNTT0iaHR0cDovL25zLmFkb2JlLmNv + bS94YXAvMS4wL21tLyIgeG1sbnM6c3RSZWY9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlw + ZS9SZXNvdXJjZVJlZiMiIHhtbG5zOnhtcD0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wLyIgeG1w + TU06T3JpZ2luYWxEb2N1bWVudElEPSJ4bXAuZGlkOjJGQzkyMzc0Rjk0OUU0MTE5NjNCQjRENDMzQjlC + MUM4IiB4bXBNTTpEb2N1bWVudElEPSJ4bXAuZGlkOjhDMTdBQjRENEFBRTExRTQ4QjQyODY0MDNBNTJE + NzNCIiB4bXBNTTpJbnN0YW5jZUlEPSJ4bXAuaWlkOjhDMTdBQjRDNEFBRTExRTQ4QjQyODY0MDNBNTJE + NzNCIiB4bXA6Q3JlYXRvclRvb2w9IkFkb2JlIFBob3Rvc2hvcCBDUzYgKFdpbmRvd3MpIj4gPHhtcE1N + OkRlcml2ZWRGcm9tIHN0UmVmOmluc3RhbmNlSUQ9InhtcC5paWQ6NUQyMjc4QTlBQjRBRTQxMTk3NEFD + QUFFQjRCMzVENkUiIHN0UmVmOmRvY3VtZW50SUQ9InhtcC5kaWQ6MkZDOTIzNzRGOTQ5RTQxMTk2M0JC + NEQ0MzNCOUIxQzgiLz4gPC9yZGY6RGVzY3JpcHRpb24+IDwvcmRmOlJERj4gPC94OnhtcG1ldGE+IDw/ + eHBhY2tldCBlbmQ9InIiPz4eHsDfAAAB00lEQVRIS7XVWytEURQH8HniTTNHLs0NCXNcXjTN5dH9g/gM + 3jx590QhFDJS0gyTGmpqaqJIMW4hzlAoOaWISS7LWifntI3ddnTGrl92e/57/We/DBsA/CvuYSHZSr0t + lvCGsriX/oI3lMW9lM/SwgF9SEHwizs08IX2vAyLZvZRgXJ+cQWv7yB0q96Ds86voT0vw6KZNJsK4Pnl + DWKxmBBlqhpDUN0UNp2n2VrB/WMOEomEEGX0ArN5o+BGfYB0Oi1EGa8cwpKw6bxRcH6lQiaTEaKMVw5q + rzCbNwr2z65BURQhynh8Qe0VZvNGwdZBFlRVFaKMxxfQXmE2rxc8rW3sQy6XE0puHoG7IaC9YnV9j5th + pbZPqOCDCrbH5uIwOD7/zWgkDkNTizAyuwQjkWWIxFNQWduqmVxI/MiPz6/A8HTUuDMTTYLkbrqhgt5S + T3PG4ZJ3HE7focElZx0u3yn+VQiG1ZLymmm7s74f88f42S6bl9zyJZ6d6Xckd+Mt5ieogH4xJORHHajt + SzvqZPSgECpHZSiA2DztuxBlad+NgnpBEbIjusiiYboKRF+kGFHegUR5ImkFv7G0eAPzWVq8gfksLd5/ + oULiHhYS97BwwPYJlSCUgVubViQAAAAASUVORK5CYII= + + + + + iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 + YQUAAAAZdEVYdFNvZnR3YXJlAEFkb2JlIEltYWdlUmVhZHlxyWU8AAADZmlUWHRYTUw6Y29tLmFkb2Jl + LnhtcAAAAAAAPD94cGFja2V0IGJlZ2luPSLvu78iIGlkPSJXNU0wTXBDZWhpSHpyZVN6TlRjemtjOWQi + Pz4gPHg6eG1wbWV0YSB4bWxuczp4PSJhZG9iZTpuczptZXRhLyIgeDp4bXB0az0iQWRvYmUgWE1QIENv + cmUgNS4zLWMwMTEgNjYuMTQ1NjYxLCAyMDEyLzAyLzA2LTE0OjU2OjI3ICAgICAgICAiPiA8cmRmOlJE + RiB4bWxuczpyZGY9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkvMDIvMjItcmRmLXN5bnRheC1ucyMiPiA8 + cmRmOkRlc2NyaXB0aW9uIHJkZjphYm91dD0iIiB4bWxuczp4bXBNTT0iaHR0cDovL25zLmFkb2JlLmNv + bS94YXAvMS4wL21tLyIgeG1sbnM6c3RSZWY9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlw + ZS9SZXNvdXJjZVJlZiMiIHhtbG5zOnhtcD0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wLyIgeG1w + TU06T3JpZ2luYWxEb2N1bWVudElEPSJ4bXAuZGlkOjJGQzkyMzc0Rjk0OUU0MTE5NjNCQjRENDMzQjlC + MUM4IiB4bXBNTTpEb2N1bWVudElEPSJ4bXAuZGlkOjJEMDQyOEZBNEFEMjExRTRBN0MxRDBCNzJGRUND + MDEzIiB4bXBNTTpJbnN0YW5jZUlEPSJ4bXAuaWlkOjJEMDQyOEY5NEFEMjExRTRBN0MxRDBCNzJGRUND + MDEzIiB4bXA6Q3JlYXRvclRvb2w9IkFkb2JlIFBob3Rvc2hvcCBDUzYgKFdpbmRvd3MpIj4gPHhtcE1N + OkRlcml2ZWRGcm9tIHN0UmVmOmluc3RhbmNlSUQ9InhtcC5paWQ6QkRDRkI1RDVEMTRBRTQxMTk3NEFD + QUFFQjRCMzVENkUiIHN0UmVmOmRvY3VtZW50SUQ9InhtcC5kaWQ6MkZDOTIzNzRGOTQ5RTQxMTk2M0JC + NEQ0MzNCOUIxQzgiLz4gPC9yZGY6RGVzY3JpcHRpb24+IDwvcmRmOlJERj4gPC94OnhtcG1ldGE+IDw/ + eHBhY2tldCBlbmQ9InIiPz59jfe3AAAEbUlEQVRIS8WTeUybZRzHF48/pnFOuQRajkFLgQFb5iRLNJr4 + l/EPgsniUI4xZDAY1zyxwApsMJyIME61rByl3DfoYGBrgbWUY06FcZSCha4rQ8jYxkqPr2/fvkv8o2Sg + S/wkT970eb6/T5/39z7Prv8dt/Oql4mR4HZJ3ccoXFxhVCzB9DT9JueJdSq6c1wzVZFupepVzxu34XVj + CaEDi1jX6hF8ZQoeokl4iBVwzV9YdU1XRlIl28eVo8phCdXwGltEeOUsro6psaHVwcSDh5volc4iOO8X + 7KuVwb1hEi7J8myq9PEQO//I85oafr0KtEpUpNSETm+AwWDAvfv3YTQaybnm/t/AyO6Ga+UonJOnIijF + 1hA9tWI2qle9RxcI+RIpmZpTIfBULhIyyqHVahHPKcN70TmYnFFCp9OhqXcc9KwW0DOHVl3YU1aUyjJu + F1SpfhO3EM6bMMsVt+D8Zhz2HIpC4oU6bG5uIu4cD3tfTwAjIBNypQYbGxsISquBU34PaDHiVEplGXee + SuIjVaBv3Lz7gJg8vHg4FlZvc+ATVoLipiHsD8qCXWAO7IPK8MG5FjLXKboOeoYADkldUkplGWb7vOb4 + 4BzxIXXQE/1m59WDXdgBvxPfwz6UC4eQUth/WIBDZ2qQXj+K7IYRImeE5s5fOFrcDPvPapcJzVNmmwVY + VxWG9U09uau1tTVymPpc0iYFLew7OEUJ4BwtALfvJpl5xMrKCu6s3cUrn5YbCM1us80CrJZZVWjXr7j3 + 4CE0y8v4IrcaH+cK4Bv+DRyPl8ApphYuia3wZ3eCUzOA1PIfcVuzjHnlIgK/vgy7mHzTG+w12yzA5E53 + edYPo1c2i/X1dQTEfwvbwDQ4hhXg8OcN4P48Df+UTrgkNIAeW4Hg3Hbo9Xq0iGSgs4ls5CUhoXnObLOA + S8pkhG/bdZzgDZJnffT3GXieLAA9XgB2/RjZjuQqMWhxfBw824H55XWyhcfy+HDNqoB1SH4Codn6G7iw + p3d78EaVPlXX0CaZgkqlgly1gpCiK0htHCH/IL6oFcEF3ZjT3CUvXqv0DzDSS0FPq1a/8EbYS5Rqa+if + SAJ8KoeNR7gitEsnoVQqSbGOkJmYX1ggxaY70SabwIGMUrjn8I3WIXnBRPnWu/8nDnE9Sd7cAaP/ZSES + 6/rRKJRArpiHXC7HzekZNIukiCyrhW9mGZgXa4w2kUVnibJnzdXbxP5URzyDO4QjxGl5i9uNpMZeKP5U + IrywAq9yCnGAOGGMonbYxpVnEPGdyR9BO/MTj8kfgXeNFPt5IngVtoF1kQ9WcTs8qgfgmNreQMS21xZL + 0E6Ln6ef75tg8sfgXT8O77oReAkkYNXJ4PRV/4ztyfo9VPTf4xjdf9CpQKzdxxuGe6UMbhXEmc8V6mze + r3qNivx3HGN7UmglQ6CVDMIxXwybo5UcaunJQD8te9rhyx4JrWwItlGNUut3y5+hlp4cDhFCpl14k9jq + nR+Y1NTjIe7NlmMnWKoHsOtvjWYcKpheqFQAAAAASUVORK5CYII= + + + + + iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 + YQUAAAAZdEVYdFNvZnR3YXJlAEFkb2JlIEltYWdlUmVhZHlxyWU8AAADZmlUWHRYTUw6Y29tLmFkb2Jl + LnhtcAAAAAAAPD94cGFja2V0IGJlZ2luPSLvu78iIGlkPSJXNU0wTXBDZWhpSHpyZVN6TlRjemtjOWQi + Pz4gPHg6eG1wbWV0YSB4bWxuczp4PSJhZG9iZTpuczptZXRhLyIgeDp4bXB0az0iQWRvYmUgWE1QIENv + cmUgNS4zLWMwMTEgNjYuMTQ1NjYxLCAyMDEyLzAyLzA2LTE0OjU2OjI3ICAgICAgICAiPiA8cmRmOlJE + RiB4bWxuczpyZGY9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkvMDIvMjItcmRmLXN5bnRheC1ucyMiPiA8 + cmRmOkRlc2NyaXB0aW9uIHJkZjphYm91dD0iIiB4bWxuczp4bXBNTT0iaHR0cDovL25zLmFkb2JlLmNv + bS94YXAvMS4wL21tLyIgeG1sbnM6c3RSZWY9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlw + ZS9SZXNvdXJjZVJlZiMiIHhtbG5zOnhtcD0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wLyIgeG1w + TU06T3JpZ2luYWxEb2N1bWVudElEPSJ4bXAuZGlkOjJGQzkyMzc0Rjk0OUU0MTE5NjNCQjRENDMzQjlC + MUM4IiB4bXBNTTpEb2N1bWVudElEPSJ4bXAuZGlkOjJERTg4QTFENEQyMjExRTRBODEyODk0M0RBMTc5 + Qjg3IiB4bXBNTTpJbnN0YW5jZUlEPSJ4bXAuaWlkOjJERTg4QTFDNEQyMjExRTRBODEyODk0M0RBMTc5 + Qjg3IiB4bXA6Q3JlYXRvclRvb2w9IkFkb2JlIFBob3Rvc2hvcCBDUzYgKFdpbmRvd3MpIj4gPHhtcE1N + OkRlcml2ZWRGcm9tIHN0UmVmOmluc3RhbmNlSUQ9InhtcC5paWQ6NjJGOUEyRDEyMTRERTQxMUIzNkJE NUVDQjU5MzE1NjIiIHN0UmVmOmRvY3VtZW50SUQ9InhtcC5kaWQ6MkZDOTIzNzRGOTQ5RTQxMTk2M0JC NEQ0MzNCOUIxQzgiLz4gPC9yZGY6RGVzY3JpcHRpb24+IDwvcmRmOlJERj4gPC94OnhtcG1ldGE+IDw/ - eHBhY2tldCBlbmQ9InIiPz6GKmpFAAAC+UlEQVRIS63T20vTYRzH8Yforj/Ei24UiSgKIygKi8oyxZQo - cvNYeXaesmzqPGu2POd0ulSsnIdaurTSTJ3O6UxTPGya5vCQx5AuPn39RbHop7nZxQt+z3ie93e/Z4w1 - p7nsCoBt8R6yBF/UHPv+Wb0rfFFzm99CRIwEW1gnqXzxTXxRc0ydctm4OlID2sxrw6iCtiwItC+A2P/D - frLnjwGNSZdMq6N1WOvLwFpP4l/WdRlY6Jaio9Ab7QXba8sVoDHZGdT8PYS9THDqMGnLsKpNw0qXGCua - BO55VZdNQ6U/DRRibVCGb+N1pH5bukoRqHmDHOIG1N8/X2F4I8WyNhtf2+9hqSsZxqZ4upbb6HsSZLHO - Im90ym6hNVcIaktYTexZyUelGEvaHMy/jcFiZxo0xX5Y7ivGcn8JkVmA9uvlWBmqwpJeAWovs+poR99O - eRgWtQWYVUdgrj0FH+i+F3XF3NoappZYGJrEoLaOVYpOOTY/FGJB+xjTqnDMtMTTAC/Ma/Ix/TLUKl9e - x0JfFQpql7PykBP7lWIXzPeUYLIhHCPKCLr/AMy2ZsKoDLTKdNNdvM8TgNpRTBZwfJ885CTmaIChPhwa - mS+GnkdhqjEWY9X+VplqvIMXEhdQ24mZeuSs0N/BNNWWj4k6EdSZHhhXxWH0aSCGFd4c4Tk7zk7XBlUM - FKLToK4Nm+0qYnneRzqGGiSYaIiiyZdhVCdgqFSIwRJPjucZW85O1pvnRmvDkO9zFNTdy2Y6HjGp4HCF - 5kk4xhoiURd/EROv4tBfeM0qAyUC9Mp9QM0+7o829T6LZV0/mNycS6+nFKFWfAGj9ZHozfGwil7miZYH - 7qCmghsw+S6VpV894KuUuKFbfhNNqa749CwY3dm0toK+VABl3HlQM5obYHybwFLc7W1y/Y5BlX6FfgNn - DNcEY0DhZZX+MiGKbh0DNR24AYYWMSfJzc6GZBApwS5skIzNODcg0dV2V36FtsJ7yBJ8UXO8hyzBFzXH - ++H/A/YDv9/V87iOlrYAAAAASUVORK5CYII= + eHBhY2tldCBlbmQ9InIiPz6wJF34AAACl0lEQVRIS62Vy08TURSH73/QhQtXVnBhxEcMiUkhbEg0hB1R + Q1i68C8wIW5cEqMLN7ho2Ji4YiEhWq0prYUhfULbadN3obTaChobtZEUsFY9nnPS6WM6HYowyZf87j33 + nG/amaai9geOBYA+4pTxihmBE8DcTQB4J8em/9IwSQyagmrtL+z9rMFmvnhkKvtV7tcVHPz6DVsftulA + AckdhUg8zf19eoLKAd597iMLMItewfOxUDTN/bqCH3tVSG8VWIBZ9AoJApEk9+sKvu/uQ2IjzwJkGtH8 + OrTwy3Hu77vIAnV9mgWlcgWiqRwLjAMmkOMbPbNTKnN/JJntqJGEBZ++7oKcyLLgLN4JrU8Cms2C4pcy + BKKZumCI18temQ/8DzSLZlBmQX7nG/jCKdpgAa0driCtY5iFHuqHSjNoFtaags1iCdzBBG+QgNY2aZ0F + mIUe6osENAtrTUEq/7kDq9PHAszU5yYoq9f1i9cUSCD5ozxDEeTsrhAoONwyxLLb8MrhYQFmZYCHsnpd + v3hNgQROb5hnKIK29944MAThTBEWbS4WYBZ6qC/sKSy5ZJ6BGUQg8b4Bbhjod4AZXlhXWdBa10LrIVul + AM9ggS+aa6AIMMO8ZYUO0KeyIOMtZyaQpXpNi4LFucYzMINwhbMNcMNw5oIJMMNKIA0LNg88mZuH/ssj + dPgBMnN+cBRmny1wrRtSMMMzWCCFMg0UAeY2Fh0+GL5xG8Zu3oHXUrCj3g0WONdTbeBm21/o1N17gPtg + 98Xh3VoS3qzKMDI22agfglnY/Uld8NDc/ZlZwAwvl4Ngun6LGh8rdfVDViNs3rguOOzq6XOD8PDpc7g2 + OkHDH7XWtYa2It66Y4eCQ8cRfpvUNa2hTUD8A6JMaBvCyTdJAAAAAElFTkSuQmCC + + + + + iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 + YQUAAAAZdEVYdFNvZnR3YXJlAEFkb2JlIEltYWdlUmVhZHlxyWU8AAADZmlUWHRYTUw6Y29tLmFkb2Jl + LnhtcAAAAAAAPD94cGFja2V0IGJlZ2luPSLvu78iIGlkPSJXNU0wTXBDZWhpSHpyZVN6TlRjemtjOWQi + Pz4gPHg6eG1wbWV0YSB4bWxuczp4PSJhZG9iZTpuczptZXRhLyIgeDp4bXB0az0iQWRvYmUgWE1QIENv + cmUgNS4zLWMwMTEgNjYuMTQ1NjYxLCAyMDEyLzAyLzA2LTE0OjU2OjI3ICAgICAgICAiPiA8cmRmOlJE + RiB4bWxuczpyZGY9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkvMDIvMjItcmRmLXN5bnRheC1ucyMiPiA8 + cmRmOkRlc2NyaXB0aW9uIHJkZjphYm91dD0iIiB4bWxuczp4bXBNTT0iaHR0cDovL25zLmFkb2JlLmNv + bS94YXAvMS4wL21tLyIgeG1sbnM6c3RSZWY9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlw + ZS9SZXNvdXJjZVJlZiMiIHhtbG5zOnhtcD0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wLyIgeG1w + TU06T3JpZ2luYWxEb2N1bWVudElEPSJ4bXAuZGlkOjJGQzkyMzc0Rjk0OUU0MTE5NjNCQjRENDMzQjlC + MUM4IiB4bXBNTTpEb2N1bWVudElEPSJ4bXAuZGlkOkUzNzJDMjE3NEFENjExRTRCNjE0OEVEQzI4MEM0 + RTZDIiB4bXBNTTpJbnN0YW5jZUlEPSJ4bXAuaWlkOkUzNzJDMjE2NEFENjExRTRCNjE0OEVEQzI4MEM0 + RTZDIiB4bXA6Q3JlYXRvclRvb2w9IkFkb2JlIFBob3Rvc2hvcCBDUzYgKFdpbmRvd3MpIj4gPHhtcE1N + OkRlcml2ZWRGcm9tIHN0UmVmOmluc3RhbmNlSUQ9InhtcC5paWQ6RkI3NUQ0QkNENDRBRTQxMTk3NEFD + QUFFQjRCMzVENkUiIHN0UmVmOmRvY3VtZW50SUQ9InhtcC5kaWQ6MkZDOTIzNzRGOTQ5RTQxMTk2M0JC + NEQ0MzNCOUIxQzgiLz4gPC9yZGY6RGVzY3JpcHRpb24+IDwvcmRmOlJERj4gPC94OnhtcG1ldGE+IDw/ + eHBhY2tldCBlbmQ9InIiPz6PyaLfAAADMElEQVRIS6VUXUiTYRT+vi3Tzd+ps23+3KRigtiPkolEQReG + UYTkhWatpWlWGkRdddfdSPImqUAJjSIT00oxLJIk0cR+tFSyzDJtgaMkDEPkdM7ZPvm2vS6jBx6es3Pe + 8zzvtm+TohLS/ov+AACStLgEQuJyLRJWYK1yzh/+FgCoQrpnfM4fOGBhcUlIMkEVkma4H4i1y2kFcMD8 + wqKQZILKZqTqmlTAWrfvMjhgbv63Dwm0hLWQohn1eNEbzrlfPiTQAtZCKjP1GXdAIC+r4XD+9CGBFrDm + RVJ1re6pZ0GyHHMvIawauYVNCFPfvvuQQAtYC6meKXU0amNsaGN/ZR60xIf9aIgN3cpGE9OzZCZ85nEm + pGiWlLABmuJCnUOXrNB7chdct4TUo32ANDbp4NuielDpqWfePdaPX6GrohSK4uLhlCEo96YlZLbOFHzH + oJXjMSBcGn4/zQGovEDqXXtzeTb+BTrKj0J3+Q54djYP7EZdTU2MPjFSK8eieQR9QtLg6GcOQPWgqKeQ + ZyOfoK30CDw+lg2Ot3Z4VLoNqo269mCNHIa2WjYn9A1PcAAqU6m9VV3TF9psOwwPS3JgZugCdNoyocwU + jU+RlImWBpezGz0vxzkA1YOiHvPFO7Ca1kGHLQtmXp2HdutmqN+/F6JiU+h3kOpyVeHJwBgHoLIpqajm + 189HoaG4CNqsGTA1UAWth9Lg6r490PygGyLjUikgzuWqQlffCAegelDdUwLqigqhpXgjTPYeh+bCFCg2 + RkEk3vxuVz/P0c43oLP3DQegLhspNalSFxiNcLswHT48LYNbBUlQk7ebzenmyhm08w1o7xmiAP6hRZiT + 70eYkzpctUuJWdHmwWs74+F1Uz7cyE+E4ohQB5mHm9a3GywpTXzektyKduIAIsKI3ISkL4rIdYle05C9 + VrZVBmvtl7eboUyv7V4jSQdwRn8FdI72iErtCUxnIuifkJ5hUqUOq9Jr7OeCNU6bTpNVqtMcDJSldOwn + KnOk+jypJ5QANRWc0cs5SEelXr54QidfwVYAMoiHq4W/gNM6OaNCJ+diaUIqN/43+Atwg27t+9ZXBUn6 + A2MdqQeVc5pWAAAAAElFTkSuQmCC + + + + + iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAIAAABvFaqvAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 + YQUAAAAZdEVYdFNvZnR3YXJlAEFkb2JlIEltYWdlUmVhZHlxyWU8AAADZmlUWHRYTUw6Y29tLmFkb2Jl + LnhtcAAAAAAAPD94cGFja2V0IGJlZ2luPSLvu78iIGlkPSJXNU0wTXBDZWhpSHpyZVN6TlRjemtjOWQi + Pz4gPHg6eG1wbWV0YSB4bWxuczp4PSJhZG9iZTpuczptZXRhLyIgeDp4bXB0az0iQWRvYmUgWE1QIENv + cmUgNS4zLWMwMTEgNjYuMTQ1NjYxLCAyMDEyLzAyLzA2LTE0OjU2OjI3ICAgICAgICAiPiA8cmRmOlJE + RiB4bWxuczpyZGY9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkvMDIvMjItcmRmLXN5bnRheC1ucyMiPiA8 + cmRmOkRlc2NyaXB0aW9uIHJkZjphYm91dD0iIiB4bWxuczp4bXBNTT0iaHR0cDovL25zLmFkb2JlLmNv + bS94YXAvMS4wL21tLyIgeG1sbnM6c3RSZWY9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlw + ZS9SZXNvdXJjZVJlZiMiIHhtbG5zOnhtcD0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wLyIgeG1w + TU06T3JpZ2luYWxEb2N1bWVudElEPSJ4bXAuZGlkOjJGQzkyMzc0Rjk0OUU0MTE5NjNCQjRENDMzQjlC + MUM4IiB4bXBNTTpEb2N1bWVudElEPSJ4bXAuZGlkOjUzQzNGNDI5NEQyQzExRTQ4QkE1QUNCMEVDRDZF + MDVEIiB4bXBNTTpJbnN0YW5jZUlEPSJ4bXAuaWlkOjUzQzNGNDI4NEQyQzExRTQ4QkE1QUNCMEVDRDZF + MDVEIiB4bXA6Q3JlYXRvclRvb2w9IkFkb2JlIFBob3Rvc2hvcCBDUzYgKFdpbmRvd3MpIj4gPHhtcE1N + OkRlcml2ZWRGcm9tIHN0UmVmOmluc3RhbmNlSUQ9InhtcC5paWQ6RkI1NUY4OTYyQTRERTQxMUIzNkJE + NUVDQjU5MzE1NjIiIHN0UmVmOmRvY3VtZW50SUQ9InhtcC5kaWQ6MkZDOTIzNzRGOTQ5RTQxMTk2M0JC + NEQ0MzNCOUIxQzgiLz4gPC9yZGY6RGVzY3JpcHRpb24+IDwvcmRmOlJERj4gPC94OnhtcG1ldGE+IDw/ + eHBhY2tldCBlbmQ9InIiPz6IsaOmAAADF0lEQVQ4T62U/UuTURTH+0nICqRI1ERMMyNQe8N0ChqBwQhN + yvwhEgJjVCqJ/qCibZo6tzQ339h6Nre5prapUzc1XzItX1ilzuWMLLVAen+xf6DTuTxjdxsFVj58ebjc + c+7nnud7z3228DbpIaDFH/CfoqCn72DIDvNfPDM2KAqyr8PcJxqY+QBTb8kkjocXQTsKigGwfqYJHqIg + 1OxHGHvlWPx4hXB1YyA3g4CBhqst+piEnrDA3rA95vBAY1x8d7lq/DVZwm5PQZNvoKYdypSgHgbVEIh1 + cLOZzOCbSSsyRQRba6uWtcpVLbPcwlglInNUCJNWWKqABqMLCGvGlfpJELaQ/V1Vd1lujAhe0chtUrH5 + ZExnmJ85MdomEa+qZMbIEF2BHGunILSjdZwYgTt4gJqjjj0Rltml1Zq9AeL0Mn71Wn2mtDU80MIvsFTw + O+KPIoWC8BNYRIUaqrRQroJKjQOk9N+xLBF2pXJFKfnsDGYa8gS6xOO2whyMuoHaHpGzZ/pBM0IMrtXD + nT4HqNHXe0lYoogMFeQP4jbSDkCPTUyXmnNoPutSo+9WN5DEQDyeWCWnhqm4p7Oimt3b54rzmmKPVHKz + 0Xg0AU1pz87VJp+yXOfd9t3mBmLXsGrsJhSsDtF4iOWxKdpzyQNnuRW7vEUp13obFG05OVUBPtO5V1Sn + k5q4SX8ENfWA6C7xHsP981Bb2sf38ZKd4JhSuXUJHPHhg/WJnAeZFw0Xzt/w8erRtLmBnB/CSmaC599I + 2PYVRl+CXigu3R9SfCC0Pf1MZ1oqvqvjogX7gtRFJfb1n24g7GblfQcFP2fkBYm5anxqQcbLKgzyK/Df + WRTkV5+RMTg84ZrgAOHo4ZIDVNdJw67CpsVLZ5gifj97Typlq2ZFQXj8LKh5EHpnaIar8N+Al5l9Y9Vs + T7OiIAzjqaMsa6QJnBkeWvgOHdPkAuIV67PSeQpCYYZplsZ+KyyWLRyFF8D553EDbURY770J0rrYJbda + SYE4iWb9NcgpRKDrOMAWwYP6d5BTaC52zyaAWDlAm/DweL8AX9zXukfxHsIAAAAASUVORK5CYII= + + + + + iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 + YQUAAAAZdEVYdFNvZnR3YXJlAEFkb2JlIEltYWdlUmVhZHlxyWU8AAADZmlUWHRYTUw6Y29tLmFkb2Jl + LnhtcAAAAAAAPD94cGFja2V0IGJlZ2luPSLvu78iIGlkPSJXNU0wTXBDZWhpSHpyZVN6TlRjemtjOWQi + Pz4gPHg6eG1wbWV0YSB4bWxuczp4PSJhZG9iZTpuczptZXRhLyIgeDp4bXB0az0iQWRvYmUgWE1QIENv + cmUgNS4zLWMwMTEgNjYuMTQ1NjYxLCAyMDEyLzAyLzA2LTE0OjU2OjI3ICAgICAgICAiPiA8cmRmOlJE + RiB4bWxuczpyZGY9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkvMDIvMjItcmRmLXN5bnRheC1ucyMiPiA8 + cmRmOkRlc2NyaXB0aW9uIHJkZjphYm91dD0iIiB4bWxuczp4bXBNTT0iaHR0cDovL25zLmFkb2JlLmNv + bS94YXAvMS4wL21tLyIgeG1sbnM6c3RSZWY9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlw + ZS9SZXNvdXJjZVJlZiMiIHhtbG5zOnhtcD0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wLyIgeG1w + TU06T3JpZ2luYWxEb2N1bWVudElEPSJ4bXAuZGlkOjJGQzkyMzc0Rjk0OUU0MTE5NjNCQjRENDMzQjlC + MUM4IiB4bXBNTTpEb2N1bWVudElEPSJ4bXAuZGlkOkVENUYwQThBNEQyOTExRTQ5QzUzQzdFMkFGQkQy + NTA1IiB4bXBNTTpJbnN0YW5jZUlEPSJ4bXAuaWlkOkVENUYwQTg5NEQyOTExRTQ5QzUzQzdFMkFGQkQy + NTA1IiB4bXA6Q3JlYXRvclRvb2w9IkFkb2JlIFBob3Rvc2hvcCBDUzYgKFdpbmRvd3MpIj4gPHhtcE1N + OkRlcml2ZWRGcm9tIHN0UmVmOmluc3RhbmNlSUQ9InhtcC5paWQ6MkRGNkEzOUYyOTRERTQxMUIzNkJE + NUVDQjU5MzE1NjIiIHN0UmVmOmRvY3VtZW50SUQ9InhtcC5kaWQ6MkZDOTIzNzRGOTQ5RTQxMTk2M0JC + NEQ0MzNCOUIxQzgiLz4gPC9yZGY6RGVzY3JpcHRpb24+IDwvcmRmOlJERj4gPC94OnhtcG1ldGE+IDw/ + eHBhY2tldCBlbmQ9InIiPz6npMy1AAAGEUlEQVRIS7WVeVDUZRjHf7Ase8ECu+wl4LIXcqyyHC783AWW + 5QaRFTHkMi9SQvE+UhLzwk0BUcQSgQBBgcYDzStMSzOPcpqcmo5pmqk/+rOapqb+iG/PbzfFcSz/6pn5 + zPN739/7fp/nvZn/3TSLjj+XJy2/RaItPCT5vaBd8m1+q2Qku1lcrcvki+iXr7fFU6ZZeOx5KDU1b7jU + 1Z2bVPMPWNMbRXrXkWAc+ywVLbcS8fKwFjlu8VdpW0XzSc6f8PEIPzJ19dFnU3WEJdHL9P3X9O1nkdB8 + CQrX7i3mKn9zfqsUq29ZsPfjRBx5aMO2cTMy94gm7FuF7XyJTwDJTo5GVdHxNALVgsPd5Ceye+9g8b0f + UXbjB8RtH4Msd+MeXS7f6twjxbILZiy7pEHDtTBsvG7BqivTUXpsClLWCbtJNpDwBlGVH3ySIFV520eW + nedRcf0HVJGwbeRrOHs/h2n1CGRZDe7wND/W1hiI8sEYlJ4KRcVpJcrfVqByNBILhqLh3KeA+UXBOpL2 + jkRZduARPGXZ/vH4pnMou/gd7INfIPn4QyQc/RSOzk9hrBtEiKPerUn1Y5PXBaDojWlwdgUjr0+G/H4Z + cnpCUNJrQNZ+LeLrBD/LYnixFEDAKFz7vJQ0r49dO4zikS8x8/ADxLd9jIT2B5ix/z7SX78Pw+K3EJy2 + wq1M4rEz6sRwthgw82Ag2KNS2I5JPZ4rZx00ImGNHIZSfisFkDGhxbs5AkKLd/3kaLkDlgTjXrsNc/Md + mPfeQeyOD2HbcRu6yi4E2Wrd8ngeG71IBPtePWa4JUhsD0DykQAkHQqApUWCFLcGyZvDoZ/P/5oCTGXk + hU2MvGB7rbGmG47dd2Fa+x6iX/kAMa/eQvS2m4jaeAPspvcROb8TQexid3CcL2usFCJjnwE5nQYU9RhR + PGDC7D4TCrqMyDqkR9oePbRz/SZEKh8rI8vdyshyXhmzLD8DS/1VGOquwtgw7glkXH0Nhvp3kbL2GrSl + hyC11ril03xZfbkQKZuVsDeq4NihRtYuDbJ2auBoUsO2TQXrJiWMlWIExflWMiHOjRzfJy0bg776HCKX + vANd7WXol1/xeN3Si7A2XIXW1YbAxAq3UO0zPTSd1yG38bplLK//vxBrffKY4PQ1HH9aKk8jonQUUyvO + Qlt9HtqaCx4/tXIMyXWXMXXOAQTEv+D2zCvDhBBTCN1zCGOCZq3k+DXO1YcpRYOY4hpF2LzTCCs74/VE + 3IvnEVd1EhGFblBbWot6BKXWQZq64tlYa2+TuJwQM9KU5cRL35hyOxCe2w913hA0hcPQFI16KRzxEFtO + a1Q9htSVN5C+5S5x7x/uIm3DR7CvuomUReOImt1FU7nwEolHECImMGkJE5i46EJkejNM+X1QOPqhzBqC + KvskVDmnJuHKT/K4bgjKzBMItXcjJv84NOwWiKPndJK40TOCgPgaRmIur1dZ1yM6txvyWT0ITR+AImOQ + gg39N1ybDBJP60PorC5My3oTwQm18FdNryBxbq0EJL6AEUTYZBTkF0NGKyKdvZDb3qJOAxSIOqcP/jtp + JyC3D1BSvYgp6EN4aiNlP/cTEk4gFASPEUeXkWd8RaY5jcrEBkTn9UCT4Q3gzfBfRvJE9rrsfpicHSRe + NsFXmJeSXhTBXXY+jMjk8uArVkpExuKb6pkbYJ7L7Ria37xTUBeMeCkcncRTN0z/TyLKNYy4khNQJq2G + IMLBXdUWQkXwCYYR6md7IPP1k8WEC3UFDzSpG2BZeAZJtXQWFpyls3HOC50JzkdQnbFqDInLLiC2rBcq + 6xoSzzzP+NDVwDBaQkx4XzahNv8xZH48sVotCHeOUnnCWNJG18Q4UjddB7vlfbBbPwC7+YannLTyIrS5 + OyHU5v3hr07poL7JBHe4Jh8bzgQROY8h46IKCAVfbi73D3PcpfoJlX0VtEVN0JXsQlj2ZoRaaynj7N/8 + NfZLPLFmHrXnpiWSCCL8iMl32T/M6YGMq+R+covD7QADwfoIgqt4QVGtfvIZJ4lRv5CY4zypbjfjy+eE + M4l4gtuSwYSQ4DS4EZAew/wNiCYQJlvQU3cAAAAASUVORK5CYII= @@ -1054,142 +1272,6 @@ R2K5fxKLWbbp/7Dc0CBY8Q+pPmOq0VkzzQAAAABJRU5ErkJggg== - - - iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAZdEVYdFNvZnR3YXJlAEFkb2JlIEltYWdlUmVhZHlxyWU8AAADZmlUWHRYTUw6Y29tLmFkb2Jl - LnhtcAAAAAAAPD94cGFja2V0IGJlZ2luPSLvu78iIGlkPSJXNU0wTXBDZWhpSHpyZVN6TlRjemtjOWQi - Pz4gPHg6eG1wbWV0YSB4bWxuczp4PSJhZG9iZTpuczptZXRhLyIgeDp4bXB0az0iQWRvYmUgWE1QIENv - cmUgNS4zLWMwMTEgNjYuMTQ1NjYxLCAyMDEyLzAyLzA2LTE0OjU2OjI3ICAgICAgICAiPiA8cmRmOlJE - RiB4bWxuczpyZGY9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkvMDIvMjItcmRmLXN5bnRheC1ucyMiPiA8 - cmRmOkRlc2NyaXB0aW9uIHJkZjphYm91dD0iIiB4bWxuczp4bXBNTT0iaHR0cDovL25zLmFkb2JlLmNv - bS94YXAvMS4wL21tLyIgeG1sbnM6c3RSZWY9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlw - ZS9SZXNvdXJjZVJlZiMiIHhtbG5zOnhtcD0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wLyIgeG1w - TU06T3JpZ2luYWxEb2N1bWVudElEPSJ4bXAuZGlkOjJGQzkyMzc0Rjk0OUU0MTE5NjNCQjRENDMzQjlC - MUM4IiB4bXBNTTpEb2N1bWVudElEPSJ4bXAuZGlkOjlDMzFEOUI4NEFBRjExRTQ4OTA5OUYwQ0QzM0Q2 - NEI4IiB4bXBNTTpJbnN0YW5jZUlEPSJ4bXAuaWlkOjlDMzFEOUI3NEFBRjExRTQ4OTA5OUYwQ0QzM0Q2 - NEI4IiB4bXA6Q3JlYXRvclRvb2w9IkFkb2JlIFBob3Rvc2hvcCBDUzYgKFdpbmRvd3MpIj4gPHhtcE1N - OkRlcml2ZWRGcm9tIHN0UmVmOmluc3RhbmNlSUQ9InhtcC5paWQ6MDk5Mzk2NTZBRjRBRTQxMTk3NEFD - QUFFQjRCMzVENkUiIHN0UmVmOmRvY3VtZW50SUQ9InhtcC5kaWQ6MkZDOTIzNzRGOTQ5RTQxMTk2M0JC - NEQ0MzNCOUIxQzgiLz4gPC9yZGY6RGVzY3JpcHRpb24+IDwvcmRmOlJERj4gPC94OnhtcG1ldGE+IDw/ - eHBhY2tldCBlbmQ9InIiPz73sIMwAAADIElEQVRIS7WVa0iTYRTH56Uiysvm3TkvpLl5DRIvQYWVWl+6 - iNEVg0yhQqloQZHkLT+Y0YdAs75IpEUhzERZoZhsRpZlS7soblotsRwoxhqWeTrnYZtv+u7NsB74cZ5z - zv89/z17HzYRAPxXeIv/EpFXcOyi4BvKhfehv4FvKBfeh+ayqIUDlIgBgT8whpRYoT2fhgvNVJKBQT9s - hB8/QZDPpnEIjEhg0J5Pw4Vm0mwygG9T06BSqQQhTUhUMoRGpyxYT7OZwfhXC6jVakFIYzNYqN5uMGKa - BI1GIwhpghXJaJJi13d0dEB2bj74hsWzSDlXbzfQG02g0+kEIU2wIomdovzKdVifngnFFytBeb4cLN+n - WaSc6hfKKqB/eHTWoHfwExgMBkFII5MnQUD4WlAWloO26wVs35MDmifPmQFFyqlO/aKKqlmDp31DYDKZ - BCGNTJ4IPqHx8LJvACbNUw7p6e2HuJQMNIhhBuaHj3vBYrEI0tb1BoIiE9kJ9h7Oh7EJM+g/jEJuwVlY - s24ri5RTnfo5BedAIoueIYPumvomuHzjzm9cq2uCq7UNUH2rEarr7kNd0yP26Y+eKoSWtk4wfpmAg7kn - ITY5DUorq1g8cOQEqze3aplOEhRtJoMcL1mMTixV9IgD5a/tSBVDYql8AKOBQLEJtTP08gY/jjFiktKg - 5FIV21Ok3NazvmR2AvrFkCAJyGYk1comZAuHDM/AyLvHThfBveZ26NOPwI59eey7LsbhFCmnOvVJ5+Ef - rrYZLEU8EZ85+HLwW7ZCLMVTFWdkHoLut+/hgbYHaE9XN31XNsupTrWV3jKVs+uS3cyAD0cLe331jW3Q - qRt0CPUlQVHDKI+fN9iGo4W90uNnyuA2vvRtWTlQgxeg/dk7FimnOvU9/CNqUe47b7ANRwt7AfjpKvAK - Gt18Qur35ymhRfsKKLr5hN7EyzDq7humWrrcfSfKxbz/QlwcLDck1snZJdUzYHUDmk57+K1qdXJyzsL6 - RmQD9ZmObygXB8sVIRO6fXQB4hC6eRQppzr1XXmHclnAckFomLc1Um5dItEvhZ97MQXP9N0AAAAASUVO - RK5CYII= - - - - - iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAZdEVYdFNvZnR3YXJlAEFkb2JlIEltYWdlUmVhZHlxyWU8AAADZmlUWHRYTUw6Y29tLmFkb2Jl - LnhtcAAAAAAAPD94cGFja2V0IGJlZ2luPSLvu78iIGlkPSJXNU0wTXBDZWhpSHpyZVN6TlRjemtjOWQi - Pz4gPHg6eG1wbWV0YSB4bWxuczp4PSJhZG9iZTpuczptZXRhLyIgeDp4bXB0az0iQWRvYmUgWE1QIENv - cmUgNS4zLWMwMTEgNjYuMTQ1NjYxLCAyMDEyLzAyLzA2LTE0OjU2OjI3ICAgICAgICAiPiA8cmRmOlJE - RiB4bWxuczpyZGY9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkvMDIvMjItcmRmLXN5bnRheC1ucyMiPiA8 - cmRmOkRlc2NyaXB0aW9uIHJkZjphYm91dD0iIiB4bWxuczp4bXBNTT0iaHR0cDovL25zLmFkb2JlLmNv - bS94YXAvMS4wL21tLyIgeG1sbnM6c3RSZWY9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlw - ZS9SZXNvdXJjZVJlZiMiIHhtbG5zOnhtcD0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wLyIgeG1w - TU06T3JpZ2luYWxEb2N1bWVudElEPSJ4bXAuZGlkOjJGQzkyMzc0Rjk0OUU0MTE5NjNCQjRENDMzQjlC - MUM4IiB4bXBNTTpEb2N1bWVudElEPSJ4bXAuZGlkOjhDMTdBQjRENEFBRTExRTQ4QjQyODY0MDNBNTJE - NzNCIiB4bXBNTTpJbnN0YW5jZUlEPSJ4bXAuaWlkOjhDMTdBQjRDNEFBRTExRTQ4QjQyODY0MDNBNTJE - NzNCIiB4bXA6Q3JlYXRvclRvb2w9IkFkb2JlIFBob3Rvc2hvcCBDUzYgKFdpbmRvd3MpIj4gPHhtcE1N - OkRlcml2ZWRGcm9tIHN0UmVmOmluc3RhbmNlSUQ9InhtcC5paWQ6NUQyMjc4QTlBQjRBRTQxMTk3NEFD - QUFFQjRCMzVENkUiIHN0UmVmOmRvY3VtZW50SUQ9InhtcC5kaWQ6MkZDOTIzNzRGOTQ5RTQxMTk2M0JC - NEQ0MzNCOUIxQzgiLz4gPC9yZGY6RGVzY3JpcHRpb24+IDwvcmRmOlJERj4gPC94OnhtcG1ldGE+IDw/ - eHBhY2tldCBlbmQ9InIiPz4eHsDfAAAB00lEQVRIS7XVWytEURQH8HniTTNHLs0NCXNcXjTN5dH9g/gM - 3jx590QhFDJS0gyTGmpqaqJIMW4hzlAoOaWISS7LWifntI3ddnTGrl92e/57/We/DBsA/CvuYSHZSr0t - lvCGsriX/oI3lMW9lM/SwgF9SEHwizs08IX2vAyLZvZRgXJ+cQWv7yB0q96Ds86voT0vw6KZNJsK4Pnl - DWKxmBBlqhpDUN0UNp2n2VrB/WMOEomEEGX0ArN5o+BGfYB0Oi1EGa8cwpKw6bxRcH6lQiaTEaKMVw5q - rzCbNwr2z65BURQhynh8Qe0VZvNGwdZBFlRVFaKMxxfQXmE2rxc8rW3sQy6XE0puHoG7IaC9YnV9j5th - pbZPqOCDCrbH5uIwOD7/zWgkDkNTizAyuwQjkWWIxFNQWduqmVxI/MiPz6/A8HTUuDMTTYLkbrqhgt5S - T3PG4ZJ3HE7focElZx0u3yn+VQiG1ZLymmm7s74f88f42S6bl9zyJZ6d6Xckd+Mt5ieogH4xJORHHajt - SzvqZPSgECpHZSiA2DztuxBlad+NgnpBEbIjusiiYboKRF+kGFHegUR5ImkFv7G0eAPzWVq8gfksLd5/ - oULiHhYS97BwwPYJlSCUgVubViQAAAAASUVORK5CYII= - - - - - iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAZdEVYdFNvZnR3YXJlAEFkb2JlIEltYWdlUmVhZHlxyWU8AAADZmlUWHRYTUw6Y29tLmFkb2Jl - LnhtcAAAAAAAPD94cGFja2V0IGJlZ2luPSLvu78iIGlkPSJXNU0wTXBDZWhpSHpyZVN6TlRjemtjOWQi - Pz4gPHg6eG1wbWV0YSB4bWxuczp4PSJhZG9iZTpuczptZXRhLyIgeDp4bXB0az0iQWRvYmUgWE1QIENv - cmUgNS4zLWMwMTEgNjYuMTQ1NjYxLCAyMDEyLzAyLzA2LTE0OjU2OjI3ICAgICAgICAiPiA8cmRmOlJE - RiB4bWxuczpyZGY9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkvMDIvMjItcmRmLXN5bnRheC1ucyMiPiA8 - cmRmOkRlc2NyaXB0aW9uIHJkZjphYm91dD0iIiB4bWxuczp4bXBNTT0iaHR0cDovL25zLmFkb2JlLmNv - bS94YXAvMS4wL21tLyIgeG1sbnM6c3RSZWY9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlw - ZS9SZXNvdXJjZVJlZiMiIHhtbG5zOnhtcD0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wLyIgeG1w - TU06T3JpZ2luYWxEb2N1bWVudElEPSJ4bXAuZGlkOjJGQzkyMzc0Rjk0OUU0MTE5NjNCQjRENDMzQjlC - MUM4IiB4bXBNTTpEb2N1bWVudElEPSJ4bXAuZGlkOjJEMDQyOEZBNEFEMjExRTRBN0MxRDBCNzJGRUND - MDEzIiB4bXBNTTpJbnN0YW5jZUlEPSJ4bXAuaWlkOjJEMDQyOEY5NEFEMjExRTRBN0MxRDBCNzJGRUND - MDEzIiB4bXA6Q3JlYXRvclRvb2w9IkFkb2JlIFBob3Rvc2hvcCBDUzYgKFdpbmRvd3MpIj4gPHhtcE1N - OkRlcml2ZWRGcm9tIHN0UmVmOmluc3RhbmNlSUQ9InhtcC5paWQ6QkRDRkI1RDVEMTRBRTQxMTk3NEFD - QUFFQjRCMzVENkUiIHN0UmVmOmRvY3VtZW50SUQ9InhtcC5kaWQ6MkZDOTIzNzRGOTQ5RTQxMTk2M0JC - NEQ0MzNCOUIxQzgiLz4gPC9yZGY6RGVzY3JpcHRpb24+IDwvcmRmOlJERj4gPC94OnhtcG1ldGE+IDw/ - eHBhY2tldCBlbmQ9InIiPz59jfe3AAAEbUlEQVRIS8WTeUybZRzHF48/pnFOuQRajkFLgQFb5iRLNJr4 - l/EPgsniUI4xZDAY1zyxwApsMJyIME61rByl3DfoYGBrgbWUY06FcZSCha4rQ8jYxkqPr2/fvkv8o2Sg - S/wkT970eb6/T5/39z7Prv8dt/Oql4mR4HZJ3ccoXFxhVCzB9DT9JueJdSq6c1wzVZFupepVzxu34XVj - CaEDi1jX6hF8ZQoeokl4iBVwzV9YdU1XRlIl28eVo8phCdXwGltEeOUsro6psaHVwcSDh5volc4iOO8X - 7KuVwb1hEi7J8myq9PEQO//I85oafr0KtEpUpNSETm+AwWDAvfv3YTQaybnm/t/AyO6Ga+UonJOnIijF - 1hA9tWI2qle9RxcI+RIpmZpTIfBULhIyyqHVahHPKcN70TmYnFFCp9OhqXcc9KwW0DOHVl3YU1aUyjJu - F1SpfhO3EM6bMMsVt+D8Zhz2HIpC4oU6bG5uIu4cD3tfTwAjIBNypQYbGxsISquBU34PaDHiVEplGXee - SuIjVaBv3Lz7gJg8vHg4FlZvc+ATVoLipiHsD8qCXWAO7IPK8MG5FjLXKboOeoYADkldUkplGWb7vOb4 - 4BzxIXXQE/1m59WDXdgBvxPfwz6UC4eQUth/WIBDZ2qQXj+K7IYRImeE5s5fOFrcDPvPapcJzVNmmwVY - VxWG9U09uau1tTVymPpc0iYFLew7OEUJ4BwtALfvJpl5xMrKCu6s3cUrn5YbCM1us80CrJZZVWjXr7j3 - 4CE0y8v4IrcaH+cK4Bv+DRyPl8ApphYuia3wZ3eCUzOA1PIfcVuzjHnlIgK/vgy7mHzTG+w12yzA5E53 - edYPo1c2i/X1dQTEfwvbwDQ4hhXg8OcN4P48Df+UTrgkNIAeW4Hg3Hbo9Xq0iGSgs4ls5CUhoXnObLOA - S8pkhG/bdZzgDZJnffT3GXieLAA9XgB2/RjZjuQqMWhxfBw824H55XWyhcfy+HDNqoB1SH4Codn6G7iw - p3d78EaVPlXX0CaZgkqlgly1gpCiK0htHCH/IL6oFcEF3ZjT3CUvXqv0DzDSS0FPq1a/8EbYS5Rqa+if - SAJ8KoeNR7gitEsnoVQqSbGOkJmYX1ggxaY70SabwIGMUrjn8I3WIXnBRPnWu/8nDnE9Sd7cAaP/ZSES - 6/rRKJRArpiHXC7HzekZNIukiCyrhW9mGZgXa4w2kUVnibJnzdXbxP5URzyDO4QjxGl5i9uNpMZeKP5U - IrywAq9yCnGAOGGMonbYxpVnEPGdyR9BO/MTj8kfgXeNFPt5IngVtoF1kQ9WcTs8qgfgmNreQMS21xZL - 0E6Ln6ef75tg8sfgXT8O77oReAkkYNXJ4PRV/4ztyfo9VPTf4xjdf9CpQKzdxxuGe6UMbhXEmc8V6mze - r3qNivx3HGN7UmglQ6CVDMIxXwybo5UcaunJQD8te9rhyx4JrWwItlGNUut3y5+hlp4cDhFCpl14k9jq - nR+Y1NTjIe7NlmMnWKoHsOtvjWYcKpheqFQAAAAASUVORK5CYII= - - - - - iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAZdEVYdFNvZnR3YXJlAEFkb2JlIEltYWdlUmVhZHlxyWU8AAADZmlUWHRYTUw6Y29tLmFkb2Jl - LnhtcAAAAAAAPD94cGFja2V0IGJlZ2luPSLvu78iIGlkPSJXNU0wTXBDZWhpSHpyZVN6TlRjemtjOWQi - Pz4gPHg6eG1wbWV0YSB4bWxuczp4PSJhZG9iZTpuczptZXRhLyIgeDp4bXB0az0iQWRvYmUgWE1QIENv - cmUgNS4zLWMwMTEgNjYuMTQ1NjYxLCAyMDEyLzAyLzA2LTE0OjU2OjI3ICAgICAgICAiPiA8cmRmOlJE - RiB4bWxuczpyZGY9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkvMDIvMjItcmRmLXN5bnRheC1ucyMiPiA8 - cmRmOkRlc2NyaXB0aW9uIHJkZjphYm91dD0iIiB4bWxuczp4bXBNTT0iaHR0cDovL25zLmFkb2JlLmNv - bS94YXAvMS4wL21tLyIgeG1sbnM6c3RSZWY9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlw - ZS9SZXNvdXJjZVJlZiMiIHhtbG5zOnhtcD0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wLyIgeG1w - TU06T3JpZ2luYWxEb2N1bWVudElEPSJ4bXAuZGlkOjJGQzkyMzc0Rjk0OUU0MTE5NjNCQjRENDMzQjlC - MUM4IiB4bXBNTTpEb2N1bWVudElEPSJ4bXAuZGlkOjJERTg4QTFENEQyMjExRTRBODEyODk0M0RBMTc5 - Qjg3IiB4bXBNTTpJbnN0YW5jZUlEPSJ4bXAuaWlkOjJERTg4QTFDNEQyMjExRTRBODEyODk0M0RBMTc5 - Qjg3IiB4bXA6Q3JlYXRvclRvb2w9IkFkb2JlIFBob3Rvc2hvcCBDUzYgKFdpbmRvd3MpIj4gPHhtcE1N - OkRlcml2ZWRGcm9tIHN0UmVmOmluc3RhbmNlSUQ9InhtcC5paWQ6NjJGOUEyRDEyMTRERTQxMUIzNkJE - NUVDQjU5MzE1NjIiIHN0UmVmOmRvY3VtZW50SUQ9InhtcC5kaWQ6MkZDOTIzNzRGOTQ5RTQxMTk2M0JC - NEQ0MzNCOUIxQzgiLz4gPC9yZGY6RGVzY3JpcHRpb24+IDwvcmRmOlJERj4gPC94OnhtcG1ldGE+IDw/ - eHBhY2tldCBlbmQ9InIiPz6wJF34AAACl0lEQVRIS62Vy08TURSH73/QhQtXVnBhxEcMiUkhbEg0hB1R - Q1i68C8wIW5cEqMLN7ho2Ji4YiEhWq0prYUhfULbadN3obTaChobtZEUsFY9nnPS6WM6HYowyZf87j33 - nG/amaai9geOBYA+4pTxihmBE8DcTQB4J8em/9IwSQyagmrtL+z9rMFmvnhkKvtV7tcVHPz6DVsftulA - AckdhUg8zf19eoLKAd597iMLMItewfOxUDTN/bqCH3tVSG8VWIBZ9AoJApEk9+sKvu/uQ2IjzwJkGtH8 - OrTwy3Hu77vIAnV9mgWlcgWiqRwLjAMmkOMbPbNTKnN/JJntqJGEBZ++7oKcyLLgLN4JrU8Cms2C4pcy - BKKZumCI18temQ/8DzSLZlBmQX7nG/jCKdpgAa0driCtY5iFHuqHSjNoFtaags1iCdzBBG+QgNY2aZ0F - mIUe6osENAtrTUEq/7kDq9PHAszU5yYoq9f1i9cUSCD5ozxDEeTsrhAoONwyxLLb8MrhYQFmZYCHsnpd - v3hNgQROb5hnKIK29944MAThTBEWbS4WYBZ6qC/sKSy5ZJ6BGUQg8b4Bbhjod4AZXlhXWdBa10LrIVul - AM9ggS+aa6AIMMO8ZYUO0KeyIOMtZyaQpXpNi4LFucYzMINwhbMNcMNw5oIJMMNKIA0LNg88mZuH/ssj - dPgBMnN+cBRmny1wrRtSMMMzWCCFMg0UAeY2Fh0+GL5xG8Zu3oHXUrCj3g0WONdTbeBm21/o1N17gPtg - 98Xh3VoS3qzKMDI22agfglnY/Uld8NDc/ZlZwAwvl4Ngun6LGh8rdfVDViNs3rguOOzq6XOD8PDpc7g2 - OkHDH7XWtYa2It66Y4eCQ8cRfpvUNa2hTUD8A6JMaBvCyTdJAAAAAElFTkSuQmCC - - iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 @@ -1403,7 +1485,7 @@ AAAASUVORK5CYII= - + iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 YQUAAAAZdEVYdFNvZnR3YXJlAEFkb2JlIEltYWdlUmVhZHlxyWU8AAADZmlUWHRYTUw6Y29tLmFkb2Jl @@ -1415,108 +1497,26 @@ bS94YXAvMS4wL21tLyIgeG1sbnM6c3RSZWY9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlw ZS9SZXNvdXJjZVJlZiMiIHhtbG5zOnhtcD0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wLyIgeG1w TU06T3JpZ2luYWxEb2N1bWVudElEPSJ4bXAuZGlkOjJGQzkyMzc0Rjk0OUU0MTE5NjNCQjRENDMzQjlC - MUM4IiB4bXBNTTpEb2N1bWVudElEPSJ4bXAuZGlkOkUzNzJDMjE3NEFENjExRTRCNjE0OEVEQzI4MEM0 - RTZDIiB4bXBNTTpJbnN0YW5jZUlEPSJ4bXAuaWlkOkUzNzJDMjE2NEFENjExRTRCNjE0OEVEQzI4MEM0 - RTZDIiB4bXA6Q3JlYXRvclRvb2w9IkFkb2JlIFBob3Rvc2hvcCBDUzYgKFdpbmRvd3MpIj4gPHhtcE1N - OkRlcml2ZWRGcm9tIHN0UmVmOmluc3RhbmNlSUQ9InhtcC5paWQ6RkI3NUQ0QkNENDRBRTQxMTk3NEFD - QUFFQjRCMzVENkUiIHN0UmVmOmRvY3VtZW50SUQ9InhtcC5kaWQ6MkZDOTIzNzRGOTQ5RTQxMTk2M0JC - NEQ0MzNCOUIxQzgiLz4gPC9yZGY6RGVzY3JpcHRpb24+IDwvcmRmOlJERj4gPC94OnhtcG1ldGE+IDw/ - eHBhY2tldCBlbmQ9InIiPz6PyaLfAAADMElEQVRIS6VUXUiTYRT+vi3Tzd+ps23+3KRigtiPkolEQReG - UYTkhWatpWlWGkRdddfdSPImqUAJjSIT00oxLJIk0cR+tFSyzDJtgaMkDEPkdM7ZPvm2vS6jBx6es3Pe - 8zzvtm+TohLS/ov+AACStLgEQuJyLRJWYK1yzh/+FgCoQrpnfM4fOGBhcUlIMkEVkma4H4i1y2kFcMD8 - wqKQZILKZqTqmlTAWrfvMjhgbv63Dwm0hLWQohn1eNEbzrlfPiTQAtZCKjP1GXdAIC+r4XD+9CGBFrDm - RVJ1re6pZ0GyHHMvIawauYVNCFPfvvuQQAtYC6meKXU0amNsaGN/ZR60xIf9aIgN3cpGE9OzZCZ85nEm - pGiWlLABmuJCnUOXrNB7chdct4TUo32ANDbp4NuielDpqWfePdaPX6GrohSK4uLhlCEo96YlZLbOFHzH - oJXjMSBcGn4/zQGovEDqXXtzeTb+BTrKj0J3+Q54djYP7EZdTU2MPjFSK8eieQR9QtLg6GcOQPWgqKeQ - ZyOfoK30CDw+lg2Ot3Z4VLoNqo269mCNHIa2WjYn9A1PcAAqU6m9VV3TF9psOwwPS3JgZugCdNoyocwU - jU+RlImWBpezGz0vxzkA1YOiHvPFO7Ca1kGHLQtmXp2HdutmqN+/F6JiU+h3kOpyVeHJwBgHoLIpqajm - 189HoaG4CNqsGTA1UAWth9Lg6r490PygGyLjUikgzuWqQlffCAegelDdUwLqigqhpXgjTPYeh+bCFCg2 - RkEk3vxuVz/P0c43oLP3DQegLhspNalSFxiNcLswHT48LYNbBUlQk7ebzenmyhm08w1o7xmiAP6hRZiT - 70eYkzpctUuJWdHmwWs74+F1Uz7cyE+E4ohQB5mHm9a3GywpTXzektyKduIAIsKI3ISkL4rIdYle05C9 - VrZVBmvtl7eboUyv7V4jSQdwRn8FdI72iErtCUxnIuifkJ5hUqUOq9Jr7OeCNU6bTpNVqtMcDJSldOwn - KnOk+jypJ5QANRWc0cs5SEelXr54QidfwVYAMoiHq4W/gNM6OaNCJ+diaUIqN/43+Atwg27t+9ZXBUn6 - A2MdqQeVc5pWAAAAAElFTkSuQmCC - - - - - iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAIAAABvFaqvAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAZdEVYdFNvZnR3YXJlAEFkb2JlIEltYWdlUmVhZHlxyWU8AAADZmlUWHRYTUw6Y29tLmFkb2Jl - LnhtcAAAAAAAPD94cGFja2V0IGJlZ2luPSLvu78iIGlkPSJXNU0wTXBDZWhpSHpyZVN6TlRjemtjOWQi - Pz4gPHg6eG1wbWV0YSB4bWxuczp4PSJhZG9iZTpuczptZXRhLyIgeDp4bXB0az0iQWRvYmUgWE1QIENv - cmUgNS4zLWMwMTEgNjYuMTQ1NjYxLCAyMDEyLzAyLzA2LTE0OjU2OjI3ICAgICAgICAiPiA8cmRmOlJE - RiB4bWxuczpyZGY9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkvMDIvMjItcmRmLXN5bnRheC1ucyMiPiA8 - cmRmOkRlc2NyaXB0aW9uIHJkZjphYm91dD0iIiB4bWxuczp4bXBNTT0iaHR0cDovL25zLmFkb2JlLmNv - bS94YXAvMS4wL21tLyIgeG1sbnM6c3RSZWY9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlw - ZS9SZXNvdXJjZVJlZiMiIHhtbG5zOnhtcD0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wLyIgeG1w - TU06T3JpZ2luYWxEb2N1bWVudElEPSJ4bXAuZGlkOjJGQzkyMzc0Rjk0OUU0MTE5NjNCQjRENDMzQjlC - MUM4IiB4bXBNTTpEb2N1bWVudElEPSJ4bXAuZGlkOjUzQzNGNDI5NEQyQzExRTQ4QkE1QUNCMEVDRDZF - MDVEIiB4bXBNTTpJbnN0YW5jZUlEPSJ4bXAuaWlkOjUzQzNGNDI4NEQyQzExRTQ4QkE1QUNCMEVDRDZF - MDVEIiB4bXA6Q3JlYXRvclRvb2w9IkFkb2JlIFBob3Rvc2hvcCBDUzYgKFdpbmRvd3MpIj4gPHhtcE1N - OkRlcml2ZWRGcm9tIHN0UmVmOmluc3RhbmNlSUQ9InhtcC5paWQ6RkI1NUY4OTYyQTRERTQxMUIzNkJE + MUM4IiB4bXBNTTpEb2N1bWVudElEPSJ4bXAuZGlkOjJERjY3MEZENEQyMzExRTRCNDlGQUMwMzk0OTAw + Qzc4IiB4bXBNTTpJbnN0YW5jZUlEPSJ4bXAuaWlkOjJERjY3MEZDNEQyMzExRTRCNDlGQUMwMzk0OTAw + Qzc4IiB4bXA6Q3JlYXRvclRvb2w9IkFkb2JlIFBob3Rvc2hvcCBDUzYgKFdpbmRvd3MpIj4gPHhtcE1N + OkRlcml2ZWRGcm9tIHN0UmVmOmluc3RhbmNlSUQ9InhtcC5paWQ6NjhGOUEyRDEyMTRERTQxMUIzNkJE NUVDQjU5MzE1NjIiIHN0UmVmOmRvY3VtZW50SUQ9InhtcC5kaWQ6MkZDOTIzNzRGOTQ5RTQxMTk2M0JC NEQ0MzNCOUIxQzgiLz4gPC9yZGY6RGVzY3JpcHRpb24+IDwvcmRmOlJERj4gPC94OnhtcG1ldGE+IDw/ - eHBhY2tldCBlbmQ9InIiPz6IsaOmAAADF0lEQVQ4T62U/UuTURTH+0nICqRI1ERMMyNQe8N0ChqBwQhN - yvwhEgJjVCqJ/qCibZo6tzQ339h6Nre5prapUzc1XzItX1ilzuWMLLVAen+xf6DTuTxjdxsFVj58ebjc - c+7nnud7z3228DbpIaDFH/CfoqCn72DIDvNfPDM2KAqyr8PcJxqY+QBTb8kkjocXQTsKigGwfqYJHqIg - 1OxHGHvlWPx4hXB1YyA3g4CBhqst+piEnrDA3rA95vBAY1x8d7lq/DVZwm5PQZNvoKYdypSgHgbVEIh1 - cLOZzOCbSSsyRQRba6uWtcpVLbPcwlglInNUCJNWWKqABqMLCGvGlfpJELaQ/V1Vd1lujAhe0chtUrH5 - ZExnmJ85MdomEa+qZMbIEF2BHGunILSjdZwYgTt4gJqjjj0Rltml1Zq9AeL0Mn71Wn2mtDU80MIvsFTw - O+KPIoWC8BNYRIUaqrRQroJKjQOk9N+xLBF2pXJFKfnsDGYa8gS6xOO2whyMuoHaHpGzZ/pBM0IMrtXD - nT4HqNHXe0lYoogMFeQP4jbSDkCPTUyXmnNoPutSo+9WN5DEQDyeWCWnhqm4p7Oimt3b54rzmmKPVHKz - 0Xg0AU1pz87VJp+yXOfd9t3mBmLXsGrsJhSsDtF4iOWxKdpzyQNnuRW7vEUp13obFG05OVUBPtO5V1Sn - k5q4SX8ENfWA6C7xHsP981Bb2sf38ZKd4JhSuXUJHPHhg/WJnAeZFw0Xzt/w8erRtLmBnB/CSmaC599I - 2PYVRl+CXigu3R9SfCC0Pf1MZ1oqvqvjogX7gtRFJfb1n24g7GblfQcFP2fkBYm5anxqQcbLKgzyK/Df - WRTkV5+RMTg84ZrgAOHo4ZIDVNdJw67CpsVLZ5gifj97Typlq2ZFQXj8LKh5EHpnaIar8N+Al5l9Y9Vs - T7OiIAzjqaMsa6QJnBkeWvgOHdPkAuIV67PSeQpCYYZplsZ+KyyWLRyFF8D553EDbURY770J0rrYJbda - SYE4iWb9NcgpRKDrOMAWwYP6d5BTaC52zyaAWDlAm/DweL8AX9zXukfxHsIAAAAASUVORK5CYII= - - - - - iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAZdEVYdFNvZnR3YXJlAEFkb2JlIEltYWdlUmVhZHlxyWU8AAADZmlUWHRYTUw6Y29tLmFkb2Jl - LnhtcAAAAAAAPD94cGFja2V0IGJlZ2luPSLvu78iIGlkPSJXNU0wTXBDZWhpSHpyZVN6TlRjemtjOWQi - Pz4gPHg6eG1wbWV0YSB4bWxuczp4PSJhZG9iZTpuczptZXRhLyIgeDp4bXB0az0iQWRvYmUgWE1QIENv - cmUgNS4zLWMwMTEgNjYuMTQ1NjYxLCAyMDEyLzAyLzA2LTE0OjU2OjI3ICAgICAgICAiPiA8cmRmOlJE - RiB4bWxuczpyZGY9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkvMDIvMjItcmRmLXN5bnRheC1ucyMiPiA8 - cmRmOkRlc2NyaXB0aW9uIHJkZjphYm91dD0iIiB4bWxuczp4bXBNTT0iaHR0cDovL25zLmFkb2JlLmNv - bS94YXAvMS4wL21tLyIgeG1sbnM6c3RSZWY9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlw - ZS9SZXNvdXJjZVJlZiMiIHhtbG5zOnhtcD0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wLyIgeG1w - TU06T3JpZ2luYWxEb2N1bWVudElEPSJ4bXAuZGlkOjJGQzkyMzc0Rjk0OUU0MTE5NjNCQjRENDMzQjlC - MUM4IiB4bXBNTTpEb2N1bWVudElEPSJ4bXAuZGlkOkVENUYwQThBNEQyOTExRTQ5QzUzQzdFMkFGQkQy - NTA1IiB4bXBNTTpJbnN0YW5jZUlEPSJ4bXAuaWlkOkVENUYwQTg5NEQyOTExRTQ5QzUzQzdFMkFGQkQy - NTA1IiB4bXA6Q3JlYXRvclRvb2w9IkFkb2JlIFBob3Rvc2hvcCBDUzYgKFdpbmRvd3MpIj4gPHhtcE1N - OkRlcml2ZWRGcm9tIHN0UmVmOmluc3RhbmNlSUQ9InhtcC5paWQ6MkRGNkEzOUYyOTRERTQxMUIzNkJE - NUVDQjU5MzE1NjIiIHN0UmVmOmRvY3VtZW50SUQ9InhtcC5kaWQ6MkZDOTIzNzRGOTQ5RTQxMTk2M0JC - NEQ0MzNCOUIxQzgiLz4gPC9yZGY6RGVzY3JpcHRpb24+IDwvcmRmOlJERj4gPC94OnhtcG1ldGE+IDw/ - eHBhY2tldCBlbmQ9InIiPz6npMy1AAAGEUlEQVRIS7WVeVDUZRjHf7Ase8ECu+wl4LIXcqyyHC783AWW - 5QaRFTHkMi9SQvE+UhLzwk0BUcQSgQBBgcYDzStMSzOPcpqcmo5pmqk/+rOapqb+iG/PbzfFcSz/6pn5 - zPN739/7fp/nvZn/3TSLjj+XJy2/RaItPCT5vaBd8m1+q2Qku1lcrcvki+iXr7fFU6ZZeOx5KDU1b7jU - 1Z2bVPMPWNMbRXrXkWAc+ywVLbcS8fKwFjlu8VdpW0XzSc6f8PEIPzJ19dFnU3WEJdHL9P3X9O1nkdB8 - CQrX7i3mKn9zfqsUq29ZsPfjRBx5aMO2cTMy94gm7FuF7XyJTwDJTo5GVdHxNALVgsPd5Ceye+9g8b0f - UXbjB8RtH4Msd+MeXS7f6twjxbILZiy7pEHDtTBsvG7BqivTUXpsClLWCbtJNpDwBlGVH3ySIFV520eW - nedRcf0HVJGwbeRrOHs/h2n1CGRZDe7wND/W1hiI8sEYlJ4KRcVpJcrfVqByNBILhqLh3KeA+UXBOpL2 - jkRZduARPGXZ/vH4pnMou/gd7INfIPn4QyQc/RSOzk9hrBtEiKPerUn1Y5PXBaDojWlwdgUjr0+G/H4Z - cnpCUNJrQNZ+LeLrBD/LYnixFEDAKFz7vJQ0r49dO4zikS8x8/ADxLd9jIT2B5ix/z7SX78Pw+K3EJy2 - wq1M4rEz6sRwthgw82Ag2KNS2I5JPZ4rZx00ImGNHIZSfisFkDGhxbs5AkKLd/3kaLkDlgTjXrsNc/Md - mPfeQeyOD2HbcRu6yi4E2Wrd8ngeG71IBPtePWa4JUhsD0DykQAkHQqApUWCFLcGyZvDoZ/P/5oCTGXk - hU2MvGB7rbGmG47dd2Fa+x6iX/kAMa/eQvS2m4jaeAPspvcROb8TQexid3CcL2usFCJjnwE5nQYU9RhR - PGDC7D4TCrqMyDqkR9oePbRz/SZEKh8rI8vdyshyXhmzLD8DS/1VGOquwtgw7glkXH0Nhvp3kbL2GrSl - hyC11ril03xZfbkQKZuVsDeq4NihRtYuDbJ2auBoUsO2TQXrJiWMlWIExflWMiHOjRzfJy0bg776HCKX - vANd7WXol1/xeN3Si7A2XIXW1YbAxAq3UO0zPTSd1yG38bplLK//vxBrffKY4PQ1HH9aKk8jonQUUyvO - Qlt9HtqaCx4/tXIMyXWXMXXOAQTEv+D2zCvDhBBTCN1zCGOCZq3k+DXO1YcpRYOY4hpF2LzTCCs74/VE - 3IvnEVd1EhGFblBbWot6BKXWQZq64tlYa2+TuJwQM9KU5cRL35hyOxCe2w913hA0hcPQFI16KRzxEFtO - a1Q9htSVN5C+5S5x7x/uIm3DR7CvuomUReOImt1FU7nwEolHECImMGkJE5i46EJkejNM+X1QOPqhzBqC - KvskVDmnJuHKT/K4bgjKzBMItXcjJv84NOwWiKPndJK40TOCgPgaRmIur1dZ1yM6txvyWT0ITR+AImOQ - gg39N1ybDBJP60PorC5My3oTwQm18FdNryBxbq0EJL6AEUTYZBTkF0NGKyKdvZDb3qJOAxSIOqcP/jtp - JyC3D1BSvYgp6EN4aiNlP/cTEk4gFASPEUeXkWd8RaY5jcrEBkTn9UCT4Q3gzfBfRvJE9rrsfpicHSRe - NsFXmJeSXhTBXXY+jMjk8uArVkpExuKb6pkbYJ7L7Ria37xTUBeMeCkcncRTN0z/TyLKNYy4khNQJq2G - IMLBXdUWQkXwCYYR6md7IPP1k8WEC3UFDzSpG2BZeAZJtXQWFpyls3HOC50JzkdQnbFqDInLLiC2rBcq - 6xoSzzzP+NDVwDBaQkx4XzahNv8xZH48sVotCHeOUnnCWNJG18Q4UjddB7vlfbBbPwC7+YannLTyIrS5 - OyHU5v3hr07poL7JBHe4Jh8bzgQROY8h46IKCAVfbi73D3PcpfoJlX0VtEVN0JXsQlj2ZoRaaynj7N/8 - NfZLPLFmHrXnpiWSCCL8iMl32T/M6YGMq+R+covD7QADwfoIgqt4QVGtfvIZJ4lRv5CY4zypbjfjy+eE - M4l4gtuSwYSQ4DS4EZAew/wNiCYQJlvQU3cAAAAASUVORK5CYII= + eHBhY2tldCBlbmQ9InIiPz6GKmpFAAAC+UlEQVRIS63T20vTYRzH8Yforj/Ei24UiSgKIygKi8oyxZQo + cvNYeXaesmzqPGu2POd0ulSsnIdaurTSTJ3O6UxTPGya5vCQx5AuPn39RbHop7nZxQt+z3ie93e/Z4w1 + p7nsCoBt8R6yBF/UHPv+Wb0rfFFzm99CRIwEW1gnqXzxTXxRc0ydctm4OlID2sxrw6iCtiwItC+A2P/D + frLnjwGNSZdMq6N1WOvLwFpP4l/WdRlY6Jaio9Ab7QXba8sVoDHZGdT8PYS9THDqMGnLsKpNw0qXGCua + BO55VZdNQ6U/DRRibVCGb+N1pH5bukoRqHmDHOIG1N8/X2F4I8WyNhtf2+9hqSsZxqZ4upbb6HsSZLHO + Im90ym6hNVcIaktYTexZyUelGEvaHMy/jcFiZxo0xX5Y7ivGcn8JkVmA9uvlWBmqwpJeAWovs+poR99O + eRgWtQWYVUdgrj0FH+i+F3XF3NoappZYGJrEoLaOVYpOOTY/FGJB+xjTqnDMtMTTAC/Ma/Ix/TLUKl9e + x0JfFQpql7PykBP7lWIXzPeUYLIhHCPKCLr/AMy2ZsKoDLTKdNNdvM8TgNpRTBZwfJ885CTmaIChPhwa + mS+GnkdhqjEWY9X+VplqvIMXEhdQ24mZeuSs0N/BNNWWj4k6EdSZHhhXxWH0aSCGFd4c4Tk7zk7XBlUM + FKLToK4Nm+0qYnneRzqGGiSYaIiiyZdhVCdgqFSIwRJPjucZW85O1pvnRmvDkO9zFNTdy2Y6HjGp4HCF + 5kk4xhoiURd/EROv4tBfeM0qAyUC9Mp9QM0+7o829T6LZV0/mNycS6+nFKFWfAGj9ZHozfGwil7miZYH + 7qCmghsw+S6VpV894KuUuKFbfhNNqa749CwY3dm0toK+VABl3HlQM5obYHybwFLc7W1y/Y5BlX6FfgNn + DNcEY0DhZZX+MiGKbh0DNR24AYYWMSfJzc6GZBApwS5skIzNODcg0dV2V36FtsJ7yBJ8UXO8hyzBFzXH + ++H/A/YDv9/V87iOlrYAAAAASUVORK5CYII= @@ -3164,9 +3164,6 @@ 864, 17 - - 864, 17 - iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 diff --git a/Program.cs b/Program.cs index e38f7b8..a76d0d4 100644 --- a/Program.cs +++ b/Program.cs @@ -16,14 +16,14 @@ [STAThread] static void Main() { - ValidateInfo validateInfo = ValidateConfig.LoadConfig(); + ValidateConfig.LoadConfig(); string localConfigPath = Application.StartupPath + "/Config.xml"; //获取程序及版本信息 string currentVersionCode = Assembly.GetExecutingAssembly().GetName().Version.ToString(); //获取文件版本信息 FileVersionInfo.GetVersionInfo(Application.ExecutablePath); - + Utility.SysInfoConfig(); string configUrl = getProgramUrl(localConfigPath, "configurl"); if (configUrl != "") { diff --git a/TreeUtils.cs b/TreeUtils.cs index 1f055b5..ad39643 100644 --- a/TreeUtils.cs +++ b/TreeUtils.cs @@ -19,7 +19,7 @@ public static void InitLayerTree(GSOGlobeControl gsoGlobeControl, TreeView treeView, string viewDatasrc) { // treeView.Nodes.Clear(); - LayerConfig layerConfig = Utility.layerConfig;//layertree所在的配置文件 + LayerConfig layerConfig = Utility.LayerConfig;//layertree所在的配置文件 List datasrcs = layerConfig.datasrcs; foreach (DataSrc datasrc in datasrcs) { diff --git a/Utility.cs b/Utility.cs index c03e405..ab947a3 100644 --- a/Utility.cs +++ b/Utility.cs @@ -20,7 +20,7 @@ public static string dbdatabase; public static string userID; - public static Hashtable Pipe_QueryFields; +// public static Hashtable Pipe_QueryFields; public static string DBPassword; public static string DBServer; public static string DBBackUp; @@ -38,7 +38,7 @@ public static List listPipelineType; public static string PicRootURL; public static string PicDefaultURL; - public static double dFlyAboveLine = 2; +// public static double dFlyAboveLine = 2; public static string userName; public static string projectStr; public static string userRole; @@ -85,12 +85,17 @@ public static List pipefittingLayerNames = new List();//管件图层名称 public static List sgPipeLayersNames = new List();//施工管线图层名称 -// public static Dictionary dictionaryNetLayerNameAndCaption = new Dictionary(); - public static HashSet layerNameSet = new HashSet(); + public static HashSet layerNameSet = new HashSet();//记录有哪些图层要显示 public static string roadLayerName = ""; #endregion wxl - public static LayerConfig layerConfig; + public static LayerConfig LayerConfig; + + public static string RoleServer; + public static string TitleImagePath; + public static string SysnameVersion; + public static string Copyright; + public static void SetBallons(GSOBalloon featureTooltip, GSOBalloonEx balloonEx) { featureTooltip.CacheFilePath = Application.StartupPath + "/GeoScene/Globe/Temp"; @@ -188,25 +193,6 @@ } return s.ToString(); } - public static GSOFeatures Table2Features(DataTable table, string currentQueryLayer, GSOGlobeControl globeControl1) - { - GSOFeatures features = new GSOFeatures(); - for (int i = 0; i < table.Rows.Count; i++) - { - DataRow row = table.Rows[i]; - - string featureName = row["编号"].ToString(); - featureName = featureName.Trim(); - GSOLayer layer = globeControl1.Globe.Layers.GetLayerByCaption(currentQueryLayer); - GSOFeatures tempfeatures = layer.GetFeatureByName(featureName, false); - if (tempfeatures.Length > 0) - { - features.Add(tempfeatures[0]); - } - } - return features; - } - //程序启动的时候读取配置文件 public static void SetParams() @@ -358,8 +344,8 @@ #region wxl 从layerconfig.xml中读取 - layerConfig = XmlTools.DeserializeFromXml(layerConfigFile); - List dataSrcs = layerConfig.datasrcs; + LayerConfig = XmlTools.DeserializeFromXml(layerConfigFile); + List dataSrcs = LayerConfig.datasrcs; foreach (var dataSrc in dataSrcs) { @@ -598,76 +584,49 @@ #endregion } - /* - //判断网络是否连接 - public static bool isNetworkConnectionSuccess(string ipAdress) + /// + /// 获取Config.xml配置文件中的roleurl配置，并返回 + /// + /// 请求综合信息平台的服务地址 + public static void SysInfoConfig() { - //return true; - if (ipAdress == null) - { - return false; - } - if (ipAdress.Contains("\\")) - { - ipAdress = ipAdress.Substring(0, ipAdress.LastIndexOf('\\')); - } - if (ipAdress.Trim() == "localhost" || ipAdress.Trim() == "127.0.0.1" || ipAdress.Trim() == Dns.GetHostName()) - { - return true; - } - Ping ping = new Ping(); + if (!File.Exists(filename)) return; + + XmlTextReader xmlReader = new XmlTextReader(filename); try { - PingReply pr = ping.Send(ipAdress.Trim(), 3000); - if (pr.Status == IPStatus.Success) + while (xmlReader.Read()) { - return true; + if (xmlReader.Name.Equals("roleurl")) + { + RoleServer = xmlReader.ReadElementString(); + } + else if (xmlReader.Name.Equals("titleimgpath")) + { + TitleImagePath = xmlReader.ReadElementString(); + } + else if (xmlReader.Name.Equals("sysname")) + { + SysnameVersion = xmlReader.ReadElementString(); + } + else if (xmlReader.Name.Equals("copyright")) + { + Copyright = xmlReader.ReadElementString(); + } } - else - { - return false; - } + } catch (Exception ex) { - LogError.PublishError(ex); - return false; + + LogHelper.Error("在config.xml配置文件中读取roleurl时出错"); } - } - */ - - - //TODO LIST:下面两个方法移到featueTools.cs中 - //根据附属物图层名字得到里面含有的附属物 - public static string[] getAccStrsByLayer(string layername) - { - string[] accStrs = null; - string sql = "select 附属物名称 from " + layername + " group by 附属物名称"; - DataSet dataset = OledbHelper.getDataSet(sql, layername); - if (dataset == null) return null; - accStrs = new string[dataset.Tables[0].Rows.Count]; - for (int i = 0; i < dataset.Tables[0].Rows.Count; i++) + finally { - accStrs[i] = dataset.Tables[0].Rows[i][0].ToString(); + xmlReader.Close(); } - return accStrs; } - //删除内存图层中指定名称的feature - public static void RemoveFeatureFromName(GSOGlobeControl globeControl1, string featureName) - { - GSOFeatures features = globeControl1.Globe.MemoryLayer.GetFeatureByName(featureName, true); - if (features != null) - { - for (int i = features.Length - 1; i >= 0; i--) - { - GSOFeature feature = features[i]; - if (feature != null) - { - globeControl1.Globe.MemoryLayer.RemoveFeatureByID(feature.ID); - } - } - } - globeControl1.Refresh(); - } + + } } diff --git a/ValidateInfo.cs b/ValidateInfo.cs index de75391..01546da 100644 --- a/ValidateInfo.cs +++ b/ValidateInfo.cs @@ -192,7 +192,7 @@ } if (!isSuccess) { - LogHelper.WriteLog(typeof(FieldUniqueValidate), logStr); + LogHelper.Error(logStr); } return isSuccess; } @@ -247,7 +247,7 @@ err += "未找到字段或其类型匹配:" + unFoundField.label + ":" + unFoundField.type + "\r\n"; } - LogHelper.WriteLog(typeof(FieldCountValidate), err); + LogHelper.Error(err); return false; } return true; @@ -316,7 +316,7 @@ { err += "字段:" + field.label + "出错\r\n"; } - LogHelper.WriteLog(typeof(FieldOrderValidate), err); + LogHelper.Error(err); return false; } return true; @@ -388,8 +388,7 @@ } if (isSuccess == false) { - LogHelper.WriteLog(typeof(FieldEmptyValidate), - "字段为空检查失败:\r\n" + err); + LogHelper.Error("字段为空检查失败:\r\n" + err); } return isSuccess; } diff --git a/bin/x86/Debug/Config.xml b/bin/x86/Debug/Config.xml index 6995f64..6a453a3 100644 --- a/bin/x86/Debug/Config.xml +++ b/bin/x86/Debug/Config.xml @@ -25,6 +25,11 @@ http://127.0.0.1/Cyberpipe.msi http://127.0.0.1/Config.xml + http://192.168.0.102:8080/ctrl + /Resource/title.jpg + 智慧太湖新城管网规划分析系统6.0 + @2014-2015 苏州航天系统工程有限公司 版权所有 + 编号,管线编码,管径_毫米,材质,埋设方式,起始地面高程,起始埋深,终止地面高程,终止埋深,建设年代,使用年限,权属单位,设计单位,设计负责人,施工单位,施工负责人,监理单位,监理负责人,业务负责人,备注 编号,管线编码,管径_毫米,材质,埋设方式,起始地面高程,起始埋深,终止地面高程,终止埋深,建设年代,使用年限,权属单位,设计单位,设计负责人,施工单位,施工负责人,监理单位,监理负责人,业务负责人,备注 diff --git a/bin/x86/Debug/config/log4net.config b/bin/x86/Debug/config/log4net.config index 80f9b25..6fbcfa7 100644 --- a/bin/x86/Debug/config/log4net.config +++ b/bin/x86/Debug/config/log4net.config @@ -3,29 +3,118 @@
- - - - - - - - - - - - - - - + + + -property: [%property{NDC}] - %n错误描述：%message%newline %n"/> - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/bin/x86/Debug/glVersion.txt b/bin/x86/Debug/glVersion.txt index cd82eca..755455e 100644 --- a/bin/x86/Debug/glVersion.txt +++ b/bin/x86/Debug/glVersion.txt Binary files differ diff --git a/bin/x86/Debug/log.txt b/bin/x86/Debug/log.txt index a4966d3..2112642 100644 --- a/bin/x86/Debug/log.txt +++ b/bin/x86/Debug/log.txt @@ -430,3 +430,43 @@ exception over ------------------------------------------------------------ + + exception begin -----------------2016/11/29 18:54:54--------------------- + + + + e.Message:第 29 行，位置 4 上的开始标记“titleimagpath”与结束标记“titleimagepath”不匹配。 第 29 行，位置 39。 + + e.Source:System.Xml + + e.TargetSite:Void Throw(System.String, System.String[]) + + e.StackTrace: 在 System.Xml.XmlTextReaderImpl.Throw(String res, String[] args) + 在 System.Xml.XmlTextReaderImpl.ThrowTagMismatch(NodeData startTag) + 在 System.Xml.XmlTextReaderImpl.ParseEndElement() + 在 System.Xml.XmlTextReaderImpl.ParseElementContent() + 在 Cyberpipe.Utility.SetParams() 位置 E:\wxl\work\GHFX_REFACTOR\Utility.cs:行号 208 + + + + exception over ------------------------------------------------------------ + + exception begin -----------------2016/11/29 18:57:17--------------------- + + + + e.Message:第 29 行，位置 4 上的开始标记“titleimagpath”与结束标记“titleimagepath”不匹配。 第 29 行，位置 39。 + + e.Source:System.Xml + + e.TargetSite:Void Throw(System.String, System.String[]) + + e.StackTrace: 在 System.Xml.XmlTextReaderImpl.Throw(String res, String[] args) + 在 System.Xml.XmlTextReaderImpl.ThrowTagMismatch(NodeData startTag) + 在 System.Xml.XmlTextReaderImpl.ParseEndElement() + 在 System.Xml.XmlTextReaderImpl.ParseElementContent() + 在 Cyberpipe.Utility.SetParams() 位置 E:\wxl\work\GHFX_REFACTOR\Utility.cs:行号 208 + + + + exception over ------------------------------------------------------------ diff --git a/bin/x86/Debug/log/2016/201611/20161107.txt b/bin/x86/Debug/log/2016/201611/20161107.txt deleted file mode 100644 index cd32fa6..0000000 --- a/bin/x86/Debug/log/2016/201611/20161107.txt +++ /dev/null @@ -1,152 +0,0 @@ - - -��¼ʱ�䣺2016-11-07 10:30:22,327 -�߳�ID:[9] -��־���� ERROR -�����ࣺCyberpipe.FrmBSQStatis property: [(null)] - -����������1 - - - -��¼ʱ�䣺2016-11-07 10:30:40,660 -�߳�ID:[9] -��־���� ERROR -�����ࣺCyberpipe.FrmBSQStatis property: [(null)] - -����������0 - - - -��¼ʱ�䣺2016-11-07 14:00:27,070 -�߳�ID:[8] -��־���� ERROR -�����ࣺCyberpipe.Forms.FrmPipelineModelDB property: [(null)] - -����������δ�������������õ������ʵ���� - - - -��¼ʱ�䣺2016-11-07 14:00:36,154 -�߳�ID:[8] -��־���� ERROR -�����ࣺCyberpipe.Forms.FrmPipelineModelDB property: [(null)] - -����������δ�������������õ������ʵ���� - - - -��¼ʱ�䣺2016-11-07 14:00:40,186 -�߳�ID:[8] -��־���� ERROR -�����ࣺCyberpipe.Forms.FrmPipelineModelDB property: [(null)] - -����������δ�������������õ������ʵ���� - - - -��¼ʱ�䣺2016-11-07 14:05:46,422 -�߳�ID:[9] -��־���� ERROR -�����ࣺCyberpipe.Forms.FrmPipelineModelDB property: [(null)] - -����������δ�������������õ������ʵ���� - - - -��¼ʱ�䣺2016-11-07 14:06:34,633 -�߳�ID:[10] -��־���� ERROR -�����ࣺCyberpipe.Forms.FrmPipelineModelDB property: [(null)] - -����������δ�������������õ������ʵ���� - - - -��¼ʱ�䣺2016-11-07 14:06:36,301 -�߳�ID:[10] -��־���� ERROR -�����ࣺCyberpipe.Forms.FrmPipelineModelDB property: [(null)] - -����������δ�������������õ������ʵ���� - - - -��¼ʱ�䣺2016-11-07 14:06:44,800 -�߳�ID:[10] -��־���� ERROR -�����ࣺCyberpipe.Forms.FrmPipelineModelDB property: [(null)] - -����������δ�������������õ������ʵ���� - - - -��¼ʱ�䣺2016-11-07 14:07:03,449 -�߳�ID:[10] -��־���� ERROR -�����ࣺCyberpipe.Forms.FrmPipelineModelDB property: [(null)] - -����������δ�������������õ������ʵ���� - - - -��¼ʱ�䣺2016-11-07 14:07:05,165 -�߳�ID:[10] -��־���� ERROR -�����ࣺCyberpipe.Forms.FrmPipelineModelDB property: [(null)] - -����������δ�������������õ������ʵ���� - - - -��¼ʱ�䣺2016-11-07 17:58:24,384 -�߳�ID:[10] -��־���� ERROR -�����ࣺCyberpipe.Forms.FrmPipelineModelDB property: [(null)] - -����������δ�������������õ������ʵ���� - - - -��¼ʱ�䣺2016-11-07 18:11:22,114 -�߳�ID:[8] -��־���� ERROR -�����ࣺCyberpipe.Forms.FrmPipelineModelDB property: [(null)] - -����������δ�������������õ������ʵ���� - - - -��¼ʱ�䣺2016-11-07 18:12:13,619 -�߳�ID:[8] -��־���� ERROR -�����ࣺCyberpipe.Forms.FrmPipelineModelDB property: [(null)] - -����������δ�������������õ������ʵ���� - - - -��¼ʱ�䣺2016-11-07 18:12:33,268 -�߳�ID:[8] -��־���� ERROR -�����ࣺCyberpipe.Forms.FrmPipelineModelDB property: [(null)] - -����������δ�������������õ������ʵ���� - - - -��¼ʱ�䣺2016-11-07 18:12:43,628 -�߳�ID:[8] -��־���� ERROR -�����ࣺCyberpipe.Forms.FrmPipelineModelDB property: [(null)] - -����������δ�������������õ������ʵ���� - - - -��¼ʱ�䣺2016-11-07 18:12:53,488 -�߳�ID:[8] -��־���� ERROR -�����ࣺCyberpipe.Forms.FrmPipelineModelDB property: [(null)] - -����������δ�������������õ������ʵ���� - - - -��¼ʱ�䣺2016-11-07 18:13:31,996 -�߳�ID:[8] -��־���� ERROR -�����ࣺCyberpipe.Forms.FrmPipelineModelDB property: [(null)] - -����������δ�������������õ������ʵ���� - - - -��¼ʱ�䣺2016-11-07 18:16:05,234 -�߳�ID:[9] -��־���� ERROR -�����ࣺCyberpipe.Forms.FrmPipelineModelDB property: [(null)] - -����������δ�������������õ������ʵ���� - diff --git a/bin/x86/Debug/log/2016/201611/20161108.txt b/bin/x86/Debug/log/2016/201611/20161108.txt deleted file mode 100644 index b5c96c9..0000000 --- a/bin/x86/Debug/log/2016/201611/20161108.txt +++ /dev/null @@ -1,40 +0,0 @@ - - -��¼ʱ�䣺2016-11-08 09:53:20,836 -�߳�ID:[10] -��־���� ERROR -�����ࣺCyberpipe.Forms.FrmPipelineModelDB property: [(null)] - -����������δ�������������õ������ʵ���� - - - -��¼ʱ�䣺2016-11-08 09:53:49,986 -�߳�ID:[10] -��־���� ERROR -�����ࣺCyberpipe.Forms.FrmPipelineModelDB property: [(null)] - -����������δ�������������õ������ʵ���� - - - -��¼ʱ�䣺2016-11-08 09:54:25,364 -�߳�ID:[10] -��־���� ERROR -�����ࣺCyberpipe.Forms.FrmPipelineModelDB property: [(null)] - -����������δ�������������õ������ʵ���� - - - -��¼ʱ�䣺2016-11-08 10:33:09,418 -�߳�ID:[11] -��־���� ERROR -�����ࣺCyberpipe.Forms.FrmPipelineModelDB property: [(null)] - -����������δ�������������õ������ʵ���� - - - -��¼ʱ�䣺2016-11-08 10:38:53,638 -�߳�ID:[10] -��־���� ERROR -�����ࣺCyberpipe.Forms.FrmPipelineModelDB property: [(null)] - -����������δ�������������õ������ʵ���� - diff --git a/FeatureStatisticsService.cs b/FeatureStatisticsService.cs index 331ee47..b127fe3 100644 --- a/FeatureStatisticsService.cs +++ b/FeatureStatisticsService.cs @@ -190,7 +190,7 @@ List result = new List(); //layer.Name是表名 - string[] accessStrs = Utility.getAccStrsByLayer(layer.Name); + string[] accessStrs = FeatureTools.GetAccStrsByLayer(layer.Name); foreach (string accssname in accessStrs) { diff --git a/FeatureTools.cs b/FeatureTools.cs index be4b469..3c08f34 100644 --- a/FeatureTools.cs +++ b/FeatureTools.cs @@ -1,5 +1,6 @@ using System; using System.Collections.Generic; +using System.Data; using System.Linq; using System.Text; using System.Windows.Forms; @@ -43,7 +44,7 @@ } feature.Delete();//地球上删除该feature string sql = "delete from " + layerName + " where LSSYS_ID =" + feature.ID + " and (编号 is null or substr(编号,length(编号)-2)='TMP')"; - OledbHelper.sqlExecuteNonQuery(sql);//目前无法取到LSSYS_ID，所以这个判断条件不太合适，会导致把该类所有新建的都删除了 + OledbHelper.sqlExecuteNonQuery(sql); } catch (Exception) { @@ -106,5 +107,46 @@ } return value; } + + /// + /// 根据附属物图层名字得到里面含有的附属物 + /// + /// + /// + public static string[] GetAccStrsByLayer(string layername) + { + string[] accStrs = null; + string sql = "select 附属物名称 from " + layername + " group by 附属物名称"; + DataSet dataset = OledbHelper.getDataSet(sql, layername); + if (dataset == null) return null; + accStrs = new string[dataset.Tables[0].Rows.Count]; + for (int i = 0; i < dataset.Tables[0].Rows.Count; i++) + { + accStrs[i] = dataset.Tables[0].Rows[i][0].ToString(); + } + return accStrs; + } + + /// + /// 删除内存图层中指定名称的feature + /// + /// + /// + public static void RemoveFeatureFromName(GSOGlobeControl globeControl1, string featureName) + { + GSOFeatures features = globeControl1.Globe.MemoryLayer.GetFeatureByName(featureName, true); + if (features != null) + { + for (int i = features.Length - 1; i >= 0; i--) + { + GSOFeature feature = features[i]; + if (feature != null) + { + globeControl1.Globe.MemoryLayer.RemoveFeatureByID(feature.ID); + } + } + } + globeControl1.Refresh(); + } } } diff --git a/Forms/FrmPipelineModelDataBase.cs b/Forms/FrmPipelineModelDataBase.cs index b577fd8..bc1e479 100644 --- a/Forms/FrmPipelineModelDataBase.cs +++ b/Forms/FrmPipelineModelDataBase.cs @@ -149,7 +149,7 @@ catch (Exception ex) { LogError.PublishError(ex); - LogHelper.WriteLog(typeof(FrmPipelineModelDB), ex.Message); + LogHelper.Error(ex.Message); } } diff --git a/FrmAccessoriesSensor.cs b/FrmAccessoriesSensor.cs index 98aa1cf..542f19a 100644 --- a/FrmAccessoriesSensor.cs +++ b/FrmAccessoriesSensor.cs @@ -240,7 +240,7 @@ { if (clbPipeLine.CheckedItems.Count > 0) { - Utility.RemoveFeatureFromName(globeControl1, "trackPolygon"); + FeatureTools.RemoveFeatureFromName(globeControl1, "trackPolygon"); globeControl1.Globe.Action = EnumAction3D.TrackPolygon; globeControl1.TrackPolygonEndEvent += globeControl1_TrackPolygonEndEvent; } @@ -259,7 +259,7 @@ private void FrmAccessoriesgather_FormClosing(object sender, FormClosingEventArgs e) { frm = null; - Utility.RemoveFeatureFromName(globeControl1, "trackPolygon"); + FeatureTools.RemoveFeatureFromName(globeControl1, "trackPolygon"); globeControl1.Globe.Action = EnumAction3D.ActionNull; globeControl1.TrackPolygonEndEvent -= globeControl1_TrackPolygonEndEvent; } diff --git a/FrmAccessoriesgather.cs b/FrmAccessoriesgather.cs index e1d176e..c36273b 100644 --- a/FrmAccessoriesgather.cs +++ b/FrmAccessoriesgather.cs @@ -118,7 +118,7 @@ { if (clbPipeLine2.Text!="") { - Utility.RemoveFeatureFromName(globeControl1, "trackPolygon"); + FeatureTools.RemoveFeatureFromName(globeControl1, "trackPolygon"); globeControl1.Globe.Action = EnumAction3D.TrackPolygon; globeControl1.Globe.TrackPolygonTool.TrackMode = EnumTrackMode.SpaceTrack; globeControl1.TrackPolygonEndEvent += globeControl1_TrackPolygonEndEvent; @@ -295,7 +295,7 @@ private void FrmAccessoriesgather_FormClosing(object sender, FormClosingEventArgs e) { frm = null; - Utility.RemoveFeatureFromName(globeControl1, "trackPolygon"); + FeatureTools.RemoveFeatureFromName(globeControl1, "trackPolygon"); globeControl1.TrackPolygonEndEvent -= globeControl1_TrackPolygonEndEvent; globeControl1.Globe.Action = EnumAction3D.ActionNull; diff --git a/FrmAddWellShp.cs b/FrmAddWellShp.cs index 7983349..78d8946 100644 --- a/FrmAddWellShp.cs +++ b/FrmAddWellShp.cs @@ -100,7 +100,7 @@ catch (Exception ex) { LogError.PublishError(ex); - LogHelper.WriteLog(typeof(FrmAddWellShp), ex.Message); + LogHelper.Error(ex.Message); } } diff --git a/FrmBSQStatis.cs b/FrmBSQStatis.cs index 5b05926..b5e581d 100644 --- a/FrmBSQStatis.cs +++ b/FrmBSQStatis.cs @@ -97,7 +97,7 @@ } catch (Exception ex) { - LogHelper.WriteLog(typeof(FrmBSQStatis),ex.Message); + LogHelper.Error(ex.Message); } return typeAndCount; } @@ -108,7 +108,7 @@ GSOLayer layer = globeControl1.Globe.Layers.GetLayerByCaption("标识器"); GSOFeatures bsqFs = FeatureStatisticsService.GetLayerFeatures(polygon, layer); if (bsqFs == null || bsqFs.Length <= 0) { - LogHelper.WriteLog(typeof(FrmBSQStatis),"标识器图层下的Feature为空"); + LogHelper.Error("标识器图层下的Feature为空!"); return null; } diff --git a/FrmBasicQuery.cs b/FrmBasicQuery.cs index baeeade..cc8d3ff 100644 --- a/FrmBasicQuery.cs +++ b/FrmBasicQuery.cs @@ -224,7 +224,7 @@ } catch(Exception ex) { - LogHelper.WriteLog(typeof(FrmBasicQuery), ex.Message); + LogHelper.Error(ex.Message); } } else diff --git a/FrmCodingQuery.cs b/FrmCodingQuery.cs index f1ac322..d4ec095 100644 --- a/FrmCodingQuery.cs +++ b/FrmCodingQuery.cs @@ -82,7 +82,7 @@ } catch (Exception ex) { - LogHelper.WriteLog(typeof(FrmCodingQuery), ex.Message); ; + LogHelper.Error(ex.Message); } } diff --git a/FrmDiameterQuery.cs b/FrmDiameterQuery.cs index e7b3657..75d7949 100644 --- a/FrmDiameterQuery.cs +++ b/FrmDiameterQuery.cs @@ -150,7 +150,7 @@ catch (Exception ex) { //LogError.PublishError(ex); - LogHelper.WriteLog(typeof(FrmDiameterQuery), ex.Message); + LogHelper.Error(ex.Message); MessageBox.Show("请输入正确的管径范围！"); return; } diff --git a/FrmFittingQuery.cs b/FrmFittingQuery.cs index 12f6007..8645011 100644 --- a/FrmFittingQuery.cs +++ b/FrmFittingQuery.cs @@ -69,7 +69,7 @@ } catch (Exception ex) { - LogHelper.WriteLog(typeof(FrmFittingQuery), ex.Message); + LogHelper.Error(ex.Message); } } /// diff --git a/FrmKeywordQuery.cs b/FrmKeywordQuery.cs index 405524f..ede0a93 100644 --- a/FrmKeywordQuery.cs +++ b/FrmKeywordQuery.cs @@ -87,7 +87,7 @@ } catch (Exception ex) { - LogHelper.WriteLog(typeof(FrmKeywordQuery), ex.Message); + LogHelper.Error(ex.Message); } } diff --git a/FrmLogin.cs b/FrmLogin.cs index 1172c23..6fbaed9 100644 --- a/FrmLogin.cs +++ b/FrmLogin.cs @@ -2,6 +2,8 @@ using System.Data; using System.Data.OracleClient; using System.IO; +using System.Net; +using System.Text; using System.Windows.Forms; using System.Xml; using DevComponents.DotNetBar; @@ -10,16 +12,15 @@ { public partial class FrmLogin : Office2007Form { + + //登录界面 -- 配置文件的路径 + public static string filename = Application.StartupPath + "\\login.xml"; + + public FrmLogin() { InitializeComponent(); } - public string rolename = "浏览"; - public string username = ""; - public string department = ""; - - //登录界面 -- 配置文件的路径 - public static string filename = Application.StartupPath + "\\login.xml"; /// /// 登录按钮事件处理 /// @@ -28,9 +29,10 @@ private void button1_Click(object sender, EventArgs e) { bool result = ValidateUser(); +// bool result =ValidateFromUrl();//从平台获取用户角色信息，判断是否能登陆成功 if (result) { - username = txtUser.Text.Trim(); + WriteXml(); Utility.userName = txtUser.Text.Trim(); DialogResult = DialogResult.OK; Close(); @@ -43,80 +45,6 @@ } } /// - /// 关闭按钮事件处理 - /// - /// - /// - private void button2_Click(object sender, EventArgs e) - { - Close(); - } - /// - /// 验证端口号 - /// - /// - //private bool ValiPort() - //{ - // Ping p = new Ping();//创建Ping对象p - // PingReply pr = p.Send(Utility.localicenseserverip);//向指定IP或者主机名的计算机发送ICMP协议的ping数据包 - // if (pr.Status == IPStatus.Success)//如果ping成功 - // { - // try - // { - // TcpClient tcpc = new TcpClient(Utility.localicenseserverip, Utility.localicenseserverport);//对IP地址为"192.168.0.105"的计算机的1500端口提出连接申请 - // tcpc.Close(); - // return true; - // } - // catch (Exception ex) - // { - // LogError.PublishError(ex); - // MessageBox.Show("端口连接错误！" + ex.Message); - // return false; - // } - // } - // else - // { - // int times = 0;//重新连接次数; - // int count = 2;//设置尝试次数 - // while (times < count) - // { - // //Thread.Sleep(1000);//等待时间(方便测试的话，你可以改为1000) - // pr = p.Send(Utility.localicenseserverip); - - // if (pr.Status == IPStatus.Success) - // { - // try - // { - // TcpClient tcpc = new TcpClient(Utility.localicenseserverip, Utility.localicenseserverport);//对IP地址为"192.168.0.105"的计算机的1500端口提出连接申请 - // tcpc.Close(); - // return true; - // } - // catch (Exception ex) - // { - // LogError.PublishError(ex); - // MessageBox.Show("端口连接错误！" + ex.Message); - // return false; - // } - // } - // else - // { - // times++; - // if (times < count) - // { - // continue; - // } - // else - // { - // MessageBox.Show("重新尝试连接失败"); - // return false; - // } - // } - - // } - // return false; - // } - //} - /// /// 验证用户名、密码 /// /// @@ -126,24 +54,64 @@ string sql = "select * from casic_userinfotest where USERNAME='" + txtUser.Text.Trim() + "' and PASSWORD='" + passWord + "' and sysname='GHFX' "; DataTable dt = OledbHelper.QueryTable(sql); - if (dt != null && dt.Rows.Count > 0) + if (dt == null || dt.Rows.Count <= 0) return false; + if (String.IsNullOrEmpty(dt.Rows[0]["rid"].ToString())) return true; + sql = "select gid from casic_userroletest where id=" + dt.Rows[0]["rid"] + " and sysname='GHFX' "; + using (OracleDataReader reader = OracleUtils.ExecuteReader(OracleUtils.ConnectionString, CommandType.Text, sql)) { - WriteXML(); - if (!String.IsNullOrEmpty(dt.Rows[0]["rid"].ToString())) + while (reader.Read()) { - sql = "select gid from casic_userroletest where id=" + dt.Rows[0]["rid"] + " and sysname='GHFX' "; - using (OracleDataReader reader = OracleUtils.ExecuteReader(OracleUtils.ConnectionString, CommandType.Text, sql)) - { - while (reader.Read()) - { - Utility.userRole = reader[0].ToString(); - break; - } - } + Utility.userRole = reader[0].ToString(); + LogHelper.Debug("测试一下"); + break; } - return true; } - return false; + return true; + } + + + + private bool ValidateFromUrl() + { + string user = txtUser.Text.Trim(); + string pwd = textBoxPassWord.Text.Trim(); + //做成配置的 + string roleserver = Utility.RoleServer; + if (roleserver == null || roleserver.Trim().Equals("")) + { + MessageBox.Show("请在Config.xml中配置roleurl！"); + return false; + } + HttpWebRequest request = + WebRequest.Create(roleserver+"/rs/authority/user?username=" + user + "&password=" + pwd + "&appId=21") as HttpWebRequest; + if (request == null) return false; + using (HttpWebResponse response = request.GetResponse() as HttpWebResponse) + { + try + { + if (response == null || response.GetResponseStream() == null) return false; + StreamReader reader = new StreamReader(response.GetResponseStream()); + string[] result = reader.ReadToEnd().Split(','); + //解析result + if (result.Length < 5) return false; + StringBuilder userRole = new StringBuilder(""); + for (int i = 4; i < result.Length; i++) + { + string[] tmpStrings = result[i].Split('_'); + if (tmpStrings.Length < 2) continue; + userRole.Append(tmpStrings[1].Trim() + ","); + } + if (userRole.Length < 3) return false; + userRole.Remove(userRole.Length - 3, 3); + // MessageBox.Show(userRole.ToString()); + Utility.userRole = userRole.ToString(); + return Utility.userRole != null && !Utility.userRole.Equals("null"); + } + catch (Exception e) + { + return false; + } + } } private void FrmLogin_Load(object sender, EventArgs e) @@ -153,74 +121,56 @@ StartPosition = FormStartPosition.CenterScreen; - ReadXML(); + ReadXml(); } /// /// 读取上一次登录的用户名和密码 /// - private void ReadXML() + private void ReadXml() { - if (File.Exists(filename)) + if (!File.Exists(filename)) return; + //初始化XML文档操作类 + XmlDocument myDoc = new XmlDocument(); { - if (!File.Exists(filename)) + //加载XML文件 + try { + myDoc.Load(filename); + } + catch (Exception e) + { + LogError.PublishError(e); return; } - - //初始化XML文档操作类 - XmlDocument myDoc = new XmlDocument(); + //搜索指定的节点 + XmlNode serverRootNode = myDoc.SelectSingleNode("Params"); + XmlNodeList nodes = null; + if (serverRootNode != null) { - //加载XML文件 - try + nodes = serverRootNode.ChildNodes; + } + if (nodes == null) return; + foreach (XmlNode xn in nodes) + { + if (xn.Name.Equals("username")) { - myDoc.Load(filename); + txtUser.Text = xn.InnerText.Trim(); } - catch (Exception e) + else if (xn.Name.Equals("password")) { - LogError.PublishError(e); - return; + textBoxPassWord.Text = xn.InnerText.Trim(); } - //搜索指定的节点 - XmlNode serverRootNode = myDoc.SelectSingleNode("Params"); - XmlNodeList nodes = null; - if (serverRootNode != null) + else if (xn.Name.Equals("isremember")) { - nodes = serverRootNode.ChildNodes; - } - if (nodes != null) - { - foreach (XmlNode xn in nodes) - { - if (xn.Name == "username") - { - txtUser.Text = xn.InnerText.Trim(); - } - else if (xn.Name == "password") - { - textBoxPassWord.Text = xn.InnerText.Trim(); - } - else if (xn.Name == "isremember") - { - if (xn.InnerText.Trim() == "true") - { - checkBoxXRememberPassword.Checked = true; - } - else if (xn.InnerText.Trim() == "false") - { - checkBoxXRememberPassword.Checked = false; - } - } - } - + checkBoxXRememberPassword.Checked = xn.InnerText.Trim().Equals("true"); } } } - } /// /// 记录登录的用户名和密码 /// - private void WriteXML() + private void WriteXml() { if (!File.Exists(filename)) { @@ -252,31 +202,17 @@ foreach (XmlNode xn in nodes) { XmlElement xe = (XmlElement)xn; - if (xe.Name == "username") + if (xe.Name.Equals("username")) { xe.InnerText = txtUser.Text.Trim(); } - else if (xe.Name == "password") + else if (xe.Name.Equals("password")) { - if (checkBoxXRememberPassword.Checked) - { - xe.InnerText = textBoxPassWord.Text.Trim(); - } - else - { - xe.InnerText = ""; - } + xe.InnerText = checkBoxXRememberPassword.Checked ? textBoxPassWord.Text.Trim() : ""; } - else if (xe.Name == "isremember") + else if (xe.Name.Equals("isremember")) { - if (checkBoxXRememberPassword.Checked) - { - xe.InnerText = "true"; - } - else - { - xe.InnerText = "false"; - } + xe.InnerText = checkBoxXRememberPassword.Checked ? "true" : "false"; } } } diff --git a/FrmMaterialSel.cs b/FrmMaterialSel.cs index 8645ab3..d23f385 100644 --- a/FrmMaterialSel.cs +++ b/FrmMaterialSel.cs @@ -157,7 +157,7 @@ } catch (Exception ex) { - LogHelper.WriteLog(typeof(FrmMaterialSel), ex.Message); + LogHelper.Error(ex.Message); } } diff --git a/FrmMetadataStat.cs b/FrmMetadataStat.cs index c3c1359..96029a6 100644 --- a/FrmMetadataStat.cs +++ b/FrmMetadataStat.cs @@ -96,7 +96,7 @@ //统计有多少个图层 private int statistLayer() { - List datasrcs = Utility.layerConfig.datasrcs; + List datasrcs = Utility.LayerConfig.datasrcs; return datasrcs.SelectMany(datasrc => datasrc.layertypes).Sum(layerType => layerType.layers.Count); } diff --git a/FrmpipeDeepstatis.cs b/FrmpipeDeepstatis.cs index 6a5c895..8d915a9 100644 --- a/FrmpipeDeepstatis.cs +++ b/FrmpipeDeepstatis.cs @@ -2,6 +2,7 @@ using System.Collections.Generic; using System.Diagnostics; using System.IO; +using System.Reflection; using System.Text; using System.Windows.Forms; using System.Windows.Forms.DataVisualization.Charting; @@ -320,7 +321,7 @@ MessageBox.Show("请添加分段"); return; } - Utility.RemoveFeatureFromName(globeControl1, "trackPolygon"); + FeatureTools.RemoveFeatureFromName(globeControl1, "trackPolygon"); globeControl1.Globe.Action = EnumAction3D.TrackPolygon; globeControl1.Globe.TrackPolygonTool.TrackMode = EnumTrackMode.SpaceTrack; globeControl1.TrackPolygonEndEvent += globeControl1_TrackPolygonEndEvent; @@ -408,12 +409,11 @@ TextBox control; private void dataGridViewX2_EditingControlShowing(object sender, DataGridViewEditingControlShowingEventArgs e) { - if (e.Control.GetType().BaseType.Name == "TextBox") - { - control = new TextBox(); - control = (TextBox)e.Control; - control.KeyPress += control_KeyPress; - } + MemberInfo memberInfo = e.Control.GetType().BaseType; + if (memberInfo != null && !memberInfo.Name.Equals("TextBox")) return; + control = new TextBox(); + control = (TextBox)e.Control; + control.KeyPress += control_KeyPress; } /// /// 键盘按键按下事件处理 @@ -423,28 +423,24 @@ void control_KeyPress(object sender, KeyPressEventArgs e) { TextBox text = sender as TextBox; + if (text == null) return; if ((e.KeyChar < 48 || e.KeyChar > 57) && (e.KeyChar != 8) && e.KeyChar != 46) { e.Handled = true; } - if (e.KeyChar == 46) //小数点 + if (e.KeyChar != 46) return; + if (text.Text.Length <= 0) + e.Handled = true; //小数点不能在第一位 + else //处理不规则的小数点 { - if (text.Text.Length <= 0) - e.Handled = true; //小数点不能在第一位 - else //处理不规则的小数点 + float f; + float oldf; + bool b1 = false, b2 = false; + b1 = float.TryParse(text.Text, out oldf); + b2 = float.TryParse(text.Text + e.KeyChar, out f); + if (!b2) { - float f; - float oldf; - bool b1 = false, b2 = false; - b1 = float.TryParse(text.Text, out oldf); - b2 = float.TryParse(text.Text + e.KeyChar, out f); - if (b2 == false) - { - if (b1) - e.Handled = true; - else - e.Handled = false; - } + e.Handled = b1; } } } @@ -457,7 +453,7 @@ { frm = null; - Utility.RemoveFeatureFromName(globeControl1, "trackPolygon"); + FeatureTools.RemoveFeatureFromName(globeControl1, "trackPolygon"); globeControl1.TrackPolygonEndEvent -= globeControl1_TrackPolygonEndEvent; globeControl1.Globe.Action = EnumAction3D.ActionNull; diff --git a/FrmpipeDiametergather.cs b/FrmpipeDiametergather.cs index a9d96fa..c09aaf1 100644 --- a/FrmpipeDiametergather.cs +++ b/FrmpipeDiametergather.cs @@ -154,7 +154,7 @@ MessageBox.Show("请选择图层！"); return; } - Utility.RemoveFeatureFromName(globeControl1, "trackPolygon"); + FeatureTools.RemoveFeatureFromName(globeControl1, "trackPolygon"); globeControl1.Globe.Action = EnumAction3D.TrackPolygon; globeControl1.Globe.TrackPolygonTool.TrackMode = EnumTrackMode.SpaceTrack; globeControl1.TrackPolygonEndEvent += globeControl1_TrackPolygonEndEvent; @@ -392,7 +392,7 @@ private void FrmpipeDiametergather_FormClosing(object sender, FormClosingEventArgs e) { frm = null; - Utility.RemoveFeatureFromName(globeControl1, "trackPolygon"); + FeatureTools.RemoveFeatureFromName(globeControl1, "trackPolygon"); globeControl1.TrackPolygonEndEvent -= globeControl1_TrackPolygonEndEvent; globeControl1.Globe.Action = EnumAction3D.ActionNull; diff --git a/FrmpipeMaterialGather.cs b/FrmpipeMaterialGather.cs index 44e7f24..5ca8144 100644 --- a/FrmpipeMaterialGather.cs +++ b/FrmpipeMaterialGather.cs @@ -58,10 +58,9 @@ for (int i = 0; i < pipeLayerNames.Count; i++) { clbPipeLine.Items.Add(pipeLayerNames[i]); - GSOLayer layer = globeControl1.Globe.Layers.GetLayerByCaption(pipeLayerNames[i]); - if (layer.Dataset == null || !layer.Dataset.IsFeatureDataset || layer.Type != EnumLayerType.FeatureLayer) continue; + GSOLayer layer = globeControl1.Globe.Layers.GetLayerByCaption(pipeLayerNames[i]); + if (layer == null || layer.Dataset == null || !layer.Dataset.IsFeatureDataset || layer.Type != EnumLayerType.FeatureLayer) continue; - string name = layer.Name; GSOFeatureLayer flayer = layer as GSOFeatureLayer; GSOFeatures feats = flayer.GetAllFeatures(); @@ -205,7 +204,7 @@ { chart1.Series.Add(clbPipeLine.CheckedItems[i].ToString()); GSOLayer layer = globeControl1.Globe.Layers.GetLayerByCaption(clbPipeLine.CheckedItems[i].ToString()); - if (layer != null && layer is GSOFeatureLayer) + if (layer is GSOFeatureLayer) { GSOFeatureLayer flayer = layer as GSOFeatureLayer; GSOFeatures features = flayer.GetAllFeatures(); @@ -240,10 +239,9 @@ labeStyleAxisX.Enabled = true; chart1.ChartAreas["ChartArea1"].AxisX.LabelStyle = labeStyleAxisX; - Dictionary dic1 = new Dictionary(); for (int j = 0; j < chart1.Series.Count; j++) { - dic1 = new Dictionary(); + Dictionary dic1 = new Dictionary(); foreach (string key in dic.Keys) { if (key.Contains(chart1.Series[j].Name)) @@ -304,7 +302,7 @@ MessageBox.Show("请选择材质类型！"); return; } - Utility.RemoveFeatureFromName(globeControl1, "trackPolygon"); + FeatureTools.RemoveFeatureFromName(globeControl1, "trackPolygon"); globeControl1.Globe.Action = EnumAction3D.TrackPolygon; globeControl1.Globe.TrackPolygonTool.TrackMode = EnumTrackMode.SpaceTrack; globeControl1.TrackPolygonEndEvent += globeControl1_TrackPolygonEndEvent; @@ -318,7 +316,7 @@ private void FrmpipeMaterialGather_FormClosing(object sender, FormClosingEventArgs e) { frm = null; - Utility.RemoveFeatureFromName(globeControl1, "trackPolygon"); + FeatureTools.RemoveFeatureFromName(globeControl1, "trackPolygon"); globeControl1.TrackPolygonEndEvent -= globeControl1_TrackPolygonEndEvent; globeControl1.Globe.Action = EnumAction3D.ActionNull; diff --git a/Frmpipediameterstatis.cs b/Frmpipediameterstatis.cs index 4fb25a8..631a996 100644 --- a/Frmpipediameterstatis.cs +++ b/Frmpipediameterstatis.cs @@ -202,8 +202,8 @@ } catch (Exception ex) { - LogHelper.WriteLog(typeof(Frmpipediameterstatis), ex.Message); //MessageBox.Show(ex.Message); + LogHelper.Error(ex.Message); LogError.PublishError(ex); } } @@ -372,7 +372,7 @@ MessageBox.Show("请添加分段！"); return; } - Utility.RemoveFeatureFromName(globeControl1, "trackPolygon"); + FeatureTools.RemoveFeatureFromName(globeControl1, "trackPolygon"); globeControl1.Globe.Action = EnumAction3D.TrackPolygon; globeControl1.Globe.TrackPolygonTool.TrackMode = EnumTrackMode.SpaceTrack; globeControl1.TrackPolygonEndEvent += globeControl1_TrackPolygonEndEvent; @@ -422,7 +422,7 @@ globeControl1.Globe.Action = EnumAction3D.ActionNull; globeControl1.TrackPolygonEndEvent -= globeControl1_TrackPolygonEndEvent; - Utility.RemoveFeatureFromName(globeControl1, "trackPolygon"); + FeatureTools.RemoveFeatureFromName(globeControl1, "trackPolygon"); globeControl1.Globe.MemoryLayer.RemoveAllFeature(); } diff --git a/LineBuilder.cs b/LineBuilder.cs index 33a216c..b6a8516 100644 --- a/LineBuilder.cs +++ b/LineBuilder.cs @@ -43,8 +43,8 @@ GSOGeoPolyline3D lineeee = f.Geometry as GSOGeoPolyline3D; if (lineeee == null || lineeee.GetSpaceLength(true, 6378137) == 0) { - LogHelper.WriteLog(typeof(LineBuilder), "出现数据无法入库:"+f.ID); - continue; //TODO LIST:判断是否会出现部署数据无法入库情况,Log2Net + LogHelper.Error("出现数据无法入库:" + f.ID); + continue; } GSOFeature newFeature = newFeatureSet.CreateFeature(); diff --git a/LogHelper.cs b/LogHelper.cs index 9ef5f27..04573cf 100644 --- a/LogHelper.cs +++ b/LogHelper.cs @@ -1,4 +1,5 @@ using System; +using System.Diagnostics; using log4net; using log4net.Config; @@ -7,35 +8,82 @@ { public class LogHelper { - /// - /// 输出日志到Log4Net - /// - /// - /// - #region static void WriteLog(Type t, Exception ex) - public static void WriteLog(Type t, Exception ex) + private static ILog _logdebug = log4net.LogManager.GetLogger("logdebug"); + private static ILog _loginfo = log4net.LogManager.GetLogger("loginfo"); + private static ILog _logwarn = log4net.LogManager.GetLogger("logwarn"); + private static ILog _logerror = log4net.LogManager.GetLogger("logerror"); + private static ILog _logfatal = log4net.LogManager.GetLogger("logfatal"); + + public static void Debug(string msg) { - ILog log = log4net.LogManager.GetLogger(t); - log.Error("Error", ex); + StackFrame sf = new StackFrame(1); + msg = string.Format("{0}.{1}:{2}", sf.GetMethod().ReflectedType.FullName, sf.GetMethod().Name, msg); + _logdebug.Debug(msg); + } + public static void Debug(string msg, Exception e) + { + StackFrame sf = new StackFrame(1); + msg = string.Format("{0}.{1}:{2}", sf.GetMethod().ReflectedType.FullName, sf.GetMethod().Name, msg); + _logdebug.Debug(msg, e); } - #endregion - /// - /// 输出日志到Log4Net - /// - /// - /// - #region static void WriteLog(Type t, string msg) - - public static void WriteLog(Type t, string msg) + public static void Info(string msg) { - ILog log = log4net.LogManager.GetLogger(t); - log.Error(msg); + StackFrame sf = new StackFrame(1); + msg = string.Format("{0}.{1}:{2}", sf.GetMethod().ReflectedType.FullName, sf.GetMethod().Name, msg); + _loginfo.Info(msg); + } + public static void Info(string msg, Exception e) + { + StackFrame sf = new StackFrame(1); + msg = string.Format("{0}.{1}:{2}", sf.GetMethod().ReflectedType.FullName, sf.GetMethod().Name, msg); + _loginfo.Info(msg, e); } - #endregion + + public static void Warn(string msg) + { + StackFrame sf = new StackFrame(1); + msg = string.Format("{0}.{1}:{2}", sf.GetMethod().ReflectedType.FullName, sf.GetMethod().Name, msg); + _logwarn.Warn(msg); + } + public static void Warn(string msg, Exception e) + { + StackFrame sf = new StackFrame(1); + msg = string.Format("{0}.{1}:{2}", sf.GetMethod().ReflectedType.FullName, sf.GetMethod().Name, msg); + _logwarn.Warn(msg, e); + } + + + public static void Error(string msg) + { + StackFrame sf = new StackFrame(1); + msg = string.Format("{0}.{1}:{2}", sf.GetMethod().ReflectedType.FullName, sf.GetMethod().Name, msg); + _logerror.Error(msg); + } + public static void Error(string msg, Exception e) + { + StackFrame sf = new StackFrame(1); + msg = string.Format("{0}.{1}:{2}", sf.GetMethod().ReflectedType.FullName, sf.GetMethod().Name, msg); + _logerror.Error(msg, e); + } + + + public static void Fatal(string msg) + { + StackFrame sf = new StackFrame(1); + msg = string.Format("{0}.{1}:{2}", sf.GetMethod().ReflectedType.FullName, sf.GetMethod().Name, msg); + _logfatal.Fatal(msg); + } + public static void Fatal(string msg, Exception e) + { + StackFrame sf = new StackFrame(1); + msg = string.Format("{0}.{1}:{2}", sf.GetMethod().ReflectedType.FullName, sf.GetMethod().Name, msg); + _logfatal.Fatal(msg, e); + } + } diff --git a/MainFrm.cs b/MainFrm.cs index 43de664..51f362a 100644 --- a/MainFrm.cs +++ b/MainFrm.cs @@ -18,7 +18,6 @@ using GeoScene.Data; using GeoScene.Engine; using GeoScene.Globe; -using Timer = System.Windows.Forms.Timer; using ToolTip = System.Windows.Forms.ToolTip; namespace Cyberpipe @@ -163,6 +162,7 @@ /// private void AddGZ() { + lendendGZ50 = new GSOHudButton(); lendendGZ50.SetImage(Application.StartupPath + "/Resource/管纵/50.png"); lendendGZ50.SetOffset(0, 0); @@ -1294,18 +1294,19 @@ private void MainFrm_Load(object sender, EventArgs e) { + layerTree.Nodes.Add("正在加载，请稍后……");//树状图加载在图层加载之后，故增加提示 initGlobalControl(); - //initGlobalMap(); - //initLayerTree(); initMarkerTree(); initLayout(); loadData(); - double x = Convert.ToDouble(Utility.Query_Roads["定位"].ToString().Split(',')[0]); - double y = Convert.ToDouble(Utility.Query_Roads["定位"].ToString().Split(',')[1]); - double z = Convert.ToDouble(Utility.Query_Roads["定位"].ToString().Split(',')[2]); + + double x = Convert.ToDouble(Utility.Query_Roads["绿岛"].ToString().Split(',')[0]); + double y = Convert.ToDouble(Utility.Query_Roads["绿岛"].ToString().Split(',')[1]); + double z = Convert.ToDouble(Utility.Query_Roads["绿岛"].ToString().Split(',')[2]); jumpToCameraState(x, y, z); + } #endregion @@ -1315,11 +1316,17 @@ if (e.Layer == null || !e.Layer.Caption.Equals(Utility.roadLayerName)) return; foreach (TreeNode layerTreeNode in layerTree.Nodes) { - foreach (TreeNode node in layerTreeNode.Nodes) + for (int i=0;i dt, DataGridView dataGridView) @@ -7330,7 +7337,7 @@ } catch (Exception ex) { - LogHelper.WriteLog(typeof(MainFrm), ex); + LogHelper.Debug("", ex); } } } @@ -7362,7 +7369,7 @@ GSOLayer layer = globeControl1.Globe.Layers.Add(strDataPath); if (layer == null) {//wxl - LogHelper.WriteLog(typeof(MainFrm), "buttonItemHX1_Click操作中，" + strDataPath + "的layer为空"); + LogHelper.Error("buttonItemHX1_Click操作中，" + strDataPath + "的layer为空"); continue; } GSOFeatures redFeatures = layer.GetAllFeatures(); @@ -7457,17 +7464,12 @@ { try { + globeControl1.BeforeSceneRenderEvent -= globeControl1_BeforeSceneRenderEvent; globeControl2.BeforeSceneRenderEvent -= globeControl2_BeforeSceneRenderEvent; - double x = Convert.ToDouble(Utility.Query_Roads["定位"].ToString().Split(',')[0]); - double y = Convert.ToDouble(Utility.Query_Roads["定位"].ToString().Split(',')[1]); - double z = Convert.ToDouble(Utility.Query_Roads["定位"].ToString().Split(',')[2]); - jumpToCameraState(x, y, z); - /* globeControl1.Globe.FlyToPosition(new GSOPoint3d(120.610963, 31.188121, 50), EnumAltitudeMode.Absolute, -4, 50, 800); globeControl1.Globe.FlyToPointSpeed = 10000000; - * */ globeControl1.Globe.Action = EnumAction3D.SelectObject; globeControl1.Refresh(); @@ -7489,6 +7491,37 @@ } } /// + /// 基础工具 + /// + /// + /// + private void ribbonTabItem1_MouseDown(object sender, MouseEventArgs e) + { + try + { + + globeControl1.BeforeSceneRenderEvent -= globeControl1_BeforeSceneRenderEvent; + globeControl2.BeforeSceneRenderEvent -= globeControl2_BeforeSceneRenderEvent; + + globeControl1.Globe.Action = EnumAction3D.ActionNull; + dataGridViewX1.AutoSizeColumnsMode = DataGridViewAutoSizeColumnsMode.AllCells; + //zhanshi = false; + redSH = false; + splitContainer1.Panel2Collapsed = true; + panelOfTable.Visible = false; + legendSC.Visible = false; + legendSG.Visible = false; + ClearGZData(); + GSOLayer redLayer = globeControl1.Globe.Layers.GetLayerByCaption("红线"); + if (redLayer == null) return; + redLayer.Visible = false; + } + catch (Exception ex) + { + //MessageBox.Show("系统运行错误:" + ex.ToString(), "错误", MessageBoxButtons.OK, MessageBoxIcon.Error); + } + } + /// /// 一键审核 /// /// @@ -7497,6 +7530,7 @@ { try { + globeControl1.BeforeSceneRenderEvent -= globeControl1_BeforeSceneRenderEvent; globeControl2.BeforeSceneRenderEvent -= globeControl2_BeforeSceneRenderEvent; @@ -7518,32 +7552,7 @@ //MessageBox.Show("系统运行错误:" + ex.ToString(), "错误", MessageBoxButtons.OK, MessageBoxIcon.Error); } } - - void ResetRibbonTab() - { - try - { - globeControl1.BeforeSceneRenderEvent -= globeControl1_BeforeSceneRenderEvent; - globeControl2.BeforeSceneRenderEvent -= globeControl2_BeforeSceneRenderEvent; - - globeControl1.Globe.Action = EnumAction3D.ActionNull; - dataGridViewX1.AutoSizeColumnsMode = DataGridViewAutoSizeColumnsMode.AllCells; - //zhanshi = false; - redSH = false; - splitContainer1.Panel2Collapsed = true; - panelOfTable.Visible = false; - legendSC.Visible = false; - legendSG.Visible = false; - ClearGZData(); - GSOLayer redLayer = globeControl1.Globe.Layers.GetLayerByCaption("红线"); - if (redLayer == null) return; - redLayer.Visible = false; - } - catch (Exception ex) - { - LogHelper.WriteLog(typeof(MainFrm), ex); - } - } + /// /// 双屏对比 /// @@ -7553,8 +7562,8 @@ { try { - globeControl1.BeforeSceneRenderEvent += new BeforeSceneRenderEventHandler(globeControl1_BeforeSceneRenderEvent); - globeControl2.BeforeSceneRenderEvent += new BeforeSceneRenderEventHandler(globeControl2_BeforeSceneRenderEvent); + globeControl1.BeforeSceneRenderEvent += globeControl1_BeforeSceneRenderEvent; + globeControl2.BeforeSceneRenderEvent += globeControl2_BeforeSceneRenderEvent; globeControl1.Globe.Action = EnumAction3D.ActionNull; panelOfTable.Visible = false; @@ -7570,32 +7579,43 @@ GSOLayer redLayer = globeControl1.Globe.Layers.GetLayerByCaption("红线"); if (redLayer != null) - { redLayer.Visible = false; - } } catch (Exception ex) { - LogHelper.WriteLog(typeof(MainFrm), ex); + //MessageBox.Show("系统运行错误:" + ex.ToString(), "错误", MessageBoxButtons.OK, MessageBoxIcon.Error); } } /// - /// 基础工具 - /// - /// - /// - private void ribbonTabItem1_MouseDown(object sender, MouseEventArgs e) - { - ResetRibbonTab(); - } - /// /// 文档管理 /// /// /// private void ribbonTabItem4_MouseDown(object sender, MouseEventArgs e) { - ResetRibbonTab(); + try + { + + globeControl1.BeforeSceneRenderEvent -= globeControl1_BeforeSceneRenderEvent; + globeControl2.BeforeSceneRenderEvent -= globeControl2_BeforeSceneRenderEvent; + + globeControl1.Globe.Action = EnumAction3D.ActionNull; + panelOfTable.Visible = false; + //zhanshi = false; + redSH = false; + splitContainer1.Panel2Collapsed = true; + dataGridViewX1.AutoSizeColumnsMode = DataGridViewAutoSizeColumnsMode.AllCells; + legendSC.Visible = false; + legendSG.Visible = false; + ClearGZData(); + GSOLayer redLayer = globeControl1.Globe.Layers.GetLayerByCaption("红线"); + if (redLayer != null) + redLayer.Visible = false; + } + catch (Exception ex) + { + //MessageBox.Show("系统运行错误:" + ex.ToString(), "错误", MessageBoxButtons.OK, MessageBoxIcon.Error); + } } /// /// 基础管理 @@ -7604,7 +7624,29 @@ /// private void ribbonTabItem14_MouseDown(object sender, MouseEventArgs e) { - ResetRibbonTab(); + try + { + globeControl1.BeforeSceneRenderEvent -= globeControl1_BeforeSceneRenderEvent; + globeControl2.BeforeSceneRenderEvent -= globeControl2_BeforeSceneRenderEvent; + + globeControl1.Globe.Action = EnumAction3D.ActionNull; + panelOfTable.Visible = false; + //zhanshi = false; + redSH = false; + splitContainer1.Panel2Collapsed = true; + dataGridViewX1.AutoSizeColumnsMode = DataGridViewAutoSizeColumnsMode.AllCells; + legendSC.Visible = false; + legendSG.Visible = false; + ClearGZData(); + + GSOLayer redLayer = globeControl1.Globe.Layers.GetLayerByCaption("红线"); + if (redLayer != null) + redLayer.Visible = false; + } + catch (Exception ex) + { + //MessageBox.Show("系统运行错误:" + ex.ToString(), "错误", MessageBoxButtons.OK, MessageBoxIcon.Error); + } } /// /// 权限管理 @@ -7613,26 +7655,31 @@ /// private void ribbonTabItem2_MouseDown(object sender, MouseEventArgs e) { - ResetRibbonTab(); + try + { + globeControl1.BeforeSceneRenderEvent -= globeControl1_BeforeSceneRenderEvent; + globeControl2.BeforeSceneRenderEvent -= globeControl2_BeforeSceneRenderEvent; + + globeControl1.Globe.Action = EnumAction3D.ActionNull; + panelOfTable.Visible = false; + //zhanshi = false; + redSH = false; + splitContainer1.Panel2Collapsed = true; + dataGridViewX1.AutoSizeColumnsMode = DataGridViewAutoSizeColumnsMode.AllCells; + legendSC.Visible = false; + legendSG.Visible = false; + ClearGZData(); + + GSOLayer redLayer = globeControl1.Globe.Layers.GetLayerByCaption("红线"); + if (redLayer == null) return; + redLayer.Visible = false; + } + catch (Exception ex) + { + //MessageBox.Show("系统运行错误:" + ex.ToString(), "错误", MessageBoxButtons.OK, MessageBoxIcon.Error); + } } - /// - /// 管线定位 - /// - /// - /// - private void ribbonTabItem7_MouseDown(object sender, MouseEventArgs e) - { - ResetRibbonTab(); - } - /// - /// 标识器管理 - /// - /// - /// - private void ribbonTabItem5_MouseDown(object sender, MouseEventArgs e) - { - ResetRibbonTab(); - } + //GSOFeature dpFeatuer = null; /// /// 双屏分析，点击管段分析 @@ -8017,7 +8064,9 @@ private void btn_flag_Click(object sender, EventArgs e) { if (FrmFlagManagers.IS_OPEN) + { return; + } FrmFlagManagers frm = new FrmFlagManagers(globeControl1); frm.Show(this); } diff --git a/MainFrm.designer.cs b/MainFrm.designer.cs index e3dca41..73398c0 100644 --- a/MainFrm.designer.cs +++ b/MainFrm.designer.cs @@ -4,6 +4,7 @@ using DevComponents.DotNetBar; using DevComponents.DotNetBar.Controls; using DevComponents.Editors; +using System.Drawing; namespace Cyberpipe { @@ -89,6 +90,7 @@ this.sideBar1 = new DevComponents.DotNetBar.SideBar(); this.panelEx3 = new DevComponents.DotNetBar.PanelEx(); this.layerSensorTree = new System.Windows.Forms.TreeView(); + this.layerTree = new Cyberpipe.MyTreeView(); this.sideBarPanelItem3 = new DevComponents.DotNetBar.SideBarPanelItem(); this.controlContainerItem3 = new DevComponents.DotNetBar.ControlContainerItem(); this.sideBarPanelItem4 = new DevComponents.DotNetBar.SideBarPanelItem(); @@ -243,42 +245,18 @@ this.保存ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.定位ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.ribbonControl1 = new DevComponents.DotNetBar.RibbonControl(); - this.ribbonPanel6 = new DevComponents.DotNetBar.RibbonPanel(); - this.ribbonBar6 = new DevComponents.DotNetBar.RibbonBar(); - this.buttonItemSPSZ = new DevComponents.DotNetBar.ButtonItem(); - this.buttonItem8 = new DevComponents.DotNetBar.ButtonItem(); - this.buttonItemLocation = new DevComponents.DotNetBar.ButtonItem(); - this.sliderItem2 = new DevComponents.DotNetBar.SliderItem(); - this.buttonItemGBJC = new DevComponents.DotNetBar.ButtonItem(); - this.ribbonPanel5 = new DevComponents.DotNetBar.RibbonPanel(); - this.ribbonBar2 = new DevComponents.DotNetBar.RibbonBar(); - this.buttonItemHX1 = new DevComponents.DotNetBar.ButtonItem(); - this.buttonItemHX2 = new DevComponents.DotNetBar.ButtonItem(); - this.buttonItemDCTP = new DevComponents.DotNetBar.ButtonItem(); - this.sliderItem3 = new DevComponents.DotNetBar.SliderItem(); - this.ribbonPanel1 = new DevComponents.DotNetBar.RibbonPanel(); - this.ribbonBar21 = new DevComponents.DotNetBar.RibbonBar(); - this.buttonItem87 = new DevComponents.DotNetBar.ButtonItem(); - this.buttonItem88 = new DevComponents.DotNetBar.ButtonItem(); - this.buttonItem27 = new DevComponents.DotNetBar.ButtonItem(); - this.buttonItem91 = new DevComponents.DotNetBar.ButtonItem(); - this.buttonItem1 = new DevComponents.DotNetBar.ButtonItem(); - this.btnlegendSet = new DevComponents.DotNetBar.ButtonItem(); - this.buttonItem89 = new DevComponents.DotNetBar.ButtonItem(); - this.btnOutputJPG = new DevComponents.DotNetBar.ButtonItem(); - this.ribbonPanel12 = new DevComponents.DotNetBar.RibbonPanel(); - this.ribbonBar18 = new DevComponents.DotNetBar.RibbonBar(); - this.buttonItem133 = new DevComponents.DotNetBar.ButtonItem(); - this.ribbonBar13 = new DevComponents.DotNetBar.RibbonBar(); - this.buttonItem127 = new DevComponents.DotNetBar.ButtonItem(); - this.buttonItem128 = new DevComponents.DotNetBar.ButtonItem(); - this.sliderItem1 = new DevComponents.DotNetBar.SliderItem(); - this.buttonItem134 = new DevComponents.DotNetBar.ButtonItem(); - this.buttonItem130 = new DevComponents.DotNetBar.ButtonItem(); - this.btn_check_history = new DevComponents.DotNetBar.ButtonItem(); - this.ribbonPanel4 = new DevComponents.DotNetBar.RibbonPanel(); - this.ribbonBar1 = new DevComponents.DotNetBar.RibbonBar(); - this.btn_document_info = new DevComponents.DotNetBar.ButtonItem(); + this.ribbonPanel3 = new DevComponents.DotNetBar.RibbonPanel(); + this.ribbonBar4 = new DevComponents.DotNetBar.RibbonBar(); + this.btn_flag = new DevComponents.DotNetBar.ButtonItem(); + this.slider4ground = new DevComponents.DotNetBar.SliderItem(); + this.ribbonPanel7 = new DevComponents.DotNetBar.RibbonPanel(); + this.gxdw_ribbonbar = new DevComponents.DotNetBar.RibbonBar(); + this.buttonItem9 = new DevComponents.DotNetBar.ButtonItem(); + this.buttonItem10 = new DevComponents.DotNetBar.ButtonItem(); + this.buttonItem11 = new DevComponents.DotNetBar.ButtonItem(); + this.buttonItem12 = new DevComponents.DotNetBar.ButtonItem(); + this.buttonItem13 = new DevComponents.DotNetBar.ButtonItem(); + this.buttonItem14 = new DevComponents.DotNetBar.ButtonItem(); this.ribbonPanel15 = new DevComponents.DotNetBar.RibbonPanel(); this.ribbonBar20 = new DevComponents.DotNetBar.RibbonBar(); this.buttonItemSH = new DevComponents.DotNetBar.ButtonItem(); @@ -334,18 +312,6 @@ this.buttonItemXT4 = new DevComponents.DotNetBar.ButtonItem(); this.buttonItemXT4_1 = new DevComponents.DotNetBar.ButtonItem(); this.buttonItemXT4_2 = new DevComponents.DotNetBar.ButtonItem(); - this.ribbonPanel3 = new DevComponents.DotNetBar.RibbonPanel(); - this.ribbonBar4 = new DevComponents.DotNetBar.RibbonBar(); - this.btn_flag = new DevComponents.DotNetBar.ButtonItem(); - this.slider4ground = new DevComponents.DotNetBar.SliderItem(); - this.ribbonPanel7 = new DevComponents.DotNetBar.RibbonPanel(); - this.gxdw_ribbonbar = new DevComponents.DotNetBar.RibbonBar(); - this.buttonItem9 = new DevComponents.DotNetBar.ButtonItem(); - this.buttonItem10 = new DevComponents.DotNetBar.ButtonItem(); - this.buttonItem11 = new DevComponents.DotNetBar.ButtonItem(); - this.buttonItem12 = new DevComponents.DotNetBar.ButtonItem(); - this.buttonItem13 = new DevComponents.DotNetBar.ButtonItem(); - this.buttonItem14 = new DevComponents.DotNetBar.ButtonItem(); this.ribbonPanel2 = new DevComponents.DotNetBar.RibbonPanel(); this.ribbonBar3 = new DevComponents.DotNetBar.RibbonBar(); this.btn_user_info = new DevComponents.DotNetBar.ButtonItem(); @@ -355,6 +321,43 @@ this.btn_user_role = new DevComponents.DotNetBar.ButtonItem(); this.btn_password_edit = new DevComponents.DotNetBar.ButtonItem(); this.buttonItemPasswordReset = new DevComponents.DotNetBar.ButtonItem(); + this.ribbonPanel6 = new DevComponents.DotNetBar.RibbonPanel(); + this.ribbonBar6 = new DevComponents.DotNetBar.RibbonBar(); + this.buttonItemSPSZ = new DevComponents.DotNetBar.ButtonItem(); + this.buttonItem8 = new DevComponents.DotNetBar.ButtonItem(); + this.buttonItemLocation = new DevComponents.DotNetBar.ButtonItem(); + this.sliderItem2 = new DevComponents.DotNetBar.SliderItem(); + this.buttonItemGBJC = new DevComponents.DotNetBar.ButtonItem(); + this.ribbonPanel5 = new DevComponents.DotNetBar.RibbonPanel(); + this.ribbonBar2 = new DevComponents.DotNetBar.RibbonBar(); + this.buttonItemHX1 = new DevComponents.DotNetBar.ButtonItem(); + this.buttonItemHX2 = new DevComponents.DotNetBar.ButtonItem(); + this.buttonItemDCTP = new DevComponents.DotNetBar.ButtonItem(); + this.sliderItem3 = new DevComponents.DotNetBar.SliderItem(); + this.ribbonPanel1 = new DevComponents.DotNetBar.RibbonPanel(); + this.ribbonBar21 = new DevComponents.DotNetBar.RibbonBar(); + this.buttonItem87 = new DevComponents.DotNetBar.ButtonItem(); + this.buttonItem88 = new DevComponents.DotNetBar.ButtonItem(); + this.buttonItem27 = new DevComponents.DotNetBar.ButtonItem(); + this.buttonItem91 = new DevComponents.DotNetBar.ButtonItem(); + this.buttonItem1 = new DevComponents.DotNetBar.ButtonItem(); + this.btnlegendSet = new DevComponents.DotNetBar.ButtonItem(); + this.buttonItem89 = new DevComponents.DotNetBar.ButtonItem(); + this.btnOutputJPG = new DevComponents.DotNetBar.ButtonItem(); + this.ribbonPanel12 = new DevComponents.DotNetBar.RibbonPanel(); + this.ribbonBar18 = new DevComponents.DotNetBar.RibbonBar(); + this.buttonItem133 = new DevComponents.DotNetBar.ButtonItem(); + this.buttonItem132 = new DevComponents.DotNetBar.ButtonItem(); + this.ribbonBar13 = new DevComponents.DotNetBar.RibbonBar(); + this.buttonItem127 = new DevComponents.DotNetBar.ButtonItem(); + this.buttonItem128 = new DevComponents.DotNetBar.ButtonItem(); + this.sliderItem1 = new DevComponents.DotNetBar.SliderItem(); + this.buttonItem134 = new DevComponents.DotNetBar.ButtonItem(); + this.buttonItem130 = new DevComponents.DotNetBar.ButtonItem(); + this.btn_check_history = new DevComponents.DotNetBar.ButtonItem(); + this.ribbonPanel4 = new DevComponents.DotNetBar.RibbonPanel(); + this.ribbonBar1 = new DevComponents.DotNetBar.RibbonBar(); + this.btn_document_info = new DevComponents.DotNetBar.ButtonItem(); this.ribbonTabItem1 = new DevComponents.DotNetBar.RibbonTabItem(); this.ribbonTabItem11 = new DevComponents.DotNetBar.RibbonTabItem(); this.ribbonTabItem6 = new DevComponents.DotNetBar.RibbonTabItem(); @@ -516,7 +519,6 @@ this.labelX17 = new DevComponents.DotNetBar.LabelX(); this.panelEx4 = new DevComponents.DotNetBar.PanelEx(); this.pictureBox1 = new System.Windows.Forms.PictureBox(); - this.layerTree = new Cyberpipe.MyTreeView(); this.statusStrip1.SuspendLayout(); this.sideBar1.SuspendLayout(); this.panelEx3.SuspendLayout(); @@ -527,15 +529,15 @@ this.contextMenuStrip3.SuspendLayout(); this.contextMenuStripDeleteLayerNode.SuspendLayout(); this.ribbonControl1.SuspendLayout(); + this.ribbonPanel3.SuspendLayout(); + this.ribbonPanel7.SuspendLayout(); + this.ribbonPanel15.SuspendLayout(); + this.ribbonPanel2.SuspendLayout(); this.ribbonPanel6.SuspendLayout(); this.ribbonPanel5.SuspendLayout(); this.ribbonPanel1.SuspendLayout(); this.ribbonPanel12.SuspendLayout(); this.ribbonPanel4.SuspendLayout(); - this.ribbonPanel15.SuspendLayout(); - this.ribbonPanel3.SuspendLayout(); - this.ribbonPanel7.SuspendLayout(); - this.ribbonPanel2.SuspendLayout(); this.panelOfTable.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.dataGridViewX1)).BeginInit(); this.statusStrip2.SuspendLayout(); @@ -711,7 +713,8 @@ this.statusLabel.Name = "statusLabel"; this.statusLabel.Size = new System.Drawing.Size(1313, 17); this.statusLabel.Spring = true; - this.statusLabel.Text = " ©2014-2015 苏州航天系统工程有限公司 版权所有"; + this.statusLabel.Text = Utility.Copyright; +// this.statusLabel.Text = " ©2014-2015 苏州航天系统工程有限公司 版权所有"; // // toolStripDropDownButton1 // @@ -956,6 +959,18 @@ this.layerSensorTree.NodeMouseClick += new System.Windows.Forms.TreeNodeMouseClickEventHandler(this.layerMarkerTree_NodeMouseClick); this.layerSensorTree.NodeMouseDoubleClick += new System.Windows.Forms.TreeNodeMouseClickEventHandler(this.layerTree_NodeMouseDoubleClick); // + // layerTree + // + this.layerTree.CheckBoxes = true; + this.layerTree.ItemHeight = 18; + this.layerTree.Location = new System.Drawing.Point(30, 78); + this.layerTree.Name = "layerTree"; + this.layerTree.Size = new System.Drawing.Size(121, 97); + this.layerTree.TabIndex = 1; + this.layerTree.AfterCheck += new System.Windows.Forms.TreeViewEventHandler(this.layerTree_AfterCheck); + this.layerTree.NodeMouseClick += new System.Windows.Forms.TreeNodeMouseClickEventHandler(this.layerTree_NodeMouseClick); + this.layerTree.NodeMouseDoubleClick += new System.Windows.Forms.TreeNodeMouseClickEventHandler(this.layerTree_NodeMouseDoubleClick); + // // sideBarPanelItem3 // this.sideBarPanelItem3.FontBold = true; @@ -2150,13 +2165,13 @@ this.ribbonControl1.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.ribbonControl1.Controls.Add(this.ribbonPanel3); this.ribbonControl1.Controls.Add(this.ribbonPanel7); - this.ribbonControl1.Controls.Add(this.ribbonPanel2); this.ribbonControl1.Controls.Add(this.ribbonPanel15); - this.ribbonControl1.Controls.Add(this.ribbonPanel4); - this.ribbonControl1.Controls.Add(this.ribbonPanel1); + this.ribbonControl1.Controls.Add(this.ribbonPanel2); this.ribbonControl1.Controls.Add(this.ribbonPanel6); - this.ribbonControl1.Controls.Add(this.ribbonPanel12); this.ribbonControl1.Controls.Add(this.ribbonPanel5); + this.ribbonControl1.Controls.Add(this.ribbonPanel1); + this.ribbonControl1.Controls.Add(this.ribbonPanel12); + this.ribbonControl1.Controls.Add(this.ribbonPanel4); this.ribbonControl1.Dock = System.Windows.Forms.DockStyle.Top; this.ribbonControl1.ImeMode = System.Windows.Forms.ImeMode.NoControl; this.ribbonControl1.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { @@ -2200,609 +2215,216 @@ this.ribbonControl1.Text = "ribbonControl1"; this.ribbonControl1.UseCustomizeDialog = false; // - // ribbonPanel6 + // ribbonPanel3 // - this.ribbonPanel6.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.ribbonPanel6.Controls.Add(this.ribbonBar6); - this.ribbonPanel6.Dock = System.Windows.Forms.DockStyle.Fill; - this.ribbonPanel6.Location = new System.Drawing.Point(0, 0); - this.ribbonPanel6.Name = "ribbonPanel6"; - this.ribbonPanel6.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); - this.ribbonPanel6.Size = new System.Drawing.Size(1328, 95); + this.ribbonPanel3.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.ribbonPanel3.Controls.Add(this.ribbonBar4); + this.ribbonPanel3.Dock = System.Windows.Forms.DockStyle.Fill; + this.ribbonPanel3.Location = new System.Drawing.Point(0, 33); + this.ribbonPanel3.Name = "ribbonPanel3"; + this.ribbonPanel3.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); + this.ribbonPanel3.Size = new System.Drawing.Size(1328, 62); // // // - this.ribbonPanel6.Style.Class = ""; - this.ribbonPanel6.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonPanel3.Style.Class = ""; + this.ribbonPanel3.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; // // // - this.ribbonPanel6.StyleMouseDown.Class = ""; - this.ribbonPanel6.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonPanel3.StyleMouseDown.Class = ""; + this.ribbonPanel3.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; // // // - this.ribbonPanel6.StyleMouseOver.Class = ""; - this.ribbonPanel6.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonPanel6.TabIndex = 38; - this.ribbonPanel6.Visible = false; + this.ribbonPanel3.StyleMouseOver.Class = ""; + this.ribbonPanel3.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonPanel3.TabIndex = 40; // - // ribbonBar6 + // ribbonBar4 // - this.ribbonBar6.AutoOverflowEnabled = true; + this.ribbonBar4.AutoOverflowEnabled = true; // // // - this.ribbonBar6.BackgroundMouseOverStyle.Class = ""; - this.ribbonBar6.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar4.BackgroundMouseOverStyle.Class = ""; + this.ribbonBar4.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; // // // - this.ribbonBar6.BackgroundStyle.Class = ""; - this.ribbonBar6.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonBar6.ContainerControlProcessDialogKey = true; - this.ribbonBar6.Dock = System.Windows.Forms.DockStyle.Left; - this.ribbonBar6.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { - this.buttonItemSPSZ, - this.buttonItem8, - this.buttonItemLocation, - this.sliderItem2, - this.buttonItemGBJC}); - this.ribbonBar6.Location = new System.Drawing.Point(3, 0); - this.ribbonBar6.Name = "ribbonBar6"; - this.ribbonBar6.Size = new System.Drawing.Size(427, 92); - this.ribbonBar6.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.ribbonBar6.TabIndex = 0; + this.ribbonBar4.BackgroundStyle.Class = ""; + this.ribbonBar4.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar4.ContainerControlProcessDialogKey = true; + this.ribbonBar4.Dock = System.Windows.Forms.DockStyle.Left; + this.ribbonBar4.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { + this.btn_flag, + this.slider4ground}); + this.ribbonBar4.Location = new System.Drawing.Point(3, 0); + this.ribbonBar4.Name = "ribbonBar4"; + this.ribbonBar4.Size = new System.Drawing.Size(634, 59); + this.ribbonBar4.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.ribbonBar4.TabIndex = 0; // // // - this.ribbonBar6.TitleStyle.Class = ""; - this.ribbonBar6.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar4.TitleStyle.Class = ""; + this.ribbonBar4.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; // // // - this.ribbonBar6.TitleStyleMouseOver.Class = ""; - this.ribbonBar6.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonBar6.TitleVisible = false; + this.ribbonBar4.TitleStyleMouseOver.Class = ""; + this.ribbonBar4.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar4.TitleVisible = false; // - // buttonItemSPSZ + // btn_flag // - this.buttonItemSPSZ.Image = ((System.Drawing.Image)(resources.GetObject("buttonItemSPSZ.Image"))); - this.buttonItemSPSZ.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItemSPSZ.Name = "buttonItemSPSZ"; - this.buttonItemSPSZ.SubItemsExpandWidth = 14; - this.buttonItemSPSZ.Text = "双屏设置"; - this.buttonItemSPSZ.Click += new System.EventHandler(this.buttonItemSPSZ_Click); + this.btn_flag.Image = global::Cyberpipe.Properties.Resources._24x24icon_03_hover; + this.btn_flag.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.btn_flag.Name = "btn_flag"; + this.btn_flag.SubItemsExpandWidth = 14; + this.btn_flag.Text = "标识器管理"; + this.btn_flag.Click += new System.EventHandler(this.btn_flag_Click); // - // buttonItem8 + // slider4ground // - this.buttonItem8.Image = ((System.Drawing.Image)(resources.GetObject("buttonItem8.Image"))); - this.buttonItem8.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem8.Name = "buttonItem8"; - this.buttonItem8.SubItemsExpandWidth = 14; - this.buttonItem8.Text = "双屏分析"; - this.buttonItem8.Click += new System.EventHandler(this.buttonItem8_Click); + this.slider4ground.LabelPosition = DevComponents.DotNetBar.eSliderLabelPosition.Top; + this.slider4ground.LabelWidth = 50; + this.slider4ground.Name = "slider4ground"; + this.slider4ground.Text = "地面透明度"; + this.slider4ground.TextColor = System.Drawing.Color.Black; + this.slider4ground.Value = 0; + this.slider4ground.ValueChanged += new System.EventHandler(this.slider4ground_ValueChanged); // - // buttonItemLocation + // ribbonPanel7 // - this.buttonItemLocation.Image = ((System.Drawing.Image)(resources.GetObject("buttonItemLocation.Image"))); - this.buttonItemLocation.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItemLocation.Name = "buttonItemLocation"; - this.buttonItemLocation.SubItemsExpandWidth = 14; - this.buttonItemLocation.Text = "快速定位"; - this.buttonItemLocation.Click += new System.EventHandler(this.buttonItemLocation_Click); + this.ribbonPanel7.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.ribbonPanel7.Controls.Add(this.gxdw_ribbonbar); + this.ribbonPanel7.Dock = System.Windows.Forms.DockStyle.Fill; + this.ribbonPanel7.Location = new System.Drawing.Point(0, 33); + this.ribbonPanel7.Name = "ribbonPanel7"; + this.ribbonPanel7.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); + this.ribbonPanel7.Size = new System.Drawing.Size(1328, 62); // - // sliderItem2 // - this.sliderItem2.LabelPosition = DevComponents.DotNetBar.eSliderLabelPosition.Top; - this.sliderItem2.LabelWidth = 50; - this.sliderItem2.Name = "sliderItem2"; - this.sliderItem2.Text = "地面透明度"; - this.sliderItem2.TextColor = System.Drawing.Color.Black; - this.sliderItem2.Value = 0; - this.sliderItem2.ValueChanged += new System.EventHandler(this.sliderItem2_ValueChanged); // - // buttonItemGBJC + this.ribbonPanel7.Style.Class = ""; + this.ribbonPanel7.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; // - this.buttonItemGBJC.Image = ((System.Drawing.Image)(resources.GetObject("buttonItemGBJC.Image"))); - this.buttonItemGBJC.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItemGBJC.Name = "buttonItemGBJC"; - this.buttonItemGBJC.SubItemsExpandWidth = 14; - this.buttonItemGBJC.Text = "国标检测"; - this.buttonItemGBJC.Click += new System.EventHandler(this.buttonItemGBJC_Click); // - // ribbonPanel5 // - this.ribbonPanel5.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.ribbonPanel5.Controls.Add(this.ribbonBar2); - this.ribbonPanel5.Dock = System.Windows.Forms.DockStyle.Fill; - this.ribbonPanel5.Location = new System.Drawing.Point(0, 0); - this.ribbonPanel5.Name = "ribbonPanel5"; - this.ribbonPanel5.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); - this.ribbonPanel5.Size = new System.Drawing.Size(1328, 95); + this.ribbonPanel7.StyleMouseDown.Class = ""; + this.ribbonPanel7.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; // // // - this.ribbonPanel5.Style.Class = ""; - this.ribbonPanel5.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonPanel7.StyleMouseOver.Class = ""; + this.ribbonPanel7.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonPanel7.TabIndex = 41; + this.ribbonPanel7.Visible = false; // + // gxdw_ribbonbar // + this.gxdw_ribbonbar.AutoOverflowEnabled = true; // - this.ribbonPanel5.StyleMouseDown.Class = ""; - this.ribbonPanel5.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; // // + this.gxdw_ribbonbar.BackgroundMouseOverStyle.Class = ""; + this.gxdw_ribbonbar.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; // - this.ribbonPanel5.StyleMouseOver.Class = ""; - this.ribbonPanel5.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonPanel5.TabIndex = 37; - this.ribbonPanel5.Visible = false; // - // ribbonBar2 // - this.ribbonBar2.AutoOverflowEnabled = true; + this.gxdw_ribbonbar.BackgroundStyle.Class = ""; + this.gxdw_ribbonbar.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.gxdw_ribbonbar.ContainerControlProcessDialogKey = true; + this.gxdw_ribbonbar.Dock = System.Windows.Forms.DockStyle.Left; + this.gxdw_ribbonbar.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { + this.buttonItem9, + this.buttonItem10, + this.buttonItem11, + this.buttonItem12, + this.buttonItem13, + this.buttonItem14}); + this.gxdw_ribbonbar.Location = new System.Drawing.Point(3, 0); + this.gxdw_ribbonbar.Name = "gxdw_ribbonbar"; + this.gxdw_ribbonbar.Size = new System.Drawing.Size(564, 59); + this.gxdw_ribbonbar.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.gxdw_ribbonbar.TabIndex = 0; + this.gxdw_ribbonbar.Text = "ribbonBar5"; // // // - this.ribbonBar2.BackgroundMouseOverStyle.Class = ""; - this.ribbonBar2.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.gxdw_ribbonbar.TitleStyle.Class = ""; + this.gxdw_ribbonbar.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; // // // - this.ribbonBar2.BackgroundStyle.Class = ""; - this.ribbonBar2.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonBar2.ContainerControlProcessDialogKey = true; - this.ribbonBar2.Dock = System.Windows.Forms.DockStyle.Left; - this.ribbonBar2.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { - this.buttonItemHX1, - this.buttonItemHX2, - this.buttonItemDCTP, - this.sliderItem3}); - this.ribbonBar2.Location = new System.Drawing.Point(3, 0); - this.ribbonBar2.Name = "ribbonBar2"; - this.ribbonBar2.Size = new System.Drawing.Size(350, 92); - this.ribbonBar2.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.ribbonBar2.TabIndex = 0; + this.gxdw_ribbonbar.TitleStyleMouseOver.Class = ""; + this.gxdw_ribbonbar.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.gxdw_ribbonbar.TitleVisible = false; // + // buttonItem9 // + this.buttonItem9.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__76; + this.buttonItem9.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem9.Name = "buttonItem9"; + this.buttonItem9.SubItemsExpandWidth = 14; + this.buttonItem9.Text = "工单管理"; + this.buttonItem9.Click += new System.EventHandler(this.buttonItem9_Click); // - this.ribbonBar2.TitleStyle.Class = ""; - this.ribbonBar2.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // buttonItem10 // + this.buttonItem10.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__69; + this.buttonItem10.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem10.Name = "buttonItem10"; + this.buttonItem10.SubItemsExpandWidth = 14; + this.buttonItem10.Text = "在线任务"; + this.buttonItem10.Click += new System.EventHandler(this.buttonItem10_Click); // + // buttonItem11 // - this.ribbonBar2.TitleStyleMouseOver.Class = ""; - this.ribbonBar2.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonBar2.TitleVisible = false; + this.buttonItem11.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__72; + this.buttonItem11.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem11.Name = "buttonItem11"; + this.buttonItem11.SubItemsExpandWidth = 14; + this.buttonItem11.Text = "事件管理"; + this.buttonItem11.Click += new System.EventHandler(this.buttonItem11_Click); // - // buttonItemHX1 + // buttonItem12 // - this.buttonItemHX1.AutoExpandOnClick = true; - this.buttonItemHX1.Image = ((System.Drawing.Image)(resources.GetObject("buttonItemHX1.Image"))); - this.buttonItemHX1.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItemHX1.Name = "buttonItemHX1"; - this.buttonItemHX1.SubItemsExpandWidth = 14; - this.buttonItemHX1.Text = "导入红线"; - this.buttonItemHX1.Click += new System.EventHandler(this.buttonItemHX1_Click); + this.buttonItem12.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__34; + this.buttonItem12.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem12.Name = "buttonItem12"; + this.buttonItem12.SubItemsExpandWidth = 14; + this.buttonItem12.Text = "探测仪管理"; + this.buttonItem12.Click += new System.EventHandler(this.buttonItem12_Click); // - // buttonItemHX2 + // buttonItem13 // - this.buttonItemHX2.Image = ((System.Drawing.Image)(resources.GetObject("buttonItemHX2.Image"))); - this.buttonItemHX2.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItemHX2.Name = "buttonItemHX2"; - this.buttonItemHX2.SubItemsExpandWidth = 14; - this.buttonItemHX2.Text = "红线审核"; - this.buttonItemHX2.Click += new System.EventHandler(this.buttonItemHX2_Click); + this.buttonItem13.Image = global::Cyberpipe.Properties.Resources._24x24icon_13_hover; + this.buttonItem13.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem13.Name = "buttonItem13"; + this.buttonItem13.SubItemsExpandWidth = 14; + this.buttonItem13.Text = "巡检人员维护"; + this.buttonItem13.Click += new System.EventHandler(this.buttonItem13_Click); // - // buttonItemDCTP + // buttonItem14 // - this.buttonItemDCTP.Image = ((System.Drawing.Image)(resources.GetObject("buttonItemDCTP.Image"))); - this.buttonItemDCTP.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItemDCTP.Name = "buttonItemDCTP"; - this.buttonItemDCTP.SubItemsExpandWidth = 14; - this.buttonItemDCTP.Text = "导出图片"; - this.buttonItemDCTP.Click += new System.EventHandler(this.buttonItemDCTP_Click); - // - // sliderItem3 - // - this.sliderItem3.LabelPosition = DevComponents.DotNetBar.eSliderLabelPosition.Top; - this.sliderItem3.LabelWidth = 50; - this.sliderItem3.Name = "sliderItem3"; - this.sliderItem3.Text = "地面透明度"; - this.sliderItem3.TextColor = System.Drawing.Color.Black; - this.sliderItem3.Value = 0; - this.sliderItem3.ValueChanged += new System.EventHandler(this.sliderItem3_ValueChanged); - // - // ribbonPanel1 - // - this.ribbonPanel1.AutoSize = true; - this.ribbonPanel1.CanvasColor = System.Drawing.Color.Gray; - this.ribbonPanel1.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.ribbonPanel1.Controls.Add(this.ribbonBar21); - this.ribbonPanel1.Dock = System.Windows.Forms.DockStyle.Fill; - this.ribbonPanel1.Location = new System.Drawing.Point(0, 0); - this.ribbonPanel1.Name = "ribbonPanel1"; - this.ribbonPanel1.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); - this.ribbonPanel1.Size = new System.Drawing.Size(1328, 95); - // - // - // - this.ribbonPanel1.Style.Class = ""; - this.ribbonPanel1.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonPanel1.StyleMouseDown.Class = ""; - this.ribbonPanel1.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonPanel1.StyleMouseOver.Class = ""; - this.ribbonPanel1.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonPanel1.TabIndex = 1; - this.ribbonPanel1.Visible = false; - // - // ribbonBar21 - // - this.ribbonBar21.AutoOverflowEnabled = true; - this.ribbonBar21.BackColor = System.Drawing.Color.White; - // - // - // - this.ribbonBar21.BackgroundMouseOverStyle.Class = ""; - this.ribbonBar21.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonBar21.BackgroundStyle.Class = ""; - this.ribbonBar21.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonBar21.ContainerControlProcessDialogKey = true; - this.ribbonBar21.Dock = System.Windows.Forms.DockStyle.Left; - this.ribbonBar21.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { - this.buttonItem87, - this.buttonItem88, - this.buttonItem27, - this.sliderGroundTransSet1, - this.buttonItem91, - this.buttonItem1, - this.btnlegendSet, - this.buttonItem89, - this.btnOutputJPG}); - this.ribbonBar21.Location = new System.Drawing.Point(3, 0); - this.ribbonBar21.Name = "ribbonBar21"; - this.ribbonBar21.Size = new System.Drawing.Size(649, 92); - this.ribbonBar21.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.ribbonBar21.TabIndex = 2; - this.ribbonBar21.Text = "浏览模式"; - // - // - // - this.ribbonBar21.TitleStyle.Class = ""; - this.ribbonBar21.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonBar21.TitleStyleMouseOver.Class = ""; - this.ribbonBar21.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonBar21.TitleVisible = false; - // - // buttonItem87 - // - this.buttonItem87.Image = ((System.Drawing.Image)(resources.GetObject("buttonItem87.Image"))); - this.buttonItem87.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem87.Name = "buttonItem87"; - this.buttonItem87.SubItemsExpandWidth = 14; - this.buttonItem87.Text = "地上模式"; - this.buttonItem87.Click += new System.EventHandler(this.buttonItem87_Click); - // - // buttonItem88 - // - this.buttonItem88.Image = ((System.Drawing.Image)(resources.GetObject("buttonItem88.Image"))); - this.buttonItem88.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem88.Name = "buttonItem88"; - this.buttonItem88.SubItemsExpandWidth = 14; - this.buttonItem88.Text = "地下模式"; - this.buttonItem88.Click += new System.EventHandler(this.buttonItem88_Click); - // - // buttonItem27 - // - this.buttonItem27.Image = ((System.Drawing.Image)(resources.GetObject("buttonItem27.Image"))); - this.buttonItem27.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem27.Name = "buttonItem27"; - this.buttonItem27.SubItemsExpandWidth = 14; - this.buttonItem27.Text = "行走模式"; - this.buttonItem27.Click += new System.EventHandler(this.buttonItem27_Click); - // - // buttonItem91 - // - this.buttonItem91.ForeColor = System.Drawing.Color.Black; - this.buttonItem91.Image = ((System.Drawing.Image)(resources.GetObject("buttonItem91.Image"))); - this.buttonItem91.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem91.Name = "buttonItem91"; - this.buttonItem91.SubItemsExpandWidth = 14; - this.buttonItem91.Text = "快速定位"; - this.buttonItem91.Click += new System.EventHandler(this.buttonItem91_Click); - // - // buttonItem1 - // - this.buttonItem1.Image = ((System.Drawing.Image)(resources.GetObject("buttonItem1.Image"))); - this.buttonItem1.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem1.Name = "buttonItem1"; - this.buttonItem1.SubItemsExpandWidth = 14; - this.buttonItem1.Text = "图层管理"; - this.buttonItem1.Click += new System.EventHandler(this.buttonItem1_Click); - // - // btnlegendSet - // - this.btnlegendSet.Image = ((System.Drawing.Image)(resources.GetObject("btnlegendSet.Image"))); - this.btnlegendSet.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.btnlegendSet.Name = "btnlegendSet"; - this.btnlegendSet.SubItemsExpandWidth = 14; - this.btnlegendSet.Text = "图例"; - this.btnlegendSet.Click += new System.EventHandler(this.btnlegendSet_Click); - // - // buttonItem89 - // - this.buttonItem89.Image = ((System.Drawing.Image)(resources.GetObject("buttonItem89.Image"))); - this.buttonItem89.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem89.Name = "buttonItem89"; - this.buttonItem89.SubItemsExpandWidth = 14; - this.buttonItem89.Text = "全屏显示"; - this.buttonItem89.Click += new System.EventHandler(this.buttonItem89_Click); - // - // btnOutputJPG - // - this.btnOutputJPG.Image = ((System.Drawing.Image)(resources.GetObject("btnOutputJPG.Image"))); - this.btnOutputJPG.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.btnOutputJPG.Name = "btnOutputJPG"; - this.btnOutputJPG.SubItemsExpandWidth = 14; - this.btnOutputJPG.Text = "导出图片"; - this.btnOutputJPG.Click += new System.EventHandler(this.btnOutputJPG_Click); - // - // ribbonPanel12 - // - this.ribbonPanel12.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.ribbonPanel12.Controls.Add(this.ribbonBar18); - this.ribbonPanel12.Controls.Add(this.ribbonBar13); - this.ribbonPanel12.Dock = System.Windows.Forms.DockStyle.Fill; - this.ribbonPanel12.Location = new System.Drawing.Point(0, 0); - this.ribbonPanel12.Name = "ribbonPanel12"; - this.ribbonPanel12.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); - this.ribbonPanel12.Size = new System.Drawing.Size(1328, 95); - // - // - // - this.ribbonPanel12.Style.Class = ""; - this.ribbonPanel12.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonPanel12.StyleMouseDown.Class = ""; - this.ribbonPanel12.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonPanel12.StyleMouseOver.Class = ""; - this.ribbonPanel12.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonPanel12.TabIndex = 34; - this.ribbonPanel12.Visible = false; - // - // ribbonBar18 - // - this.ribbonBar18.AutoOverflowEnabled = true; - // - // - // - this.ribbonBar18.BackgroundMouseOverStyle.Class = ""; - this.ribbonBar18.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonBar18.BackgroundStyle.Class = ""; - this.ribbonBar18.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonBar18.ContainerControlProcessDialogKey = true; - this.ribbonBar18.Dock = System.Windows.Forms.DockStyle.Left; - this.ribbonBar18.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { - this.buttonItem133}); - this.ribbonBar18.Location = new System.Drawing.Point(531, 0); - this.ribbonBar18.Name = "ribbonBar18"; - this.ribbonBar18.Size = new System.Drawing.Size(129, 92); - this.ribbonBar18.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.ribbonBar18.TabIndex = 1; - // - // - // - this.ribbonBar18.TitleStyle.Class = ""; - this.ribbonBar18.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonBar18.TitleStyleMouseOver.Class = ""; - this.ribbonBar18.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonBar18.TitleVisible = false; - // - // buttonItem133 - // - this.buttonItem133.Image = ((System.Drawing.Image)(resources.GetObject("buttonItem133.Image"))); - this.buttonItem133.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem133.Name = "buttonItem133"; - this.buttonItem133.SubItemsExpandWidth = 14; - this.buttonItem133.Text = "审核入库"; - this.buttonItem133.Click += new System.EventHandler(this.buttonItem133_Click_1); - // - // ribbonBar13 - // - this.ribbonBar13.AutoOverflowEnabled = true; - // - // - // - this.ribbonBar13.BackgroundMouseOverStyle.Class = ""; - this.ribbonBar13.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonBar13.BackgroundStyle.Class = ""; - this.ribbonBar13.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonBar13.ContainerControlProcessDialogKey = true; - this.ribbonBar13.Dock = System.Windows.Forms.DockStyle.Left; - this.ribbonBar13.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { - this.buttonItem127, - this.buttonItem128, - this.sliderItem1, - this.buttonItem134, - this.buttonItem130, - this.btn_check_history}); - this.ribbonBar13.Location = new System.Drawing.Point(3, 0); - this.ribbonBar13.Name = "ribbonBar13"; - this.ribbonBar13.Size = new System.Drawing.Size(528, 92); - this.ribbonBar13.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.ribbonBar13.TabIndex = 0; - // - // - // - this.ribbonBar13.TitleStyle.Class = ""; - this.ribbonBar13.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonBar13.TitleStyleMouseOver.Class = ""; - this.ribbonBar13.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonBar13.TitleVisible = false; - // - // buttonItem127 - // - this.buttonItem127.Image = ((System.Drawing.Image)(resources.GetObject("buttonItem127.Image"))); - this.buttonItem127.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem127.Name = "buttonItem127"; - this.buttonItem127.SubItemsExpandWidth = 14; - this.buttonItem127.Text = "打开数据"; - this.buttonItem127.Click += new System.EventHandler(this.buttonItem127_Click_2); - // - // buttonItem128 - // - this.buttonItem128.Image = ((System.Drawing.Image)(resources.GetObject("buttonItem128.Image"))); - this.buttonItem128.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem128.Name = "buttonItem128"; - this.buttonItem128.SubItemsExpandWidth = 14; - this.buttonItem128.Text = "一键审核"; - this.buttonItem128.Click += new System.EventHandler(this.buttonItem128_Click); - // - // sliderItem1 - // - this.sliderItem1.LabelPosition = DevComponents.DotNetBar.eSliderLabelPosition.Top; - this.sliderItem1.LabelWidth = 50; - this.sliderItem1.Name = "sliderItem1"; - this.sliderItem1.Text = "地面透明度"; - this.sliderItem1.TextColor = System.Drawing.Color.Black; - this.sliderItem1.Value = 0; - this.sliderItem1.ValueChanged += new System.EventHandler(this.sliderItem1_ValueChanged); - // - // buttonItem134 - // - this.buttonItem134.Image = ((System.Drawing.Image)(resources.GetObject("buttonItem134.Image"))); - this.buttonItem134.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem134.Name = "buttonItem134"; - this.buttonItem134.SubItemsExpandWidth = 14; - this.buttonItem134.Text = "模拟设计修改"; - this.buttonItem134.Click += new System.EventHandler(this.buttonItem134_Click_1); - // - // buttonItem130 - // - this.buttonItem130.Image = ((System.Drawing.Image)(resources.GetObject("buttonItem130.Image"))); - this.buttonItem130.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem130.Name = "buttonItem130"; - this.buttonItem130.SubItemsExpandWidth = 14; - this.buttonItem130.Text = "导出审核图"; - this.buttonItem130.Click += new System.EventHandler(this.buttonItem130_Click_1); - // - // btn_check_history - // - this.btn_check_history.Image = ((System.Drawing.Image)(resources.GetObject("btn_check_history.Image"))); - this.btn_check_history.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.btn_check_history.Name = "btn_check_history"; - this.btn_check_history.SubItemsExpandWidth = 14; - this.btn_check_history.Text = "审核历史"; - this.btn_check_history.Click += new System.EventHandler(this.btn_check_history_Click); - // - // ribbonPanel4 - // - this.ribbonPanel4.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.ribbonPanel4.Controls.Add(this.ribbonBar1); - this.ribbonPanel4.Dock = System.Windows.Forms.DockStyle.Fill; - this.ribbonPanel4.Location = new System.Drawing.Point(0, 0); - this.ribbonPanel4.Name = "ribbonPanel4"; - this.ribbonPanel4.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); - this.ribbonPanel4.Size = new System.Drawing.Size(1328, 95); - // - // - // - this.ribbonPanel4.Style.Class = ""; - this.ribbonPanel4.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonPanel4.StyleMouseDown.Class = ""; - this.ribbonPanel4.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonPanel4.StyleMouseOver.Class = ""; - this.ribbonPanel4.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonPanel4.TabIndex = 36; - this.ribbonPanel4.Visible = false; - // - // ribbonBar1 - // - this.ribbonBar1.AutoOverflowEnabled = true; - // - // - // - this.ribbonBar1.BackgroundMouseOverStyle.Class = ""; - this.ribbonBar1.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonBar1.BackgroundStyle.Class = ""; - this.ribbonBar1.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonBar1.ContainerControlProcessDialogKey = true; - this.ribbonBar1.Dock = System.Windows.Forms.DockStyle.Left; - this.ribbonBar1.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { - this.btn_document_info}); - this.ribbonBar1.Location = new System.Drawing.Point(3, 0); - this.ribbonBar1.Name = "ribbonBar1"; - this.ribbonBar1.Size = new System.Drawing.Size(88, 92); - this.ribbonBar1.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.ribbonBar1.TabIndex = 0; - // - // - // - this.ribbonBar1.TitleStyle.Class = ""; - this.ribbonBar1.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonBar1.TitleStyleMouseOver.Class = ""; - this.ribbonBar1.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonBar1.TitleVisible = false; - // - // btn_document_info - // - this.btn_document_info.Image = ((System.Drawing.Image)(resources.GetObject("btn_document_info.Image"))); - this.btn_document_info.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.btn_document_info.Name = "btn_document_info"; - this.btn_document_info.SubItemsExpandWidth = 14; - this.btn_document_info.Text = "文档管理"; - this.btn_document_info.Click += new System.EventHandler(this.btn_document_info_Click); + this.buttonItem14.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__56; + this.buttonItem14.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem14.Name = "buttonItem14"; + this.buttonItem14.SubItemsExpandWidth = 14; + this.buttonItem14.Text = "导出施工图"; + this.buttonItem14.Click += new System.EventHandler(this.buttonItem14_Click); // // ribbonPanel15 // this.ribbonPanel15.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; this.ribbonPanel15.Controls.Add(this.ribbonBar20); this.ribbonPanel15.Dock = System.Windows.Forms.DockStyle.Fill; - this.ribbonPanel15.Location = new System.Drawing.Point(0, 0); + this.ribbonPanel15.Location = new System.Drawing.Point(0, 33); this.ribbonPanel15.Name = "ribbonPanel15"; this.ribbonPanel15.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); - this.ribbonPanel15.Size = new System.Drawing.Size(1328, 95); + this.ribbonPanel15.Size = new System.Drawing.Size(1328, 62); // // // @@ -2843,7 +2465,7 @@ this.buttonItemXTGL}); this.ribbonBar20.Location = new System.Drawing.Point(3, 0); this.ribbonBar20.Name = "ribbonBar20"; - this.ribbonBar20.Size = new System.Drawing.Size(283, 92); + this.ribbonBar20.Size = new System.Drawing.Size(283, 59); this.ribbonBar20.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; this.ribbonBar20.TabIndex = 0; // @@ -3274,216 +2896,15 @@ this.buttonItemXT4_2.Text = "人员修改"; this.buttonItemXT4_2.Click += new System.EventHandler(this.buttonItemXT4_2_Click); // - // ribbonPanel3 - // - this.ribbonPanel3.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.ribbonPanel3.Controls.Add(this.ribbonBar4); - this.ribbonPanel3.Dock = System.Windows.Forms.DockStyle.Fill; - this.ribbonPanel3.Location = new System.Drawing.Point(0, 33); - this.ribbonPanel3.Name = "ribbonPanel3"; - this.ribbonPanel3.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); - this.ribbonPanel3.Size = new System.Drawing.Size(1328, 62); - // - // - // - this.ribbonPanel3.Style.Class = ""; - this.ribbonPanel3.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonPanel3.StyleMouseDown.Class = ""; - this.ribbonPanel3.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonPanel3.StyleMouseOver.Class = ""; - this.ribbonPanel3.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonPanel3.TabIndex = 40; - // - // ribbonBar4 - // - this.ribbonBar4.AutoOverflowEnabled = true; - // - // - // - this.ribbonBar4.BackgroundMouseOverStyle.Class = ""; - this.ribbonBar4.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonBar4.BackgroundStyle.Class = ""; - this.ribbonBar4.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonBar4.ContainerControlProcessDialogKey = true; - this.ribbonBar4.Dock = System.Windows.Forms.DockStyle.Left; - this.ribbonBar4.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { - this.btn_flag, - this.slider4ground}); - this.ribbonBar4.Location = new System.Drawing.Point(3, 0); - this.ribbonBar4.Name = "ribbonBar4"; - this.ribbonBar4.Size = new System.Drawing.Size(321, 59); - this.ribbonBar4.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.ribbonBar4.TabIndex = 0; - // - // - // - this.ribbonBar4.TitleStyle.Class = ""; - this.ribbonBar4.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonBar4.TitleStyleMouseOver.Class = ""; - this.ribbonBar4.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonBar4.TitleVisible = false; - // - // btn_flag - // - this.btn_flag.Image = global::Cyberpipe.Properties.Resources._24x24icon_03_hover; - this.btn_flag.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.btn_flag.Name = "btn_flag"; - this.btn_flag.SubItemsExpandWidth = 14; - this.btn_flag.Text = "标识器管理"; - this.btn_flag.Click += new System.EventHandler(this.btn_flag_Click); - // - // slider4ground - // - this.slider4ground.LabelPosition = DevComponents.DotNetBar.eSliderLabelPosition.Top; - this.slider4ground.LabelWidth = 50; - this.slider4ground.Name = "slider4ground"; - this.slider4ground.Text = "地面透明度"; - this.slider4ground.TextColor = System.Drawing.Color.Black; - this.slider4ground.Value = 0; - this.slider4ground.ValueChanged += new System.EventHandler(this.slider4ground_ValueChanged); - // - // ribbonPanel7 - // - this.ribbonPanel7.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.ribbonPanel7.Controls.Add(this.gxdw_ribbonbar); - this.ribbonPanel7.Dock = System.Windows.Forms.DockStyle.Fill; - this.ribbonPanel7.Location = new System.Drawing.Point(0, 33); - this.ribbonPanel7.Name = "ribbonPanel7"; - this.ribbonPanel7.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); - this.ribbonPanel7.Size = new System.Drawing.Size(1328, 62); - // - // - // - this.ribbonPanel7.Style.Class = ""; - this.ribbonPanel7.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonPanel7.StyleMouseDown.Class = ""; - this.ribbonPanel7.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonPanel7.StyleMouseOver.Class = ""; - this.ribbonPanel7.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonPanel7.TabIndex = 41; - this.ribbonPanel7.Visible = false; - // - // gxdw_ribbonbar - // - this.gxdw_ribbonbar.AutoOverflowEnabled = true; - // - // - // - this.gxdw_ribbonbar.BackgroundMouseOverStyle.Class = ""; - this.gxdw_ribbonbar.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.gxdw_ribbonbar.BackgroundStyle.Class = ""; - this.gxdw_ribbonbar.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.gxdw_ribbonbar.ContainerControlProcessDialogKey = true; - this.gxdw_ribbonbar.Dock = System.Windows.Forms.DockStyle.Left; - this.gxdw_ribbonbar.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { - this.buttonItem9, - this.buttonItem10, - this.buttonItem11, - this.buttonItem12, - this.buttonItem13, - this.buttonItem14}); - this.gxdw_ribbonbar.Location = new System.Drawing.Point(3, 0); - this.gxdw_ribbonbar.Name = "gxdw_ribbonbar"; - this.gxdw_ribbonbar.Size = new System.Drawing.Size(522, 59); - this.gxdw_ribbonbar.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.gxdw_ribbonbar.TabIndex = 0; - this.gxdw_ribbonbar.Text = "ribbonBar5"; - // - // - // - this.gxdw_ribbonbar.TitleStyle.Class = ""; - this.gxdw_ribbonbar.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.gxdw_ribbonbar.TitleStyleMouseOver.Class = ""; - this.gxdw_ribbonbar.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.gxdw_ribbonbar.TitleVisible = false; - // - // buttonItem9 - // - this.buttonItem9.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__76; - this.buttonItem9.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem9.Name = "buttonItem9"; - this.buttonItem9.SubItemsExpandWidth = 14; - this.buttonItem9.Text = "工单管理"; - this.buttonItem9.Click += new System.EventHandler(this.buttonItem9_Click); - // - // buttonItem10 - // - this.buttonItem10.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__69; - this.buttonItem10.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem10.Name = "buttonItem10"; - this.buttonItem10.SubItemsExpandWidth = 14; - this.buttonItem10.Text = "在线任务"; - this.buttonItem10.Click += new System.EventHandler(this.buttonItem10_Click); - // - // buttonItem11 - // - this.buttonItem11.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__72; - this.buttonItem11.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem11.Name = "buttonItem11"; - this.buttonItem11.SubItemsExpandWidth = 14; - this.buttonItem11.Text = "事件管理"; - this.buttonItem11.Click += new System.EventHandler(this.buttonItem11_Click); - // - // buttonItem12 - // - this.buttonItem12.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__34; - this.buttonItem12.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem12.Name = "buttonItem12"; - this.buttonItem12.SubItemsExpandWidth = 14; - this.buttonItem12.Text = "探测仪管理"; - this.buttonItem12.Click += new System.EventHandler(this.buttonItem12_Click); - // - // buttonItem13 - // - this.buttonItem13.Image = global::Cyberpipe.Properties.Resources._24x24icon_13_hover; - this.buttonItem13.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem13.Name = "buttonItem13"; - this.buttonItem13.SubItemsExpandWidth = 14; - this.buttonItem13.Text = "巡检人员维护"; - this.buttonItem13.Click += new System.EventHandler(this.buttonItem13_Click); - // - // buttonItem14 - // - this.buttonItem14.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__56; - this.buttonItem14.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem14.Name = "buttonItem14"; - this.buttonItem14.SubItemsExpandWidth = 14; - this.buttonItem14.Text = "导出施工图"; - this.buttonItem14.Click += new System.EventHandler(this.buttonItem14_Click); - // // ribbonPanel2 // this.ribbonPanel2.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; this.ribbonPanel2.Controls.Add(this.ribbonBar3); this.ribbonPanel2.Dock = System.Windows.Forms.DockStyle.Fill; - this.ribbonPanel2.Location = new System.Drawing.Point(0, 33); + this.ribbonPanel2.Location = new System.Drawing.Point(0, 0); this.ribbonPanel2.Name = "ribbonPanel2"; this.ribbonPanel2.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); - this.ribbonPanel2.Size = new System.Drawing.Size(1328, 62); + this.ribbonPanel2.Size = new System.Drawing.Size(1328, 95); // // // @@ -3527,7 +2948,7 @@ this.buttonItemPasswordReset}); this.ribbonBar3.Location = new System.Drawing.Point(3, 0); this.ribbonBar3.Name = "ribbonBar3"; - this.ribbonBar3.Size = new System.Drawing.Size(551, 59); + this.ribbonBar3.Size = new System.Drawing.Size(551, 92); this.ribbonBar3.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; this.ribbonBar3.TabIndex = 1; // @@ -3567,6 +2988,7 @@ this.btn_resc_info.Name = "btn_resc_info"; this.btn_resc_info.SubItemsExpandWidth = 14; this.btn_resc_info.Text = "资源管理"; + this.btn_resc_info.Visible = false; this.btn_resc_info.Click += new System.EventHandler(this.btn_resc_info_Click); // // btn_role_resc @@ -3605,6 +3027,605 @@ this.buttonItemPasswordReset.Text = "重置密码"; this.buttonItemPasswordReset.Click += new System.EventHandler(this.buttonItemPasswordReset_Click); // + // ribbonPanel6 + // + this.ribbonPanel6.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.ribbonPanel6.Controls.Add(this.ribbonBar6); + this.ribbonPanel6.Dock = System.Windows.Forms.DockStyle.Fill; + this.ribbonPanel6.Location = new System.Drawing.Point(0, 0); + this.ribbonPanel6.Name = "ribbonPanel6"; + this.ribbonPanel6.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); + this.ribbonPanel6.Size = new System.Drawing.Size(1328, 95); + // + // + // + this.ribbonPanel6.Style.Class = ""; + this.ribbonPanel6.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonPanel6.StyleMouseDown.Class = ""; + this.ribbonPanel6.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonPanel6.StyleMouseOver.Class = ""; + this.ribbonPanel6.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonPanel6.TabIndex = 38; + this.ribbonPanel6.Visible = false; + // + // ribbonBar6 + // + this.ribbonBar6.AutoOverflowEnabled = true; + // + // + // + this.ribbonBar6.BackgroundMouseOverStyle.Class = ""; + this.ribbonBar6.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonBar6.BackgroundStyle.Class = ""; + this.ribbonBar6.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar6.ContainerControlProcessDialogKey = true; + this.ribbonBar6.Dock = System.Windows.Forms.DockStyle.Left; + this.ribbonBar6.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { + this.buttonItemSPSZ, + this.buttonItem8, + this.buttonItemLocation, + this.sliderItem2, + this.buttonItemGBJC}); + this.ribbonBar6.Location = new System.Drawing.Point(3, 0); + this.ribbonBar6.Name = "ribbonBar6"; + this.ribbonBar6.Size = new System.Drawing.Size(427, 92); + this.ribbonBar6.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.ribbonBar6.TabIndex = 0; + // + // + // + this.ribbonBar6.TitleStyle.Class = ""; + this.ribbonBar6.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonBar6.TitleStyleMouseOver.Class = ""; + this.ribbonBar6.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar6.TitleVisible = false; + // + // buttonItemSPSZ + // + this.buttonItemSPSZ.Image = ((System.Drawing.Image)(resources.GetObject("buttonItemSPSZ.Image"))); + this.buttonItemSPSZ.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItemSPSZ.Name = "buttonItemSPSZ"; + this.buttonItemSPSZ.SubItemsExpandWidth = 14; + this.buttonItemSPSZ.Text = "双屏设置"; + this.buttonItemSPSZ.Click += new System.EventHandler(this.buttonItemSPSZ_Click); + // + // buttonItem8 + // + this.buttonItem8.Image = ((System.Drawing.Image)(resources.GetObject("buttonItem8.Image"))); + this.buttonItem8.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem8.Name = "buttonItem8"; + this.buttonItem8.SubItemsExpandWidth = 14; + this.buttonItem8.Text = "双屏分析"; + this.buttonItem8.Click += new System.EventHandler(this.buttonItem8_Click); + // + // buttonItemLocation + // + this.buttonItemLocation.Image = ((System.Drawing.Image)(resources.GetObject("buttonItemLocation.Image"))); + this.buttonItemLocation.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItemLocation.Name = "buttonItemLocation"; + this.buttonItemLocation.SubItemsExpandWidth = 14; + this.buttonItemLocation.Text = "快速定位"; + this.buttonItemLocation.Click += new System.EventHandler(this.buttonItemLocation_Click); + // + // sliderItem2 + // + this.sliderItem2.LabelPosition = DevComponents.DotNetBar.eSliderLabelPosition.Top; + this.sliderItem2.LabelWidth = 50; + this.sliderItem2.Name = "sliderItem2"; + this.sliderItem2.Text = "地面透明度"; + this.sliderItem2.TextColor = System.Drawing.Color.Black; + this.sliderItem2.Value = 0; + this.sliderItem2.ValueChanged += new System.EventHandler(this.sliderItem2_ValueChanged); + // + // buttonItemGBJC + // + this.buttonItemGBJC.Image = ((System.Drawing.Image)(resources.GetObject("buttonItemGBJC.Image"))); + this.buttonItemGBJC.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItemGBJC.Name = "buttonItemGBJC"; + this.buttonItemGBJC.SubItemsExpandWidth = 14; + this.buttonItemGBJC.Text = "国标检测"; + this.buttonItemGBJC.Click += new System.EventHandler(this.buttonItemGBJC_Click); + // + // ribbonPanel5 + // + this.ribbonPanel5.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.ribbonPanel5.Controls.Add(this.ribbonBar2); + this.ribbonPanel5.Dock = System.Windows.Forms.DockStyle.Fill; + this.ribbonPanel5.Location = new System.Drawing.Point(0, 33); + this.ribbonPanel5.Name = "ribbonPanel5"; + this.ribbonPanel5.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); + this.ribbonPanel5.Size = new System.Drawing.Size(1328, 62); + // + // + // + this.ribbonPanel5.Style.Class = ""; + this.ribbonPanel5.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonPanel5.StyleMouseDown.Class = ""; + this.ribbonPanel5.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonPanel5.StyleMouseOver.Class = ""; + this.ribbonPanel5.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonPanel5.TabIndex = 37; + this.ribbonPanel5.Visible = false; + // + // ribbonBar2 + // + this.ribbonBar2.AutoOverflowEnabled = true; + // + // + // + this.ribbonBar2.BackgroundMouseOverStyle.Class = ""; + this.ribbonBar2.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonBar2.BackgroundStyle.Class = ""; + this.ribbonBar2.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar2.ContainerControlProcessDialogKey = true; + this.ribbonBar2.Dock = System.Windows.Forms.DockStyle.Left; + this.ribbonBar2.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { + this.buttonItemHX1, + this.buttonItemHX2, + this.buttonItemDCTP, + this.sliderItem3}); + this.ribbonBar2.Location = new System.Drawing.Point(3, 0); + this.ribbonBar2.Name = "ribbonBar2"; + this.ribbonBar2.Size = new System.Drawing.Size(350, 59); + this.ribbonBar2.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.ribbonBar2.TabIndex = 0; + // + // + // + this.ribbonBar2.TitleStyle.Class = ""; + this.ribbonBar2.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonBar2.TitleStyleMouseOver.Class = ""; + this.ribbonBar2.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar2.TitleVisible = false; + // + // buttonItemHX1 + // + this.buttonItemHX1.AutoExpandOnClick = true; + this.buttonItemHX1.Image = ((System.Drawing.Image)(resources.GetObject("buttonItemHX1.Image"))); + this.buttonItemHX1.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItemHX1.Name = "buttonItemHX1"; + this.buttonItemHX1.SubItemsExpandWidth = 14; + this.buttonItemHX1.Text = "导入红线"; + this.buttonItemHX1.Click += new System.EventHandler(this.buttonItemHX1_Click); + // + // buttonItemHX2 + // + this.buttonItemHX2.Image = ((System.Drawing.Image)(resources.GetObject("buttonItemHX2.Image"))); + this.buttonItemHX2.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItemHX2.Name = "buttonItemHX2"; + this.buttonItemHX2.SubItemsExpandWidth = 14; + this.buttonItemHX2.Text = "红线审核"; + this.buttonItemHX2.Click += new System.EventHandler(this.buttonItemHX2_Click); + // + // buttonItemDCTP + // + this.buttonItemDCTP.Image = ((System.Drawing.Image)(resources.GetObject("buttonItemDCTP.Image"))); + this.buttonItemDCTP.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItemDCTP.Name = "buttonItemDCTP"; + this.buttonItemDCTP.SubItemsExpandWidth = 14; + this.buttonItemDCTP.Text = "导出图片"; + this.buttonItemDCTP.Click += new System.EventHandler(this.buttonItemDCTP_Click); + // + // sliderItem3 + // + this.sliderItem3.LabelPosition = DevComponents.DotNetBar.eSliderLabelPosition.Top; + this.sliderItem3.LabelWidth = 50; + this.sliderItem3.Name = "sliderItem3"; + this.sliderItem3.Text = "地面透明度"; + this.sliderItem3.TextColor = System.Drawing.Color.Black; + this.sliderItem3.Value = 0; + this.sliderItem3.ValueChanged += new System.EventHandler(this.sliderItem3_ValueChanged); + // + // ribbonPanel1 + // + this.ribbonPanel1.AutoSize = true; + this.ribbonPanel1.CanvasColor = System.Drawing.Color.Gray; + this.ribbonPanel1.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.ribbonPanel1.Controls.Add(this.ribbonBar21); + this.ribbonPanel1.Dock = System.Windows.Forms.DockStyle.Fill; + this.ribbonPanel1.Location = new System.Drawing.Point(0, 33); + this.ribbonPanel1.Name = "ribbonPanel1"; + this.ribbonPanel1.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); + this.ribbonPanel1.Size = new System.Drawing.Size(1328, 62); + // + // + // + this.ribbonPanel1.Style.Class = ""; + this.ribbonPanel1.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonPanel1.StyleMouseDown.Class = ""; + this.ribbonPanel1.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonPanel1.StyleMouseOver.Class = ""; + this.ribbonPanel1.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonPanel1.TabIndex = 1; + this.ribbonPanel1.Visible = false; + // + // ribbonBar21 + // + this.ribbonBar21.AutoOverflowEnabled = true; + this.ribbonBar21.BackColor = System.Drawing.Color.White; + // + // + // + this.ribbonBar21.BackgroundMouseOverStyle.Class = ""; + this.ribbonBar21.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonBar21.BackgroundStyle.Class = ""; + this.ribbonBar21.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar21.ContainerControlProcessDialogKey = true; + this.ribbonBar21.Dock = System.Windows.Forms.DockStyle.Left; + this.ribbonBar21.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { + this.buttonItem87, + this.buttonItem88, + this.buttonItem27, + this.sliderGroundTransSet1, + this.buttonItem91, + this.buttonItem1, + this.btnlegendSet, + this.buttonItem89, + this.btnOutputJPG}); + this.ribbonBar21.Location = new System.Drawing.Point(3, 0); + this.ribbonBar21.Name = "ribbonBar21"; + this.ribbonBar21.Size = new System.Drawing.Size(649, 59); + this.ribbonBar21.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.ribbonBar21.TabIndex = 2; + this.ribbonBar21.Text = "浏览模式"; + // + // + // + this.ribbonBar21.TitleStyle.Class = ""; + this.ribbonBar21.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonBar21.TitleStyleMouseOver.Class = ""; + this.ribbonBar21.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar21.TitleVisible = false; + // + // buttonItem87 + // + this.buttonItem87.Image = ((System.Drawing.Image)(resources.GetObject("buttonItem87.Image"))); + this.buttonItem87.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem87.Name = "buttonItem87"; + this.buttonItem87.SubItemsExpandWidth = 14; + this.buttonItem87.Text = "地上模式"; + this.buttonItem87.Click += new System.EventHandler(this.buttonItem87_Click); + // + // buttonItem88 + // + this.buttonItem88.Image = ((System.Drawing.Image)(resources.GetObject("buttonItem88.Image"))); + this.buttonItem88.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem88.Name = "buttonItem88"; + this.buttonItem88.SubItemsExpandWidth = 14; + this.buttonItem88.Text = "地下模式"; + this.buttonItem88.Click += new System.EventHandler(this.buttonItem88_Click); + // + // buttonItem27 + // + this.buttonItem27.Image = ((System.Drawing.Image)(resources.GetObject("buttonItem27.Image"))); + this.buttonItem27.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem27.Name = "buttonItem27"; + this.buttonItem27.SubItemsExpandWidth = 14; + this.buttonItem27.Text = "行走模式"; + this.buttonItem27.Click += new System.EventHandler(this.buttonItem27_Click); + // + // buttonItem91 + // + this.buttonItem91.ForeColor = System.Drawing.Color.Black; + this.buttonItem91.Image = ((System.Drawing.Image)(resources.GetObject("buttonItem91.Image"))); + this.buttonItem91.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem91.Name = "buttonItem91"; + this.buttonItem91.SubItemsExpandWidth = 14; + this.buttonItem91.Text = "快速定位"; + this.buttonItem91.Click += new System.EventHandler(this.buttonItem91_Click); + // + // buttonItem1 + // + this.buttonItem1.Image = ((System.Drawing.Image)(resources.GetObject("buttonItem1.Image"))); + this.buttonItem1.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem1.Name = "buttonItem1"; + this.buttonItem1.SubItemsExpandWidth = 14; + this.buttonItem1.Text = "图层管理"; + this.buttonItem1.Click += new System.EventHandler(this.buttonItem1_Click); + // + // btnlegendSet + // + this.btnlegendSet.Image = ((System.Drawing.Image)(resources.GetObject("btnlegendSet.Image"))); + this.btnlegendSet.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.btnlegendSet.Name = "btnlegendSet"; + this.btnlegendSet.SubItemsExpandWidth = 14; + this.btnlegendSet.Text = "图例"; + this.btnlegendSet.Click += new System.EventHandler(this.btnlegendSet_Click); + // + // buttonItem89 + // + this.buttonItem89.Image = ((System.Drawing.Image)(resources.GetObject("buttonItem89.Image"))); + this.buttonItem89.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem89.Name = "buttonItem89"; + this.buttonItem89.SubItemsExpandWidth = 14; + this.buttonItem89.Text = "全屏显示"; + this.buttonItem89.Click += new System.EventHandler(this.buttonItem89_Click); + // + // btnOutputJPG + // + this.btnOutputJPG.Image = ((System.Drawing.Image)(resources.GetObject("btnOutputJPG.Image"))); + this.btnOutputJPG.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.btnOutputJPG.Name = "btnOutputJPG"; + this.btnOutputJPG.SubItemsExpandWidth = 14; + this.btnOutputJPG.Text = "导出图片"; + this.btnOutputJPG.Click += new System.EventHandler(this.btnOutputJPG_Click); + // + // ribbonPanel12 + // + this.ribbonPanel12.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.ribbonPanel12.Controls.Add(this.ribbonBar18); + this.ribbonPanel12.Controls.Add(this.ribbonBar13); + this.ribbonPanel12.Dock = System.Windows.Forms.DockStyle.Fill; + this.ribbonPanel12.Location = new System.Drawing.Point(0, 33); + this.ribbonPanel12.Name = "ribbonPanel12"; + this.ribbonPanel12.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); + this.ribbonPanel12.Size = new System.Drawing.Size(1328, 62); + // + // + // + this.ribbonPanel12.Style.Class = ""; + this.ribbonPanel12.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonPanel12.StyleMouseDown.Class = ""; + this.ribbonPanel12.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonPanel12.StyleMouseOver.Class = ""; + this.ribbonPanel12.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonPanel12.TabIndex = 34; + this.ribbonPanel12.Visible = false; + // + // ribbonBar18 + // + this.ribbonBar18.AutoOverflowEnabled = true; + // + // + // + this.ribbonBar18.BackgroundMouseOverStyle.Class = ""; + this.ribbonBar18.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonBar18.BackgroundStyle.Class = ""; + this.ribbonBar18.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar18.ContainerControlProcessDialogKey = true; + this.ribbonBar18.Dock = System.Windows.Forms.DockStyle.Left; + this.ribbonBar18.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { + this.buttonItem133, + this.buttonItem132}); + this.ribbonBar18.Location = new System.Drawing.Point(508, 0); + this.ribbonBar18.Name = "ribbonBar18"; + this.ribbonBar18.Size = new System.Drawing.Size(75, 59); + this.ribbonBar18.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.ribbonBar18.TabIndex = 1; + // + // + // + this.ribbonBar18.TitleStyle.Class = ""; + this.ribbonBar18.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonBar18.TitleStyleMouseOver.Class = ""; + this.ribbonBar18.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar18.TitleVisible = false; + // + // buttonItem133 + // + this.buttonItem133.Image = ((System.Drawing.Image)(resources.GetObject("buttonItem133.Image"))); + this.buttonItem133.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem133.Name = "buttonItem133"; + this.buttonItem133.SubItemsExpandWidth = 14; + this.buttonItem133.Text = "审核入库"; + this.buttonItem133.Click += new System.EventHandler(this.buttonItem133_Click_1); + // + // buttonItem132 + // + this.buttonItem132.Name = "buttonItem132"; + // + // ribbonBar13 + // + this.ribbonBar13.AutoOverflowEnabled = true; + // + // + // + this.ribbonBar13.BackgroundMouseOverStyle.Class = ""; + this.ribbonBar13.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonBar13.BackgroundStyle.Class = ""; + this.ribbonBar13.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar13.ContainerControlProcessDialogKey = true; + this.ribbonBar13.Dock = System.Windows.Forms.DockStyle.Left; + this.ribbonBar13.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { + this.buttonItem127, + this.buttonItem128, + this.sliderItem1, + this.buttonItem134, + this.buttonItem130, + this.btn_check_history}); + this.ribbonBar13.Location = new System.Drawing.Point(3, 0); + this.ribbonBar13.Name = "ribbonBar13"; + this.ribbonBar13.Size = new System.Drawing.Size(505, 59); + this.ribbonBar13.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.ribbonBar13.TabIndex = 0; + // + // + // + this.ribbonBar13.TitleStyle.Class = ""; + this.ribbonBar13.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonBar13.TitleStyleMouseOver.Class = ""; + this.ribbonBar13.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar13.TitleVisible = false; + // + // buttonItem127 + // + this.buttonItem127.Image = ((System.Drawing.Image)(resources.GetObject("buttonItem127.Image"))); + this.buttonItem127.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem127.Name = "buttonItem127"; + this.buttonItem127.SubItemsExpandWidth = 14; + this.buttonItem127.Text = "打开数据"; + this.buttonItem127.Click += new System.EventHandler(this.buttonItem127_Click_2); + // + // buttonItem128 + // + this.buttonItem128.Image = ((System.Drawing.Image)(resources.GetObject("buttonItem128.Image"))); + this.buttonItem128.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem128.Name = "buttonItem128"; + this.buttonItem128.SubItemsExpandWidth = 14; + this.buttonItem128.Text = "一键审核"; + this.buttonItem128.Click += new System.EventHandler(this.buttonItem128_Click); + // + // sliderItem1 + // + this.sliderItem1.LabelPosition = DevComponents.DotNetBar.eSliderLabelPosition.Top; + this.sliderItem1.LabelWidth = 50; + this.sliderItem1.Name = "sliderItem1"; + this.sliderItem1.Text = "地面透明度"; + this.sliderItem1.TextColor = System.Drawing.Color.Black; + this.sliderItem1.Value = 0; + this.sliderItem1.ValueChanged += new System.EventHandler(this.sliderItem1_ValueChanged); + // + // buttonItem134 + // + this.buttonItem134.Image = ((System.Drawing.Image)(resources.GetObject("buttonItem134.Image"))); + this.buttonItem134.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem134.Name = "buttonItem134"; + this.buttonItem134.SubItemsExpandWidth = 14; + this.buttonItem134.Text = "模拟设计修改"; + this.buttonItem134.Click += new System.EventHandler(this.buttonItem134_Click_1); + // + // buttonItem130 + // + this.buttonItem130.Image = ((System.Drawing.Image)(resources.GetObject("buttonItem130.Image"))); + this.buttonItem130.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem130.Name = "buttonItem130"; + this.buttonItem130.SubItemsExpandWidth = 14; + this.buttonItem130.Text = "导出审核图"; + this.buttonItem130.Click += new System.EventHandler(this.buttonItem130_Click_1); + // + // btn_check_history + // + this.btn_check_history.Image = ((System.Drawing.Image)(resources.GetObject("btn_check_history.Image"))); + this.btn_check_history.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.btn_check_history.Name = "btn_check_history"; + this.btn_check_history.SubItemsExpandWidth = 14; + this.btn_check_history.Text = "审核历史"; + this.btn_check_history.Click += new System.EventHandler(this.btn_check_history_Click); + // + // ribbonPanel4 + // + this.ribbonPanel4.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.ribbonPanel4.Controls.Add(this.ribbonBar1); + this.ribbonPanel4.Dock = System.Windows.Forms.DockStyle.Fill; + this.ribbonPanel4.Location = new System.Drawing.Point(0, 33); + this.ribbonPanel4.Name = "ribbonPanel4"; + this.ribbonPanel4.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); + this.ribbonPanel4.Size = new System.Drawing.Size(1328, 62); + // + // + // + this.ribbonPanel4.Style.Class = ""; + this.ribbonPanel4.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonPanel4.StyleMouseDown.Class = ""; + this.ribbonPanel4.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonPanel4.StyleMouseOver.Class = ""; + this.ribbonPanel4.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonPanel4.TabIndex = 36; + this.ribbonPanel4.Visible = false; + // + // ribbonBar1 + // + this.ribbonBar1.AutoOverflowEnabled = true; + // + // + // + this.ribbonBar1.BackgroundMouseOverStyle.Class = ""; + this.ribbonBar1.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonBar1.BackgroundStyle.Class = ""; + this.ribbonBar1.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar1.ContainerControlProcessDialogKey = true; + this.ribbonBar1.Dock = System.Windows.Forms.DockStyle.Left; + this.ribbonBar1.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { + this.btn_document_info}); + this.ribbonBar1.Location = new System.Drawing.Point(3, 0); + this.ribbonBar1.Name = "ribbonBar1"; + this.ribbonBar1.Size = new System.Drawing.Size(88, 59); + this.ribbonBar1.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.ribbonBar1.TabIndex = 0; + // + // + // + this.ribbonBar1.TitleStyle.Class = ""; + this.ribbonBar1.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonBar1.TitleStyleMouseOver.Class = ""; + this.ribbonBar1.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar1.TitleVisible = false; + // + // btn_document_info + // + this.btn_document_info.Image = ((System.Drawing.Image)(resources.GetObject("btn_document_info.Image"))); + this.btn_document_info.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.btn_document_info.Name = "btn_document_info"; + this.btn_document_info.SubItemsExpandWidth = 14; + this.btn_document_info.Text = "文档管理"; + this.btn_document_info.Click += new System.EventHandler(this.btn_document_info_Click); + // // ribbonTabItem1 // this.ribbonTabItem1.ButtonStyle = DevComponents.DotNetBar.eButtonStyle.ImageAndText; @@ -3673,7 +3694,6 @@ this.ribbonTabItem7.Name = "ribbonTabItem7"; this.ribbonTabItem7.Panel = this.ribbonPanel7; this.ribbonTabItem7.Text = "管线定位"; - this.ribbonTabItem7.MouseDown += new System.Windows.Forms.MouseEventHandler(this.ribbonTabItem7_MouseDown); // // ribbonTabItem5 // @@ -3684,7 +3704,6 @@ this.ribbonTabItem5.Name = "ribbonTabItem5"; this.ribbonTabItem5.Panel = this.ribbonPanel3; this.ribbonTabItem5.Text = "标识器管理"; - this.ribbonTabItem5.MouseDown += new System.Windows.Forms.MouseEventHandler(this.ribbonTabItem5_MouseDown); // // ribbonTabItem2 // @@ -4451,7 +4470,7 @@ this.dataGridViewX2.ReadOnly = true; this.dataGridViewX2.RowHeadersVisible = false; this.dataGridViewX2.RowTemplate.Height = 23; - this.dataGridViewX2.Size = new System.Drawing.Size(31081, 92); + this.dataGridViewX2.Size = new System.Drawing.Size(31378, 92); this.dataGridViewX2.TabIndex = 11; // // dataGridViewTextBoxColumn10 @@ -4545,7 +4564,7 @@ this.dataGridViewX3.ReadOnly = true; this.dataGridViewX3.RowHeadersVisible = false; this.dataGridViewX3.RowTemplate.Height = 23; - this.dataGridViewX3.Size = new System.Drawing.Size(31080, 127); + this.dataGridViewX3.Size = new System.Drawing.Size(31377, 127); this.dataGridViewX3.TabIndex = 5; this.dataGridViewX3.MouseDoubleClick += new System.Windows.Forms.MouseEventHandler(this.dataGridViewX3_MouseDoubleClick); // @@ -5722,7 +5741,8 @@ // pictureBox1 // this.pictureBox1.Dock = System.Windows.Forms.DockStyle.Top; - this.pictureBox1.Image = ((System.Drawing.Image)(resources.GetObject("pictureBox1.Image"))); +// this.pictureBox1.Image = ((System.Drawing.Image)(resources.GetObject("pictureBox1.Image"))); + this.pictureBox1.Image = Image.FromFile(Application.StartupPath + Utility.TitleImagePath); this.pictureBox1.Location = new System.Drawing.Point(0, 0); this.pictureBox1.Margin = new System.Windows.Forms.Padding(0); this.pictureBox1.Name = "pictureBox1"; @@ -5732,18 +5752,6 @@ this.pictureBox1.TabStop = false; this.pictureBox1.Paint += new System.Windows.Forms.PaintEventHandler(this.pictureBox1_Paint); // - // layerTree - // - this.layerTree.CheckBoxes = true; - this.layerTree.ItemHeight = 18; - this.layerTree.Location = new System.Drawing.Point(30, 78); - this.layerTree.Name = "layerTree"; - this.layerTree.Size = new System.Drawing.Size(121, 97); - this.layerTree.TabIndex = 1; - this.layerTree.AfterCheck += new System.Windows.Forms.TreeViewEventHandler(this.layerTree_AfterCheck); - this.layerTree.NodeMouseClick += new System.Windows.Forms.TreeNodeMouseClickEventHandler(this.layerTree_NodeMouseClick); - this.layerTree.NodeMouseDoubleClick += new System.Windows.Forms.TreeNodeMouseClickEventHandler(this.layerTree_NodeMouseDoubleClick); - // // MainFrm // this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Inherit; @@ -5770,7 +5778,8 @@ this.KeyPreview = true; this.Name = "MainFrm"; this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen; - this.Text = "智慧太湖新城管网规划分析系统6.0"; +// this.Text = "智慧太湖新城管网规划分析系统6.0"; + this.Text = Utility.SysnameVersion; this.WindowState = System.Windows.Forms.FormWindowState.Maximized; this.FormClosing += new System.Windows.Forms.FormClosingEventHandler(this.MainFrm_FormClosing); this.Load += new System.EventHandler(this.MainFrm_Load); @@ -5787,15 +5796,15 @@ this.contextMenuStripDeleteLayerNode.ResumeLayout(false); this.ribbonControl1.ResumeLayout(false); this.ribbonControl1.PerformLayout(); + this.ribbonPanel3.ResumeLayout(false); + this.ribbonPanel7.ResumeLayout(false); + this.ribbonPanel15.ResumeLayout(false); + this.ribbonPanel2.ResumeLayout(false); this.ribbonPanel6.ResumeLayout(false); this.ribbonPanel5.ResumeLayout(false); this.ribbonPanel1.ResumeLayout(false); this.ribbonPanel12.ResumeLayout(false); this.ribbonPanel4.ResumeLayout(false); - this.ribbonPanel15.ResumeLayout(false); - this.ribbonPanel3.ResumeLayout(false); - this.ribbonPanel7.ResumeLayout(false); - this.ribbonPanel2.ResumeLayout(false); this.panelOfTable.ResumeLayout(false); this.panelOfTable.PerformLayout(); ((System.ComponentModel.ISupportInitialize)(this.dataGridViewX1)).EndInit(); @@ -5955,6 +5964,7 @@ private RibbonTabItem ribbonTabItem11; private ButtonItem buttonItem130; private RibbonBar ribbonBar18; + private ButtonItem buttonItem132; private SliderItem sliderItem1; private ButtonItem buttonItem133; private ButtonItem buttonItem134; diff --git a/MainFrm.resx b/MainFrm.resx index 9f9bba4..ce490c1 100644 --- a/MainFrm.resx +++ b/MainFrm.resx @@ -351,6 +351,146 @@ 766, 54 + + + iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 + YQUAAAAZdEVYdFNvZnR3YXJlAEFkb2JlIEltYWdlUmVhZHlxyWU8AAADZmlUWHRYTUw6Y29tLmFkb2Jl + LnhtcAAAAAAAPD94cGFja2V0IGJlZ2luPSLvu78iIGlkPSJXNU0wTXBDZWhpSHpyZVN6TlRjemtjOWQi + Pz4gPHg6eG1wbWV0YSB4bWxuczp4PSJhZG9iZTpuczptZXRhLyIgeDp4bXB0az0iQWRvYmUgWE1QIENv + cmUgNS4zLWMwMTEgNjYuMTQ1NjYxLCAyMDEyLzAyLzA2LTE0OjU2OjI3ICAgICAgICAiPiA8cmRmOlJE + RiB4bWxuczpyZGY9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkvMDIvMjItcmRmLXN5bnRheC1ucyMiPiA8 + cmRmOkRlc2NyaXB0aW9uIHJkZjphYm91dD0iIiB4bWxuczp4bXBNTT0iaHR0cDovL25zLmFkb2JlLmNv + bS94YXAvMS4wL21tLyIgeG1sbnM6c3RSZWY9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlw + ZS9SZXNvdXJjZVJlZiMiIHhtbG5zOnhtcD0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wLyIgeG1w + TU06T3JpZ2luYWxEb2N1bWVudElEPSJ4bXAuZGlkOjYzQTM5NEY4Mjg0OUU0MTE5NDBEQTc4ODZEQzk5 + N0NGIiB4bXBNTTpEb2N1bWVudElEPSJ4bXAuZGlkOjEwQ0IxNzBBNEM1QzExRTRBNkNGQzRBMjhDQzI0 + MkY4IiB4bXBNTTpJbnN0YW5jZUlEPSJ4bXAuaWlkOjEwQ0IxNzA5NEM1QzExRTRBNkNGQzRBMjhDQzI0 + MkY4IiB4bXA6Q3JlYXRvclRvb2w9IkFkb2JlIFBob3Rvc2hvcCBDUzYgKFdpbmRvd3MpIj4gPHhtcE1N + OkRlcml2ZWRGcm9tIHN0UmVmOmluc3RhbmNlSUQ9InhtcC5paWQ6NTEzMDNDMjA1QjRDRTQxMTg4NERE + MUVBOEQ4QTgyNTUiIHN0UmVmOmRvY3VtZW50SUQ9InhtcC5kaWQ6NjNBMzk0RjgyODQ5RTQxMTk0MERB + Nzg4NkRDOTk3Q0YiLz4gPC9yZGY6RGVzY3JpcHRpb24+IDwvcmRmOlJERj4gPC94OnhtcG1ldGE+IDw/ + eHBhY2tldCBlbmQ9InIiPz43wa2/AAAFaUlEQVRIS6WUC0xTVxzGKy0UkSmlFGjBFilSkNpSaAWRh63y + sIiAArKs4spLRLQoiEJlSMGoMCc6CBOnYHzMOHUqqOhEHOqCbjNu6kCd6KYje5mZ6KbObd/OuVL3cEzj + /skv997/+b7v39PTW9aj3/BM+OKxPEIZoW/gyrOuPbP+GvRPSNBQQqXYLwSW1etw7cYt5kqfaZ+uD8QM + Xg8f/f4UxGhHMHv4qlG6vAb9394G6T+BPpdV1oCuUx3VD8Q9XT8//PUJRMghlLhLg1C41IK+r/pB+oNC + 16mO6qmP+gdi/6y793+hwTYEk9uoQOSaStHzxQ2Q/nND9XMKy0D9NIfmDcSzaLhI4KXE7LwinLtwGXfu + PXhhqJ/m0DyS62EdUGWpqcf3P97DD3d++t/QnKraBjpghXWAiC+WN0ZNScOe1mP45vbdF2ZvWwdoDs/D + b6ejs6ecxHPoAG/l+Fhkzy+FyCcY0YkG7D/yAW5+d+e5oXrqo36aQ/McnNyjyAAuHWA05pfgzPlehhyT + mflV6FOMaDt2Ctf7bw8KXac6qqc+a4Zx3hLwRLJCZgcJjcPIEPkyIZmeX1SB7vOX0dn9KQy5jw8r8eVc + HOrsxidXP0d9hxlzd4QgeYMzEt7kQVvOR0pFFNpOHmd81E9znIS+dSTc1foVGWfNKUZjyy6Ex6SQl0cD + 09IVxHAFh0+cReqr+QjK8ERqEw+VHWOwoycSR/v1OHwzDlsvhcNCeqkbedAYxQiPm87kZOQVw0nkW0QG + 2DFnIA+JRm3DFpzr/RKNW3ZDE5UAsX8ocizZiFs7DEUHvPFunw4Hb05B+y09jn49lYHe0x5doxqqLVlf + DJrnyB+pIQNs6QAhf6R8tZu3CqpwPdZu2I6PLl3HwnV5iHv9JVSeUOKdqzq81xeDvddiYG73R0aLEIZm + IRa1jUbjxQnYRHa17YqW0VJPwHT3LocRbirrDiymspXo6L6AgiXV8JSNQ2i6GpNWOqK4U4n1n0Vge68W + 9ecmIKnBBSqDCIp4P2RWGDB/QxqS6l1QcToIld3BqDobgsXEQ73+Se5HrGcgdJEokGzIx66DXXi7dRvC + yx2Q2RqApR+GoPbjCag8pUZ6sxjqWRKEldljRr07ZjaKmHt5qpBZKzkeiIJ2BbIPKmA8MIbJUC/ghrM0 + RfYsDtdhqJNIVulK/ku0BQokbfZGZrsKBR3BmEsMOfvl0FY7o7ypDPo1brCcGc+QUCdExabXEFsjQO4B + ObL2BSBlqx8SWwibvBE0334nK3Ael+yEbIW81DZszlhZ2oieuAYvpO5VIHGzP9J2+CN9pz/CzDwExMox + eZUbFnZpkEc+gLZagJjMWOiqXZDVqmC0+kZf6Nb4IHKFCPIsu92sgCw7BlJswjBJLCdenmuPyFUS6Gp9 + oG/yRdJWGSKqhYjKDgLRImK5ACGlzsy9d/zwXn2DBMZDSkZLPaHlnpBncyGO5kxj+Rps/wYdJE2xzfOb + zcU4sye0b0gRu3E0Ypt8ELTICRFGNcShUgjHuZyWxNu2096sdiXS9o1ltNQjyyDhes4SkuXEGpXC+Ve8 + kjlzpDPtoCkVQrdOihgyIHmXP6LryGEX86Ba6ISJNR7IeF+JV8gAfbOM0XoTj8dktpmEOxM4rJHTBscz + njNNnMiBagEfU98ajRnbZMg7GojCk2oGU1cw5nUGw7BHAZWJD6oVhLFzSDCPCacljGP/J7xAm6Hu0ew6 + STIXkcvckN7ig8XHVCjvUiNvdwAmW0Twms6FayS7meM4REoihxPoeT4u10nsZ0LKhhdsIxZEsVcLtOyL + pHffVcd+IJjI7uGHsRscJEPURMMn2FMtNTwuFusPrjFl48ji7nIAAAAASUVORK5CYII= + + + + + iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 + YQUAAAAZdEVYdFNvZnR3YXJlAEFkb2JlIEltYWdlUmVhZHlxyWU8AAADZmlUWHRYTUw6Y29tLmFkb2Jl + LnhtcAAAAAAAPD94cGFja2V0IGJlZ2luPSLvu78iIGlkPSJXNU0wTXBDZWhpSHpyZVN6TlRjemtjOWQi + Pz4gPHg6eG1wbWV0YSB4bWxuczp4PSJhZG9iZTpuczptZXRhLyIgeDp4bXB0az0iQWRvYmUgWE1QIENv + cmUgNS4zLWMwMTEgNjYuMTQ1NjYxLCAyMDEyLzAyLzA2LTE0OjU2OjI3ICAgICAgICAiPiA8cmRmOlJE + RiB4bWxuczpyZGY9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkvMDIvMjItcmRmLXN5bnRheC1ucyMiPiA8 + cmRmOkRlc2NyaXB0aW9uIHJkZjphYm91dD0iIiB4bWxuczp4bXBNTT0iaHR0cDovL25zLmFkb2JlLmNv + bS94YXAvMS4wL21tLyIgeG1sbnM6c3RSZWY9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlw + ZS9SZXNvdXJjZVJlZiMiIHhtbG5zOnhtcD0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wLyIgeG1w + TU06T3JpZ2luYWxEb2N1bWVudElEPSJ4bXAuZGlkOjYzQTM5NEY4Mjg0OUU0MTE5NDBEQTc4ODZEQzk5 + N0NGIiB4bXBNTTpEb2N1bWVudElEPSJ4bXAuZGlkOkUyMTg3NjEyNDlEODExRTQ4NjNGQjM2Mzk1QkNB + RkQwIiB4bXBNTTpJbnN0YW5jZUlEPSJ4bXAuaWlkOkUyMTg3NjExNDlEODExRTQ4NjNGQjM2Mzk1QkNB + RkQwIiB4bXA6Q3JlYXRvclRvb2w9IkFkb2JlIFBob3Rvc2hvcCBDUzYgKFdpbmRvd3MpIj4gPHhtcE1N + OkRlcml2ZWRGcm9tIHN0UmVmOmluc3RhbmNlSUQ9InhtcC5paWQ6NkJCNTE0NDlEODQ5RTQxMUE0QzNB + MjdEOTJBQzc3QkMiIHN0UmVmOmRvY3VtZW50SUQ9InhtcC5kaWQ6NjNBMzk0RjgyODQ5RTQxMTk0MERB + Nzg4NkRDOTk3Q0YiLz4gPC9yZGY6RGVzY3JpcHRpb24+IDwvcmRmOlJERj4gPC94OnhtcG1ldGE+IDw/ + eHBhY2tldCBlbmQ9InIiPz5e5MstAAADiUlEQVRIS+2UW0yTdxjGcePwtYyVVpAUCi1tv9ImrVbxhAei + kjGphAgFT4jzEJ0gGuJhDk0sml0sglmWmC1hqHNKWwI4srgNh3phpjg1O1yIN5DMbFHQZUu42O76+D4f + 3Fl6Z7ILn+SXvH3f533++X/98iUBeKW81v9Uwx1G1+1240EhfKfdeE/4U3qTAqaZZO/2aeN9IXLrY+Ph + wVOZHll9YyohgYZOGS4JsYdXVDy+NQ8Tvy3BP6OlmPyjDP9OBDRYs8cZPfRy5/uQISIRqcIsLSye+j7I + wN+PluOvhyWY+NmL8fsOjP9kxdN7BRh/YJHfFjy5m48nd4ThQjy968bEgwV49usicFciTEKKFhZPXXv1 + eHxtLsYGPBjttwsWjF0xY+ybOfj9uylYs8cZPfQS7kpEnqDTwuLp9GYlfKZeifUfzcb1j/Iw/IkNv3Q6 + MfKVC6O9bg3W7HFGD73cORlMG5AIizDzAaVtunD5ESXWfNSEY/tNCO00oG1zOkJBBSeqUjVYh6R3Qmat + zSY0Hjah7IASW7hPuSoRvIGihcVTSauCppvFODRUjJZvPWgaKMTuXgt2RHOxLTwHDd3EjPfCudgesWJX + jxM7eryo7/Ni8SGFj8gp6LWwePLvS0Og043A5y5UdtkQOJeLivM5ePf8bJSfM04zG2u7chDoysW6Thsq + zqpY0+GAvymNB/gEgxYWT64tKdGihpSYv8WEpSEzVp0pwDuf2SVQReCiS4M1e5zRQy937NXJ1yRirjDz + AVmVJyNZa9+PObauh7ptKdR6FY6N2SisTYe1OlmDNXtqvRNqwxLYt1TCVLY1ZijZOSQRbuEtLSyeTOXH + sfLDH1EauoFFx6/Cd6Qf7pYI1ObLsO+9iMLdF+DccwEuqd2Nl+Br6sbCxiiKd/XBuPogH1HiAzJXHMC8 + YA98td1wb4rCuaEH1roo8oMR5JGaMPIFa10Ejtowiuouw1vzJTwVXyBz+X4ekPgRZfgbohkLtsfMy47B + tqYdakUnPFUM6YUv+LUGa/Y4o8e8rBXcSffWDkpE4j9ZpEvNmb9KsZV16BzrBnVq1YjeVf1MX1Tzn74o + iCmkdq1/LrNHOkfgB6Vg9afJRrVOdv2ClRkMmklvCnyPs4V8ge81v5RegddnCGHNHmf00JslcJcZCcWv + IU1pAhcyhLcFXj1zGtbscUYPvdyZ+Uv6Wi8rKekFBjoX2627by8AAAAASUVORK5CYII= + + + + + iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 + YQUAAAAZdEVYdFNvZnR3YXJlAEFkb2JlIEltYWdlUmVhZHlxyWU8AAADZmlUWHRYTUw6Y29tLmFkb2Jl + LnhtcAAAAAAAPD94cGFja2V0IGJlZ2luPSLvu78iIGlkPSJXNU0wTXBDZWhpSHpyZVN6TlRjemtjOWQi + Pz4gPHg6eG1wbWV0YSB4bWxuczp4PSJhZG9iZTpuczptZXRhLyIgeDp4bXB0az0iQWRvYmUgWE1QIENv + cmUgNS4zLWMwMTEgNjYuMTQ1NjYxLCAyMDEyLzAyLzA2LTE0OjU2OjI3ICAgICAgICAiPiA8cmRmOlJE + RiB4bWxuczpyZGY9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkvMDIvMjItcmRmLXN5bnRheC1ucyMiPiA8 + cmRmOkRlc2NyaXB0aW9uIHJkZjphYm91dD0iIiB4bWxuczp4bXBNTT0iaHR0cDovL25zLmFkb2JlLmNv + bS94YXAvMS4wL21tLyIgeG1sbnM6c3RSZWY9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlw + ZS9SZXNvdXJjZVJlZiMiIHhtbG5zOnhtcD0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wLyIgeG1w + TU06T3JpZ2luYWxEb2N1bWVudElEPSJ4bXAuZGlkOjYzQTM5NEY4Mjg0OUU0MTE5NDBEQTc4ODZEQzk5 + N0NGIiB4bXBNTTpEb2N1bWVudElEPSJ4bXAuZGlkOkE2Q0VGMDE2NDlEQTExRTQ4NTlCQTI3NTMyOEY5 + NEU2IiB4bXBNTTpJbnN0YW5jZUlEPSJ4bXAuaWlkOkE2Q0VGMDE1NDlEQTExRTQ4NTlCQTI3NTMyOEY5 + NEU2IiB4bXA6Q3JlYXRvclRvb2w9IkFkb2JlIFBob3Rvc2hvcCBDUzYgKFdpbmRvd3MpIj4gPHhtcE1N + OkRlcml2ZWRGcm9tIHN0UmVmOmluc3RhbmNlSUQ9InhtcC5paWQ6NjA1MjM3NzFEOTQ5RTQxMUE0QzNB + MjdEOTJBQzc3QkMiIHN0UmVmOmRvY3VtZW50SUQ9InhtcC5kaWQ6NjNBMzk0RjgyODQ5RTQxMTk0MERB + Nzg4NkRDOTk3Q0YiLz4gPC9yZGY6RGVzY3JpcHRpb24+IDwvcmRmOlJERj4gPC94OnhtcG1ldGE+IDw/ + eHBhY2tldCBlbmQ9InIiPz6UH16BAAABrElEQVRIS63N70tTURzH8fsnKSGCCEIQCBKISMq2iILCgQOL + JUxQAoVKdMGQuwgWFepsMGjFZCMuorsIJV4WFatpvzdr1ZAFsaIHn8559v1eDsI91wevJ/ee7/tjbMRH + fAFwJOWRF6oopTzyQhWlVEdBwRbgUhICAnuvilKGtXDGzW6WV/CvbjE/xTfxr+R6q4xSxtP5YTf8rVn4 + s5dG+809Rv5zvVVGKaNwfYgyBfhksoH83CCF9seiL7LBBnLXTlP4/W4dza0ZLS0nCdlgA9npAQq/qk/Q + sKa0NJ8nIBtsIBPrp9CqPMJBYVLLj+04ZIMNrF49ReHwVRafH1/R8m3zJmSDDdy/fJJC88Ua3mcjWurW + LGSDDaQifRS+O8uopsNaPhVnIBts4E64l0Jj5y4qDy5q+ZCPQTbYgHmph8LXZ0m8TJ3Xsp+LQjbYQOJC + N4XadgLl22e1vM1OQDbYwK1zXRS+lBbhmEHsLgU8kTeVh+OQDTawEDpB2U4mitfpMS22GYJssIH5QCcV + FGwBmuRtkA3cGO3whcZUlEdeqKKU8sgLVZRSfjw+MP4DJ2GPpDR9OIsAAAAASUVORK5CYII= + + + + + iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 + YQUAAAAZdEVYdFNvZnR3YXJlAEFkb2JlIEltYWdlUmVhZHlxyWU8AAADZmlUWHRYTUw6Y29tLmFkb2Jl + LnhtcAAAAAAAPD94cGFja2V0IGJlZ2luPSLvu78iIGlkPSJXNU0wTXBDZWhpSHpyZVN6TlRjemtjOWQi + Pz4gPHg6eG1wbWV0YSB4bWxuczp4PSJhZG9iZTpuczptZXRhLyIgeDp4bXB0az0iQWRvYmUgWE1QIENv + cmUgNS4zLWMwMTEgNjYuMTQ1NjYxLCAyMDEyLzAyLzA2LTE0OjU2OjI3ICAgICAgICAiPiA8cmRmOlJE + RiB4bWxuczpyZGY9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkvMDIvMjItcmRmLXN5bnRheC1ucyMiPiA8 + cmRmOkRlc2NyaXB0aW9uIHJkZjphYm91dD0iIiB4bWxuczp4bXBNTT0iaHR0cDovL25zLmFkb2JlLmNv + bS94YXAvMS4wL21tLyIgeG1sbnM6c3RSZWY9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlw + ZS9SZXNvdXJjZVJlZiMiIHhtbG5zOnhtcD0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wLyIgeG1w + TU06T3JpZ2luYWxEb2N1bWVudElEPSJ4bXAuZGlkOjYzQTM5NEY4Mjg0OUU0MTE5NDBEQTc4ODZEQzk5 + N0NGIiB4bXBNTTpEb2N1bWVudElEPSJ4bXAuZGlkOjJGRTU5OEQ1NDlEQjExRTRBRUVDOTkyMjQ5NzEw + REUwIiB4bXBNTTpJbnN0YW5jZUlEPSJ4bXAuaWlkOjJGRTU5OEQ0NDlEQjExRTRBRUVDOTkyMjQ5NzEw + REUwIiB4bXA6Q3JlYXRvclRvb2w9IkFkb2JlIFBob3Rvc2hvcCBDUzYgKFdpbmRvd3MpIj4gPHhtcE1N + OkRlcml2ZWRGcm9tIHN0UmVmOmluc3RhbmNlSUQ9InhtcC5paWQ6MTY0MkI1RjlEQTQ5RTQxMUE0QzNB + MjdEOTJBQzc3QkMiIHN0UmVmOmRvY3VtZW50SUQ9InhtcC5kaWQ6NjNBMzk0RjgyODQ5RTQxMTk0MERB + Nzg4NkRDOTk3Q0YiLz4gPC9yZGY6RGVzY3JpcHRpb24+IDwvcmRmOlJERj4gPC94OnhtcG1ldGE+IDw/ + eHBhY2tldCBlbmQ9InIiPz6B5sF9AAACe0lEQVRIS7WVb2jMcRzHL7UHanF/Mts5prE/1li3kAfu5Ak7 + 5IHNobBkSC2UIuGJkrrSWRvTmHQWK8U1T8jqUtYwkZpaGjV/Js6to5YwfXze39+fu/v23f36hXe9us+f + 7/v9rd/dr3MQ0X/F4Zm3+K9QhWajNNlBFZqN0mQHS6lMdrCUyqSgimllUsy4XmOmp+QRDllQWbygjjq6 + uimZStOX8a+ixox3pXrM1JLCDAqYJmY7c669M0bff07mcLbtEl9QE8k6V6BH5ooXMsHZZX7ae+AY7W45 + SrPm19LbsSR9m/iRA2bYGefggVePzUgKBzeu9sQpmZ4QcG/WMtk7eLjv0WMz0kOz+TX6MUXvP6cFeNbD + bz6YvQFm2Bk9PPByZO6jksLB5KvRTzTyLikIrG2ktsvXzd4g2hGjYP1ms4eHvb850qkl65LCQW/ntVs0 + 9HpMcPx0K1X4V1Ff/3NzhnphbVDsjBk8Lm/VE44s0ZJ1KS4Ie8uXUvPBE7Tn0ElCzTMqrV5BO/cfEaDG + TD5X6PFFONLygsTF7jj1vxihyPkYNTS1iFrFxm37KHIhJmp43L7qZxzp0pJ1SeHhQGgLJQaH6fb9R1QX + 2EB3Ek9FryLe95j8K9eLT/TB0FZcskOP1iRdkIh23aR7Ay9pzaZddKY9Jup8nIpeoXXhZlHD655b85Bj + p2npLOmCML+dD/iTZhaX3+UvbRB1PpzeygFnSUUvatecRUMzisoOc+x0LZ3FixxYhQyK1cxyZhkTYhqY + RgnM6hmcwVl4ljDI0KS4AC+Kmyli8Jv2MF7GNwXY4QzOwgNv5mWTL7CLpVQmO1hKZbKDpVR/1P8OcvwB + lh7gOXXZq9sAAAAASUVORK5CYII= + + iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 @@ -598,147 +738,7 @@ 1BGxz38BvCwLsyQ3iHgAAAAASUVORK5CYII= - - - iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAZdEVYdFNvZnR3YXJlAEFkb2JlIEltYWdlUmVhZHlxyWU8AAADZmlUWHRYTUw6Y29tLmFkb2Jl - LnhtcAAAAAAAPD94cGFja2V0IGJlZ2luPSLvu78iIGlkPSJXNU0wTXBDZWhpSHpyZVN6TlRjemtjOWQi - Pz4gPHg6eG1wbWV0YSB4bWxuczp4PSJhZG9iZTpuczptZXRhLyIgeDp4bXB0az0iQWRvYmUgWE1QIENv - cmUgNS4zLWMwMTEgNjYuMTQ1NjYxLCAyMDEyLzAyLzA2LTE0OjU2OjI3ICAgICAgICAiPiA8cmRmOlJE - RiB4bWxuczpyZGY9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkvMDIvMjItcmRmLXN5bnRheC1ucyMiPiA8 - cmRmOkRlc2NyaXB0aW9uIHJkZjphYm91dD0iIiB4bWxuczp4bXBNTT0iaHR0cDovL25zLmFkb2JlLmNv - bS94YXAvMS4wL21tLyIgeG1sbnM6c3RSZWY9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlw - ZS9SZXNvdXJjZVJlZiMiIHhtbG5zOnhtcD0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wLyIgeG1w - TU06T3JpZ2luYWxEb2N1bWVudElEPSJ4bXAuZGlkOjYzQTM5NEY4Mjg0OUU0MTE5NDBEQTc4ODZEQzk5 - N0NGIiB4bXBNTTpEb2N1bWVudElEPSJ4bXAuZGlkOjEwQ0IxNzBBNEM1QzExRTRBNkNGQzRBMjhDQzI0 - MkY4IiB4bXBNTTpJbnN0YW5jZUlEPSJ4bXAuaWlkOjEwQ0IxNzA5NEM1QzExRTRBNkNGQzRBMjhDQzI0 - MkY4IiB4bXA6Q3JlYXRvclRvb2w9IkFkb2JlIFBob3Rvc2hvcCBDUzYgKFdpbmRvd3MpIj4gPHhtcE1N - OkRlcml2ZWRGcm9tIHN0UmVmOmluc3RhbmNlSUQ9InhtcC5paWQ6NTEzMDNDMjA1QjRDRTQxMTg4NERE - MUVBOEQ4QTgyNTUiIHN0UmVmOmRvY3VtZW50SUQ9InhtcC5kaWQ6NjNBMzk0RjgyODQ5RTQxMTk0MERB - Nzg4NkRDOTk3Q0YiLz4gPC9yZGY6RGVzY3JpcHRpb24+IDwvcmRmOlJERj4gPC94OnhtcG1ldGE+IDw/ - eHBhY2tldCBlbmQ9InIiPz43wa2/AAAFaUlEQVRIS6WUC0xTVxzGKy0UkSmlFGjBFilSkNpSaAWRh63y - sIiAArKs4spLRLQoiEJlSMGoMCc6CBOnYHzMOHUqqOhEHOqCbjNu6kCd6KYje5mZ6KbObd/OuVL3cEzj - /skv997/+b7v39PTW9aj3/BM+OKxPEIZoW/gyrOuPbP+GvRPSNBQQqXYLwSW1etw7cYt5kqfaZ+uD8QM - Xg8f/f4UxGhHMHv4qlG6vAb9394G6T+BPpdV1oCuUx3VD8Q9XT8//PUJRMghlLhLg1C41IK+r/pB+oNC - 16mO6qmP+gdi/6y793+hwTYEk9uoQOSaStHzxQ2Q/nND9XMKy0D9NIfmDcSzaLhI4KXE7LwinLtwGXfu - PXhhqJ/m0DyS62EdUGWpqcf3P97DD3d++t/QnKraBjpghXWAiC+WN0ZNScOe1mP45vbdF2ZvWwdoDs/D - b6ejs6ecxHPoAG/l+Fhkzy+FyCcY0YkG7D/yAW5+d+e5oXrqo36aQ/McnNyjyAAuHWA05pfgzPlehhyT - mflV6FOMaDt2Ctf7bw8KXac6qqc+a4Zx3hLwRLJCZgcJjcPIEPkyIZmeX1SB7vOX0dn9KQy5jw8r8eVc - HOrsxidXP0d9hxlzd4QgeYMzEt7kQVvOR0pFFNpOHmd81E9znIS+dSTc1foVGWfNKUZjyy6Ex6SQl0cD - 09IVxHAFh0+cReqr+QjK8ERqEw+VHWOwoycSR/v1OHwzDlsvhcNCeqkbedAYxQiPm87kZOQVw0nkW0QG - 2DFnIA+JRm3DFpzr/RKNW3ZDE5UAsX8ocizZiFs7DEUHvPFunw4Hb05B+y09jn49lYHe0x5doxqqLVlf - DJrnyB+pIQNs6QAhf6R8tZu3CqpwPdZu2I6PLl3HwnV5iHv9JVSeUOKdqzq81xeDvddiYG73R0aLEIZm - IRa1jUbjxQnYRHa17YqW0VJPwHT3LocRbirrDiymspXo6L6AgiXV8JSNQ2i6GpNWOqK4U4n1n0Vge68W - 9ecmIKnBBSqDCIp4P2RWGDB/QxqS6l1QcToIld3BqDobgsXEQ73+Se5HrGcgdJEokGzIx66DXXi7dRvC - yx2Q2RqApR+GoPbjCag8pUZ6sxjqWRKEldljRr07ZjaKmHt5qpBZKzkeiIJ2BbIPKmA8MIbJUC/ghrM0 - RfYsDtdhqJNIVulK/ku0BQokbfZGZrsKBR3BmEsMOfvl0FY7o7ypDPo1brCcGc+QUCdExabXEFsjQO4B - ObL2BSBlqx8SWwibvBE0334nK3Ael+yEbIW81DZszlhZ2oieuAYvpO5VIHGzP9J2+CN9pz/CzDwExMox - eZUbFnZpkEc+gLZagJjMWOiqXZDVqmC0+kZf6Nb4IHKFCPIsu92sgCw7BlJswjBJLCdenmuPyFUS6Gp9 - oG/yRdJWGSKqhYjKDgLRImK5ACGlzsy9d/zwXn2DBMZDSkZLPaHlnpBncyGO5kxj+Rps/wYdJE2xzfOb - zcU4sye0b0gRu3E0Ypt8ELTICRFGNcShUgjHuZyWxNu2096sdiXS9o1ltNQjyyDhes4SkuXEGpXC+Ve8 - kjlzpDPtoCkVQrdOihgyIHmXP6LryGEX86Ba6ISJNR7IeF+JV8gAfbOM0XoTj8dktpmEOxM4rJHTBscz - njNNnMiBagEfU98ajRnbZMg7GojCk2oGU1cw5nUGw7BHAZWJD6oVhLFzSDCPCacljGP/J7xAm6Hu0ew6 - STIXkcvckN7ig8XHVCjvUiNvdwAmW0Twms6FayS7meM4REoihxPoeT4u10nsZ0LKhhdsIxZEsVcLtOyL - pHffVcd+IJjI7uGHsRscJEPURMMn2FMtNTwuFusPrjFl48ji7nIAAAAASUVORK5CYII= - - - - - iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAZdEVYdFNvZnR3YXJlAEFkb2JlIEltYWdlUmVhZHlxyWU8AAADZmlUWHRYTUw6Y29tLmFkb2Jl - LnhtcAAAAAAAPD94cGFja2V0IGJlZ2luPSLvu78iIGlkPSJXNU0wTXBDZWhpSHpyZVN6TlRjemtjOWQi - Pz4gPHg6eG1wbWV0YSB4bWxuczp4PSJhZG9iZTpuczptZXRhLyIgeDp4bXB0az0iQWRvYmUgWE1QIENv - cmUgNS4zLWMwMTEgNjYuMTQ1NjYxLCAyMDEyLzAyLzA2LTE0OjU2OjI3ICAgICAgICAiPiA8cmRmOlJE - RiB4bWxuczpyZGY9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkvMDIvMjItcmRmLXN5bnRheC1ucyMiPiA8 - cmRmOkRlc2NyaXB0aW9uIHJkZjphYm91dD0iIiB4bWxuczp4bXBNTT0iaHR0cDovL25zLmFkb2JlLmNv - bS94YXAvMS4wL21tLyIgeG1sbnM6c3RSZWY9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlw - ZS9SZXNvdXJjZVJlZiMiIHhtbG5zOnhtcD0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wLyIgeG1w - TU06T3JpZ2luYWxEb2N1bWVudElEPSJ4bXAuZGlkOjYzQTM5NEY4Mjg0OUU0MTE5NDBEQTc4ODZEQzk5 - N0NGIiB4bXBNTTpEb2N1bWVudElEPSJ4bXAuZGlkOkUyMTg3NjEyNDlEODExRTQ4NjNGQjM2Mzk1QkNB - RkQwIiB4bXBNTTpJbnN0YW5jZUlEPSJ4bXAuaWlkOkUyMTg3NjExNDlEODExRTQ4NjNGQjM2Mzk1QkNB - RkQwIiB4bXA6Q3JlYXRvclRvb2w9IkFkb2JlIFBob3Rvc2hvcCBDUzYgKFdpbmRvd3MpIj4gPHhtcE1N - OkRlcml2ZWRGcm9tIHN0UmVmOmluc3RhbmNlSUQ9InhtcC5paWQ6NkJCNTE0NDlEODQ5RTQxMUE0QzNB - MjdEOTJBQzc3QkMiIHN0UmVmOmRvY3VtZW50SUQ9InhtcC5kaWQ6NjNBMzk0RjgyODQ5RTQxMTk0MERB - Nzg4NkRDOTk3Q0YiLz4gPC9yZGY6RGVzY3JpcHRpb24+IDwvcmRmOlJERj4gPC94OnhtcG1ldGE+IDw/ - eHBhY2tldCBlbmQ9InIiPz5e5MstAAADiUlEQVRIS+2UW0yTdxjGcePwtYyVVpAUCi1tv9ImrVbxhAei - kjGphAgFT4jzEJ0gGuJhDk0sml0sglmWmC1hqHNKWwI4srgNh3phpjg1O1yIN5DMbFHQZUu42O76+D4f - 3Fl6Z7ILn+SXvH3f533++X/98iUBeKW81v9Uwx1G1+1240EhfKfdeE/4U3qTAqaZZO/2aeN9IXLrY+Ph - wVOZHll9YyohgYZOGS4JsYdXVDy+NQ8Tvy3BP6OlmPyjDP9OBDRYs8cZPfRy5/uQISIRqcIsLSye+j7I - wN+PluOvhyWY+NmL8fsOjP9kxdN7BRh/YJHfFjy5m48nd4ThQjy968bEgwV49usicFciTEKKFhZPXXv1 - eHxtLsYGPBjttwsWjF0xY+ybOfj9uylYs8cZPfQS7kpEnqDTwuLp9GYlfKZeifUfzcb1j/Iw/IkNv3Q6 - MfKVC6O9bg3W7HFGD73cORlMG5AIizDzAaVtunD5ESXWfNSEY/tNCO00oG1zOkJBBSeqUjVYh6R3Qmat - zSY0Hjah7IASW7hPuSoRvIGihcVTSauCppvFODRUjJZvPWgaKMTuXgt2RHOxLTwHDd3EjPfCudgesWJX - jxM7eryo7/Ni8SGFj8gp6LWwePLvS0Og043A5y5UdtkQOJeLivM5ePf8bJSfM04zG2u7chDoysW6Thsq - zqpY0+GAvymNB/gEgxYWT64tKdGihpSYv8WEpSEzVp0pwDuf2SVQReCiS4M1e5zRQy937NXJ1yRirjDz - AVmVJyNZa9+PObauh7ptKdR6FY6N2SisTYe1OlmDNXtqvRNqwxLYt1TCVLY1ZijZOSQRbuEtLSyeTOXH - sfLDH1EauoFFx6/Cd6Qf7pYI1ObLsO+9iMLdF+DccwEuqd2Nl+Br6sbCxiiKd/XBuPogH1HiAzJXHMC8 - YA98td1wb4rCuaEH1roo8oMR5JGaMPIFa10Ejtowiuouw1vzJTwVXyBz+X4ekPgRZfgbohkLtsfMy47B - tqYdakUnPFUM6YUv+LUGa/Y4o8e8rBXcSffWDkpE4j9ZpEvNmb9KsZV16BzrBnVq1YjeVf1MX1Tzn74o - iCmkdq1/LrNHOkfgB6Vg9afJRrVOdv2ClRkMmklvCnyPs4V8ge81v5RegddnCGHNHmf00JslcJcZCcWv - IU1pAhcyhLcFXj1zGtbscUYPvdyZ+Uv6Wi8rKekFBjoX2627by8AAAAASUVORK5CYII= - - - - - iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAZdEVYdFNvZnR3YXJlAEFkb2JlIEltYWdlUmVhZHlxyWU8AAADZmlUWHRYTUw6Y29tLmFkb2Jl - LnhtcAAAAAAAPD94cGFja2V0IGJlZ2luPSLvu78iIGlkPSJXNU0wTXBDZWhpSHpyZVN6TlRjemtjOWQi - Pz4gPHg6eG1wbWV0YSB4bWxuczp4PSJhZG9iZTpuczptZXRhLyIgeDp4bXB0az0iQWRvYmUgWE1QIENv - cmUgNS4zLWMwMTEgNjYuMTQ1NjYxLCAyMDEyLzAyLzA2LTE0OjU2OjI3ICAgICAgICAiPiA8cmRmOlJE - RiB4bWxuczpyZGY9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkvMDIvMjItcmRmLXN5bnRheC1ucyMiPiA8 - cmRmOkRlc2NyaXB0aW9uIHJkZjphYm91dD0iIiB4bWxuczp4bXBNTT0iaHR0cDovL25zLmFkb2JlLmNv - bS94YXAvMS4wL21tLyIgeG1sbnM6c3RSZWY9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlw - ZS9SZXNvdXJjZVJlZiMiIHhtbG5zOnhtcD0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wLyIgeG1w - TU06T3JpZ2luYWxEb2N1bWVudElEPSJ4bXAuZGlkOjYzQTM5NEY4Mjg0OUU0MTE5NDBEQTc4ODZEQzk5 - N0NGIiB4bXBNTTpEb2N1bWVudElEPSJ4bXAuZGlkOkE2Q0VGMDE2NDlEQTExRTQ4NTlCQTI3NTMyOEY5 - NEU2IiB4bXBNTTpJbnN0YW5jZUlEPSJ4bXAuaWlkOkE2Q0VGMDE1NDlEQTExRTQ4NTlCQTI3NTMyOEY5 - NEU2IiB4bXA6Q3JlYXRvclRvb2w9IkFkb2JlIFBob3Rvc2hvcCBDUzYgKFdpbmRvd3MpIj4gPHhtcE1N - OkRlcml2ZWRGcm9tIHN0UmVmOmluc3RhbmNlSUQ9InhtcC5paWQ6NjA1MjM3NzFEOTQ5RTQxMUE0QzNB - MjdEOTJBQzc3QkMiIHN0UmVmOmRvY3VtZW50SUQ9InhtcC5kaWQ6NjNBMzk0RjgyODQ5RTQxMTk0MERB - Nzg4NkRDOTk3Q0YiLz4gPC9yZGY6RGVzY3JpcHRpb24+IDwvcmRmOlJERj4gPC94OnhtcG1ldGE+IDw/ - eHBhY2tldCBlbmQ9InIiPz6UH16BAAABrElEQVRIS63N70tTURzH8fsnKSGCCEIQCBKISMq2iILCgQOL - JUxQAoVKdMGQuwgWFepsMGjFZCMuorsIJV4WFatpvzdr1ZAFsaIHn8559v1eDsI91wevJ/ee7/tjbMRH - fAFwJOWRF6oopTzyQhWlVEdBwRbgUhICAnuvilKGtXDGzW6WV/CvbjE/xTfxr+R6q4xSxtP5YTf8rVn4 - s5dG+809Rv5zvVVGKaNwfYgyBfhksoH83CCF9seiL7LBBnLXTlP4/W4dza0ZLS0nCdlgA9npAQq/qk/Q - sKa0NJ8nIBtsIBPrp9CqPMJBYVLLj+04ZIMNrF49ReHwVRafH1/R8m3zJmSDDdy/fJJC88Ua3mcjWurW - LGSDDaQifRS+O8uopsNaPhVnIBts4E64l0Jj5y4qDy5q+ZCPQTbYgHmph8LXZ0m8TJ3Xsp+LQjbYQOJC - N4XadgLl22e1vM1OQDbYwK1zXRS+lBbhmEHsLgU8kTeVh+OQDTawEDpB2U4mitfpMS22GYJssIH5QCcV - FGwBmuRtkA3cGO3whcZUlEdeqKKU8sgLVZRSfjw+MP4DJ2GPpDR9OIsAAAAASUVORK5CYII= - - - - - iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAZdEVYdFNvZnR3YXJlAEFkb2JlIEltYWdlUmVhZHlxyWU8AAADZmlUWHRYTUw6Y29tLmFkb2Jl - LnhtcAAAAAAAPD94cGFja2V0IGJlZ2luPSLvu78iIGlkPSJXNU0wTXBDZWhpSHpyZVN6TlRjemtjOWQi - Pz4gPHg6eG1wbWV0YSB4bWxuczp4PSJhZG9iZTpuczptZXRhLyIgeDp4bXB0az0iQWRvYmUgWE1QIENv - cmUgNS4zLWMwMTEgNjYuMTQ1NjYxLCAyMDEyLzAyLzA2LTE0OjU2OjI3ICAgICAgICAiPiA8cmRmOlJE - RiB4bWxuczpyZGY9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkvMDIvMjItcmRmLXN5bnRheC1ucyMiPiA8 - cmRmOkRlc2NyaXB0aW9uIHJkZjphYm91dD0iIiB4bWxuczp4bXBNTT0iaHR0cDovL25zLmFkb2JlLmNv - bS94YXAvMS4wL21tLyIgeG1sbnM6c3RSZWY9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlw - ZS9SZXNvdXJjZVJlZiMiIHhtbG5zOnhtcD0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wLyIgeG1w - TU06T3JpZ2luYWxEb2N1bWVudElEPSJ4bXAuZGlkOjYzQTM5NEY4Mjg0OUU0MTE5NDBEQTc4ODZEQzk5 - N0NGIiB4bXBNTTpEb2N1bWVudElEPSJ4bXAuZGlkOjJGRTU5OEQ1NDlEQjExRTRBRUVDOTkyMjQ5NzEw - REUwIiB4bXBNTTpJbnN0YW5jZUlEPSJ4bXAuaWlkOjJGRTU5OEQ0NDlEQjExRTRBRUVDOTkyMjQ5NzEw - REUwIiB4bXA6Q3JlYXRvclRvb2w9IkFkb2JlIFBob3Rvc2hvcCBDUzYgKFdpbmRvd3MpIj4gPHhtcE1N - OkRlcml2ZWRGcm9tIHN0UmVmOmluc3RhbmNlSUQ9InhtcC5paWQ6MTY0MkI1RjlEQTQ5RTQxMUE0QzNB - MjdEOTJBQzc3QkMiIHN0UmVmOmRvY3VtZW50SUQ9InhtcC5kaWQ6NjNBMzk0RjgyODQ5RTQxMTk0MERB - Nzg4NkRDOTk3Q0YiLz4gPC9yZGY6RGVzY3JpcHRpb24+IDwvcmRmOlJERj4gPC94OnhtcG1ldGE+IDw/ - eHBhY2tldCBlbmQ9InIiPz6B5sF9AAACe0lEQVRIS7WVb2jMcRzHL7UHanF/Mts5prE/1li3kAfu5Ak7 - 5IHNobBkSC2UIuGJkrrSWRvTmHQWK8U1T8jqUtYwkZpaGjV/Js6to5YwfXze39+fu/v23f36hXe9us+f - 7/v9rd/dr3MQ0X/F4Zm3+K9QhWajNNlBFZqN0mQHS6lMdrCUyqSgimllUsy4XmOmp+QRDllQWbygjjq6 - uimZStOX8a+ixox3pXrM1JLCDAqYJmY7c669M0bff07mcLbtEl9QE8k6V6BH5ooXMsHZZX7ae+AY7W45 - SrPm19LbsSR9m/iRA2bYGefggVePzUgKBzeu9sQpmZ4QcG/WMtk7eLjv0WMz0kOz+TX6MUXvP6cFeNbD - bz6YvQFm2Bk9PPByZO6jksLB5KvRTzTyLikIrG2ktsvXzd4g2hGjYP1ms4eHvb850qkl65LCQW/ntVs0 - 9HpMcPx0K1X4V1Ff/3NzhnphbVDsjBk8Lm/VE44s0ZJ1KS4Ie8uXUvPBE7Tn0ElCzTMqrV5BO/cfEaDG - TD5X6PFFONLygsTF7jj1vxihyPkYNTS1iFrFxm37KHIhJmp43L7qZxzp0pJ1SeHhQGgLJQaH6fb9R1QX - 2EB3Ek9FryLe95j8K9eLT/TB0FZcskOP1iRdkIh23aR7Ay9pzaZddKY9Jup8nIpeoXXhZlHD655b85Bj - p2npLOmCML+dD/iTZhaX3+UvbRB1PpzeygFnSUUvatecRUMzisoOc+x0LZ3FixxYhQyK1cxyZhkTYhqY - RgnM6hmcwVl4ljDI0KS4AC+Kmyli8Jv2MF7GNwXY4QzOwgNv5mWTL7CLpVQmO1hKZbKDpVR/1P8OcvwB - lh7gOXXZq9sAAAAASUVORK5CYII= - - - + iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 YQUAAAAZdEVYdFNvZnR3YXJlAEFkb2JlIEltYWdlUmVhZHlxyWU8AAADZmlUWHRYTUw6Y29tLmFkb2Jl @@ -750,26 +750,244 @@ bS94YXAvMS4wL21tLyIgeG1sbnM6c3RSZWY9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlw ZS9SZXNvdXJjZVJlZiMiIHhtbG5zOnhtcD0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wLyIgeG1w TU06T3JpZ2luYWxEb2N1bWVudElEPSJ4bXAuZGlkOjJGQzkyMzc0Rjk0OUU0MTE5NjNCQjRENDMzQjlC - MUM4IiB4bXBNTTpEb2N1bWVudElEPSJ4bXAuZGlkOjJERjY3MEZENEQyMzExRTRCNDlGQUMwMzk0OTAw - Qzc4IiB4bXBNTTpJbnN0YW5jZUlEPSJ4bXAuaWlkOjJERjY3MEZDNEQyMzExRTRCNDlGQUMwMzk0OTAw - Qzc4IiB4bXA6Q3JlYXRvclRvb2w9IkFkb2JlIFBob3Rvc2hvcCBDUzYgKFdpbmRvd3MpIj4gPHhtcE1N - OkRlcml2ZWRGcm9tIHN0UmVmOmluc3RhbmNlSUQ9InhtcC5paWQ6NjhGOUEyRDEyMTRERTQxMUIzNkJE + MUM4IiB4bXBNTTpEb2N1bWVudElEPSJ4bXAuZGlkOjlDMzFEOUI4NEFBRjExRTQ4OTA5OUYwQ0QzM0Q2 + NEI4IiB4bXBNTTpJbnN0YW5jZUlEPSJ4bXAuaWlkOjlDMzFEOUI3NEFBRjExRTQ4OTA5OUYwQ0QzM0Q2 + NEI4IiB4bXA6Q3JlYXRvclRvb2w9IkFkb2JlIFBob3Rvc2hvcCBDUzYgKFdpbmRvd3MpIj4gPHhtcE1N + OkRlcml2ZWRGcm9tIHN0UmVmOmluc3RhbmNlSUQ9InhtcC5paWQ6MDk5Mzk2NTZBRjRBRTQxMTk3NEFD + QUFFQjRCMzVENkUiIHN0UmVmOmRvY3VtZW50SUQ9InhtcC5kaWQ6MkZDOTIzNzRGOTQ5RTQxMTk2M0JC + NEQ0MzNCOUIxQzgiLz4gPC9yZGY6RGVzY3JpcHRpb24+IDwvcmRmOlJERj4gPC94OnhtcG1ldGE+IDw/ + eHBhY2tldCBlbmQ9InIiPz73sIMwAAADIElEQVRIS7WVa0iTYRTH56Uiysvm3TkvpLl5DRIvQYWVWl+6 + iNEVg0yhQqloQZHkLT+Y0YdAs75IpEUhzERZoZhsRpZlS7soblotsRwoxhqWeTrnYZtv+u7NsB74cZ5z + zv89/z17HzYRAPxXeIv/EpFXcOyi4BvKhfehv4FvKBfeh+ayqIUDlIgBgT8whpRYoT2fhgvNVJKBQT9s + hB8/QZDPpnEIjEhg0J5Pw4Vm0mwygG9T06BSqQQhTUhUMoRGpyxYT7OZwfhXC6jVakFIYzNYqN5uMGKa + BI1GIwhpghXJaJJi13d0dEB2bj74hsWzSDlXbzfQG02g0+kEIU2wIomdovzKdVifngnFFytBeb4cLN+n + WaSc6hfKKqB/eHTWoHfwExgMBkFII5MnQUD4WlAWloO26wVs35MDmifPmQFFyqlO/aKKqlmDp31DYDKZ + BCGNTJ4IPqHx8LJvACbNUw7p6e2HuJQMNIhhBuaHj3vBYrEI0tb1BoIiE9kJ9h7Oh7EJM+g/jEJuwVlY + s24ri5RTnfo5BedAIoueIYPumvomuHzjzm9cq2uCq7UNUH2rEarr7kNd0yP26Y+eKoSWtk4wfpmAg7kn + ITY5DUorq1g8cOQEqze3aplOEhRtJoMcL1mMTixV9IgD5a/tSBVDYql8AKOBQLEJtTP08gY/jjFiktKg + 5FIV21Ok3NazvmR2AvrFkCAJyGYk1comZAuHDM/AyLvHThfBveZ26NOPwI59eey7LsbhFCmnOvVJ5+Ef + rrYZLEU8EZ85+HLwW7ZCLMVTFWdkHoLut+/hgbYHaE9XN31XNsupTrWV3jKVs+uS3cyAD0cLe331jW3Q + qRt0CPUlQVHDKI+fN9iGo4W90uNnyuA2vvRtWTlQgxeg/dk7FimnOvU9/CNqUe47b7ANRwt7AfjpKvAK + Gt18Qur35ymhRfsKKLr5hN7EyzDq7humWrrcfSfKxbz/QlwcLDck1snZJdUzYHUDmk57+K1qdXJyzsL6 + RmQD9ZmObygXB8sVIRO6fXQB4hC6eRQppzr1XXmHclnAckFomLc1Um5dItEvhZ97MQXP9N0AAAAASUVO + RK5CYII= + + + + + iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 + YQUAAAAZdEVYdFNvZnR3YXJlAEFkb2JlIEltYWdlUmVhZHlxyWU8AAADZmlUWHRYTUw6Y29tLmFkb2Jl + LnhtcAAAAAAAPD94cGFja2V0IGJlZ2luPSLvu78iIGlkPSJXNU0wTXBDZWhpSHpyZVN6TlRjemtjOWQi + Pz4gPHg6eG1wbWV0YSB4bWxuczp4PSJhZG9iZTpuczptZXRhLyIgeDp4bXB0az0iQWRvYmUgWE1QIENv + cmUgNS4zLWMwMTEgNjYuMTQ1NjYxLCAyMDEyLzAyLzA2LTE0OjU2OjI3ICAgICAgICAiPiA8cmRmOlJE + RiB4bWxuczpyZGY9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkvMDIvMjItcmRmLXN5bnRheC1ucyMiPiA8 + cmRmOkRlc2NyaXB0aW9uIHJkZjphYm91dD0iIiB4bWxuczp4bXBNTT0iaHR0cDovL25zLmFkb2JlLmNv + bS94YXAvMS4wL21tLyIgeG1sbnM6c3RSZWY9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlw + ZS9SZXNvdXJjZVJlZiMiIHhtbG5zOnhtcD0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wLyIgeG1w + TU06T3JpZ2luYWxEb2N1bWVudElEPSJ4bXAuZGlkOjJGQzkyMzc0Rjk0OUU0MTE5NjNCQjRENDMzQjlC + MUM4IiB4bXBNTTpEb2N1bWVudElEPSJ4bXAuZGlkOjhDMTdBQjRENEFBRTExRTQ4QjQyODY0MDNBNTJE + NzNCIiB4bXBNTTpJbnN0YW5jZUlEPSJ4bXAuaWlkOjhDMTdBQjRDNEFBRTExRTQ4QjQyODY0MDNBNTJE + NzNCIiB4bXA6Q3JlYXRvclRvb2w9IkFkb2JlIFBob3Rvc2hvcCBDUzYgKFdpbmRvd3MpIj4gPHhtcE1N + OkRlcml2ZWRGcm9tIHN0UmVmOmluc3RhbmNlSUQ9InhtcC5paWQ6NUQyMjc4QTlBQjRBRTQxMTk3NEFD + QUFFQjRCMzVENkUiIHN0UmVmOmRvY3VtZW50SUQ9InhtcC5kaWQ6MkZDOTIzNzRGOTQ5RTQxMTk2M0JC + NEQ0MzNCOUIxQzgiLz4gPC9yZGY6RGVzY3JpcHRpb24+IDwvcmRmOlJERj4gPC94OnhtcG1ldGE+IDw/ + eHBhY2tldCBlbmQ9InIiPz4eHsDfAAAB00lEQVRIS7XVWytEURQH8HniTTNHLs0NCXNcXjTN5dH9g/gM + 3jx590QhFDJS0gyTGmpqaqJIMW4hzlAoOaWISS7LWifntI3ddnTGrl92e/57/We/DBsA/CvuYSHZSr0t + lvCGsriX/oI3lMW9lM/SwgF9SEHwizs08IX2vAyLZvZRgXJ+cQWv7yB0q96Ds86voT0vw6KZNJsK4Pnl + DWKxmBBlqhpDUN0UNp2n2VrB/WMOEomEEGX0ArN5o+BGfYB0Oi1EGa8cwpKw6bxRcH6lQiaTEaKMVw5q + rzCbNwr2z65BURQhynh8Qe0VZvNGwdZBFlRVFaKMxxfQXmE2rxc8rW3sQy6XE0puHoG7IaC9YnV9j5th + pbZPqOCDCrbH5uIwOD7/zWgkDkNTizAyuwQjkWWIxFNQWduqmVxI/MiPz6/A8HTUuDMTTYLkbrqhgt5S + T3PG4ZJ3HE7focElZx0u3yn+VQiG1ZLymmm7s74f88f42S6bl9zyJZ6d6Xckd+Mt5ieogH4xJORHHajt + SzvqZPSgECpHZSiA2DztuxBlad+NgnpBEbIjusiiYboKRF+kGFHegUR5ImkFv7G0eAPzWVq8gfksLd5/ + oULiHhYS97BwwPYJlSCUgVubViQAAAAASUVORK5CYII= + + + + + iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 + YQUAAAAZdEVYdFNvZnR3YXJlAEFkb2JlIEltYWdlUmVhZHlxyWU8AAADZmlUWHRYTUw6Y29tLmFkb2Jl + LnhtcAAAAAAAPD94cGFja2V0IGJlZ2luPSLvu78iIGlkPSJXNU0wTXBDZWhpSHpyZVN6TlRjemtjOWQi + Pz4gPHg6eG1wbWV0YSB4bWxuczp4PSJhZG9iZTpuczptZXRhLyIgeDp4bXB0az0iQWRvYmUgWE1QIENv + cmUgNS4zLWMwMTEgNjYuMTQ1NjYxLCAyMDEyLzAyLzA2LTE0OjU2OjI3ICAgICAgICAiPiA8cmRmOlJE + RiB4bWxuczpyZGY9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkvMDIvMjItcmRmLXN5bnRheC1ucyMiPiA8 + cmRmOkRlc2NyaXB0aW9uIHJkZjphYm91dD0iIiB4bWxuczp4bXBNTT0iaHR0cDovL25zLmFkb2JlLmNv + bS94YXAvMS4wL21tLyIgeG1sbnM6c3RSZWY9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlw + ZS9SZXNvdXJjZVJlZiMiIHhtbG5zOnhtcD0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wLyIgeG1w + TU06T3JpZ2luYWxEb2N1bWVudElEPSJ4bXAuZGlkOjJGQzkyMzc0Rjk0OUU0MTE5NjNCQjRENDMzQjlC + MUM4IiB4bXBNTTpEb2N1bWVudElEPSJ4bXAuZGlkOjJEMDQyOEZBNEFEMjExRTRBN0MxRDBCNzJGRUND + MDEzIiB4bXBNTTpJbnN0YW5jZUlEPSJ4bXAuaWlkOjJEMDQyOEY5NEFEMjExRTRBN0MxRDBCNzJGRUND + MDEzIiB4bXA6Q3JlYXRvclRvb2w9IkFkb2JlIFBob3Rvc2hvcCBDUzYgKFdpbmRvd3MpIj4gPHhtcE1N + OkRlcml2ZWRGcm9tIHN0UmVmOmluc3RhbmNlSUQ9InhtcC5paWQ6QkRDRkI1RDVEMTRBRTQxMTk3NEFD + QUFFQjRCMzVENkUiIHN0UmVmOmRvY3VtZW50SUQ9InhtcC5kaWQ6MkZDOTIzNzRGOTQ5RTQxMTk2M0JC + NEQ0MzNCOUIxQzgiLz4gPC9yZGY6RGVzY3JpcHRpb24+IDwvcmRmOlJERj4gPC94OnhtcG1ldGE+IDw/ + eHBhY2tldCBlbmQ9InIiPz59jfe3AAAEbUlEQVRIS8WTeUybZRzHF48/pnFOuQRajkFLgQFb5iRLNJr4 + l/EPgsniUI4xZDAY1zyxwApsMJyIME61rByl3DfoYGBrgbWUY06FcZSCha4rQ8jYxkqPr2/fvkv8o2Sg + S/wkT970eb6/T5/39z7Prv8dt/Oql4mR4HZJ3ccoXFxhVCzB9DT9JueJdSq6c1wzVZFupepVzxu34XVj + CaEDi1jX6hF8ZQoeokl4iBVwzV9YdU1XRlIl28eVo8phCdXwGltEeOUsro6psaHVwcSDh5volc4iOO8X + 7KuVwb1hEi7J8myq9PEQO//I85oafr0KtEpUpNSETm+AwWDAvfv3YTQaybnm/t/AyO6Ga+UonJOnIijF + 1hA9tWI2qle9RxcI+RIpmZpTIfBULhIyyqHVahHPKcN70TmYnFFCp9OhqXcc9KwW0DOHVl3YU1aUyjJu + F1SpfhO3EM6bMMsVt+D8Zhz2HIpC4oU6bG5uIu4cD3tfTwAjIBNypQYbGxsISquBU34PaDHiVEplGXee + SuIjVaBv3Lz7gJg8vHg4FlZvc+ATVoLipiHsD8qCXWAO7IPK8MG5FjLXKboOeoYADkldUkplGWb7vOb4 + 4BzxIXXQE/1m59WDXdgBvxPfwz6UC4eQUth/WIBDZ2qQXj+K7IYRImeE5s5fOFrcDPvPapcJzVNmmwVY + VxWG9U09uau1tTVymPpc0iYFLew7OEUJ4BwtALfvJpl5xMrKCu6s3cUrn5YbCM1us80CrJZZVWjXr7j3 + 4CE0y8v4IrcaH+cK4Bv+DRyPl8ApphYuia3wZ3eCUzOA1PIfcVuzjHnlIgK/vgy7mHzTG+w12yzA5E53 + edYPo1c2i/X1dQTEfwvbwDQ4hhXg8OcN4P48Df+UTrgkNIAeW4Hg3Hbo9Xq0iGSgs4ls5CUhoXnObLOA + S8pkhG/bdZzgDZJnffT3GXieLAA9XgB2/RjZjuQqMWhxfBw824H55XWyhcfy+HDNqoB1SH4Codn6G7iw + p3d78EaVPlXX0CaZgkqlgly1gpCiK0htHCH/IL6oFcEF3ZjT3CUvXqv0DzDSS0FPq1a/8EbYS5Rqa+if + SAJ8KoeNR7gitEsnoVQqSbGOkJmYX1ggxaY70SabwIGMUrjn8I3WIXnBRPnWu/8nDnE9Sd7cAaP/ZSES + 6/rRKJRArpiHXC7HzekZNIukiCyrhW9mGZgXa4w2kUVnibJnzdXbxP5URzyDO4QjxGl5i9uNpMZeKP5U + IrywAq9yCnGAOGGMonbYxpVnEPGdyR9BO/MTj8kfgXeNFPt5IngVtoF1kQ9WcTs8qgfgmNreQMS21xZL + 0E6Ln6ef75tg8sfgXT8O77oReAkkYNXJ4PRV/4ztyfo9VPTf4xjdf9CpQKzdxxuGe6UMbhXEmc8V6mze + r3qNivx3HGN7UmglQ6CVDMIxXwybo5UcaunJQD8te9rhyx4JrWwItlGNUut3y5+hlp4cDhFCpl14k9jq + nR+Y1NTjIe7NlmMnWKoHsOtvjWYcKpheqFQAAAAASUVORK5CYII= + + + + + iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 + YQUAAAAZdEVYdFNvZnR3YXJlAEFkb2JlIEltYWdlUmVhZHlxyWU8AAADZmlUWHRYTUw6Y29tLmFkb2Jl + LnhtcAAAAAAAPD94cGFja2V0IGJlZ2luPSLvu78iIGlkPSJXNU0wTXBDZWhpSHpyZVN6TlRjemtjOWQi + Pz4gPHg6eG1wbWV0YSB4bWxuczp4PSJhZG9iZTpuczptZXRhLyIgeDp4bXB0az0iQWRvYmUgWE1QIENv + cmUgNS4zLWMwMTEgNjYuMTQ1NjYxLCAyMDEyLzAyLzA2LTE0OjU2OjI3ICAgICAgICAiPiA8cmRmOlJE + RiB4bWxuczpyZGY9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkvMDIvMjItcmRmLXN5bnRheC1ucyMiPiA8 + cmRmOkRlc2NyaXB0aW9uIHJkZjphYm91dD0iIiB4bWxuczp4bXBNTT0iaHR0cDovL25zLmFkb2JlLmNv + bS94YXAvMS4wL21tLyIgeG1sbnM6c3RSZWY9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlw + ZS9SZXNvdXJjZVJlZiMiIHhtbG5zOnhtcD0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wLyIgeG1w + TU06T3JpZ2luYWxEb2N1bWVudElEPSJ4bXAuZGlkOjJGQzkyMzc0Rjk0OUU0MTE5NjNCQjRENDMzQjlC + MUM4IiB4bXBNTTpEb2N1bWVudElEPSJ4bXAuZGlkOjJERTg4QTFENEQyMjExRTRBODEyODk0M0RBMTc5 + Qjg3IiB4bXBNTTpJbnN0YW5jZUlEPSJ4bXAuaWlkOjJERTg4QTFDNEQyMjExRTRBODEyODk0M0RBMTc5 + Qjg3IiB4bXA6Q3JlYXRvclRvb2w9IkFkb2JlIFBob3Rvc2hvcCBDUzYgKFdpbmRvd3MpIj4gPHhtcE1N + OkRlcml2ZWRGcm9tIHN0UmVmOmluc3RhbmNlSUQ9InhtcC5paWQ6NjJGOUEyRDEyMTRERTQxMUIzNkJE NUVDQjU5MzE1NjIiIHN0UmVmOmRvY3VtZW50SUQ9InhtcC5kaWQ6MkZDOTIzNzRGOTQ5RTQxMTk2M0JC NEQ0MzNCOUIxQzgiLz4gPC9yZGY6RGVzY3JpcHRpb24+IDwvcmRmOlJERj4gPC94OnhtcG1ldGE+IDw/ - eHBhY2tldCBlbmQ9InIiPz6GKmpFAAAC+UlEQVRIS63T20vTYRzH8Yforj/Ei24UiSgKIygKi8oyxZQo - cvNYeXaesmzqPGu2POd0ulSsnIdaurTSTJ3O6UxTPGya5vCQx5AuPn39RbHop7nZxQt+z3ie93e/Z4w1 - p7nsCoBt8R6yBF/UHPv+Wb0rfFFzm99CRIwEW1gnqXzxTXxRc0ydctm4OlID2sxrw6iCtiwItC+A2P/D - frLnjwGNSZdMq6N1WOvLwFpP4l/WdRlY6Jaio9Ab7QXba8sVoDHZGdT8PYS9THDqMGnLsKpNw0qXGCua - BO55VZdNQ6U/DRRibVCGb+N1pH5bukoRqHmDHOIG1N8/X2F4I8WyNhtf2+9hqSsZxqZ4upbb6HsSZLHO - Im90ym6hNVcIaktYTexZyUelGEvaHMy/jcFiZxo0xX5Y7ivGcn8JkVmA9uvlWBmqwpJeAWovs+poR99O - eRgWtQWYVUdgrj0FH+i+F3XF3NoappZYGJrEoLaOVYpOOTY/FGJB+xjTqnDMtMTTAC/Ma/Ix/TLUKl9e - x0JfFQpql7PykBP7lWIXzPeUYLIhHCPKCLr/AMy2ZsKoDLTKdNNdvM8TgNpRTBZwfJ885CTmaIChPhwa - mS+GnkdhqjEWY9X+VplqvIMXEhdQ24mZeuSs0N/BNNWWj4k6EdSZHhhXxWH0aSCGFd4c4Tk7zk7XBlUM - FKLToK4Nm+0qYnneRzqGGiSYaIiiyZdhVCdgqFSIwRJPjucZW85O1pvnRmvDkO9zFNTdy2Y6HjGp4HCF - 5kk4xhoiURd/EROv4tBfeM0qAyUC9Mp9QM0+7o829T6LZV0/mNycS6+nFKFWfAGj9ZHozfGwil7miZYH - 7qCmghsw+S6VpV894KuUuKFbfhNNqa749CwY3dm0toK+VABl3HlQM5obYHybwFLc7W1y/Y5BlX6FfgNn - DNcEY0DhZZX+MiGKbh0DNR24AYYWMSfJzc6GZBApwS5skIzNODcg0dV2V36FtsJ7yBJ8UXO8hyzBFzXH - ++H/A/YDv9/V87iOlrYAAAAASUVORK5CYII= + eHBhY2tldCBlbmQ9InIiPz6wJF34AAACl0lEQVRIS62Vy08TURSH73/QhQtXVnBhxEcMiUkhbEg0hB1R + Q1i68C8wIW5cEqMLN7ho2Ji4YiEhWq0prYUhfULbadN3obTaChobtZEUsFY9nnPS6WM6HYowyZf87j33 + nG/amaai9geOBYA+4pTxihmBE8DcTQB4J8em/9IwSQyagmrtL+z9rMFmvnhkKvtV7tcVHPz6DVsftulA + AckdhUg8zf19eoLKAd597iMLMItewfOxUDTN/bqCH3tVSG8VWIBZ9AoJApEk9+sKvu/uQ2IjzwJkGtH8 + OrTwy3Hu77vIAnV9mgWlcgWiqRwLjAMmkOMbPbNTKnN/JJntqJGEBZ++7oKcyLLgLN4JrU8Cms2C4pcy + BKKZumCI18temQ/8DzSLZlBmQX7nG/jCKdpgAa0driCtY5iFHuqHSjNoFtaags1iCdzBBG+QgNY2aZ0F + mIUe6osENAtrTUEq/7kDq9PHAszU5yYoq9f1i9cUSCD5ozxDEeTsrhAoONwyxLLb8MrhYQFmZYCHsnpd + v3hNgQROb5hnKIK29944MAThTBEWbS4WYBZ6qC/sKSy5ZJ6BGUQg8b4Bbhjod4AZXlhXWdBa10LrIVul + AM9ggS+aa6AIMMO8ZYUO0KeyIOMtZyaQpXpNi4LFucYzMINwhbMNcMNw5oIJMMNKIA0LNg88mZuH/ssj + dPgBMnN+cBRmny1wrRtSMMMzWCCFMg0UAeY2Fh0+GL5xG8Zu3oHXUrCj3g0WONdTbeBm21/o1N17gPtg + 98Xh3VoS3qzKMDI22agfglnY/Uld8NDc/ZlZwAwvl4Ngun6LGh8rdfVDViNs3rguOOzq6XOD8PDpc7g2 + OkHDH7XWtYa2It66Y4eCQ8cRfpvUNa2hTUD8A6JMaBvCyTdJAAAAAElFTkSuQmCC + + + + + iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 + YQUAAAAZdEVYdFNvZnR3YXJlAEFkb2JlIEltYWdlUmVhZHlxyWU8AAADZmlUWHRYTUw6Y29tLmFkb2Jl + LnhtcAAAAAAAPD94cGFja2V0IGJlZ2luPSLvu78iIGlkPSJXNU0wTXBDZWhpSHpyZVN6TlRjemtjOWQi + Pz4gPHg6eG1wbWV0YSB4bWxuczp4PSJhZG9iZTpuczptZXRhLyIgeDp4bXB0az0iQWRvYmUgWE1QIENv + cmUgNS4zLWMwMTEgNjYuMTQ1NjYxLCAyMDEyLzAyLzA2LTE0OjU2OjI3ICAgICAgICAiPiA8cmRmOlJE + RiB4bWxuczpyZGY9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkvMDIvMjItcmRmLXN5bnRheC1ucyMiPiA8 + cmRmOkRlc2NyaXB0aW9uIHJkZjphYm91dD0iIiB4bWxuczp4bXBNTT0iaHR0cDovL25zLmFkb2JlLmNv + bS94YXAvMS4wL21tLyIgeG1sbnM6c3RSZWY9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlw + ZS9SZXNvdXJjZVJlZiMiIHhtbG5zOnhtcD0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wLyIgeG1w + TU06T3JpZ2luYWxEb2N1bWVudElEPSJ4bXAuZGlkOjJGQzkyMzc0Rjk0OUU0MTE5NjNCQjRENDMzQjlC + MUM4IiB4bXBNTTpEb2N1bWVudElEPSJ4bXAuZGlkOkUzNzJDMjE3NEFENjExRTRCNjE0OEVEQzI4MEM0 + RTZDIiB4bXBNTTpJbnN0YW5jZUlEPSJ4bXAuaWlkOkUzNzJDMjE2NEFENjExRTRCNjE0OEVEQzI4MEM0 + RTZDIiB4bXA6Q3JlYXRvclRvb2w9IkFkb2JlIFBob3Rvc2hvcCBDUzYgKFdpbmRvd3MpIj4gPHhtcE1N + OkRlcml2ZWRGcm9tIHN0UmVmOmluc3RhbmNlSUQ9InhtcC5paWQ6RkI3NUQ0QkNENDRBRTQxMTk3NEFD + QUFFQjRCMzVENkUiIHN0UmVmOmRvY3VtZW50SUQ9InhtcC5kaWQ6MkZDOTIzNzRGOTQ5RTQxMTk2M0JC + NEQ0MzNCOUIxQzgiLz4gPC9yZGY6RGVzY3JpcHRpb24+IDwvcmRmOlJERj4gPC94OnhtcG1ldGE+IDw/ + eHBhY2tldCBlbmQ9InIiPz6PyaLfAAADMElEQVRIS6VUXUiTYRT+vi3Tzd+ps23+3KRigtiPkolEQReG + UYTkhWatpWlWGkRdddfdSPImqUAJjSIT00oxLJIk0cR+tFSyzDJtgaMkDEPkdM7ZPvm2vS6jBx6es3Pe + 8zzvtm+TohLS/ov+AACStLgEQuJyLRJWYK1yzh/+FgCoQrpnfM4fOGBhcUlIMkEVkma4H4i1y2kFcMD8 + wqKQZILKZqTqmlTAWrfvMjhgbv63Dwm0hLWQohn1eNEbzrlfPiTQAtZCKjP1GXdAIC+r4XD+9CGBFrDm + RVJ1re6pZ0GyHHMvIawauYVNCFPfvvuQQAtYC6meKXU0amNsaGN/ZR60xIf9aIgN3cpGE9OzZCZ85nEm + pGiWlLABmuJCnUOXrNB7chdct4TUo32ANDbp4NuielDpqWfePdaPX6GrohSK4uLhlCEo96YlZLbOFHzH + oJXjMSBcGn4/zQGovEDqXXtzeTb+BTrKj0J3+Q54djYP7EZdTU2MPjFSK8eieQR9QtLg6GcOQPWgqKeQ + ZyOfoK30CDw+lg2Ot3Z4VLoNqo269mCNHIa2WjYn9A1PcAAqU6m9VV3TF9psOwwPS3JgZugCdNoyocwU + jU+RlImWBpezGz0vxzkA1YOiHvPFO7Ca1kGHLQtmXp2HdutmqN+/F6JiU+h3kOpyVeHJwBgHoLIpqajm + 189HoaG4CNqsGTA1UAWth9Lg6r490PygGyLjUikgzuWqQlffCAegelDdUwLqigqhpXgjTPYeh+bCFCg2 + RkEk3vxuVz/P0c43oLP3DQegLhspNalSFxiNcLswHT48LYNbBUlQk7ebzenmyhm08w1o7xmiAP6hRZiT + 70eYkzpctUuJWdHmwWs74+F1Uz7cyE+E4ohQB5mHm9a3GywpTXzektyKduIAIsKI3ISkL4rIdYle05C9 + VrZVBmvtl7eboUyv7V4jSQdwRn8FdI72iErtCUxnIuifkJ5hUqUOq9Jr7OeCNU6bTpNVqtMcDJSldOwn + KnOk+jypJ5QANRWc0cs5SEelXr54QidfwVYAMoiHq4W/gNM6OaNCJ+diaUIqN/43+Atwg27t+9ZXBUn6 + A2MdqQeVc5pWAAAAAElFTkSuQmCC + + + + + iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAIAAABvFaqvAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 + YQUAAAAZdEVYdFNvZnR3YXJlAEFkb2JlIEltYWdlUmVhZHlxyWU8AAADZmlUWHRYTUw6Y29tLmFkb2Jl + LnhtcAAAAAAAPD94cGFja2V0IGJlZ2luPSLvu78iIGlkPSJXNU0wTXBDZWhpSHpyZVN6TlRjemtjOWQi + Pz4gPHg6eG1wbWV0YSB4bWxuczp4PSJhZG9iZTpuczptZXRhLyIgeDp4bXB0az0iQWRvYmUgWE1QIENv + cmUgNS4zLWMwMTEgNjYuMTQ1NjYxLCAyMDEyLzAyLzA2LTE0OjU2OjI3ICAgICAgICAiPiA8cmRmOlJE + RiB4bWxuczpyZGY9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkvMDIvMjItcmRmLXN5bnRheC1ucyMiPiA8 + cmRmOkRlc2NyaXB0aW9uIHJkZjphYm91dD0iIiB4bWxuczp4bXBNTT0iaHR0cDovL25zLmFkb2JlLmNv + bS94YXAvMS4wL21tLyIgeG1sbnM6c3RSZWY9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlw + ZS9SZXNvdXJjZVJlZiMiIHhtbG5zOnhtcD0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wLyIgeG1w + TU06T3JpZ2luYWxEb2N1bWVudElEPSJ4bXAuZGlkOjJGQzkyMzc0Rjk0OUU0MTE5NjNCQjRENDMzQjlC + MUM4IiB4bXBNTTpEb2N1bWVudElEPSJ4bXAuZGlkOjUzQzNGNDI5NEQyQzExRTQ4QkE1QUNCMEVDRDZF + MDVEIiB4bXBNTTpJbnN0YW5jZUlEPSJ4bXAuaWlkOjUzQzNGNDI4NEQyQzExRTQ4QkE1QUNCMEVDRDZF + MDVEIiB4bXA6Q3JlYXRvclRvb2w9IkFkb2JlIFBob3Rvc2hvcCBDUzYgKFdpbmRvd3MpIj4gPHhtcE1N + OkRlcml2ZWRGcm9tIHN0UmVmOmluc3RhbmNlSUQ9InhtcC5paWQ6RkI1NUY4OTYyQTRERTQxMUIzNkJE + NUVDQjU5MzE1NjIiIHN0UmVmOmRvY3VtZW50SUQ9InhtcC5kaWQ6MkZDOTIzNzRGOTQ5RTQxMTk2M0JC + NEQ0MzNCOUIxQzgiLz4gPC9yZGY6RGVzY3JpcHRpb24+IDwvcmRmOlJERj4gPC94OnhtcG1ldGE+IDw/ + eHBhY2tldCBlbmQ9InIiPz6IsaOmAAADF0lEQVQ4T62U/UuTURTH+0nICqRI1ERMMyNQe8N0ChqBwQhN + yvwhEgJjVCqJ/qCibZo6tzQ339h6Nre5prapUzc1XzItX1ilzuWMLLVAen+xf6DTuTxjdxsFVj58ebjc + c+7nnud7z3228DbpIaDFH/CfoqCn72DIDvNfPDM2KAqyr8PcJxqY+QBTb8kkjocXQTsKigGwfqYJHqIg + 1OxHGHvlWPx4hXB1YyA3g4CBhqst+piEnrDA3rA95vBAY1x8d7lq/DVZwm5PQZNvoKYdypSgHgbVEIh1 + cLOZzOCbSSsyRQRba6uWtcpVLbPcwlglInNUCJNWWKqABqMLCGvGlfpJELaQ/V1Vd1lujAhe0chtUrH5 + ZExnmJ85MdomEa+qZMbIEF2BHGunILSjdZwYgTt4gJqjjj0Rltml1Zq9AeL0Mn71Wn2mtDU80MIvsFTw + O+KPIoWC8BNYRIUaqrRQroJKjQOk9N+xLBF2pXJFKfnsDGYa8gS6xOO2whyMuoHaHpGzZ/pBM0IMrtXD + nT4HqNHXe0lYoogMFeQP4jbSDkCPTUyXmnNoPutSo+9WN5DEQDyeWCWnhqm4p7Oimt3b54rzmmKPVHKz + 0Xg0AU1pz87VJp+yXOfd9t3mBmLXsGrsJhSsDtF4iOWxKdpzyQNnuRW7vEUp13obFG05OVUBPtO5V1Sn + k5q4SX8ENfWA6C7xHsP981Bb2sf38ZKd4JhSuXUJHPHhg/WJnAeZFw0Xzt/w8erRtLmBnB/CSmaC599I + 2PYVRl+CXigu3R9SfCC0Pf1MZ1oqvqvjogX7gtRFJfb1n24g7GblfQcFP2fkBYm5anxqQcbLKgzyK/Df + WRTkV5+RMTg84ZrgAOHo4ZIDVNdJw67CpsVLZ5gifj97Typlq2ZFQXj8LKh5EHpnaIar8N+Al5l9Y9Vs + T7OiIAzjqaMsa6QJnBkeWvgOHdPkAuIV67PSeQpCYYZplsZ+KyyWLRyFF8D553EDbURY770J0rrYJbda + SYE4iWb9NcgpRKDrOMAWwYP6d5BTaC52zyaAWDlAm/DweL8AX9zXukfxHsIAAAAASUVORK5CYII= + + + + + iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 + YQUAAAAZdEVYdFNvZnR3YXJlAEFkb2JlIEltYWdlUmVhZHlxyWU8AAADZmlUWHRYTUw6Y29tLmFkb2Jl + LnhtcAAAAAAAPD94cGFja2V0IGJlZ2luPSLvu78iIGlkPSJXNU0wTXBDZWhpSHpyZVN6TlRjemtjOWQi + Pz4gPHg6eG1wbWV0YSB4bWxuczp4PSJhZG9iZTpuczptZXRhLyIgeDp4bXB0az0iQWRvYmUgWE1QIENv + cmUgNS4zLWMwMTEgNjYuMTQ1NjYxLCAyMDEyLzAyLzA2LTE0OjU2OjI3ICAgICAgICAiPiA8cmRmOlJE + RiB4bWxuczpyZGY9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkvMDIvMjItcmRmLXN5bnRheC1ucyMiPiA8 + cmRmOkRlc2NyaXB0aW9uIHJkZjphYm91dD0iIiB4bWxuczp4bXBNTT0iaHR0cDovL25zLmFkb2JlLmNv + bS94YXAvMS4wL21tLyIgeG1sbnM6c3RSZWY9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlw + ZS9SZXNvdXJjZVJlZiMiIHhtbG5zOnhtcD0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wLyIgeG1w + TU06T3JpZ2luYWxEb2N1bWVudElEPSJ4bXAuZGlkOjJGQzkyMzc0Rjk0OUU0MTE5NjNCQjRENDMzQjlC + MUM4IiB4bXBNTTpEb2N1bWVudElEPSJ4bXAuZGlkOkVENUYwQThBNEQyOTExRTQ5QzUzQzdFMkFGQkQy + NTA1IiB4bXBNTTpJbnN0YW5jZUlEPSJ4bXAuaWlkOkVENUYwQTg5NEQyOTExRTQ5QzUzQzdFMkFGQkQy + NTA1IiB4bXA6Q3JlYXRvclRvb2w9IkFkb2JlIFBob3Rvc2hvcCBDUzYgKFdpbmRvd3MpIj4gPHhtcE1N + OkRlcml2ZWRGcm9tIHN0UmVmOmluc3RhbmNlSUQ9InhtcC5paWQ6MkRGNkEzOUYyOTRERTQxMUIzNkJE + NUVDQjU5MzE1NjIiIHN0UmVmOmRvY3VtZW50SUQ9InhtcC5kaWQ6MkZDOTIzNzRGOTQ5RTQxMTk2M0JC + NEQ0MzNCOUIxQzgiLz4gPC9yZGY6RGVzY3JpcHRpb24+IDwvcmRmOlJERj4gPC94OnhtcG1ldGE+IDw/ + eHBhY2tldCBlbmQ9InIiPz6npMy1AAAGEUlEQVRIS7WVeVDUZRjHf7Ase8ECu+wl4LIXcqyyHC783AWW + 5QaRFTHkMi9SQvE+UhLzwk0BUcQSgQBBgcYDzStMSzOPcpqcmo5pmqk/+rOapqb+iG/PbzfFcSz/6pn5 + zPN739/7fp/nvZn/3TSLjj+XJy2/RaItPCT5vaBd8m1+q2Qku1lcrcvki+iXr7fFU6ZZeOx5KDU1b7jU + 1Z2bVPMPWNMbRXrXkWAc+ywVLbcS8fKwFjlu8VdpW0XzSc6f8PEIPzJ19dFnU3WEJdHL9P3X9O1nkdB8 + CQrX7i3mKn9zfqsUq29ZsPfjRBx5aMO2cTMy94gm7FuF7XyJTwDJTo5GVdHxNALVgsPd5Ceye+9g8b0f + UXbjB8RtH4Msd+MeXS7f6twjxbILZiy7pEHDtTBsvG7BqivTUXpsClLWCbtJNpDwBlGVH3ySIFV520eW + nedRcf0HVJGwbeRrOHs/h2n1CGRZDe7wND/W1hiI8sEYlJ4KRcVpJcrfVqByNBILhqLh3KeA+UXBOpL2 + jkRZduARPGXZ/vH4pnMou/gd7INfIPn4QyQc/RSOzk9hrBtEiKPerUn1Y5PXBaDojWlwdgUjr0+G/H4Z + cnpCUNJrQNZ+LeLrBD/LYnixFEDAKFz7vJQ0r49dO4zikS8x8/ADxLd9jIT2B5ix/z7SX78Pw+K3EJy2 + wq1M4rEz6sRwthgw82Ag2KNS2I5JPZ4rZx00ImGNHIZSfisFkDGhxbs5AkKLd/3kaLkDlgTjXrsNc/Md + mPfeQeyOD2HbcRu6yi4E2Wrd8ngeG71IBPtePWa4JUhsD0DykQAkHQqApUWCFLcGyZvDoZ/P/5oCTGXk + hU2MvGB7rbGmG47dd2Fa+x6iX/kAMa/eQvS2m4jaeAPspvcROb8TQexid3CcL2usFCJjnwE5nQYU9RhR + PGDC7D4TCrqMyDqkR9oePbRz/SZEKh8rI8vdyshyXhmzLD8DS/1VGOquwtgw7glkXH0Nhvp3kbL2GrSl + hyC11ril03xZfbkQKZuVsDeq4NihRtYuDbJ2auBoUsO2TQXrJiWMlWIExflWMiHOjRzfJy0bg776HCKX + vANd7WXol1/xeN3Si7A2XIXW1YbAxAq3UO0zPTSd1yG38bplLK//vxBrffKY4PQ1HH9aKk8jonQUUyvO + Qlt9HtqaCx4/tXIMyXWXMXXOAQTEv+D2zCvDhBBTCN1zCGOCZq3k+DXO1YcpRYOY4hpF2LzTCCs74/VE + 3IvnEVd1EhGFblBbWot6BKXWQZq64tlYa2+TuJwQM9KU5cRL35hyOxCe2w913hA0hcPQFI16KRzxEFtO + a1Q9htSVN5C+5S5x7x/uIm3DR7CvuomUReOImt1FU7nwEolHECImMGkJE5i46EJkejNM+X1QOPqhzBqC + KvskVDmnJuHKT/K4bgjKzBMItXcjJv84NOwWiKPndJK40TOCgPgaRmIur1dZ1yM6txvyWT0ITR+AImOQ + gg39N1ybDBJP60PorC5My3oTwQm18FdNryBxbq0EJL6AEUTYZBTkF0NGKyKdvZDb3qJOAxSIOqcP/jtp + JyC3D1BSvYgp6EN4aiNlP/cTEk4gFASPEUeXkWd8RaY5jcrEBkTn9UCT4Q3gzfBfRvJE9rrsfpicHSRe + NsFXmJeSXhTBXXY+jMjk8uArVkpExuKb6pkbYJ7L7Ria37xTUBeMeCkcncRTN0z/TyLKNYy4khNQJq2G + IMLBXdUWQkXwCYYR6md7IPP1k8WEC3UFDzSpG2BZeAZJtXQWFpyls3HOC50JzkdQnbFqDInLLiC2rBcq + 6xoSzzzP+NDVwDBaQkx4XzahNv8xZH48sVotCHeOUnnCWNJG18Q4UjddB7vlfbBbPwC7+YannLTyIrS5 + OyHU5v3hr07poL7JBHe4Jh8bzgQROY8h46IKCAVfbi73D3PcpfoJlX0VtEVN0JXsQlj2ZoRaaynj7N/8 + NfZLPLFmHrXnpiWSCCL8iMl32T/M6YGMq+R+covD7QADwfoIgqt4QVGtfvIZJ4lRv5CY4zypbjfjy+eE + M4l4gtuSwYSQ4DS4EZAew/wNiCYQJlvQU3cAAAAASUVORK5CYII= @@ -1054,142 +1272,6 @@ R2K5fxKLWbbp/7Dc0CBY8Q+pPmOq0VkzzQAAAABJRU5ErkJggg== - - - iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAZdEVYdFNvZnR3YXJlAEFkb2JlIEltYWdlUmVhZHlxyWU8AAADZmlUWHRYTUw6Y29tLmFkb2Jl - LnhtcAAAAAAAPD94cGFja2V0IGJlZ2luPSLvu78iIGlkPSJXNU0wTXBDZWhpSHpyZVN6TlRjemtjOWQi - Pz4gPHg6eG1wbWV0YSB4bWxuczp4PSJhZG9iZTpuczptZXRhLyIgeDp4bXB0az0iQWRvYmUgWE1QIENv - cmUgNS4zLWMwMTEgNjYuMTQ1NjYxLCAyMDEyLzAyLzA2LTE0OjU2OjI3ICAgICAgICAiPiA8cmRmOlJE - RiB4bWxuczpyZGY9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkvMDIvMjItcmRmLXN5bnRheC1ucyMiPiA8 - cmRmOkRlc2NyaXB0aW9uIHJkZjphYm91dD0iIiB4bWxuczp4bXBNTT0iaHR0cDovL25zLmFkb2JlLmNv - bS94YXAvMS4wL21tLyIgeG1sbnM6c3RSZWY9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlw - ZS9SZXNvdXJjZVJlZiMiIHhtbG5zOnhtcD0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wLyIgeG1w - TU06T3JpZ2luYWxEb2N1bWVudElEPSJ4bXAuZGlkOjJGQzkyMzc0Rjk0OUU0MTE5NjNCQjRENDMzQjlC - MUM4IiB4bXBNTTpEb2N1bWVudElEPSJ4bXAuZGlkOjlDMzFEOUI4NEFBRjExRTQ4OTA5OUYwQ0QzM0Q2 - NEI4IiB4bXBNTTpJbnN0YW5jZUlEPSJ4bXAuaWlkOjlDMzFEOUI3NEFBRjExRTQ4OTA5OUYwQ0QzM0Q2 - NEI4IiB4bXA6Q3JlYXRvclRvb2w9IkFkb2JlIFBob3Rvc2hvcCBDUzYgKFdpbmRvd3MpIj4gPHhtcE1N - OkRlcml2ZWRGcm9tIHN0UmVmOmluc3RhbmNlSUQ9InhtcC5paWQ6MDk5Mzk2NTZBRjRBRTQxMTk3NEFD - QUFFQjRCMzVENkUiIHN0UmVmOmRvY3VtZW50SUQ9InhtcC5kaWQ6MkZDOTIzNzRGOTQ5RTQxMTk2M0JC - NEQ0MzNCOUIxQzgiLz4gPC9yZGY6RGVzY3JpcHRpb24+IDwvcmRmOlJERj4gPC94OnhtcG1ldGE+IDw/ - eHBhY2tldCBlbmQ9InIiPz73sIMwAAADIElEQVRIS7WVa0iTYRTH56Uiysvm3TkvpLl5DRIvQYWVWl+6 - iNEVg0yhQqloQZHkLT+Y0YdAs75IpEUhzERZoZhsRpZlS7soblotsRwoxhqWeTrnYZtv+u7NsB74cZ5z - zv89/z17HzYRAPxXeIv/EpFXcOyi4BvKhfehv4FvKBfeh+ayqIUDlIgBgT8whpRYoT2fhgvNVJKBQT9s - hB8/QZDPpnEIjEhg0J5Pw4Vm0mwygG9T06BSqQQhTUhUMoRGpyxYT7OZwfhXC6jVakFIYzNYqN5uMGKa - BI1GIwhpghXJaJJi13d0dEB2bj74hsWzSDlXbzfQG02g0+kEIU2wIomdovzKdVifngnFFytBeb4cLN+n - WaSc6hfKKqB/eHTWoHfwExgMBkFII5MnQUD4WlAWloO26wVs35MDmifPmQFFyqlO/aKKqlmDp31DYDKZ - BCGNTJ4IPqHx8LJvACbNUw7p6e2HuJQMNIhhBuaHj3vBYrEI0tb1BoIiE9kJ9h7Oh7EJM+g/jEJuwVlY - s24ri5RTnfo5BedAIoueIYPumvomuHzjzm9cq2uCq7UNUH2rEarr7kNd0yP26Y+eKoSWtk4wfpmAg7kn - ITY5DUorq1g8cOQEqze3aplOEhRtJoMcL1mMTixV9IgD5a/tSBVDYql8AKOBQLEJtTP08gY/jjFiktKg - 5FIV21Ok3NazvmR2AvrFkCAJyGYk1comZAuHDM/AyLvHThfBveZ26NOPwI59eey7LsbhFCmnOvVJ5+Ef - rrYZLEU8EZ85+HLwW7ZCLMVTFWdkHoLut+/hgbYHaE9XN31XNsupTrWV3jKVs+uS3cyAD0cLe331jW3Q - qRt0CPUlQVHDKI+fN9iGo4W90uNnyuA2vvRtWTlQgxeg/dk7FimnOvU9/CNqUe47b7ANRwt7AfjpKvAK - Gt18Qur35ymhRfsKKLr5hN7EyzDq7humWrrcfSfKxbz/QlwcLDck1snZJdUzYHUDmk57+K1qdXJyzsL6 - RmQD9ZmObygXB8sVIRO6fXQB4hC6eRQppzr1XXmHclnAckFomLc1Um5dItEvhZ97MQXP9N0AAAAASUVO - RK5CYII= - - - - - iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAZdEVYdFNvZnR3YXJlAEFkb2JlIEltYWdlUmVhZHlxyWU8AAADZmlUWHRYTUw6Y29tLmFkb2Jl - LnhtcAAAAAAAPD94cGFja2V0IGJlZ2luPSLvu78iIGlkPSJXNU0wTXBDZWhpSHpyZVN6TlRjemtjOWQi - Pz4gPHg6eG1wbWV0YSB4bWxuczp4PSJhZG9iZTpuczptZXRhLyIgeDp4bXB0az0iQWRvYmUgWE1QIENv - cmUgNS4zLWMwMTEgNjYuMTQ1NjYxLCAyMDEyLzAyLzA2LTE0OjU2OjI3ICAgICAgICAiPiA8cmRmOlJE - RiB4bWxuczpyZGY9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkvMDIvMjItcmRmLXN5bnRheC1ucyMiPiA8 - cmRmOkRlc2NyaXB0aW9uIHJkZjphYm91dD0iIiB4bWxuczp4bXBNTT0iaHR0cDovL25zLmFkb2JlLmNv - bS94YXAvMS4wL21tLyIgeG1sbnM6c3RSZWY9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlw - ZS9SZXNvdXJjZVJlZiMiIHhtbG5zOnhtcD0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wLyIgeG1w - TU06T3JpZ2luYWxEb2N1bWVudElEPSJ4bXAuZGlkOjJGQzkyMzc0Rjk0OUU0MTE5NjNCQjRENDMzQjlC - MUM4IiB4bXBNTTpEb2N1bWVudElEPSJ4bXAuZGlkOjhDMTdBQjRENEFBRTExRTQ4QjQyODY0MDNBNTJE - NzNCIiB4bXBNTTpJbnN0YW5jZUlEPSJ4bXAuaWlkOjhDMTdBQjRDNEFBRTExRTQ4QjQyODY0MDNBNTJE - NzNCIiB4bXA6Q3JlYXRvclRvb2w9IkFkb2JlIFBob3Rvc2hvcCBDUzYgKFdpbmRvd3MpIj4gPHhtcE1N - OkRlcml2ZWRGcm9tIHN0UmVmOmluc3RhbmNlSUQ9InhtcC5paWQ6NUQyMjc4QTlBQjRBRTQxMTk3NEFD - QUFFQjRCMzVENkUiIHN0UmVmOmRvY3VtZW50SUQ9InhtcC5kaWQ6MkZDOTIzNzRGOTQ5RTQxMTk2M0JC - NEQ0MzNCOUIxQzgiLz4gPC9yZGY6RGVzY3JpcHRpb24+IDwvcmRmOlJERj4gPC94OnhtcG1ldGE+IDw/ - eHBhY2tldCBlbmQ9InIiPz4eHsDfAAAB00lEQVRIS7XVWytEURQH8HniTTNHLs0NCXNcXjTN5dH9g/gM - 3jx590QhFDJS0gyTGmpqaqJIMW4hzlAoOaWISS7LWifntI3ddnTGrl92e/57/We/DBsA/CvuYSHZSr0t - lvCGsriX/oI3lMW9lM/SwgF9SEHwizs08IX2vAyLZvZRgXJ+cQWv7yB0q96Ds86voT0vw6KZNJsK4Pnl - DWKxmBBlqhpDUN0UNp2n2VrB/WMOEomEEGX0ArN5o+BGfYB0Oi1EGa8cwpKw6bxRcH6lQiaTEaKMVw5q - rzCbNwr2z65BURQhynh8Qe0VZvNGwdZBFlRVFaKMxxfQXmE2rxc8rW3sQy6XE0puHoG7IaC9YnV9j5th - pbZPqOCDCrbH5uIwOD7/zWgkDkNTizAyuwQjkWWIxFNQWduqmVxI/MiPz6/A8HTUuDMTTYLkbrqhgt5S - T3PG4ZJ3HE7focElZx0u3yn+VQiG1ZLymmm7s74f88f42S6bl9zyJZ6d6Xckd+Mt5ieogH4xJORHHajt - SzvqZPSgECpHZSiA2DztuxBlad+NgnpBEbIjusiiYboKRF+kGFHegUR5ImkFv7G0eAPzWVq8gfksLd5/ - oULiHhYS97BwwPYJlSCUgVubViQAAAAASUVORK5CYII= - - - - - iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAZdEVYdFNvZnR3YXJlAEFkb2JlIEltYWdlUmVhZHlxyWU8AAADZmlUWHRYTUw6Y29tLmFkb2Jl - LnhtcAAAAAAAPD94cGFja2V0IGJlZ2luPSLvu78iIGlkPSJXNU0wTXBDZWhpSHpyZVN6TlRjemtjOWQi - Pz4gPHg6eG1wbWV0YSB4bWxuczp4PSJhZG9iZTpuczptZXRhLyIgeDp4bXB0az0iQWRvYmUgWE1QIENv - cmUgNS4zLWMwMTEgNjYuMTQ1NjYxLCAyMDEyLzAyLzA2LTE0OjU2OjI3ICAgICAgICAiPiA8cmRmOlJE - RiB4bWxuczpyZGY9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkvMDIvMjItcmRmLXN5bnRheC1ucyMiPiA8 - cmRmOkRlc2NyaXB0aW9uIHJkZjphYm91dD0iIiB4bWxuczp4bXBNTT0iaHR0cDovL25zLmFkb2JlLmNv - bS94YXAvMS4wL21tLyIgeG1sbnM6c3RSZWY9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlw - ZS9SZXNvdXJjZVJlZiMiIHhtbG5zOnhtcD0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wLyIgeG1w - TU06T3JpZ2luYWxEb2N1bWVudElEPSJ4bXAuZGlkOjJGQzkyMzc0Rjk0OUU0MTE5NjNCQjRENDMzQjlC - MUM4IiB4bXBNTTpEb2N1bWVudElEPSJ4bXAuZGlkOjJEMDQyOEZBNEFEMjExRTRBN0MxRDBCNzJGRUND - MDEzIiB4bXBNTTpJbnN0YW5jZUlEPSJ4bXAuaWlkOjJEMDQyOEY5NEFEMjExRTRBN0MxRDBCNzJGRUND - MDEzIiB4bXA6Q3JlYXRvclRvb2w9IkFkb2JlIFBob3Rvc2hvcCBDUzYgKFdpbmRvd3MpIj4gPHhtcE1N - OkRlcml2ZWRGcm9tIHN0UmVmOmluc3RhbmNlSUQ9InhtcC5paWQ6QkRDRkI1RDVEMTRBRTQxMTk3NEFD - QUFFQjRCMzVENkUiIHN0UmVmOmRvY3VtZW50SUQ9InhtcC5kaWQ6MkZDOTIzNzRGOTQ5RTQxMTk2M0JC - NEQ0MzNCOUIxQzgiLz4gPC9yZGY6RGVzY3JpcHRpb24+IDwvcmRmOlJERj4gPC94OnhtcG1ldGE+IDw/ - eHBhY2tldCBlbmQ9InIiPz59jfe3AAAEbUlEQVRIS8WTeUybZRzHF48/pnFOuQRajkFLgQFb5iRLNJr4 - l/EPgsniUI4xZDAY1zyxwApsMJyIME61rByl3DfoYGBrgbWUY06FcZSCha4rQ8jYxkqPr2/fvkv8o2Sg - S/wkT970eb6/T5/39z7Prv8dt/Oql4mR4HZJ3ccoXFxhVCzB9DT9JueJdSq6c1wzVZFupepVzxu34XVj - CaEDi1jX6hF8ZQoeokl4iBVwzV9YdU1XRlIl28eVo8phCdXwGltEeOUsro6psaHVwcSDh5volc4iOO8X - 7KuVwb1hEi7J8myq9PEQO//I85oafr0KtEpUpNSETm+AwWDAvfv3YTQaybnm/t/AyO6Ga+UonJOnIijF - 1hA9tWI2qle9RxcI+RIpmZpTIfBULhIyyqHVahHPKcN70TmYnFFCp9OhqXcc9KwW0DOHVl3YU1aUyjJu - F1SpfhO3EM6bMMsVt+D8Zhz2HIpC4oU6bG5uIu4cD3tfTwAjIBNypQYbGxsISquBU34PaDHiVEplGXee - SuIjVaBv3Lz7gJg8vHg4FlZvc+ATVoLipiHsD8qCXWAO7IPK8MG5FjLXKboOeoYADkldUkplGWb7vOb4 - 4BzxIXXQE/1m59WDXdgBvxPfwz6UC4eQUth/WIBDZ2qQXj+K7IYRImeE5s5fOFrcDPvPapcJzVNmmwVY - VxWG9U09uau1tTVymPpc0iYFLew7OEUJ4BwtALfvJpl5xMrKCu6s3cUrn5YbCM1us80CrJZZVWjXr7j3 - 4CE0y8v4IrcaH+cK4Bv+DRyPl8ApphYuia3wZ3eCUzOA1PIfcVuzjHnlIgK/vgy7mHzTG+w12yzA5E53 - edYPo1c2i/X1dQTEfwvbwDQ4hhXg8OcN4P48Df+UTrgkNIAeW4Hg3Hbo9Xq0iGSgs4ls5CUhoXnObLOA - S8pkhG/bdZzgDZJnffT3GXieLAA9XgB2/RjZjuQqMWhxfBw824H55XWyhcfy+HDNqoB1SH4Codn6G7iw - p3d78EaVPlXX0CaZgkqlgly1gpCiK0htHCH/IL6oFcEF3ZjT3CUvXqv0DzDSS0FPq1a/8EbYS5Rqa+if - SAJ8KoeNR7gitEsnoVQqSbGOkJmYX1ggxaY70SabwIGMUrjn8I3WIXnBRPnWu/8nDnE9Sd7cAaP/ZSES - 6/rRKJRArpiHXC7HzekZNIukiCyrhW9mGZgXa4w2kUVnibJnzdXbxP5URzyDO4QjxGl5i9uNpMZeKP5U - IrywAq9yCnGAOGGMonbYxpVnEPGdyR9BO/MTj8kfgXeNFPt5IngVtoF1kQ9WcTs8qgfgmNreQMS21xZL - 0E6Ln6ef75tg8sfgXT8O77oReAkkYNXJ4PRV/4ztyfo9VPTf4xjdf9CpQKzdxxuGe6UMbhXEmc8V6mze - r3qNivx3HGN7UmglQ6CVDMIxXwybo5UcaunJQD8te9rhyx4JrWwItlGNUut3y5+hlp4cDhFCpl14k9jq - nR+Y1NTjIe7NlmMnWKoHsOtvjWYcKpheqFQAAAAASUVORK5CYII= - - - - - iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAZdEVYdFNvZnR3YXJlAEFkb2JlIEltYWdlUmVhZHlxyWU8AAADZmlUWHRYTUw6Y29tLmFkb2Jl - LnhtcAAAAAAAPD94cGFja2V0IGJlZ2luPSLvu78iIGlkPSJXNU0wTXBDZWhpSHpyZVN6TlRjemtjOWQi - Pz4gPHg6eG1wbWV0YSB4bWxuczp4PSJhZG9iZTpuczptZXRhLyIgeDp4bXB0az0iQWRvYmUgWE1QIENv - cmUgNS4zLWMwMTEgNjYuMTQ1NjYxLCAyMDEyLzAyLzA2LTE0OjU2OjI3ICAgICAgICAiPiA8cmRmOlJE - RiB4bWxuczpyZGY9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkvMDIvMjItcmRmLXN5bnRheC1ucyMiPiA8 - cmRmOkRlc2NyaXB0aW9uIHJkZjphYm91dD0iIiB4bWxuczp4bXBNTT0iaHR0cDovL25zLmFkb2JlLmNv - bS94YXAvMS4wL21tLyIgeG1sbnM6c3RSZWY9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlw - ZS9SZXNvdXJjZVJlZiMiIHhtbG5zOnhtcD0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wLyIgeG1w - TU06T3JpZ2luYWxEb2N1bWVudElEPSJ4bXAuZGlkOjJGQzkyMzc0Rjk0OUU0MTE5NjNCQjRENDMzQjlC - MUM4IiB4bXBNTTpEb2N1bWVudElEPSJ4bXAuZGlkOjJERTg4QTFENEQyMjExRTRBODEyODk0M0RBMTc5 - Qjg3IiB4bXBNTTpJbnN0YW5jZUlEPSJ4bXAuaWlkOjJERTg4QTFDNEQyMjExRTRBODEyODk0M0RBMTc5 - Qjg3IiB4bXA6Q3JlYXRvclRvb2w9IkFkb2JlIFBob3Rvc2hvcCBDUzYgKFdpbmRvd3MpIj4gPHhtcE1N - OkRlcml2ZWRGcm9tIHN0UmVmOmluc3RhbmNlSUQ9InhtcC5paWQ6NjJGOUEyRDEyMTRERTQxMUIzNkJE - NUVDQjU5MzE1NjIiIHN0UmVmOmRvY3VtZW50SUQ9InhtcC5kaWQ6MkZDOTIzNzRGOTQ5RTQxMTk2M0JC - NEQ0MzNCOUIxQzgiLz4gPC9yZGY6RGVzY3JpcHRpb24+IDwvcmRmOlJERj4gPC94OnhtcG1ldGE+IDw/ - eHBhY2tldCBlbmQ9InIiPz6wJF34AAACl0lEQVRIS62Vy08TURSH73/QhQtXVnBhxEcMiUkhbEg0hB1R - Q1i68C8wIW5cEqMLN7ho2Ji4YiEhWq0prYUhfULbadN3obTaChobtZEUsFY9nnPS6WM6HYowyZf87j33 - nG/amaai9geOBYA+4pTxihmBE8DcTQB4J8em/9IwSQyagmrtL+z9rMFmvnhkKvtV7tcVHPz6DVsftulA - AckdhUg8zf19eoLKAd597iMLMItewfOxUDTN/bqCH3tVSG8VWIBZ9AoJApEk9+sKvu/uQ2IjzwJkGtH8 - OrTwy3Hu77vIAnV9mgWlcgWiqRwLjAMmkOMbPbNTKnN/JJntqJGEBZ++7oKcyLLgLN4JrU8Cms2C4pcy - BKKZumCI18temQ/8DzSLZlBmQX7nG/jCKdpgAa0driCtY5iFHuqHSjNoFtaags1iCdzBBG+QgNY2aZ0F - mIUe6osENAtrTUEq/7kDq9PHAszU5yYoq9f1i9cUSCD5ozxDEeTsrhAoONwyxLLb8MrhYQFmZYCHsnpd - v3hNgQROb5hnKIK29944MAThTBEWbS4WYBZ6qC/sKSy5ZJ6BGUQg8b4Bbhjod4AZXlhXWdBa10LrIVul - AM9ggS+aa6AIMMO8ZYUO0KeyIOMtZyaQpXpNi4LFucYzMINwhbMNcMNw5oIJMMNKIA0LNg88mZuH/ssj - dPgBMnN+cBRmny1wrRtSMMMzWCCFMg0UAeY2Fh0+GL5xG8Zu3oHXUrCj3g0WONdTbeBm21/o1N17gPtg - 98Xh3VoS3qzKMDI22agfglnY/Uld8NDc/ZlZwAwvl4Ngun6LGh8rdfVDViNs3rguOOzq6XOD8PDpc7g2 - OkHDH7XWtYa2It66Y4eCQ8cRfpvUNa2hTUD8A6JMaBvCyTdJAAAAAElFTkSuQmCC - - iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 @@ -1403,7 +1485,7 @@ AAAASUVORK5CYII= - + iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 YQUAAAAZdEVYdFNvZnR3YXJlAEFkb2JlIEltYWdlUmVhZHlxyWU8AAADZmlUWHRYTUw6Y29tLmFkb2Jl @@ -1415,108 +1497,26 @@ bS94YXAvMS4wL21tLyIgeG1sbnM6c3RSZWY9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlw ZS9SZXNvdXJjZVJlZiMiIHhtbG5zOnhtcD0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wLyIgeG1w TU06T3JpZ2luYWxEb2N1bWVudElEPSJ4bXAuZGlkOjJGQzkyMzc0Rjk0OUU0MTE5NjNCQjRENDMzQjlC - MUM4IiB4bXBNTTpEb2N1bWVudElEPSJ4bXAuZGlkOkUzNzJDMjE3NEFENjExRTRCNjE0OEVEQzI4MEM0 - RTZDIiB4bXBNTTpJbnN0YW5jZUlEPSJ4bXAuaWlkOkUzNzJDMjE2NEFENjExRTRCNjE0OEVEQzI4MEM0 - RTZDIiB4bXA6Q3JlYXRvclRvb2w9IkFkb2JlIFBob3Rvc2hvcCBDUzYgKFdpbmRvd3MpIj4gPHhtcE1N - OkRlcml2ZWRGcm9tIHN0UmVmOmluc3RhbmNlSUQ9InhtcC5paWQ6RkI3NUQ0QkNENDRBRTQxMTk3NEFD - QUFFQjRCMzVENkUiIHN0UmVmOmRvY3VtZW50SUQ9InhtcC5kaWQ6MkZDOTIzNzRGOTQ5RTQxMTk2M0JC - NEQ0MzNCOUIxQzgiLz4gPC9yZGY6RGVzY3JpcHRpb24+IDwvcmRmOlJERj4gPC94OnhtcG1ldGE+IDw/ - eHBhY2tldCBlbmQ9InIiPz6PyaLfAAADMElEQVRIS6VUXUiTYRT+vi3Tzd+ps23+3KRigtiPkolEQReG - UYTkhWatpWlWGkRdddfdSPImqUAJjSIT00oxLJIk0cR+tFSyzDJtgaMkDEPkdM7ZPvm2vS6jBx6es3Pe - 8zzvtm+TohLS/ov+AACStLgEQuJyLRJWYK1yzh/+FgCoQrpnfM4fOGBhcUlIMkEVkma4H4i1y2kFcMD8 - wqKQZILKZqTqmlTAWrfvMjhgbv63Dwm0hLWQohn1eNEbzrlfPiTQAtZCKjP1GXdAIC+r4XD+9CGBFrDm - RVJ1re6pZ0GyHHMvIawauYVNCFPfvvuQQAtYC6meKXU0amNsaGN/ZR60xIf9aIgN3cpGE9OzZCZ85nEm - pGiWlLABmuJCnUOXrNB7chdct4TUo32ANDbp4NuielDpqWfePdaPX6GrohSK4uLhlCEo96YlZLbOFHzH - oJXjMSBcGn4/zQGovEDqXXtzeTb+BTrKj0J3+Q54djYP7EZdTU2MPjFSK8eieQR9QtLg6GcOQPWgqKeQ - ZyOfoK30CDw+lg2Ot3Z4VLoNqo269mCNHIa2WjYn9A1PcAAqU6m9VV3TF9psOwwPS3JgZugCdNoyocwU - jU+RlImWBpezGz0vxzkA1YOiHvPFO7Ca1kGHLQtmXp2HdutmqN+/F6JiU+h3kOpyVeHJwBgHoLIpqajm - 189HoaG4CNqsGTA1UAWth9Lg6r490PygGyLjUikgzuWqQlffCAegelDdUwLqigqhpXgjTPYeh+bCFCg2 - RkEk3vxuVz/P0c43oLP3DQegLhspNalSFxiNcLswHT48LYNbBUlQk7ebzenmyhm08w1o7xmiAP6hRZiT - 70eYkzpctUuJWdHmwWs74+F1Uz7cyE+E4ohQB5mHm9a3GywpTXzektyKduIAIsKI3ISkL4rIdYle05C9 - VrZVBmvtl7eboUyv7V4jSQdwRn8FdI72iErtCUxnIuifkJ5hUqUOq9Jr7OeCNU6bTpNVqtMcDJSldOwn - KnOk+jypJ5QANRWc0cs5SEelXr54QidfwVYAMoiHq4W/gNM6OaNCJ+diaUIqN/43+Atwg27t+9ZXBUn6 - A2MdqQeVc5pWAAAAAElFTkSuQmCC - - - - - iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAIAAABvFaqvAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAZdEVYdFNvZnR3YXJlAEFkb2JlIEltYWdlUmVhZHlxyWU8AAADZmlUWHRYTUw6Y29tLmFkb2Jl - LnhtcAAAAAAAPD94cGFja2V0IGJlZ2luPSLvu78iIGlkPSJXNU0wTXBDZWhpSHpyZVN6TlRjemtjOWQi - Pz4gPHg6eG1wbWV0YSB4bWxuczp4PSJhZG9iZTpuczptZXRhLyIgeDp4bXB0az0iQWRvYmUgWE1QIENv - cmUgNS4zLWMwMTEgNjYuMTQ1NjYxLCAyMDEyLzAyLzA2LTE0OjU2OjI3ICAgICAgICAiPiA8cmRmOlJE - RiB4bWxuczpyZGY9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkvMDIvMjItcmRmLXN5bnRheC1ucyMiPiA8 - cmRmOkRlc2NyaXB0aW9uIHJkZjphYm91dD0iIiB4bWxuczp4bXBNTT0iaHR0cDovL25zLmFkb2JlLmNv - bS94YXAvMS4wL21tLyIgeG1sbnM6c3RSZWY9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlw - ZS9SZXNvdXJjZVJlZiMiIHhtbG5zOnhtcD0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wLyIgeG1w - TU06T3JpZ2luYWxEb2N1bWVudElEPSJ4bXAuZGlkOjJGQzkyMzc0Rjk0OUU0MTE5NjNCQjRENDMzQjlC - MUM4IiB4bXBNTTpEb2N1bWVudElEPSJ4bXAuZGlkOjUzQzNGNDI5NEQyQzExRTQ4QkE1QUNCMEVDRDZF - MDVEIiB4bXBNTTpJbnN0YW5jZUlEPSJ4bXAuaWlkOjUzQzNGNDI4NEQyQzExRTQ4QkE1QUNCMEVDRDZF - MDVEIiB4bXA6Q3JlYXRvclRvb2w9IkFkb2JlIFBob3Rvc2hvcCBDUzYgKFdpbmRvd3MpIj4gPHhtcE1N - OkRlcml2ZWRGcm9tIHN0UmVmOmluc3RhbmNlSUQ9InhtcC5paWQ6RkI1NUY4OTYyQTRERTQxMUIzNkJE + MUM4IiB4bXBNTTpEb2N1bWVudElEPSJ4bXAuZGlkOjJERjY3MEZENEQyMzExRTRCNDlGQUMwMzk0OTAw + Qzc4IiB4bXBNTTpJbnN0YW5jZUlEPSJ4bXAuaWlkOjJERjY3MEZDNEQyMzExRTRCNDlGQUMwMzk0OTAw + Qzc4IiB4bXA6Q3JlYXRvclRvb2w9IkFkb2JlIFBob3Rvc2hvcCBDUzYgKFdpbmRvd3MpIj4gPHhtcE1N + OkRlcml2ZWRGcm9tIHN0UmVmOmluc3RhbmNlSUQ9InhtcC5paWQ6NjhGOUEyRDEyMTRERTQxMUIzNkJE NUVDQjU5MzE1NjIiIHN0UmVmOmRvY3VtZW50SUQ9InhtcC5kaWQ6MkZDOTIzNzRGOTQ5RTQxMTk2M0JC NEQ0MzNCOUIxQzgiLz4gPC9yZGY6RGVzY3JpcHRpb24+IDwvcmRmOlJERj4gPC94OnhtcG1ldGE+IDw/ - eHBhY2tldCBlbmQ9InIiPz6IsaOmAAADF0lEQVQ4T62U/UuTURTH+0nICqRI1ERMMyNQe8N0ChqBwQhN - yvwhEgJjVCqJ/qCibZo6tzQ339h6Nre5prapUzc1XzItX1ilzuWMLLVAen+xf6DTuTxjdxsFVj58ebjc - c+7nnud7z3228DbpIaDFH/CfoqCn72DIDvNfPDM2KAqyr8PcJxqY+QBTb8kkjocXQTsKigGwfqYJHqIg - 1OxHGHvlWPx4hXB1YyA3g4CBhqst+piEnrDA3rA95vBAY1x8d7lq/DVZwm5PQZNvoKYdypSgHgbVEIh1 - cLOZzOCbSSsyRQRba6uWtcpVLbPcwlglInNUCJNWWKqABqMLCGvGlfpJELaQ/V1Vd1lujAhe0chtUrH5 - ZExnmJ85MdomEa+qZMbIEF2BHGunILSjdZwYgTt4gJqjjj0Rltml1Zq9AeL0Mn71Wn2mtDU80MIvsFTw - O+KPIoWC8BNYRIUaqrRQroJKjQOk9N+xLBF2pXJFKfnsDGYa8gS6xOO2whyMuoHaHpGzZ/pBM0IMrtXD - nT4HqNHXe0lYoogMFeQP4jbSDkCPTUyXmnNoPutSo+9WN5DEQDyeWCWnhqm4p7Oimt3b54rzmmKPVHKz - 0Xg0AU1pz87VJp+yXOfd9t3mBmLXsGrsJhSsDtF4iOWxKdpzyQNnuRW7vEUp13obFG05OVUBPtO5V1Sn - k5q4SX8ENfWA6C7xHsP981Bb2sf38ZKd4JhSuXUJHPHhg/WJnAeZFw0Xzt/w8erRtLmBnB/CSmaC599I - 2PYVRl+CXigu3R9SfCC0Pf1MZ1oqvqvjogX7gtRFJfb1n24g7GblfQcFP2fkBYm5anxqQcbLKgzyK/Df - WRTkV5+RMTg84ZrgAOHo4ZIDVNdJw67CpsVLZ5gifj97Typlq2ZFQXj8LKh5EHpnaIar8N+Al5l9Y9Vs - T7OiIAzjqaMsa6QJnBkeWvgOHdPkAuIV67PSeQpCYYZplsZ+KyyWLRyFF8D553EDbURY770J0rrYJbda - SYE4iWb9NcgpRKDrOMAWwYP6d5BTaC52zyaAWDlAm/DweL8AX9zXukfxHsIAAAAASUVORK5CYII= - - - - - iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAZdEVYdFNvZnR3YXJlAEFkb2JlIEltYWdlUmVhZHlxyWU8AAADZmlUWHRYTUw6Y29tLmFkb2Jl - LnhtcAAAAAAAPD94cGFja2V0IGJlZ2luPSLvu78iIGlkPSJXNU0wTXBDZWhpSHpyZVN6TlRjemtjOWQi - Pz4gPHg6eG1wbWV0YSB4bWxuczp4PSJhZG9iZTpuczptZXRhLyIgeDp4bXB0az0iQWRvYmUgWE1QIENv - cmUgNS4zLWMwMTEgNjYuMTQ1NjYxLCAyMDEyLzAyLzA2LTE0OjU2OjI3ICAgICAgICAiPiA8cmRmOlJE - RiB4bWxuczpyZGY9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkvMDIvMjItcmRmLXN5bnRheC1ucyMiPiA8 - cmRmOkRlc2NyaXB0aW9uIHJkZjphYm91dD0iIiB4bWxuczp4bXBNTT0iaHR0cDovL25zLmFkb2JlLmNv - bS94YXAvMS4wL21tLyIgeG1sbnM6c3RSZWY9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlw - ZS9SZXNvdXJjZVJlZiMiIHhtbG5zOnhtcD0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wLyIgeG1w - TU06T3JpZ2luYWxEb2N1bWVudElEPSJ4bXAuZGlkOjJGQzkyMzc0Rjk0OUU0MTE5NjNCQjRENDMzQjlC - MUM4IiB4bXBNTTpEb2N1bWVudElEPSJ4bXAuZGlkOkVENUYwQThBNEQyOTExRTQ5QzUzQzdFMkFGQkQy - NTA1IiB4bXBNTTpJbnN0YW5jZUlEPSJ4bXAuaWlkOkVENUYwQTg5NEQyOTExRTQ5QzUzQzdFMkFGQkQy - NTA1IiB4bXA6Q3JlYXRvclRvb2w9IkFkb2JlIFBob3Rvc2hvcCBDUzYgKFdpbmRvd3MpIj4gPHhtcE1N - OkRlcml2ZWRGcm9tIHN0UmVmOmluc3RhbmNlSUQ9InhtcC5paWQ6MkRGNkEzOUYyOTRERTQxMUIzNkJE - NUVDQjU5MzE1NjIiIHN0UmVmOmRvY3VtZW50SUQ9InhtcC5kaWQ6MkZDOTIzNzRGOTQ5RTQxMTk2M0JC - NEQ0MzNCOUIxQzgiLz4gPC9yZGY6RGVzY3JpcHRpb24+IDwvcmRmOlJERj4gPC94OnhtcG1ldGE+IDw/ - eHBhY2tldCBlbmQ9InIiPz6npMy1AAAGEUlEQVRIS7WVeVDUZRjHf7Ase8ECu+wl4LIXcqyyHC783AWW - 5QaRFTHkMi9SQvE+UhLzwk0BUcQSgQBBgcYDzStMSzOPcpqcmo5pmqk/+rOapqb+iG/PbzfFcSz/6pn5 - zPN739/7fp/nvZn/3TSLjj+XJy2/RaItPCT5vaBd8m1+q2Qku1lcrcvki+iXr7fFU6ZZeOx5KDU1b7jU - 1Z2bVPMPWNMbRXrXkWAc+ywVLbcS8fKwFjlu8VdpW0XzSc6f8PEIPzJ19dFnU3WEJdHL9P3X9O1nkdB8 - CQrX7i3mKn9zfqsUq29ZsPfjRBx5aMO2cTMy94gm7FuF7XyJTwDJTo5GVdHxNALVgsPd5Ceye+9g8b0f - UXbjB8RtH4Msd+MeXS7f6twjxbILZiy7pEHDtTBsvG7BqivTUXpsClLWCbtJNpDwBlGVH3ySIFV520eW - nedRcf0HVJGwbeRrOHs/h2n1CGRZDe7wND/W1hiI8sEYlJ4KRcVpJcrfVqByNBILhqLh3KeA+UXBOpL2 - jkRZduARPGXZ/vH4pnMou/gd7INfIPn4QyQc/RSOzk9hrBtEiKPerUn1Y5PXBaDojWlwdgUjr0+G/H4Z - cnpCUNJrQNZ+LeLrBD/LYnixFEDAKFz7vJQ0r49dO4zikS8x8/ADxLd9jIT2B5ix/z7SX78Pw+K3EJy2 - wq1M4rEz6sRwthgw82Ag2KNS2I5JPZ4rZx00ImGNHIZSfisFkDGhxbs5AkKLd/3kaLkDlgTjXrsNc/Md - mPfeQeyOD2HbcRu6yi4E2Wrd8ngeG71IBPtePWa4JUhsD0DykQAkHQqApUWCFLcGyZvDoZ/P/5oCTGXk - hU2MvGB7rbGmG47dd2Fa+x6iX/kAMa/eQvS2m4jaeAPspvcROb8TQexid3CcL2usFCJjnwE5nQYU9RhR - PGDC7D4TCrqMyDqkR9oePbRz/SZEKh8rI8vdyshyXhmzLD8DS/1VGOquwtgw7glkXH0Nhvp3kbL2GrSl - hyC11ril03xZfbkQKZuVsDeq4NihRtYuDbJ2auBoUsO2TQXrJiWMlWIExflWMiHOjRzfJy0bg776HCKX - vANd7WXol1/xeN3Si7A2XIXW1YbAxAq3UO0zPTSd1yG38bplLK//vxBrffKY4PQ1HH9aKk8jonQUUyvO - Qlt9HtqaCx4/tXIMyXWXMXXOAQTEv+D2zCvDhBBTCN1zCGOCZq3k+DXO1YcpRYOY4hpF2LzTCCs74/VE - 3IvnEVd1EhGFblBbWot6BKXWQZq64tlYa2+TuJwQM9KU5cRL35hyOxCe2w913hA0hcPQFI16KRzxEFtO - a1Q9htSVN5C+5S5x7x/uIm3DR7CvuomUReOImt1FU7nwEolHECImMGkJE5i46EJkejNM+X1QOPqhzBqC - KvskVDmnJuHKT/K4bgjKzBMItXcjJv84NOwWiKPndJK40TOCgPgaRmIur1dZ1yM6txvyWT0ITR+AImOQ - gg39N1ybDBJP60PorC5My3oTwQm18FdNryBxbq0EJL6AEUTYZBTkF0NGKyKdvZDb3qJOAxSIOqcP/jtp - JyC3D1BSvYgp6EN4aiNlP/cTEk4gFASPEUeXkWd8RaY5jcrEBkTn9UCT4Q3gzfBfRvJE9rrsfpicHSRe - NsFXmJeSXhTBXXY+jMjk8uArVkpExuKb6pkbYJ7L7Ria37xTUBeMeCkcncRTN0z/TyLKNYy4khNQJq2G - IMLBXdUWQkXwCYYR6md7IPP1k8WEC3UFDzSpG2BZeAZJtXQWFpyls3HOC50JzkdQnbFqDInLLiC2rBcq - 6xoSzzzP+NDVwDBaQkx4XzahNv8xZH48sVotCHeOUnnCWNJG18Q4UjddB7vlfbBbPwC7+YannLTyIrS5 - OyHU5v3hr07poL7JBHe4Jh8bzgQROY8h46IKCAVfbi73D3PcpfoJlX0VtEVN0JXsQlj2ZoRaaynj7N/8 - NfZLPLFmHrXnpiWSCCL8iMl32T/M6YGMq+R+covD7QADwfoIgqt4QVGtfvIZJ4lRv5CY4zypbjfjy+eE - M4l4gtuSwYSQ4DS4EZAew/wNiCYQJlvQU3cAAAAASUVORK5CYII= + eHBhY2tldCBlbmQ9InIiPz6GKmpFAAAC+UlEQVRIS63T20vTYRzH8Yforj/Ei24UiSgKIygKi8oyxZQo + cvNYeXaesmzqPGu2POd0ulSsnIdaurTSTJ3O6UxTPGya5vCQx5AuPn39RbHop7nZxQt+z3ie93e/Z4w1 + p7nsCoBt8R6yBF/UHPv+Wb0rfFFzm99CRIwEW1gnqXzxTXxRc0ydctm4OlID2sxrw6iCtiwItC+A2P/D + frLnjwGNSZdMq6N1WOvLwFpP4l/WdRlY6Jaio9Ab7QXba8sVoDHZGdT8PYS9THDqMGnLsKpNw0qXGCua + BO55VZdNQ6U/DRRibVCGb+N1pH5bukoRqHmDHOIG1N8/X2F4I8WyNhtf2+9hqSsZxqZ4upbb6HsSZLHO + Im90ym6hNVcIaktYTexZyUelGEvaHMy/jcFiZxo0xX5Y7ivGcn8JkVmA9uvlWBmqwpJeAWovs+poR99O + eRgWtQWYVUdgrj0FH+i+F3XF3NoappZYGJrEoLaOVYpOOTY/FGJB+xjTqnDMtMTTAC/Ma/Ix/TLUKl9e + x0JfFQpql7PykBP7lWIXzPeUYLIhHCPKCLr/AMy2ZsKoDLTKdNNdvM8TgNpRTBZwfJ885CTmaIChPhwa + mS+GnkdhqjEWY9X+VplqvIMXEhdQ24mZeuSs0N/BNNWWj4k6EdSZHhhXxWH0aSCGFd4c4Tk7zk7XBlUM + FKLToK4Nm+0qYnneRzqGGiSYaIiiyZdhVCdgqFSIwRJPjucZW85O1pvnRmvDkO9zFNTdy2Y6HjGp4HCF + 5kk4xhoiURd/EROv4tBfeM0qAyUC9Mp9QM0+7o829T6LZV0/mNycS6+nFKFWfAGj9ZHozfGwil7miZYH + 7qCmghsw+S6VpV894KuUuKFbfhNNqa749CwY3dm0toK+VABl3HlQM5obYHybwFLc7W1y/Y5BlX6FfgNn + DNcEY0DhZZX+MiGKbh0DNR24AYYWMSfJzc6GZBApwS5skIzNODcg0dV2V36FtsJ7yBJ8UXO8hyzBFzXH + ++H/A/YDv9/V87iOlrYAAAAASUVORK5CYII= @@ -3164,9 +3164,6 @@ 864, 17 - - 864, 17 - iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 diff --git a/Program.cs b/Program.cs index e38f7b8..a76d0d4 100644 --- a/Program.cs +++ b/Program.cs @@ -16,14 +16,14 @@ [STAThread] static void Main() { - ValidateInfo validateInfo = ValidateConfig.LoadConfig(); + ValidateConfig.LoadConfig(); string localConfigPath = Application.StartupPath + "/Config.xml"; //获取程序及版本信息 string currentVersionCode = Assembly.GetExecutingAssembly().GetName().Version.ToString(); //获取文件版本信息 FileVersionInfo.GetVersionInfo(Application.ExecutablePath); - + Utility.SysInfoConfig(); string configUrl = getProgramUrl(localConfigPath, "configurl"); if (configUrl != "") { diff --git a/TreeUtils.cs b/TreeUtils.cs index 1f055b5..ad39643 100644 --- a/TreeUtils.cs +++ b/TreeUtils.cs @@ -19,7 +19,7 @@ public static void InitLayerTree(GSOGlobeControl gsoGlobeControl, TreeView treeView, string viewDatasrc) { // treeView.Nodes.Clear(); - LayerConfig layerConfig = Utility.layerConfig;//layertree所在的配置文件 + LayerConfig layerConfig = Utility.LayerConfig;//layertree所在的配置文件 List datasrcs = layerConfig.datasrcs; foreach (DataSrc datasrc in datasrcs) { diff --git a/Utility.cs b/Utility.cs index c03e405..ab947a3 100644 --- a/Utility.cs +++ b/Utility.cs @@ -20,7 +20,7 @@ public static string dbdatabase; public static string userID; - public static Hashtable Pipe_QueryFields; +// public static Hashtable Pipe_QueryFields; public static string DBPassword; public static string DBServer; public static string DBBackUp; @@ -38,7 +38,7 @@ public static List listPipelineType; public static string PicRootURL; public static string PicDefaultURL; - public static double dFlyAboveLine = 2; +// public static double dFlyAboveLine = 2; public static string userName; public static string projectStr; public static string userRole; @@ -85,12 +85,17 @@ public static List pipefittingLayerNames = new List();//管件图层名称 public static List sgPipeLayersNames = new List();//施工管线图层名称 -// public static Dictionary dictionaryNetLayerNameAndCaption = new Dictionary(); - public static HashSet layerNameSet = new HashSet(); + public static HashSet layerNameSet = new HashSet();//记录有哪些图层要显示 public static string roadLayerName = ""; #endregion wxl - public static LayerConfig layerConfig; + public static LayerConfig LayerConfig; + + public static string RoleServer; + public static string TitleImagePath; + public static string SysnameVersion; + public static string Copyright; + public static void SetBallons(GSOBalloon featureTooltip, GSOBalloonEx balloonEx) { featureTooltip.CacheFilePath = Application.StartupPath + "/GeoScene/Globe/Temp"; @@ -188,25 +193,6 @@ } return s.ToString(); } - public static GSOFeatures Table2Features(DataTable table, string currentQueryLayer, GSOGlobeControl globeControl1) - { - GSOFeatures features = new GSOFeatures(); - for (int i = 0; i < table.Rows.Count; i++) - { - DataRow row = table.Rows[i]; - - string featureName = row["编号"].ToString(); - featureName = featureName.Trim(); - GSOLayer layer = globeControl1.Globe.Layers.GetLayerByCaption(currentQueryLayer); - GSOFeatures tempfeatures = layer.GetFeatureByName(featureName, false); - if (tempfeatures.Length > 0) - { - features.Add(tempfeatures[0]); - } - } - return features; - } - //程序启动的时候读取配置文件 public static void SetParams() @@ -358,8 +344,8 @@ #region wxl 从layerconfig.xml中读取 - layerConfig = XmlTools.DeserializeFromXml(layerConfigFile); - List dataSrcs = layerConfig.datasrcs; + LayerConfig = XmlTools.DeserializeFromXml(layerConfigFile); + List dataSrcs = LayerConfig.datasrcs; foreach (var dataSrc in dataSrcs) { @@ -598,76 +584,49 @@ #endregion } - /* - //判断网络是否连接 - public static bool isNetworkConnectionSuccess(string ipAdress) + /// + /// 获取Config.xml配置文件中的roleurl配置，并返回 + /// + /// 请求综合信息平台的服务地址 + public static void SysInfoConfig() { - //return true; - if (ipAdress == null) - { - return false; - } - if (ipAdress.Contains("\\")) - { - ipAdress = ipAdress.Substring(0, ipAdress.LastIndexOf('\\')); - } - if (ipAdress.Trim() == "localhost" || ipAdress.Trim() == "127.0.0.1" || ipAdress.Trim() == Dns.GetHostName()) - { - return true; - } - Ping ping = new Ping(); + if (!File.Exists(filename)) return; + + XmlTextReader xmlReader = new XmlTextReader(filename); try { - PingReply pr = ping.Send(ipAdress.Trim(), 3000); - if (pr.Status == IPStatus.Success) + while (xmlReader.Read()) { - return true; + if (xmlReader.Name.Equals("roleurl")) + { + RoleServer = xmlReader.ReadElementString(); + } + else if (xmlReader.Name.Equals("titleimgpath")) + { + TitleImagePath = xmlReader.ReadElementString(); + } + else if (xmlReader.Name.Equals("sysname")) + { + SysnameVersion = xmlReader.ReadElementString(); + } + else if (xmlReader.Name.Equals("copyright")) + { + Copyright = xmlReader.ReadElementString(); + } } - else - { - return false; - } + } catch (Exception ex) { - LogError.PublishError(ex); - return false; + + LogHelper.Error("在config.xml配置文件中读取roleurl时出错"); } - } - */ - - - //TODO LIST:下面两个方法移到featueTools.cs中 - //根据附属物图层名字得到里面含有的附属物 - public static string[] getAccStrsByLayer(string layername) - { - string[] accStrs = null; - string sql = "select 附属物名称 from " + layername + " group by 附属物名称"; - DataSet dataset = OledbHelper.getDataSet(sql, layername); - if (dataset == null) return null; - accStrs = new string[dataset.Tables[0].Rows.Count]; - for (int i = 0; i < dataset.Tables[0].Rows.Count; i++) + finally { - accStrs[i] = dataset.Tables[0].Rows[i][0].ToString(); + xmlReader.Close(); } - return accStrs; } - //删除内存图层中指定名称的feature - public static void RemoveFeatureFromName(GSOGlobeControl globeControl1, string featureName) - { - GSOFeatures features = globeControl1.Globe.MemoryLayer.GetFeatureByName(featureName, true); - if (features != null) - { - for (int i = features.Length - 1; i >= 0; i--) - { - GSOFeature feature = features[i]; - if (feature != null) - { - globeControl1.Globe.MemoryLayer.RemoveFeatureByID(feature.ID); - } - } - } - globeControl1.Refresh(); - } + + } } diff --git a/ValidateInfo.cs b/ValidateInfo.cs index de75391..01546da 100644 --- a/ValidateInfo.cs +++ b/ValidateInfo.cs @@ -192,7 +192,7 @@ } if (!isSuccess) { - LogHelper.WriteLog(typeof(FieldUniqueValidate), logStr); + LogHelper.Error(logStr); } return isSuccess; } @@ -247,7 +247,7 @@ err += "未找到字段或其类型匹配:" + unFoundField.label + ":" + unFoundField.type + "\r\n"; } - LogHelper.WriteLog(typeof(FieldCountValidate), err); + LogHelper.Error(err); return false; } return true; @@ -316,7 +316,7 @@ { err += "字段:" + field.label + "出错\r\n"; } - LogHelper.WriteLog(typeof(FieldOrderValidate), err); + LogHelper.Error(err); return false; } return true; @@ -388,8 +388,7 @@ } if (isSuccess == false) { - LogHelper.WriteLog(typeof(FieldEmptyValidate), - "字段为空检查失败:\r\n" + err); + LogHelper.Error("字段为空检查失败:\r\n" + err); } return isSuccess; } diff --git a/bin/x86/Debug/Config.xml b/bin/x86/Debug/Config.xml index 6995f64..6a453a3 100644 --- a/bin/x86/Debug/Config.xml +++ b/bin/x86/Debug/Config.xml @@ -25,6 +25,11 @@ http://127.0.0.1/Cyberpipe.msi http://127.0.0.1/Config.xml + http://192.168.0.102:8080/ctrl + /Resource/title.jpg + 智慧太湖新城管网规划分析系统6.0 + @2014-2015 苏州航天系统工程有限公司 版权所有 + 编号,管线编码,管径_毫米,材质,埋设方式,起始地面高程,起始埋深,终止地面高程,终止埋深,建设年代,使用年限,权属单位,设计单位,设计负责人,施工单位,施工负责人,监理单位,监理负责人,业务负责人,备注 编号,管线编码,管径_毫米,材质,埋设方式,起始地面高程,起始埋深,终止地面高程,终止埋深,建设年代,使用年限,权属单位,设计单位,设计负责人,施工单位,施工负责人,监理单位,监理负责人,业务负责人,备注 diff --git a/bin/x86/Debug/config/log4net.config b/bin/x86/Debug/config/log4net.config index 80f9b25..6fbcfa7 100644 --- a/bin/x86/Debug/config/log4net.config +++ b/bin/x86/Debug/config/log4net.config @@ -3,29 +3,118 @@
- - - - - - - - - - - - - - - + + + -property: [%property{NDC}] - %n错误描述：%message%newline %n"/> - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/bin/x86/Debug/glVersion.txt b/bin/x86/Debug/glVersion.txt index cd82eca..755455e 100644 --- a/bin/x86/Debug/glVersion.txt +++ b/bin/x86/Debug/glVersion.txt Binary files differ diff --git a/bin/x86/Debug/log.txt b/bin/x86/Debug/log.txt index a4966d3..2112642 100644 --- a/bin/x86/Debug/log.txt +++ b/bin/x86/Debug/log.txt @@ -430,3 +430,43 @@ exception over ------------------------------------------------------------ + + exception begin -----------------2016/11/29 18:54:54--------------------- + + + + e.Message:第 29 行，位置 4 上的开始标记“titleimagpath”与结束标记“titleimagepath”不匹配。 第 29 行，位置 39。 + + e.Source:System.Xml + + e.TargetSite:Void Throw(System.String, System.String[]) + + e.StackTrace: 在 System.Xml.XmlTextReaderImpl.Throw(String res, String[] args) + 在 System.Xml.XmlTextReaderImpl.ThrowTagMismatch(NodeData startTag) + 在 System.Xml.XmlTextReaderImpl.ParseEndElement() + 在 System.Xml.XmlTextReaderImpl.ParseElementContent() + 在 Cyberpipe.Utility.SetParams() 位置 E:\wxl\work\GHFX_REFACTOR\Utility.cs:行号 208 + + + + exception over ------------------------------------------------------------ + + exception begin -----------------2016/11/29 18:57:17--------------------- + + + + e.Message:第 29 行，位置 4 上的开始标记“titleimagpath”与结束标记“titleimagepath”不匹配。 第 29 行，位置 39。 + + e.Source:System.Xml + + e.TargetSite:Void Throw(System.String, System.String[]) + + e.StackTrace: 在 System.Xml.XmlTextReaderImpl.Throw(String res, String[] args) + 在 System.Xml.XmlTextReaderImpl.ThrowTagMismatch(NodeData startTag) + 在 System.Xml.XmlTextReaderImpl.ParseEndElement() + 在 System.Xml.XmlTextReaderImpl.ParseElementContent() + 在 Cyberpipe.Utility.SetParams() 位置 E:\wxl\work\GHFX_REFACTOR\Utility.cs:行号 208 + + + + exception over ------------------------------------------------------------ diff --git a/bin/x86/Debug/log/2016/201611/20161107.txt b/bin/x86/Debug/log/2016/201611/20161107.txt deleted file mode 100644 index cd32fa6..0000000 --- a/bin/x86/Debug/log/2016/201611/20161107.txt +++ /dev/null @@ -1,152 +0,0 @@ - - -��¼ʱ�䣺2016-11-07 10:30:22,327 -�߳�ID:[9] -��־���� ERROR -�����ࣺCyberpipe.FrmBSQStatis property: [(null)] - -����������1 - - - -��¼ʱ�䣺2016-11-07 10:30:40,660 -�߳�ID:[9] -��־���� ERROR -�����ࣺCyberpipe.FrmBSQStatis property: [(null)] - -����������0 - - - -��¼ʱ�䣺2016-11-07 14:00:27,070 -�߳�ID:[8] -��־���� ERROR -�����ࣺCyberpipe.Forms.FrmPipelineModelDB property: [(null)] - -����������δ�������������õ������ʵ���� - - - -��¼ʱ�䣺2016-11-07 14:00:36,154 -�߳�ID:[8] -��־���� ERROR -�����ࣺCyberpipe.Forms.FrmPipelineModelDB property: [(null)] - -����������δ�������������õ������ʵ���� - - - -��¼ʱ�䣺2016-11-07 14:00:40,186 -�߳�ID:[8] -��־���� ERROR -�����ࣺCyberpipe.Forms.FrmPipelineModelDB property: [(null)] - -����������δ�������������õ������ʵ���� - - - -��¼ʱ�䣺2016-11-07 14:05:46,422 -�߳�ID:[9] -��־���� ERROR -�����ࣺCyberpipe.Forms.FrmPipelineModelDB property: [(null)] - -����������δ�������������õ������ʵ���� - - - -��¼ʱ�䣺2016-11-07 14:06:34,633 -�߳�ID:[10] -��־���� ERROR -�����ࣺCyberpipe.Forms.FrmPipelineModelDB property: [(null)] - -����������δ�������������õ������ʵ���� - - - -��¼ʱ�䣺2016-11-07 14:06:36,301 -�߳�ID:[10] -��־���� ERROR -�����ࣺCyberpipe.Forms.FrmPipelineModelDB property: [(null)] - -����������δ�������������õ������ʵ���� - - - -��¼ʱ�䣺2016-11-07 14:06:44,800 -�߳�ID:[10] -��־���� ERROR -�����ࣺCyberpipe.Forms.FrmPipelineModelDB property: [(null)] - -����������δ�������������õ������ʵ���� - - - -��¼ʱ�䣺2016-11-07 14:07:03,449 -�߳�ID:[10] -��־���� ERROR -�����ࣺCyberpipe.Forms.FrmPipelineModelDB property: [(null)] - -����������δ�������������õ������ʵ���� - - - -��¼ʱ�䣺2016-11-07 14:07:05,165 -�߳�ID:[10] -��־���� ERROR -�����ࣺCyberpipe.Forms.FrmPipelineModelDB property: [(null)] - -����������δ�������������õ������ʵ���� - - - -��¼ʱ�䣺2016-11-07 17:58:24,384 -�߳�ID:[10] -��־���� ERROR -�����ࣺCyberpipe.Forms.FrmPipelineModelDB property: [(null)] - -����������δ�������������õ������ʵ���� - - - -��¼ʱ�䣺2016-11-07 18:11:22,114 -�߳�ID:[8] -��־���� ERROR -�����ࣺCyberpipe.Forms.FrmPipelineModelDB property: [(null)] - -����������δ�������������õ������ʵ���� - - - -��¼ʱ�䣺2016-11-07 18:12:13,619 -�߳�ID:[8] -��־���� ERROR -�����ࣺCyberpipe.Forms.FrmPipelineModelDB property: [(null)] - -����������δ�������������õ������ʵ���� - - - -��¼ʱ�䣺2016-11-07 18:12:33,268 -�߳�ID:[8] -��־���� ERROR -�����ࣺCyberpipe.Forms.FrmPipelineModelDB property: [(null)] - -����������δ�������������õ������ʵ���� - - - -��¼ʱ�䣺2016-11-07 18:12:43,628 -�߳�ID:[8] -��־���� ERROR -�����ࣺCyberpipe.Forms.FrmPipelineModelDB property: [(null)] - -����������δ�������������õ������ʵ���� - - - -��¼ʱ�䣺2016-11-07 18:12:53,488 -�߳�ID:[8] -��־���� ERROR -�����ࣺCyberpipe.Forms.FrmPipelineModelDB property: [(null)] - -����������δ�������������õ������ʵ���� - - - -��¼ʱ�䣺2016-11-07 18:13:31,996 -�߳�ID:[8] -��־���� ERROR -�����ࣺCyberpipe.Forms.FrmPipelineModelDB property: [(null)] - -����������δ�������������õ������ʵ���� - - - -��¼ʱ�䣺2016-11-07 18:16:05,234 -�߳�ID:[9] -��־���� ERROR -�����ࣺCyberpipe.Forms.FrmPipelineModelDB property: [(null)] - -����������δ�������������õ������ʵ���� - diff --git a/bin/x86/Debug/log/2016/201611/20161108.txt b/bin/x86/Debug/log/2016/201611/20161108.txt deleted file mode 100644 index b5c96c9..0000000 --- a/bin/x86/Debug/log/2016/201611/20161108.txt +++ /dev/null @@ -1,40 +0,0 @@ - - -��¼ʱ�䣺2016-11-08 09:53:20,836 -�߳�ID:[10] -��־���� ERROR -�����ࣺCyberpipe.Forms.FrmPipelineModelDB property: [(null)] - -����������δ�������������õ������ʵ���� - - - -��¼ʱ�䣺2016-11-08 09:53:49,986 -�߳�ID:[10] -��־���� ERROR -�����ࣺCyberpipe.Forms.FrmPipelineModelDB property: [(null)] - -����������δ�������������õ������ʵ���� - - - -��¼ʱ�䣺2016-11-08 09:54:25,364 -�߳�ID:[10] -��־���� ERROR -�����ࣺCyberpipe.Forms.FrmPipelineModelDB property: [(null)] - -����������δ�������������õ������ʵ���� - - - -��¼ʱ�䣺2016-11-08 10:33:09,418 -�߳�ID:[11] -��־���� ERROR -�����ࣺCyberpipe.Forms.FrmPipelineModelDB property: [(null)] - -����������δ�������������õ������ʵ���� - - - -��¼ʱ�䣺2016-11-08 10:38:53,638 -�߳�ID:[10] -��־���� ERROR -�����ࣺCyberpipe.Forms.FrmPipelineModelDB property: [(null)] - -����������δ�������������õ������ʵ���� - diff --git a/bin/x86/Debug/log/2016/201611/20161116.txt b/bin/x86/Debug/log/2016/201611/20161116.txt deleted file mode 100644 index d23f760..0000000 --- a/bin/x86/Debug/log/2016/201611/20161116.txt +++ /dev/null @@ -1,8 +0,0 @@ - - -��¼ʱ�䣺2016-11-16 15:06:52,549 -�߳�ID:[9] -��־���� ERROR -�����ࣺCyberpipe.Utility property: [(null)] - -����������������־ - diff --git a/FeatureStatisticsService.cs b/FeatureStatisticsService.cs index 331ee47..b127fe3 100644 --- a/FeatureStatisticsService.cs +++ b/FeatureStatisticsService.cs @@ -190,7 +190,7 @@ List result = new List(); //layer.Name是表名 - string[] accessStrs = Utility.getAccStrsByLayer(layer.Name); + string[] accessStrs = FeatureTools.GetAccStrsByLayer(layer.Name); foreach (string accssname in accessStrs) { diff --git a/FeatureTools.cs b/FeatureTools.cs index be4b469..3c08f34 100644 --- a/FeatureTools.cs +++ b/FeatureTools.cs @@ -1,5 +1,6 @@ using System; using System.Collections.Generic; +using System.Data; using System.Linq; using System.Text; using System.Windows.Forms; @@ -43,7 +44,7 @@ } feature.Delete();//地球上删除该feature string sql = "delete from " + layerName + " where LSSYS_ID =" + feature.ID + " and (编号 is null or substr(编号,length(编号)-2)='TMP')"; - OledbHelper.sqlExecuteNonQuery(sql);//目前无法取到LSSYS_ID，所以这个判断条件不太合适，会导致把该类所有新建的都删除了 + OledbHelper.sqlExecuteNonQuery(sql); } catch (Exception) { @@ -106,5 +107,46 @@ } return value; } + + /// + /// 根据附属物图层名字得到里面含有的附属物 + /// + /// + /// + public static string[] GetAccStrsByLayer(string layername) + { + string[] accStrs = null; + string sql = "select 附属物名称 from " + layername + " group by 附属物名称"; + DataSet dataset = OledbHelper.getDataSet(sql, layername); + if (dataset == null) return null; + accStrs = new string[dataset.Tables[0].Rows.Count]; + for (int i = 0; i < dataset.Tables[0].Rows.Count; i++) + { + accStrs[i] = dataset.Tables[0].Rows[i][0].ToString(); + } + return accStrs; + } + + /// + /// 删除内存图层中指定名称的feature + /// + /// + /// + public static void RemoveFeatureFromName(GSOGlobeControl globeControl1, string featureName) + { + GSOFeatures features = globeControl1.Globe.MemoryLayer.GetFeatureByName(featureName, true); + if (features != null) + { + for (int i = features.Length - 1; i >= 0; i--) + { + GSOFeature feature = features[i]; + if (feature != null) + { + globeControl1.Globe.MemoryLayer.RemoveFeatureByID(feature.ID); + } + } + } + globeControl1.Refresh(); + } } } diff --git a/Forms/FrmPipelineModelDataBase.cs b/Forms/FrmPipelineModelDataBase.cs index b577fd8..bc1e479 100644 --- a/Forms/FrmPipelineModelDataBase.cs +++ b/Forms/FrmPipelineModelDataBase.cs @@ -149,7 +149,7 @@ catch (Exception ex) { LogError.PublishError(ex); - LogHelper.WriteLog(typeof(FrmPipelineModelDB), ex.Message); + LogHelper.Error(ex.Message); } } diff --git a/FrmAccessoriesSensor.cs b/FrmAccessoriesSensor.cs index 98aa1cf..542f19a 100644 --- a/FrmAccessoriesSensor.cs +++ b/FrmAccessoriesSensor.cs @@ -240,7 +240,7 @@ { if (clbPipeLine.CheckedItems.Count > 0) { - Utility.RemoveFeatureFromName(globeControl1, "trackPolygon"); + FeatureTools.RemoveFeatureFromName(globeControl1, "trackPolygon"); globeControl1.Globe.Action = EnumAction3D.TrackPolygon; globeControl1.TrackPolygonEndEvent += globeControl1_TrackPolygonEndEvent; } @@ -259,7 +259,7 @@ private void FrmAccessoriesgather_FormClosing(object sender, FormClosingEventArgs e) { frm = null; - Utility.RemoveFeatureFromName(globeControl1, "trackPolygon"); + FeatureTools.RemoveFeatureFromName(globeControl1, "trackPolygon"); globeControl1.Globe.Action = EnumAction3D.ActionNull; globeControl1.TrackPolygonEndEvent -= globeControl1_TrackPolygonEndEvent; } diff --git a/FrmAccessoriesgather.cs b/FrmAccessoriesgather.cs index e1d176e..c36273b 100644 --- a/FrmAccessoriesgather.cs +++ b/FrmAccessoriesgather.cs @@ -118,7 +118,7 @@ { if (clbPipeLine2.Text!="") { - Utility.RemoveFeatureFromName(globeControl1, "trackPolygon"); + FeatureTools.RemoveFeatureFromName(globeControl1, "trackPolygon"); globeControl1.Globe.Action = EnumAction3D.TrackPolygon; globeControl1.Globe.TrackPolygonTool.TrackMode = EnumTrackMode.SpaceTrack; globeControl1.TrackPolygonEndEvent += globeControl1_TrackPolygonEndEvent; @@ -295,7 +295,7 @@ private void FrmAccessoriesgather_FormClosing(object sender, FormClosingEventArgs e) { frm = null; - Utility.RemoveFeatureFromName(globeControl1, "trackPolygon"); + FeatureTools.RemoveFeatureFromName(globeControl1, "trackPolygon"); globeControl1.TrackPolygonEndEvent -= globeControl1_TrackPolygonEndEvent; globeControl1.Globe.Action = EnumAction3D.ActionNull; diff --git a/FrmAddWellShp.cs b/FrmAddWellShp.cs index 7983349..78d8946 100644 --- a/FrmAddWellShp.cs +++ b/FrmAddWellShp.cs @@ -100,7 +100,7 @@ catch (Exception ex) { LogError.PublishError(ex); - LogHelper.WriteLog(typeof(FrmAddWellShp), ex.Message); + LogHelper.Error(ex.Message); } } diff --git a/FrmBSQStatis.cs b/FrmBSQStatis.cs index 5b05926..b5e581d 100644 --- a/FrmBSQStatis.cs +++ b/FrmBSQStatis.cs @@ -97,7 +97,7 @@ } catch (Exception ex) { - LogHelper.WriteLog(typeof(FrmBSQStatis),ex.Message); + LogHelper.Error(ex.Message); } return typeAndCount; } @@ -108,7 +108,7 @@ GSOLayer layer = globeControl1.Globe.Layers.GetLayerByCaption("标识器"); GSOFeatures bsqFs = FeatureStatisticsService.GetLayerFeatures(polygon, layer); if (bsqFs == null || bsqFs.Length <= 0) { - LogHelper.WriteLog(typeof(FrmBSQStatis),"标识器图层下的Feature为空"); + LogHelper.Error("标识器图层下的Feature为空!"); return null; } diff --git a/FrmBasicQuery.cs b/FrmBasicQuery.cs index baeeade..cc8d3ff 100644 --- a/FrmBasicQuery.cs +++ b/FrmBasicQuery.cs @@ -224,7 +224,7 @@ } catch(Exception ex) { - LogHelper.WriteLog(typeof(FrmBasicQuery), ex.Message); + LogHelper.Error(ex.Message); } } else diff --git a/FrmCodingQuery.cs b/FrmCodingQuery.cs index f1ac322..d4ec095 100644 --- a/FrmCodingQuery.cs +++ b/FrmCodingQuery.cs @@ -82,7 +82,7 @@ } catch (Exception ex) { - LogHelper.WriteLog(typeof(FrmCodingQuery), ex.Message); ; + LogHelper.Error(ex.Message); } } diff --git a/FrmDiameterQuery.cs b/FrmDiameterQuery.cs index e7b3657..75d7949 100644 --- a/FrmDiameterQuery.cs +++ b/FrmDiameterQuery.cs @@ -150,7 +150,7 @@ catch (Exception ex) { //LogError.PublishError(ex); - LogHelper.WriteLog(typeof(FrmDiameterQuery), ex.Message); + LogHelper.Error(ex.Message); MessageBox.Show("请输入正确的管径范围！"); return; } diff --git a/FrmFittingQuery.cs b/FrmFittingQuery.cs index 12f6007..8645011 100644 --- a/FrmFittingQuery.cs +++ b/FrmFittingQuery.cs @@ -69,7 +69,7 @@ } catch (Exception ex) { - LogHelper.WriteLog(typeof(FrmFittingQuery), ex.Message); + LogHelper.Error(ex.Message); } } /// diff --git a/FrmKeywordQuery.cs b/FrmKeywordQuery.cs index 405524f..ede0a93 100644 --- a/FrmKeywordQuery.cs +++ b/FrmKeywordQuery.cs @@ -87,7 +87,7 @@ } catch (Exception ex) { - LogHelper.WriteLog(typeof(FrmKeywordQuery), ex.Message); + LogHelper.Error(ex.Message); } } diff --git a/FrmLogin.cs b/FrmLogin.cs index 1172c23..6fbaed9 100644 --- a/FrmLogin.cs +++ b/FrmLogin.cs @@ -2,6 +2,8 @@ using System.Data; using System.Data.OracleClient; using System.IO; +using System.Net; +using System.Text; using System.Windows.Forms; using System.Xml; using DevComponents.DotNetBar; @@ -10,16 +12,15 @@ { public partial class FrmLogin : Office2007Form { + + //登录界面 -- 配置文件的路径 + public static string filename = Application.StartupPath + "\\login.xml"; + + public FrmLogin() { InitializeComponent(); } - public string rolename = "浏览"; - public string username = ""; - public string department = ""; - - //登录界面 -- 配置文件的路径 - public static string filename = Application.StartupPath + "\\login.xml"; /// /// 登录按钮事件处理 /// @@ -28,9 +29,10 @@ private void button1_Click(object sender, EventArgs e) { bool result = ValidateUser(); +// bool result =ValidateFromUrl();//从平台获取用户角色信息，判断是否能登陆成功 if (result) { - username = txtUser.Text.Trim(); + WriteXml(); Utility.userName = txtUser.Text.Trim(); DialogResult = DialogResult.OK; Close(); @@ -43,80 +45,6 @@ } } /// - /// 关闭按钮事件处理 - /// - /// - /// - private void button2_Click(object sender, EventArgs e) - { - Close(); - } - /// - /// 验证端口号 - /// - /// - //private bool ValiPort() - //{ - // Ping p = new Ping();//创建Ping对象p - // PingReply pr = p.Send(Utility.localicenseserverip);//向指定IP或者主机名的计算机发送ICMP协议的ping数据包 - // if (pr.Status == IPStatus.Success)//如果ping成功 - // { - // try - // { - // TcpClient tcpc = new TcpClient(Utility.localicenseserverip, Utility.localicenseserverport);//对IP地址为"192.168.0.105"的计算机的1500端口提出连接申请 - // tcpc.Close(); - // return true; - // } - // catch (Exception ex) - // { - // LogError.PublishError(ex); - // MessageBox.Show("端口连接错误！" + ex.Message); - // return false; - // } - // } - // else - // { - // int times = 0;//重新连接次数; - // int count = 2;//设置尝试次数 - // while (times < count) - // { - // //Thread.Sleep(1000);//等待时间(方便测试的话，你可以改为1000) - // pr = p.Send(Utility.localicenseserverip); - - // if (pr.Status == IPStatus.Success) - // { - // try - // { - // TcpClient tcpc = new TcpClient(Utility.localicenseserverip, Utility.localicenseserverport);//对IP地址为"192.168.0.105"的计算机的1500端口提出连接申请 - // tcpc.Close(); - // return true; - // } - // catch (Exception ex) - // { - // LogError.PublishError(ex); - // MessageBox.Show("端口连接错误！" + ex.Message); - // return false; - // } - // } - // else - // { - // times++; - // if (times < count) - // { - // continue; - // } - // else - // { - // MessageBox.Show("重新尝试连接失败"); - // return false; - // } - // } - - // } - // return false; - // } - //} - /// /// 验证用户名、密码 /// /// @@ -126,24 +54,64 @@ string sql = "select * from casic_userinfotest where USERNAME='" + txtUser.Text.Trim() + "' and PASSWORD='" + passWord + "' and sysname='GHFX' "; DataTable dt = OledbHelper.QueryTable(sql); - if (dt != null && dt.Rows.Count > 0) + if (dt == null || dt.Rows.Count <= 0) return false; + if (String.IsNullOrEmpty(dt.Rows[0]["rid"].ToString())) return true; + sql = "select gid from casic_userroletest where id=" + dt.Rows[0]["rid"] + " and sysname='GHFX' "; + using (OracleDataReader reader = OracleUtils.ExecuteReader(OracleUtils.ConnectionString, CommandType.Text, sql)) { - WriteXML(); - if (!String.IsNullOrEmpty(dt.Rows[0]["rid"].ToString())) + while (reader.Read()) { - sql = "select gid from casic_userroletest where id=" + dt.Rows[0]["rid"] + " and sysname='GHFX' "; - using (OracleDataReader reader = OracleUtils.ExecuteReader(OracleUtils.ConnectionString, CommandType.Text, sql)) - { - while (reader.Read()) - { - Utility.userRole = reader[0].ToString(); - break; - } - } + Utility.userRole = reader[0].ToString(); + LogHelper.Debug("测试一下"); + break; } - return true; } - return false; + return true; + } + + + + private bool ValidateFromUrl() + { + string user = txtUser.Text.Trim(); + string pwd = textBoxPassWord.Text.Trim(); + //做成配置的 + string roleserver = Utility.RoleServer; + if (roleserver == null || roleserver.Trim().Equals("")) + { + MessageBox.Show("请在Config.xml中配置roleurl！"); + return false; + } + HttpWebRequest request = + WebRequest.Create(roleserver+"/rs/authority/user?username=" + user + "&password=" + pwd + "&appId=21") as HttpWebRequest; + if (request == null) return false; + using (HttpWebResponse response = request.GetResponse() as HttpWebResponse) + { + try + { + if (response == null || response.GetResponseStream() == null) return false; + StreamReader reader = new StreamReader(response.GetResponseStream()); + string[] result = reader.ReadToEnd().Split(','); + //解析result + if (result.Length < 5) return false; + StringBuilder userRole = new StringBuilder(""); + for (int i = 4; i < result.Length; i++) + { + string[] tmpStrings = result[i].Split('_'); + if (tmpStrings.Length < 2) continue; + userRole.Append(tmpStrings[1].Trim() + ","); + } + if (userRole.Length < 3) return false; + userRole.Remove(userRole.Length - 3, 3); + // MessageBox.Show(userRole.ToString()); + Utility.userRole = userRole.ToString(); + return Utility.userRole != null && !Utility.userRole.Equals("null"); + } + catch (Exception e) + { + return false; + } + } } private void FrmLogin_Load(object sender, EventArgs e) @@ -153,74 +121,56 @@ StartPosition = FormStartPosition.CenterScreen; - ReadXML(); + ReadXml(); } /// /// 读取上一次登录的用户名和密码 /// - private void ReadXML() + private void ReadXml() { - if (File.Exists(filename)) + if (!File.Exists(filename)) return; + //初始化XML文档操作类 + XmlDocument myDoc = new XmlDocument(); { - if (!File.Exists(filename)) + //加载XML文件 + try { + myDoc.Load(filename); + } + catch (Exception e) + { + LogError.PublishError(e); return; } - - //初始化XML文档操作类 - XmlDocument myDoc = new XmlDocument(); + //搜索指定的节点 + XmlNode serverRootNode = myDoc.SelectSingleNode("Params"); + XmlNodeList nodes = null; + if (serverRootNode != null) { - //加载XML文件 - try + nodes = serverRootNode.ChildNodes; + } + if (nodes == null) return; + foreach (XmlNode xn in nodes) + { + if (xn.Name.Equals("username")) { - myDoc.Load(filename); + txtUser.Text = xn.InnerText.Trim(); } - catch (Exception e) + else if (xn.Name.Equals("password")) { - LogError.PublishError(e); - return; + textBoxPassWord.Text = xn.InnerText.Trim(); } - //搜索指定的节点 - XmlNode serverRootNode = myDoc.SelectSingleNode("Params"); - XmlNodeList nodes = null; - if (serverRootNode != null) + else if (xn.Name.Equals("isremember")) { - nodes = serverRootNode.ChildNodes; - } - if (nodes != null) - { - foreach (XmlNode xn in nodes) - { - if (xn.Name == "username") - { - txtUser.Text = xn.InnerText.Trim(); - } - else if (xn.Name == "password") - { - textBoxPassWord.Text = xn.InnerText.Trim(); - } - else if (xn.Name == "isremember") - { - if (xn.InnerText.Trim() == "true") - { - checkBoxXRememberPassword.Checked = true; - } - else if (xn.InnerText.Trim() == "false") - { - checkBoxXRememberPassword.Checked = false; - } - } - } - + checkBoxXRememberPassword.Checked = xn.InnerText.Trim().Equals("true"); } } } - } /// /// 记录登录的用户名和密码 /// - private void WriteXML() + private void WriteXml() { if (!File.Exists(filename)) { @@ -252,31 +202,17 @@ foreach (XmlNode xn in nodes) { XmlElement xe = (XmlElement)xn; - if (xe.Name == "username") + if (xe.Name.Equals("username")) { xe.InnerText = txtUser.Text.Trim(); } - else if (xe.Name == "password") + else if (xe.Name.Equals("password")) { - if (checkBoxXRememberPassword.Checked) - { - xe.InnerText = textBoxPassWord.Text.Trim(); - } - else - { - xe.InnerText = ""; - } + xe.InnerText = checkBoxXRememberPassword.Checked ? textBoxPassWord.Text.Trim() : ""; } - else if (xe.Name == "isremember") + else if (xe.Name.Equals("isremember")) { - if (checkBoxXRememberPassword.Checked) - { - xe.InnerText = "true"; - } - else - { - xe.InnerText = "false"; - } + xe.InnerText = checkBoxXRememberPassword.Checked ? "true" : "false"; } } } diff --git a/FrmMaterialSel.cs b/FrmMaterialSel.cs index 8645ab3..d23f385 100644 --- a/FrmMaterialSel.cs +++ b/FrmMaterialSel.cs @@ -157,7 +157,7 @@ } catch (Exception ex) { - LogHelper.WriteLog(typeof(FrmMaterialSel), ex.Message); + LogHelper.Error(ex.Message); } } diff --git a/FrmMetadataStat.cs b/FrmMetadataStat.cs index c3c1359..96029a6 100644 --- a/FrmMetadataStat.cs +++ b/FrmMetadataStat.cs @@ -96,7 +96,7 @@ //统计有多少个图层 private int statistLayer() { - List datasrcs = Utility.layerConfig.datasrcs; + List datasrcs = Utility.LayerConfig.datasrcs; return datasrcs.SelectMany(datasrc => datasrc.layertypes).Sum(layerType => layerType.layers.Count); } diff --git a/FrmpipeDeepstatis.cs b/FrmpipeDeepstatis.cs index 6a5c895..8d915a9 100644 --- a/FrmpipeDeepstatis.cs +++ b/FrmpipeDeepstatis.cs @@ -2,6 +2,7 @@ using System.Collections.Generic; using System.Diagnostics; using System.IO; +using System.Reflection; using System.Text; using System.Windows.Forms; using System.Windows.Forms.DataVisualization.Charting; @@ -320,7 +321,7 @@ MessageBox.Show("请添加分段"); return; } - Utility.RemoveFeatureFromName(globeControl1, "trackPolygon"); + FeatureTools.RemoveFeatureFromName(globeControl1, "trackPolygon"); globeControl1.Globe.Action = EnumAction3D.TrackPolygon; globeControl1.Globe.TrackPolygonTool.TrackMode = EnumTrackMode.SpaceTrack; globeControl1.TrackPolygonEndEvent += globeControl1_TrackPolygonEndEvent; @@ -408,12 +409,11 @@ TextBox control; private void dataGridViewX2_EditingControlShowing(object sender, DataGridViewEditingControlShowingEventArgs e) { - if (e.Control.GetType().BaseType.Name == "TextBox") - { - control = new TextBox(); - control = (TextBox)e.Control; - control.KeyPress += control_KeyPress; - } + MemberInfo memberInfo = e.Control.GetType().BaseType; + if (memberInfo != null && !memberInfo.Name.Equals("TextBox")) return; + control = new TextBox(); + control = (TextBox)e.Control; + control.KeyPress += control_KeyPress; } /// /// 键盘按键按下事件处理 @@ -423,28 +423,24 @@ void control_KeyPress(object sender, KeyPressEventArgs e) { TextBox text = sender as TextBox; + if (text == null) return; if ((e.KeyChar < 48 || e.KeyChar > 57) && (e.KeyChar != 8) && e.KeyChar != 46) { e.Handled = true; } - if (e.KeyChar == 46) //小数点 + if (e.KeyChar != 46) return; + if (text.Text.Length <= 0) + e.Handled = true; //小数点不能在第一位 + else //处理不规则的小数点 { - if (text.Text.Length <= 0) - e.Handled = true; //小数点不能在第一位 - else //处理不规则的小数点 + float f; + float oldf; + bool b1 = false, b2 = false; + b1 = float.TryParse(text.Text, out oldf); + b2 = float.TryParse(text.Text + e.KeyChar, out f); + if (!b2) { - float f; - float oldf; - bool b1 = false, b2 = false; - b1 = float.TryParse(text.Text, out oldf); - b2 = float.TryParse(text.Text + e.KeyChar, out f); - if (b2 == false) - { - if (b1) - e.Handled = true; - else - e.Handled = false; - } + e.Handled = b1; } } } @@ -457,7 +453,7 @@ { frm = null; - Utility.RemoveFeatureFromName(globeControl1, "trackPolygon"); + FeatureTools.RemoveFeatureFromName(globeControl1, "trackPolygon"); globeControl1.TrackPolygonEndEvent -= globeControl1_TrackPolygonEndEvent; globeControl1.Globe.Action = EnumAction3D.ActionNull; diff --git a/FrmpipeDiametergather.cs b/FrmpipeDiametergather.cs index a9d96fa..c09aaf1 100644 --- a/FrmpipeDiametergather.cs +++ b/FrmpipeDiametergather.cs @@ -154,7 +154,7 @@ MessageBox.Show("请选择图层！"); return; } - Utility.RemoveFeatureFromName(globeControl1, "trackPolygon"); + FeatureTools.RemoveFeatureFromName(globeControl1, "trackPolygon"); globeControl1.Globe.Action = EnumAction3D.TrackPolygon; globeControl1.Globe.TrackPolygonTool.TrackMode = EnumTrackMode.SpaceTrack; globeControl1.TrackPolygonEndEvent += globeControl1_TrackPolygonEndEvent; @@ -392,7 +392,7 @@ private void FrmpipeDiametergather_FormClosing(object sender, FormClosingEventArgs e) { frm = null; - Utility.RemoveFeatureFromName(globeControl1, "trackPolygon"); + FeatureTools.RemoveFeatureFromName(globeControl1, "trackPolygon"); globeControl1.TrackPolygonEndEvent -= globeControl1_TrackPolygonEndEvent; globeControl1.Globe.Action = EnumAction3D.ActionNull; diff --git a/FrmpipeMaterialGather.cs b/FrmpipeMaterialGather.cs index 44e7f24..5ca8144 100644 --- a/FrmpipeMaterialGather.cs +++ b/FrmpipeMaterialGather.cs @@ -58,10 +58,9 @@ for (int i = 0; i < pipeLayerNames.Count; i++) { clbPipeLine.Items.Add(pipeLayerNames[i]); - GSOLayer layer = globeControl1.Globe.Layers.GetLayerByCaption(pipeLayerNames[i]); - if (layer.Dataset == null || !layer.Dataset.IsFeatureDataset || layer.Type != EnumLayerType.FeatureLayer) continue; + GSOLayer layer = globeControl1.Globe.Layers.GetLayerByCaption(pipeLayerNames[i]); + if (layer == null || layer.Dataset == null || !layer.Dataset.IsFeatureDataset || layer.Type != EnumLayerType.FeatureLayer) continue; - string name = layer.Name; GSOFeatureLayer flayer = layer as GSOFeatureLayer; GSOFeatures feats = flayer.GetAllFeatures(); @@ -205,7 +204,7 @@ { chart1.Series.Add(clbPipeLine.CheckedItems[i].ToString()); GSOLayer layer = globeControl1.Globe.Layers.GetLayerByCaption(clbPipeLine.CheckedItems[i].ToString()); - if (layer != null && layer is GSOFeatureLayer) + if (layer is GSOFeatureLayer) { GSOFeatureLayer flayer = layer as GSOFeatureLayer; GSOFeatures features = flayer.GetAllFeatures(); @@ -240,10 +239,9 @@ labeStyleAxisX.Enabled = true; chart1.ChartAreas["ChartArea1"].AxisX.LabelStyle = labeStyleAxisX; - Dictionary dic1 = new Dictionary(); for (int j = 0; j < chart1.Series.Count; j++) { - dic1 = new Dictionary(); + Dictionary dic1 = new Dictionary(); foreach (string key in dic.Keys) { if (key.Contains(chart1.Series[j].Name)) @@ -304,7 +302,7 @@ MessageBox.Show("请选择材质类型！"); return; } - Utility.RemoveFeatureFromName(globeControl1, "trackPolygon"); + FeatureTools.RemoveFeatureFromName(globeControl1, "trackPolygon"); globeControl1.Globe.Action = EnumAction3D.TrackPolygon; globeControl1.Globe.TrackPolygonTool.TrackMode = EnumTrackMode.SpaceTrack; globeControl1.TrackPolygonEndEvent += globeControl1_TrackPolygonEndEvent; @@ -318,7 +316,7 @@ private void FrmpipeMaterialGather_FormClosing(object sender, FormClosingEventArgs e) { frm = null; - Utility.RemoveFeatureFromName(globeControl1, "trackPolygon"); + FeatureTools.RemoveFeatureFromName(globeControl1, "trackPolygon"); globeControl1.TrackPolygonEndEvent -= globeControl1_TrackPolygonEndEvent; globeControl1.Globe.Action = EnumAction3D.ActionNull; diff --git a/Frmpipediameterstatis.cs b/Frmpipediameterstatis.cs index 4fb25a8..631a996 100644 --- a/Frmpipediameterstatis.cs +++ b/Frmpipediameterstatis.cs @@ -202,8 +202,8 @@ } catch (Exception ex) { - LogHelper.WriteLog(typeof(Frmpipediameterstatis), ex.Message); //MessageBox.Show(ex.Message); + LogHelper.Error(ex.Message); LogError.PublishError(ex); } } @@ -372,7 +372,7 @@ MessageBox.Show("请添加分段！"); return; } - Utility.RemoveFeatureFromName(globeControl1, "trackPolygon"); + FeatureTools.RemoveFeatureFromName(globeControl1, "trackPolygon"); globeControl1.Globe.Action = EnumAction3D.TrackPolygon; globeControl1.Globe.TrackPolygonTool.TrackMode = EnumTrackMode.SpaceTrack; globeControl1.TrackPolygonEndEvent += globeControl1_TrackPolygonEndEvent; @@ -422,7 +422,7 @@ globeControl1.Globe.Action = EnumAction3D.ActionNull; globeControl1.TrackPolygonEndEvent -= globeControl1_TrackPolygonEndEvent; - Utility.RemoveFeatureFromName(globeControl1, "trackPolygon"); + FeatureTools.RemoveFeatureFromName(globeControl1, "trackPolygon"); globeControl1.Globe.MemoryLayer.RemoveAllFeature(); } diff --git a/LineBuilder.cs b/LineBuilder.cs index 33a216c..b6a8516 100644 --- a/LineBuilder.cs +++ b/LineBuilder.cs @@ -43,8 +43,8 @@ GSOGeoPolyline3D lineeee = f.Geometry as GSOGeoPolyline3D; if (lineeee == null || lineeee.GetSpaceLength(true, 6378137) == 0) { - LogHelper.WriteLog(typeof(LineBuilder), "出现数据无法入库:"+f.ID); - continue; //TODO LIST:判断是否会出现部署数据无法入库情况,Log2Net + LogHelper.Error("出现数据无法入库:" + f.ID); + continue; } GSOFeature newFeature = newFeatureSet.CreateFeature(); diff --git a/LogHelper.cs b/LogHelper.cs index 9ef5f27..04573cf 100644 --- a/LogHelper.cs +++ b/LogHelper.cs @@ -1,4 +1,5 @@ using System; +using System.Diagnostics; using log4net; using log4net.Config; @@ -7,35 +8,82 @@ { public class LogHelper { - /// - /// 输出日志到Log4Net - /// - /// - /// - #region static void WriteLog(Type t, Exception ex) - public static void WriteLog(Type t, Exception ex) + private static ILog _logdebug = log4net.LogManager.GetLogger("logdebug"); + private static ILog _loginfo = log4net.LogManager.GetLogger("loginfo"); + private static ILog _logwarn = log4net.LogManager.GetLogger("logwarn"); + private static ILog _logerror = log4net.LogManager.GetLogger("logerror"); + private static ILog _logfatal = log4net.LogManager.GetLogger("logfatal"); + + public static void Debug(string msg) { - ILog log = log4net.LogManager.GetLogger(t); - log.Error("Error", ex); + StackFrame sf = new StackFrame(1); + msg = string.Format("{0}.{1}:{2}", sf.GetMethod().ReflectedType.FullName, sf.GetMethod().Name, msg); + _logdebug.Debug(msg); + } + public static void Debug(string msg, Exception e) + { + StackFrame sf = new StackFrame(1); + msg = string.Format("{0}.{1}:{2}", sf.GetMethod().ReflectedType.FullName, sf.GetMethod().Name, msg); + _logdebug.Debug(msg, e); } - #endregion - /// - /// 输出日志到Log4Net - /// - /// - /// - #region static void WriteLog(Type t, string msg) - - public static void WriteLog(Type t, string msg) + public static void Info(string msg) { - ILog log = log4net.LogManager.GetLogger(t); - log.Error(msg); + StackFrame sf = new StackFrame(1); + msg = string.Format("{0}.{1}:{2}", sf.GetMethod().ReflectedType.FullName, sf.GetMethod().Name, msg); + _loginfo.Info(msg); + } + public static void Info(string msg, Exception e) + { + StackFrame sf = new StackFrame(1); + msg = string.Format("{0}.{1}:{2}", sf.GetMethod().ReflectedType.FullName, sf.GetMethod().Name, msg); + _loginfo.Info(msg, e); } - #endregion + + public static void Warn(string msg) + { + StackFrame sf = new StackFrame(1); + msg = string.Format("{0}.{1}:{2}", sf.GetMethod().ReflectedType.FullName, sf.GetMethod().Name, msg); + _logwarn.Warn(msg); + } + public static void Warn(string msg, Exception e) + { + StackFrame sf = new StackFrame(1); + msg = string.Format("{0}.{1}:{2}", sf.GetMethod().ReflectedType.FullName, sf.GetMethod().Name, msg); + _logwarn.Warn(msg, e); + } + + + public static void Error(string msg) + { + StackFrame sf = new StackFrame(1); + msg = string.Format("{0}.{1}:{2}", sf.GetMethod().ReflectedType.FullName, sf.GetMethod().Name, msg); + _logerror.Error(msg); + } + public static void Error(string msg, Exception e) + { + StackFrame sf = new StackFrame(1); + msg = string.Format("{0}.{1}:{2}", sf.GetMethod().ReflectedType.FullName, sf.GetMethod().Name, msg); + _logerror.Error(msg, e); + } + + + public static void Fatal(string msg) + { + StackFrame sf = new StackFrame(1); + msg = string.Format("{0}.{1}:{2}", sf.GetMethod().ReflectedType.FullName, sf.GetMethod().Name, msg); + _logfatal.Fatal(msg); + } + public static void Fatal(string msg, Exception e) + { + StackFrame sf = new StackFrame(1); + msg = string.Format("{0}.{1}:{2}", sf.GetMethod().ReflectedType.FullName, sf.GetMethod().Name, msg); + _logfatal.Fatal(msg, e); + } + } diff --git a/MainFrm.cs b/MainFrm.cs index 43de664..51f362a 100644 --- a/MainFrm.cs +++ b/MainFrm.cs @@ -18,7 +18,6 @@ using GeoScene.Data; using GeoScene.Engine; using GeoScene.Globe; -using Timer = System.Windows.Forms.Timer; using ToolTip = System.Windows.Forms.ToolTip; namespace Cyberpipe @@ -163,6 +162,7 @@ /// private void AddGZ() { + lendendGZ50 = new GSOHudButton(); lendendGZ50.SetImage(Application.StartupPath + "/Resource/管纵/50.png"); lendendGZ50.SetOffset(0, 0); @@ -1294,18 +1294,19 @@ private void MainFrm_Load(object sender, EventArgs e) { + layerTree.Nodes.Add("正在加载，请稍后……");//树状图加载在图层加载之后，故增加提示 initGlobalControl(); - //initGlobalMap(); - //initLayerTree(); initMarkerTree(); initLayout(); loadData(); - double x = Convert.ToDouble(Utility.Query_Roads["定位"].ToString().Split(',')[0]); - double y = Convert.ToDouble(Utility.Query_Roads["定位"].ToString().Split(',')[1]); - double z = Convert.ToDouble(Utility.Query_Roads["定位"].ToString().Split(',')[2]); + + double x = Convert.ToDouble(Utility.Query_Roads["绿岛"].ToString().Split(',')[0]); + double y = Convert.ToDouble(Utility.Query_Roads["绿岛"].ToString().Split(',')[1]); + double z = Convert.ToDouble(Utility.Query_Roads["绿岛"].ToString().Split(',')[2]); jumpToCameraState(x, y, z); + } #endregion @@ -1315,11 +1316,17 @@ if (e.Layer == null || !e.Layer.Caption.Equals(Utility.roadLayerName)) return; foreach (TreeNode layerTreeNode in layerTree.Nodes) { - foreach (TreeNode node in layerTreeNode.Nodes) + for (int i=0;i dt, DataGridView dataGridView) @@ -7330,7 +7337,7 @@ } catch (Exception ex) { - LogHelper.WriteLog(typeof(MainFrm), ex); + LogHelper.Debug("", ex); } } } @@ -7362,7 +7369,7 @@ GSOLayer layer = globeControl1.Globe.Layers.Add(strDataPath); if (layer == null) {//wxl - LogHelper.WriteLog(typeof(MainFrm), "buttonItemHX1_Click操作中，" + strDataPath + "的layer为空"); + LogHelper.Error("buttonItemHX1_Click操作中，" + strDataPath + "的layer为空"); continue; } GSOFeatures redFeatures = layer.GetAllFeatures(); @@ -7457,17 +7464,12 @@ { try { + globeControl1.BeforeSceneRenderEvent -= globeControl1_BeforeSceneRenderEvent; globeControl2.BeforeSceneRenderEvent -= globeControl2_BeforeSceneRenderEvent; - double x = Convert.ToDouble(Utility.Query_Roads["定位"].ToString().Split(',')[0]); - double y = Convert.ToDouble(Utility.Query_Roads["定位"].ToString().Split(',')[1]); - double z = Convert.ToDouble(Utility.Query_Roads["定位"].ToString().Split(',')[2]); - jumpToCameraState(x, y, z); - /* globeControl1.Globe.FlyToPosition(new GSOPoint3d(120.610963, 31.188121, 50), EnumAltitudeMode.Absolute, -4, 50, 800); globeControl1.Globe.FlyToPointSpeed = 10000000; - * */ globeControl1.Globe.Action = EnumAction3D.SelectObject; globeControl1.Refresh(); @@ -7489,6 +7491,37 @@ } } /// + /// 基础工具 + /// + /// + /// + private void ribbonTabItem1_MouseDown(object sender, MouseEventArgs e) + { + try + { + + globeControl1.BeforeSceneRenderEvent -= globeControl1_BeforeSceneRenderEvent; + globeControl2.BeforeSceneRenderEvent -= globeControl2_BeforeSceneRenderEvent; + + globeControl1.Globe.Action = EnumAction3D.ActionNull; + dataGridViewX1.AutoSizeColumnsMode = DataGridViewAutoSizeColumnsMode.AllCells; + //zhanshi = false; + redSH = false; + splitContainer1.Panel2Collapsed = true; + panelOfTable.Visible = false; + legendSC.Visible = false; + legendSG.Visible = false; + ClearGZData(); + GSOLayer redLayer = globeControl1.Globe.Layers.GetLayerByCaption("红线"); + if (redLayer == null) return; + redLayer.Visible = false; + } + catch (Exception ex) + { + //MessageBox.Show("系统运行错误:" + ex.ToString(), "错误", MessageBoxButtons.OK, MessageBoxIcon.Error); + } + } + /// /// 一键审核 /// /// @@ -7497,6 +7530,7 @@ { try { + globeControl1.BeforeSceneRenderEvent -= globeControl1_BeforeSceneRenderEvent; globeControl2.BeforeSceneRenderEvent -= globeControl2_BeforeSceneRenderEvent; @@ -7518,32 +7552,7 @@ //MessageBox.Show("系统运行错误:" + ex.ToString(), "错误", MessageBoxButtons.OK, MessageBoxIcon.Error); } } - - void ResetRibbonTab() - { - try - { - globeControl1.BeforeSceneRenderEvent -= globeControl1_BeforeSceneRenderEvent; - globeControl2.BeforeSceneRenderEvent -= globeControl2_BeforeSceneRenderEvent; - - globeControl1.Globe.Action = EnumAction3D.ActionNull; - dataGridViewX1.AutoSizeColumnsMode = DataGridViewAutoSizeColumnsMode.AllCells; - //zhanshi = false; - redSH = false; - splitContainer1.Panel2Collapsed = true; - panelOfTable.Visible = false; - legendSC.Visible = false; - legendSG.Visible = false; - ClearGZData(); - GSOLayer redLayer = globeControl1.Globe.Layers.GetLayerByCaption("红线"); - if (redLayer == null) return; - redLayer.Visible = false; - } - catch (Exception ex) - { - LogHelper.WriteLog(typeof(MainFrm), ex); - } - } + /// /// 双屏对比 /// @@ -7553,8 +7562,8 @@ { try { - globeControl1.BeforeSceneRenderEvent += new BeforeSceneRenderEventHandler(globeControl1_BeforeSceneRenderEvent); - globeControl2.BeforeSceneRenderEvent += new BeforeSceneRenderEventHandler(globeControl2_BeforeSceneRenderEvent); + globeControl1.BeforeSceneRenderEvent += globeControl1_BeforeSceneRenderEvent; + globeControl2.BeforeSceneRenderEvent += globeControl2_BeforeSceneRenderEvent; globeControl1.Globe.Action = EnumAction3D.ActionNull; panelOfTable.Visible = false; @@ -7570,32 +7579,43 @@ GSOLayer redLayer = globeControl1.Globe.Layers.GetLayerByCaption("红线"); if (redLayer != null) - { redLayer.Visible = false; - } } catch (Exception ex) { - LogHelper.WriteLog(typeof(MainFrm), ex); + //MessageBox.Show("系统运行错误:" + ex.ToString(), "错误", MessageBoxButtons.OK, MessageBoxIcon.Error); } } /// - /// 基础工具 - /// - /// - /// - private void ribbonTabItem1_MouseDown(object sender, MouseEventArgs e) - { - ResetRibbonTab(); - } - /// /// 文档管理 /// /// /// private void ribbonTabItem4_MouseDown(object sender, MouseEventArgs e) { - ResetRibbonTab(); + try + { + + globeControl1.BeforeSceneRenderEvent -= globeControl1_BeforeSceneRenderEvent; + globeControl2.BeforeSceneRenderEvent -= globeControl2_BeforeSceneRenderEvent; + + globeControl1.Globe.Action = EnumAction3D.ActionNull; + panelOfTable.Visible = false; + //zhanshi = false; + redSH = false; + splitContainer1.Panel2Collapsed = true; + dataGridViewX1.AutoSizeColumnsMode = DataGridViewAutoSizeColumnsMode.AllCells; + legendSC.Visible = false; + legendSG.Visible = false; + ClearGZData(); + GSOLayer redLayer = globeControl1.Globe.Layers.GetLayerByCaption("红线"); + if (redLayer != null) + redLayer.Visible = false; + } + catch (Exception ex) + { + //MessageBox.Show("系统运行错误:" + ex.ToString(), "错误", MessageBoxButtons.OK, MessageBoxIcon.Error); + } } /// /// 基础管理 @@ -7604,7 +7624,29 @@ /// private void ribbonTabItem14_MouseDown(object sender, MouseEventArgs e) { - ResetRibbonTab(); + try + { + globeControl1.BeforeSceneRenderEvent -= globeControl1_BeforeSceneRenderEvent; + globeControl2.BeforeSceneRenderEvent -= globeControl2_BeforeSceneRenderEvent; + + globeControl1.Globe.Action = EnumAction3D.ActionNull; + panelOfTable.Visible = false; + //zhanshi = false; + redSH = false; + splitContainer1.Panel2Collapsed = true; + dataGridViewX1.AutoSizeColumnsMode = DataGridViewAutoSizeColumnsMode.AllCells; + legendSC.Visible = false; + legendSG.Visible = false; + ClearGZData(); + + GSOLayer redLayer = globeControl1.Globe.Layers.GetLayerByCaption("红线"); + if (redLayer != null) + redLayer.Visible = false; + } + catch (Exception ex) + { + //MessageBox.Show("系统运行错误:" + ex.ToString(), "错误", MessageBoxButtons.OK, MessageBoxIcon.Error); + } } /// /// 权限管理 @@ -7613,26 +7655,31 @@ /// private void ribbonTabItem2_MouseDown(object sender, MouseEventArgs e) { - ResetRibbonTab(); + try + { + globeControl1.BeforeSceneRenderEvent -= globeControl1_BeforeSceneRenderEvent; + globeControl2.BeforeSceneRenderEvent -= globeControl2_BeforeSceneRenderEvent; + + globeControl1.Globe.Action = EnumAction3D.ActionNull; + panelOfTable.Visible = false; + //zhanshi = false; + redSH = false; + splitContainer1.Panel2Collapsed = true; + dataGridViewX1.AutoSizeColumnsMode = DataGridViewAutoSizeColumnsMode.AllCells; + legendSC.Visible = false; + legendSG.Visible = false; + ClearGZData(); + + GSOLayer redLayer = globeControl1.Globe.Layers.GetLayerByCaption("红线"); + if (redLayer == null) return; + redLayer.Visible = false; + } + catch (Exception ex) + { + //MessageBox.Show("系统运行错误:" + ex.ToString(), "错误", MessageBoxButtons.OK, MessageBoxIcon.Error); + } } - /// - /// 管线定位 - /// - /// - /// - private void ribbonTabItem7_MouseDown(object sender, MouseEventArgs e) - { - ResetRibbonTab(); - } - /// - /// 标识器管理 - /// - /// - /// - private void ribbonTabItem5_MouseDown(object sender, MouseEventArgs e) - { - ResetRibbonTab(); - } + //GSOFeature dpFeatuer = null; /// /// 双屏分析，点击管段分析 @@ -8017,7 +8064,9 @@ private void btn_flag_Click(object sender, EventArgs e) { if (FrmFlagManagers.IS_OPEN) + { return; + } FrmFlagManagers frm = new FrmFlagManagers(globeControl1); frm.Show(this); } diff --git a/MainFrm.designer.cs b/MainFrm.designer.cs index e3dca41..73398c0 100644 --- a/MainFrm.designer.cs +++ b/MainFrm.designer.cs @@ -4,6 +4,7 @@ using DevComponents.DotNetBar; using DevComponents.DotNetBar.Controls; using DevComponents.Editors; +using System.Drawing; namespace Cyberpipe { @@ -89,6 +90,7 @@ this.sideBar1 = new DevComponents.DotNetBar.SideBar(); this.panelEx3 = new DevComponents.DotNetBar.PanelEx(); this.layerSensorTree = new System.Windows.Forms.TreeView(); + this.layerTree = new Cyberpipe.MyTreeView(); this.sideBarPanelItem3 = new DevComponents.DotNetBar.SideBarPanelItem(); this.controlContainerItem3 = new DevComponents.DotNetBar.ControlContainerItem(); this.sideBarPanelItem4 = new DevComponents.DotNetBar.SideBarPanelItem(); @@ -243,42 +245,18 @@ this.保存ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.定位ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.ribbonControl1 = new DevComponents.DotNetBar.RibbonControl(); - this.ribbonPanel6 = new DevComponents.DotNetBar.RibbonPanel(); - this.ribbonBar6 = new DevComponents.DotNetBar.RibbonBar(); - this.buttonItemSPSZ = new DevComponents.DotNetBar.ButtonItem(); - this.buttonItem8 = new DevComponents.DotNetBar.ButtonItem(); - this.buttonItemLocation = new DevComponents.DotNetBar.ButtonItem(); - this.sliderItem2 = new DevComponents.DotNetBar.SliderItem(); - this.buttonItemGBJC = new DevComponents.DotNetBar.ButtonItem(); - this.ribbonPanel5 = new DevComponents.DotNetBar.RibbonPanel(); - this.ribbonBar2 = new DevComponents.DotNetBar.RibbonBar(); - this.buttonItemHX1 = new DevComponents.DotNetBar.ButtonItem(); - this.buttonItemHX2 = new DevComponents.DotNetBar.ButtonItem(); - this.buttonItemDCTP = new DevComponents.DotNetBar.ButtonItem(); - this.sliderItem3 = new DevComponents.DotNetBar.SliderItem(); - this.ribbonPanel1 = new DevComponents.DotNetBar.RibbonPanel(); - this.ribbonBar21 = new DevComponents.DotNetBar.RibbonBar(); - this.buttonItem87 = new DevComponents.DotNetBar.ButtonItem(); - this.buttonItem88 = new DevComponents.DotNetBar.ButtonItem(); - this.buttonItem27 = new DevComponents.DotNetBar.ButtonItem(); - this.buttonItem91 = new DevComponents.DotNetBar.ButtonItem(); - this.buttonItem1 = new DevComponents.DotNetBar.ButtonItem(); - this.btnlegendSet = new DevComponents.DotNetBar.ButtonItem(); - this.buttonItem89 = new DevComponents.DotNetBar.ButtonItem(); - this.btnOutputJPG = new DevComponents.DotNetBar.ButtonItem(); - this.ribbonPanel12 = new DevComponents.DotNetBar.RibbonPanel(); - this.ribbonBar18 = new DevComponents.DotNetBar.RibbonBar(); - this.buttonItem133 = new DevComponents.DotNetBar.ButtonItem(); - this.ribbonBar13 = new DevComponents.DotNetBar.RibbonBar(); - this.buttonItem127 = new DevComponents.DotNetBar.ButtonItem(); - this.buttonItem128 = new DevComponents.DotNetBar.ButtonItem(); - this.sliderItem1 = new DevComponents.DotNetBar.SliderItem(); - this.buttonItem134 = new DevComponents.DotNetBar.ButtonItem(); - this.buttonItem130 = new DevComponents.DotNetBar.ButtonItem(); - this.btn_check_history = new DevComponents.DotNetBar.ButtonItem(); - this.ribbonPanel4 = new DevComponents.DotNetBar.RibbonPanel(); - this.ribbonBar1 = new DevComponents.DotNetBar.RibbonBar(); - this.btn_document_info = new DevComponents.DotNetBar.ButtonItem(); + this.ribbonPanel3 = new DevComponents.DotNetBar.RibbonPanel(); + this.ribbonBar4 = new DevComponents.DotNetBar.RibbonBar(); + this.btn_flag = new DevComponents.DotNetBar.ButtonItem(); + this.slider4ground = new DevComponents.DotNetBar.SliderItem(); + this.ribbonPanel7 = new DevComponents.DotNetBar.RibbonPanel(); + this.gxdw_ribbonbar = new DevComponents.DotNetBar.RibbonBar(); + this.buttonItem9 = new DevComponents.DotNetBar.ButtonItem(); + this.buttonItem10 = new DevComponents.DotNetBar.ButtonItem(); + this.buttonItem11 = new DevComponents.DotNetBar.ButtonItem(); + this.buttonItem12 = new DevComponents.DotNetBar.ButtonItem(); + this.buttonItem13 = new DevComponents.DotNetBar.ButtonItem(); + this.buttonItem14 = new DevComponents.DotNetBar.ButtonItem(); this.ribbonPanel15 = new DevComponents.DotNetBar.RibbonPanel(); this.ribbonBar20 = new DevComponents.DotNetBar.RibbonBar(); this.buttonItemSH = new DevComponents.DotNetBar.ButtonItem(); @@ -334,18 +312,6 @@ this.buttonItemXT4 = new DevComponents.DotNetBar.ButtonItem(); this.buttonItemXT4_1 = new DevComponents.DotNetBar.ButtonItem(); this.buttonItemXT4_2 = new DevComponents.DotNetBar.ButtonItem(); - this.ribbonPanel3 = new DevComponents.DotNetBar.RibbonPanel(); - this.ribbonBar4 = new DevComponents.DotNetBar.RibbonBar(); - this.btn_flag = new DevComponents.DotNetBar.ButtonItem(); - this.slider4ground = new DevComponents.DotNetBar.SliderItem(); - this.ribbonPanel7 = new DevComponents.DotNetBar.RibbonPanel(); - this.gxdw_ribbonbar = new DevComponents.DotNetBar.RibbonBar(); - this.buttonItem9 = new DevComponents.DotNetBar.ButtonItem(); - this.buttonItem10 = new DevComponents.DotNetBar.ButtonItem(); - this.buttonItem11 = new DevComponents.DotNetBar.ButtonItem(); - this.buttonItem12 = new DevComponents.DotNetBar.ButtonItem(); - this.buttonItem13 = new DevComponents.DotNetBar.ButtonItem(); - this.buttonItem14 = new DevComponents.DotNetBar.ButtonItem(); this.ribbonPanel2 = new DevComponents.DotNetBar.RibbonPanel(); this.ribbonBar3 = new DevComponents.DotNetBar.RibbonBar(); this.btn_user_info = new DevComponents.DotNetBar.ButtonItem(); @@ -355,6 +321,43 @@ this.btn_user_role = new DevComponents.DotNetBar.ButtonItem(); this.btn_password_edit = new DevComponents.DotNetBar.ButtonItem(); this.buttonItemPasswordReset = new DevComponents.DotNetBar.ButtonItem(); + this.ribbonPanel6 = new DevComponents.DotNetBar.RibbonPanel(); + this.ribbonBar6 = new DevComponents.DotNetBar.RibbonBar(); + this.buttonItemSPSZ = new DevComponents.DotNetBar.ButtonItem(); + this.buttonItem8 = new DevComponents.DotNetBar.ButtonItem(); + this.buttonItemLocation = new DevComponents.DotNetBar.ButtonItem(); + this.sliderItem2 = new DevComponents.DotNetBar.SliderItem(); + this.buttonItemGBJC = new DevComponents.DotNetBar.ButtonItem(); + this.ribbonPanel5 = new DevComponents.DotNetBar.RibbonPanel(); + this.ribbonBar2 = new DevComponents.DotNetBar.RibbonBar(); + this.buttonItemHX1 = new DevComponents.DotNetBar.ButtonItem(); + this.buttonItemHX2 = new DevComponents.DotNetBar.ButtonItem(); + this.buttonItemDCTP = new DevComponents.DotNetBar.ButtonItem(); + this.sliderItem3 = new DevComponents.DotNetBar.SliderItem(); + this.ribbonPanel1 = new DevComponents.DotNetBar.RibbonPanel(); + this.ribbonBar21 = new DevComponents.DotNetBar.RibbonBar(); + this.buttonItem87 = new DevComponents.DotNetBar.ButtonItem(); + this.buttonItem88 = new DevComponents.DotNetBar.ButtonItem(); + this.buttonItem27 = new DevComponents.DotNetBar.ButtonItem(); + this.buttonItem91 = new DevComponents.DotNetBar.ButtonItem(); + this.buttonItem1 = new DevComponents.DotNetBar.ButtonItem(); + this.btnlegendSet = new DevComponents.DotNetBar.ButtonItem(); + this.buttonItem89 = new DevComponents.DotNetBar.ButtonItem(); + this.btnOutputJPG = new DevComponents.DotNetBar.ButtonItem(); + this.ribbonPanel12 = new DevComponents.DotNetBar.RibbonPanel(); + this.ribbonBar18 = new DevComponents.DotNetBar.RibbonBar(); + this.buttonItem133 = new DevComponents.DotNetBar.ButtonItem(); + this.buttonItem132 = new DevComponents.DotNetBar.ButtonItem(); + this.ribbonBar13 = new DevComponents.DotNetBar.RibbonBar(); + this.buttonItem127 = new DevComponents.DotNetBar.ButtonItem(); + this.buttonItem128 = new DevComponents.DotNetBar.ButtonItem(); + this.sliderItem1 = new DevComponents.DotNetBar.SliderItem(); + this.buttonItem134 = new DevComponents.DotNetBar.ButtonItem(); + this.buttonItem130 = new DevComponents.DotNetBar.ButtonItem(); + this.btn_check_history = new DevComponents.DotNetBar.ButtonItem(); + this.ribbonPanel4 = new DevComponents.DotNetBar.RibbonPanel(); + this.ribbonBar1 = new DevComponents.DotNetBar.RibbonBar(); + this.btn_document_info = new DevComponents.DotNetBar.ButtonItem(); this.ribbonTabItem1 = new DevComponents.DotNetBar.RibbonTabItem(); this.ribbonTabItem11 = new DevComponents.DotNetBar.RibbonTabItem(); this.ribbonTabItem6 = new DevComponents.DotNetBar.RibbonTabItem(); @@ -516,7 +519,6 @@ this.labelX17 = new DevComponents.DotNetBar.LabelX(); this.panelEx4 = new DevComponents.DotNetBar.PanelEx(); this.pictureBox1 = new System.Windows.Forms.PictureBox(); - this.layerTree = new Cyberpipe.MyTreeView(); this.statusStrip1.SuspendLayout(); this.sideBar1.SuspendLayout(); this.panelEx3.SuspendLayout(); @@ -527,15 +529,15 @@ this.contextMenuStrip3.SuspendLayout(); this.contextMenuStripDeleteLayerNode.SuspendLayout(); this.ribbonControl1.SuspendLayout(); + this.ribbonPanel3.SuspendLayout(); + this.ribbonPanel7.SuspendLayout(); + this.ribbonPanel15.SuspendLayout(); + this.ribbonPanel2.SuspendLayout(); this.ribbonPanel6.SuspendLayout(); this.ribbonPanel5.SuspendLayout(); this.ribbonPanel1.SuspendLayout(); this.ribbonPanel12.SuspendLayout(); this.ribbonPanel4.SuspendLayout(); - this.ribbonPanel15.SuspendLayout(); - this.ribbonPanel3.SuspendLayout(); - this.ribbonPanel7.SuspendLayout(); - this.ribbonPanel2.SuspendLayout(); this.panelOfTable.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.dataGridViewX1)).BeginInit(); this.statusStrip2.SuspendLayout(); @@ -711,7 +713,8 @@ this.statusLabel.Name = "statusLabel"; this.statusLabel.Size = new System.Drawing.Size(1313, 17); this.statusLabel.Spring = true; - this.statusLabel.Text = " ©2014-2015 苏州航天系统工程有限公司 版权所有"; + this.statusLabel.Text = Utility.Copyright; +// this.statusLabel.Text = " ©2014-2015 苏州航天系统工程有限公司 版权所有"; // // toolStripDropDownButton1 // @@ -956,6 +959,18 @@ this.layerSensorTree.NodeMouseClick += new System.Windows.Forms.TreeNodeMouseClickEventHandler(this.layerMarkerTree_NodeMouseClick); this.layerSensorTree.NodeMouseDoubleClick += new System.Windows.Forms.TreeNodeMouseClickEventHandler(this.layerTree_NodeMouseDoubleClick); // + // layerTree + // + this.layerTree.CheckBoxes = true; + this.layerTree.ItemHeight = 18; + this.layerTree.Location = new System.Drawing.Point(30, 78); + this.layerTree.Name = "layerTree"; + this.layerTree.Size = new System.Drawing.Size(121, 97); + this.layerTree.TabIndex = 1; + this.layerTree.AfterCheck += new System.Windows.Forms.TreeViewEventHandler(this.layerTree_AfterCheck); + this.layerTree.NodeMouseClick += new System.Windows.Forms.TreeNodeMouseClickEventHandler(this.layerTree_NodeMouseClick); + this.layerTree.NodeMouseDoubleClick += new System.Windows.Forms.TreeNodeMouseClickEventHandler(this.layerTree_NodeMouseDoubleClick); + // // sideBarPanelItem3 // this.sideBarPanelItem3.FontBold = true; @@ -2150,13 +2165,13 @@ this.ribbonControl1.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.ribbonControl1.Controls.Add(this.ribbonPanel3); this.ribbonControl1.Controls.Add(this.ribbonPanel7); - this.ribbonControl1.Controls.Add(this.ribbonPanel2); this.ribbonControl1.Controls.Add(this.ribbonPanel15); - this.ribbonControl1.Controls.Add(this.ribbonPanel4); - this.ribbonControl1.Controls.Add(this.ribbonPanel1); + this.ribbonControl1.Controls.Add(this.ribbonPanel2); this.ribbonControl1.Controls.Add(this.ribbonPanel6); - this.ribbonControl1.Controls.Add(this.ribbonPanel12); this.ribbonControl1.Controls.Add(this.ribbonPanel5); + this.ribbonControl1.Controls.Add(this.ribbonPanel1); + this.ribbonControl1.Controls.Add(this.ribbonPanel12); + this.ribbonControl1.Controls.Add(this.ribbonPanel4); this.ribbonControl1.Dock = System.Windows.Forms.DockStyle.Top; this.ribbonControl1.ImeMode = System.Windows.Forms.ImeMode.NoControl; this.ribbonControl1.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { @@ -2200,609 +2215,216 @@ this.ribbonControl1.Text = "ribbonControl1"; this.ribbonControl1.UseCustomizeDialog = false; // - // ribbonPanel6 + // ribbonPanel3 // - this.ribbonPanel6.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.ribbonPanel6.Controls.Add(this.ribbonBar6); - this.ribbonPanel6.Dock = System.Windows.Forms.DockStyle.Fill; - this.ribbonPanel6.Location = new System.Drawing.Point(0, 0); - this.ribbonPanel6.Name = "ribbonPanel6"; - this.ribbonPanel6.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); - this.ribbonPanel6.Size = new System.Drawing.Size(1328, 95); + this.ribbonPanel3.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.ribbonPanel3.Controls.Add(this.ribbonBar4); + this.ribbonPanel3.Dock = System.Windows.Forms.DockStyle.Fill; + this.ribbonPanel3.Location = new System.Drawing.Point(0, 33); + this.ribbonPanel3.Name = "ribbonPanel3"; + this.ribbonPanel3.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); + this.ribbonPanel3.Size = new System.Drawing.Size(1328, 62); // // // - this.ribbonPanel6.Style.Class = ""; - this.ribbonPanel6.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonPanel3.Style.Class = ""; + this.ribbonPanel3.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; // // // - this.ribbonPanel6.StyleMouseDown.Class = ""; - this.ribbonPanel6.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonPanel3.StyleMouseDown.Class = ""; + this.ribbonPanel3.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; // // // - this.ribbonPanel6.StyleMouseOver.Class = ""; - this.ribbonPanel6.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonPanel6.TabIndex = 38; - this.ribbonPanel6.Visible = false; + this.ribbonPanel3.StyleMouseOver.Class = ""; + this.ribbonPanel3.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonPanel3.TabIndex = 40; // - // ribbonBar6 + // ribbonBar4 // - this.ribbonBar6.AutoOverflowEnabled = true; + this.ribbonBar4.AutoOverflowEnabled = true; // // // - this.ribbonBar6.BackgroundMouseOverStyle.Class = ""; - this.ribbonBar6.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar4.BackgroundMouseOverStyle.Class = ""; + this.ribbonBar4.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; // // // - this.ribbonBar6.BackgroundStyle.Class = ""; - this.ribbonBar6.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonBar6.ContainerControlProcessDialogKey = true; - this.ribbonBar6.Dock = System.Windows.Forms.DockStyle.Left; - this.ribbonBar6.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { - this.buttonItemSPSZ, - this.buttonItem8, - this.buttonItemLocation, - this.sliderItem2, - this.buttonItemGBJC}); - this.ribbonBar6.Location = new System.Drawing.Point(3, 0); - this.ribbonBar6.Name = "ribbonBar6"; - this.ribbonBar6.Size = new System.Drawing.Size(427, 92); - this.ribbonBar6.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.ribbonBar6.TabIndex = 0; + this.ribbonBar4.BackgroundStyle.Class = ""; + this.ribbonBar4.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar4.ContainerControlProcessDialogKey = true; + this.ribbonBar4.Dock = System.Windows.Forms.DockStyle.Left; + this.ribbonBar4.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { + this.btn_flag, + this.slider4ground}); + this.ribbonBar4.Location = new System.Drawing.Point(3, 0); + this.ribbonBar4.Name = "ribbonBar4"; + this.ribbonBar4.Size = new System.Drawing.Size(634, 59); + this.ribbonBar4.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.ribbonBar4.TabIndex = 0; // // // - this.ribbonBar6.TitleStyle.Class = ""; - this.ribbonBar6.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar4.TitleStyle.Class = ""; + this.ribbonBar4.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; // // // - this.ribbonBar6.TitleStyleMouseOver.Class = ""; - this.ribbonBar6.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonBar6.TitleVisible = false; + this.ribbonBar4.TitleStyleMouseOver.Class = ""; + this.ribbonBar4.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar4.TitleVisible = false; // - // buttonItemSPSZ + // btn_flag // - this.buttonItemSPSZ.Image = ((System.Drawing.Image)(resources.GetObject("buttonItemSPSZ.Image"))); - this.buttonItemSPSZ.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItemSPSZ.Name = "buttonItemSPSZ"; - this.buttonItemSPSZ.SubItemsExpandWidth = 14; - this.buttonItemSPSZ.Text = "双屏设置"; - this.buttonItemSPSZ.Click += new System.EventHandler(this.buttonItemSPSZ_Click); + this.btn_flag.Image = global::Cyberpipe.Properties.Resources._24x24icon_03_hover; + this.btn_flag.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.btn_flag.Name = "btn_flag"; + this.btn_flag.SubItemsExpandWidth = 14; + this.btn_flag.Text = "标识器管理"; + this.btn_flag.Click += new System.EventHandler(this.btn_flag_Click); // - // buttonItem8 + // slider4ground // - this.buttonItem8.Image = ((System.Drawing.Image)(resources.GetObject("buttonItem8.Image"))); - this.buttonItem8.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem8.Name = "buttonItem8"; - this.buttonItem8.SubItemsExpandWidth = 14; - this.buttonItem8.Text = "双屏分析"; - this.buttonItem8.Click += new System.EventHandler(this.buttonItem8_Click); + this.slider4ground.LabelPosition = DevComponents.DotNetBar.eSliderLabelPosition.Top; + this.slider4ground.LabelWidth = 50; + this.slider4ground.Name = "slider4ground"; + this.slider4ground.Text = "地面透明度"; + this.slider4ground.TextColor = System.Drawing.Color.Black; + this.slider4ground.Value = 0; + this.slider4ground.ValueChanged += new System.EventHandler(this.slider4ground_ValueChanged); // - // buttonItemLocation + // ribbonPanel7 // - this.buttonItemLocation.Image = ((System.Drawing.Image)(resources.GetObject("buttonItemLocation.Image"))); - this.buttonItemLocation.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItemLocation.Name = "buttonItemLocation"; - this.buttonItemLocation.SubItemsExpandWidth = 14; - this.buttonItemLocation.Text = "快速定位"; - this.buttonItemLocation.Click += new System.EventHandler(this.buttonItemLocation_Click); + this.ribbonPanel7.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.ribbonPanel7.Controls.Add(this.gxdw_ribbonbar); + this.ribbonPanel7.Dock = System.Windows.Forms.DockStyle.Fill; + this.ribbonPanel7.Location = new System.Drawing.Point(0, 33); + this.ribbonPanel7.Name = "ribbonPanel7"; + this.ribbonPanel7.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); + this.ribbonPanel7.Size = new System.Drawing.Size(1328, 62); // - // sliderItem2 // - this.sliderItem2.LabelPosition = DevComponents.DotNetBar.eSliderLabelPosition.Top; - this.sliderItem2.LabelWidth = 50; - this.sliderItem2.Name = "sliderItem2"; - this.sliderItem2.Text = "地面透明度"; - this.sliderItem2.TextColor = System.Drawing.Color.Black; - this.sliderItem2.Value = 0; - this.sliderItem2.ValueChanged += new System.EventHandler(this.sliderItem2_ValueChanged); // - // buttonItemGBJC + this.ribbonPanel7.Style.Class = ""; + this.ribbonPanel7.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; // - this.buttonItemGBJC.Image = ((System.Drawing.Image)(resources.GetObject("buttonItemGBJC.Image"))); - this.buttonItemGBJC.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItemGBJC.Name = "buttonItemGBJC"; - this.buttonItemGBJC.SubItemsExpandWidth = 14; - this.buttonItemGBJC.Text = "国标检测"; - this.buttonItemGBJC.Click += new System.EventHandler(this.buttonItemGBJC_Click); // - // ribbonPanel5 // - this.ribbonPanel5.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.ribbonPanel5.Controls.Add(this.ribbonBar2); - this.ribbonPanel5.Dock = System.Windows.Forms.DockStyle.Fill; - this.ribbonPanel5.Location = new System.Drawing.Point(0, 0); - this.ribbonPanel5.Name = "ribbonPanel5"; - this.ribbonPanel5.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); - this.ribbonPanel5.Size = new System.Drawing.Size(1328, 95); + this.ribbonPanel7.StyleMouseDown.Class = ""; + this.ribbonPanel7.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; // // // - this.ribbonPanel5.Style.Class = ""; - this.ribbonPanel5.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonPanel7.StyleMouseOver.Class = ""; + this.ribbonPanel7.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonPanel7.TabIndex = 41; + this.ribbonPanel7.Visible = false; // + // gxdw_ribbonbar // + this.gxdw_ribbonbar.AutoOverflowEnabled = true; // - this.ribbonPanel5.StyleMouseDown.Class = ""; - this.ribbonPanel5.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; // // + this.gxdw_ribbonbar.BackgroundMouseOverStyle.Class = ""; + this.gxdw_ribbonbar.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; // - this.ribbonPanel5.StyleMouseOver.Class = ""; - this.ribbonPanel5.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonPanel5.TabIndex = 37; - this.ribbonPanel5.Visible = false; // - // ribbonBar2 // - this.ribbonBar2.AutoOverflowEnabled = true; + this.gxdw_ribbonbar.BackgroundStyle.Class = ""; + this.gxdw_ribbonbar.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.gxdw_ribbonbar.ContainerControlProcessDialogKey = true; + this.gxdw_ribbonbar.Dock = System.Windows.Forms.DockStyle.Left; + this.gxdw_ribbonbar.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { + this.buttonItem9, + this.buttonItem10, + this.buttonItem11, + this.buttonItem12, + this.buttonItem13, + this.buttonItem14}); + this.gxdw_ribbonbar.Location = new System.Drawing.Point(3, 0); + this.gxdw_ribbonbar.Name = "gxdw_ribbonbar"; + this.gxdw_ribbonbar.Size = new System.Drawing.Size(564, 59); + this.gxdw_ribbonbar.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.gxdw_ribbonbar.TabIndex = 0; + this.gxdw_ribbonbar.Text = "ribbonBar5"; // // // - this.ribbonBar2.BackgroundMouseOverStyle.Class = ""; - this.ribbonBar2.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.gxdw_ribbonbar.TitleStyle.Class = ""; + this.gxdw_ribbonbar.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; // // // - this.ribbonBar2.BackgroundStyle.Class = ""; - this.ribbonBar2.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonBar2.ContainerControlProcessDialogKey = true; - this.ribbonBar2.Dock = System.Windows.Forms.DockStyle.Left; - this.ribbonBar2.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { - this.buttonItemHX1, - this.buttonItemHX2, - this.buttonItemDCTP, - this.sliderItem3}); - this.ribbonBar2.Location = new System.Drawing.Point(3, 0); - this.ribbonBar2.Name = "ribbonBar2"; - this.ribbonBar2.Size = new System.Drawing.Size(350, 92); - this.ribbonBar2.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.ribbonBar2.TabIndex = 0; + this.gxdw_ribbonbar.TitleStyleMouseOver.Class = ""; + this.gxdw_ribbonbar.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.gxdw_ribbonbar.TitleVisible = false; // + // buttonItem9 // + this.buttonItem9.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__76; + this.buttonItem9.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem9.Name = "buttonItem9"; + this.buttonItem9.SubItemsExpandWidth = 14; + this.buttonItem9.Text = "工单管理"; + this.buttonItem9.Click += new System.EventHandler(this.buttonItem9_Click); // - this.ribbonBar2.TitleStyle.Class = ""; - this.ribbonBar2.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // buttonItem10 // + this.buttonItem10.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__69; + this.buttonItem10.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem10.Name = "buttonItem10"; + this.buttonItem10.SubItemsExpandWidth = 14; + this.buttonItem10.Text = "在线任务"; + this.buttonItem10.Click += new System.EventHandler(this.buttonItem10_Click); // + // buttonItem11 // - this.ribbonBar2.TitleStyleMouseOver.Class = ""; - this.ribbonBar2.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonBar2.TitleVisible = false; + this.buttonItem11.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__72; + this.buttonItem11.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem11.Name = "buttonItem11"; + this.buttonItem11.SubItemsExpandWidth = 14; + this.buttonItem11.Text = "事件管理"; + this.buttonItem11.Click += new System.EventHandler(this.buttonItem11_Click); // - // buttonItemHX1 + // buttonItem12 // - this.buttonItemHX1.AutoExpandOnClick = true; - this.buttonItemHX1.Image = ((System.Drawing.Image)(resources.GetObject("buttonItemHX1.Image"))); - this.buttonItemHX1.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItemHX1.Name = "buttonItemHX1"; - this.buttonItemHX1.SubItemsExpandWidth = 14; - this.buttonItemHX1.Text = "导入红线"; - this.buttonItemHX1.Click += new System.EventHandler(this.buttonItemHX1_Click); + this.buttonItem12.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__34; + this.buttonItem12.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem12.Name = "buttonItem12"; + this.buttonItem12.SubItemsExpandWidth = 14; + this.buttonItem12.Text = "探测仪管理"; + this.buttonItem12.Click += new System.EventHandler(this.buttonItem12_Click); // - // buttonItemHX2 + // buttonItem13 // - this.buttonItemHX2.Image = ((System.Drawing.Image)(resources.GetObject("buttonItemHX2.Image"))); - this.buttonItemHX2.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItemHX2.Name = "buttonItemHX2"; - this.buttonItemHX2.SubItemsExpandWidth = 14; - this.buttonItemHX2.Text = "红线审核"; - this.buttonItemHX2.Click += new System.EventHandler(this.buttonItemHX2_Click); + this.buttonItem13.Image = global::Cyberpipe.Properties.Resources._24x24icon_13_hover; + this.buttonItem13.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem13.Name = "buttonItem13"; + this.buttonItem13.SubItemsExpandWidth = 14; + this.buttonItem13.Text = "巡检人员维护"; + this.buttonItem13.Click += new System.EventHandler(this.buttonItem13_Click); // - // buttonItemDCTP + // buttonItem14 // - this.buttonItemDCTP.Image = ((System.Drawing.Image)(resources.GetObject("buttonItemDCTP.Image"))); - this.buttonItemDCTP.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItemDCTP.Name = "buttonItemDCTP"; - this.buttonItemDCTP.SubItemsExpandWidth = 14; - this.buttonItemDCTP.Text = "导出图片"; - this.buttonItemDCTP.Click += new System.EventHandler(this.buttonItemDCTP_Click); - // - // sliderItem3 - // - this.sliderItem3.LabelPosition = DevComponents.DotNetBar.eSliderLabelPosition.Top; - this.sliderItem3.LabelWidth = 50; - this.sliderItem3.Name = "sliderItem3"; - this.sliderItem3.Text = "地面透明度"; - this.sliderItem3.TextColor = System.Drawing.Color.Black; - this.sliderItem3.Value = 0; - this.sliderItem3.ValueChanged += new System.EventHandler(this.sliderItem3_ValueChanged); - // - // ribbonPanel1 - // - this.ribbonPanel1.AutoSize = true; - this.ribbonPanel1.CanvasColor = System.Drawing.Color.Gray; - this.ribbonPanel1.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.ribbonPanel1.Controls.Add(this.ribbonBar21); - this.ribbonPanel1.Dock = System.Windows.Forms.DockStyle.Fill; - this.ribbonPanel1.Location = new System.Drawing.Point(0, 0); - this.ribbonPanel1.Name = "ribbonPanel1"; - this.ribbonPanel1.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); - this.ribbonPanel1.Size = new System.Drawing.Size(1328, 95); - // - // - // - this.ribbonPanel1.Style.Class = ""; - this.ribbonPanel1.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonPanel1.StyleMouseDown.Class = ""; - this.ribbonPanel1.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonPanel1.StyleMouseOver.Class = ""; - this.ribbonPanel1.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonPanel1.TabIndex = 1; - this.ribbonPanel1.Visible = false; - // - // ribbonBar21 - // - this.ribbonBar21.AutoOverflowEnabled = true; - this.ribbonBar21.BackColor = System.Drawing.Color.White; - // - // - // - this.ribbonBar21.BackgroundMouseOverStyle.Class = ""; - this.ribbonBar21.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonBar21.BackgroundStyle.Class = ""; - this.ribbonBar21.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonBar21.ContainerControlProcessDialogKey = true; - this.ribbonBar21.Dock = System.Windows.Forms.DockStyle.Left; - this.ribbonBar21.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { - this.buttonItem87, - this.buttonItem88, - this.buttonItem27, - this.sliderGroundTransSet1, - this.buttonItem91, - this.buttonItem1, - this.btnlegendSet, - this.buttonItem89, - this.btnOutputJPG}); - this.ribbonBar21.Location = new System.Drawing.Point(3, 0); - this.ribbonBar21.Name = "ribbonBar21"; - this.ribbonBar21.Size = new System.Drawing.Size(649, 92); - this.ribbonBar21.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.ribbonBar21.TabIndex = 2; - this.ribbonBar21.Text = "浏览模式"; - // - // - // - this.ribbonBar21.TitleStyle.Class = ""; - this.ribbonBar21.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonBar21.TitleStyleMouseOver.Class = ""; - this.ribbonBar21.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonBar21.TitleVisible = false; - // - // buttonItem87 - // - this.buttonItem87.Image = ((System.Drawing.Image)(resources.GetObject("buttonItem87.Image"))); - this.buttonItem87.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem87.Name = "buttonItem87"; - this.buttonItem87.SubItemsExpandWidth = 14; - this.buttonItem87.Text = "地上模式"; - this.buttonItem87.Click += new System.EventHandler(this.buttonItem87_Click); - // - // buttonItem88 - // - this.buttonItem88.Image = ((System.Drawing.Image)(resources.GetObject("buttonItem88.Image"))); - this.buttonItem88.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem88.Name = "buttonItem88"; - this.buttonItem88.SubItemsExpandWidth = 14; - this.buttonItem88.Text = "地下模式"; - this.buttonItem88.Click += new System.EventHandler(this.buttonItem88_Click); - // - // buttonItem27 - // - this.buttonItem27.Image = ((System.Drawing.Image)(resources.GetObject("buttonItem27.Image"))); - this.buttonItem27.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem27.Name = "buttonItem27"; - this.buttonItem27.SubItemsExpandWidth = 14; - this.buttonItem27.Text = "行走模式"; - this.buttonItem27.Click += new System.EventHandler(this.buttonItem27_Click); - // - // buttonItem91 - // - this.buttonItem91.ForeColor = System.Drawing.Color.Black; - this.buttonItem91.Image = ((System.Drawing.Image)(resources.GetObject("buttonItem91.Image"))); - this.buttonItem91.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem91.Name = "buttonItem91"; - this.buttonItem91.SubItemsExpandWidth = 14; - this.buttonItem91.Text = "快速定位"; - this.buttonItem91.Click += new System.EventHandler(this.buttonItem91_Click); - // - // buttonItem1 - // - this.buttonItem1.Image = ((System.Drawing.Image)(resources.GetObject("buttonItem1.Image"))); - this.buttonItem1.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem1.Name = "buttonItem1"; - this.buttonItem1.SubItemsExpandWidth = 14; - this.buttonItem1.Text = "图层管理"; - this.buttonItem1.Click += new System.EventHandler(this.buttonItem1_Click); - // - // btnlegendSet - // - this.btnlegendSet.Image = ((System.Drawing.Image)(resources.GetObject("btnlegendSet.Image"))); - this.btnlegendSet.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.btnlegendSet.Name = "btnlegendSet"; - this.btnlegendSet.SubItemsExpandWidth = 14; - this.btnlegendSet.Text = "图例"; - this.btnlegendSet.Click += new System.EventHandler(this.btnlegendSet_Click); - // - // buttonItem89 - // - this.buttonItem89.Image = ((System.Drawing.Image)(resources.GetObject("buttonItem89.Image"))); - this.buttonItem89.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem89.Name = "buttonItem89"; - this.buttonItem89.SubItemsExpandWidth = 14; - this.buttonItem89.Text = "全屏显示"; - this.buttonItem89.Click += new System.EventHandler(this.buttonItem89_Click); - // - // btnOutputJPG - // - this.btnOutputJPG.Image = ((System.Drawing.Image)(resources.GetObject("btnOutputJPG.Image"))); - this.btnOutputJPG.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.btnOutputJPG.Name = "btnOutputJPG"; - this.btnOutputJPG.SubItemsExpandWidth = 14; - this.btnOutputJPG.Text = "导出图片"; - this.btnOutputJPG.Click += new System.EventHandler(this.btnOutputJPG_Click); - // - // ribbonPanel12 - // - this.ribbonPanel12.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.ribbonPanel12.Controls.Add(this.ribbonBar18); - this.ribbonPanel12.Controls.Add(this.ribbonBar13); - this.ribbonPanel12.Dock = System.Windows.Forms.DockStyle.Fill; - this.ribbonPanel12.Location = new System.Drawing.Point(0, 0); - this.ribbonPanel12.Name = "ribbonPanel12"; - this.ribbonPanel12.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); - this.ribbonPanel12.Size = new System.Drawing.Size(1328, 95); - // - // - // - this.ribbonPanel12.Style.Class = ""; - this.ribbonPanel12.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonPanel12.StyleMouseDown.Class = ""; - this.ribbonPanel12.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonPanel12.StyleMouseOver.Class = ""; - this.ribbonPanel12.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonPanel12.TabIndex = 34; - this.ribbonPanel12.Visible = false; - // - // ribbonBar18 - // - this.ribbonBar18.AutoOverflowEnabled = true; - // - // - // - this.ribbonBar18.BackgroundMouseOverStyle.Class = ""; - this.ribbonBar18.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonBar18.BackgroundStyle.Class = ""; - this.ribbonBar18.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonBar18.ContainerControlProcessDialogKey = true; - this.ribbonBar18.Dock = System.Windows.Forms.DockStyle.Left; - this.ribbonBar18.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { - this.buttonItem133}); - this.ribbonBar18.Location = new System.Drawing.Point(531, 0); - this.ribbonBar18.Name = "ribbonBar18"; - this.ribbonBar18.Size = new System.Drawing.Size(129, 92); - this.ribbonBar18.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.ribbonBar18.TabIndex = 1; - // - // - // - this.ribbonBar18.TitleStyle.Class = ""; - this.ribbonBar18.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonBar18.TitleStyleMouseOver.Class = ""; - this.ribbonBar18.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonBar18.TitleVisible = false; - // - // buttonItem133 - // - this.buttonItem133.Image = ((System.Drawing.Image)(resources.GetObject("buttonItem133.Image"))); - this.buttonItem133.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem133.Name = "buttonItem133"; - this.buttonItem133.SubItemsExpandWidth = 14; - this.buttonItem133.Text = "审核入库"; - this.buttonItem133.Click += new System.EventHandler(this.buttonItem133_Click_1); - // - // ribbonBar13 - // - this.ribbonBar13.AutoOverflowEnabled = true; - // - // - // - this.ribbonBar13.BackgroundMouseOverStyle.Class = ""; - this.ribbonBar13.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonBar13.BackgroundStyle.Class = ""; - this.ribbonBar13.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonBar13.ContainerControlProcessDialogKey = true; - this.ribbonBar13.Dock = System.Windows.Forms.DockStyle.Left; - this.ribbonBar13.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { - this.buttonItem127, - this.buttonItem128, - this.sliderItem1, - this.buttonItem134, - this.buttonItem130, - this.btn_check_history}); - this.ribbonBar13.Location = new System.Drawing.Point(3, 0); - this.ribbonBar13.Name = "ribbonBar13"; - this.ribbonBar13.Size = new System.Drawing.Size(528, 92); - this.ribbonBar13.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.ribbonBar13.TabIndex = 0; - // - // - // - this.ribbonBar13.TitleStyle.Class = ""; - this.ribbonBar13.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonBar13.TitleStyleMouseOver.Class = ""; - this.ribbonBar13.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonBar13.TitleVisible = false; - // - // buttonItem127 - // - this.buttonItem127.Image = ((System.Drawing.Image)(resources.GetObject("buttonItem127.Image"))); - this.buttonItem127.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem127.Name = "buttonItem127"; - this.buttonItem127.SubItemsExpandWidth = 14; - this.buttonItem127.Text = "打开数据"; - this.buttonItem127.Click += new System.EventHandler(this.buttonItem127_Click_2); - // - // buttonItem128 - // - this.buttonItem128.Image = ((System.Drawing.Image)(resources.GetObject("buttonItem128.Image"))); - this.buttonItem128.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem128.Name = "buttonItem128"; - this.buttonItem128.SubItemsExpandWidth = 14; - this.buttonItem128.Text = "一键审核"; - this.buttonItem128.Click += new System.EventHandler(this.buttonItem128_Click); - // - // sliderItem1 - // - this.sliderItem1.LabelPosition = DevComponents.DotNetBar.eSliderLabelPosition.Top; - this.sliderItem1.LabelWidth = 50; - this.sliderItem1.Name = "sliderItem1"; - this.sliderItem1.Text = "地面透明度"; - this.sliderItem1.TextColor = System.Drawing.Color.Black; - this.sliderItem1.Value = 0; - this.sliderItem1.ValueChanged += new System.EventHandler(this.sliderItem1_ValueChanged); - // - // buttonItem134 - // - this.buttonItem134.Image = ((System.Drawing.Image)(resources.GetObject("buttonItem134.Image"))); - this.buttonItem134.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem134.Name = "buttonItem134"; - this.buttonItem134.SubItemsExpandWidth = 14; - this.buttonItem134.Text = "模拟设计修改"; - this.buttonItem134.Click += new System.EventHandler(this.buttonItem134_Click_1); - // - // buttonItem130 - // - this.buttonItem130.Image = ((System.Drawing.Image)(resources.GetObject("buttonItem130.Image"))); - this.buttonItem130.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem130.Name = "buttonItem130"; - this.buttonItem130.SubItemsExpandWidth = 14; - this.buttonItem130.Text = "导出审核图"; - this.buttonItem130.Click += new System.EventHandler(this.buttonItem130_Click_1); - // - // btn_check_history - // - this.btn_check_history.Image = ((System.Drawing.Image)(resources.GetObject("btn_check_history.Image"))); - this.btn_check_history.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.btn_check_history.Name = "btn_check_history"; - this.btn_check_history.SubItemsExpandWidth = 14; - this.btn_check_history.Text = "审核历史"; - this.btn_check_history.Click += new System.EventHandler(this.btn_check_history_Click); - // - // ribbonPanel4 - // - this.ribbonPanel4.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.ribbonPanel4.Controls.Add(this.ribbonBar1); - this.ribbonPanel4.Dock = System.Windows.Forms.DockStyle.Fill; - this.ribbonPanel4.Location = new System.Drawing.Point(0, 0); - this.ribbonPanel4.Name = "ribbonPanel4"; - this.ribbonPanel4.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); - this.ribbonPanel4.Size = new System.Drawing.Size(1328, 95); - // - // - // - this.ribbonPanel4.Style.Class = ""; - this.ribbonPanel4.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonPanel4.StyleMouseDown.Class = ""; - this.ribbonPanel4.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonPanel4.StyleMouseOver.Class = ""; - this.ribbonPanel4.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonPanel4.TabIndex = 36; - this.ribbonPanel4.Visible = false; - // - // ribbonBar1 - // - this.ribbonBar1.AutoOverflowEnabled = true; - // - // - // - this.ribbonBar1.BackgroundMouseOverStyle.Class = ""; - this.ribbonBar1.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonBar1.BackgroundStyle.Class = ""; - this.ribbonBar1.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonBar1.ContainerControlProcessDialogKey = true; - this.ribbonBar1.Dock = System.Windows.Forms.DockStyle.Left; - this.ribbonBar1.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { - this.btn_document_info}); - this.ribbonBar1.Location = new System.Drawing.Point(3, 0); - this.ribbonBar1.Name = "ribbonBar1"; - this.ribbonBar1.Size = new System.Drawing.Size(88, 92); - this.ribbonBar1.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.ribbonBar1.TabIndex = 0; - // - // - // - this.ribbonBar1.TitleStyle.Class = ""; - this.ribbonBar1.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonBar1.TitleStyleMouseOver.Class = ""; - this.ribbonBar1.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonBar1.TitleVisible = false; - // - // btn_document_info - // - this.btn_document_info.Image = ((System.Drawing.Image)(resources.GetObject("btn_document_info.Image"))); - this.btn_document_info.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.btn_document_info.Name = "btn_document_info"; - this.btn_document_info.SubItemsExpandWidth = 14; - this.btn_document_info.Text = "文档管理"; - this.btn_document_info.Click += new System.EventHandler(this.btn_document_info_Click); + this.buttonItem14.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__56; + this.buttonItem14.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem14.Name = "buttonItem14"; + this.buttonItem14.SubItemsExpandWidth = 14; + this.buttonItem14.Text = "导出施工图"; + this.buttonItem14.Click += new System.EventHandler(this.buttonItem14_Click); // // ribbonPanel15 // this.ribbonPanel15.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; this.ribbonPanel15.Controls.Add(this.ribbonBar20); this.ribbonPanel15.Dock = System.Windows.Forms.DockStyle.Fill; - this.ribbonPanel15.Location = new System.Drawing.Point(0, 0); + this.ribbonPanel15.Location = new System.Drawing.Point(0, 33); this.ribbonPanel15.Name = "ribbonPanel15"; this.ribbonPanel15.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); - this.ribbonPanel15.Size = new System.Drawing.Size(1328, 95); + this.ribbonPanel15.Size = new System.Drawing.Size(1328, 62); // // // @@ -2843,7 +2465,7 @@ this.buttonItemXTGL}); this.ribbonBar20.Location = new System.Drawing.Point(3, 0); this.ribbonBar20.Name = "ribbonBar20"; - this.ribbonBar20.Size = new System.Drawing.Size(283, 92); + this.ribbonBar20.Size = new System.Drawing.Size(283, 59); this.ribbonBar20.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; this.ribbonBar20.TabIndex = 0; // @@ -3274,216 +2896,15 @@ this.buttonItemXT4_2.Text = "人员修改"; this.buttonItemXT4_2.Click += new System.EventHandler(this.buttonItemXT4_2_Click); // - // ribbonPanel3 - // - this.ribbonPanel3.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.ribbonPanel3.Controls.Add(this.ribbonBar4); - this.ribbonPanel3.Dock = System.Windows.Forms.DockStyle.Fill; - this.ribbonPanel3.Location = new System.Drawing.Point(0, 33); - this.ribbonPanel3.Name = "ribbonPanel3"; - this.ribbonPanel3.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); - this.ribbonPanel3.Size = new System.Drawing.Size(1328, 62); - // - // - // - this.ribbonPanel3.Style.Class = ""; - this.ribbonPanel3.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonPanel3.StyleMouseDown.Class = ""; - this.ribbonPanel3.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonPanel3.StyleMouseOver.Class = ""; - this.ribbonPanel3.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonPanel3.TabIndex = 40; - // - // ribbonBar4 - // - this.ribbonBar4.AutoOverflowEnabled = true; - // - // - // - this.ribbonBar4.BackgroundMouseOverStyle.Class = ""; - this.ribbonBar4.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonBar4.BackgroundStyle.Class = ""; - this.ribbonBar4.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonBar4.ContainerControlProcessDialogKey = true; - this.ribbonBar4.Dock = System.Windows.Forms.DockStyle.Left; - this.ribbonBar4.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { - this.btn_flag, - this.slider4ground}); - this.ribbonBar4.Location = new System.Drawing.Point(3, 0); - this.ribbonBar4.Name = "ribbonBar4"; - this.ribbonBar4.Size = new System.Drawing.Size(321, 59); - this.ribbonBar4.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.ribbonBar4.TabIndex = 0; - // - // - // - this.ribbonBar4.TitleStyle.Class = ""; - this.ribbonBar4.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonBar4.TitleStyleMouseOver.Class = ""; - this.ribbonBar4.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonBar4.TitleVisible = false; - // - // btn_flag - // - this.btn_flag.Image = global::Cyberpipe.Properties.Resources._24x24icon_03_hover; - this.btn_flag.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.btn_flag.Name = "btn_flag"; - this.btn_flag.SubItemsExpandWidth = 14; - this.btn_flag.Text = "标识器管理"; - this.btn_flag.Click += new System.EventHandler(this.btn_flag_Click); - // - // slider4ground - // - this.slider4ground.LabelPosition = DevComponents.DotNetBar.eSliderLabelPosition.Top; - this.slider4ground.LabelWidth = 50; - this.slider4ground.Name = "slider4ground"; - this.slider4ground.Text = "地面透明度"; - this.slider4ground.TextColor = System.Drawing.Color.Black; - this.slider4ground.Value = 0; - this.slider4ground.ValueChanged += new System.EventHandler(this.slider4ground_ValueChanged); - // - // ribbonPanel7 - // - this.ribbonPanel7.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.ribbonPanel7.Controls.Add(this.gxdw_ribbonbar); - this.ribbonPanel7.Dock = System.Windows.Forms.DockStyle.Fill; - this.ribbonPanel7.Location = new System.Drawing.Point(0, 33); - this.ribbonPanel7.Name = "ribbonPanel7"; - this.ribbonPanel7.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); - this.ribbonPanel7.Size = new System.Drawing.Size(1328, 62); - // - // - // - this.ribbonPanel7.Style.Class = ""; - this.ribbonPanel7.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonPanel7.StyleMouseDown.Class = ""; - this.ribbonPanel7.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonPanel7.StyleMouseOver.Class = ""; - this.ribbonPanel7.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonPanel7.TabIndex = 41; - this.ribbonPanel7.Visible = false; - // - // gxdw_ribbonbar - // - this.gxdw_ribbonbar.AutoOverflowEnabled = true; - // - // - // - this.gxdw_ribbonbar.BackgroundMouseOverStyle.Class = ""; - this.gxdw_ribbonbar.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.gxdw_ribbonbar.BackgroundStyle.Class = ""; - this.gxdw_ribbonbar.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.gxdw_ribbonbar.ContainerControlProcessDialogKey = true; - this.gxdw_ribbonbar.Dock = System.Windows.Forms.DockStyle.Left; - this.gxdw_ribbonbar.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { - this.buttonItem9, - this.buttonItem10, - this.buttonItem11, - this.buttonItem12, - this.buttonItem13, - this.buttonItem14}); - this.gxdw_ribbonbar.Location = new System.Drawing.Point(3, 0); - this.gxdw_ribbonbar.Name = "gxdw_ribbonbar"; - this.gxdw_ribbonbar.Size = new System.Drawing.Size(522, 59); - this.gxdw_ribbonbar.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.gxdw_ribbonbar.TabIndex = 0; - this.gxdw_ribbonbar.Text = "ribbonBar5"; - // - // - // - this.gxdw_ribbonbar.TitleStyle.Class = ""; - this.gxdw_ribbonbar.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.gxdw_ribbonbar.TitleStyleMouseOver.Class = ""; - this.gxdw_ribbonbar.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.gxdw_ribbonbar.TitleVisible = false; - // - // buttonItem9 - // - this.buttonItem9.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__76; - this.buttonItem9.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem9.Name = "buttonItem9"; - this.buttonItem9.SubItemsExpandWidth = 14; - this.buttonItem9.Text = "工单管理"; - this.buttonItem9.Click += new System.EventHandler(this.buttonItem9_Click); - // - // buttonItem10 - // - this.buttonItem10.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__69; - this.buttonItem10.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem10.Name = "buttonItem10"; - this.buttonItem10.SubItemsExpandWidth = 14; - this.buttonItem10.Text = "在线任务"; - this.buttonItem10.Click += new System.EventHandler(this.buttonItem10_Click); - // - // buttonItem11 - // - this.buttonItem11.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__72; - this.buttonItem11.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem11.Name = "buttonItem11"; - this.buttonItem11.SubItemsExpandWidth = 14; - this.buttonItem11.Text = "事件管理"; - this.buttonItem11.Click += new System.EventHandler(this.buttonItem11_Click); - // - // buttonItem12 - // - this.buttonItem12.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__34; - this.buttonItem12.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem12.Name = "buttonItem12"; - this.buttonItem12.SubItemsExpandWidth = 14; - this.buttonItem12.Text = "探测仪管理"; - this.buttonItem12.Click += new System.EventHandler(this.buttonItem12_Click); - // - // buttonItem13 - // - this.buttonItem13.Image = global::Cyberpipe.Properties.Resources._24x24icon_13_hover; - this.buttonItem13.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem13.Name = "buttonItem13"; - this.buttonItem13.SubItemsExpandWidth = 14; - this.buttonItem13.Text = "巡检人员维护"; - this.buttonItem13.Click += new System.EventHandler(this.buttonItem13_Click); - // - // buttonItem14 - // - this.buttonItem14.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__56; - this.buttonItem14.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem14.Name = "buttonItem14"; - this.buttonItem14.SubItemsExpandWidth = 14; - this.buttonItem14.Text = "导出施工图"; - this.buttonItem14.Click += new System.EventHandler(this.buttonItem14_Click); - // // ribbonPanel2 // this.ribbonPanel2.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; this.ribbonPanel2.Controls.Add(this.ribbonBar3); this.ribbonPanel2.Dock = System.Windows.Forms.DockStyle.Fill; - this.ribbonPanel2.Location = new System.Drawing.Point(0, 33); + this.ribbonPanel2.Location = new System.Drawing.Point(0, 0); this.ribbonPanel2.Name = "ribbonPanel2"; this.ribbonPanel2.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); - this.ribbonPanel2.Size = new System.Drawing.Size(1328, 62); + this.ribbonPanel2.Size = new System.Drawing.Size(1328, 95); // // // @@ -3527,7 +2948,7 @@ this.buttonItemPasswordReset}); this.ribbonBar3.Location = new System.Drawing.Point(3, 0); this.ribbonBar3.Name = "ribbonBar3"; - this.ribbonBar3.Size = new System.Drawing.Size(551, 59); + this.ribbonBar3.Size = new System.Drawing.Size(551, 92); this.ribbonBar3.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; this.ribbonBar3.TabIndex = 1; // @@ -3567,6 +2988,7 @@ this.btn_resc_info.Name = "btn_resc_info"; this.btn_resc_info.SubItemsExpandWidth = 14; this.btn_resc_info.Text = "资源管理"; + this.btn_resc_info.Visible = false; this.btn_resc_info.Click += new System.EventHandler(this.btn_resc_info_Click); // // btn_role_resc @@ -3605,6 +3027,605 @@ this.buttonItemPasswordReset.Text = "重置密码"; this.buttonItemPasswordReset.Click += new System.EventHandler(this.buttonItemPasswordReset_Click); // + // ribbonPanel6 + // + this.ribbonPanel6.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.ribbonPanel6.Controls.Add(this.ribbonBar6); + this.ribbonPanel6.Dock = System.Windows.Forms.DockStyle.Fill; + this.ribbonPanel6.Location = new System.Drawing.Point(0, 0); + this.ribbonPanel6.Name = "ribbonPanel6"; + this.ribbonPanel6.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); + this.ribbonPanel6.Size = new System.Drawing.Size(1328, 95); + // + // + // + this.ribbonPanel6.Style.Class = ""; + this.ribbonPanel6.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonPanel6.StyleMouseDown.Class = ""; + this.ribbonPanel6.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonPanel6.StyleMouseOver.Class = ""; + this.ribbonPanel6.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonPanel6.TabIndex = 38; + this.ribbonPanel6.Visible = false; + // + // ribbonBar6 + // + this.ribbonBar6.AutoOverflowEnabled = true; + // + // + // + this.ribbonBar6.BackgroundMouseOverStyle.Class = ""; + this.ribbonBar6.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonBar6.BackgroundStyle.Class = ""; + this.ribbonBar6.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar6.ContainerControlProcessDialogKey = true; + this.ribbonBar6.Dock = System.Windows.Forms.DockStyle.Left; + this.ribbonBar6.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { + this.buttonItemSPSZ, + this.buttonItem8, + this.buttonItemLocation, + this.sliderItem2, + this.buttonItemGBJC}); + this.ribbonBar6.Location = new System.Drawing.Point(3, 0); + this.ribbonBar6.Name = "ribbonBar6"; + this.ribbonBar6.Size = new System.Drawing.Size(427, 92); + this.ribbonBar6.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.ribbonBar6.TabIndex = 0; + // + // + // + this.ribbonBar6.TitleStyle.Class = ""; + this.ribbonBar6.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonBar6.TitleStyleMouseOver.Class = ""; + this.ribbonBar6.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar6.TitleVisible = false; + // + // buttonItemSPSZ + // + this.buttonItemSPSZ.Image = ((System.Drawing.Image)(resources.GetObject("buttonItemSPSZ.Image"))); + this.buttonItemSPSZ.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItemSPSZ.Name = "buttonItemSPSZ"; + this.buttonItemSPSZ.SubItemsExpandWidth = 14; + this.buttonItemSPSZ.Text = "双屏设置"; + this.buttonItemSPSZ.Click += new System.EventHandler(this.buttonItemSPSZ_Click); + // + // buttonItem8 + // + this.buttonItem8.Image = ((System.Drawing.Image)(resources.GetObject("buttonItem8.Image"))); + this.buttonItem8.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem8.Name = "buttonItem8"; + this.buttonItem8.SubItemsExpandWidth = 14; + this.buttonItem8.Text = "双屏分析"; + this.buttonItem8.Click += new System.EventHandler(this.buttonItem8_Click); + // + // buttonItemLocation + // + this.buttonItemLocation.Image = ((System.Drawing.Image)(resources.GetObject("buttonItemLocation.Image"))); + this.buttonItemLocation.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItemLocation.Name = "buttonItemLocation"; + this.buttonItemLocation.SubItemsExpandWidth = 14; + this.buttonItemLocation.Text = "快速定位"; + this.buttonItemLocation.Click += new System.EventHandler(this.buttonItemLocation_Click); + // + // sliderItem2 + // + this.sliderItem2.LabelPosition = DevComponents.DotNetBar.eSliderLabelPosition.Top; + this.sliderItem2.LabelWidth = 50; + this.sliderItem2.Name = "sliderItem2"; + this.sliderItem2.Text = "地面透明度"; + this.sliderItem2.TextColor = System.Drawing.Color.Black; + this.sliderItem2.Value = 0; + this.sliderItem2.ValueChanged += new System.EventHandler(this.sliderItem2_ValueChanged); + // + // buttonItemGBJC + // + this.buttonItemGBJC.Image = ((System.Drawing.Image)(resources.GetObject("buttonItemGBJC.Image"))); + this.buttonItemGBJC.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItemGBJC.Name = "buttonItemGBJC"; + this.buttonItemGBJC.SubItemsExpandWidth = 14; + this.buttonItemGBJC.Text = "国标检测"; + this.buttonItemGBJC.Click += new System.EventHandler(this.buttonItemGBJC_Click); + // + // ribbonPanel5 + // + this.ribbonPanel5.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.ribbonPanel5.Controls.Add(this.ribbonBar2); + this.ribbonPanel5.Dock = System.Windows.Forms.DockStyle.Fill; + this.ribbonPanel5.Location = new System.Drawing.Point(0, 33); + this.ribbonPanel5.Name = "ribbonPanel5"; + this.ribbonPanel5.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); + this.ribbonPanel5.Size = new System.Drawing.Size(1328, 62); + // + // + // + this.ribbonPanel5.Style.Class = ""; + this.ribbonPanel5.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonPanel5.StyleMouseDown.Class = ""; + this.ribbonPanel5.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonPanel5.StyleMouseOver.Class = ""; + this.ribbonPanel5.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonPanel5.TabIndex = 37; + this.ribbonPanel5.Visible = false; + // + // ribbonBar2 + // + this.ribbonBar2.AutoOverflowEnabled = true; + // + // + // + this.ribbonBar2.BackgroundMouseOverStyle.Class = ""; + this.ribbonBar2.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonBar2.BackgroundStyle.Class = ""; + this.ribbonBar2.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar2.ContainerControlProcessDialogKey = true; + this.ribbonBar2.Dock = System.Windows.Forms.DockStyle.Left; + this.ribbonBar2.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { + this.buttonItemHX1, + this.buttonItemHX2, + this.buttonItemDCTP, + this.sliderItem3}); + this.ribbonBar2.Location = new System.Drawing.Point(3, 0); + this.ribbonBar2.Name = "ribbonBar2"; + this.ribbonBar2.Size = new System.Drawing.Size(350, 59); + this.ribbonBar2.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.ribbonBar2.TabIndex = 0; + // + // + // + this.ribbonBar2.TitleStyle.Class = ""; + this.ribbonBar2.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonBar2.TitleStyleMouseOver.Class = ""; + this.ribbonBar2.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar2.TitleVisible = false; + // + // buttonItemHX1 + // + this.buttonItemHX1.AutoExpandOnClick = true; + this.buttonItemHX1.Image = ((System.Drawing.Image)(resources.GetObject("buttonItemHX1.Image"))); + this.buttonItemHX1.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItemHX1.Name = "buttonItemHX1"; + this.buttonItemHX1.SubItemsExpandWidth = 14; + this.buttonItemHX1.Text = "导入红线"; + this.buttonItemHX1.Click += new System.EventHandler(this.buttonItemHX1_Click); + // + // buttonItemHX2 + // + this.buttonItemHX2.Image = ((System.Drawing.Image)(resources.GetObject("buttonItemHX2.Image"))); + this.buttonItemHX2.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItemHX2.Name = "buttonItemHX2"; + this.buttonItemHX2.SubItemsExpandWidth = 14; + this.buttonItemHX2.Text = "红线审核"; + this.buttonItemHX2.Click += new System.EventHandler(this.buttonItemHX2_Click); + // + // buttonItemDCTP + // + this.buttonItemDCTP.Image = ((System.Drawing.Image)(resources.GetObject("buttonItemDCTP.Image"))); + this.buttonItemDCTP.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItemDCTP.Name = "buttonItemDCTP"; + this.buttonItemDCTP.SubItemsExpandWidth = 14; + this.buttonItemDCTP.Text = "导出图片"; + this.buttonItemDCTP.Click += new System.EventHandler(this.buttonItemDCTP_Click); + // + // sliderItem3 + // + this.sliderItem3.LabelPosition = DevComponents.DotNetBar.eSliderLabelPosition.Top; + this.sliderItem3.LabelWidth = 50; + this.sliderItem3.Name = "sliderItem3"; + this.sliderItem3.Text = "地面透明度"; + this.sliderItem3.TextColor = System.Drawing.Color.Black; + this.sliderItem3.Value = 0; + this.sliderItem3.ValueChanged += new System.EventHandler(this.sliderItem3_ValueChanged); + // + // ribbonPanel1 + // + this.ribbonPanel1.AutoSize = true; + this.ribbonPanel1.CanvasColor = System.Drawing.Color.Gray; + this.ribbonPanel1.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.ribbonPanel1.Controls.Add(this.ribbonBar21); + this.ribbonPanel1.Dock = System.Windows.Forms.DockStyle.Fill; + this.ribbonPanel1.Location = new System.Drawing.Point(0, 33); + this.ribbonPanel1.Name = "ribbonPanel1"; + this.ribbonPanel1.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); + this.ribbonPanel1.Size = new System.Drawing.Size(1328, 62); + // + // + // + this.ribbonPanel1.Style.Class = ""; + this.ribbonPanel1.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonPanel1.StyleMouseDown.Class = ""; + this.ribbonPanel1.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonPanel1.StyleMouseOver.Class = ""; + this.ribbonPanel1.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonPanel1.TabIndex = 1; + this.ribbonPanel1.Visible = false; + // + // ribbonBar21 + // + this.ribbonBar21.AutoOverflowEnabled = true; + this.ribbonBar21.BackColor = System.Drawing.Color.White; + // + // + // + this.ribbonBar21.BackgroundMouseOverStyle.Class = ""; + this.ribbonBar21.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonBar21.BackgroundStyle.Class = ""; + this.ribbonBar21.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar21.ContainerControlProcessDialogKey = true; + this.ribbonBar21.Dock = System.Windows.Forms.DockStyle.Left; + this.ribbonBar21.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { + this.buttonItem87, + this.buttonItem88, + this.buttonItem27, + this.sliderGroundTransSet1, + this.buttonItem91, + this.buttonItem1, + this.btnlegendSet, + this.buttonItem89, + this.btnOutputJPG}); + this.ribbonBar21.Location = new System.Drawing.Point(3, 0); + this.ribbonBar21.Name = "ribbonBar21"; + this.ribbonBar21.Size = new System.Drawing.Size(649, 59); + this.ribbonBar21.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.ribbonBar21.TabIndex = 2; + this.ribbonBar21.Text = "浏览模式"; + // + // + // + this.ribbonBar21.TitleStyle.Class = ""; + this.ribbonBar21.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonBar21.TitleStyleMouseOver.Class = ""; + this.ribbonBar21.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar21.TitleVisible = false; + // + // buttonItem87 + // + this.buttonItem87.Image = ((System.Drawing.Image)(resources.GetObject("buttonItem87.Image"))); + this.buttonItem87.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem87.Name = "buttonItem87"; + this.buttonItem87.SubItemsExpandWidth = 14; + this.buttonItem87.Text = "地上模式"; + this.buttonItem87.Click += new System.EventHandler(this.buttonItem87_Click); + // + // buttonItem88 + // + this.buttonItem88.Image = ((System.Drawing.Image)(resources.GetObject("buttonItem88.Image"))); + this.buttonItem88.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem88.Name = "buttonItem88"; + this.buttonItem88.SubItemsExpandWidth = 14; + this.buttonItem88.Text = "地下模式"; + this.buttonItem88.Click += new System.EventHandler(this.buttonItem88_Click); + // + // buttonItem27 + // + this.buttonItem27.Image = ((System.Drawing.Image)(resources.GetObject("buttonItem27.Image"))); + this.buttonItem27.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem27.Name = "buttonItem27"; + this.buttonItem27.SubItemsExpandWidth = 14; + this.buttonItem27.Text = "行走模式"; + this.buttonItem27.Click += new System.EventHandler(this.buttonItem27_Click); + // + // buttonItem91 + // + this.buttonItem91.ForeColor = System.Drawing.Color.Black; + this.buttonItem91.Image = ((System.Drawing.Image)(resources.GetObject("buttonItem91.Image"))); + this.buttonItem91.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem91.Name = "buttonItem91"; + this.buttonItem91.SubItemsExpandWidth = 14; + this.buttonItem91.Text = "快速定位"; + this.buttonItem91.Click += new System.EventHandler(this.buttonItem91_Click); + // + // buttonItem1 + // + this.buttonItem1.Image = ((System.Drawing.Image)(resources.GetObject("buttonItem1.Image"))); + this.buttonItem1.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem1.Name = "buttonItem1"; + this.buttonItem1.SubItemsExpandWidth = 14; + this.buttonItem1.Text = "图层管理"; + this.buttonItem1.Click += new System.EventHandler(this.buttonItem1_Click); + // + // btnlegendSet + // + this.btnlegendSet.Image = ((System.Drawing.Image)(resources.GetObject("btnlegendSet.Image"))); + this.btnlegendSet.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.btnlegendSet.Name = "btnlegendSet"; + this.btnlegendSet.SubItemsExpandWidth = 14; + this.btnlegendSet.Text = "图例"; + this.btnlegendSet.Click += new System.EventHandler(this.btnlegendSet_Click); + // + // buttonItem89 + // + this.buttonItem89.Image = ((System.Drawing.Image)(resources.GetObject("buttonItem89.Image"))); + this.buttonItem89.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem89.Name = "buttonItem89"; + this.buttonItem89.SubItemsExpandWidth = 14; + this.buttonItem89.Text = "全屏显示"; + this.buttonItem89.Click += new System.EventHandler(this.buttonItem89_Click); + // + // btnOutputJPG + // + this.btnOutputJPG.Image = ((System.Drawing.Image)(resources.GetObject("btnOutputJPG.Image"))); + this.btnOutputJPG.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.btnOutputJPG.Name = "btnOutputJPG"; + this.btnOutputJPG.SubItemsExpandWidth = 14; + this.btnOutputJPG.Text = "导出图片"; + this.btnOutputJPG.Click += new System.EventHandler(this.btnOutputJPG_Click); + // + // ribbonPanel12 + // + this.ribbonPanel12.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.ribbonPanel12.Controls.Add(this.ribbonBar18); + this.ribbonPanel12.Controls.Add(this.ribbonBar13); + this.ribbonPanel12.Dock = System.Windows.Forms.DockStyle.Fill; + this.ribbonPanel12.Location = new System.Drawing.Point(0, 33); + this.ribbonPanel12.Name = "ribbonPanel12"; + this.ribbonPanel12.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); + this.ribbonPanel12.Size = new System.Drawing.Size(1328, 62); + // + // + // + this.ribbonPanel12.Style.Class = ""; + this.ribbonPanel12.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonPanel12.StyleMouseDown.Class = ""; + this.ribbonPanel12.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonPanel12.StyleMouseOver.Class = ""; + this.ribbonPanel12.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonPanel12.TabIndex = 34; + this.ribbonPanel12.Visible = false; + // + // ribbonBar18 + // + this.ribbonBar18.AutoOverflowEnabled = true; + // + // + // + this.ribbonBar18.BackgroundMouseOverStyle.Class = ""; + this.ribbonBar18.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonBar18.BackgroundStyle.Class = ""; + this.ribbonBar18.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar18.ContainerControlProcessDialogKey = true; + this.ribbonBar18.Dock = System.Windows.Forms.DockStyle.Left; + this.ribbonBar18.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { + this.buttonItem133, + this.buttonItem132}); + this.ribbonBar18.Location = new System.Drawing.Point(508, 0); + this.ribbonBar18.Name = "ribbonBar18"; + this.ribbonBar18.Size = new System.Drawing.Size(75, 59); + this.ribbonBar18.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.ribbonBar18.TabIndex = 1; + // + // + // + this.ribbonBar18.TitleStyle.Class = ""; + this.ribbonBar18.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonBar18.TitleStyleMouseOver.Class = ""; + this.ribbonBar18.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar18.TitleVisible = false; + // + // buttonItem133 + // + this.buttonItem133.Image = ((System.Drawing.Image)(resources.GetObject("buttonItem133.Image"))); + this.buttonItem133.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem133.Name = "buttonItem133"; + this.buttonItem133.SubItemsExpandWidth = 14; + this.buttonItem133.Text = "审核入库"; + this.buttonItem133.Click += new System.EventHandler(this.buttonItem133_Click_1); + // + // buttonItem132 + // + this.buttonItem132.Name = "buttonItem132"; + // + // ribbonBar13 + // + this.ribbonBar13.AutoOverflowEnabled = true; + // + // + // + this.ribbonBar13.BackgroundMouseOverStyle.Class = ""; + this.ribbonBar13.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonBar13.BackgroundStyle.Class = ""; + this.ribbonBar13.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar13.ContainerControlProcessDialogKey = true; + this.ribbonBar13.Dock = System.Windows.Forms.DockStyle.Left; + this.ribbonBar13.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { + this.buttonItem127, + this.buttonItem128, + this.sliderItem1, + this.buttonItem134, + this.buttonItem130, + this.btn_check_history}); + this.ribbonBar13.Location = new System.Drawing.Point(3, 0); + this.ribbonBar13.Name = "ribbonBar13"; + this.ribbonBar13.Size = new System.Drawing.Size(505, 59); + this.ribbonBar13.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.ribbonBar13.TabIndex = 0; + // + // + // + this.ribbonBar13.TitleStyle.Class = ""; + this.ribbonBar13.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonBar13.TitleStyleMouseOver.Class = ""; + this.ribbonBar13.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar13.TitleVisible = false; + // + // buttonItem127 + // + this.buttonItem127.Image = ((System.Drawing.Image)(resources.GetObject("buttonItem127.Image"))); + this.buttonItem127.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem127.Name = "buttonItem127"; + this.buttonItem127.SubItemsExpandWidth = 14; + this.buttonItem127.Text = "打开数据"; + this.buttonItem127.Click += new System.EventHandler(this.buttonItem127_Click_2); + // + // buttonItem128 + // + this.buttonItem128.Image = ((System.Drawing.Image)(resources.GetObject("buttonItem128.Image"))); + this.buttonItem128.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem128.Name = "buttonItem128"; + this.buttonItem128.SubItemsExpandWidth = 14; + this.buttonItem128.Text = "一键审核"; + this.buttonItem128.Click += new System.EventHandler(this.buttonItem128_Click); + // + // sliderItem1 + // + this.sliderItem1.LabelPosition = DevComponents.DotNetBar.eSliderLabelPosition.Top; + this.sliderItem1.LabelWidth = 50; + this.sliderItem1.Name = "sliderItem1"; + this.sliderItem1.Text = "地面透明度"; + this.sliderItem1.TextColor = System.Drawing.Color.Black; + this.sliderItem1.Value = 0; + this.sliderItem1.ValueChanged += new System.EventHandler(this.sliderItem1_ValueChanged); + // + // buttonItem134 + // + this.buttonItem134.Image = ((System.Drawing.Image)(resources.GetObject("buttonItem134.Image"))); + this.buttonItem134.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem134.Name = "buttonItem134"; + this.buttonItem134.SubItemsExpandWidth = 14; + this.buttonItem134.Text = "模拟设计修改"; + this.buttonItem134.Click += new System.EventHandler(this.buttonItem134_Click_1); + // + // buttonItem130 + // + this.buttonItem130.Image = ((System.Drawing.Image)(resources.GetObject("buttonItem130.Image"))); + this.buttonItem130.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem130.Name = "buttonItem130"; + this.buttonItem130.SubItemsExpandWidth = 14; + this.buttonItem130.Text = "导出审核图"; + this.buttonItem130.Click += new System.EventHandler(this.buttonItem130_Click_1); + // + // btn_check_history + // + this.btn_check_history.Image = ((System.Drawing.Image)(resources.GetObject("btn_check_history.Image"))); + this.btn_check_history.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.btn_check_history.Name = "btn_check_history"; + this.btn_check_history.SubItemsExpandWidth = 14; + this.btn_check_history.Text = "审核历史"; + this.btn_check_history.Click += new System.EventHandler(this.btn_check_history_Click); + // + // ribbonPanel4 + // + this.ribbonPanel4.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.ribbonPanel4.Controls.Add(this.ribbonBar1); + this.ribbonPanel4.Dock = System.Windows.Forms.DockStyle.Fill; + this.ribbonPanel4.Location = new System.Drawing.Point(0, 33); + this.ribbonPanel4.Name = "ribbonPanel4"; + this.ribbonPanel4.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); + this.ribbonPanel4.Size = new System.Drawing.Size(1328, 62); + // + // + // + this.ribbonPanel4.Style.Class = ""; + this.ribbonPanel4.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonPanel4.StyleMouseDown.Class = ""; + this.ribbonPanel4.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonPanel4.StyleMouseOver.Class = ""; + this.ribbonPanel4.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonPanel4.TabIndex = 36; + this.ribbonPanel4.Visible = false; + // + // ribbonBar1 + // + this.ribbonBar1.AutoOverflowEnabled = true; + // + // + // + this.ribbonBar1.BackgroundMouseOverStyle.Class = ""; + this.ribbonBar1.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonBar1.BackgroundStyle.Class = ""; + this.ribbonBar1.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar1.ContainerControlProcessDialogKey = true; + this.ribbonBar1.Dock = System.Windows.Forms.DockStyle.Left; + this.ribbonBar1.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { + this.btn_document_info}); + this.ribbonBar1.Location = new System.Drawing.Point(3, 0); + this.ribbonBar1.Name = "ribbonBar1"; + this.ribbonBar1.Size = new System.Drawing.Size(88, 59); + this.ribbonBar1.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.ribbonBar1.TabIndex = 0; + // + // + // + this.ribbonBar1.TitleStyle.Class = ""; + this.ribbonBar1.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonBar1.TitleStyleMouseOver.Class = ""; + this.ribbonBar1.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar1.TitleVisible = false; + // + // btn_document_info + // + this.btn_document_info.Image = ((System.Drawing.Image)(resources.GetObject("btn_document_info.Image"))); + this.btn_document_info.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.btn_document_info.Name = "btn_document_info"; + this.btn_document_info.SubItemsExpandWidth = 14; + this.btn_document_info.Text = "文档管理"; + this.btn_document_info.Click += new System.EventHandler(this.btn_document_info_Click); + // // ribbonTabItem1 // this.ribbonTabItem1.ButtonStyle = DevComponents.DotNetBar.eButtonStyle.ImageAndText; @@ -3673,7 +3694,6 @@ this.ribbonTabItem7.Name = "ribbonTabItem7"; this.ribbonTabItem7.Panel = this.ribbonPanel7; this.ribbonTabItem7.Text = "管线定位"; - this.ribbonTabItem7.MouseDown += new System.Windows.Forms.MouseEventHandler(this.ribbonTabItem7_MouseDown); // // ribbonTabItem5 // @@ -3684,7 +3704,6 @@ this.ribbonTabItem5.Name = "ribbonTabItem5"; this.ribbonTabItem5.Panel = this.ribbonPanel3; this.ribbonTabItem5.Text = "标识器管理"; - this.ribbonTabItem5.MouseDown += new System.Windows.Forms.MouseEventHandler(this.ribbonTabItem5_MouseDown); // // ribbonTabItem2 // @@ -4451,7 +4470,7 @@ this.dataGridViewX2.ReadOnly = true; this.dataGridViewX2.RowHeadersVisible = false; this.dataGridViewX2.RowTemplate.Height = 23; - this.dataGridViewX2.Size = new System.Drawing.Size(31081, 92); + this.dataGridViewX2.Size = new System.Drawing.Size(31378, 92); this.dataGridViewX2.TabIndex = 11; // // dataGridViewTextBoxColumn10 @@ -4545,7 +4564,7 @@ this.dataGridViewX3.ReadOnly = true; this.dataGridViewX3.RowHeadersVisible = false; this.dataGridViewX3.RowTemplate.Height = 23; - this.dataGridViewX3.Size = new System.Drawing.Size(31080, 127); + this.dataGridViewX3.Size = new System.Drawing.Size(31377, 127); this.dataGridViewX3.TabIndex = 5; this.dataGridViewX3.MouseDoubleClick += new System.Windows.Forms.MouseEventHandler(this.dataGridViewX3_MouseDoubleClick); // @@ -5722,7 +5741,8 @@ // pictureBox1 // this.pictureBox1.Dock = System.Windows.Forms.DockStyle.Top; - this.pictureBox1.Image = ((System.Drawing.Image)(resources.GetObject("pictureBox1.Image"))); +// this.pictureBox1.Image = ((System.Drawing.Image)(resources.GetObject("pictureBox1.Image"))); + this.pictureBox1.Image = Image.FromFile(Application.StartupPath + Utility.TitleImagePath); this.pictureBox1.Location = new System.Drawing.Point(0, 0); this.pictureBox1.Margin = new System.Windows.Forms.Padding(0); this.pictureBox1.Name = "pictureBox1"; @@ -5732,18 +5752,6 @@ this.pictureBox1.TabStop = false; this.pictureBox1.Paint += new System.Windows.Forms.PaintEventHandler(this.pictureBox1_Paint); // - // layerTree - // - this.layerTree.CheckBoxes = true; - this.layerTree.ItemHeight = 18; - this.layerTree.Location = new System.Drawing.Point(30, 78); - this.layerTree.Name = "layerTree"; - this.layerTree.Size = new System.Drawing.Size(121, 97); - this.layerTree.TabIndex = 1; - this.layerTree.AfterCheck += new System.Windows.Forms.TreeViewEventHandler(this.layerTree_AfterCheck); - this.layerTree.NodeMouseClick += new System.Windows.Forms.TreeNodeMouseClickEventHandler(this.layerTree_NodeMouseClick); - this.layerTree.NodeMouseDoubleClick += new System.Windows.Forms.TreeNodeMouseClickEventHandler(this.layerTree_NodeMouseDoubleClick); - // // MainFrm // this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Inherit; @@ -5770,7 +5778,8 @@ this.KeyPreview = true; this.Name = "MainFrm"; this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen; - this.Text = "智慧太湖新城管网规划分析系统6.0"; +// this.Text = "智慧太湖新城管网规划分析系统6.0"; + this.Text = Utility.SysnameVersion; this.WindowState = System.Windows.Forms.FormWindowState.Maximized; this.FormClosing += new System.Windows.Forms.FormClosingEventHandler(this.MainFrm_FormClosing); this.Load += new System.EventHandler(this.MainFrm_Load); @@ -5787,15 +5796,15 @@ this.contextMenuStripDeleteLayerNode.ResumeLayout(false); this.ribbonControl1.ResumeLayout(false); this.ribbonControl1.PerformLayout(); + this.ribbonPanel3.ResumeLayout(false); + this.ribbonPanel7.ResumeLayout(false); + this.ribbonPanel15.ResumeLayout(false); + this.ribbonPanel2.ResumeLayout(false); this.ribbonPanel6.ResumeLayout(false); this.ribbonPanel5.ResumeLayout(false); this.ribbonPanel1.ResumeLayout(false); this.ribbonPanel12.ResumeLayout(false); this.ribbonPanel4.ResumeLayout(false); - this.ribbonPanel15.ResumeLayout(false); - this.ribbonPanel3.ResumeLayout(false); - this.ribbonPanel7.ResumeLayout(false); - this.ribbonPanel2.ResumeLayout(false); this.panelOfTable.ResumeLayout(false); this.panelOfTable.PerformLayout(); ((System.ComponentModel.ISupportInitialize)(this.dataGridViewX1)).EndInit(); @@ -5955,6 +5964,7 @@ private RibbonTabItem ribbonTabItem11; private ButtonItem buttonItem130; private RibbonBar ribbonBar18; + private ButtonItem buttonItem132; private SliderItem sliderItem1; private ButtonItem buttonItem133; private ButtonItem buttonItem134; diff --git a/MainFrm.resx b/MainFrm.resx index 9f9bba4..ce490c1 100644 --- a/MainFrm.resx +++ b/MainFrm.resx @@ -351,6 +351,146 @@ 766, 54 + + + iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 + YQUAAAAZdEVYdFNvZnR3YXJlAEFkb2JlIEltYWdlUmVhZHlxyWU8AAADZmlUWHRYTUw6Y29tLmFkb2Jl + LnhtcAAAAAAAPD94cGFja2V0IGJlZ2luPSLvu78iIGlkPSJXNU0wTXBDZWhpSHpyZVN6TlRjemtjOWQi + Pz4gPHg6eG1wbWV0YSB4bWxuczp4PSJhZG9iZTpuczptZXRhLyIgeDp4bXB0az0iQWRvYmUgWE1QIENv + cmUgNS4zLWMwMTEgNjYuMTQ1NjYxLCAyMDEyLzAyLzA2LTE0OjU2OjI3ICAgICAgICAiPiA8cmRmOlJE + RiB4bWxuczpyZGY9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkvMDIvMjItcmRmLXN5bnRheC1ucyMiPiA8 + cmRmOkRlc2NyaXB0aW9uIHJkZjphYm91dD0iIiB4bWxuczp4bXBNTT0iaHR0cDovL25zLmFkb2JlLmNv + bS94YXAvMS4wL21tLyIgeG1sbnM6c3RSZWY9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlw + ZS9SZXNvdXJjZVJlZiMiIHhtbG5zOnhtcD0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wLyIgeG1w + TU06T3JpZ2luYWxEb2N1bWVudElEPSJ4bXAuZGlkOjYzQTM5NEY4Mjg0OUU0MTE5NDBEQTc4ODZEQzk5 + N0NGIiB4bXBNTTpEb2N1bWVudElEPSJ4bXAuZGlkOjEwQ0IxNzBBNEM1QzExRTRBNkNGQzRBMjhDQzI0 + MkY4IiB4bXBNTTpJbnN0YW5jZUlEPSJ4bXAuaWlkOjEwQ0IxNzA5NEM1QzExRTRBNkNGQzRBMjhDQzI0 + MkY4IiB4bXA6Q3JlYXRvclRvb2w9IkFkb2JlIFBob3Rvc2hvcCBDUzYgKFdpbmRvd3MpIj4gPHhtcE1N + OkRlcml2ZWRGcm9tIHN0UmVmOmluc3RhbmNlSUQ9InhtcC5paWQ6NTEzMDNDMjA1QjRDRTQxMTg4NERE + MUVBOEQ4QTgyNTUiIHN0UmVmOmRvY3VtZW50SUQ9InhtcC5kaWQ6NjNBMzk0RjgyODQ5RTQxMTk0MERB + Nzg4NkRDOTk3Q0YiLz4gPC9yZGY6RGVzY3JpcHRpb24+IDwvcmRmOlJERj4gPC94OnhtcG1ldGE+IDw/ + eHBhY2tldCBlbmQ9InIiPz43wa2/AAAFaUlEQVRIS6WUC0xTVxzGKy0UkSmlFGjBFilSkNpSaAWRh63y + sIiAArKs4spLRLQoiEJlSMGoMCc6CBOnYHzMOHUqqOhEHOqCbjNu6kCd6KYje5mZ6KbObd/OuVL3cEzj + /skv997/+b7v39PTW9aj3/BM+OKxPEIZoW/gyrOuPbP+GvRPSNBQQqXYLwSW1etw7cYt5kqfaZ+uD8QM + Xg8f/f4UxGhHMHv4qlG6vAb9394G6T+BPpdV1oCuUx3VD8Q9XT8//PUJRMghlLhLg1C41IK+r/pB+oNC + 16mO6qmP+gdi/6y793+hwTYEk9uoQOSaStHzxQ2Q/nND9XMKy0D9NIfmDcSzaLhI4KXE7LwinLtwGXfu + PXhhqJ/m0DyS62EdUGWpqcf3P97DD3d++t/QnKraBjpghXWAiC+WN0ZNScOe1mP45vbdF2ZvWwdoDs/D + b6ejs6ecxHPoAG/l+Fhkzy+FyCcY0YkG7D/yAW5+d+e5oXrqo36aQ/McnNyjyAAuHWA05pfgzPlehhyT + mflV6FOMaDt2Ctf7bw8KXac6qqc+a4Zx3hLwRLJCZgcJjcPIEPkyIZmeX1SB7vOX0dn9KQy5jw8r8eVc + HOrsxidXP0d9hxlzd4QgeYMzEt7kQVvOR0pFFNpOHmd81E9znIS+dSTc1foVGWfNKUZjyy6Ex6SQl0cD + 09IVxHAFh0+cReqr+QjK8ERqEw+VHWOwoycSR/v1OHwzDlsvhcNCeqkbedAYxQiPm87kZOQVw0nkW0QG + 2DFnIA+JRm3DFpzr/RKNW3ZDE5UAsX8ocizZiFs7DEUHvPFunw4Hb05B+y09jn49lYHe0x5doxqqLVlf + DJrnyB+pIQNs6QAhf6R8tZu3CqpwPdZu2I6PLl3HwnV5iHv9JVSeUOKdqzq81xeDvddiYG73R0aLEIZm + IRa1jUbjxQnYRHa17YqW0VJPwHT3LocRbirrDiymspXo6L6AgiXV8JSNQ2i6GpNWOqK4U4n1n0Vge68W + 9ecmIKnBBSqDCIp4P2RWGDB/QxqS6l1QcToIld3BqDobgsXEQ73+Se5HrGcgdJEokGzIx66DXXi7dRvC + yx2Q2RqApR+GoPbjCag8pUZ6sxjqWRKEldljRr07ZjaKmHt5qpBZKzkeiIJ2BbIPKmA8MIbJUC/ghrM0 + RfYsDtdhqJNIVulK/ku0BQokbfZGZrsKBR3BmEsMOfvl0FY7o7ypDPo1brCcGc+QUCdExabXEFsjQO4B + ObL2BSBlqx8SWwibvBE0334nK3Ael+yEbIW81DZszlhZ2oieuAYvpO5VIHGzP9J2+CN9pz/CzDwExMox + eZUbFnZpkEc+gLZagJjMWOiqXZDVqmC0+kZf6Nb4IHKFCPIsu92sgCw7BlJswjBJLCdenmuPyFUS6Gp9 + oG/yRdJWGSKqhYjKDgLRImK5ACGlzsy9d/zwXn2DBMZDSkZLPaHlnpBncyGO5kxj+Rps/wYdJE2xzfOb + zcU4sye0b0gRu3E0Ypt8ELTICRFGNcShUgjHuZyWxNu2096sdiXS9o1ltNQjyyDhes4SkuXEGpXC+Ve8 + kjlzpDPtoCkVQrdOihgyIHmXP6LryGEX86Ba6ISJNR7IeF+JV8gAfbOM0XoTj8dktpmEOxM4rJHTBscz + njNNnMiBagEfU98ajRnbZMg7GojCk2oGU1cw5nUGw7BHAZWJD6oVhLFzSDCPCacljGP/J7xAm6Hu0ew6 + STIXkcvckN7ig8XHVCjvUiNvdwAmW0Twms6FayS7meM4REoihxPoeT4u10nsZ0LKhhdsIxZEsVcLtOyL + pHffVcd+IJjI7uGHsRscJEPURMMn2FMtNTwuFusPrjFl48ji7nIAAAAASUVORK5CYII= + + + + + iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 + YQUAAAAZdEVYdFNvZnR3YXJlAEFkb2JlIEltYWdlUmVhZHlxyWU8AAADZmlUWHRYTUw6Y29tLmFkb2Jl + LnhtcAAAAAAAPD94cGFja2V0IGJlZ2luPSLvu78iIGlkPSJXNU0wTXBDZWhpSHpyZVN6TlRjemtjOWQi + Pz4gPHg6eG1wbWV0YSB4bWxuczp4PSJhZG9iZTpuczptZXRhLyIgeDp4bXB0az0iQWRvYmUgWE1QIENv + cmUgNS4zLWMwMTEgNjYuMTQ1NjYxLCAyMDEyLzAyLzA2LTE0OjU2OjI3ICAgICAgICAiPiA8cmRmOlJE + RiB4bWxuczpyZGY9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkvMDIvMjItcmRmLXN5bnRheC1ucyMiPiA8 + cmRmOkRlc2NyaXB0aW9uIHJkZjphYm91dD0iIiB4bWxuczp4bXBNTT0iaHR0cDovL25zLmFkb2JlLmNv + bS94YXAvMS4wL21tLyIgeG1sbnM6c3RSZWY9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlw + ZS9SZXNvdXJjZVJlZiMiIHhtbG5zOnhtcD0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wLyIgeG1w + TU06T3JpZ2luYWxEb2N1bWVudElEPSJ4bXAuZGlkOjYzQTM5NEY4Mjg0OUU0MTE5NDBEQTc4ODZEQzk5 + N0NGIiB4bXBNTTpEb2N1bWVudElEPSJ4bXAuZGlkOkUyMTg3NjEyNDlEODExRTQ4NjNGQjM2Mzk1QkNB + RkQwIiB4bXBNTTpJbnN0YW5jZUlEPSJ4bXAuaWlkOkUyMTg3NjExNDlEODExRTQ4NjNGQjM2Mzk1QkNB + RkQwIiB4bXA6Q3JlYXRvclRvb2w9IkFkb2JlIFBob3Rvc2hvcCBDUzYgKFdpbmRvd3MpIj4gPHhtcE1N + OkRlcml2ZWRGcm9tIHN0UmVmOmluc3RhbmNlSUQ9InhtcC5paWQ6NkJCNTE0NDlEODQ5RTQxMUE0QzNB + MjdEOTJBQzc3QkMiIHN0UmVmOmRvY3VtZW50SUQ9InhtcC5kaWQ6NjNBMzk0RjgyODQ5RTQxMTk0MERB + Nzg4NkRDOTk3Q0YiLz4gPC9yZGY6RGVzY3JpcHRpb24+IDwvcmRmOlJERj4gPC94OnhtcG1ldGE+IDw/ + eHBhY2tldCBlbmQ9InIiPz5e5MstAAADiUlEQVRIS+2UW0yTdxjGcePwtYyVVpAUCi1tv9ImrVbxhAei + kjGphAgFT4jzEJ0gGuJhDk0sml0sglmWmC1hqHNKWwI4srgNh3phpjg1O1yIN5DMbFHQZUu42O76+D4f + 3Fl6Z7ILn+SXvH3f533++X/98iUBeKW81v9Uwx1G1+1240EhfKfdeE/4U3qTAqaZZO/2aeN9IXLrY+Ph + wVOZHll9YyohgYZOGS4JsYdXVDy+NQ8Tvy3BP6OlmPyjDP9OBDRYs8cZPfRy5/uQISIRqcIsLSye+j7I + wN+PluOvhyWY+NmL8fsOjP9kxdN7BRh/YJHfFjy5m48nd4ThQjy968bEgwV49usicFciTEKKFhZPXXv1 + eHxtLsYGPBjttwsWjF0xY+ybOfj9uylYs8cZPfQS7kpEnqDTwuLp9GYlfKZeifUfzcb1j/Iw/IkNv3Q6 + MfKVC6O9bg3W7HFGD73cORlMG5AIizDzAaVtunD5ESXWfNSEY/tNCO00oG1zOkJBBSeqUjVYh6R3Qmat + zSY0Hjah7IASW7hPuSoRvIGihcVTSauCppvFODRUjJZvPWgaKMTuXgt2RHOxLTwHDd3EjPfCudgesWJX + jxM7eryo7/Ni8SGFj8gp6LWwePLvS0Og043A5y5UdtkQOJeLivM5ePf8bJSfM04zG2u7chDoysW6Thsq + zqpY0+GAvymNB/gEgxYWT64tKdGihpSYv8WEpSEzVp0pwDuf2SVQReCiS4M1e5zRQy937NXJ1yRirjDz + AVmVJyNZa9+PObauh7ptKdR6FY6N2SisTYe1OlmDNXtqvRNqwxLYt1TCVLY1ZijZOSQRbuEtLSyeTOXH + sfLDH1EauoFFx6/Cd6Qf7pYI1ObLsO+9iMLdF+DccwEuqd2Nl+Br6sbCxiiKd/XBuPogH1HiAzJXHMC8 + YA98td1wb4rCuaEH1roo8oMR5JGaMPIFa10Ejtowiuouw1vzJTwVXyBz+X4ekPgRZfgbohkLtsfMy47B + tqYdakUnPFUM6YUv+LUGa/Y4o8e8rBXcSffWDkpE4j9ZpEvNmb9KsZV16BzrBnVq1YjeVf1MX1Tzn74o + iCmkdq1/LrNHOkfgB6Vg9afJRrVOdv2ClRkMmklvCnyPs4V8ge81v5RegddnCGHNHmf00JslcJcZCcWv + IU1pAhcyhLcFXj1zGtbscUYPvdyZ+Uv6Wi8rKekFBjoX2627by8AAAAASUVORK5CYII= + + + + + iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 + YQUAAAAZdEVYdFNvZnR3YXJlAEFkb2JlIEltYWdlUmVhZHlxyWU8AAADZmlUWHRYTUw6Y29tLmFkb2Jl + LnhtcAAAAAAAPD94cGFja2V0IGJlZ2luPSLvu78iIGlkPSJXNU0wTXBDZWhpSHpyZVN6TlRjemtjOWQi + Pz4gPHg6eG1wbWV0YSB4bWxuczp4PSJhZG9iZTpuczptZXRhLyIgeDp4bXB0az0iQWRvYmUgWE1QIENv + cmUgNS4zLWMwMTEgNjYuMTQ1NjYxLCAyMDEyLzAyLzA2LTE0OjU2OjI3ICAgICAgICAiPiA8cmRmOlJE + RiB4bWxuczpyZGY9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkvMDIvMjItcmRmLXN5bnRheC1ucyMiPiA8 + cmRmOkRlc2NyaXB0aW9uIHJkZjphYm91dD0iIiB4bWxuczp4bXBNTT0iaHR0cDovL25zLmFkb2JlLmNv + bS94YXAvMS4wL21tLyIgeG1sbnM6c3RSZWY9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlw + ZS9SZXNvdXJjZVJlZiMiIHhtbG5zOnhtcD0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wLyIgeG1w + TU06T3JpZ2luYWxEb2N1bWVudElEPSJ4bXAuZGlkOjYzQTM5NEY4Mjg0OUU0MTE5NDBEQTc4ODZEQzk5 + N0NGIiB4bXBNTTpEb2N1bWVudElEPSJ4bXAuZGlkOkE2Q0VGMDE2NDlEQTExRTQ4NTlCQTI3NTMyOEY5 + NEU2IiB4bXBNTTpJbnN0YW5jZUlEPSJ4bXAuaWlkOkE2Q0VGMDE1NDlEQTExRTQ4NTlCQTI3NTMyOEY5 + NEU2IiB4bXA6Q3JlYXRvclRvb2w9IkFkb2JlIFBob3Rvc2hvcCBDUzYgKFdpbmRvd3MpIj4gPHhtcE1N + OkRlcml2ZWRGcm9tIHN0UmVmOmluc3RhbmNlSUQ9InhtcC5paWQ6NjA1MjM3NzFEOTQ5RTQxMUE0QzNB + MjdEOTJBQzc3QkMiIHN0UmVmOmRvY3VtZW50SUQ9InhtcC5kaWQ6NjNBMzk0RjgyODQ5RTQxMTk0MERB + Nzg4NkRDOTk3Q0YiLz4gPC9yZGY6RGVzY3JpcHRpb24+IDwvcmRmOlJERj4gPC94OnhtcG1ldGE+IDw/ + eHBhY2tldCBlbmQ9InIiPz6UH16BAAABrElEQVRIS63N70tTURzH8fsnKSGCCEIQCBKISMq2iILCgQOL + JUxQAoVKdMGQuwgWFepsMGjFZCMuorsIJV4WFatpvzdr1ZAFsaIHn8559v1eDsI91wevJ/ee7/tjbMRH + fAFwJOWRF6oopTzyQhWlVEdBwRbgUhICAnuvilKGtXDGzW6WV/CvbjE/xTfxr+R6q4xSxtP5YTf8rVn4 + s5dG+809Rv5zvVVGKaNwfYgyBfhksoH83CCF9seiL7LBBnLXTlP4/W4dza0ZLS0nCdlgA9npAQq/qk/Q + sKa0NJ8nIBtsIBPrp9CqPMJBYVLLj+04ZIMNrF49ReHwVRafH1/R8m3zJmSDDdy/fJJC88Ua3mcjWurW + LGSDDaQifRS+O8uopsNaPhVnIBts4E64l0Jj5y4qDy5q+ZCPQTbYgHmph8LXZ0m8TJ3Xsp+LQjbYQOJC + N4XadgLl22e1vM1OQDbYwK1zXRS+lBbhmEHsLgU8kTeVh+OQDTawEDpB2U4mitfpMS22GYJssIH5QCcV + FGwBmuRtkA3cGO3whcZUlEdeqKKU8sgLVZRSfjw+MP4DJ2GPpDR9OIsAAAAASUVORK5CYII= + + + + + iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 + YQUAAAAZdEVYdFNvZnR3YXJlAEFkb2JlIEltYWdlUmVhZHlxyWU8AAADZmlUWHRYTUw6Y29tLmFkb2Jl + LnhtcAAAAAAAPD94cGFja2V0IGJlZ2luPSLvu78iIGlkPSJXNU0wTXBDZWhpSHpyZVN6TlRjemtjOWQi + Pz4gPHg6eG1wbWV0YSB4bWxuczp4PSJhZG9iZTpuczptZXRhLyIgeDp4bXB0az0iQWRvYmUgWE1QIENv + cmUgNS4zLWMwMTEgNjYuMTQ1NjYxLCAyMDEyLzAyLzA2LTE0OjU2OjI3ICAgICAgICAiPiA8cmRmOlJE + RiB4bWxuczpyZGY9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkvMDIvMjItcmRmLXN5bnRheC1ucyMiPiA8 + cmRmOkRlc2NyaXB0aW9uIHJkZjphYm91dD0iIiB4bWxuczp4bXBNTT0iaHR0cDovL25zLmFkb2JlLmNv + bS94YXAvMS4wL21tLyIgeG1sbnM6c3RSZWY9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlw + ZS9SZXNvdXJjZVJlZiMiIHhtbG5zOnhtcD0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wLyIgeG1w + TU06T3JpZ2luYWxEb2N1bWVudElEPSJ4bXAuZGlkOjYzQTM5NEY4Mjg0OUU0MTE5NDBEQTc4ODZEQzk5 + N0NGIiB4bXBNTTpEb2N1bWVudElEPSJ4bXAuZGlkOjJGRTU5OEQ1NDlEQjExRTRBRUVDOTkyMjQ5NzEw + REUwIiB4bXBNTTpJbnN0YW5jZUlEPSJ4bXAuaWlkOjJGRTU5OEQ0NDlEQjExRTRBRUVDOTkyMjQ5NzEw + REUwIiB4bXA6Q3JlYXRvclRvb2w9IkFkb2JlIFBob3Rvc2hvcCBDUzYgKFdpbmRvd3MpIj4gPHhtcE1N + OkRlcml2ZWRGcm9tIHN0UmVmOmluc3RhbmNlSUQ9InhtcC5paWQ6MTY0MkI1RjlEQTQ5RTQxMUE0QzNB + MjdEOTJBQzc3QkMiIHN0UmVmOmRvY3VtZW50SUQ9InhtcC5kaWQ6NjNBMzk0RjgyODQ5RTQxMTk0MERB + Nzg4NkRDOTk3Q0YiLz4gPC9yZGY6RGVzY3JpcHRpb24+IDwvcmRmOlJERj4gPC94OnhtcG1ldGE+IDw/ + eHBhY2tldCBlbmQ9InIiPz6B5sF9AAACe0lEQVRIS7WVb2jMcRzHL7UHanF/Mts5prE/1li3kAfu5Ak7 + 5IHNobBkSC2UIuGJkrrSWRvTmHQWK8U1T8jqUtYwkZpaGjV/Js6to5YwfXze39+fu/v23f36hXe9us+f + 7/v9rd/dr3MQ0X/F4Zm3+K9QhWajNNlBFZqN0mQHS6lMdrCUyqSgimllUsy4XmOmp+QRDllQWbygjjq6 + uimZStOX8a+ixox3pXrM1JLCDAqYJmY7c669M0bff07mcLbtEl9QE8k6V6BH5ooXMsHZZX7ae+AY7W45 + SrPm19LbsSR9m/iRA2bYGefggVePzUgKBzeu9sQpmZ4QcG/WMtk7eLjv0WMz0kOz+TX6MUXvP6cFeNbD + bz6YvQFm2Bk9PPByZO6jksLB5KvRTzTyLikIrG2ktsvXzd4g2hGjYP1ms4eHvb850qkl65LCQW/ntVs0 + 9HpMcPx0K1X4V1Ff/3NzhnphbVDsjBk8Lm/VE44s0ZJ1KS4Ie8uXUvPBE7Tn0ElCzTMqrV5BO/cfEaDG + TD5X6PFFONLygsTF7jj1vxihyPkYNTS1iFrFxm37KHIhJmp43L7qZxzp0pJ1SeHhQGgLJQaH6fb9R1QX + 2EB3Ek9FryLe95j8K9eLT/TB0FZcskOP1iRdkIh23aR7Ay9pzaZddKY9Jup8nIpeoXXhZlHD655b85Bj + p2npLOmCML+dD/iTZhaX3+UvbRB1PpzeygFnSUUvatecRUMzisoOc+x0LZ3FixxYhQyK1cxyZhkTYhqY + RgnM6hmcwVl4ljDI0KS4AC+Kmyli8Jv2MF7GNwXY4QzOwgNv5mWTL7CLpVQmO1hKZbKDpVR/1P8OcvwB + lh7gOXXZq9sAAAAASUVORK5CYII= + + iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 @@ -598,147 +738,7 @@ 1BGxz38BvCwLsyQ3iHgAAAAASUVORK5CYII= - - - iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAZdEVYdFNvZnR3YXJlAEFkb2JlIEltYWdlUmVhZHlxyWU8AAADZmlUWHRYTUw6Y29tLmFkb2Jl - LnhtcAAAAAAAPD94cGFja2V0IGJlZ2luPSLvu78iIGlkPSJXNU0wTXBDZWhpSHpyZVN6TlRjemtjOWQi - Pz4gPHg6eG1wbWV0YSB4bWxuczp4PSJhZG9iZTpuczptZXRhLyIgeDp4bXB0az0iQWRvYmUgWE1QIENv - cmUgNS4zLWMwMTEgNjYuMTQ1NjYxLCAyMDEyLzAyLzA2LTE0OjU2OjI3ICAgICAgICAiPiA8cmRmOlJE - RiB4bWxuczpyZGY9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkvMDIvMjItcmRmLXN5bnRheC1ucyMiPiA8 - cmRmOkRlc2NyaXB0aW9uIHJkZjphYm91dD0iIiB4bWxuczp4bXBNTT0iaHR0cDovL25zLmFkb2JlLmNv - bS94YXAvMS4wL21tLyIgeG1sbnM6c3RSZWY9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlw - ZS9SZXNvdXJjZVJlZiMiIHhtbG5zOnhtcD0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wLyIgeG1w - TU06T3JpZ2luYWxEb2N1bWVudElEPSJ4bXAuZGlkOjYzQTM5NEY4Mjg0OUU0MTE5NDBEQTc4ODZEQzk5 - N0NGIiB4bXBNTTpEb2N1bWVudElEPSJ4bXAuZGlkOjEwQ0IxNzBBNEM1QzExRTRBNkNGQzRBMjhDQzI0 - MkY4IiB4bXBNTTpJbnN0YW5jZUlEPSJ4bXAuaWlkOjEwQ0IxNzA5NEM1QzExRTRBNkNGQzRBMjhDQzI0 - MkY4IiB4bXA6Q3JlYXRvclRvb2w9IkFkb2JlIFBob3Rvc2hvcCBDUzYgKFdpbmRvd3MpIj4gPHhtcE1N - OkRlcml2ZWRGcm9tIHN0UmVmOmluc3RhbmNlSUQ9InhtcC5paWQ6NTEzMDNDMjA1QjRDRTQxMTg4NERE - MUVBOEQ4QTgyNTUiIHN0UmVmOmRvY3VtZW50SUQ9InhtcC5kaWQ6NjNBMzk0RjgyODQ5RTQxMTk0MERB - Nzg4NkRDOTk3Q0YiLz4gPC9yZGY6RGVzY3JpcHRpb24+IDwvcmRmOlJERj4gPC94OnhtcG1ldGE+IDw/ - eHBhY2tldCBlbmQ9InIiPz43wa2/AAAFaUlEQVRIS6WUC0xTVxzGKy0UkSmlFGjBFilSkNpSaAWRh63y - sIiAArKs4spLRLQoiEJlSMGoMCc6CBOnYHzMOHUqqOhEHOqCbjNu6kCd6KYje5mZ6KbObd/OuVL3cEzj - /skv997/+b7v39PTW9aj3/BM+OKxPEIZoW/gyrOuPbP+GvRPSNBQQqXYLwSW1etw7cYt5kqfaZ+uD8QM - Xg8f/f4UxGhHMHv4qlG6vAb9394G6T+BPpdV1oCuUx3VD8Q9XT8//PUJRMghlLhLg1C41IK+r/pB+oNC - 16mO6qmP+gdi/6y793+hwTYEk9uoQOSaStHzxQ2Q/nND9XMKy0D9NIfmDcSzaLhI4KXE7LwinLtwGXfu - PXhhqJ/m0DyS62EdUGWpqcf3P97DD3d++t/QnKraBjpghXWAiC+WN0ZNScOe1mP45vbdF2ZvWwdoDs/D - b6ejs6ecxHPoAG/l+Fhkzy+FyCcY0YkG7D/yAW5+d+e5oXrqo36aQ/McnNyjyAAuHWA05pfgzPlehhyT - mflV6FOMaDt2Ctf7bw8KXac6qqc+a4Zx3hLwRLJCZgcJjcPIEPkyIZmeX1SB7vOX0dn9KQy5jw8r8eVc - HOrsxidXP0d9hxlzd4QgeYMzEt7kQVvOR0pFFNpOHmd81E9znIS+dSTc1foVGWfNKUZjyy6Ex6SQl0cD - 09IVxHAFh0+cReqr+QjK8ERqEw+VHWOwoycSR/v1OHwzDlsvhcNCeqkbedAYxQiPm87kZOQVw0nkW0QG - 2DFnIA+JRm3DFpzr/RKNW3ZDE5UAsX8ocizZiFs7DEUHvPFunw4Hb05B+y09jn49lYHe0x5doxqqLVlf - DJrnyB+pIQNs6QAhf6R8tZu3CqpwPdZu2I6PLl3HwnV5iHv9JVSeUOKdqzq81xeDvddiYG73R0aLEIZm - IRa1jUbjxQnYRHa17YqW0VJPwHT3LocRbirrDiymspXo6L6AgiXV8JSNQ2i6GpNWOqK4U4n1n0Vge68W - 9ecmIKnBBSqDCIp4P2RWGDB/QxqS6l1QcToIld3BqDobgsXEQ73+Se5HrGcgdJEokGzIx66DXXi7dRvC - yx2Q2RqApR+GoPbjCag8pUZ6sxjqWRKEldljRr07ZjaKmHt5qpBZKzkeiIJ2BbIPKmA8MIbJUC/ghrM0 - RfYsDtdhqJNIVulK/ku0BQokbfZGZrsKBR3BmEsMOfvl0FY7o7ypDPo1brCcGc+QUCdExabXEFsjQO4B - ObL2BSBlqx8SWwibvBE0334nK3Ael+yEbIW81DZszlhZ2oieuAYvpO5VIHGzP9J2+CN9pz/CzDwExMox - eZUbFnZpkEc+gLZagJjMWOiqXZDVqmC0+kZf6Nb4IHKFCPIsu92sgCw7BlJswjBJLCdenmuPyFUS6Gp9 - oG/yRdJWGSKqhYjKDgLRImK5ACGlzsy9d/zwXn2DBMZDSkZLPaHlnpBncyGO5kxj+Rps/wYdJE2xzfOb - zcU4sye0b0gRu3E0Ypt8ELTICRFGNcShUgjHuZyWxNu2096sdiXS9o1ltNQjyyDhes4SkuXEGpXC+Ve8 - kjlzpDPtoCkVQrdOihgyIHmXP6LryGEX86Ba6ISJNR7IeF+JV8gAfbOM0XoTj8dktpmEOxM4rJHTBscz - njNNnMiBagEfU98ajRnbZMg7GojCk2oGU1cw5nUGw7BHAZWJD6oVhLFzSDCPCacljGP/J7xAm6Hu0ew6 - STIXkcvckN7ig8XHVCjvUiNvdwAmW0Twms6FayS7meM4REoihxPoeT4u10nsZ0LKhhdsIxZEsVcLtOyL - pHffVcd+IJjI7uGHsRscJEPURMMn2FMtNTwuFusPrjFl48ji7nIAAAAASUVORK5CYII= - - - - - iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAZdEVYdFNvZnR3YXJlAEFkb2JlIEltYWdlUmVhZHlxyWU8AAADZmlUWHRYTUw6Y29tLmFkb2Jl - LnhtcAAAAAAAPD94cGFja2V0IGJlZ2luPSLvu78iIGlkPSJXNU0wTXBDZWhpSHpyZVN6TlRjemtjOWQi - Pz4gPHg6eG1wbWV0YSB4bWxuczp4PSJhZG9iZTpuczptZXRhLyIgeDp4bXB0az0iQWRvYmUgWE1QIENv - cmUgNS4zLWMwMTEgNjYuMTQ1NjYxLCAyMDEyLzAyLzA2LTE0OjU2OjI3ICAgICAgICAiPiA8cmRmOlJE - RiB4bWxuczpyZGY9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkvMDIvMjItcmRmLXN5bnRheC1ucyMiPiA8 - cmRmOkRlc2NyaXB0aW9uIHJkZjphYm91dD0iIiB4bWxuczp4bXBNTT0iaHR0cDovL25zLmFkb2JlLmNv - bS94YXAvMS4wL21tLyIgeG1sbnM6c3RSZWY9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlw - ZS9SZXNvdXJjZVJlZiMiIHhtbG5zOnhtcD0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wLyIgeG1w - TU06T3JpZ2luYWxEb2N1bWVudElEPSJ4bXAuZGlkOjYzQTM5NEY4Mjg0OUU0MTE5NDBEQTc4ODZEQzk5 - N0NGIiB4bXBNTTpEb2N1bWVudElEPSJ4bXAuZGlkOkUyMTg3NjEyNDlEODExRTQ4NjNGQjM2Mzk1QkNB - RkQwIiB4bXBNTTpJbnN0YW5jZUlEPSJ4bXAuaWlkOkUyMTg3NjExNDlEODExRTQ4NjNGQjM2Mzk1QkNB - RkQwIiB4bXA6Q3JlYXRvclRvb2w9IkFkb2JlIFBob3Rvc2hvcCBDUzYgKFdpbmRvd3MpIj4gPHhtcE1N - OkRlcml2ZWRGcm9tIHN0UmVmOmluc3RhbmNlSUQ9InhtcC5paWQ6NkJCNTE0NDlEODQ5RTQxMUE0QzNB - MjdEOTJBQzc3QkMiIHN0UmVmOmRvY3VtZW50SUQ9InhtcC5kaWQ6NjNBMzk0RjgyODQ5RTQxMTk0MERB - Nzg4NkRDOTk3Q0YiLz4gPC9yZGY6RGVzY3JpcHRpb24+IDwvcmRmOlJERj4gPC94OnhtcG1ldGE+IDw/ - eHBhY2tldCBlbmQ9InIiPz5e5MstAAADiUlEQVRIS+2UW0yTdxjGcePwtYyVVpAUCi1tv9ImrVbxhAei - kjGphAgFT4jzEJ0gGuJhDk0sml0sglmWmC1hqHNKWwI4srgNh3phpjg1O1yIN5DMbFHQZUu42O76+D4f - 3Fl6Z7ILn+SXvH3f533++X/98iUBeKW81v9Uwx1G1+1240EhfKfdeE/4U3qTAqaZZO/2aeN9IXLrY+Ph - wVOZHll9YyohgYZOGS4JsYdXVDy+NQ8Tvy3BP6OlmPyjDP9OBDRYs8cZPfRy5/uQISIRqcIsLSye+j7I - wN+PluOvhyWY+NmL8fsOjP9kxdN7BRh/YJHfFjy5m48nd4ThQjy968bEgwV49usicFciTEKKFhZPXXv1 - eHxtLsYGPBjttwsWjF0xY+ybOfj9uylYs8cZPfQS7kpEnqDTwuLp9GYlfKZeifUfzcb1j/Iw/IkNv3Q6 - MfKVC6O9bg3W7HFGD73cORlMG5AIizDzAaVtunD5ESXWfNSEY/tNCO00oG1zOkJBBSeqUjVYh6R3Qmat - zSY0Hjah7IASW7hPuSoRvIGihcVTSauCppvFODRUjJZvPWgaKMTuXgt2RHOxLTwHDd3EjPfCudgesWJX - jxM7eryo7/Ni8SGFj8gp6LWwePLvS0Og043A5y5UdtkQOJeLivM5ePf8bJSfM04zG2u7chDoysW6Thsq - zqpY0+GAvymNB/gEgxYWT64tKdGihpSYv8WEpSEzVp0pwDuf2SVQReCiS4M1e5zRQy937NXJ1yRirjDz - AVmVJyNZa9+PObauh7ptKdR6FY6N2SisTYe1OlmDNXtqvRNqwxLYt1TCVLY1ZijZOSQRbuEtLSyeTOXH - sfLDH1EauoFFx6/Cd6Qf7pYI1ObLsO+9iMLdF+DccwEuqd2Nl+Br6sbCxiiKd/XBuPogH1HiAzJXHMC8 - YA98td1wb4rCuaEH1roo8oMR5JGaMPIFa10Ejtowiuouw1vzJTwVXyBz+X4ekPgRZfgbohkLtsfMy47B - tqYdakUnPFUM6YUv+LUGa/Y4o8e8rBXcSffWDkpE4j9ZpEvNmb9KsZV16BzrBnVq1YjeVf1MX1Tzn74o - iCmkdq1/LrNHOkfgB6Vg9afJRrVOdv2ClRkMmklvCnyPs4V8ge81v5RegddnCGHNHmf00JslcJcZCcWv - IU1pAhcyhLcFXj1zGtbscUYPvdyZ+Uv6Wi8rKekFBjoX2627by8AAAAASUVORK5CYII= - - - - - iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAZdEVYdFNvZnR3YXJlAEFkb2JlIEltYWdlUmVhZHlxyWU8AAADZmlUWHRYTUw6Y29tLmFkb2Jl - LnhtcAAAAAAAPD94cGFja2V0IGJlZ2luPSLvu78iIGlkPSJXNU0wTXBDZWhpSHpyZVN6TlRjemtjOWQi - Pz4gPHg6eG1wbWV0YSB4bWxuczp4PSJhZG9iZTpuczptZXRhLyIgeDp4bXB0az0iQWRvYmUgWE1QIENv - cmUgNS4zLWMwMTEgNjYuMTQ1NjYxLCAyMDEyLzAyLzA2LTE0OjU2OjI3ICAgICAgICAiPiA8cmRmOlJE - RiB4bWxuczpyZGY9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkvMDIvMjItcmRmLXN5bnRheC1ucyMiPiA8 - cmRmOkRlc2NyaXB0aW9uIHJkZjphYm91dD0iIiB4bWxuczp4bXBNTT0iaHR0cDovL25zLmFkb2JlLmNv - bS94YXAvMS4wL21tLyIgeG1sbnM6c3RSZWY9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlw - ZS9SZXNvdXJjZVJlZiMiIHhtbG5zOnhtcD0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wLyIgeG1w - TU06T3JpZ2luYWxEb2N1bWVudElEPSJ4bXAuZGlkOjYzQTM5NEY4Mjg0OUU0MTE5NDBEQTc4ODZEQzk5 - N0NGIiB4bXBNTTpEb2N1bWVudElEPSJ4bXAuZGlkOkE2Q0VGMDE2NDlEQTExRTQ4NTlCQTI3NTMyOEY5 - NEU2IiB4bXBNTTpJbnN0YW5jZUlEPSJ4bXAuaWlkOkE2Q0VGMDE1NDlEQTExRTQ4NTlCQTI3NTMyOEY5 - NEU2IiB4bXA6Q3JlYXRvclRvb2w9IkFkb2JlIFBob3Rvc2hvcCBDUzYgKFdpbmRvd3MpIj4gPHhtcE1N - OkRlcml2ZWRGcm9tIHN0UmVmOmluc3RhbmNlSUQ9InhtcC5paWQ6NjA1MjM3NzFEOTQ5RTQxMUE0QzNB - MjdEOTJBQzc3QkMiIHN0UmVmOmRvY3VtZW50SUQ9InhtcC5kaWQ6NjNBMzk0RjgyODQ5RTQxMTk0MERB - Nzg4NkRDOTk3Q0YiLz4gPC9yZGY6RGVzY3JpcHRpb24+IDwvcmRmOlJERj4gPC94OnhtcG1ldGE+IDw/ - eHBhY2tldCBlbmQ9InIiPz6UH16BAAABrElEQVRIS63N70tTURzH8fsnKSGCCEIQCBKISMq2iILCgQOL - JUxQAoVKdMGQuwgWFepsMGjFZCMuorsIJV4WFatpvzdr1ZAFsaIHn8559v1eDsI91wevJ/ee7/tjbMRH - fAFwJOWRF6oopTzyQhWlVEdBwRbgUhICAnuvilKGtXDGzW6WV/CvbjE/xTfxr+R6q4xSxtP5YTf8rVn4 - s5dG+809Rv5zvVVGKaNwfYgyBfhksoH83CCF9seiL7LBBnLXTlP4/W4dza0ZLS0nCdlgA9npAQq/qk/Q - sKa0NJ8nIBtsIBPrp9CqPMJBYVLLj+04ZIMNrF49ReHwVRafH1/R8m3zJmSDDdy/fJJC88Ua3mcjWurW - LGSDDaQifRS+O8uopsNaPhVnIBts4E64l0Jj5y4qDy5q+ZCPQTbYgHmph8LXZ0m8TJ3Xsp+LQjbYQOJC - N4XadgLl22e1vM1OQDbYwK1zXRS+lBbhmEHsLgU8kTeVh+OQDTawEDpB2U4mitfpMS22GYJssIH5QCcV - FGwBmuRtkA3cGO3whcZUlEdeqKKU8sgLVZRSfjw+MP4DJ2GPpDR9OIsAAAAASUVORK5CYII= - - - - - iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAZdEVYdFNvZnR3YXJlAEFkb2JlIEltYWdlUmVhZHlxyWU8AAADZmlUWHRYTUw6Y29tLmFkb2Jl - LnhtcAAAAAAAPD94cGFja2V0IGJlZ2luPSLvu78iIGlkPSJXNU0wTXBDZWhpSHpyZVN6TlRjemtjOWQi - Pz4gPHg6eG1wbWV0YSB4bWxuczp4PSJhZG9iZTpuczptZXRhLyIgeDp4bXB0az0iQWRvYmUgWE1QIENv - cmUgNS4zLWMwMTEgNjYuMTQ1NjYxLCAyMDEyLzAyLzA2LTE0OjU2OjI3ICAgICAgICAiPiA8cmRmOlJE - RiB4bWxuczpyZGY9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkvMDIvMjItcmRmLXN5bnRheC1ucyMiPiA8 - cmRmOkRlc2NyaXB0aW9uIHJkZjphYm91dD0iIiB4bWxuczp4bXBNTT0iaHR0cDovL25zLmFkb2JlLmNv - bS94YXAvMS4wL21tLyIgeG1sbnM6c3RSZWY9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlw - ZS9SZXNvdXJjZVJlZiMiIHhtbG5zOnhtcD0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wLyIgeG1w - TU06T3JpZ2luYWxEb2N1bWVudElEPSJ4bXAuZGlkOjYzQTM5NEY4Mjg0OUU0MTE5NDBEQTc4ODZEQzk5 - N0NGIiB4bXBNTTpEb2N1bWVudElEPSJ4bXAuZGlkOjJGRTU5OEQ1NDlEQjExRTRBRUVDOTkyMjQ5NzEw - REUwIiB4bXBNTTpJbnN0YW5jZUlEPSJ4bXAuaWlkOjJGRTU5OEQ0NDlEQjExRTRBRUVDOTkyMjQ5NzEw - REUwIiB4bXA6Q3JlYXRvclRvb2w9IkFkb2JlIFBob3Rvc2hvcCBDUzYgKFdpbmRvd3MpIj4gPHhtcE1N - OkRlcml2ZWRGcm9tIHN0UmVmOmluc3RhbmNlSUQ9InhtcC5paWQ6MTY0MkI1RjlEQTQ5RTQxMUE0QzNB - MjdEOTJBQzc3QkMiIHN0UmVmOmRvY3VtZW50SUQ9InhtcC5kaWQ6NjNBMzk0RjgyODQ5RTQxMTk0MERB - Nzg4NkRDOTk3Q0YiLz4gPC9yZGY6RGVzY3JpcHRpb24+IDwvcmRmOlJERj4gPC94OnhtcG1ldGE+IDw/ - eHBhY2tldCBlbmQ9InIiPz6B5sF9AAACe0lEQVRIS7WVb2jMcRzHL7UHanF/Mts5prE/1li3kAfu5Ak7 - 5IHNobBkSC2UIuGJkrrSWRvTmHQWK8U1T8jqUtYwkZpaGjV/Js6to5YwfXze39+fu/v23f36hXe9us+f - 7/v9rd/dr3MQ0X/F4Zm3+K9QhWajNNlBFZqN0mQHS6lMdrCUyqSgimllUsy4XmOmp+QRDllQWbygjjq6 - uimZStOX8a+ixox3pXrM1JLCDAqYJmY7c669M0bff07mcLbtEl9QE8k6V6BH5ooXMsHZZX7ae+AY7W45 - SrPm19LbsSR9m/iRA2bYGefggVePzUgKBzeu9sQpmZ4QcG/WMtk7eLjv0WMz0kOz+TX6MUXvP6cFeNbD - bz6YvQFm2Bk9PPByZO6jksLB5KvRTzTyLikIrG2ktsvXzd4g2hGjYP1ms4eHvb850qkl65LCQW/ntVs0 - 9HpMcPx0K1X4V1Ff/3NzhnphbVDsjBk8Lm/VE44s0ZJ1KS4Ie8uXUvPBE7Tn0ElCzTMqrV5BO/cfEaDG - TD5X6PFFONLygsTF7jj1vxihyPkYNTS1iFrFxm37KHIhJmp43L7qZxzp0pJ1SeHhQGgLJQaH6fb9R1QX - 2EB3Ek9FryLe95j8K9eLT/TB0FZcskOP1iRdkIh23aR7Ay9pzaZddKY9Jup8nIpeoXXhZlHD655b85Bj - p2npLOmCML+dD/iTZhaX3+UvbRB1PpzeygFnSUUvatecRUMzisoOc+x0LZ3FixxYhQyK1cxyZhkTYhqY - RgnM6hmcwVl4ljDI0KS4AC+Kmyli8Jv2MF7GNwXY4QzOwgNv5mWTL7CLpVQmO1hKZbKDpVR/1P8OcvwB - lh7gOXXZq9sAAAAASUVORK5CYII= - - - + iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 YQUAAAAZdEVYdFNvZnR3YXJlAEFkb2JlIEltYWdlUmVhZHlxyWU8AAADZmlUWHRYTUw6Y29tLmFkb2Jl @@ -750,26 +750,244 @@ bS94YXAvMS4wL21tLyIgeG1sbnM6c3RSZWY9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlw ZS9SZXNvdXJjZVJlZiMiIHhtbG5zOnhtcD0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wLyIgeG1w TU06T3JpZ2luYWxEb2N1bWVudElEPSJ4bXAuZGlkOjJGQzkyMzc0Rjk0OUU0MTE5NjNCQjRENDMzQjlC - MUM4IiB4bXBNTTpEb2N1bWVudElEPSJ4bXAuZGlkOjJERjY3MEZENEQyMzExRTRCNDlGQUMwMzk0OTAw - Qzc4IiB4bXBNTTpJbnN0YW5jZUlEPSJ4bXAuaWlkOjJERjY3MEZDNEQyMzExRTRCNDlGQUMwMzk0OTAw - Qzc4IiB4bXA6Q3JlYXRvclRvb2w9IkFkb2JlIFBob3Rvc2hvcCBDUzYgKFdpbmRvd3MpIj4gPHhtcE1N - OkRlcml2ZWRGcm9tIHN0UmVmOmluc3RhbmNlSUQ9InhtcC5paWQ6NjhGOUEyRDEyMTRERTQxMUIzNkJE + MUM4IiB4bXBNTTpEb2N1bWVudElEPSJ4bXAuZGlkOjlDMzFEOUI4NEFBRjExRTQ4OTA5OUYwQ0QzM0Q2 + NEI4IiB4bXBNTTpJbnN0YW5jZUlEPSJ4bXAuaWlkOjlDMzFEOUI3NEFBRjExRTQ4OTA5OUYwQ0QzM0Q2 + NEI4IiB4bXA6Q3JlYXRvclRvb2w9IkFkb2JlIFBob3Rvc2hvcCBDUzYgKFdpbmRvd3MpIj4gPHhtcE1N + OkRlcml2ZWRGcm9tIHN0UmVmOmluc3RhbmNlSUQ9InhtcC5paWQ6MDk5Mzk2NTZBRjRBRTQxMTk3NEFD + QUFFQjRCMzVENkUiIHN0UmVmOmRvY3VtZW50SUQ9InhtcC5kaWQ6MkZDOTIzNzRGOTQ5RTQxMTk2M0JC + NEQ0MzNCOUIxQzgiLz4gPC9yZGY6RGVzY3JpcHRpb24+IDwvcmRmOlJERj4gPC94OnhtcG1ldGE+IDw/ + eHBhY2tldCBlbmQ9InIiPz73sIMwAAADIElEQVRIS7WVa0iTYRTH56Uiysvm3TkvpLl5DRIvQYWVWl+6 + iNEVg0yhQqloQZHkLT+Y0YdAs75IpEUhzERZoZhsRpZlS7soblotsRwoxhqWeTrnYZtv+u7NsB74cZ5z + zv89/z17HzYRAPxXeIv/EpFXcOyi4BvKhfehv4FvKBfeh+ayqIUDlIgBgT8whpRYoT2fhgvNVJKBQT9s + hB8/QZDPpnEIjEhg0J5Pw4Vm0mwygG9T06BSqQQhTUhUMoRGpyxYT7OZwfhXC6jVakFIYzNYqN5uMGKa + BI1GIwhpghXJaJJi13d0dEB2bj74hsWzSDlXbzfQG02g0+kEIU2wIomdovzKdVifngnFFytBeb4cLN+n + WaSc6hfKKqB/eHTWoHfwExgMBkFII5MnQUD4WlAWloO26wVs35MDmifPmQFFyqlO/aKKqlmDp31DYDKZ + BCGNTJ4IPqHx8LJvACbNUw7p6e2HuJQMNIhhBuaHj3vBYrEI0tb1BoIiE9kJ9h7Oh7EJM+g/jEJuwVlY + s24ri5RTnfo5BedAIoueIYPumvomuHzjzm9cq2uCq7UNUH2rEarr7kNd0yP26Y+eKoSWtk4wfpmAg7kn + ITY5DUorq1g8cOQEqze3aplOEhRtJoMcL1mMTixV9IgD5a/tSBVDYql8AKOBQLEJtTP08gY/jjFiktKg + 5FIV21Ok3NazvmR2AvrFkCAJyGYk1comZAuHDM/AyLvHThfBveZ26NOPwI59eey7LsbhFCmnOvVJ5+Ef + rrYZLEU8EZ85+HLwW7ZCLMVTFWdkHoLut+/hgbYHaE9XN31XNsupTrWV3jKVs+uS3cyAD0cLe331jW3Q + qRt0CPUlQVHDKI+fN9iGo4W90uNnyuA2vvRtWTlQgxeg/dk7FimnOvU9/CNqUe47b7ANRwt7AfjpKvAK + Gt18Qur35ymhRfsKKLr5hN7EyzDq7humWrrcfSfKxbz/QlwcLDck1snZJdUzYHUDmk57+K1qdXJyzsL6 + RmQD9ZmObygXB8sVIRO6fXQB4hC6eRQppzr1XXmHclnAckFomLc1Um5dItEvhZ97MQXP9N0AAAAASUVO + RK5CYII= + + + + + iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 + YQUAAAAZdEVYdFNvZnR3YXJlAEFkb2JlIEltYWdlUmVhZHlxyWU8AAADZmlUWHRYTUw6Y29tLmFkb2Jl + LnhtcAAAAAAAPD94cGFja2V0IGJlZ2luPSLvu78iIGlkPSJXNU0wTXBDZWhpSHpyZVN6TlRjemtjOWQi + Pz4gPHg6eG1wbWV0YSB4bWxuczp4PSJhZG9iZTpuczptZXRhLyIgeDp4bXB0az0iQWRvYmUgWE1QIENv + cmUgNS4zLWMwMTEgNjYuMTQ1NjYxLCAyMDEyLzAyLzA2LTE0OjU2OjI3ICAgICAgICAiPiA8cmRmOlJE + RiB4bWxuczpyZGY9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkvMDIvMjItcmRmLXN5bnRheC1ucyMiPiA8 + cmRmOkRlc2NyaXB0aW9uIHJkZjphYm91dD0iIiB4bWxuczp4bXBNTT0iaHR0cDovL25zLmFkb2JlLmNv + bS94YXAvMS4wL21tLyIgeG1sbnM6c3RSZWY9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlw + ZS9SZXNvdXJjZVJlZiMiIHhtbG5zOnhtcD0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wLyIgeG1w + TU06T3JpZ2luYWxEb2N1bWVudElEPSJ4bXAuZGlkOjJGQzkyMzc0Rjk0OUU0MTE5NjNCQjRENDMzQjlC + MUM4IiB4bXBNTTpEb2N1bWVudElEPSJ4bXAuZGlkOjhDMTdBQjRENEFBRTExRTQ4QjQyODY0MDNBNTJE + NzNCIiB4bXBNTTpJbnN0YW5jZUlEPSJ4bXAuaWlkOjhDMTdBQjRDNEFBRTExRTQ4QjQyODY0MDNBNTJE + NzNCIiB4bXA6Q3JlYXRvclRvb2w9IkFkb2JlIFBob3Rvc2hvcCBDUzYgKFdpbmRvd3MpIj4gPHhtcE1N + OkRlcml2ZWRGcm9tIHN0UmVmOmluc3RhbmNlSUQ9InhtcC5paWQ6NUQyMjc4QTlBQjRBRTQxMTk3NEFD + QUFFQjRCMzVENkUiIHN0UmVmOmRvY3VtZW50SUQ9InhtcC5kaWQ6MkZDOTIzNzRGOTQ5RTQxMTk2M0JC + NEQ0MzNCOUIxQzgiLz4gPC9yZGY6RGVzY3JpcHRpb24+IDwvcmRmOlJERj4gPC94OnhtcG1ldGE+IDw/ + eHBhY2tldCBlbmQ9InIiPz4eHsDfAAAB00lEQVRIS7XVWytEURQH8HniTTNHLs0NCXNcXjTN5dH9g/gM + 3jx590QhFDJS0gyTGmpqaqJIMW4hzlAoOaWISS7LWifntI3ddnTGrl92e/57/We/DBsA/CvuYSHZSr0t + lvCGsriX/oI3lMW9lM/SwgF9SEHwizs08IX2vAyLZvZRgXJ+cQWv7yB0q96Ds86voT0vw6KZNJsK4Pnl + DWKxmBBlqhpDUN0UNp2n2VrB/WMOEomEEGX0ArN5o+BGfYB0Oi1EGa8cwpKw6bxRcH6lQiaTEaKMVw5q + rzCbNwr2z65BURQhynh8Qe0VZvNGwdZBFlRVFaKMxxfQXmE2rxc8rW3sQy6XE0puHoG7IaC9YnV9j5th + pbZPqOCDCrbH5uIwOD7/zWgkDkNTizAyuwQjkWWIxFNQWduqmVxI/MiPz6/A8HTUuDMTTYLkbrqhgt5S + T3PG4ZJ3HE7focElZx0u3yn+VQiG1ZLymmm7s74f88f42S6bl9zyJZ6d6Xckd+Mt5ieogH4xJORHHajt + SzvqZPSgECpHZSiA2DztuxBlad+NgnpBEbIjusiiYboKRF+kGFHegUR5ImkFv7G0eAPzWVq8gfksLd5/ + oULiHhYS97BwwPYJlSCUgVubViQAAAAASUVORK5CYII= + + + + + iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 + YQUAAAAZdEVYdFNvZnR3YXJlAEFkb2JlIEltYWdlUmVhZHlxyWU8AAADZmlUWHRYTUw6Y29tLmFkb2Jl + LnhtcAAAAAAAPD94cGFja2V0IGJlZ2luPSLvu78iIGlkPSJXNU0wTXBDZWhpSHpyZVN6TlRjemtjOWQi + Pz4gPHg6eG1wbWV0YSB4bWxuczp4PSJhZG9iZTpuczptZXRhLyIgeDp4bXB0az0iQWRvYmUgWE1QIENv + cmUgNS4zLWMwMTEgNjYuMTQ1NjYxLCAyMDEyLzAyLzA2LTE0OjU2OjI3ICAgICAgICAiPiA8cmRmOlJE + RiB4bWxuczpyZGY9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkvMDIvMjItcmRmLXN5bnRheC1ucyMiPiA8 + cmRmOkRlc2NyaXB0aW9uIHJkZjphYm91dD0iIiB4bWxuczp4bXBNTT0iaHR0cDovL25zLmFkb2JlLmNv + bS94YXAvMS4wL21tLyIgeG1sbnM6c3RSZWY9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlw + ZS9SZXNvdXJjZVJlZiMiIHhtbG5zOnhtcD0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wLyIgeG1w + TU06T3JpZ2luYWxEb2N1bWVudElEPSJ4bXAuZGlkOjJGQzkyMzc0Rjk0OUU0MTE5NjNCQjRENDMzQjlC + MUM4IiB4bXBNTTpEb2N1bWVudElEPSJ4bXAuZGlkOjJEMDQyOEZBNEFEMjExRTRBN0MxRDBCNzJGRUND + MDEzIiB4bXBNTTpJbnN0YW5jZUlEPSJ4bXAuaWlkOjJEMDQyOEY5NEFEMjExRTRBN0MxRDBCNzJGRUND + MDEzIiB4bXA6Q3JlYXRvclRvb2w9IkFkb2JlIFBob3Rvc2hvcCBDUzYgKFdpbmRvd3MpIj4gPHhtcE1N + OkRlcml2ZWRGcm9tIHN0UmVmOmluc3RhbmNlSUQ9InhtcC5paWQ6QkRDRkI1RDVEMTRBRTQxMTk3NEFD + QUFFQjRCMzVENkUiIHN0UmVmOmRvY3VtZW50SUQ9InhtcC5kaWQ6MkZDOTIzNzRGOTQ5RTQxMTk2M0JC + NEQ0MzNCOUIxQzgiLz4gPC9yZGY6RGVzY3JpcHRpb24+IDwvcmRmOlJERj4gPC94OnhtcG1ldGE+IDw/ + eHBhY2tldCBlbmQ9InIiPz59jfe3AAAEbUlEQVRIS8WTeUybZRzHF48/pnFOuQRajkFLgQFb5iRLNJr4 + l/EPgsniUI4xZDAY1zyxwApsMJyIME61rByl3DfoYGBrgbWUY06FcZSCha4rQ8jYxkqPr2/fvkv8o2Sg + S/wkT970eb6/T5/39z7Prv8dt/Oql4mR4HZJ3ccoXFxhVCzB9DT9JueJdSq6c1wzVZFupepVzxu34XVj + CaEDi1jX6hF8ZQoeokl4iBVwzV9YdU1XRlIl28eVo8phCdXwGltEeOUsro6psaHVwcSDh5volc4iOO8X + 7KuVwb1hEi7J8myq9PEQO//I85oafr0KtEpUpNSETm+AwWDAvfv3YTQaybnm/t/AyO6Ga+UonJOnIijF + 1hA9tWI2qle9RxcI+RIpmZpTIfBULhIyyqHVahHPKcN70TmYnFFCp9OhqXcc9KwW0DOHVl3YU1aUyjJu + F1SpfhO3EM6bMMsVt+D8Zhz2HIpC4oU6bG5uIu4cD3tfTwAjIBNypQYbGxsISquBU34PaDHiVEplGXee + SuIjVaBv3Lz7gJg8vHg4FlZvc+ATVoLipiHsD8qCXWAO7IPK8MG5FjLXKboOeoYADkldUkplGWb7vOb4 + 4BzxIXXQE/1m59WDXdgBvxPfwz6UC4eQUth/WIBDZ2qQXj+K7IYRImeE5s5fOFrcDPvPapcJzVNmmwVY + VxWG9U09uau1tTVymPpc0iYFLew7OEUJ4BwtALfvJpl5xMrKCu6s3cUrn5YbCM1us80CrJZZVWjXr7j3 + 4CE0y8v4IrcaH+cK4Bv+DRyPl8ApphYuia3wZ3eCUzOA1PIfcVuzjHnlIgK/vgy7mHzTG+w12yzA5E53 + edYPo1c2i/X1dQTEfwvbwDQ4hhXg8OcN4P48Df+UTrgkNIAeW4Hg3Hbo9Xq0iGSgs4ls5CUhoXnObLOA + S8pkhG/bdZzgDZJnffT3GXieLAA9XgB2/RjZjuQqMWhxfBw824H55XWyhcfy+HDNqoB1SH4Codn6G7iw + p3d78EaVPlXX0CaZgkqlgly1gpCiK0htHCH/IL6oFcEF3ZjT3CUvXqv0DzDSS0FPq1a/8EbYS5Rqa+if + SAJ8KoeNR7gitEsnoVQqSbGOkJmYX1ggxaY70SabwIGMUrjn8I3WIXnBRPnWu/8nDnE9Sd7cAaP/ZSES + 6/rRKJRArpiHXC7HzekZNIukiCyrhW9mGZgXa4w2kUVnibJnzdXbxP5URzyDO4QjxGl5i9uNpMZeKP5U + IrywAq9yCnGAOGGMonbYxpVnEPGdyR9BO/MTj8kfgXeNFPt5IngVtoF1kQ9WcTs8qgfgmNreQMS21xZL + 0E6Ln6ef75tg8sfgXT8O77oReAkkYNXJ4PRV/4ztyfo9VPTf4xjdf9CpQKzdxxuGe6UMbhXEmc8V6mze + r3qNivx3HGN7UmglQ6CVDMIxXwybo5UcaunJQD8te9rhyx4JrWwItlGNUut3y5+hlp4cDhFCpl14k9jq + nR+Y1NTjIe7NlmMnWKoHsOtvjWYcKpheqFQAAAAASUVORK5CYII= + + + + + iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 + YQUAAAAZdEVYdFNvZnR3YXJlAEFkb2JlIEltYWdlUmVhZHlxyWU8AAADZmlUWHRYTUw6Y29tLmFkb2Jl + LnhtcAAAAAAAPD94cGFja2V0IGJlZ2luPSLvu78iIGlkPSJXNU0wTXBDZWhpSHpyZVN6TlRjemtjOWQi + Pz4gPHg6eG1wbWV0YSB4bWxuczp4PSJhZG9iZTpuczptZXRhLyIgeDp4bXB0az0iQWRvYmUgWE1QIENv + cmUgNS4zLWMwMTEgNjYuMTQ1NjYxLCAyMDEyLzAyLzA2LTE0OjU2OjI3ICAgICAgICAiPiA8cmRmOlJE + RiB4bWxuczpyZGY9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkvMDIvMjItcmRmLXN5bnRheC1ucyMiPiA8 + cmRmOkRlc2NyaXB0aW9uIHJkZjphYm91dD0iIiB4bWxuczp4bXBNTT0iaHR0cDovL25zLmFkb2JlLmNv + bS94YXAvMS4wL21tLyIgeG1sbnM6c3RSZWY9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlw + ZS9SZXNvdXJjZVJlZiMiIHhtbG5zOnhtcD0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wLyIgeG1w + TU06T3JpZ2luYWxEb2N1bWVudElEPSJ4bXAuZGlkOjJGQzkyMzc0Rjk0OUU0MTE5NjNCQjRENDMzQjlC + MUM4IiB4bXBNTTpEb2N1bWVudElEPSJ4bXAuZGlkOjJERTg4QTFENEQyMjExRTRBODEyODk0M0RBMTc5 + Qjg3IiB4bXBNTTpJbnN0YW5jZUlEPSJ4bXAuaWlkOjJERTg4QTFDNEQyMjExRTRBODEyODk0M0RBMTc5 + Qjg3IiB4bXA6Q3JlYXRvclRvb2w9IkFkb2JlIFBob3Rvc2hvcCBDUzYgKFdpbmRvd3MpIj4gPHhtcE1N + OkRlcml2ZWRGcm9tIHN0UmVmOmluc3RhbmNlSUQ9InhtcC5paWQ6NjJGOUEyRDEyMTRERTQxMUIzNkJE NUVDQjU5MzE1NjIiIHN0UmVmOmRvY3VtZW50SUQ9InhtcC5kaWQ6MkZDOTIzNzRGOTQ5RTQxMTk2M0JC NEQ0MzNCOUIxQzgiLz4gPC9yZGY6RGVzY3JpcHRpb24+IDwvcmRmOlJERj4gPC94OnhtcG1ldGE+IDw/ - eHBhY2tldCBlbmQ9InIiPz6GKmpFAAAC+UlEQVRIS63T20vTYRzH8Yforj/Ei24UiSgKIygKi8oyxZQo - cvNYeXaesmzqPGu2POd0ulSsnIdaurTSTJ3O6UxTPGya5vCQx5AuPn39RbHop7nZxQt+z3ie93e/Z4w1 - p7nsCoBt8R6yBF/UHPv+Wb0rfFFzm99CRIwEW1gnqXzxTXxRc0ydctm4OlID2sxrw6iCtiwItC+A2P/D - frLnjwGNSZdMq6N1WOvLwFpP4l/WdRlY6Jaio9Ab7QXba8sVoDHZGdT8PYS9THDqMGnLsKpNw0qXGCua - BO55VZdNQ6U/DRRibVCGb+N1pH5bukoRqHmDHOIG1N8/X2F4I8WyNhtf2+9hqSsZxqZ4upbb6HsSZLHO - Im90ym6hNVcIaktYTexZyUelGEvaHMy/jcFiZxo0xX5Y7ivGcn8JkVmA9uvlWBmqwpJeAWovs+poR99O - eRgWtQWYVUdgrj0FH+i+F3XF3NoappZYGJrEoLaOVYpOOTY/FGJB+xjTqnDMtMTTAC/Ma/Ix/TLUKl9e - x0JfFQpql7PykBP7lWIXzPeUYLIhHCPKCLr/AMy2ZsKoDLTKdNNdvM8TgNpRTBZwfJ885CTmaIChPhwa - mS+GnkdhqjEWY9X+VplqvIMXEhdQ24mZeuSs0N/BNNWWj4k6EdSZHhhXxWH0aSCGFd4c4Tk7zk7XBlUM - FKLToK4Nm+0qYnneRzqGGiSYaIiiyZdhVCdgqFSIwRJPjucZW85O1pvnRmvDkO9zFNTdy2Y6HjGp4HCF - 5kk4xhoiURd/EROv4tBfeM0qAyUC9Mp9QM0+7o829T6LZV0/mNycS6+nFKFWfAGj9ZHozfGwil7miZYH - 7qCmghsw+S6VpV894KuUuKFbfhNNqa749CwY3dm0toK+VABl3HlQM5obYHybwFLc7W1y/Y5BlX6FfgNn - DNcEY0DhZZX+MiGKbh0DNR24AYYWMSfJzc6GZBApwS5skIzNODcg0dV2V36FtsJ7yBJ8UXO8hyzBFzXH - ++H/A/YDv9/V87iOlrYAAAAASUVORK5CYII= + eHBhY2tldCBlbmQ9InIiPz6wJF34AAACl0lEQVRIS62Vy08TURSH73/QhQtXVnBhxEcMiUkhbEg0hB1R + Q1i68C8wIW5cEqMLN7ho2Ji4YiEhWq0prYUhfULbadN3obTaChobtZEUsFY9nnPS6WM6HYowyZf87j33 + nG/amaai9geOBYA+4pTxihmBE8DcTQB4J8em/9IwSQyagmrtL+z9rMFmvnhkKvtV7tcVHPz6DVsftulA + AckdhUg8zf19eoLKAd597iMLMItewfOxUDTN/bqCH3tVSG8VWIBZ9AoJApEk9+sKvu/uQ2IjzwJkGtH8 + OrTwy3Hu77vIAnV9mgWlcgWiqRwLjAMmkOMbPbNTKnN/JJntqJGEBZ++7oKcyLLgLN4JrU8Cms2C4pcy + BKKZumCI18temQ/8DzSLZlBmQX7nG/jCKdpgAa0driCtY5iFHuqHSjNoFtaags1iCdzBBG+QgNY2aZ0F + mIUe6osENAtrTUEq/7kDq9PHAszU5yYoq9f1i9cUSCD5ozxDEeTsrhAoONwyxLLb8MrhYQFmZYCHsnpd + v3hNgQROb5hnKIK29944MAThTBEWbS4WYBZ6qC/sKSy5ZJ6BGUQg8b4Bbhjod4AZXlhXWdBa10LrIVul + AM9ggS+aa6AIMMO8ZYUO0KeyIOMtZyaQpXpNi4LFucYzMINwhbMNcMNw5oIJMMNKIA0LNg88mZuH/ssj + dPgBMnN+cBRmny1wrRtSMMMzWCCFMg0UAeY2Fh0+GL5xG8Zu3oHXUrCj3g0WONdTbeBm21/o1N17gPtg + 98Xh3VoS3qzKMDI22agfglnY/Uld8NDc/ZlZwAwvl4Ngun6LGh8rdfVDViNs3rguOOzq6XOD8PDpc7g2 + OkHDH7XWtYa2It66Y4eCQ8cRfpvUNa2hTUD8A6JMaBvCyTdJAAAAAElFTkSuQmCC + + + + + iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 + YQUAAAAZdEVYdFNvZnR3YXJlAEFkb2JlIEltYWdlUmVhZHlxyWU8AAADZmlUWHRYTUw6Y29tLmFkb2Jl + LnhtcAAAAAAAPD94cGFja2V0IGJlZ2luPSLvu78iIGlkPSJXNU0wTXBDZWhpSHpyZVN6TlRjemtjOWQi + Pz4gPHg6eG1wbWV0YSB4bWxuczp4PSJhZG9iZTpuczptZXRhLyIgeDp4bXB0az0iQWRvYmUgWE1QIENv + cmUgNS4zLWMwMTEgNjYuMTQ1NjYxLCAyMDEyLzAyLzA2LTE0OjU2OjI3ICAgICAgICAiPiA8cmRmOlJE + RiB4bWxuczpyZGY9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkvMDIvMjItcmRmLXN5bnRheC1ucyMiPiA8 + cmRmOkRlc2NyaXB0aW9uIHJkZjphYm91dD0iIiB4bWxuczp4bXBNTT0iaHR0cDovL25zLmFkb2JlLmNv + bS94YXAvMS4wL21tLyIgeG1sbnM6c3RSZWY9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlw + ZS9SZXNvdXJjZVJlZiMiIHhtbG5zOnhtcD0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wLyIgeG1w + TU06T3JpZ2luYWxEb2N1bWVudElEPSJ4bXAuZGlkOjJGQzkyMzc0Rjk0OUU0MTE5NjNCQjRENDMzQjlC + MUM4IiB4bXBNTTpEb2N1bWVudElEPSJ4bXAuZGlkOkUzNzJDMjE3NEFENjExRTRCNjE0OEVEQzI4MEM0 + RTZDIiB4bXBNTTpJbnN0YW5jZUlEPSJ4bXAuaWlkOkUzNzJDMjE2NEFENjExRTRCNjE0OEVEQzI4MEM0 + RTZDIiB4bXA6Q3JlYXRvclRvb2w9IkFkb2JlIFBob3Rvc2hvcCBDUzYgKFdpbmRvd3MpIj4gPHhtcE1N + OkRlcml2ZWRGcm9tIHN0UmVmOmluc3RhbmNlSUQ9InhtcC5paWQ6RkI3NUQ0QkNENDRBRTQxMTk3NEFD + QUFFQjRCMzVENkUiIHN0UmVmOmRvY3VtZW50SUQ9InhtcC5kaWQ6MkZDOTIzNzRGOTQ5RTQxMTk2M0JC + NEQ0MzNCOUIxQzgiLz4gPC9yZGY6RGVzY3JpcHRpb24+IDwvcmRmOlJERj4gPC94OnhtcG1ldGE+IDw/ + eHBhY2tldCBlbmQ9InIiPz6PyaLfAAADMElEQVRIS6VUXUiTYRT+vi3Tzd+ps23+3KRigtiPkolEQReG + UYTkhWatpWlWGkRdddfdSPImqUAJjSIT00oxLJIk0cR+tFSyzDJtgaMkDEPkdM7ZPvm2vS6jBx6es3Pe + 8zzvtm+TohLS/ov+AACStLgEQuJyLRJWYK1yzh/+FgCoQrpnfM4fOGBhcUlIMkEVkma4H4i1y2kFcMD8 + wqKQZILKZqTqmlTAWrfvMjhgbv63Dwm0hLWQohn1eNEbzrlfPiTQAtZCKjP1GXdAIC+r4XD+9CGBFrDm + RVJ1re6pZ0GyHHMvIawauYVNCFPfvvuQQAtYC6meKXU0amNsaGN/ZR60xIf9aIgN3cpGE9OzZCZ85nEm + pGiWlLABmuJCnUOXrNB7chdct4TUo32ANDbp4NuielDpqWfePdaPX6GrohSK4uLhlCEo96YlZLbOFHzH + oJXjMSBcGn4/zQGovEDqXXtzeTb+BTrKj0J3+Q54djYP7EZdTU2MPjFSK8eieQR9QtLg6GcOQPWgqKeQ + ZyOfoK30CDw+lg2Ot3Z4VLoNqo269mCNHIa2WjYn9A1PcAAqU6m9VV3TF9psOwwPS3JgZugCdNoyocwU + jU+RlImWBpezGz0vxzkA1YOiHvPFO7Ca1kGHLQtmXp2HdutmqN+/F6JiU+h3kOpyVeHJwBgHoLIpqajm + 189HoaG4CNqsGTA1UAWth9Lg6r490PygGyLjUikgzuWqQlffCAegelDdUwLqigqhpXgjTPYeh+bCFCg2 + RkEk3vxuVz/P0c43oLP3DQegLhspNalSFxiNcLswHT48LYNbBUlQk7ebzenmyhm08w1o7xmiAP6hRZiT + 70eYkzpctUuJWdHmwWs74+F1Uz7cyE+E4ohQB5mHm9a3GywpTXzektyKduIAIsKI3ISkL4rIdYle05C9 + VrZVBmvtl7eboUyv7V4jSQdwRn8FdI72iErtCUxnIuifkJ5hUqUOq9Jr7OeCNU6bTpNVqtMcDJSldOwn + KnOk+jypJ5QANRWc0cs5SEelXr54QidfwVYAMoiHq4W/gNM6OaNCJ+diaUIqN/43+Atwg27t+9ZXBUn6 + A2MdqQeVc5pWAAAAAElFTkSuQmCC + + + + + iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAIAAABvFaqvAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 + YQUAAAAZdEVYdFNvZnR3YXJlAEFkb2JlIEltYWdlUmVhZHlxyWU8AAADZmlUWHRYTUw6Y29tLmFkb2Jl + LnhtcAAAAAAAPD94cGFja2V0IGJlZ2luPSLvu78iIGlkPSJXNU0wTXBDZWhpSHpyZVN6TlRjemtjOWQi + Pz4gPHg6eG1wbWV0YSB4bWxuczp4PSJhZG9iZTpuczptZXRhLyIgeDp4bXB0az0iQWRvYmUgWE1QIENv + cmUgNS4zLWMwMTEgNjYuMTQ1NjYxLCAyMDEyLzAyLzA2LTE0OjU2OjI3ICAgICAgICAiPiA8cmRmOlJE + RiB4bWxuczpyZGY9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkvMDIvMjItcmRmLXN5bnRheC1ucyMiPiA8 + cmRmOkRlc2NyaXB0aW9uIHJkZjphYm91dD0iIiB4bWxuczp4bXBNTT0iaHR0cDovL25zLmFkb2JlLmNv + bS94YXAvMS4wL21tLyIgeG1sbnM6c3RSZWY9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlw + ZS9SZXNvdXJjZVJlZiMiIHhtbG5zOnhtcD0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wLyIgeG1w + TU06T3JpZ2luYWxEb2N1bWVudElEPSJ4bXAuZGlkOjJGQzkyMzc0Rjk0OUU0MTE5NjNCQjRENDMzQjlC + MUM4IiB4bXBNTTpEb2N1bWVudElEPSJ4bXAuZGlkOjUzQzNGNDI5NEQyQzExRTQ4QkE1QUNCMEVDRDZF + MDVEIiB4bXBNTTpJbnN0YW5jZUlEPSJ4bXAuaWlkOjUzQzNGNDI4NEQyQzExRTQ4QkE1QUNCMEVDRDZF + MDVEIiB4bXA6Q3JlYXRvclRvb2w9IkFkb2JlIFBob3Rvc2hvcCBDUzYgKFdpbmRvd3MpIj4gPHhtcE1N + OkRlcml2ZWRGcm9tIHN0UmVmOmluc3RhbmNlSUQ9InhtcC5paWQ6RkI1NUY4OTYyQTRERTQxMUIzNkJE + NUVDQjU5MzE1NjIiIHN0UmVmOmRvY3VtZW50SUQ9InhtcC5kaWQ6MkZDOTIzNzRGOTQ5RTQxMTk2M0JC + NEQ0MzNCOUIxQzgiLz4gPC9yZGY6RGVzY3JpcHRpb24+IDwvcmRmOlJERj4gPC94OnhtcG1ldGE+IDw/ + eHBhY2tldCBlbmQ9InIiPz6IsaOmAAADF0lEQVQ4T62U/UuTURTH+0nICqRI1ERMMyNQe8N0ChqBwQhN + yvwhEgJjVCqJ/qCibZo6tzQ339h6Nre5prapUzc1XzItX1ilzuWMLLVAen+xf6DTuTxjdxsFVj58ebjc + c+7nnud7z3228DbpIaDFH/CfoqCn72DIDvNfPDM2KAqyr8PcJxqY+QBTb8kkjocXQTsKigGwfqYJHqIg + 1OxHGHvlWPx4hXB1YyA3g4CBhqst+piEnrDA3rA95vBAY1x8d7lq/DVZwm5PQZNvoKYdypSgHgbVEIh1 + cLOZzOCbSSsyRQRba6uWtcpVLbPcwlglInNUCJNWWKqABqMLCGvGlfpJELaQ/V1Vd1lujAhe0chtUrH5 + ZExnmJ85MdomEa+qZMbIEF2BHGunILSjdZwYgTt4gJqjjj0Rltml1Zq9AeL0Mn71Wn2mtDU80MIvsFTw + O+KPIoWC8BNYRIUaqrRQroJKjQOk9N+xLBF2pXJFKfnsDGYa8gS6xOO2whyMuoHaHpGzZ/pBM0IMrtXD + nT4HqNHXe0lYoogMFeQP4jbSDkCPTUyXmnNoPutSo+9WN5DEQDyeWCWnhqm4p7Oimt3b54rzmmKPVHKz + 0Xg0AU1pz87VJp+yXOfd9t3mBmLXsGrsJhSsDtF4iOWxKdpzyQNnuRW7vEUp13obFG05OVUBPtO5V1Sn + k5q4SX8ENfWA6C7xHsP981Bb2sf38ZKd4JhSuXUJHPHhg/WJnAeZFw0Xzt/w8erRtLmBnB/CSmaC599I + 2PYVRl+CXigu3R9SfCC0Pf1MZ1oqvqvjogX7gtRFJfb1n24g7GblfQcFP2fkBYm5anxqQcbLKgzyK/Df + WRTkV5+RMTg84ZrgAOHo4ZIDVNdJw67CpsVLZ5gifj97Typlq2ZFQXj8LKh5EHpnaIar8N+Al5l9Y9Vs + T7OiIAzjqaMsa6QJnBkeWvgOHdPkAuIV67PSeQpCYYZplsZ+KyyWLRyFF8D553EDbURY770J0rrYJbda + SYE4iWb9NcgpRKDrOMAWwYP6d5BTaC52zyaAWDlAm/DweL8AX9zXukfxHsIAAAAASUVORK5CYII= + + + + + iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 + YQUAAAAZdEVYdFNvZnR3YXJlAEFkb2JlIEltYWdlUmVhZHlxyWU8AAADZmlUWHRYTUw6Y29tLmFkb2Jl + LnhtcAAAAAAAPD94cGFja2V0IGJlZ2luPSLvu78iIGlkPSJXNU0wTXBDZWhpSHpyZVN6TlRjemtjOWQi + Pz4gPHg6eG1wbWV0YSB4bWxuczp4PSJhZG9iZTpuczptZXRhLyIgeDp4bXB0az0iQWRvYmUgWE1QIENv + cmUgNS4zLWMwMTEgNjYuMTQ1NjYxLCAyMDEyLzAyLzA2LTE0OjU2OjI3ICAgICAgICAiPiA8cmRmOlJE + RiB4bWxuczpyZGY9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkvMDIvMjItcmRmLXN5bnRheC1ucyMiPiA8 + cmRmOkRlc2NyaXB0aW9uIHJkZjphYm91dD0iIiB4bWxuczp4bXBNTT0iaHR0cDovL25zLmFkb2JlLmNv + bS94YXAvMS4wL21tLyIgeG1sbnM6c3RSZWY9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlw + ZS9SZXNvdXJjZVJlZiMiIHhtbG5zOnhtcD0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wLyIgeG1w + TU06T3JpZ2luYWxEb2N1bWVudElEPSJ4bXAuZGlkOjJGQzkyMzc0Rjk0OUU0MTE5NjNCQjRENDMzQjlC + MUM4IiB4bXBNTTpEb2N1bWVudElEPSJ4bXAuZGlkOkVENUYwQThBNEQyOTExRTQ5QzUzQzdFMkFGQkQy + NTA1IiB4bXBNTTpJbnN0YW5jZUlEPSJ4bXAuaWlkOkVENUYwQTg5NEQyOTExRTQ5QzUzQzdFMkFGQkQy + NTA1IiB4bXA6Q3JlYXRvclRvb2w9IkFkb2JlIFBob3Rvc2hvcCBDUzYgKFdpbmRvd3MpIj4gPHhtcE1N + OkRlcml2ZWRGcm9tIHN0UmVmOmluc3RhbmNlSUQ9InhtcC5paWQ6MkRGNkEzOUYyOTRERTQxMUIzNkJE + NUVDQjU5MzE1NjIiIHN0UmVmOmRvY3VtZW50SUQ9InhtcC5kaWQ6MkZDOTIzNzRGOTQ5RTQxMTk2M0JC + NEQ0MzNCOUIxQzgiLz4gPC9yZGY6RGVzY3JpcHRpb24+IDwvcmRmOlJERj4gPC94OnhtcG1ldGE+IDw/ + eHBhY2tldCBlbmQ9InIiPz6npMy1AAAGEUlEQVRIS7WVeVDUZRjHf7Ase8ECu+wl4LIXcqyyHC783AWW + 5QaRFTHkMi9SQvE+UhLzwk0BUcQSgQBBgcYDzStMSzOPcpqcmo5pmqk/+rOapqb+iG/PbzfFcSz/6pn5 + zPN739/7fp/nvZn/3TSLjj+XJy2/RaItPCT5vaBd8m1+q2Qku1lcrcvki+iXr7fFU6ZZeOx5KDU1b7jU + 1Z2bVPMPWNMbRXrXkWAc+ywVLbcS8fKwFjlu8VdpW0XzSc6f8PEIPzJ19dFnU3WEJdHL9P3X9O1nkdB8 + CQrX7i3mKn9zfqsUq29ZsPfjRBx5aMO2cTMy94gm7FuF7XyJTwDJTo5GVdHxNALVgsPd5Ceye+9g8b0f + UXbjB8RtH4Msd+MeXS7f6twjxbILZiy7pEHDtTBsvG7BqivTUXpsClLWCbtJNpDwBlGVH3ySIFV520eW + nedRcf0HVJGwbeRrOHs/h2n1CGRZDe7wND/W1hiI8sEYlJ4KRcVpJcrfVqByNBILhqLh3KeA+UXBOpL2 + jkRZduARPGXZ/vH4pnMou/gd7INfIPn4QyQc/RSOzk9hrBtEiKPerUn1Y5PXBaDojWlwdgUjr0+G/H4Z + cnpCUNJrQNZ+LeLrBD/LYnixFEDAKFz7vJQ0r49dO4zikS8x8/ADxLd9jIT2B5ix/z7SX78Pw+K3EJy2 + wq1M4rEz6sRwthgw82Ag2KNS2I5JPZ4rZx00ImGNHIZSfisFkDGhxbs5AkKLd/3kaLkDlgTjXrsNc/Md + mPfeQeyOD2HbcRu6yi4E2Wrd8ngeG71IBPtePWa4JUhsD0DykQAkHQqApUWCFLcGyZvDoZ/P/5oCTGXk + hU2MvGB7rbGmG47dd2Fa+x6iX/kAMa/eQvS2m4jaeAPspvcROb8TQexid3CcL2usFCJjnwE5nQYU9RhR + PGDC7D4TCrqMyDqkR9oePbRz/SZEKh8rI8vdyshyXhmzLD8DS/1VGOquwtgw7glkXH0Nhvp3kbL2GrSl + hyC11ril03xZfbkQKZuVsDeq4NihRtYuDbJ2auBoUsO2TQXrJiWMlWIExflWMiHOjRzfJy0bg776HCKX + vANd7WXol1/xeN3Si7A2XIXW1YbAxAq3UO0zPTSd1yG38bplLK//vxBrffKY4PQ1HH9aKk8jonQUUyvO + Qlt9HtqaCx4/tXIMyXWXMXXOAQTEv+D2zCvDhBBTCN1zCGOCZq3k+DXO1YcpRYOY4hpF2LzTCCs74/VE + 3IvnEVd1EhGFblBbWot6BKXWQZq64tlYa2+TuJwQM9KU5cRL35hyOxCe2w913hA0hcPQFI16KRzxEFtO + a1Q9htSVN5C+5S5x7x/uIm3DR7CvuomUReOImt1FU7nwEolHECImMGkJE5i46EJkejNM+X1QOPqhzBqC + KvskVDmnJuHKT/K4bgjKzBMItXcjJv84NOwWiKPndJK40TOCgPgaRmIur1dZ1yM6txvyWT0ITR+AImOQ + gg39N1ybDBJP60PorC5My3oTwQm18FdNryBxbq0EJL6AEUTYZBTkF0NGKyKdvZDb3qJOAxSIOqcP/jtp + JyC3D1BSvYgp6EN4aiNlP/cTEk4gFASPEUeXkWd8RaY5jcrEBkTn9UCT4Q3gzfBfRvJE9rrsfpicHSRe + NsFXmJeSXhTBXXY+jMjk8uArVkpExuKb6pkbYJ7L7Ria37xTUBeMeCkcncRTN0z/TyLKNYy4khNQJq2G + IMLBXdUWQkXwCYYR6md7IPP1k8WEC3UFDzSpG2BZeAZJtXQWFpyls3HOC50JzkdQnbFqDInLLiC2rBcq + 6xoSzzzP+NDVwDBaQkx4XzahNv8xZH48sVotCHeOUnnCWNJG18Q4UjddB7vlfbBbPwC7+YannLTyIrS5 + OyHU5v3hr07poL7JBHe4Jh8bzgQROY8h46IKCAVfbi73D3PcpfoJlX0VtEVN0JXsQlj2ZoRaaynj7N/8 + NfZLPLFmHrXnpiWSCCL8iMl32T/M6YGMq+R+covD7QADwfoIgqt4QVGtfvIZJ4lRv5CY4zypbjfjy+eE + M4l4gtuSwYSQ4DS4EZAew/wNiCYQJlvQU3cAAAAASUVORK5CYII= @@ -1054,142 +1272,6 @@ R2K5fxKLWbbp/7Dc0CBY8Q+pPmOq0VkzzQAAAABJRU5ErkJggg== - - - iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAZdEVYdFNvZnR3YXJlAEFkb2JlIEltYWdlUmVhZHlxyWU8AAADZmlUWHRYTUw6Y29tLmFkb2Jl - LnhtcAAAAAAAPD94cGFja2V0IGJlZ2luPSLvu78iIGlkPSJXNU0wTXBDZWhpSHpyZVN6TlRjemtjOWQi - Pz4gPHg6eG1wbWV0YSB4bWxuczp4PSJhZG9iZTpuczptZXRhLyIgeDp4bXB0az0iQWRvYmUgWE1QIENv - cmUgNS4zLWMwMTEgNjYuMTQ1NjYxLCAyMDEyLzAyLzA2LTE0OjU2OjI3ICAgICAgICAiPiA8cmRmOlJE - RiB4bWxuczpyZGY9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkvMDIvMjItcmRmLXN5bnRheC1ucyMiPiA8 - cmRmOkRlc2NyaXB0aW9uIHJkZjphYm91dD0iIiB4bWxuczp4bXBNTT0iaHR0cDovL25zLmFkb2JlLmNv - bS94YXAvMS4wL21tLyIgeG1sbnM6c3RSZWY9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlw - ZS9SZXNvdXJjZVJlZiMiIHhtbG5zOnhtcD0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wLyIgeG1w - TU06T3JpZ2luYWxEb2N1bWVudElEPSJ4bXAuZGlkOjJGQzkyMzc0Rjk0OUU0MTE5NjNCQjRENDMzQjlC - MUM4IiB4bXBNTTpEb2N1bWVudElEPSJ4bXAuZGlkOjlDMzFEOUI4NEFBRjExRTQ4OTA5OUYwQ0QzM0Q2 - NEI4IiB4bXBNTTpJbnN0YW5jZUlEPSJ4bXAuaWlkOjlDMzFEOUI3NEFBRjExRTQ4OTA5OUYwQ0QzM0Q2 - NEI4IiB4bXA6Q3JlYXRvclRvb2w9IkFkb2JlIFBob3Rvc2hvcCBDUzYgKFdpbmRvd3MpIj4gPHhtcE1N - OkRlcml2ZWRGcm9tIHN0UmVmOmluc3RhbmNlSUQ9InhtcC5paWQ6MDk5Mzk2NTZBRjRBRTQxMTk3NEFD - QUFFQjRCMzVENkUiIHN0UmVmOmRvY3VtZW50SUQ9InhtcC5kaWQ6MkZDOTIzNzRGOTQ5RTQxMTk2M0JC - NEQ0MzNCOUIxQzgiLz4gPC9yZGY6RGVzY3JpcHRpb24+IDwvcmRmOlJERj4gPC94OnhtcG1ldGE+IDw/ - eHBhY2tldCBlbmQ9InIiPz73sIMwAAADIElEQVRIS7WVa0iTYRTH56Uiysvm3TkvpLl5DRIvQYWVWl+6 - iNEVg0yhQqloQZHkLT+Y0YdAs75IpEUhzERZoZhsRpZlS7soblotsRwoxhqWeTrnYZtv+u7NsB74cZ5z - zv89/z17HzYRAPxXeIv/EpFXcOyi4BvKhfehv4FvKBfeh+ayqIUDlIgBgT8whpRYoT2fhgvNVJKBQT9s - hB8/QZDPpnEIjEhg0J5Pw4Vm0mwygG9T06BSqQQhTUhUMoRGpyxYT7OZwfhXC6jVakFIYzNYqN5uMGKa - BI1GIwhpghXJaJJi13d0dEB2bj74hsWzSDlXbzfQG02g0+kEIU2wIomdovzKdVifngnFFytBeb4cLN+n - WaSc6hfKKqB/eHTWoHfwExgMBkFII5MnQUD4WlAWloO26wVs35MDmifPmQFFyqlO/aKKqlmDp31DYDKZ - BCGNTJ4IPqHx8LJvACbNUw7p6e2HuJQMNIhhBuaHj3vBYrEI0tb1BoIiE9kJ9h7Oh7EJM+g/jEJuwVlY - s24ri5RTnfo5BedAIoueIYPumvomuHzjzm9cq2uCq7UNUH2rEarr7kNd0yP26Y+eKoSWtk4wfpmAg7kn - ITY5DUorq1g8cOQEqze3aplOEhRtJoMcL1mMTixV9IgD5a/tSBVDYql8AKOBQLEJtTP08gY/jjFiktKg - 5FIV21Ok3NazvmR2AvrFkCAJyGYk1comZAuHDM/AyLvHThfBveZ26NOPwI59eey7LsbhFCmnOvVJ5+Ef - rrYZLEU8EZ85+HLwW7ZCLMVTFWdkHoLut+/hgbYHaE9XN31XNsupTrWV3jKVs+uS3cyAD0cLe331jW3Q - qRt0CPUlQVHDKI+fN9iGo4W90uNnyuA2vvRtWTlQgxeg/dk7FimnOvU9/CNqUe47b7ANRwt7AfjpKvAK - Gt18Qur35ymhRfsKKLr5hN7EyzDq7humWrrcfSfKxbz/QlwcLDck1snZJdUzYHUDmk57+K1qdXJyzsL6 - RmQD9ZmObygXB8sVIRO6fXQB4hC6eRQppzr1XXmHclnAckFomLc1Um5dItEvhZ97MQXP9N0AAAAASUVO - RK5CYII= - - - - - iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAZdEVYdFNvZnR3YXJlAEFkb2JlIEltYWdlUmVhZHlxyWU8AAADZmlUWHRYTUw6Y29tLmFkb2Jl - LnhtcAAAAAAAPD94cGFja2V0IGJlZ2luPSLvu78iIGlkPSJXNU0wTXBDZWhpSHpyZVN6TlRjemtjOWQi - Pz4gPHg6eG1wbWV0YSB4bWxuczp4PSJhZG9iZTpuczptZXRhLyIgeDp4bXB0az0iQWRvYmUgWE1QIENv - cmUgNS4zLWMwMTEgNjYuMTQ1NjYxLCAyMDEyLzAyLzA2LTE0OjU2OjI3ICAgICAgICAiPiA8cmRmOlJE - RiB4bWxuczpyZGY9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkvMDIvMjItcmRmLXN5bnRheC1ucyMiPiA8 - cmRmOkRlc2NyaXB0aW9uIHJkZjphYm91dD0iIiB4bWxuczp4bXBNTT0iaHR0cDovL25zLmFkb2JlLmNv - bS94YXAvMS4wL21tLyIgeG1sbnM6c3RSZWY9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlw - ZS9SZXNvdXJjZVJlZiMiIHhtbG5zOnhtcD0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wLyIgeG1w - TU06T3JpZ2luYWxEb2N1bWVudElEPSJ4bXAuZGlkOjJGQzkyMzc0Rjk0OUU0MTE5NjNCQjRENDMzQjlC - MUM4IiB4bXBNTTpEb2N1bWVudElEPSJ4bXAuZGlkOjhDMTdBQjRENEFBRTExRTQ4QjQyODY0MDNBNTJE - NzNCIiB4bXBNTTpJbnN0YW5jZUlEPSJ4bXAuaWlkOjhDMTdBQjRDNEFBRTExRTQ4QjQyODY0MDNBNTJE - NzNCIiB4bXA6Q3JlYXRvclRvb2w9IkFkb2JlIFBob3Rvc2hvcCBDUzYgKFdpbmRvd3MpIj4gPHhtcE1N - OkRlcml2ZWRGcm9tIHN0UmVmOmluc3RhbmNlSUQ9InhtcC5paWQ6NUQyMjc4QTlBQjRBRTQxMTk3NEFD - QUFFQjRCMzVENkUiIHN0UmVmOmRvY3VtZW50SUQ9InhtcC5kaWQ6MkZDOTIzNzRGOTQ5RTQxMTk2M0JC - NEQ0MzNCOUIxQzgiLz4gPC9yZGY6RGVzY3JpcHRpb24+IDwvcmRmOlJERj4gPC94OnhtcG1ldGE+IDw/ - eHBhY2tldCBlbmQ9InIiPz4eHsDfAAAB00lEQVRIS7XVWytEURQH8HniTTNHLs0NCXNcXjTN5dH9g/gM - 3jx590QhFDJS0gyTGmpqaqJIMW4hzlAoOaWISS7LWifntI3ddnTGrl92e/57/We/DBsA/CvuYSHZSr0t - lvCGsriX/oI3lMW9lM/SwgF9SEHwizs08IX2vAyLZvZRgXJ+cQWv7yB0q96Ds86voT0vw6KZNJsK4Pnl - DWKxmBBlqhpDUN0UNp2n2VrB/WMOEomEEGX0ArN5o+BGfYB0Oi1EGa8cwpKw6bxRcH6lQiaTEaKMVw5q - rzCbNwr2z65BURQhynh8Qe0VZvNGwdZBFlRVFaKMxxfQXmE2rxc8rW3sQy6XE0puHoG7IaC9YnV9j5th - pbZPqOCDCrbH5uIwOD7/zWgkDkNTizAyuwQjkWWIxFNQWduqmVxI/MiPz6/A8HTUuDMTTYLkbrqhgt5S - T3PG4ZJ3HE7focElZx0u3yn+VQiG1ZLymmm7s74f88f42S6bl9zyJZ6d6Xckd+Mt5ieogH4xJORHHajt - SzvqZPSgECpHZSiA2DztuxBlad+NgnpBEbIjusiiYboKRF+kGFHegUR5ImkFv7G0eAPzWVq8gfksLd5/ - oULiHhYS97BwwPYJlSCUgVubViQAAAAASUVORK5CYII= - - - - - iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAZdEVYdFNvZnR3YXJlAEFkb2JlIEltYWdlUmVhZHlxyWU8AAADZmlUWHRYTUw6Y29tLmFkb2Jl - LnhtcAAAAAAAPD94cGFja2V0IGJlZ2luPSLvu78iIGlkPSJXNU0wTXBDZWhpSHpyZVN6TlRjemtjOWQi - Pz4gPHg6eG1wbWV0YSB4bWxuczp4PSJhZG9iZTpuczptZXRhLyIgeDp4bXB0az0iQWRvYmUgWE1QIENv - cmUgNS4zLWMwMTEgNjYuMTQ1NjYxLCAyMDEyLzAyLzA2LTE0OjU2OjI3ICAgICAgICAiPiA8cmRmOlJE - RiB4bWxuczpyZGY9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkvMDIvMjItcmRmLXN5bnRheC1ucyMiPiA8 - cmRmOkRlc2NyaXB0aW9uIHJkZjphYm91dD0iIiB4bWxuczp4bXBNTT0iaHR0cDovL25zLmFkb2JlLmNv - bS94YXAvMS4wL21tLyIgeG1sbnM6c3RSZWY9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlw - ZS9SZXNvdXJjZVJlZiMiIHhtbG5zOnhtcD0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wLyIgeG1w - TU06T3JpZ2luYWxEb2N1bWVudElEPSJ4bXAuZGlkOjJGQzkyMzc0Rjk0OUU0MTE5NjNCQjRENDMzQjlC - MUM4IiB4bXBNTTpEb2N1bWVudElEPSJ4bXAuZGlkOjJEMDQyOEZBNEFEMjExRTRBN0MxRDBCNzJGRUND - MDEzIiB4bXBNTTpJbnN0YW5jZUlEPSJ4bXAuaWlkOjJEMDQyOEY5NEFEMjExRTRBN0MxRDBCNzJGRUND - MDEzIiB4bXA6Q3JlYXRvclRvb2w9IkFkb2JlIFBob3Rvc2hvcCBDUzYgKFdpbmRvd3MpIj4gPHhtcE1N - OkRlcml2ZWRGcm9tIHN0UmVmOmluc3RhbmNlSUQ9InhtcC5paWQ6QkRDRkI1RDVEMTRBRTQxMTk3NEFD - QUFFQjRCMzVENkUiIHN0UmVmOmRvY3VtZW50SUQ9InhtcC5kaWQ6MkZDOTIzNzRGOTQ5RTQxMTk2M0JC - NEQ0MzNCOUIxQzgiLz4gPC9yZGY6RGVzY3JpcHRpb24+IDwvcmRmOlJERj4gPC94OnhtcG1ldGE+IDw/ - eHBhY2tldCBlbmQ9InIiPz59jfe3AAAEbUlEQVRIS8WTeUybZRzHF48/pnFOuQRajkFLgQFb5iRLNJr4 - l/EPgsniUI4xZDAY1zyxwApsMJyIME61rByl3DfoYGBrgbWUY06FcZSCha4rQ8jYxkqPr2/fvkv8o2Sg - S/wkT970eb6/T5/39z7Prv8dt/Oql4mR4HZJ3ccoXFxhVCzB9DT9JueJdSq6c1wzVZFupepVzxu34XVj - CaEDi1jX6hF8ZQoeokl4iBVwzV9YdU1XRlIl28eVo8phCdXwGltEeOUsro6psaHVwcSDh5volc4iOO8X - 7KuVwb1hEi7J8myq9PEQO//I85oafr0KtEpUpNSETm+AwWDAvfv3YTQaybnm/t/AyO6Ga+UonJOnIijF - 1hA9tWI2qle9RxcI+RIpmZpTIfBULhIyyqHVahHPKcN70TmYnFFCp9OhqXcc9KwW0DOHVl3YU1aUyjJu - F1SpfhO3EM6bMMsVt+D8Zhz2HIpC4oU6bG5uIu4cD3tfTwAjIBNypQYbGxsISquBU34PaDHiVEplGXee - SuIjVaBv3Lz7gJg8vHg4FlZvc+ATVoLipiHsD8qCXWAO7IPK8MG5FjLXKboOeoYADkldUkplGWb7vOb4 - 4BzxIXXQE/1m59WDXdgBvxPfwz6UC4eQUth/WIBDZ2qQXj+K7IYRImeE5s5fOFrcDPvPapcJzVNmmwVY - VxWG9U09uau1tTVymPpc0iYFLew7OEUJ4BwtALfvJpl5xMrKCu6s3cUrn5YbCM1us80CrJZZVWjXr7j3 - 4CE0y8v4IrcaH+cK4Bv+DRyPl8ApphYuia3wZ3eCUzOA1PIfcVuzjHnlIgK/vgy7mHzTG+w12yzA5E53 - edYPo1c2i/X1dQTEfwvbwDQ4hhXg8OcN4P48Df+UTrgkNIAeW4Hg3Hbo9Xq0iGSgs4ls5CUhoXnObLOA - S8pkhG/bdZzgDZJnffT3GXieLAA9XgB2/RjZjuQqMWhxfBw824H55XWyhcfy+HDNqoB1SH4Codn6G7iw - p3d78EaVPlXX0CaZgkqlgly1gpCiK0htHCH/IL6oFcEF3ZjT3CUvXqv0DzDSS0FPq1a/8EbYS5Rqa+if - SAJ8KoeNR7gitEsnoVQqSbGOkJmYX1ggxaY70SabwIGMUrjn8I3WIXnBRPnWu/8nDnE9Sd7cAaP/ZSES - 6/rRKJRArpiHXC7HzekZNIukiCyrhW9mGZgXa4w2kUVnibJnzdXbxP5URzyDO4QjxGl5i9uNpMZeKP5U - IrywAq9yCnGAOGGMonbYxpVnEPGdyR9BO/MTj8kfgXeNFPt5IngVtoF1kQ9WcTs8qgfgmNreQMS21xZL - 0E6Ln6ef75tg8sfgXT8O77oReAkkYNXJ4PRV/4ztyfo9VPTf4xjdf9CpQKzdxxuGe6UMbhXEmc8V6mze - r3qNivx3HGN7UmglQ6CVDMIxXwybo5UcaunJQD8te9rhyx4JrWwItlGNUut3y5+hlp4cDhFCpl14k9jq - nR+Y1NTjIe7NlmMnWKoHsOtvjWYcKpheqFQAAAAASUVORK5CYII= - - - - - iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAZdEVYdFNvZnR3YXJlAEFkb2JlIEltYWdlUmVhZHlxyWU8AAADZmlUWHRYTUw6Y29tLmFkb2Jl - LnhtcAAAAAAAPD94cGFja2V0IGJlZ2luPSLvu78iIGlkPSJXNU0wTXBDZWhpSHpyZVN6TlRjemtjOWQi - Pz4gPHg6eG1wbWV0YSB4bWxuczp4PSJhZG9iZTpuczptZXRhLyIgeDp4bXB0az0iQWRvYmUgWE1QIENv - cmUgNS4zLWMwMTEgNjYuMTQ1NjYxLCAyMDEyLzAyLzA2LTE0OjU2OjI3ICAgICAgICAiPiA8cmRmOlJE - RiB4bWxuczpyZGY9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkvMDIvMjItcmRmLXN5bnRheC1ucyMiPiA8 - cmRmOkRlc2NyaXB0aW9uIHJkZjphYm91dD0iIiB4bWxuczp4bXBNTT0iaHR0cDovL25zLmFkb2JlLmNv - bS94YXAvMS4wL21tLyIgeG1sbnM6c3RSZWY9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlw - ZS9SZXNvdXJjZVJlZiMiIHhtbG5zOnhtcD0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wLyIgeG1w - TU06T3JpZ2luYWxEb2N1bWVudElEPSJ4bXAuZGlkOjJGQzkyMzc0Rjk0OUU0MTE5NjNCQjRENDMzQjlC - MUM4IiB4bXBNTTpEb2N1bWVudElEPSJ4bXAuZGlkOjJERTg4QTFENEQyMjExRTRBODEyODk0M0RBMTc5 - Qjg3IiB4bXBNTTpJbnN0YW5jZUlEPSJ4bXAuaWlkOjJERTg4QTFDNEQyMjExRTRBODEyODk0M0RBMTc5 - Qjg3IiB4bXA6Q3JlYXRvclRvb2w9IkFkb2JlIFBob3Rvc2hvcCBDUzYgKFdpbmRvd3MpIj4gPHhtcE1N - OkRlcml2ZWRGcm9tIHN0UmVmOmluc3RhbmNlSUQ9InhtcC5paWQ6NjJGOUEyRDEyMTRERTQxMUIzNkJE - NUVDQjU5MzE1NjIiIHN0UmVmOmRvY3VtZW50SUQ9InhtcC5kaWQ6MkZDOTIzNzRGOTQ5RTQxMTk2M0JC - NEQ0MzNCOUIxQzgiLz4gPC9yZGY6RGVzY3JpcHRpb24+IDwvcmRmOlJERj4gPC94OnhtcG1ldGE+IDw/ - eHBhY2tldCBlbmQ9InIiPz6wJF34AAACl0lEQVRIS62Vy08TURSH73/QhQtXVnBhxEcMiUkhbEg0hB1R - Q1i68C8wIW5cEqMLN7ho2Ji4YiEhWq0prYUhfULbadN3obTaChobtZEUsFY9nnPS6WM6HYowyZf87j33 - nG/amaai9geOBYA+4pTxihmBE8DcTQB4J8em/9IwSQyagmrtL+z9rMFmvnhkKvtV7tcVHPz6DVsftulA - AckdhUg8zf19eoLKAd597iMLMItewfOxUDTN/bqCH3tVSG8VWIBZ9AoJApEk9+sKvu/uQ2IjzwJkGtH8 - OrTwy3Hu77vIAnV9mgWlcgWiqRwLjAMmkOMbPbNTKnN/JJntqJGEBZ++7oKcyLLgLN4JrU8Cms2C4pcy - BKKZumCI18temQ/8DzSLZlBmQX7nG/jCKdpgAa0driCtY5iFHuqHSjNoFtaags1iCdzBBG+QgNY2aZ0F - mIUe6osENAtrTUEq/7kDq9PHAszU5yYoq9f1i9cUSCD5ozxDEeTsrhAoONwyxLLb8MrhYQFmZYCHsnpd - v3hNgQROb5hnKIK29944MAThTBEWbS4WYBZ6qC/sKSy5ZJ6BGUQg8b4Bbhjod4AZXlhXWdBa10LrIVul - AM9ggS+aa6AIMMO8ZYUO0KeyIOMtZyaQpXpNi4LFucYzMINwhbMNcMNw5oIJMMNKIA0LNg88mZuH/ssj - dPgBMnN+cBRmny1wrRtSMMMzWCCFMg0UAeY2Fh0+GL5xG8Zu3oHXUrCj3g0WONdTbeBm21/o1N17gPtg - 98Xh3VoS3qzKMDI22agfglnY/Uld8NDc/ZlZwAwvl4Ngun6LGh8rdfVDViNs3rguOOzq6XOD8PDpc7g2 - OkHDH7XWtYa2It66Y4eCQ8cRfpvUNa2hTUD8A6JMaBvCyTdJAAAAAElFTkSuQmCC - - iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 @@ -1403,7 +1485,7 @@ AAAASUVORK5CYII= - + iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 YQUAAAAZdEVYdFNvZnR3YXJlAEFkb2JlIEltYWdlUmVhZHlxyWU8AAADZmlUWHRYTUw6Y29tLmFkb2Jl @@ -1415,108 +1497,26 @@ bS94YXAvMS4wL21tLyIgeG1sbnM6c3RSZWY9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlw ZS9SZXNvdXJjZVJlZiMiIHhtbG5zOnhtcD0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wLyIgeG1w TU06T3JpZ2luYWxEb2N1bWVudElEPSJ4bXAuZGlkOjJGQzkyMzc0Rjk0OUU0MTE5NjNCQjRENDMzQjlC - MUM4IiB4bXBNTTpEb2N1bWVudElEPSJ4bXAuZGlkOkUzNzJDMjE3NEFENjExRTRCNjE0OEVEQzI4MEM0 - RTZDIiB4bXBNTTpJbnN0YW5jZUlEPSJ4bXAuaWlkOkUzNzJDMjE2NEFENjExRTRCNjE0OEVEQzI4MEM0 - RTZDIiB4bXA6Q3JlYXRvclRvb2w9IkFkb2JlIFBob3Rvc2hvcCBDUzYgKFdpbmRvd3MpIj4gPHhtcE1N - OkRlcml2ZWRGcm9tIHN0UmVmOmluc3RhbmNlSUQ9InhtcC5paWQ6RkI3NUQ0QkNENDRBRTQxMTk3NEFD - QUFFQjRCMzVENkUiIHN0UmVmOmRvY3VtZW50SUQ9InhtcC5kaWQ6MkZDOTIzNzRGOTQ5RTQxMTk2M0JC - NEQ0MzNCOUIxQzgiLz4gPC9yZGY6RGVzY3JpcHRpb24+IDwvcmRmOlJERj4gPC94OnhtcG1ldGE+IDw/ - eHBhY2tldCBlbmQ9InIiPz6PyaLfAAADMElEQVRIS6VUXUiTYRT+vi3Tzd+ps23+3KRigtiPkolEQReG - UYTkhWatpWlWGkRdddfdSPImqUAJjSIT00oxLJIk0cR+tFSyzDJtgaMkDEPkdM7ZPvm2vS6jBx6es3Pe - 8zzvtm+TohLS/ov+AACStLgEQuJyLRJWYK1yzh/+FgCoQrpnfM4fOGBhcUlIMkEVkma4H4i1y2kFcMD8 - wqKQZILKZqTqmlTAWrfvMjhgbv63Dwm0hLWQohn1eNEbzrlfPiTQAtZCKjP1GXdAIC+r4XD+9CGBFrDm - RVJ1re6pZ0GyHHMvIawauYVNCFPfvvuQQAtYC6meKXU0amNsaGN/ZR60xIf9aIgN3cpGE9OzZCZ85nEm - pGiWlLABmuJCnUOXrNB7chdct4TUo32ANDbp4NuielDpqWfePdaPX6GrohSK4uLhlCEo96YlZLbOFHzH - oJXjMSBcGn4/zQGovEDqXXtzeTb+BTrKj0J3+Q54djYP7EZdTU2MPjFSK8eieQR9QtLg6GcOQPWgqKeQ - ZyOfoK30CDw+lg2Ot3Z4VLoNqo269mCNHIa2WjYn9A1PcAAqU6m9VV3TF9psOwwPS3JgZugCdNoyocwU - jU+RlImWBpezGz0vxzkA1YOiHvPFO7Ca1kGHLQtmXp2HdutmqN+/F6JiU+h3kOpyVeHJwBgHoLIpqajm - 189HoaG4CNqsGTA1UAWth9Lg6r490PygGyLjUikgzuWqQlffCAegelDdUwLqigqhpXgjTPYeh+bCFCg2 - RkEk3vxuVz/P0c43oLP3DQegLhspNalSFxiNcLswHT48LYNbBUlQk7ebzenmyhm08w1o7xmiAP6hRZiT - 70eYkzpctUuJWdHmwWs74+F1Uz7cyE+E4ohQB5mHm9a3GywpTXzektyKduIAIsKI3ISkL4rIdYle05C9 - VrZVBmvtl7eboUyv7V4jSQdwRn8FdI72iErtCUxnIuifkJ5hUqUOq9Jr7OeCNU6bTpNVqtMcDJSldOwn - KnOk+jypJ5QANRWc0cs5SEelXr54QidfwVYAMoiHq4W/gNM6OaNCJ+diaUIqN/43+Atwg27t+9ZXBUn6 - A2MdqQeVc5pWAAAAAElFTkSuQmCC - - - - - iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAIAAABvFaqvAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAZdEVYdFNvZnR3YXJlAEFkb2JlIEltYWdlUmVhZHlxyWU8AAADZmlUWHRYTUw6Y29tLmFkb2Jl - LnhtcAAAAAAAPD94cGFja2V0IGJlZ2luPSLvu78iIGlkPSJXNU0wTXBDZWhpSHpyZVN6TlRjemtjOWQi - Pz4gPHg6eG1wbWV0YSB4bWxuczp4PSJhZG9iZTpuczptZXRhLyIgeDp4bXB0az0iQWRvYmUgWE1QIENv - cmUgNS4zLWMwMTEgNjYuMTQ1NjYxLCAyMDEyLzAyLzA2LTE0OjU2OjI3ICAgICAgICAiPiA8cmRmOlJE - RiB4bWxuczpyZGY9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkvMDIvMjItcmRmLXN5bnRheC1ucyMiPiA8 - cmRmOkRlc2NyaXB0aW9uIHJkZjphYm91dD0iIiB4bWxuczp4bXBNTT0iaHR0cDovL25zLmFkb2JlLmNv - bS94YXAvMS4wL21tLyIgeG1sbnM6c3RSZWY9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlw - ZS9SZXNvdXJjZVJlZiMiIHhtbG5zOnhtcD0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wLyIgeG1w - TU06T3JpZ2luYWxEb2N1bWVudElEPSJ4bXAuZGlkOjJGQzkyMzc0Rjk0OUU0MTE5NjNCQjRENDMzQjlC - MUM4IiB4bXBNTTpEb2N1bWVudElEPSJ4bXAuZGlkOjUzQzNGNDI5NEQyQzExRTQ4QkE1QUNCMEVDRDZF - MDVEIiB4bXBNTTpJbnN0YW5jZUlEPSJ4bXAuaWlkOjUzQzNGNDI4NEQyQzExRTQ4QkE1QUNCMEVDRDZF - MDVEIiB4bXA6Q3JlYXRvclRvb2w9IkFkb2JlIFBob3Rvc2hvcCBDUzYgKFdpbmRvd3MpIj4gPHhtcE1N - OkRlcml2ZWRGcm9tIHN0UmVmOmluc3RhbmNlSUQ9InhtcC5paWQ6RkI1NUY4OTYyQTRERTQxMUIzNkJE + MUM4IiB4bXBNTTpEb2N1bWVudElEPSJ4bXAuZGlkOjJERjY3MEZENEQyMzExRTRCNDlGQUMwMzk0OTAw + Qzc4IiB4bXBNTTpJbnN0YW5jZUlEPSJ4bXAuaWlkOjJERjY3MEZDNEQyMzExRTRCNDlGQUMwMzk0OTAw + Qzc4IiB4bXA6Q3JlYXRvclRvb2w9IkFkb2JlIFBob3Rvc2hvcCBDUzYgKFdpbmRvd3MpIj4gPHhtcE1N + OkRlcml2ZWRGcm9tIHN0UmVmOmluc3RhbmNlSUQ9InhtcC5paWQ6NjhGOUEyRDEyMTRERTQxMUIzNkJE NUVDQjU5MzE1NjIiIHN0UmVmOmRvY3VtZW50SUQ9InhtcC5kaWQ6MkZDOTIzNzRGOTQ5RTQxMTk2M0JC NEQ0MzNCOUIxQzgiLz4gPC9yZGY6RGVzY3JpcHRpb24+IDwvcmRmOlJERj4gPC94OnhtcG1ldGE+IDw/ - eHBhY2tldCBlbmQ9InIiPz6IsaOmAAADF0lEQVQ4T62U/UuTURTH+0nICqRI1ERMMyNQe8N0ChqBwQhN - yvwhEgJjVCqJ/qCibZo6tzQ339h6Nre5prapUzc1XzItX1ilzuWMLLVAen+xf6DTuTxjdxsFVj58ebjc - c+7nnud7z3228DbpIaDFH/CfoqCn72DIDvNfPDM2KAqyr8PcJxqY+QBTb8kkjocXQTsKigGwfqYJHqIg - 1OxHGHvlWPx4hXB1YyA3g4CBhqst+piEnrDA3rA95vBAY1x8d7lq/DVZwm5PQZNvoKYdypSgHgbVEIh1 - cLOZzOCbSSsyRQRba6uWtcpVLbPcwlglInNUCJNWWKqABqMLCGvGlfpJELaQ/V1Vd1lujAhe0chtUrH5 - ZExnmJ85MdomEa+qZMbIEF2BHGunILSjdZwYgTt4gJqjjj0Rltml1Zq9AeL0Mn71Wn2mtDU80MIvsFTw - O+KPIoWC8BNYRIUaqrRQroJKjQOk9N+xLBF2pXJFKfnsDGYa8gS6xOO2whyMuoHaHpGzZ/pBM0IMrtXD - nT4HqNHXe0lYoogMFeQP4jbSDkCPTUyXmnNoPutSo+9WN5DEQDyeWCWnhqm4p7Oimt3b54rzmmKPVHKz - 0Xg0AU1pz87VJp+yXOfd9t3mBmLXsGrsJhSsDtF4iOWxKdpzyQNnuRW7vEUp13obFG05OVUBPtO5V1Sn - k5q4SX8ENfWA6C7xHsP981Bb2sf38ZKd4JhSuXUJHPHhg/WJnAeZFw0Xzt/w8erRtLmBnB/CSmaC599I - 2PYVRl+CXigu3R9SfCC0Pf1MZ1oqvqvjogX7gtRFJfb1n24g7GblfQcFP2fkBYm5anxqQcbLKgzyK/Df - WRTkV5+RMTg84ZrgAOHo4ZIDVNdJw67CpsVLZ5gifj97Typlq2ZFQXj8LKh5EHpnaIar8N+Al5l9Y9Vs - T7OiIAzjqaMsa6QJnBkeWvgOHdPkAuIV67PSeQpCYYZplsZ+KyyWLRyFF8D553EDbURY770J0rrYJbda - SYE4iWb9NcgpRKDrOMAWwYP6d5BTaC52zyaAWDlAm/DweL8AX9zXukfxHsIAAAAASUVORK5CYII= - - - - - iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAZdEVYdFNvZnR3YXJlAEFkb2JlIEltYWdlUmVhZHlxyWU8AAADZmlUWHRYTUw6Y29tLmFkb2Jl - LnhtcAAAAAAAPD94cGFja2V0IGJlZ2luPSLvu78iIGlkPSJXNU0wTXBDZWhpSHpyZVN6TlRjemtjOWQi - Pz4gPHg6eG1wbWV0YSB4bWxuczp4PSJhZG9iZTpuczptZXRhLyIgeDp4bXB0az0iQWRvYmUgWE1QIENv - cmUgNS4zLWMwMTEgNjYuMTQ1NjYxLCAyMDEyLzAyLzA2LTE0OjU2OjI3ICAgICAgICAiPiA8cmRmOlJE - RiB4bWxuczpyZGY9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkvMDIvMjItcmRmLXN5bnRheC1ucyMiPiA8 - cmRmOkRlc2NyaXB0aW9uIHJkZjphYm91dD0iIiB4bWxuczp4bXBNTT0iaHR0cDovL25zLmFkb2JlLmNv - bS94YXAvMS4wL21tLyIgeG1sbnM6c3RSZWY9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlw - ZS9SZXNvdXJjZVJlZiMiIHhtbG5zOnhtcD0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wLyIgeG1w - TU06T3JpZ2luYWxEb2N1bWVudElEPSJ4bXAuZGlkOjJGQzkyMzc0Rjk0OUU0MTE5NjNCQjRENDMzQjlC - MUM4IiB4bXBNTTpEb2N1bWVudElEPSJ4bXAuZGlkOkVENUYwQThBNEQyOTExRTQ5QzUzQzdFMkFGQkQy - NTA1IiB4bXBNTTpJbnN0YW5jZUlEPSJ4bXAuaWlkOkVENUYwQTg5NEQyOTExRTQ5QzUzQzdFMkFGQkQy - NTA1IiB4bXA6Q3JlYXRvclRvb2w9IkFkb2JlIFBob3Rvc2hvcCBDUzYgKFdpbmRvd3MpIj4gPHhtcE1N - OkRlcml2ZWRGcm9tIHN0UmVmOmluc3RhbmNlSUQ9InhtcC5paWQ6MkRGNkEzOUYyOTRERTQxMUIzNkJE - NUVDQjU5MzE1NjIiIHN0UmVmOmRvY3VtZW50SUQ9InhtcC5kaWQ6MkZDOTIzNzRGOTQ5RTQxMTk2M0JC - NEQ0MzNCOUIxQzgiLz4gPC9yZGY6RGVzY3JpcHRpb24+IDwvcmRmOlJERj4gPC94OnhtcG1ldGE+IDw/ - eHBhY2tldCBlbmQ9InIiPz6npMy1AAAGEUlEQVRIS7WVeVDUZRjHf7Ase8ECu+wl4LIXcqyyHC783AWW - 5QaRFTHkMi9SQvE+UhLzwk0BUcQSgQBBgcYDzStMSzOPcpqcmo5pmqk/+rOapqb+iG/PbzfFcSz/6pn5 - zPN739/7fp/nvZn/3TSLjj+XJy2/RaItPCT5vaBd8m1+q2Qku1lcrcvki+iXr7fFU6ZZeOx5KDU1b7jU - 1Z2bVPMPWNMbRXrXkWAc+ywVLbcS8fKwFjlu8VdpW0XzSc6f8PEIPzJ19dFnU3WEJdHL9P3X9O1nkdB8 - CQrX7i3mKn9zfqsUq29ZsPfjRBx5aMO2cTMy94gm7FuF7XyJTwDJTo5GVdHxNALVgsPd5Ceye+9g8b0f - UXbjB8RtH4Msd+MeXS7f6twjxbILZiy7pEHDtTBsvG7BqivTUXpsClLWCbtJNpDwBlGVH3ySIFV520eW - nedRcf0HVJGwbeRrOHs/h2n1CGRZDe7wND/W1hiI8sEYlJ4KRcVpJcrfVqByNBILhqLh3KeA+UXBOpL2 - jkRZduARPGXZ/vH4pnMou/gd7INfIPn4QyQc/RSOzk9hrBtEiKPerUn1Y5PXBaDojWlwdgUjr0+G/H4Z - cnpCUNJrQNZ+LeLrBD/LYnixFEDAKFz7vJQ0r49dO4zikS8x8/ADxLd9jIT2B5ix/z7SX78Pw+K3EJy2 - wq1M4rEz6sRwthgw82Ag2KNS2I5JPZ4rZx00ImGNHIZSfisFkDGhxbs5AkKLd/3kaLkDlgTjXrsNc/Md - mPfeQeyOD2HbcRu6yi4E2Wrd8ngeG71IBPtePWa4JUhsD0DykQAkHQqApUWCFLcGyZvDoZ/P/5oCTGXk - hU2MvGB7rbGmG47dd2Fa+x6iX/kAMa/eQvS2m4jaeAPspvcROb8TQexid3CcL2usFCJjnwE5nQYU9RhR - PGDC7D4TCrqMyDqkR9oePbRz/SZEKh8rI8vdyshyXhmzLD8DS/1VGOquwtgw7glkXH0Nhvp3kbL2GrSl - hyC11ril03xZfbkQKZuVsDeq4NihRtYuDbJ2auBoUsO2TQXrJiWMlWIExflWMiHOjRzfJy0bg776HCKX - vANd7WXol1/xeN3Si7A2XIXW1YbAxAq3UO0zPTSd1yG38bplLK//vxBrffKY4PQ1HH9aKk8jonQUUyvO - Qlt9HtqaCx4/tXIMyXWXMXXOAQTEv+D2zCvDhBBTCN1zCGOCZq3k+DXO1YcpRYOY4hpF2LzTCCs74/VE - 3IvnEVd1EhGFblBbWot6BKXWQZq64tlYa2+TuJwQM9KU5cRL35hyOxCe2w913hA0hcPQFI16KRzxEFtO - a1Q9htSVN5C+5S5x7x/uIm3DR7CvuomUReOImt1FU7nwEolHECImMGkJE5i46EJkejNM+X1QOPqhzBqC - KvskVDmnJuHKT/K4bgjKzBMItXcjJv84NOwWiKPndJK40TOCgPgaRmIur1dZ1yM6txvyWT0ITR+AImOQ - gg39N1ybDBJP60PorC5My3oTwQm18FdNryBxbq0EJL6AEUTYZBTkF0NGKyKdvZDb3qJOAxSIOqcP/jtp - JyC3D1BSvYgp6EN4aiNlP/cTEk4gFASPEUeXkWd8RaY5jcrEBkTn9UCT4Q3gzfBfRvJE9rrsfpicHSRe - NsFXmJeSXhTBXXY+jMjk8uArVkpExuKb6pkbYJ7L7Ria37xTUBeMeCkcncRTN0z/TyLKNYy4khNQJq2G - IMLBXdUWQkXwCYYR6md7IPP1k8WEC3UFDzSpG2BZeAZJtXQWFpyls3HOC50JzkdQnbFqDInLLiC2rBcq - 6xoSzzzP+NDVwDBaQkx4XzahNv8xZH48sVotCHeOUnnCWNJG18Q4UjddB7vlfbBbPwC7+YannLTyIrS5 - OyHU5v3hr07poL7JBHe4Jh8bzgQROY8h46IKCAVfbi73D3PcpfoJlX0VtEVN0JXsQlj2ZoRaaynj7N/8 - NfZLPLFmHrXnpiWSCCL8iMl32T/M6YGMq+R+covD7QADwfoIgqt4QVGtfvIZJ4lRv5CY4zypbjfjy+eE - M4l4gtuSwYSQ4DS4EZAew/wNiCYQJlvQU3cAAAAASUVORK5CYII= + eHBhY2tldCBlbmQ9InIiPz6GKmpFAAAC+UlEQVRIS63T20vTYRzH8Yforj/Ei24UiSgKIygKi8oyxZQo + cvNYeXaesmzqPGu2POd0ulSsnIdaurTSTJ3O6UxTPGya5vCQx5AuPn39RbHop7nZxQt+z3ie93e/Z4w1 + p7nsCoBt8R6yBF/UHPv+Wb0rfFFzm99CRIwEW1gnqXzxTXxRc0ydctm4OlID2sxrw6iCtiwItC+A2P/D + frLnjwGNSZdMq6N1WOvLwFpP4l/WdRlY6Jaio9Ab7QXba8sVoDHZGdT8PYS9THDqMGnLsKpNw0qXGCua + BO55VZdNQ6U/DRRibVCGb+N1pH5bukoRqHmDHOIG1N8/X2F4I8WyNhtf2+9hqSsZxqZ4upbb6HsSZLHO + Im90ym6hNVcIaktYTexZyUelGEvaHMy/jcFiZxo0xX5Y7ivGcn8JkVmA9uvlWBmqwpJeAWovs+poR99O + eRgWtQWYVUdgrj0FH+i+F3XF3NoappZYGJrEoLaOVYpOOTY/FGJB+xjTqnDMtMTTAC/Ma/Ix/TLUKl9e + x0JfFQpql7PykBP7lWIXzPeUYLIhHCPKCLr/AMy2ZsKoDLTKdNNdvM8TgNpRTBZwfJ885CTmaIChPhwa + mS+GnkdhqjEWY9X+VplqvIMXEhdQ24mZeuSs0N/BNNWWj4k6EdSZHhhXxWH0aSCGFd4c4Tk7zk7XBlUM + FKLToK4Nm+0qYnneRzqGGiSYaIiiyZdhVCdgqFSIwRJPjucZW85O1pvnRmvDkO9zFNTdy2Y6HjGp4HCF + 5kk4xhoiURd/EROv4tBfeM0qAyUC9Mp9QM0+7o829T6LZV0/mNycS6+nFKFWfAGj9ZHozfGwil7miZYH + 7qCmghsw+S6VpV894KuUuKFbfhNNqa749CwY3dm0toK+VABl3HlQM5obYHybwFLc7W1y/Y5BlX6FfgNn + DNcEY0DhZZX+MiGKbh0DNR24AYYWMSfJzc6GZBApwS5skIzNODcg0dV2V36FtsJ7yBJ8UXO8hyzBFzXH + ++H/A/YDv9/V87iOlrYAAAAASUVORK5CYII= @@ -3164,9 +3164,6 @@ 864, 17 - - 864, 17 - iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 diff --git a/Program.cs b/Program.cs index e38f7b8..a76d0d4 100644 --- a/Program.cs +++ b/Program.cs @@ -16,14 +16,14 @@ [STAThread] static void Main() { - ValidateInfo validateInfo = ValidateConfig.LoadConfig(); + ValidateConfig.LoadConfig(); string localConfigPath = Application.StartupPath + "/Config.xml"; //获取程序及版本信息 string currentVersionCode = Assembly.GetExecutingAssembly().GetName().Version.ToString(); //获取文件版本信息 FileVersionInfo.GetVersionInfo(Application.ExecutablePath); - + Utility.SysInfoConfig(); string configUrl = getProgramUrl(localConfigPath, "configurl"); if (configUrl != "") { diff --git a/TreeUtils.cs b/TreeUtils.cs index 1f055b5..ad39643 100644 --- a/TreeUtils.cs +++ b/TreeUtils.cs @@ -19,7 +19,7 @@ public static void InitLayerTree(GSOGlobeControl gsoGlobeControl, TreeView treeView, string viewDatasrc) { // treeView.Nodes.Clear(); - LayerConfig layerConfig = Utility.layerConfig;//layertree所在的配置文件 + LayerConfig layerConfig = Utility.LayerConfig;//layertree所在的配置文件 List datasrcs = layerConfig.datasrcs; foreach (DataSrc datasrc in datasrcs) { diff --git a/Utility.cs b/Utility.cs index c03e405..ab947a3 100644 --- a/Utility.cs +++ b/Utility.cs @@ -20,7 +20,7 @@ public static string dbdatabase; public static string userID; - public static Hashtable Pipe_QueryFields; +// public static Hashtable Pipe_QueryFields; public static string DBPassword; public static string DBServer; public static string DBBackUp; @@ -38,7 +38,7 @@ public static List listPipelineType; public static string PicRootURL; public static string PicDefaultURL; - public static double dFlyAboveLine = 2; +// public static double dFlyAboveLine = 2; public static string userName; public static string projectStr; public static string userRole; @@ -85,12 +85,17 @@ public static List pipefittingLayerNames = new List();//管件图层名称 public static List sgPipeLayersNames = new List();//施工管线图层名称 -// public static Dictionary dictionaryNetLayerNameAndCaption = new Dictionary(); - public static HashSet layerNameSet = new HashSet(); + public static HashSet layerNameSet = new HashSet();//记录有哪些图层要显示 public static string roadLayerName = ""; #endregion wxl - public static LayerConfig layerConfig; + public static LayerConfig LayerConfig; + + public static string RoleServer; + public static string TitleImagePath; + public static string SysnameVersion; + public static string Copyright; + public static void SetBallons(GSOBalloon featureTooltip, GSOBalloonEx balloonEx) { featureTooltip.CacheFilePath = Application.StartupPath + "/GeoScene/Globe/Temp"; @@ -188,25 +193,6 @@ } return s.ToString(); } - public static GSOFeatures Table2Features(DataTable table, string currentQueryLayer, GSOGlobeControl globeControl1) - { - GSOFeatures features = new GSOFeatures(); - for (int i = 0; i < table.Rows.Count; i++) - { - DataRow row = table.Rows[i]; - - string featureName = row["编号"].ToString(); - featureName = featureName.Trim(); - GSOLayer layer = globeControl1.Globe.Layers.GetLayerByCaption(currentQueryLayer); - GSOFeatures tempfeatures = layer.GetFeatureByName(featureName, false); - if (tempfeatures.Length > 0) - { - features.Add(tempfeatures[0]); - } - } - return features; - } - //程序启动的时候读取配置文件 public static void SetParams() @@ -358,8 +344,8 @@ #region wxl 从layerconfig.xml中读取 - layerConfig = XmlTools.DeserializeFromXml(layerConfigFile); - List dataSrcs = layerConfig.datasrcs; + LayerConfig = XmlTools.DeserializeFromXml(layerConfigFile); + List dataSrcs = LayerConfig.datasrcs; foreach (var dataSrc in dataSrcs) { @@ -598,76 +584,49 @@ #endregion } - /* - //判断网络是否连接 - public static bool isNetworkConnectionSuccess(string ipAdress) + /// + /// 获取Config.xml配置文件中的roleurl配置，并返回 + /// + /// 请求综合信息平台的服务地址 + public static void SysInfoConfig() { - //return true; - if (ipAdress == null) - { - return false; - } - if (ipAdress.Contains("\\")) - { - ipAdress = ipAdress.Substring(0, ipAdress.LastIndexOf('\\')); - } - if (ipAdress.Trim() == "localhost" || ipAdress.Trim() == "127.0.0.1" || ipAdress.Trim() == Dns.GetHostName()) - { - return true; - } - Ping ping = new Ping(); + if (!File.Exists(filename)) return; + + XmlTextReader xmlReader = new XmlTextReader(filename); try { - PingReply pr = ping.Send(ipAdress.Trim(), 3000); - if (pr.Status == IPStatus.Success) + while (xmlReader.Read()) { - return true; + if (xmlReader.Name.Equals("roleurl")) + { + RoleServer = xmlReader.ReadElementString(); + } + else if (xmlReader.Name.Equals("titleimgpath")) + { + TitleImagePath = xmlReader.ReadElementString(); + } + else if (xmlReader.Name.Equals("sysname")) + { + SysnameVersion = xmlReader.ReadElementString(); + } + else if (xmlReader.Name.Equals("copyright")) + { + Copyright = xmlReader.ReadElementString(); + } } - else - { - return false; - } + } catch (Exception ex) { - LogError.PublishError(ex); - return false; + + LogHelper.Error("在config.xml配置文件中读取roleurl时出错"); } - } - */ - - - //TODO LIST:下面两个方法移到featueTools.cs中 - //根据附属物图层名字得到里面含有的附属物 - public static string[] getAccStrsByLayer(string layername) - { - string[] accStrs = null; - string sql = "select 附属物名称 from " + layername + " group by 附属物名称"; - DataSet dataset = OledbHelper.getDataSet(sql, layername); - if (dataset == null) return null; - accStrs = new string[dataset.Tables[0].Rows.Count]; - for (int i = 0; i < dataset.Tables[0].Rows.Count; i++) + finally { - accStrs[i] = dataset.Tables[0].Rows[i][0].ToString(); + xmlReader.Close(); } - return accStrs; } - //删除内存图层中指定名称的feature - public static void RemoveFeatureFromName(GSOGlobeControl globeControl1, string featureName) - { - GSOFeatures features = globeControl1.Globe.MemoryLayer.GetFeatureByName(featureName, true); - if (features != null) - { - for (int i = features.Length - 1; i >= 0; i--) - { - GSOFeature feature = features[i]; - if (feature != null) - { - globeControl1.Globe.MemoryLayer.RemoveFeatureByID(feature.ID); - } - } - } - globeControl1.Refresh(); - } + + } } diff --git a/ValidateInfo.cs b/ValidateInfo.cs index de75391..01546da 100644 --- a/ValidateInfo.cs +++ b/ValidateInfo.cs @@ -192,7 +192,7 @@ } if (!isSuccess) { - LogHelper.WriteLog(typeof(FieldUniqueValidate), logStr); + LogHelper.Error(logStr); } return isSuccess; } @@ -247,7 +247,7 @@ err += "未找到字段或其类型匹配:" + unFoundField.label + ":" + unFoundField.type + "\r\n"; } - LogHelper.WriteLog(typeof(FieldCountValidate), err); + LogHelper.Error(err); return false; } return true; @@ -316,7 +316,7 @@ { err += "字段:" + field.label + "出错\r\n"; } - LogHelper.WriteLog(typeof(FieldOrderValidate), err); + LogHelper.Error(err); return false; } return true; @@ -388,8 +388,7 @@ } if (isSuccess == false) { - LogHelper.WriteLog(typeof(FieldEmptyValidate), - "字段为空检查失败:\r\n" + err); + LogHelper.Error("字段为空检查失败:\r\n" + err); } return isSuccess; } diff --git a/bin/x86/Debug/Config.xml b/bin/x86/Debug/Config.xml index 6995f64..6a453a3 100644 --- a/bin/x86/Debug/Config.xml +++ b/bin/x86/Debug/Config.xml @@ -25,6 +25,11 @@ http://127.0.0.1/Cyberpipe.msi http://127.0.0.1/Config.xml + http://192.168.0.102:8080/ctrl + /Resource/title.jpg + 智慧太湖新城管网规划分析系统6.0 + @2014-2015 苏州航天系统工程有限公司 版权所有 + 编号,管线编码,管径_毫米,材质,埋设方式,起始地面高程,起始埋深,终止地面高程,终止埋深,建设年代,使用年限,权属单位,设计单位,设计负责人,施工单位,施工负责人,监理单位,监理负责人,业务负责人,备注 编号,管线编码,管径_毫米,材质,埋设方式,起始地面高程,起始埋深,终止地面高程,终止埋深,建设年代,使用年限,权属单位,设计单位,设计负责人,施工单位,施工负责人,监理单位,监理负责人,业务负责人,备注 diff --git a/bin/x86/Debug/config/log4net.config b/bin/x86/Debug/config/log4net.config index 80f9b25..6fbcfa7 100644 --- a/bin/x86/Debug/config/log4net.config +++ b/bin/x86/Debug/config/log4net.config @@ -3,29 +3,118 @@
- - - - - - - - - - - - - - - + + + -property: [%property{NDC}] - %n错误描述：%message%newline %n"/> - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/bin/x86/Debug/glVersion.txt b/bin/x86/Debug/glVersion.txt index cd82eca..755455e 100644 --- a/bin/x86/Debug/glVersion.txt +++ b/bin/x86/Debug/glVersion.txt Binary files differ diff --git a/bin/x86/Debug/log.txt b/bin/x86/Debug/log.txt index a4966d3..2112642 100644 --- a/bin/x86/Debug/log.txt +++ b/bin/x86/Debug/log.txt @@ -430,3 +430,43 @@ exception over ------------------------------------------------------------ + + exception begin -----------------2016/11/29 18:54:54--------------------- + + + + e.Message:第 29 行，位置 4 上的开始标记“titleimagpath”与结束标记“titleimagepath”不匹配。 第 29 行，位置 39。 + + e.Source:System.Xml + + e.TargetSite:Void Throw(System.String, System.String[]) + + e.StackTrace: 在 System.Xml.XmlTextReaderImpl.Throw(String res, String[] args) + 在 System.Xml.XmlTextReaderImpl.ThrowTagMismatch(NodeData startTag) + 在 System.Xml.XmlTextReaderImpl.ParseEndElement() + 在 System.Xml.XmlTextReaderImpl.ParseElementContent() + 在 Cyberpipe.Utility.SetParams() 位置 E:\wxl\work\GHFX_REFACTOR\Utility.cs:行号 208 + + + + exception over ------------------------------------------------------------ + + exception begin -----------------2016/11/29 18:57:17--------------------- + + + + e.Message:第 29 行，位置 4 上的开始标记“titleimagpath”与结束标记“titleimagepath”不匹配。 第 29 行，位置 39。 + + e.Source:System.Xml + + e.TargetSite:Void Throw(System.String, System.String[]) + + e.StackTrace: 在 System.Xml.XmlTextReaderImpl.Throw(String res, String[] args) + 在 System.Xml.XmlTextReaderImpl.ThrowTagMismatch(NodeData startTag) + 在 System.Xml.XmlTextReaderImpl.ParseEndElement() + 在 System.Xml.XmlTextReaderImpl.ParseElementContent() + 在 Cyberpipe.Utility.SetParams() 位置 E:\wxl\work\GHFX_REFACTOR\Utility.cs:行号 208 + + + + exception over ------------------------------------------------------------ diff --git a/bin/x86/Debug/log/2016/201611/20161107.txt b/bin/x86/Debug/log/2016/201611/20161107.txt deleted file mode 100644 index cd32fa6..0000000 --- a/bin/x86/Debug/log/2016/201611/20161107.txt +++ /dev/null @@ -1,152 +0,0 @@ - - -��¼ʱ�䣺2016-11-07 10:30:22,327 -�߳�ID:[9] -��־���� ERROR -�����ࣺCyberpipe.FrmBSQStatis property: [(null)] - -����������1 - - - -��¼ʱ�䣺2016-11-07 10:30:40,660 -�߳�ID:[9] -��־���� ERROR -�����ࣺCyberpipe.FrmBSQStatis property: [(null)] - -����������0 - - - -��¼ʱ�䣺2016-11-07 14:00:27,070 -�߳�ID:[8] -��־���� ERROR -�����ࣺCyberpipe.Forms.FrmPipelineModelDB property: [(null)] - -����������δ�������������õ������ʵ���� - - - -��¼ʱ�䣺2016-11-07 14:00:36,154 -�߳�ID:[8] -��־���� ERROR -�����ࣺCyberpipe.Forms.FrmPipelineModelDB property: [(null)] - -����������δ�������������õ������ʵ���� - - - -��¼ʱ�䣺2016-11-07 14:00:40,186 -�߳�ID:[8] -��־���� ERROR -�����ࣺCyberpipe.Forms.FrmPipelineModelDB property: [(null)] - -����������δ�������������õ������ʵ���� - - - -��¼ʱ�䣺2016-11-07 14:05:46,422 -�߳�ID:[9] -��־���� ERROR -�����ࣺCyberpipe.Forms.FrmPipelineModelDB property: [(null)] - -����������δ�������������õ������ʵ���� - - - -��¼ʱ�䣺2016-11-07 14:06:34,633 -�߳�ID:[10] -��־���� ERROR -�����ࣺCyberpipe.Forms.FrmPipelineModelDB property: [(null)] - -����������δ�������������õ������ʵ���� - - - -��¼ʱ�䣺2016-11-07 14:06:36,301 -�߳�ID:[10] -��־���� ERROR -�����ࣺCyberpipe.Forms.FrmPipelineModelDB property: [(null)] - -����������δ�������������õ������ʵ���� - - - -��¼ʱ�䣺2016-11-07 14:06:44,800 -�߳�ID:[10] -��־���� ERROR -�����ࣺCyberpipe.Forms.FrmPipelineModelDB property: [(null)] - -����������δ�������������õ������ʵ���� - - - -��¼ʱ�䣺2016-11-07 14:07:03,449 -�߳�ID:[10] -��־���� ERROR -�����ࣺCyberpipe.Forms.FrmPipelineModelDB property: [(null)] - -����������δ�������������õ������ʵ���� - - - -��¼ʱ�䣺2016-11-07 14:07:05,165 -�߳�ID:[10] -��־���� ERROR -�����ࣺCyberpipe.Forms.FrmPipelineModelDB property: [(null)] - -����������δ�������������õ������ʵ���� - - - -��¼ʱ�䣺2016-11-07 17:58:24,384 -�߳�ID:[10] -��־���� ERROR -�����ࣺCyberpipe.Forms.FrmPipelineModelDB property: [(null)] - -����������δ�������������õ������ʵ���� - - - -��¼ʱ�䣺2016-11-07 18:11:22,114 -�߳�ID:[8] -��־���� ERROR -�����ࣺCyberpipe.Forms.FrmPipelineModelDB property: [(null)] - -����������δ�������������õ������ʵ���� - - - -��¼ʱ�䣺2016-11-07 18:12:13,619 -�߳�ID:[8] -��־���� ERROR -�����ࣺCyberpipe.Forms.FrmPipelineModelDB property: [(null)] - -����������δ�������������õ������ʵ���� - - - -��¼ʱ�䣺2016-11-07 18:12:33,268 -�߳�ID:[8] -��־���� ERROR -�����ࣺCyberpipe.Forms.FrmPipelineModelDB property: [(null)] - -����������δ�������������õ������ʵ���� - - - -��¼ʱ�䣺2016-11-07 18:12:43,628 -�߳�ID:[8] -��־���� ERROR -�����ࣺCyberpipe.Forms.FrmPipelineModelDB property: [(null)] - -����������δ�������������õ������ʵ���� - - - -��¼ʱ�䣺2016-11-07 18:12:53,488 -�߳�ID:[8] -��־���� ERROR -�����ࣺCyberpipe.Forms.FrmPipelineModelDB property: [(null)] - -����������δ�������������õ������ʵ���� - - - -��¼ʱ�䣺2016-11-07 18:13:31,996 -�߳�ID:[8] -��־���� ERROR -�����ࣺCyberpipe.Forms.FrmPipelineModelDB property: [(null)] - -����������δ�������������õ������ʵ���� - - - -��¼ʱ�䣺2016-11-07 18:16:05,234 -�߳�ID:[9] -��־���� ERROR -�����ࣺCyberpipe.Forms.FrmPipelineModelDB property: [(null)] - -����������δ�������������õ������ʵ���� - diff --git a/bin/x86/Debug/log/2016/201611/20161108.txt b/bin/x86/Debug/log/2016/201611/20161108.txt deleted file mode 100644 index b5c96c9..0000000 --- a/bin/x86/Debug/log/2016/201611/20161108.txt +++ /dev/null @@ -1,40 +0,0 @@ - - -��¼ʱ�䣺2016-11-08 09:53:20,836 -�߳�ID:[10] -��־���� ERROR -�����ࣺCyberpipe.Forms.FrmPipelineModelDB property: [(null)] - -����������δ�������������õ������ʵ���� - - - -��¼ʱ�䣺2016-11-08 09:53:49,986 -�߳�ID:[10] -��־���� ERROR -�����ࣺCyberpipe.Forms.FrmPipelineModelDB property: [(null)] - -����������δ�������������õ������ʵ���� - - - -��¼ʱ�䣺2016-11-08 09:54:25,364 -�߳�ID:[10] -��־���� ERROR -�����ࣺCyberpipe.Forms.FrmPipelineModelDB property: [(null)] - -����������δ�������������õ������ʵ���� - - - -��¼ʱ�䣺2016-11-08 10:33:09,418 -�߳�ID:[11] -��־���� ERROR -�����ࣺCyberpipe.Forms.FrmPipelineModelDB property: [(null)] - -����������δ�������������õ������ʵ���� - - - -��¼ʱ�䣺2016-11-08 10:38:53,638 -�߳�ID:[10] -��־���� ERROR -�����ࣺCyberpipe.Forms.FrmPipelineModelDB property: [(null)] - -����������δ�������������õ������ʵ���� - diff --git a/bin/x86/Debug/log/2016/201611/20161116.txt b/bin/x86/Debug/log/2016/201611/20161116.txt deleted file mode 100644 index d23f760..0000000 --- a/bin/x86/Debug/log/2016/201611/20161116.txt +++ /dev/null @@ -1,8 +0,0 @@ - - -��¼ʱ�䣺2016-11-16 15:06:52,549 -�߳�ID:[9] -��־���� ERROR -�����ࣺCyberpipe.Utility property: [(null)] - -����������������־ - diff --git a/bin/x86/Debug/log/2016/201611/20161118.txt b/bin/x86/Debug/log/2016/201611/20161118.txt deleted file mode 100644 index d03145b..0000000 --- a/bin/x86/Debug/log/2016/201611/20161118.txt +++ /dev/null @@ -1,84 +0,0 @@ - - -��¼ʱ�䣺2016-11-18 15:22:27,833 -�߳�ID:[9] -��־���� ERROR -�����ࣺCyberpipe.Forms.FrmPipelineModelDB property: [(null)] - -���������������ͳ��ȱ������ø��ַ����ڵ�λ�á� -������: length - - - -��¼ʱ�䣺2016-11-18 15:23:05,224 -�߳�ID:[9] -��־���� ERROR -�����ࣺCyberpipe.Forms.FrmPipelineModelDB property: [(null)] - -���������������ͳ��ȱ������ø��ַ����ڵ�λ�á� -������: length - - - -��¼ʱ�䣺2016-11-18 15:24:36,900 -�߳�ID:[9] -��־���� ERROR -�����ࣺCyberpipe.Forms.FrmPipelineModelDB property: [(null)] - -���������������ͳ��ȱ������ø��ַ����ڵ�λ�á� -������: length - - - -��¼ʱ�䣺2016-11-18 15:26:25,752 -�߳�ID:[9] -��־���� ERROR -�����ࣺCyberpipe.Forms.FrmPipelineModelDB property: [(null)] - -���������������ͳ��ȱ������ø��ַ����ڵ�λ�á� -������: length - - - -��¼ʱ�䣺2016-11-18 15:27:04,799 -�߳�ID:[9] -��־���� ERROR -�����ࣺCyberpipe.FieldOrderValidate property: [(null)] - -�����������ֶ�˳����ʧ�� -�ֶ�:��ʼ�ܶ��߳��� -�ֶ�:��ֹ����߳��� -�ֶ�:��ֹ������� -�ֶ�:��ֹ�ܶ��߳��� -�ֶ�:������·���� -�ֶ�:Ȩ����λ���� -�ֶ�:��ע���� - - - - -��¼ʱ�䣺2016-11-18 15:27:11,752 -�߳�ID:[9] -��־���� ERROR -�����ࣺCyberpipe.FieldOrderValidate property: [(null)] - -�����������ֶ�˳����ʧ�� -�ֶ�:��ʼ�ܶ��߳��� -�ֶ�:��ֹ����߳��� -�ֶ�:��ֹ������� -�ֶ�:��ֹ�ܶ��߳��� -�ֶ�:������·���� -�ֶ�:Ȩ����λ���� -�ֶ�:��ע���� - - - - -��¼ʱ�䣺2016-11-18 15:27:27,018 -�߳�ID:[9] -��־���� ERROR -�����ࣺCyberpipe.FieldOrderValidate property: [(null)] - -�����������ֶ�˳����ʧ�� -�ֶ�:��ʼ�ܶ��߳��� -�ֶ�:��ֹ����߳��� -�ֶ�:��ֹ������� -�ֶ�:��ֹ�ܶ��߳��� -�ֶ�:������·���� -�ֶ�:Ȩ����λ���� -�ֶ�:��ע���� - - diff --git a/FeatureStatisticsService.cs b/FeatureStatisticsService.cs index 331ee47..b127fe3 100644 --- a/FeatureStatisticsService.cs +++ b/FeatureStatisticsService.cs @@ -190,7 +190,7 @@ List result = new List(); //layer.Name是表名 - string[] accessStrs = Utility.getAccStrsByLayer(layer.Name); + string[] accessStrs = FeatureTools.GetAccStrsByLayer(layer.Name); foreach (string accssname in accessStrs) { diff --git a/FeatureTools.cs b/FeatureTools.cs index be4b469..3c08f34 100644 --- a/FeatureTools.cs +++ b/FeatureTools.cs @@ -1,5 +1,6 @@ using System; using System.Collections.Generic; +using System.Data; using System.Linq; using System.Text; using System.Windows.Forms; @@ -43,7 +44,7 @@ } feature.Delete();//地球上删除该feature string sql = "delete from " + layerName + " where LSSYS_ID =" + feature.ID + " and (编号 is null or substr(编号,length(编号)-2)='TMP')"; - OledbHelper.sqlExecuteNonQuery(sql);//目前无法取到LSSYS_ID，所以这个判断条件不太合适，会导致把该类所有新建的都删除了 + OledbHelper.sqlExecuteNonQuery(sql); } catch (Exception) { @@ -106,5 +107,46 @@ } return value; } + + /// + /// 根据附属物图层名字得到里面含有的附属物 + /// + /// + /// + public static string[] GetAccStrsByLayer(string layername) + { + string[] accStrs = null; + string sql = "select 附属物名称 from " + layername + " group by 附属物名称"; + DataSet dataset = OledbHelper.getDataSet(sql, layername); + if (dataset == null) return null; + accStrs = new string[dataset.Tables[0].Rows.Count]; + for (int i = 0; i < dataset.Tables[0].Rows.Count; i++) + { + accStrs[i] = dataset.Tables[0].Rows[i][0].ToString(); + } + return accStrs; + } + + /// + /// 删除内存图层中指定名称的feature + /// + /// + /// + public static void RemoveFeatureFromName(GSOGlobeControl globeControl1, string featureName) + { + GSOFeatures features = globeControl1.Globe.MemoryLayer.GetFeatureByName(featureName, true); + if (features != null) + { + for (int i = features.Length - 1; i >= 0; i--) + { + GSOFeature feature = features[i]; + if (feature != null) + { + globeControl1.Globe.MemoryLayer.RemoveFeatureByID(feature.ID); + } + } + } + globeControl1.Refresh(); + } } } diff --git a/Forms/FrmPipelineModelDataBase.cs b/Forms/FrmPipelineModelDataBase.cs index b577fd8..bc1e479 100644 --- a/Forms/FrmPipelineModelDataBase.cs +++ b/Forms/FrmPipelineModelDataBase.cs @@ -149,7 +149,7 @@ catch (Exception ex) { LogError.PublishError(ex); - LogHelper.WriteLog(typeof(FrmPipelineModelDB), ex.Message); + LogHelper.Error(ex.Message); } } diff --git a/FrmAccessoriesSensor.cs b/FrmAccessoriesSensor.cs index 98aa1cf..542f19a 100644 --- a/FrmAccessoriesSensor.cs +++ b/FrmAccessoriesSensor.cs @@ -240,7 +240,7 @@ { if (clbPipeLine.CheckedItems.Count > 0) { - Utility.RemoveFeatureFromName(globeControl1, "trackPolygon"); + FeatureTools.RemoveFeatureFromName(globeControl1, "trackPolygon"); globeControl1.Globe.Action = EnumAction3D.TrackPolygon; globeControl1.TrackPolygonEndEvent += globeControl1_TrackPolygonEndEvent; } @@ -259,7 +259,7 @@ private void FrmAccessoriesgather_FormClosing(object sender, FormClosingEventArgs e) { frm = null; - Utility.RemoveFeatureFromName(globeControl1, "trackPolygon"); + FeatureTools.RemoveFeatureFromName(globeControl1, "trackPolygon"); globeControl1.Globe.Action = EnumAction3D.ActionNull; globeControl1.TrackPolygonEndEvent -= globeControl1_TrackPolygonEndEvent; } diff --git a/FrmAccessoriesgather.cs b/FrmAccessoriesgather.cs index e1d176e..c36273b 100644 --- a/FrmAccessoriesgather.cs +++ b/FrmAccessoriesgather.cs @@ -118,7 +118,7 @@ { if (clbPipeLine2.Text!="") { - Utility.RemoveFeatureFromName(globeControl1, "trackPolygon"); + FeatureTools.RemoveFeatureFromName(globeControl1, "trackPolygon"); globeControl1.Globe.Action = EnumAction3D.TrackPolygon; globeControl1.Globe.TrackPolygonTool.TrackMode = EnumTrackMode.SpaceTrack; globeControl1.TrackPolygonEndEvent += globeControl1_TrackPolygonEndEvent; @@ -295,7 +295,7 @@ private void FrmAccessoriesgather_FormClosing(object sender, FormClosingEventArgs e) { frm = null; - Utility.RemoveFeatureFromName(globeControl1, "trackPolygon"); + FeatureTools.RemoveFeatureFromName(globeControl1, "trackPolygon"); globeControl1.TrackPolygonEndEvent -= globeControl1_TrackPolygonEndEvent; globeControl1.Globe.Action = EnumAction3D.ActionNull; diff --git a/FrmAddWellShp.cs b/FrmAddWellShp.cs index 7983349..78d8946 100644 --- a/FrmAddWellShp.cs +++ b/FrmAddWellShp.cs @@ -100,7 +100,7 @@ catch (Exception ex) { LogError.PublishError(ex); - LogHelper.WriteLog(typeof(FrmAddWellShp), ex.Message); + LogHelper.Error(ex.Message); } } diff --git a/FrmBSQStatis.cs b/FrmBSQStatis.cs index 5b05926..b5e581d 100644 --- a/FrmBSQStatis.cs +++ b/FrmBSQStatis.cs @@ -97,7 +97,7 @@ } catch (Exception ex) { - LogHelper.WriteLog(typeof(FrmBSQStatis),ex.Message); + LogHelper.Error(ex.Message); } return typeAndCount; } @@ -108,7 +108,7 @@ GSOLayer layer = globeControl1.Globe.Layers.GetLayerByCaption("标识器"); GSOFeatures bsqFs = FeatureStatisticsService.GetLayerFeatures(polygon, layer); if (bsqFs == null || bsqFs.Length <= 0) { - LogHelper.WriteLog(typeof(FrmBSQStatis),"标识器图层下的Feature为空"); + LogHelper.Error("标识器图层下的Feature为空!"); return null; } diff --git a/FrmBasicQuery.cs b/FrmBasicQuery.cs index baeeade..cc8d3ff 100644 --- a/FrmBasicQuery.cs +++ b/FrmBasicQuery.cs @@ -224,7 +224,7 @@ } catch(Exception ex) { - LogHelper.WriteLog(typeof(FrmBasicQuery), ex.Message); + LogHelper.Error(ex.Message); } } else diff --git a/FrmCodingQuery.cs b/FrmCodingQuery.cs index f1ac322..d4ec095 100644 --- a/FrmCodingQuery.cs +++ b/FrmCodingQuery.cs @@ -82,7 +82,7 @@ } catch (Exception ex) { - LogHelper.WriteLog(typeof(FrmCodingQuery), ex.Message); ; + LogHelper.Error(ex.Message); } } diff --git a/FrmDiameterQuery.cs b/FrmDiameterQuery.cs index e7b3657..75d7949 100644 --- a/FrmDiameterQuery.cs +++ b/FrmDiameterQuery.cs @@ -150,7 +150,7 @@ catch (Exception ex) { //LogError.PublishError(ex); - LogHelper.WriteLog(typeof(FrmDiameterQuery), ex.Message); + LogHelper.Error(ex.Message); MessageBox.Show("请输入正确的管径范围！"); return; } diff --git a/FrmFittingQuery.cs b/FrmFittingQuery.cs index 12f6007..8645011 100644 --- a/FrmFittingQuery.cs +++ b/FrmFittingQuery.cs @@ -69,7 +69,7 @@ } catch (Exception ex) { - LogHelper.WriteLog(typeof(FrmFittingQuery), ex.Message); + LogHelper.Error(ex.Message); } } /// diff --git a/FrmKeywordQuery.cs b/FrmKeywordQuery.cs index 405524f..ede0a93 100644 --- a/FrmKeywordQuery.cs +++ b/FrmKeywordQuery.cs @@ -87,7 +87,7 @@ } catch (Exception ex) { - LogHelper.WriteLog(typeof(FrmKeywordQuery), ex.Message); + LogHelper.Error(ex.Message); } } diff --git a/FrmLogin.cs b/FrmLogin.cs index 1172c23..6fbaed9 100644 --- a/FrmLogin.cs +++ b/FrmLogin.cs @@ -2,6 +2,8 @@ using System.Data; using System.Data.OracleClient; using System.IO; +using System.Net; +using System.Text; using System.Windows.Forms; using System.Xml; using DevComponents.DotNetBar; @@ -10,16 +12,15 @@ { public partial class FrmLogin : Office2007Form { + + //登录界面 -- 配置文件的路径 + public static string filename = Application.StartupPath + "\\login.xml"; + + public FrmLogin() { InitializeComponent(); } - public string rolename = "浏览"; - public string username = ""; - public string department = ""; - - //登录界面 -- 配置文件的路径 - public static string filename = Application.StartupPath + "\\login.xml"; /// /// 登录按钮事件处理 /// @@ -28,9 +29,10 @@ private void button1_Click(object sender, EventArgs e) { bool result = ValidateUser(); +// bool result =ValidateFromUrl();//从平台获取用户角色信息，判断是否能登陆成功 if (result) { - username = txtUser.Text.Trim(); + WriteXml(); Utility.userName = txtUser.Text.Trim(); DialogResult = DialogResult.OK; Close(); @@ -43,80 +45,6 @@ } } /// - /// 关闭按钮事件处理 - /// - /// - /// - private void button2_Click(object sender, EventArgs e) - { - Close(); - } - /// - /// 验证端口号 - /// - /// - //private bool ValiPort() - //{ - // Ping p = new Ping();//创建Ping对象p - // PingReply pr = p.Send(Utility.localicenseserverip);//向指定IP或者主机名的计算机发送ICMP协议的ping数据包 - // if (pr.Status == IPStatus.Success)//如果ping成功 - // { - // try - // { - // TcpClient tcpc = new TcpClient(Utility.localicenseserverip, Utility.localicenseserverport);//对IP地址为"192.168.0.105"的计算机的1500端口提出连接申请 - // tcpc.Close(); - // return true; - // } - // catch (Exception ex) - // { - // LogError.PublishError(ex); - // MessageBox.Show("端口连接错误！" + ex.Message); - // return false; - // } - // } - // else - // { - // int times = 0;//重新连接次数; - // int count = 2;//设置尝试次数 - // while (times < count) - // { - // //Thread.Sleep(1000);//等待时间(方便测试的话，你可以改为1000) - // pr = p.Send(Utility.localicenseserverip); - - // if (pr.Status == IPStatus.Success) - // { - // try - // { - // TcpClient tcpc = new TcpClient(Utility.localicenseserverip, Utility.localicenseserverport);//对IP地址为"192.168.0.105"的计算机的1500端口提出连接申请 - // tcpc.Close(); - // return true; - // } - // catch (Exception ex) - // { - // LogError.PublishError(ex); - // MessageBox.Show("端口连接错误！" + ex.Message); - // return false; - // } - // } - // else - // { - // times++; - // if (times < count) - // { - // continue; - // } - // else - // { - // MessageBox.Show("重新尝试连接失败"); - // return false; - // } - // } - - // } - // return false; - // } - //} - /// /// 验证用户名、密码 /// /// @@ -126,24 +54,64 @@ string sql = "select * from casic_userinfotest where USERNAME='" + txtUser.Text.Trim() + "' and PASSWORD='" + passWord + "' and sysname='GHFX' "; DataTable dt = OledbHelper.QueryTable(sql); - if (dt != null && dt.Rows.Count > 0) + if (dt == null || dt.Rows.Count <= 0) return false; + if (String.IsNullOrEmpty(dt.Rows[0]["rid"].ToString())) return true; + sql = "select gid from casic_userroletest where id=" + dt.Rows[0]["rid"] + " and sysname='GHFX' "; + using (OracleDataReader reader = OracleUtils.ExecuteReader(OracleUtils.ConnectionString, CommandType.Text, sql)) { - WriteXML(); - if (!String.IsNullOrEmpty(dt.Rows[0]["rid"].ToString())) + while (reader.Read()) { - sql = "select gid from casic_userroletest where id=" + dt.Rows[0]["rid"] + " and sysname='GHFX' "; - using (OracleDataReader reader = OracleUtils.ExecuteReader(OracleUtils.ConnectionString, CommandType.Text, sql)) - { - while (reader.Read()) - { - Utility.userRole = reader[0].ToString(); - break; - } - } + Utility.userRole = reader[0].ToString(); + LogHelper.Debug("测试一下"); + break; } - return true; } - return false; + return true; + } + + + + private bool ValidateFromUrl() + { + string user = txtUser.Text.Trim(); + string pwd = textBoxPassWord.Text.Trim(); + //做成配置的 + string roleserver = Utility.RoleServer; + if (roleserver == null || roleserver.Trim().Equals("")) + { + MessageBox.Show("请在Config.xml中配置roleurl！"); + return false; + } + HttpWebRequest request = + WebRequest.Create(roleserver+"/rs/authority/user?username=" + user + "&password=" + pwd + "&appId=21") as HttpWebRequest; + if (request == null) return false; + using (HttpWebResponse response = request.GetResponse() as HttpWebResponse) + { + try + { + if (response == null || response.GetResponseStream() == null) return false; + StreamReader reader = new StreamReader(response.GetResponseStream()); + string[] result = reader.ReadToEnd().Split(','); + //解析result + if (result.Length < 5) return false; + StringBuilder userRole = new StringBuilder(""); + for (int i = 4; i < result.Length; i++) + { + string[] tmpStrings = result[i].Split('_'); + if (tmpStrings.Length < 2) continue; + userRole.Append(tmpStrings[1].Trim() + ","); + } + if (userRole.Length < 3) return false; + userRole.Remove(userRole.Length - 3, 3); + // MessageBox.Show(userRole.ToString()); + Utility.userRole = userRole.ToString(); + return Utility.userRole != null && !Utility.userRole.Equals("null"); + } + catch (Exception e) + { + return false; + } + } } private void FrmLogin_Load(object sender, EventArgs e) @@ -153,74 +121,56 @@ StartPosition = FormStartPosition.CenterScreen; - ReadXML(); + ReadXml(); } /// /// 读取上一次登录的用户名和密码 /// - private void ReadXML() + private void ReadXml() { - if (File.Exists(filename)) + if (!File.Exists(filename)) return; + //初始化XML文档操作类 + XmlDocument myDoc = new XmlDocument(); { - if (!File.Exists(filename)) + //加载XML文件 + try { + myDoc.Load(filename); + } + catch (Exception e) + { + LogError.PublishError(e); return; } - - //初始化XML文档操作类 - XmlDocument myDoc = new XmlDocument(); + //搜索指定的节点 + XmlNode serverRootNode = myDoc.SelectSingleNode("Params"); + XmlNodeList nodes = null; + if (serverRootNode != null) { - //加载XML文件 - try + nodes = serverRootNode.ChildNodes; + } + if (nodes == null) return; + foreach (XmlNode xn in nodes) + { + if (xn.Name.Equals("username")) { - myDoc.Load(filename); + txtUser.Text = xn.InnerText.Trim(); } - catch (Exception e) + else if (xn.Name.Equals("password")) { - LogError.PublishError(e); - return; + textBoxPassWord.Text = xn.InnerText.Trim(); } - //搜索指定的节点 - XmlNode serverRootNode = myDoc.SelectSingleNode("Params"); - XmlNodeList nodes = null; - if (serverRootNode != null) + else if (xn.Name.Equals("isremember")) { - nodes = serverRootNode.ChildNodes; - } - if (nodes != null) - { - foreach (XmlNode xn in nodes) - { - if (xn.Name == "username") - { - txtUser.Text = xn.InnerText.Trim(); - } - else if (xn.Name == "password") - { - textBoxPassWord.Text = xn.InnerText.Trim(); - } - else if (xn.Name == "isremember") - { - if (xn.InnerText.Trim() == "true") - { - checkBoxXRememberPassword.Checked = true; - } - else if (xn.InnerText.Trim() == "false") - { - checkBoxXRememberPassword.Checked = false; - } - } - } - + checkBoxXRememberPassword.Checked = xn.InnerText.Trim().Equals("true"); } } } - } /// /// 记录登录的用户名和密码 /// - private void WriteXML() + private void WriteXml() { if (!File.Exists(filename)) { @@ -252,31 +202,17 @@ foreach (XmlNode xn in nodes) { XmlElement xe = (XmlElement)xn; - if (xe.Name == "username") + if (xe.Name.Equals("username")) { xe.InnerText = txtUser.Text.Trim(); } - else if (xe.Name == "password") + else if (xe.Name.Equals("password")) { - if (checkBoxXRememberPassword.Checked) - { - xe.InnerText = textBoxPassWord.Text.Trim(); - } - else - { - xe.InnerText = ""; - } + xe.InnerText = checkBoxXRememberPassword.Checked ? textBoxPassWord.Text.Trim() : ""; } - else if (xe.Name == "isremember") + else if (xe.Name.Equals("isremember")) { - if (checkBoxXRememberPassword.Checked) - { - xe.InnerText = "true"; - } - else - { - xe.InnerText = "false"; - } + xe.InnerText = checkBoxXRememberPassword.Checked ? "true" : "false"; } } } diff --git a/FrmMaterialSel.cs b/FrmMaterialSel.cs index 8645ab3..d23f385 100644 --- a/FrmMaterialSel.cs +++ b/FrmMaterialSel.cs @@ -157,7 +157,7 @@ } catch (Exception ex) { - LogHelper.WriteLog(typeof(FrmMaterialSel), ex.Message); + LogHelper.Error(ex.Message); } } diff --git a/FrmMetadataStat.cs b/FrmMetadataStat.cs index c3c1359..96029a6 100644 --- a/FrmMetadataStat.cs +++ b/FrmMetadataStat.cs @@ -96,7 +96,7 @@ //统计有多少个图层 private int statistLayer() { - List datasrcs = Utility.layerConfig.datasrcs; + List datasrcs = Utility.LayerConfig.datasrcs; return datasrcs.SelectMany(datasrc => datasrc.layertypes).Sum(layerType => layerType.layers.Count); } diff --git a/FrmpipeDeepstatis.cs b/FrmpipeDeepstatis.cs index 6a5c895..8d915a9 100644 --- a/FrmpipeDeepstatis.cs +++ b/FrmpipeDeepstatis.cs @@ -2,6 +2,7 @@ using System.Collections.Generic; using System.Diagnostics; using System.IO; +using System.Reflection; using System.Text; using System.Windows.Forms; using System.Windows.Forms.DataVisualization.Charting; @@ -320,7 +321,7 @@ MessageBox.Show("请添加分段"); return; } - Utility.RemoveFeatureFromName(globeControl1, "trackPolygon"); + FeatureTools.RemoveFeatureFromName(globeControl1, "trackPolygon"); globeControl1.Globe.Action = EnumAction3D.TrackPolygon; globeControl1.Globe.TrackPolygonTool.TrackMode = EnumTrackMode.SpaceTrack; globeControl1.TrackPolygonEndEvent += globeControl1_TrackPolygonEndEvent; @@ -408,12 +409,11 @@ TextBox control; private void dataGridViewX2_EditingControlShowing(object sender, DataGridViewEditingControlShowingEventArgs e) { - if (e.Control.GetType().BaseType.Name == "TextBox") - { - control = new TextBox(); - control = (TextBox)e.Control; - control.KeyPress += control_KeyPress; - } + MemberInfo memberInfo = e.Control.GetType().BaseType; + if (memberInfo != null && !memberInfo.Name.Equals("TextBox")) return; + control = new TextBox(); + control = (TextBox)e.Control; + control.KeyPress += control_KeyPress; } /// /// 键盘按键按下事件处理 @@ -423,28 +423,24 @@ void control_KeyPress(object sender, KeyPressEventArgs e) { TextBox text = sender as TextBox; + if (text == null) return; if ((e.KeyChar < 48 || e.KeyChar > 57) && (e.KeyChar != 8) && e.KeyChar != 46) { e.Handled = true; } - if (e.KeyChar == 46) //小数点 + if (e.KeyChar != 46) return; + if (text.Text.Length <= 0) + e.Handled = true; //小数点不能在第一位 + else //处理不规则的小数点 { - if (text.Text.Length <= 0) - e.Handled = true; //小数点不能在第一位 - else //处理不规则的小数点 + float f; + float oldf; + bool b1 = false, b2 = false; + b1 = float.TryParse(text.Text, out oldf); + b2 = float.TryParse(text.Text + e.KeyChar, out f); + if (!b2) { - float f; - float oldf; - bool b1 = false, b2 = false; - b1 = float.TryParse(text.Text, out oldf); - b2 = float.TryParse(text.Text + e.KeyChar, out f); - if (b2 == false) - { - if (b1) - e.Handled = true; - else - e.Handled = false; - } + e.Handled = b1; } } } @@ -457,7 +453,7 @@ { frm = null; - Utility.RemoveFeatureFromName(globeControl1, "trackPolygon"); + FeatureTools.RemoveFeatureFromName(globeControl1, "trackPolygon"); globeControl1.TrackPolygonEndEvent -= globeControl1_TrackPolygonEndEvent; globeControl1.Globe.Action = EnumAction3D.ActionNull; diff --git a/FrmpipeDiametergather.cs b/FrmpipeDiametergather.cs index a9d96fa..c09aaf1 100644 --- a/FrmpipeDiametergather.cs +++ b/FrmpipeDiametergather.cs @@ -154,7 +154,7 @@ MessageBox.Show("请选择图层！"); return; } - Utility.RemoveFeatureFromName(globeControl1, "trackPolygon"); + FeatureTools.RemoveFeatureFromName(globeControl1, "trackPolygon"); globeControl1.Globe.Action = EnumAction3D.TrackPolygon; globeControl1.Globe.TrackPolygonTool.TrackMode = EnumTrackMode.SpaceTrack; globeControl1.TrackPolygonEndEvent += globeControl1_TrackPolygonEndEvent; @@ -392,7 +392,7 @@ private void FrmpipeDiametergather_FormClosing(object sender, FormClosingEventArgs e) { frm = null; - Utility.RemoveFeatureFromName(globeControl1, "trackPolygon"); + FeatureTools.RemoveFeatureFromName(globeControl1, "trackPolygon"); globeControl1.TrackPolygonEndEvent -= globeControl1_TrackPolygonEndEvent; globeControl1.Globe.Action = EnumAction3D.ActionNull; diff --git a/FrmpipeMaterialGather.cs b/FrmpipeMaterialGather.cs index 44e7f24..5ca8144 100644 --- a/FrmpipeMaterialGather.cs +++ b/FrmpipeMaterialGather.cs @@ -58,10 +58,9 @@ for (int i = 0; i < pipeLayerNames.Count; i++) { clbPipeLine.Items.Add(pipeLayerNames[i]); - GSOLayer layer = globeControl1.Globe.Layers.GetLayerByCaption(pipeLayerNames[i]); - if (layer.Dataset == null || !layer.Dataset.IsFeatureDataset || layer.Type != EnumLayerType.FeatureLayer) continue; + GSOLayer layer = globeControl1.Globe.Layers.GetLayerByCaption(pipeLayerNames[i]); + if (layer == null || layer.Dataset == null || !layer.Dataset.IsFeatureDataset || layer.Type != EnumLayerType.FeatureLayer) continue; - string name = layer.Name; GSOFeatureLayer flayer = layer as GSOFeatureLayer; GSOFeatures feats = flayer.GetAllFeatures(); @@ -205,7 +204,7 @@ { chart1.Series.Add(clbPipeLine.CheckedItems[i].ToString()); GSOLayer layer = globeControl1.Globe.Layers.GetLayerByCaption(clbPipeLine.CheckedItems[i].ToString()); - if (layer != null && layer is GSOFeatureLayer) + if (layer is GSOFeatureLayer) { GSOFeatureLayer flayer = layer as GSOFeatureLayer; GSOFeatures features = flayer.GetAllFeatures(); @@ -240,10 +239,9 @@ labeStyleAxisX.Enabled = true; chart1.ChartAreas["ChartArea1"].AxisX.LabelStyle = labeStyleAxisX; - Dictionary dic1 = new Dictionary(); for (int j = 0; j < chart1.Series.Count; j++) { - dic1 = new Dictionary(); + Dictionary dic1 = new Dictionary(); foreach (string key in dic.Keys) { if (key.Contains(chart1.Series[j].Name)) @@ -304,7 +302,7 @@ MessageBox.Show("请选择材质类型！"); return; } - Utility.RemoveFeatureFromName(globeControl1, "trackPolygon"); + FeatureTools.RemoveFeatureFromName(globeControl1, "trackPolygon"); globeControl1.Globe.Action = EnumAction3D.TrackPolygon; globeControl1.Globe.TrackPolygonTool.TrackMode = EnumTrackMode.SpaceTrack; globeControl1.TrackPolygonEndEvent += globeControl1_TrackPolygonEndEvent; @@ -318,7 +316,7 @@ private void FrmpipeMaterialGather_FormClosing(object sender, FormClosingEventArgs e) { frm = null; - Utility.RemoveFeatureFromName(globeControl1, "trackPolygon"); + FeatureTools.RemoveFeatureFromName(globeControl1, "trackPolygon"); globeControl1.TrackPolygonEndEvent -= globeControl1_TrackPolygonEndEvent; globeControl1.Globe.Action = EnumAction3D.ActionNull; diff --git a/Frmpipediameterstatis.cs b/Frmpipediameterstatis.cs index 4fb25a8..631a996 100644 --- a/Frmpipediameterstatis.cs +++ b/Frmpipediameterstatis.cs @@ -202,8 +202,8 @@ } catch (Exception ex) { - LogHelper.WriteLog(typeof(Frmpipediameterstatis), ex.Message); //MessageBox.Show(ex.Message); + LogHelper.Error(ex.Message); LogError.PublishError(ex); } } @@ -372,7 +372,7 @@ MessageBox.Show("请添加分段！"); return; } - Utility.RemoveFeatureFromName(globeControl1, "trackPolygon"); + FeatureTools.RemoveFeatureFromName(globeControl1, "trackPolygon"); globeControl1.Globe.Action = EnumAction3D.TrackPolygon; globeControl1.Globe.TrackPolygonTool.TrackMode = EnumTrackMode.SpaceTrack; globeControl1.TrackPolygonEndEvent += globeControl1_TrackPolygonEndEvent; @@ -422,7 +422,7 @@ globeControl1.Globe.Action = EnumAction3D.ActionNull; globeControl1.TrackPolygonEndEvent -= globeControl1_TrackPolygonEndEvent; - Utility.RemoveFeatureFromName(globeControl1, "trackPolygon"); + FeatureTools.RemoveFeatureFromName(globeControl1, "trackPolygon"); globeControl1.Globe.MemoryLayer.RemoveAllFeature(); } diff --git a/LineBuilder.cs b/LineBuilder.cs index 33a216c..b6a8516 100644 --- a/LineBuilder.cs +++ b/LineBuilder.cs @@ -43,8 +43,8 @@ GSOGeoPolyline3D lineeee = f.Geometry as GSOGeoPolyline3D; if (lineeee == null || lineeee.GetSpaceLength(true, 6378137) == 0) { - LogHelper.WriteLog(typeof(LineBuilder), "出现数据无法入库:"+f.ID); - continue; //TODO LIST:判断是否会出现部署数据无法入库情况,Log2Net + LogHelper.Error("出现数据无法入库:" + f.ID); + continue; } GSOFeature newFeature = newFeatureSet.CreateFeature(); diff --git a/LogHelper.cs b/LogHelper.cs index 9ef5f27..04573cf 100644 --- a/LogHelper.cs +++ b/LogHelper.cs @@ -1,4 +1,5 @@ using System; +using System.Diagnostics; using log4net; using log4net.Config; @@ -7,35 +8,82 @@ { public class LogHelper { - /// - /// 输出日志到Log4Net - /// - /// - /// - #region static void WriteLog(Type t, Exception ex) - public static void WriteLog(Type t, Exception ex) + private static ILog _logdebug = log4net.LogManager.GetLogger("logdebug"); + private static ILog _loginfo = log4net.LogManager.GetLogger("loginfo"); + private static ILog _logwarn = log4net.LogManager.GetLogger("logwarn"); + private static ILog _logerror = log4net.LogManager.GetLogger("logerror"); + private static ILog _logfatal = log4net.LogManager.GetLogger("logfatal"); + + public static void Debug(string msg) { - ILog log = log4net.LogManager.GetLogger(t); - log.Error("Error", ex); + StackFrame sf = new StackFrame(1); + msg = string.Format("{0}.{1}:{2}", sf.GetMethod().ReflectedType.FullName, sf.GetMethod().Name, msg); + _logdebug.Debug(msg); + } + public static void Debug(string msg, Exception e) + { + StackFrame sf = new StackFrame(1); + msg = string.Format("{0}.{1}:{2}", sf.GetMethod().ReflectedType.FullName, sf.GetMethod().Name, msg); + _logdebug.Debug(msg, e); } - #endregion - /// - /// 输出日志到Log4Net - /// - /// - /// - #region static void WriteLog(Type t, string msg) - - public static void WriteLog(Type t, string msg) + public static void Info(string msg) { - ILog log = log4net.LogManager.GetLogger(t); - log.Error(msg); + StackFrame sf = new StackFrame(1); + msg = string.Format("{0}.{1}:{2}", sf.GetMethod().ReflectedType.FullName, sf.GetMethod().Name, msg); + _loginfo.Info(msg); + } + public static void Info(string msg, Exception e) + { + StackFrame sf = new StackFrame(1); + msg = string.Format("{0}.{1}:{2}", sf.GetMethod().ReflectedType.FullName, sf.GetMethod().Name, msg); + _loginfo.Info(msg, e); } - #endregion + + public static void Warn(string msg) + { + StackFrame sf = new StackFrame(1); + msg = string.Format("{0}.{1}:{2}", sf.GetMethod().ReflectedType.FullName, sf.GetMethod().Name, msg); + _logwarn.Warn(msg); + } + public static void Warn(string msg, Exception e) + { + StackFrame sf = new StackFrame(1); + msg = string.Format("{0}.{1}:{2}", sf.GetMethod().ReflectedType.FullName, sf.GetMethod().Name, msg); + _logwarn.Warn(msg, e); + } + + + public static void Error(string msg) + { + StackFrame sf = new StackFrame(1); + msg = string.Format("{0}.{1}:{2}", sf.GetMethod().ReflectedType.FullName, sf.GetMethod().Name, msg); + _logerror.Error(msg); + } + public static void Error(string msg, Exception e) + { + StackFrame sf = new StackFrame(1); + msg = string.Format("{0}.{1}:{2}", sf.GetMethod().ReflectedType.FullName, sf.GetMethod().Name, msg); + _logerror.Error(msg, e); + } + + + public static void Fatal(string msg) + { + StackFrame sf = new StackFrame(1); + msg = string.Format("{0}.{1}:{2}", sf.GetMethod().ReflectedType.FullName, sf.GetMethod().Name, msg); + _logfatal.Fatal(msg); + } + public static void Fatal(string msg, Exception e) + { + StackFrame sf = new StackFrame(1); + msg = string.Format("{0}.{1}:{2}", sf.GetMethod().ReflectedType.FullName, sf.GetMethod().Name, msg); + _logfatal.Fatal(msg, e); + } + } diff --git a/MainFrm.cs b/MainFrm.cs index 43de664..51f362a 100644 --- a/MainFrm.cs +++ b/MainFrm.cs @@ -18,7 +18,6 @@ using GeoScene.Data; using GeoScene.Engine; using GeoScene.Globe; -using Timer = System.Windows.Forms.Timer; using ToolTip = System.Windows.Forms.ToolTip; namespace Cyberpipe @@ -163,6 +162,7 @@ /// private void AddGZ() { + lendendGZ50 = new GSOHudButton(); lendendGZ50.SetImage(Application.StartupPath + "/Resource/管纵/50.png"); lendendGZ50.SetOffset(0, 0); @@ -1294,18 +1294,19 @@ private void MainFrm_Load(object sender, EventArgs e) { + layerTree.Nodes.Add("正在加载，请稍后……");//树状图加载在图层加载之后，故增加提示 initGlobalControl(); - //initGlobalMap(); - //initLayerTree(); initMarkerTree(); initLayout(); loadData(); - double x = Convert.ToDouble(Utility.Query_Roads["定位"].ToString().Split(',')[0]); - double y = Convert.ToDouble(Utility.Query_Roads["定位"].ToString().Split(',')[1]); - double z = Convert.ToDouble(Utility.Query_Roads["定位"].ToString().Split(',')[2]); + + double x = Convert.ToDouble(Utility.Query_Roads["绿岛"].ToString().Split(',')[0]); + double y = Convert.ToDouble(Utility.Query_Roads["绿岛"].ToString().Split(',')[1]); + double z = Convert.ToDouble(Utility.Query_Roads["绿岛"].ToString().Split(',')[2]); jumpToCameraState(x, y, z); + } #endregion @@ -1315,11 +1316,17 @@ if (e.Layer == null || !e.Layer.Caption.Equals(Utility.roadLayerName)) return; foreach (TreeNode layerTreeNode in layerTree.Nodes) { - foreach (TreeNode node in layerTreeNode.Nodes) + for (int i=0;i dt, DataGridView dataGridView) @@ -7330,7 +7337,7 @@ } catch (Exception ex) { - LogHelper.WriteLog(typeof(MainFrm), ex); + LogHelper.Debug("", ex); } } } @@ -7362,7 +7369,7 @@ GSOLayer layer = globeControl1.Globe.Layers.Add(strDataPath); if (layer == null) {//wxl - LogHelper.WriteLog(typeof(MainFrm), "buttonItemHX1_Click操作中，" + strDataPath + "的layer为空"); + LogHelper.Error("buttonItemHX1_Click操作中，" + strDataPath + "的layer为空"); continue; } GSOFeatures redFeatures = layer.GetAllFeatures(); @@ -7457,17 +7464,12 @@ { try { + globeControl1.BeforeSceneRenderEvent -= globeControl1_BeforeSceneRenderEvent; globeControl2.BeforeSceneRenderEvent -= globeControl2_BeforeSceneRenderEvent; - double x = Convert.ToDouble(Utility.Query_Roads["定位"].ToString().Split(',')[0]); - double y = Convert.ToDouble(Utility.Query_Roads["定位"].ToString().Split(',')[1]); - double z = Convert.ToDouble(Utility.Query_Roads["定位"].ToString().Split(',')[2]); - jumpToCameraState(x, y, z); - /* globeControl1.Globe.FlyToPosition(new GSOPoint3d(120.610963, 31.188121, 50), EnumAltitudeMode.Absolute, -4, 50, 800); globeControl1.Globe.FlyToPointSpeed = 10000000; - * */ globeControl1.Globe.Action = EnumAction3D.SelectObject; globeControl1.Refresh(); @@ -7489,6 +7491,37 @@ } } /// + /// 基础工具 + /// + /// + /// + private void ribbonTabItem1_MouseDown(object sender, MouseEventArgs e) + { + try + { + + globeControl1.BeforeSceneRenderEvent -= globeControl1_BeforeSceneRenderEvent; + globeControl2.BeforeSceneRenderEvent -= globeControl2_BeforeSceneRenderEvent; + + globeControl1.Globe.Action = EnumAction3D.ActionNull; + dataGridViewX1.AutoSizeColumnsMode = DataGridViewAutoSizeColumnsMode.AllCells; + //zhanshi = false; + redSH = false; + splitContainer1.Panel2Collapsed = true; + panelOfTable.Visible = false; + legendSC.Visible = false; + legendSG.Visible = false; + ClearGZData(); + GSOLayer redLayer = globeControl1.Globe.Layers.GetLayerByCaption("红线"); + if (redLayer == null) return; + redLayer.Visible = false; + } + catch (Exception ex) + { + //MessageBox.Show("系统运行错误:" + ex.ToString(), "错误", MessageBoxButtons.OK, MessageBoxIcon.Error); + } + } + /// /// 一键审核 /// /// @@ -7497,6 +7530,7 @@ { try { + globeControl1.BeforeSceneRenderEvent -= globeControl1_BeforeSceneRenderEvent; globeControl2.BeforeSceneRenderEvent -= globeControl2_BeforeSceneRenderEvent; @@ -7518,32 +7552,7 @@ //MessageBox.Show("系统运行错误:" + ex.ToString(), "错误", MessageBoxButtons.OK, MessageBoxIcon.Error); } } - - void ResetRibbonTab() - { - try - { - globeControl1.BeforeSceneRenderEvent -= globeControl1_BeforeSceneRenderEvent; - globeControl2.BeforeSceneRenderEvent -= globeControl2_BeforeSceneRenderEvent; - - globeControl1.Globe.Action = EnumAction3D.ActionNull; - dataGridViewX1.AutoSizeColumnsMode = DataGridViewAutoSizeColumnsMode.AllCells; - //zhanshi = false; - redSH = false; - splitContainer1.Panel2Collapsed = true; - panelOfTable.Visible = false; - legendSC.Visible = false; - legendSG.Visible = false; - ClearGZData(); - GSOLayer redLayer = globeControl1.Globe.Layers.GetLayerByCaption("红线"); - if (redLayer == null) return; - redLayer.Visible = false; - } - catch (Exception ex) - { - LogHelper.WriteLog(typeof(MainFrm), ex); - } - } + /// /// 双屏对比 /// @@ -7553,8 +7562,8 @@ { try { - globeControl1.BeforeSceneRenderEvent += new BeforeSceneRenderEventHandler(globeControl1_BeforeSceneRenderEvent); - globeControl2.BeforeSceneRenderEvent += new BeforeSceneRenderEventHandler(globeControl2_BeforeSceneRenderEvent); + globeControl1.BeforeSceneRenderEvent += globeControl1_BeforeSceneRenderEvent; + globeControl2.BeforeSceneRenderEvent += globeControl2_BeforeSceneRenderEvent; globeControl1.Globe.Action = EnumAction3D.ActionNull; panelOfTable.Visible = false; @@ -7570,32 +7579,43 @@ GSOLayer redLayer = globeControl1.Globe.Layers.GetLayerByCaption("红线"); if (redLayer != null) - { redLayer.Visible = false; - } } catch (Exception ex) { - LogHelper.WriteLog(typeof(MainFrm), ex); + //MessageBox.Show("系统运行错误:" + ex.ToString(), "错误", MessageBoxButtons.OK, MessageBoxIcon.Error); } } /// - /// 基础工具 - /// - /// - /// - private void ribbonTabItem1_MouseDown(object sender, MouseEventArgs e) - { - ResetRibbonTab(); - } - /// /// 文档管理 /// /// /// private void ribbonTabItem4_MouseDown(object sender, MouseEventArgs e) { - ResetRibbonTab(); + try + { + + globeControl1.BeforeSceneRenderEvent -= globeControl1_BeforeSceneRenderEvent; + globeControl2.BeforeSceneRenderEvent -= globeControl2_BeforeSceneRenderEvent; + + globeControl1.Globe.Action = EnumAction3D.ActionNull; + panelOfTable.Visible = false; + //zhanshi = false; + redSH = false; + splitContainer1.Panel2Collapsed = true; + dataGridViewX1.AutoSizeColumnsMode = DataGridViewAutoSizeColumnsMode.AllCells; + legendSC.Visible = false; + legendSG.Visible = false; + ClearGZData(); + GSOLayer redLayer = globeControl1.Globe.Layers.GetLayerByCaption("红线"); + if (redLayer != null) + redLayer.Visible = false; + } + catch (Exception ex) + { + //MessageBox.Show("系统运行错误:" + ex.ToString(), "错误", MessageBoxButtons.OK, MessageBoxIcon.Error); + } } /// /// 基础管理 @@ -7604,7 +7624,29 @@ /// private void ribbonTabItem14_MouseDown(object sender, MouseEventArgs e) { - ResetRibbonTab(); + try + { + globeControl1.BeforeSceneRenderEvent -= globeControl1_BeforeSceneRenderEvent; + globeControl2.BeforeSceneRenderEvent -= globeControl2_BeforeSceneRenderEvent; + + globeControl1.Globe.Action = EnumAction3D.ActionNull; + panelOfTable.Visible = false; + //zhanshi = false; + redSH = false; + splitContainer1.Panel2Collapsed = true; + dataGridViewX1.AutoSizeColumnsMode = DataGridViewAutoSizeColumnsMode.AllCells; + legendSC.Visible = false; + legendSG.Visible = false; + ClearGZData(); + + GSOLayer redLayer = globeControl1.Globe.Layers.GetLayerByCaption("红线"); + if (redLayer != null) + redLayer.Visible = false; + } + catch (Exception ex) + { + //MessageBox.Show("系统运行错误:" + ex.ToString(), "错误", MessageBoxButtons.OK, MessageBoxIcon.Error); + } } /// /// 权限管理 @@ -7613,26 +7655,31 @@ /// private void ribbonTabItem2_MouseDown(object sender, MouseEventArgs e) { - ResetRibbonTab(); + try + { + globeControl1.BeforeSceneRenderEvent -= globeControl1_BeforeSceneRenderEvent; + globeControl2.BeforeSceneRenderEvent -= globeControl2_BeforeSceneRenderEvent; + + globeControl1.Globe.Action = EnumAction3D.ActionNull; + panelOfTable.Visible = false; + //zhanshi = false; + redSH = false; + splitContainer1.Panel2Collapsed = true; + dataGridViewX1.AutoSizeColumnsMode = DataGridViewAutoSizeColumnsMode.AllCells; + legendSC.Visible = false; + legendSG.Visible = false; + ClearGZData(); + + GSOLayer redLayer = globeControl1.Globe.Layers.GetLayerByCaption("红线"); + if (redLayer == null) return; + redLayer.Visible = false; + } + catch (Exception ex) + { + //MessageBox.Show("系统运行错误:" + ex.ToString(), "错误", MessageBoxButtons.OK, MessageBoxIcon.Error); + } } - /// - /// 管线定位 - /// - /// - /// - private void ribbonTabItem7_MouseDown(object sender, MouseEventArgs e) - { - ResetRibbonTab(); - } - /// - /// 标识器管理 - /// - /// - /// - private void ribbonTabItem5_MouseDown(object sender, MouseEventArgs e) - { - ResetRibbonTab(); - } + //GSOFeature dpFeatuer = null; /// /// 双屏分析，点击管段分析 @@ -8017,7 +8064,9 @@ private void btn_flag_Click(object sender, EventArgs e) { if (FrmFlagManagers.IS_OPEN) + { return; + } FrmFlagManagers frm = new FrmFlagManagers(globeControl1); frm.Show(this); } diff --git a/MainFrm.designer.cs b/MainFrm.designer.cs index e3dca41..73398c0 100644 --- a/MainFrm.designer.cs +++ b/MainFrm.designer.cs @@ -4,6 +4,7 @@ using DevComponents.DotNetBar; using DevComponents.DotNetBar.Controls; using DevComponents.Editors; +using System.Drawing; namespace Cyberpipe { @@ -89,6 +90,7 @@ this.sideBar1 = new DevComponents.DotNetBar.SideBar(); this.panelEx3 = new DevComponents.DotNetBar.PanelEx(); this.layerSensorTree = new System.Windows.Forms.TreeView(); + this.layerTree = new Cyberpipe.MyTreeView(); this.sideBarPanelItem3 = new DevComponents.DotNetBar.SideBarPanelItem(); this.controlContainerItem3 = new DevComponents.DotNetBar.ControlContainerItem(); this.sideBarPanelItem4 = new DevComponents.DotNetBar.SideBarPanelItem(); @@ -243,42 +245,18 @@ this.保存ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.定位ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.ribbonControl1 = new DevComponents.DotNetBar.RibbonControl(); - this.ribbonPanel6 = new DevComponents.DotNetBar.RibbonPanel(); - this.ribbonBar6 = new DevComponents.DotNetBar.RibbonBar(); - this.buttonItemSPSZ = new DevComponents.DotNetBar.ButtonItem(); - this.buttonItem8 = new DevComponents.DotNetBar.ButtonItem(); - this.buttonItemLocation = new DevComponents.DotNetBar.ButtonItem(); - this.sliderItem2 = new DevComponents.DotNetBar.SliderItem(); - this.buttonItemGBJC = new DevComponents.DotNetBar.ButtonItem(); - this.ribbonPanel5 = new DevComponents.DotNetBar.RibbonPanel(); - this.ribbonBar2 = new DevComponents.DotNetBar.RibbonBar(); - this.buttonItemHX1 = new DevComponents.DotNetBar.ButtonItem(); - this.buttonItemHX2 = new DevComponents.DotNetBar.ButtonItem(); - this.buttonItemDCTP = new DevComponents.DotNetBar.ButtonItem(); - this.sliderItem3 = new DevComponents.DotNetBar.SliderItem(); - this.ribbonPanel1 = new DevComponents.DotNetBar.RibbonPanel(); - this.ribbonBar21 = new DevComponents.DotNetBar.RibbonBar(); - this.buttonItem87 = new DevComponents.DotNetBar.ButtonItem(); - this.buttonItem88 = new DevComponents.DotNetBar.ButtonItem(); - this.buttonItem27 = new DevComponents.DotNetBar.ButtonItem(); - this.buttonItem91 = new DevComponents.DotNetBar.ButtonItem(); - this.buttonItem1 = new DevComponents.DotNetBar.ButtonItem(); - this.btnlegendSet = new DevComponents.DotNetBar.ButtonItem(); - this.buttonItem89 = new DevComponents.DotNetBar.ButtonItem(); - this.btnOutputJPG = new DevComponents.DotNetBar.ButtonItem(); - this.ribbonPanel12 = new DevComponents.DotNetBar.RibbonPanel(); - this.ribbonBar18 = new DevComponents.DotNetBar.RibbonBar(); - this.buttonItem133 = new DevComponents.DotNetBar.ButtonItem(); - this.ribbonBar13 = new DevComponents.DotNetBar.RibbonBar(); - this.buttonItem127 = new DevComponents.DotNetBar.ButtonItem(); - this.buttonItem128 = new DevComponents.DotNetBar.ButtonItem(); - this.sliderItem1 = new DevComponents.DotNetBar.SliderItem(); - this.buttonItem134 = new DevComponents.DotNetBar.ButtonItem(); - this.buttonItem130 = new DevComponents.DotNetBar.ButtonItem(); - this.btn_check_history = new DevComponents.DotNetBar.ButtonItem(); - this.ribbonPanel4 = new DevComponents.DotNetBar.RibbonPanel(); - this.ribbonBar1 = new DevComponents.DotNetBar.RibbonBar(); - this.btn_document_info = new DevComponents.DotNetBar.ButtonItem(); + this.ribbonPanel3 = new DevComponents.DotNetBar.RibbonPanel(); + this.ribbonBar4 = new DevComponents.DotNetBar.RibbonBar(); + this.btn_flag = new DevComponents.DotNetBar.ButtonItem(); + this.slider4ground = new DevComponents.DotNetBar.SliderItem(); + this.ribbonPanel7 = new DevComponents.DotNetBar.RibbonPanel(); + this.gxdw_ribbonbar = new DevComponents.DotNetBar.RibbonBar(); + this.buttonItem9 = new DevComponents.DotNetBar.ButtonItem(); + this.buttonItem10 = new DevComponents.DotNetBar.ButtonItem(); + this.buttonItem11 = new DevComponents.DotNetBar.ButtonItem(); + this.buttonItem12 = new DevComponents.DotNetBar.ButtonItem(); + this.buttonItem13 = new DevComponents.DotNetBar.ButtonItem(); + this.buttonItem14 = new DevComponents.DotNetBar.ButtonItem(); this.ribbonPanel15 = new DevComponents.DotNetBar.RibbonPanel(); this.ribbonBar20 = new DevComponents.DotNetBar.RibbonBar(); this.buttonItemSH = new DevComponents.DotNetBar.ButtonItem(); @@ -334,18 +312,6 @@ this.buttonItemXT4 = new DevComponents.DotNetBar.ButtonItem(); this.buttonItemXT4_1 = new DevComponents.DotNetBar.ButtonItem(); this.buttonItemXT4_2 = new DevComponents.DotNetBar.ButtonItem(); - this.ribbonPanel3 = new DevComponents.DotNetBar.RibbonPanel(); - this.ribbonBar4 = new DevComponents.DotNetBar.RibbonBar(); - this.btn_flag = new DevComponents.DotNetBar.ButtonItem(); - this.slider4ground = new DevComponents.DotNetBar.SliderItem(); - this.ribbonPanel7 = new DevComponents.DotNetBar.RibbonPanel(); - this.gxdw_ribbonbar = new DevComponents.DotNetBar.RibbonBar(); - this.buttonItem9 = new DevComponents.DotNetBar.ButtonItem(); - this.buttonItem10 = new DevComponents.DotNetBar.ButtonItem(); - this.buttonItem11 = new DevComponents.DotNetBar.ButtonItem(); - this.buttonItem12 = new DevComponents.DotNetBar.ButtonItem(); - this.buttonItem13 = new DevComponents.DotNetBar.ButtonItem(); - this.buttonItem14 = new DevComponents.DotNetBar.ButtonItem(); this.ribbonPanel2 = new DevComponents.DotNetBar.RibbonPanel(); this.ribbonBar3 = new DevComponents.DotNetBar.RibbonBar(); this.btn_user_info = new DevComponents.DotNetBar.ButtonItem(); @@ -355,6 +321,43 @@ this.btn_user_role = new DevComponents.DotNetBar.ButtonItem(); this.btn_password_edit = new DevComponents.DotNetBar.ButtonItem(); this.buttonItemPasswordReset = new DevComponents.DotNetBar.ButtonItem(); + this.ribbonPanel6 = new DevComponents.DotNetBar.RibbonPanel(); + this.ribbonBar6 = new DevComponents.DotNetBar.RibbonBar(); + this.buttonItemSPSZ = new DevComponents.DotNetBar.ButtonItem(); + this.buttonItem8 = new DevComponents.DotNetBar.ButtonItem(); + this.buttonItemLocation = new DevComponents.DotNetBar.ButtonItem(); + this.sliderItem2 = new DevComponents.DotNetBar.SliderItem(); + this.buttonItemGBJC = new DevComponents.DotNetBar.ButtonItem(); + this.ribbonPanel5 = new DevComponents.DotNetBar.RibbonPanel(); + this.ribbonBar2 = new DevComponents.DotNetBar.RibbonBar(); + this.buttonItemHX1 = new DevComponents.DotNetBar.ButtonItem(); + this.buttonItemHX2 = new DevComponents.DotNetBar.ButtonItem(); + this.buttonItemDCTP = new DevComponents.DotNetBar.ButtonItem(); + this.sliderItem3 = new DevComponents.DotNetBar.SliderItem(); + this.ribbonPanel1 = new DevComponents.DotNetBar.RibbonPanel(); + this.ribbonBar21 = new DevComponents.DotNetBar.RibbonBar(); + this.buttonItem87 = new DevComponents.DotNetBar.ButtonItem(); + this.buttonItem88 = new DevComponents.DotNetBar.ButtonItem(); + this.buttonItem27 = new DevComponents.DotNetBar.ButtonItem(); + this.buttonItem91 = new DevComponents.DotNetBar.ButtonItem(); + this.buttonItem1 = new DevComponents.DotNetBar.ButtonItem(); + this.btnlegendSet = new DevComponents.DotNetBar.ButtonItem(); + this.buttonItem89 = new DevComponents.DotNetBar.ButtonItem(); + this.btnOutputJPG = new DevComponents.DotNetBar.ButtonItem(); + this.ribbonPanel12 = new DevComponents.DotNetBar.RibbonPanel(); + this.ribbonBar18 = new DevComponents.DotNetBar.RibbonBar(); + this.buttonItem133 = new DevComponents.DotNetBar.ButtonItem(); + this.buttonItem132 = new DevComponents.DotNetBar.ButtonItem(); + this.ribbonBar13 = new DevComponents.DotNetBar.RibbonBar(); + this.buttonItem127 = new DevComponents.DotNetBar.ButtonItem(); + this.buttonItem128 = new DevComponents.DotNetBar.ButtonItem(); + this.sliderItem1 = new DevComponents.DotNetBar.SliderItem(); + this.buttonItem134 = new DevComponents.DotNetBar.ButtonItem(); + this.buttonItem130 = new DevComponents.DotNetBar.ButtonItem(); + this.btn_check_history = new DevComponents.DotNetBar.ButtonItem(); + this.ribbonPanel4 = new DevComponents.DotNetBar.RibbonPanel(); + this.ribbonBar1 = new DevComponents.DotNetBar.RibbonBar(); + this.btn_document_info = new DevComponents.DotNetBar.ButtonItem(); this.ribbonTabItem1 = new DevComponents.DotNetBar.RibbonTabItem(); this.ribbonTabItem11 = new DevComponents.DotNetBar.RibbonTabItem(); this.ribbonTabItem6 = new DevComponents.DotNetBar.RibbonTabItem(); @@ -516,7 +519,6 @@ this.labelX17 = new DevComponents.DotNetBar.LabelX(); this.panelEx4 = new DevComponents.DotNetBar.PanelEx(); this.pictureBox1 = new System.Windows.Forms.PictureBox(); - this.layerTree = new Cyberpipe.MyTreeView(); this.statusStrip1.SuspendLayout(); this.sideBar1.SuspendLayout(); this.panelEx3.SuspendLayout(); @@ -527,15 +529,15 @@ this.contextMenuStrip3.SuspendLayout(); this.contextMenuStripDeleteLayerNode.SuspendLayout(); this.ribbonControl1.SuspendLayout(); + this.ribbonPanel3.SuspendLayout(); + this.ribbonPanel7.SuspendLayout(); + this.ribbonPanel15.SuspendLayout(); + this.ribbonPanel2.SuspendLayout(); this.ribbonPanel6.SuspendLayout(); this.ribbonPanel5.SuspendLayout(); this.ribbonPanel1.SuspendLayout(); this.ribbonPanel12.SuspendLayout(); this.ribbonPanel4.SuspendLayout(); - this.ribbonPanel15.SuspendLayout(); - this.ribbonPanel3.SuspendLayout(); - this.ribbonPanel7.SuspendLayout(); - this.ribbonPanel2.SuspendLayout(); this.panelOfTable.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.dataGridViewX1)).BeginInit(); this.statusStrip2.SuspendLayout(); @@ -711,7 +713,8 @@ this.statusLabel.Name = "statusLabel"; this.statusLabel.Size = new System.Drawing.Size(1313, 17); this.statusLabel.Spring = true; - this.statusLabel.Text = " ©2014-2015 苏州航天系统工程有限公司 版权所有"; + this.statusLabel.Text = Utility.Copyright; +// this.statusLabel.Text = " ©2014-2015 苏州航天系统工程有限公司 版权所有"; // // toolStripDropDownButton1 // @@ -956,6 +959,18 @@ this.layerSensorTree.NodeMouseClick += new System.Windows.Forms.TreeNodeMouseClickEventHandler(this.layerMarkerTree_NodeMouseClick); this.layerSensorTree.NodeMouseDoubleClick += new System.Windows.Forms.TreeNodeMouseClickEventHandler(this.layerTree_NodeMouseDoubleClick); // + // layerTree + // + this.layerTree.CheckBoxes = true; + this.layerTree.ItemHeight = 18; + this.layerTree.Location = new System.Drawing.Point(30, 78); + this.layerTree.Name = "layerTree"; + this.layerTree.Size = new System.Drawing.Size(121, 97); + this.layerTree.TabIndex = 1; + this.layerTree.AfterCheck += new System.Windows.Forms.TreeViewEventHandler(this.layerTree_AfterCheck); + this.layerTree.NodeMouseClick += new System.Windows.Forms.TreeNodeMouseClickEventHandler(this.layerTree_NodeMouseClick); + this.layerTree.NodeMouseDoubleClick += new System.Windows.Forms.TreeNodeMouseClickEventHandler(this.layerTree_NodeMouseDoubleClick); + // // sideBarPanelItem3 // this.sideBarPanelItem3.FontBold = true; @@ -2150,13 +2165,13 @@ this.ribbonControl1.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.ribbonControl1.Controls.Add(this.ribbonPanel3); this.ribbonControl1.Controls.Add(this.ribbonPanel7); - this.ribbonControl1.Controls.Add(this.ribbonPanel2); this.ribbonControl1.Controls.Add(this.ribbonPanel15); - this.ribbonControl1.Controls.Add(this.ribbonPanel4); - this.ribbonControl1.Controls.Add(this.ribbonPanel1); + this.ribbonControl1.Controls.Add(this.ribbonPanel2); this.ribbonControl1.Controls.Add(this.ribbonPanel6); - this.ribbonControl1.Controls.Add(this.ribbonPanel12); this.ribbonControl1.Controls.Add(this.ribbonPanel5); + this.ribbonControl1.Controls.Add(this.ribbonPanel1); + this.ribbonControl1.Controls.Add(this.ribbonPanel12); + this.ribbonControl1.Controls.Add(this.ribbonPanel4); this.ribbonControl1.Dock = System.Windows.Forms.DockStyle.Top; this.ribbonControl1.ImeMode = System.Windows.Forms.ImeMode.NoControl; this.ribbonControl1.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { @@ -2200,609 +2215,216 @@ this.ribbonControl1.Text = "ribbonControl1"; this.ribbonControl1.UseCustomizeDialog = false; // - // ribbonPanel6 + // ribbonPanel3 // - this.ribbonPanel6.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.ribbonPanel6.Controls.Add(this.ribbonBar6); - this.ribbonPanel6.Dock = System.Windows.Forms.DockStyle.Fill; - this.ribbonPanel6.Location = new System.Drawing.Point(0, 0); - this.ribbonPanel6.Name = "ribbonPanel6"; - this.ribbonPanel6.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); - this.ribbonPanel6.Size = new System.Drawing.Size(1328, 95); + this.ribbonPanel3.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.ribbonPanel3.Controls.Add(this.ribbonBar4); + this.ribbonPanel3.Dock = System.Windows.Forms.DockStyle.Fill; + this.ribbonPanel3.Location = new System.Drawing.Point(0, 33); + this.ribbonPanel3.Name = "ribbonPanel3"; + this.ribbonPanel3.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); + this.ribbonPanel3.Size = new System.Drawing.Size(1328, 62); // // // - this.ribbonPanel6.Style.Class = ""; - this.ribbonPanel6.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonPanel3.Style.Class = ""; + this.ribbonPanel3.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; // // // - this.ribbonPanel6.StyleMouseDown.Class = ""; - this.ribbonPanel6.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonPanel3.StyleMouseDown.Class = ""; + this.ribbonPanel3.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; // // // - this.ribbonPanel6.StyleMouseOver.Class = ""; - this.ribbonPanel6.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonPanel6.TabIndex = 38; - this.ribbonPanel6.Visible = false; + this.ribbonPanel3.StyleMouseOver.Class = ""; + this.ribbonPanel3.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonPanel3.TabIndex = 40; // - // ribbonBar6 + // ribbonBar4 // - this.ribbonBar6.AutoOverflowEnabled = true; + this.ribbonBar4.AutoOverflowEnabled = true; // // // - this.ribbonBar6.BackgroundMouseOverStyle.Class = ""; - this.ribbonBar6.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar4.BackgroundMouseOverStyle.Class = ""; + this.ribbonBar4.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; // // // - this.ribbonBar6.BackgroundStyle.Class = ""; - this.ribbonBar6.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonBar6.ContainerControlProcessDialogKey = true; - this.ribbonBar6.Dock = System.Windows.Forms.DockStyle.Left; - this.ribbonBar6.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { - this.buttonItemSPSZ, - this.buttonItem8, - this.buttonItemLocation, - this.sliderItem2, - this.buttonItemGBJC}); - this.ribbonBar6.Location = new System.Drawing.Point(3, 0); - this.ribbonBar6.Name = "ribbonBar6"; - this.ribbonBar6.Size = new System.Drawing.Size(427, 92); - this.ribbonBar6.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.ribbonBar6.TabIndex = 0; + this.ribbonBar4.BackgroundStyle.Class = ""; + this.ribbonBar4.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar4.ContainerControlProcessDialogKey = true; + this.ribbonBar4.Dock = System.Windows.Forms.DockStyle.Left; + this.ribbonBar4.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { + this.btn_flag, + this.slider4ground}); + this.ribbonBar4.Location = new System.Drawing.Point(3, 0); + this.ribbonBar4.Name = "ribbonBar4"; + this.ribbonBar4.Size = new System.Drawing.Size(634, 59); + this.ribbonBar4.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.ribbonBar4.TabIndex = 0; // // // - this.ribbonBar6.TitleStyle.Class = ""; - this.ribbonBar6.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar4.TitleStyle.Class = ""; + this.ribbonBar4.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; // // // - this.ribbonBar6.TitleStyleMouseOver.Class = ""; - this.ribbonBar6.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonBar6.TitleVisible = false; + this.ribbonBar4.TitleStyleMouseOver.Class = ""; + this.ribbonBar4.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar4.TitleVisible = false; // - // buttonItemSPSZ + // btn_flag // - this.buttonItemSPSZ.Image = ((System.Drawing.Image)(resources.GetObject("buttonItemSPSZ.Image"))); - this.buttonItemSPSZ.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItemSPSZ.Name = "buttonItemSPSZ"; - this.buttonItemSPSZ.SubItemsExpandWidth = 14; - this.buttonItemSPSZ.Text = "双屏设置"; - this.buttonItemSPSZ.Click += new System.EventHandler(this.buttonItemSPSZ_Click); + this.btn_flag.Image = global::Cyberpipe.Properties.Resources._24x24icon_03_hover; + this.btn_flag.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.btn_flag.Name = "btn_flag"; + this.btn_flag.SubItemsExpandWidth = 14; + this.btn_flag.Text = "标识器管理"; + this.btn_flag.Click += new System.EventHandler(this.btn_flag_Click); // - // buttonItem8 + // slider4ground // - this.buttonItem8.Image = ((System.Drawing.Image)(resources.GetObject("buttonItem8.Image"))); - this.buttonItem8.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem8.Name = "buttonItem8"; - this.buttonItem8.SubItemsExpandWidth = 14; - this.buttonItem8.Text = "双屏分析"; - this.buttonItem8.Click += new System.EventHandler(this.buttonItem8_Click); + this.slider4ground.LabelPosition = DevComponents.DotNetBar.eSliderLabelPosition.Top; + this.slider4ground.LabelWidth = 50; + this.slider4ground.Name = "slider4ground"; + this.slider4ground.Text = "地面透明度"; + this.slider4ground.TextColor = System.Drawing.Color.Black; + this.slider4ground.Value = 0; + this.slider4ground.ValueChanged += new System.EventHandler(this.slider4ground_ValueChanged); // - // buttonItemLocation + // ribbonPanel7 // - this.buttonItemLocation.Image = ((System.Drawing.Image)(resources.GetObject("buttonItemLocation.Image"))); - this.buttonItemLocation.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItemLocation.Name = "buttonItemLocation"; - this.buttonItemLocation.SubItemsExpandWidth = 14; - this.buttonItemLocation.Text = "快速定位"; - this.buttonItemLocation.Click += new System.EventHandler(this.buttonItemLocation_Click); + this.ribbonPanel7.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.ribbonPanel7.Controls.Add(this.gxdw_ribbonbar); + this.ribbonPanel7.Dock = System.Windows.Forms.DockStyle.Fill; + this.ribbonPanel7.Location = new System.Drawing.Point(0, 33); + this.ribbonPanel7.Name = "ribbonPanel7"; + this.ribbonPanel7.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); + this.ribbonPanel7.Size = new System.Drawing.Size(1328, 62); // - // sliderItem2 // - this.sliderItem2.LabelPosition = DevComponents.DotNetBar.eSliderLabelPosition.Top; - this.sliderItem2.LabelWidth = 50; - this.sliderItem2.Name = "sliderItem2"; - this.sliderItem2.Text = "地面透明度"; - this.sliderItem2.TextColor = System.Drawing.Color.Black; - this.sliderItem2.Value = 0; - this.sliderItem2.ValueChanged += new System.EventHandler(this.sliderItem2_ValueChanged); // - // buttonItemGBJC + this.ribbonPanel7.Style.Class = ""; + this.ribbonPanel7.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; // - this.buttonItemGBJC.Image = ((System.Drawing.Image)(resources.GetObject("buttonItemGBJC.Image"))); - this.buttonItemGBJC.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItemGBJC.Name = "buttonItemGBJC"; - this.buttonItemGBJC.SubItemsExpandWidth = 14; - this.buttonItemGBJC.Text = "国标检测"; - this.buttonItemGBJC.Click += new System.EventHandler(this.buttonItemGBJC_Click); // - // ribbonPanel5 // - this.ribbonPanel5.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.ribbonPanel5.Controls.Add(this.ribbonBar2); - this.ribbonPanel5.Dock = System.Windows.Forms.DockStyle.Fill; - this.ribbonPanel5.Location = new System.Drawing.Point(0, 0); - this.ribbonPanel5.Name = "ribbonPanel5"; - this.ribbonPanel5.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); - this.ribbonPanel5.Size = new System.Drawing.Size(1328, 95); + this.ribbonPanel7.StyleMouseDown.Class = ""; + this.ribbonPanel7.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; // // // - this.ribbonPanel5.Style.Class = ""; - this.ribbonPanel5.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonPanel7.StyleMouseOver.Class = ""; + this.ribbonPanel7.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonPanel7.TabIndex = 41; + this.ribbonPanel7.Visible = false; // + // gxdw_ribbonbar // + this.gxdw_ribbonbar.AutoOverflowEnabled = true; // - this.ribbonPanel5.StyleMouseDown.Class = ""; - this.ribbonPanel5.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; // // + this.gxdw_ribbonbar.BackgroundMouseOverStyle.Class = ""; + this.gxdw_ribbonbar.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; // - this.ribbonPanel5.StyleMouseOver.Class = ""; - this.ribbonPanel5.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonPanel5.TabIndex = 37; - this.ribbonPanel5.Visible = false; // - // ribbonBar2 // - this.ribbonBar2.AutoOverflowEnabled = true; + this.gxdw_ribbonbar.BackgroundStyle.Class = ""; + this.gxdw_ribbonbar.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.gxdw_ribbonbar.ContainerControlProcessDialogKey = true; + this.gxdw_ribbonbar.Dock = System.Windows.Forms.DockStyle.Left; + this.gxdw_ribbonbar.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { + this.buttonItem9, + this.buttonItem10, + this.buttonItem11, + this.buttonItem12, + this.buttonItem13, + this.buttonItem14}); + this.gxdw_ribbonbar.Location = new System.Drawing.Point(3, 0); + this.gxdw_ribbonbar.Name = "gxdw_ribbonbar"; + this.gxdw_ribbonbar.Size = new System.Drawing.Size(564, 59); + this.gxdw_ribbonbar.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.gxdw_ribbonbar.TabIndex = 0; + this.gxdw_ribbonbar.Text = "ribbonBar5"; // // // - this.ribbonBar2.BackgroundMouseOverStyle.Class = ""; - this.ribbonBar2.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.gxdw_ribbonbar.TitleStyle.Class = ""; + this.gxdw_ribbonbar.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; // // // - this.ribbonBar2.BackgroundStyle.Class = ""; - this.ribbonBar2.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonBar2.ContainerControlProcessDialogKey = true; - this.ribbonBar2.Dock = System.Windows.Forms.DockStyle.Left; - this.ribbonBar2.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { - this.buttonItemHX1, - this.buttonItemHX2, - this.buttonItemDCTP, - this.sliderItem3}); - this.ribbonBar2.Location = new System.Drawing.Point(3, 0); - this.ribbonBar2.Name = "ribbonBar2"; - this.ribbonBar2.Size = new System.Drawing.Size(350, 92); - this.ribbonBar2.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.ribbonBar2.TabIndex = 0; + this.gxdw_ribbonbar.TitleStyleMouseOver.Class = ""; + this.gxdw_ribbonbar.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.gxdw_ribbonbar.TitleVisible = false; // + // buttonItem9 // + this.buttonItem9.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__76; + this.buttonItem9.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem9.Name = "buttonItem9"; + this.buttonItem9.SubItemsExpandWidth = 14; + this.buttonItem9.Text = "工单管理"; + this.buttonItem9.Click += new System.EventHandler(this.buttonItem9_Click); // - this.ribbonBar2.TitleStyle.Class = ""; - this.ribbonBar2.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // buttonItem10 // + this.buttonItem10.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__69; + this.buttonItem10.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem10.Name = "buttonItem10"; + this.buttonItem10.SubItemsExpandWidth = 14; + this.buttonItem10.Text = "在线任务"; + this.buttonItem10.Click += new System.EventHandler(this.buttonItem10_Click); // + // buttonItem11 // - this.ribbonBar2.TitleStyleMouseOver.Class = ""; - this.ribbonBar2.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonBar2.TitleVisible = false; + this.buttonItem11.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__72; + this.buttonItem11.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem11.Name = "buttonItem11"; + this.buttonItem11.SubItemsExpandWidth = 14; + this.buttonItem11.Text = "事件管理"; + this.buttonItem11.Click += new System.EventHandler(this.buttonItem11_Click); // - // buttonItemHX1 + // buttonItem12 // - this.buttonItemHX1.AutoExpandOnClick = true; - this.buttonItemHX1.Image = ((System.Drawing.Image)(resources.GetObject("buttonItemHX1.Image"))); - this.buttonItemHX1.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItemHX1.Name = "buttonItemHX1"; - this.buttonItemHX1.SubItemsExpandWidth = 14; - this.buttonItemHX1.Text = "导入红线"; - this.buttonItemHX1.Click += new System.EventHandler(this.buttonItemHX1_Click); + this.buttonItem12.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__34; + this.buttonItem12.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem12.Name = "buttonItem12"; + this.buttonItem12.SubItemsExpandWidth = 14; + this.buttonItem12.Text = "探测仪管理"; + this.buttonItem12.Click += new System.EventHandler(this.buttonItem12_Click); // - // buttonItemHX2 + // buttonItem13 // - this.buttonItemHX2.Image = ((System.Drawing.Image)(resources.GetObject("buttonItemHX2.Image"))); - this.buttonItemHX2.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItemHX2.Name = "buttonItemHX2"; - this.buttonItemHX2.SubItemsExpandWidth = 14; - this.buttonItemHX2.Text = "红线审核"; - this.buttonItemHX2.Click += new System.EventHandler(this.buttonItemHX2_Click); + this.buttonItem13.Image = global::Cyberpipe.Properties.Resources._24x24icon_13_hover; + this.buttonItem13.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem13.Name = "buttonItem13"; + this.buttonItem13.SubItemsExpandWidth = 14; + this.buttonItem13.Text = "巡检人员维护"; + this.buttonItem13.Click += new System.EventHandler(this.buttonItem13_Click); // - // buttonItemDCTP + // buttonItem14 // - this.buttonItemDCTP.Image = ((System.Drawing.Image)(resources.GetObject("buttonItemDCTP.Image"))); - this.buttonItemDCTP.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItemDCTP.Name = "buttonItemDCTP"; - this.buttonItemDCTP.SubItemsExpandWidth = 14; - this.buttonItemDCTP.Text = "导出图片"; - this.buttonItemDCTP.Click += new System.EventHandler(this.buttonItemDCTP_Click); - // - // sliderItem3 - // - this.sliderItem3.LabelPosition = DevComponents.DotNetBar.eSliderLabelPosition.Top; - this.sliderItem3.LabelWidth = 50; - this.sliderItem3.Name = "sliderItem3"; - this.sliderItem3.Text = "地面透明度"; - this.sliderItem3.TextColor = System.Drawing.Color.Black; - this.sliderItem3.Value = 0; - this.sliderItem3.ValueChanged += new System.EventHandler(this.sliderItem3_ValueChanged); - // - // ribbonPanel1 - // - this.ribbonPanel1.AutoSize = true; - this.ribbonPanel1.CanvasColor = System.Drawing.Color.Gray; - this.ribbonPanel1.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.ribbonPanel1.Controls.Add(this.ribbonBar21); - this.ribbonPanel1.Dock = System.Windows.Forms.DockStyle.Fill; - this.ribbonPanel1.Location = new System.Drawing.Point(0, 0); - this.ribbonPanel1.Name = "ribbonPanel1"; - this.ribbonPanel1.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); - this.ribbonPanel1.Size = new System.Drawing.Size(1328, 95); - // - // - // - this.ribbonPanel1.Style.Class = ""; - this.ribbonPanel1.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonPanel1.StyleMouseDown.Class = ""; - this.ribbonPanel1.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonPanel1.StyleMouseOver.Class = ""; - this.ribbonPanel1.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonPanel1.TabIndex = 1; - this.ribbonPanel1.Visible = false; - // - // ribbonBar21 - // - this.ribbonBar21.AutoOverflowEnabled = true; - this.ribbonBar21.BackColor = System.Drawing.Color.White; - // - // - // - this.ribbonBar21.BackgroundMouseOverStyle.Class = ""; - this.ribbonBar21.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonBar21.BackgroundStyle.Class = ""; - this.ribbonBar21.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonBar21.ContainerControlProcessDialogKey = true; - this.ribbonBar21.Dock = System.Windows.Forms.DockStyle.Left; - this.ribbonBar21.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { - this.buttonItem87, - this.buttonItem88, - this.buttonItem27, - this.sliderGroundTransSet1, - this.buttonItem91, - this.buttonItem1, - this.btnlegendSet, - this.buttonItem89, - this.btnOutputJPG}); - this.ribbonBar21.Location = new System.Drawing.Point(3, 0); - this.ribbonBar21.Name = "ribbonBar21"; - this.ribbonBar21.Size = new System.Drawing.Size(649, 92); - this.ribbonBar21.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.ribbonBar21.TabIndex = 2; - this.ribbonBar21.Text = "浏览模式"; - // - // - // - this.ribbonBar21.TitleStyle.Class = ""; - this.ribbonBar21.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonBar21.TitleStyleMouseOver.Class = ""; - this.ribbonBar21.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonBar21.TitleVisible = false; - // - // buttonItem87 - // - this.buttonItem87.Image = ((System.Drawing.Image)(resources.GetObject("buttonItem87.Image"))); - this.buttonItem87.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem87.Name = "buttonItem87"; - this.buttonItem87.SubItemsExpandWidth = 14; - this.buttonItem87.Text = "地上模式"; - this.buttonItem87.Click += new System.EventHandler(this.buttonItem87_Click); - // - // buttonItem88 - // - this.buttonItem88.Image = ((System.Drawing.Image)(resources.GetObject("buttonItem88.Image"))); - this.buttonItem88.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem88.Name = "buttonItem88"; - this.buttonItem88.SubItemsExpandWidth = 14; - this.buttonItem88.Text = "地下模式"; - this.buttonItem88.Click += new System.EventHandler(this.buttonItem88_Click); - // - // buttonItem27 - // - this.buttonItem27.Image = ((System.Drawing.Image)(resources.GetObject("buttonItem27.Image"))); - this.buttonItem27.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem27.Name = "buttonItem27"; - this.buttonItem27.SubItemsExpandWidth = 14; - this.buttonItem27.Text = "行走模式"; - this.buttonItem27.Click += new System.EventHandler(this.buttonItem27_Click); - // - // buttonItem91 - // - this.buttonItem91.ForeColor = System.Drawing.Color.Black; - this.buttonItem91.Image = ((System.Drawing.Image)(resources.GetObject("buttonItem91.Image"))); - this.buttonItem91.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem91.Name = "buttonItem91"; - this.buttonItem91.SubItemsExpandWidth = 14; - this.buttonItem91.Text = "快速定位"; - this.buttonItem91.Click += new System.EventHandler(this.buttonItem91_Click); - // - // buttonItem1 - // - this.buttonItem1.Image = ((System.Drawing.Image)(resources.GetObject("buttonItem1.Image"))); - this.buttonItem1.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem1.Name = "buttonItem1"; - this.buttonItem1.SubItemsExpandWidth = 14; - this.buttonItem1.Text = "图层管理"; - this.buttonItem1.Click += new System.EventHandler(this.buttonItem1_Click); - // - // btnlegendSet - // - this.btnlegendSet.Image = ((System.Drawing.Image)(resources.GetObject("btnlegendSet.Image"))); - this.btnlegendSet.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.btnlegendSet.Name = "btnlegendSet"; - this.btnlegendSet.SubItemsExpandWidth = 14; - this.btnlegendSet.Text = "图例"; - this.btnlegendSet.Click += new System.EventHandler(this.btnlegendSet_Click); - // - // buttonItem89 - // - this.buttonItem89.Image = ((System.Drawing.Image)(resources.GetObject("buttonItem89.Image"))); - this.buttonItem89.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem89.Name = "buttonItem89"; - this.buttonItem89.SubItemsExpandWidth = 14; - this.buttonItem89.Text = "全屏显示"; - this.buttonItem89.Click += new System.EventHandler(this.buttonItem89_Click); - // - // btnOutputJPG - // - this.btnOutputJPG.Image = ((System.Drawing.Image)(resources.GetObject("btnOutputJPG.Image"))); - this.btnOutputJPG.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.btnOutputJPG.Name = "btnOutputJPG"; - this.btnOutputJPG.SubItemsExpandWidth = 14; - this.btnOutputJPG.Text = "导出图片"; - this.btnOutputJPG.Click += new System.EventHandler(this.btnOutputJPG_Click); - // - // ribbonPanel12 - // - this.ribbonPanel12.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.ribbonPanel12.Controls.Add(this.ribbonBar18); - this.ribbonPanel12.Controls.Add(this.ribbonBar13); - this.ribbonPanel12.Dock = System.Windows.Forms.DockStyle.Fill; - this.ribbonPanel12.Location = new System.Drawing.Point(0, 0); - this.ribbonPanel12.Name = "ribbonPanel12"; - this.ribbonPanel12.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); - this.ribbonPanel12.Size = new System.Drawing.Size(1328, 95); - // - // - // - this.ribbonPanel12.Style.Class = ""; - this.ribbonPanel12.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonPanel12.StyleMouseDown.Class = ""; - this.ribbonPanel12.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonPanel12.StyleMouseOver.Class = ""; - this.ribbonPanel12.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonPanel12.TabIndex = 34; - this.ribbonPanel12.Visible = false; - // - // ribbonBar18 - // - this.ribbonBar18.AutoOverflowEnabled = true; - // - // - // - this.ribbonBar18.BackgroundMouseOverStyle.Class = ""; - this.ribbonBar18.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonBar18.BackgroundStyle.Class = ""; - this.ribbonBar18.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonBar18.ContainerControlProcessDialogKey = true; - this.ribbonBar18.Dock = System.Windows.Forms.DockStyle.Left; - this.ribbonBar18.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { - this.buttonItem133}); - this.ribbonBar18.Location = new System.Drawing.Point(531, 0); - this.ribbonBar18.Name = "ribbonBar18"; - this.ribbonBar18.Size = new System.Drawing.Size(129, 92); - this.ribbonBar18.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.ribbonBar18.TabIndex = 1; - // - // - // - this.ribbonBar18.TitleStyle.Class = ""; - this.ribbonBar18.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonBar18.TitleStyleMouseOver.Class = ""; - this.ribbonBar18.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonBar18.TitleVisible = false; - // - // buttonItem133 - // - this.buttonItem133.Image = ((System.Drawing.Image)(resources.GetObject("buttonItem133.Image"))); - this.buttonItem133.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem133.Name = "buttonItem133"; - this.buttonItem133.SubItemsExpandWidth = 14; - this.buttonItem133.Text = "审核入库"; - this.buttonItem133.Click += new System.EventHandler(this.buttonItem133_Click_1); - // - // ribbonBar13 - // - this.ribbonBar13.AutoOverflowEnabled = true; - // - // - // - this.ribbonBar13.BackgroundMouseOverStyle.Class = ""; - this.ribbonBar13.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonBar13.BackgroundStyle.Class = ""; - this.ribbonBar13.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonBar13.ContainerControlProcessDialogKey = true; - this.ribbonBar13.Dock = System.Windows.Forms.DockStyle.Left; - this.ribbonBar13.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { - this.buttonItem127, - this.buttonItem128, - this.sliderItem1, - this.buttonItem134, - this.buttonItem130, - this.btn_check_history}); - this.ribbonBar13.Location = new System.Drawing.Point(3, 0); - this.ribbonBar13.Name = "ribbonBar13"; - this.ribbonBar13.Size = new System.Drawing.Size(528, 92); - this.ribbonBar13.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.ribbonBar13.TabIndex = 0; - // - // - // - this.ribbonBar13.TitleStyle.Class = ""; - this.ribbonBar13.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonBar13.TitleStyleMouseOver.Class = ""; - this.ribbonBar13.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonBar13.TitleVisible = false; - // - // buttonItem127 - // - this.buttonItem127.Image = ((System.Drawing.Image)(resources.GetObject("buttonItem127.Image"))); - this.buttonItem127.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem127.Name = "buttonItem127"; - this.buttonItem127.SubItemsExpandWidth = 14; - this.buttonItem127.Text = "打开数据"; - this.buttonItem127.Click += new System.EventHandler(this.buttonItem127_Click_2); - // - // buttonItem128 - // - this.buttonItem128.Image = ((System.Drawing.Image)(resources.GetObject("buttonItem128.Image"))); - this.buttonItem128.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem128.Name = "buttonItem128"; - this.buttonItem128.SubItemsExpandWidth = 14; - this.buttonItem128.Text = "一键审核"; - this.buttonItem128.Click += new System.EventHandler(this.buttonItem128_Click); - // - // sliderItem1 - // - this.sliderItem1.LabelPosition = DevComponents.DotNetBar.eSliderLabelPosition.Top; - this.sliderItem1.LabelWidth = 50; - this.sliderItem1.Name = "sliderItem1"; - this.sliderItem1.Text = "地面透明度"; - this.sliderItem1.TextColor = System.Drawing.Color.Black; - this.sliderItem1.Value = 0; - this.sliderItem1.ValueChanged += new System.EventHandler(this.sliderItem1_ValueChanged); - // - // buttonItem134 - // - this.buttonItem134.Image = ((System.Drawing.Image)(resources.GetObject("buttonItem134.Image"))); - this.buttonItem134.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem134.Name = "buttonItem134"; - this.buttonItem134.SubItemsExpandWidth = 14; - this.buttonItem134.Text = "模拟设计修改"; - this.buttonItem134.Click += new System.EventHandler(this.buttonItem134_Click_1); - // - // buttonItem130 - // - this.buttonItem130.Image = ((System.Drawing.Image)(resources.GetObject("buttonItem130.Image"))); - this.buttonItem130.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem130.Name = "buttonItem130"; - this.buttonItem130.SubItemsExpandWidth = 14; - this.buttonItem130.Text = "导出审核图"; - this.buttonItem130.Click += new System.EventHandler(this.buttonItem130_Click_1); - // - // btn_check_history - // - this.btn_check_history.Image = ((System.Drawing.Image)(resources.GetObject("btn_check_history.Image"))); - this.btn_check_history.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.btn_check_history.Name = "btn_check_history"; - this.btn_check_history.SubItemsExpandWidth = 14; - this.btn_check_history.Text = "审核历史"; - this.btn_check_history.Click += new System.EventHandler(this.btn_check_history_Click); - // - // ribbonPanel4 - // - this.ribbonPanel4.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.ribbonPanel4.Controls.Add(this.ribbonBar1); - this.ribbonPanel4.Dock = System.Windows.Forms.DockStyle.Fill; - this.ribbonPanel4.Location = new System.Drawing.Point(0, 0); - this.ribbonPanel4.Name = "ribbonPanel4"; - this.ribbonPanel4.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); - this.ribbonPanel4.Size = new System.Drawing.Size(1328, 95); - // - // - // - this.ribbonPanel4.Style.Class = ""; - this.ribbonPanel4.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonPanel4.StyleMouseDown.Class = ""; - this.ribbonPanel4.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonPanel4.StyleMouseOver.Class = ""; - this.ribbonPanel4.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonPanel4.TabIndex = 36; - this.ribbonPanel4.Visible = false; - // - // ribbonBar1 - // - this.ribbonBar1.AutoOverflowEnabled = true; - // - // - // - this.ribbonBar1.BackgroundMouseOverStyle.Class = ""; - this.ribbonBar1.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonBar1.BackgroundStyle.Class = ""; - this.ribbonBar1.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonBar1.ContainerControlProcessDialogKey = true; - this.ribbonBar1.Dock = System.Windows.Forms.DockStyle.Left; - this.ribbonBar1.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { - this.btn_document_info}); - this.ribbonBar1.Location = new System.Drawing.Point(3, 0); - this.ribbonBar1.Name = "ribbonBar1"; - this.ribbonBar1.Size = new System.Drawing.Size(88, 92); - this.ribbonBar1.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.ribbonBar1.TabIndex = 0; - // - // - // - this.ribbonBar1.TitleStyle.Class = ""; - this.ribbonBar1.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonBar1.TitleStyleMouseOver.Class = ""; - this.ribbonBar1.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonBar1.TitleVisible = false; - // - // btn_document_info - // - this.btn_document_info.Image = ((System.Drawing.Image)(resources.GetObject("btn_document_info.Image"))); - this.btn_document_info.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.btn_document_info.Name = "btn_document_info"; - this.btn_document_info.SubItemsExpandWidth = 14; - this.btn_document_info.Text = "文档管理"; - this.btn_document_info.Click += new System.EventHandler(this.btn_document_info_Click); + this.buttonItem14.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__56; + this.buttonItem14.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem14.Name = "buttonItem14"; + this.buttonItem14.SubItemsExpandWidth = 14; + this.buttonItem14.Text = "导出施工图"; + this.buttonItem14.Click += new System.EventHandler(this.buttonItem14_Click); // // ribbonPanel15 // this.ribbonPanel15.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; this.ribbonPanel15.Controls.Add(this.ribbonBar20); this.ribbonPanel15.Dock = System.Windows.Forms.DockStyle.Fill; - this.ribbonPanel15.Location = new System.Drawing.Point(0, 0); + this.ribbonPanel15.Location = new System.Drawing.Point(0, 33); this.ribbonPanel15.Name = "ribbonPanel15"; this.ribbonPanel15.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); - this.ribbonPanel15.Size = new System.Drawing.Size(1328, 95); + this.ribbonPanel15.Size = new System.Drawing.Size(1328, 62); // // // @@ -2843,7 +2465,7 @@ this.buttonItemXTGL}); this.ribbonBar20.Location = new System.Drawing.Point(3, 0); this.ribbonBar20.Name = "ribbonBar20"; - this.ribbonBar20.Size = new System.Drawing.Size(283, 92); + this.ribbonBar20.Size = new System.Drawing.Size(283, 59); this.ribbonBar20.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; this.ribbonBar20.TabIndex = 0; // @@ -3274,216 +2896,15 @@ this.buttonItemXT4_2.Text = "人员修改"; this.buttonItemXT4_2.Click += new System.EventHandler(this.buttonItemXT4_2_Click); // - // ribbonPanel3 - // - this.ribbonPanel3.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.ribbonPanel3.Controls.Add(this.ribbonBar4); - this.ribbonPanel3.Dock = System.Windows.Forms.DockStyle.Fill; - this.ribbonPanel3.Location = new System.Drawing.Point(0, 33); - this.ribbonPanel3.Name = "ribbonPanel3"; - this.ribbonPanel3.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); - this.ribbonPanel3.Size = new System.Drawing.Size(1328, 62); - // - // - // - this.ribbonPanel3.Style.Class = ""; - this.ribbonPanel3.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonPanel3.StyleMouseDown.Class = ""; - this.ribbonPanel3.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonPanel3.StyleMouseOver.Class = ""; - this.ribbonPanel3.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonPanel3.TabIndex = 40; - // - // ribbonBar4 - // - this.ribbonBar4.AutoOverflowEnabled = true; - // - // - // - this.ribbonBar4.BackgroundMouseOverStyle.Class = ""; - this.ribbonBar4.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonBar4.BackgroundStyle.Class = ""; - this.ribbonBar4.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonBar4.ContainerControlProcessDialogKey = true; - this.ribbonBar4.Dock = System.Windows.Forms.DockStyle.Left; - this.ribbonBar4.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { - this.btn_flag, - this.slider4ground}); - this.ribbonBar4.Location = new System.Drawing.Point(3, 0); - this.ribbonBar4.Name = "ribbonBar4"; - this.ribbonBar4.Size = new System.Drawing.Size(321, 59); - this.ribbonBar4.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.ribbonBar4.TabIndex = 0; - // - // - // - this.ribbonBar4.TitleStyle.Class = ""; - this.ribbonBar4.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonBar4.TitleStyleMouseOver.Class = ""; - this.ribbonBar4.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonBar4.TitleVisible = false; - // - // btn_flag - // - this.btn_flag.Image = global::Cyberpipe.Properties.Resources._24x24icon_03_hover; - this.btn_flag.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.btn_flag.Name = "btn_flag"; - this.btn_flag.SubItemsExpandWidth = 14; - this.btn_flag.Text = "标识器管理"; - this.btn_flag.Click += new System.EventHandler(this.btn_flag_Click); - // - // slider4ground - // - this.slider4ground.LabelPosition = DevComponents.DotNetBar.eSliderLabelPosition.Top; - this.slider4ground.LabelWidth = 50; - this.slider4ground.Name = "slider4ground"; - this.slider4ground.Text = "地面透明度"; - this.slider4ground.TextColor = System.Drawing.Color.Black; - this.slider4ground.Value = 0; - this.slider4ground.ValueChanged += new System.EventHandler(this.slider4ground_ValueChanged); - // - // ribbonPanel7 - // - this.ribbonPanel7.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.ribbonPanel7.Controls.Add(this.gxdw_ribbonbar); - this.ribbonPanel7.Dock = System.Windows.Forms.DockStyle.Fill; - this.ribbonPanel7.Location = new System.Drawing.Point(0, 33); - this.ribbonPanel7.Name = "ribbonPanel7"; - this.ribbonPanel7.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); - this.ribbonPanel7.Size = new System.Drawing.Size(1328, 62); - // - // - // - this.ribbonPanel7.Style.Class = ""; - this.ribbonPanel7.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonPanel7.StyleMouseDown.Class = ""; - this.ribbonPanel7.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonPanel7.StyleMouseOver.Class = ""; - this.ribbonPanel7.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonPanel7.TabIndex = 41; - this.ribbonPanel7.Visible = false; - // - // gxdw_ribbonbar - // - this.gxdw_ribbonbar.AutoOverflowEnabled = true; - // - // - // - this.gxdw_ribbonbar.BackgroundMouseOverStyle.Class = ""; - this.gxdw_ribbonbar.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.gxdw_ribbonbar.BackgroundStyle.Class = ""; - this.gxdw_ribbonbar.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.gxdw_ribbonbar.ContainerControlProcessDialogKey = true; - this.gxdw_ribbonbar.Dock = System.Windows.Forms.DockStyle.Left; - this.gxdw_ribbonbar.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { - this.buttonItem9, - this.buttonItem10, - this.buttonItem11, - this.buttonItem12, - this.buttonItem13, - this.buttonItem14}); - this.gxdw_ribbonbar.Location = new System.Drawing.Point(3, 0); - this.gxdw_ribbonbar.Name = "gxdw_ribbonbar"; - this.gxdw_ribbonbar.Size = new System.Drawing.Size(522, 59); - this.gxdw_ribbonbar.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.gxdw_ribbonbar.TabIndex = 0; - this.gxdw_ribbonbar.Text = "ribbonBar5"; - // - // - // - this.gxdw_ribbonbar.TitleStyle.Class = ""; - this.gxdw_ribbonbar.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.gxdw_ribbonbar.TitleStyleMouseOver.Class = ""; - this.gxdw_ribbonbar.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.gxdw_ribbonbar.TitleVisible = false; - // - // buttonItem9 - // - this.buttonItem9.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__76; - this.buttonItem9.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem9.Name = "buttonItem9"; - this.buttonItem9.SubItemsExpandWidth = 14; - this.buttonItem9.Text = "工单管理"; - this.buttonItem9.Click += new System.EventHandler(this.buttonItem9_Click); - // - // buttonItem10 - // - this.buttonItem10.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__69; - this.buttonItem10.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem10.Name = "buttonItem10"; - this.buttonItem10.SubItemsExpandWidth = 14; - this.buttonItem10.Text = "在线任务"; - this.buttonItem10.Click += new System.EventHandler(this.buttonItem10_Click); - // - // buttonItem11 - // - this.buttonItem11.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__72; - this.buttonItem11.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem11.Name = "buttonItem11"; - this.buttonItem11.SubItemsExpandWidth = 14; - this.buttonItem11.Text = "事件管理"; - this.buttonItem11.Click += new System.EventHandler(this.buttonItem11_Click); - // - // buttonItem12 - // - this.buttonItem12.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__34; - this.buttonItem12.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem12.Name = "buttonItem12"; - this.buttonItem12.SubItemsExpandWidth = 14; - this.buttonItem12.Text = "探测仪管理"; - this.buttonItem12.Click += new System.EventHandler(this.buttonItem12_Click); - // - // buttonItem13 - // - this.buttonItem13.Image = global::Cyberpipe.Properties.Resources._24x24icon_13_hover; - this.buttonItem13.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem13.Name = "buttonItem13"; - this.buttonItem13.SubItemsExpandWidth = 14; - this.buttonItem13.Text = "巡检人员维护"; - this.buttonItem13.Click += new System.EventHandler(this.buttonItem13_Click); - // - // buttonItem14 - // - this.buttonItem14.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__56; - this.buttonItem14.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem14.Name = "buttonItem14"; - this.buttonItem14.SubItemsExpandWidth = 14; - this.buttonItem14.Text = "导出施工图"; - this.buttonItem14.Click += new System.EventHandler(this.buttonItem14_Click); - // // ribbonPanel2 // this.ribbonPanel2.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; this.ribbonPanel2.Controls.Add(this.ribbonBar3); this.ribbonPanel2.Dock = System.Windows.Forms.DockStyle.Fill; - this.ribbonPanel2.Location = new System.Drawing.Point(0, 33); + this.ribbonPanel2.Location = new System.Drawing.Point(0, 0); this.ribbonPanel2.Name = "ribbonPanel2"; this.ribbonPanel2.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); - this.ribbonPanel2.Size = new System.Drawing.Size(1328, 62); + this.ribbonPanel2.Size = new System.Drawing.Size(1328, 95); // // // @@ -3527,7 +2948,7 @@ this.buttonItemPasswordReset}); this.ribbonBar3.Location = new System.Drawing.Point(3, 0); this.ribbonBar3.Name = "ribbonBar3"; - this.ribbonBar3.Size = new System.Drawing.Size(551, 59); + this.ribbonBar3.Size = new System.Drawing.Size(551, 92); this.ribbonBar3.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; this.ribbonBar3.TabIndex = 1; // @@ -3567,6 +2988,7 @@ this.btn_resc_info.Name = "btn_resc_info"; this.btn_resc_info.SubItemsExpandWidth = 14; this.btn_resc_info.Text = "资源管理"; + this.btn_resc_info.Visible = false; this.btn_resc_info.Click += new System.EventHandler(this.btn_resc_info_Click); // // btn_role_resc @@ -3605,6 +3027,605 @@ this.buttonItemPasswordReset.Text = "重置密码"; this.buttonItemPasswordReset.Click += new System.EventHandler(this.buttonItemPasswordReset_Click); // + // ribbonPanel6 + // + this.ribbonPanel6.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.ribbonPanel6.Controls.Add(this.ribbonBar6); + this.ribbonPanel6.Dock = System.Windows.Forms.DockStyle.Fill; + this.ribbonPanel6.Location = new System.Drawing.Point(0, 0); + this.ribbonPanel6.Name = "ribbonPanel6"; + this.ribbonPanel6.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); + this.ribbonPanel6.Size = new System.Drawing.Size(1328, 95); + // + // + // + this.ribbonPanel6.Style.Class = ""; + this.ribbonPanel6.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonPanel6.StyleMouseDown.Class = ""; + this.ribbonPanel6.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonPanel6.StyleMouseOver.Class = ""; + this.ribbonPanel6.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonPanel6.TabIndex = 38; + this.ribbonPanel6.Visible = false; + // + // ribbonBar6 + // + this.ribbonBar6.AutoOverflowEnabled = true; + // + // + // + this.ribbonBar6.BackgroundMouseOverStyle.Class = ""; + this.ribbonBar6.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonBar6.BackgroundStyle.Class = ""; + this.ribbonBar6.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar6.ContainerControlProcessDialogKey = true; + this.ribbonBar6.Dock = System.Windows.Forms.DockStyle.Left; + this.ribbonBar6.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { + this.buttonItemSPSZ, + this.buttonItem8, + this.buttonItemLocation, + this.sliderItem2, + this.buttonItemGBJC}); + this.ribbonBar6.Location = new System.Drawing.Point(3, 0); + this.ribbonBar6.Name = "ribbonBar6"; + this.ribbonBar6.Size = new System.Drawing.Size(427, 92); + this.ribbonBar6.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.ribbonBar6.TabIndex = 0; + // + // + // + this.ribbonBar6.TitleStyle.Class = ""; + this.ribbonBar6.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonBar6.TitleStyleMouseOver.Class = ""; + this.ribbonBar6.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar6.TitleVisible = false; + // + // buttonItemSPSZ + // + this.buttonItemSPSZ.Image = ((System.Drawing.Image)(resources.GetObject("buttonItemSPSZ.Image"))); + this.buttonItemSPSZ.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItemSPSZ.Name = "buttonItemSPSZ"; + this.buttonItemSPSZ.SubItemsExpandWidth = 14; + this.buttonItemSPSZ.Text = "双屏设置"; + this.buttonItemSPSZ.Click += new System.EventHandler(this.buttonItemSPSZ_Click); + // + // buttonItem8 + // + this.buttonItem8.Image = ((System.Drawing.Image)(resources.GetObject("buttonItem8.Image"))); + this.buttonItem8.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem8.Name = "buttonItem8"; + this.buttonItem8.SubItemsExpandWidth = 14; + this.buttonItem8.Text = "双屏分析"; + this.buttonItem8.Click += new System.EventHandler(this.buttonItem8_Click); + // + // buttonItemLocation + // + this.buttonItemLocation.Image = ((System.Drawing.Image)(resources.GetObject("buttonItemLocation.Image"))); + this.buttonItemLocation.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItemLocation.Name = "buttonItemLocation"; + this.buttonItemLocation.SubItemsExpandWidth = 14; + this.buttonItemLocation.Text = "快速定位"; + this.buttonItemLocation.Click += new System.EventHandler(this.buttonItemLocation_Click); + // + // sliderItem2 + // + this.sliderItem2.LabelPosition = DevComponents.DotNetBar.eSliderLabelPosition.Top; + this.sliderItem2.LabelWidth = 50; + this.sliderItem2.Name = "sliderItem2"; + this.sliderItem2.Text = "地面透明度"; + this.sliderItem2.TextColor = System.Drawing.Color.Black; + this.sliderItem2.Value = 0; + this.sliderItem2.ValueChanged += new System.EventHandler(this.sliderItem2_ValueChanged); + // + // buttonItemGBJC + // + this.buttonItemGBJC.Image = ((System.Drawing.Image)(resources.GetObject("buttonItemGBJC.Image"))); + this.buttonItemGBJC.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItemGBJC.Name = "buttonItemGBJC"; + this.buttonItemGBJC.SubItemsExpandWidth = 14; + this.buttonItemGBJC.Text = "国标检测"; + this.buttonItemGBJC.Click += new System.EventHandler(this.buttonItemGBJC_Click); + // + // ribbonPanel5 + // + this.ribbonPanel5.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.ribbonPanel5.Controls.Add(this.ribbonBar2); + this.ribbonPanel5.Dock = System.Windows.Forms.DockStyle.Fill; + this.ribbonPanel5.Location = new System.Drawing.Point(0, 33); + this.ribbonPanel5.Name = "ribbonPanel5"; + this.ribbonPanel5.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); + this.ribbonPanel5.Size = new System.Drawing.Size(1328, 62); + // + // + // + this.ribbonPanel5.Style.Class = ""; + this.ribbonPanel5.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonPanel5.StyleMouseDown.Class = ""; + this.ribbonPanel5.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonPanel5.StyleMouseOver.Class = ""; + this.ribbonPanel5.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonPanel5.TabIndex = 37; + this.ribbonPanel5.Visible = false; + // + // ribbonBar2 + // + this.ribbonBar2.AutoOverflowEnabled = true; + // + // + // + this.ribbonBar2.BackgroundMouseOverStyle.Class = ""; + this.ribbonBar2.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonBar2.BackgroundStyle.Class = ""; + this.ribbonBar2.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar2.ContainerControlProcessDialogKey = true; + this.ribbonBar2.Dock = System.Windows.Forms.DockStyle.Left; + this.ribbonBar2.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { + this.buttonItemHX1, + this.buttonItemHX2, + this.buttonItemDCTP, + this.sliderItem3}); + this.ribbonBar2.Location = new System.Drawing.Point(3, 0); + this.ribbonBar2.Name = "ribbonBar2"; + this.ribbonBar2.Size = new System.Drawing.Size(350, 59); + this.ribbonBar2.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.ribbonBar2.TabIndex = 0; + // + // + // + this.ribbonBar2.TitleStyle.Class = ""; + this.ribbonBar2.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonBar2.TitleStyleMouseOver.Class = ""; + this.ribbonBar2.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar2.TitleVisible = false; + // + // buttonItemHX1 + // + this.buttonItemHX1.AutoExpandOnClick = true; + this.buttonItemHX1.Image = ((System.Drawing.Image)(resources.GetObject("buttonItemHX1.Image"))); + this.buttonItemHX1.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItemHX1.Name = "buttonItemHX1"; + this.buttonItemHX1.SubItemsExpandWidth = 14; + this.buttonItemHX1.Text = "导入红线"; + this.buttonItemHX1.Click += new System.EventHandler(this.buttonItemHX1_Click); + // + // buttonItemHX2 + // + this.buttonItemHX2.Image = ((System.Drawing.Image)(resources.GetObject("buttonItemHX2.Image"))); + this.buttonItemHX2.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItemHX2.Name = "buttonItemHX2"; + this.buttonItemHX2.SubItemsExpandWidth = 14; + this.buttonItemHX2.Text = "红线审核"; + this.buttonItemHX2.Click += new System.EventHandler(this.buttonItemHX2_Click); + // + // buttonItemDCTP + // + this.buttonItemDCTP.Image = ((System.Drawing.Image)(resources.GetObject("buttonItemDCTP.Image"))); + this.buttonItemDCTP.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItemDCTP.Name = "buttonItemDCTP"; + this.buttonItemDCTP.SubItemsExpandWidth = 14; + this.buttonItemDCTP.Text = "导出图片"; + this.buttonItemDCTP.Click += new System.EventHandler(this.buttonItemDCTP_Click); + // + // sliderItem3 + // + this.sliderItem3.LabelPosition = DevComponents.DotNetBar.eSliderLabelPosition.Top; + this.sliderItem3.LabelWidth = 50; + this.sliderItem3.Name = "sliderItem3"; + this.sliderItem3.Text = "地面透明度"; + this.sliderItem3.TextColor = System.Drawing.Color.Black; + this.sliderItem3.Value = 0; + this.sliderItem3.ValueChanged += new System.EventHandler(this.sliderItem3_ValueChanged); + // + // ribbonPanel1 + // + this.ribbonPanel1.AutoSize = true; + this.ribbonPanel1.CanvasColor = System.Drawing.Color.Gray; + this.ribbonPanel1.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.ribbonPanel1.Controls.Add(this.ribbonBar21); + this.ribbonPanel1.Dock = System.Windows.Forms.DockStyle.Fill; + this.ribbonPanel1.Location = new System.Drawing.Point(0, 33); + this.ribbonPanel1.Name = "ribbonPanel1"; + this.ribbonPanel1.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); + this.ribbonPanel1.Size = new System.Drawing.Size(1328, 62); + // + // + // + this.ribbonPanel1.Style.Class = ""; + this.ribbonPanel1.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonPanel1.StyleMouseDown.Class = ""; + this.ribbonPanel1.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonPanel1.StyleMouseOver.Class = ""; + this.ribbonPanel1.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonPanel1.TabIndex = 1; + this.ribbonPanel1.Visible = false; + // + // ribbonBar21 + // + this.ribbonBar21.AutoOverflowEnabled = true; + this.ribbonBar21.BackColor = System.Drawing.Color.White; + // + // + // + this.ribbonBar21.BackgroundMouseOverStyle.Class = ""; + this.ribbonBar21.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonBar21.BackgroundStyle.Class = ""; + this.ribbonBar21.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar21.ContainerControlProcessDialogKey = true; + this.ribbonBar21.Dock = System.Windows.Forms.DockStyle.Left; + this.ribbonBar21.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { + this.buttonItem87, + this.buttonItem88, + this.buttonItem27, + this.sliderGroundTransSet1, + this.buttonItem91, + this.buttonItem1, + this.btnlegendSet, + this.buttonItem89, + this.btnOutputJPG}); + this.ribbonBar21.Location = new System.Drawing.Point(3, 0); + this.ribbonBar21.Name = "ribbonBar21"; + this.ribbonBar21.Size = new System.Drawing.Size(649, 59); + this.ribbonBar21.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.ribbonBar21.TabIndex = 2; + this.ribbonBar21.Text = "浏览模式"; + // + // + // + this.ribbonBar21.TitleStyle.Class = ""; + this.ribbonBar21.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonBar21.TitleStyleMouseOver.Class = ""; + this.ribbonBar21.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar21.TitleVisible = false; + // + // buttonItem87 + // + this.buttonItem87.Image = ((System.Drawing.Image)(resources.GetObject("buttonItem87.Image"))); + this.buttonItem87.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem87.Name = "buttonItem87"; + this.buttonItem87.SubItemsExpandWidth = 14; + this.buttonItem87.Text = "地上模式"; + this.buttonItem87.Click += new System.EventHandler(this.buttonItem87_Click); + // + // buttonItem88 + // + this.buttonItem88.Image = ((System.Drawing.Image)(resources.GetObject("buttonItem88.Image"))); + this.buttonItem88.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem88.Name = "buttonItem88"; + this.buttonItem88.SubItemsExpandWidth = 14; + this.buttonItem88.Text = "地下模式"; + this.buttonItem88.Click += new System.EventHandler(this.buttonItem88_Click); + // + // buttonItem27 + // + this.buttonItem27.Image = ((System.Drawing.Image)(resources.GetObject("buttonItem27.Image"))); + this.buttonItem27.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem27.Name = "buttonItem27"; + this.buttonItem27.SubItemsExpandWidth = 14; + this.buttonItem27.Text = "行走模式"; + this.buttonItem27.Click += new System.EventHandler(this.buttonItem27_Click); + // + // buttonItem91 + // + this.buttonItem91.ForeColor = System.Drawing.Color.Black; + this.buttonItem91.Image = ((System.Drawing.Image)(resources.GetObject("buttonItem91.Image"))); + this.buttonItem91.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem91.Name = "buttonItem91"; + this.buttonItem91.SubItemsExpandWidth = 14; + this.buttonItem91.Text = "快速定位"; + this.buttonItem91.Click += new System.EventHandler(this.buttonItem91_Click); + // + // buttonItem1 + // + this.buttonItem1.Image = ((System.Drawing.Image)(resources.GetObject("buttonItem1.Image"))); + this.buttonItem1.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem1.Name = "buttonItem1"; + this.buttonItem1.SubItemsExpandWidth = 14; + this.buttonItem1.Text = "图层管理"; + this.buttonItem1.Click += new System.EventHandler(this.buttonItem1_Click); + // + // btnlegendSet + // + this.btnlegendSet.Image = ((System.Drawing.Image)(resources.GetObject("btnlegendSet.Image"))); + this.btnlegendSet.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.btnlegendSet.Name = "btnlegendSet"; + this.btnlegendSet.SubItemsExpandWidth = 14; + this.btnlegendSet.Text = "图例"; + this.btnlegendSet.Click += new System.EventHandler(this.btnlegendSet_Click); + // + // buttonItem89 + // + this.buttonItem89.Image = ((System.Drawing.Image)(resources.GetObject("buttonItem89.Image"))); + this.buttonItem89.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem89.Name = "buttonItem89"; + this.buttonItem89.SubItemsExpandWidth = 14; + this.buttonItem89.Text = "全屏显示"; + this.buttonItem89.Click += new System.EventHandler(this.buttonItem89_Click); + // + // btnOutputJPG + // + this.btnOutputJPG.Image = ((System.Drawing.Image)(resources.GetObject("btnOutputJPG.Image"))); + this.btnOutputJPG.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.btnOutputJPG.Name = "btnOutputJPG"; + this.btnOutputJPG.SubItemsExpandWidth = 14; + this.btnOutputJPG.Text = "导出图片"; + this.btnOutputJPG.Click += new System.EventHandler(this.btnOutputJPG_Click); + // + // ribbonPanel12 + // + this.ribbonPanel12.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.ribbonPanel12.Controls.Add(this.ribbonBar18); + this.ribbonPanel12.Controls.Add(this.ribbonBar13); + this.ribbonPanel12.Dock = System.Windows.Forms.DockStyle.Fill; + this.ribbonPanel12.Location = new System.Drawing.Point(0, 33); + this.ribbonPanel12.Name = "ribbonPanel12"; + this.ribbonPanel12.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); + this.ribbonPanel12.Size = new System.Drawing.Size(1328, 62); + // + // + // + this.ribbonPanel12.Style.Class = ""; + this.ribbonPanel12.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonPanel12.StyleMouseDown.Class = ""; + this.ribbonPanel12.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonPanel12.StyleMouseOver.Class = ""; + this.ribbonPanel12.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonPanel12.TabIndex = 34; + this.ribbonPanel12.Visible = false; + // + // ribbonBar18 + // + this.ribbonBar18.AutoOverflowEnabled = true; + // + // + // + this.ribbonBar18.BackgroundMouseOverStyle.Class = ""; + this.ribbonBar18.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonBar18.BackgroundStyle.Class = ""; + this.ribbonBar18.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar18.ContainerControlProcessDialogKey = true; + this.ribbonBar18.Dock = System.Windows.Forms.DockStyle.Left; + this.ribbonBar18.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { + this.buttonItem133, + this.buttonItem132}); + this.ribbonBar18.Location = new System.Drawing.Point(508, 0); + this.ribbonBar18.Name = "ribbonBar18"; + this.ribbonBar18.Size = new System.Drawing.Size(75, 59); + this.ribbonBar18.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.ribbonBar18.TabIndex = 1; + // + // + // + this.ribbonBar18.TitleStyle.Class = ""; + this.ribbonBar18.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonBar18.TitleStyleMouseOver.Class = ""; + this.ribbonBar18.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar18.TitleVisible = false; + // + // buttonItem133 + // + this.buttonItem133.Image = ((System.Drawing.Image)(resources.GetObject("buttonItem133.Image"))); + this.buttonItem133.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem133.Name = "buttonItem133"; + this.buttonItem133.SubItemsExpandWidth = 14; + this.buttonItem133.Text = "审核入库"; + this.buttonItem133.Click += new System.EventHandler(this.buttonItem133_Click_1); + // + // buttonItem132 + // + this.buttonItem132.Name = "buttonItem132"; + // + // ribbonBar13 + // + this.ribbonBar13.AutoOverflowEnabled = true; + // + // + // + this.ribbonBar13.BackgroundMouseOverStyle.Class = ""; + this.ribbonBar13.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonBar13.BackgroundStyle.Class = ""; + this.ribbonBar13.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar13.ContainerControlProcessDialogKey = true; + this.ribbonBar13.Dock = System.Windows.Forms.DockStyle.Left; + this.ribbonBar13.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { + this.buttonItem127, + this.buttonItem128, + this.sliderItem1, + this.buttonItem134, + this.buttonItem130, + this.btn_check_history}); + this.ribbonBar13.Location = new System.Drawing.Point(3, 0); + this.ribbonBar13.Name = "ribbonBar13"; + this.ribbonBar13.Size = new System.Drawing.Size(505, 59); + this.ribbonBar13.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.ribbonBar13.TabIndex = 0; + // + // + // + this.ribbonBar13.TitleStyle.Class = ""; + this.ribbonBar13.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonBar13.TitleStyleMouseOver.Class = ""; + this.ribbonBar13.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar13.TitleVisible = false; + // + // buttonItem127 + // + this.buttonItem127.Image = ((System.Drawing.Image)(resources.GetObject("buttonItem127.Image"))); + this.buttonItem127.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem127.Name = "buttonItem127"; + this.buttonItem127.SubItemsExpandWidth = 14; + this.buttonItem127.Text = "打开数据"; + this.buttonItem127.Click += new System.EventHandler(this.buttonItem127_Click_2); + // + // buttonItem128 + // + this.buttonItem128.Image = ((System.Drawing.Image)(resources.GetObject("buttonItem128.Image"))); + this.buttonItem128.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem128.Name = "buttonItem128"; + this.buttonItem128.SubItemsExpandWidth = 14; + this.buttonItem128.Text = "一键审核"; + this.buttonItem128.Click += new System.EventHandler(this.buttonItem128_Click); + // + // sliderItem1 + // + this.sliderItem1.LabelPosition = DevComponents.DotNetBar.eSliderLabelPosition.Top; + this.sliderItem1.LabelWidth = 50; + this.sliderItem1.Name = "sliderItem1"; + this.sliderItem1.Text = "地面透明度"; + this.sliderItem1.TextColor = System.Drawing.Color.Black; + this.sliderItem1.Value = 0; + this.sliderItem1.ValueChanged += new System.EventHandler(this.sliderItem1_ValueChanged); + // + // buttonItem134 + // + this.buttonItem134.Image = ((System.Drawing.Image)(resources.GetObject("buttonItem134.Image"))); + this.buttonItem134.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem134.Name = "buttonItem134"; + this.buttonItem134.SubItemsExpandWidth = 14; + this.buttonItem134.Text = "模拟设计修改"; + this.buttonItem134.Click += new System.EventHandler(this.buttonItem134_Click_1); + // + // buttonItem130 + // + this.buttonItem130.Image = ((System.Drawing.Image)(resources.GetObject("buttonItem130.Image"))); + this.buttonItem130.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem130.Name = "buttonItem130"; + this.buttonItem130.SubItemsExpandWidth = 14; + this.buttonItem130.Text = "导出审核图"; + this.buttonItem130.Click += new System.EventHandler(this.buttonItem130_Click_1); + // + // btn_check_history + // + this.btn_check_history.Image = ((System.Drawing.Image)(resources.GetObject("btn_check_history.Image"))); + this.btn_check_history.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.btn_check_history.Name = "btn_check_history"; + this.btn_check_history.SubItemsExpandWidth = 14; + this.btn_check_history.Text = "审核历史"; + this.btn_check_history.Click += new System.EventHandler(this.btn_check_history_Click); + // + // ribbonPanel4 + // + this.ribbonPanel4.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.ribbonPanel4.Controls.Add(this.ribbonBar1); + this.ribbonPanel4.Dock = System.Windows.Forms.DockStyle.Fill; + this.ribbonPanel4.Location = new System.Drawing.Point(0, 33); + this.ribbonPanel4.Name = "ribbonPanel4"; + this.ribbonPanel4.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); + this.ribbonPanel4.Size = new System.Drawing.Size(1328, 62); + // + // + // + this.ribbonPanel4.Style.Class = ""; + this.ribbonPanel4.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonPanel4.StyleMouseDown.Class = ""; + this.ribbonPanel4.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonPanel4.StyleMouseOver.Class = ""; + this.ribbonPanel4.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonPanel4.TabIndex = 36; + this.ribbonPanel4.Visible = false; + // + // ribbonBar1 + // + this.ribbonBar1.AutoOverflowEnabled = true; + // + // + // + this.ribbonBar1.BackgroundMouseOverStyle.Class = ""; + this.ribbonBar1.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonBar1.BackgroundStyle.Class = ""; + this.ribbonBar1.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar1.ContainerControlProcessDialogKey = true; + this.ribbonBar1.Dock = System.Windows.Forms.DockStyle.Left; + this.ribbonBar1.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { + this.btn_document_info}); + this.ribbonBar1.Location = new System.Drawing.Point(3, 0); + this.ribbonBar1.Name = "ribbonBar1"; + this.ribbonBar1.Size = new System.Drawing.Size(88, 59); + this.ribbonBar1.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.ribbonBar1.TabIndex = 0; + // + // + // + this.ribbonBar1.TitleStyle.Class = ""; + this.ribbonBar1.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonBar1.TitleStyleMouseOver.Class = ""; + this.ribbonBar1.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar1.TitleVisible = false; + // + // btn_document_info + // + this.btn_document_info.Image = ((System.Drawing.Image)(resources.GetObject("btn_document_info.Image"))); + this.btn_document_info.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.btn_document_info.Name = "btn_document_info"; + this.btn_document_info.SubItemsExpandWidth = 14; + this.btn_document_info.Text = "文档管理"; + this.btn_document_info.Click += new System.EventHandler(this.btn_document_info_Click); + // // ribbonTabItem1 // this.ribbonTabItem1.ButtonStyle = DevComponents.DotNetBar.eButtonStyle.ImageAndText; @@ -3673,7 +3694,6 @@ this.ribbonTabItem7.Name = "ribbonTabItem7"; this.ribbonTabItem7.Panel = this.ribbonPanel7; this.ribbonTabItem7.Text = "管线定位"; - this.ribbonTabItem7.MouseDown += new System.Windows.Forms.MouseEventHandler(this.ribbonTabItem7_MouseDown); // // ribbonTabItem5 // @@ -3684,7 +3704,6 @@ this.ribbonTabItem5.Name = "ribbonTabItem5"; this.ribbonTabItem5.Panel = this.ribbonPanel3; this.ribbonTabItem5.Text = "标识器管理"; - this.ribbonTabItem5.MouseDown += new System.Windows.Forms.MouseEventHandler(this.ribbonTabItem5_MouseDown); // // ribbonTabItem2 // @@ -4451,7 +4470,7 @@ this.dataGridViewX2.ReadOnly = true; this.dataGridViewX2.RowHeadersVisible = false; this.dataGridViewX2.RowTemplate.Height = 23; - this.dataGridViewX2.Size = new System.Drawing.Size(31081, 92); + this.dataGridViewX2.Size = new System.Drawing.Size(31378, 92); this.dataGridViewX2.TabIndex = 11; // // dataGridViewTextBoxColumn10 @@ -4545,7 +4564,7 @@ this.dataGridViewX3.ReadOnly = true; this.dataGridViewX3.RowHeadersVisible = false; this.dataGridViewX3.RowTemplate.Height = 23; - this.dataGridViewX3.Size = new System.Drawing.Size(31080, 127); + this.dataGridViewX3.Size = new System.Drawing.Size(31377, 127); this.dataGridViewX3.TabIndex = 5; this.dataGridViewX3.MouseDoubleClick += new System.Windows.Forms.MouseEventHandler(this.dataGridViewX3_MouseDoubleClick); // @@ -5722,7 +5741,8 @@ // pictureBox1 // this.pictureBox1.Dock = System.Windows.Forms.DockStyle.Top; - this.pictureBox1.Image = ((System.Drawing.Image)(resources.GetObject("pictureBox1.Image"))); +// this.pictureBox1.Image = ((System.Drawing.Image)(resources.GetObject("pictureBox1.Image"))); + this.pictureBox1.Image = Image.FromFile(Application.StartupPath + Utility.TitleImagePath); this.pictureBox1.Location = new System.Drawing.Point(0, 0); this.pictureBox1.Margin = new System.Windows.Forms.Padding(0); this.pictureBox1.Name = "pictureBox1"; @@ -5732,18 +5752,6 @@ this.pictureBox1.TabStop = false; this.pictureBox1.Paint += new System.Windows.Forms.PaintEventHandler(this.pictureBox1_Paint); // - // layerTree - // - this.layerTree.CheckBoxes = true; - this.layerTree.ItemHeight = 18; - this.layerTree.Location = new System.Drawing.Point(30, 78); - this.layerTree.Name = "layerTree"; - this.layerTree.Size = new System.Drawing.Size(121, 97); - this.layerTree.TabIndex = 1; - this.layerTree.AfterCheck += new System.Windows.Forms.TreeViewEventHandler(this.layerTree_AfterCheck); - this.layerTree.NodeMouseClick += new System.Windows.Forms.TreeNodeMouseClickEventHandler(this.layerTree_NodeMouseClick); - this.layerTree.NodeMouseDoubleClick += new System.Windows.Forms.TreeNodeMouseClickEventHandler(this.layerTree_NodeMouseDoubleClick); - // // MainFrm // this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Inherit; @@ -5770,7 +5778,8 @@ this.KeyPreview = true; this.Name = "MainFrm"; this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen; - this.Text = "智慧太湖新城管网规划分析系统6.0"; +// this.Text = "智慧太湖新城管网规划分析系统6.0"; + this.Text = Utility.SysnameVersion; this.WindowState = System.Windows.Forms.FormWindowState.Maximized; this.FormClosing += new System.Windows.Forms.FormClosingEventHandler(this.MainFrm_FormClosing); this.Load += new System.EventHandler(this.MainFrm_Load); @@ -5787,15 +5796,15 @@ this.contextMenuStripDeleteLayerNode.ResumeLayout(false); this.ribbonControl1.ResumeLayout(false); this.ribbonControl1.PerformLayout(); + this.ribbonPanel3.ResumeLayout(false); + this.ribbonPanel7.ResumeLayout(false); + this.ribbonPanel15.ResumeLayout(false); + this.ribbonPanel2.ResumeLayout(false); this.ribbonPanel6.ResumeLayout(false); this.ribbonPanel5.ResumeLayout(false); this.ribbonPanel1.ResumeLayout(false); this.ribbonPanel12.ResumeLayout(false); this.ribbonPanel4.ResumeLayout(false); - this.ribbonPanel15.ResumeLayout(false); - this.ribbonPanel3.ResumeLayout(false); - this.ribbonPanel7.ResumeLayout(false); - this.ribbonPanel2.ResumeLayout(false); this.panelOfTable.ResumeLayout(false); this.panelOfTable.PerformLayout(); ((System.ComponentModel.ISupportInitialize)(this.dataGridViewX1)).EndInit(); @@ -5955,6 +5964,7 @@ private RibbonTabItem ribbonTabItem11; private ButtonItem buttonItem130; private RibbonBar ribbonBar18; + private ButtonItem buttonItem132; private SliderItem sliderItem1; private ButtonItem buttonItem133; private ButtonItem buttonItem134; diff --git a/MainFrm.resx b/MainFrm.resx index 9f9bba4..ce490c1 100644 --- a/MainFrm.resx +++ b/MainFrm.resx @@ -351,6 +351,146 @@ 766, 54 + + + iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 + YQUAAAAZdEVYdFNvZnR3YXJlAEFkb2JlIEltYWdlUmVhZHlxyWU8AAADZmlUWHRYTUw6Y29tLmFkb2Jl + LnhtcAAAAAAAPD94cGFja2V0IGJlZ2luPSLvu78iIGlkPSJXNU0wTXBDZWhpSHpyZVN6TlRjemtjOWQi + Pz4gPHg6eG1wbWV0YSB4bWxuczp4PSJhZG9iZTpuczptZXRhLyIgeDp4bXB0az0iQWRvYmUgWE1QIENv + cmUgNS4zLWMwMTEgNjYuMTQ1NjYxLCAyMDEyLzAyLzA2LTE0OjU2OjI3ICAgICAgICAiPiA8cmRmOlJE + RiB4bWxuczpyZGY9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkvMDIvMjItcmRmLXN5bnRheC1ucyMiPiA8 + cmRmOkRlc2NyaXB0aW9uIHJkZjphYm91dD0iIiB4bWxuczp4bXBNTT0iaHR0cDovL25zLmFkb2JlLmNv + bS94YXAvMS4wL21tLyIgeG1sbnM6c3RSZWY9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlw + ZS9SZXNvdXJjZVJlZiMiIHhtbG5zOnhtcD0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wLyIgeG1w + TU06T3JpZ2luYWxEb2N1bWVudElEPSJ4bXAuZGlkOjYzQTM5NEY4Mjg0OUU0MTE5NDBEQTc4ODZEQzk5 + N0NGIiB4bXBNTTpEb2N1bWVudElEPSJ4bXAuZGlkOjEwQ0IxNzBBNEM1QzExRTRBNkNGQzRBMjhDQzI0 + MkY4IiB4bXBNTTpJbnN0YW5jZUlEPSJ4bXAuaWlkOjEwQ0IxNzA5NEM1QzExRTRBNkNGQzRBMjhDQzI0 + MkY4IiB4bXA6Q3JlYXRvclRvb2w9IkFkb2JlIFBob3Rvc2hvcCBDUzYgKFdpbmRvd3MpIj4gPHhtcE1N + OkRlcml2ZWRGcm9tIHN0UmVmOmluc3RhbmNlSUQ9InhtcC5paWQ6NTEzMDNDMjA1QjRDRTQxMTg4NERE + MUVBOEQ4QTgyNTUiIHN0UmVmOmRvY3VtZW50SUQ9InhtcC5kaWQ6NjNBMzk0RjgyODQ5RTQxMTk0MERB + Nzg4NkRDOTk3Q0YiLz4gPC9yZGY6RGVzY3JpcHRpb24+IDwvcmRmOlJERj4gPC94OnhtcG1ldGE+IDw/ + eHBhY2tldCBlbmQ9InIiPz43wa2/AAAFaUlEQVRIS6WUC0xTVxzGKy0UkSmlFGjBFilSkNpSaAWRh63y + sIiAArKs4spLRLQoiEJlSMGoMCc6CBOnYHzMOHUqqOhEHOqCbjNu6kCd6KYje5mZ6KbObd/OuVL3cEzj + /skv997/+b7v39PTW9aj3/BM+OKxPEIZoW/gyrOuPbP+GvRPSNBQQqXYLwSW1etw7cYt5kqfaZ+uD8QM + Xg8f/f4UxGhHMHv4qlG6vAb9394G6T+BPpdV1oCuUx3VD8Q9XT8//PUJRMghlLhLg1C41IK+r/pB+oNC + 16mO6qmP+gdi/6y793+hwTYEk9uoQOSaStHzxQ2Q/nND9XMKy0D9NIfmDcSzaLhI4KXE7LwinLtwGXfu + PXhhqJ/m0DyS62EdUGWpqcf3P97DD3d++t/QnKraBjpghXWAiC+WN0ZNScOe1mP45vbdF2ZvWwdoDs/D + b6ejs6ecxHPoAG/l+Fhkzy+FyCcY0YkG7D/yAW5+d+e5oXrqo36aQ/McnNyjyAAuHWA05pfgzPlehhyT + mflV6FOMaDt2Ctf7bw8KXac6qqc+a4Zx3hLwRLJCZgcJjcPIEPkyIZmeX1SB7vOX0dn9KQy5jw8r8eVc + HOrsxidXP0d9hxlzd4QgeYMzEt7kQVvOR0pFFNpOHmd81E9znIS+dSTc1foVGWfNKUZjyy6Ex6SQl0cD + 09IVxHAFh0+cReqr+QjK8ERqEw+VHWOwoycSR/v1OHwzDlsvhcNCeqkbedAYxQiPm87kZOQVw0nkW0QG + 2DFnIA+JRm3DFpzr/RKNW3ZDE5UAsX8ocizZiFs7DEUHvPFunw4Hb05B+y09jn49lYHe0x5doxqqLVlf + DJrnyB+pIQNs6QAhf6R8tZu3CqpwPdZu2I6PLl3HwnV5iHv9JVSeUOKdqzq81xeDvddiYG73R0aLEIZm + IRa1jUbjxQnYRHa17YqW0VJPwHT3LocRbirrDiymspXo6L6AgiXV8JSNQ2i6GpNWOqK4U4n1n0Vge68W + 9ecmIKnBBSqDCIp4P2RWGDB/QxqS6l1QcToIld3BqDobgsXEQ73+Se5HrGcgdJEokGzIx66DXXi7dRvC + yx2Q2RqApR+GoPbjCag8pUZ6sxjqWRKEldljRr07ZjaKmHt5qpBZKzkeiIJ2BbIPKmA8MIbJUC/ghrM0 + RfYsDtdhqJNIVulK/ku0BQokbfZGZrsKBR3BmEsMOfvl0FY7o7ypDPo1brCcGc+QUCdExabXEFsjQO4B + ObL2BSBlqx8SWwibvBE0334nK3Ael+yEbIW81DZszlhZ2oieuAYvpO5VIHGzP9J2+CN9pz/CzDwExMox + eZUbFnZpkEc+gLZagJjMWOiqXZDVqmC0+kZf6Nb4IHKFCPIsu92sgCw7BlJswjBJLCdenmuPyFUS6Gp9 + oG/yRdJWGSKqhYjKDgLRImK5ACGlzsy9d/zwXn2DBMZDSkZLPaHlnpBncyGO5kxj+Rps/wYdJE2xzfOb + zcU4sye0b0gRu3E0Ypt8ELTICRFGNcShUgjHuZyWxNu2096sdiXS9o1ltNQjyyDhes4SkuXEGpXC+Ve8 + kjlzpDPtoCkVQrdOihgyIHmXP6LryGEX86Ba6ISJNR7IeF+JV8gAfbOM0XoTj8dktpmEOxM4rJHTBscz + njNNnMiBagEfU98ajRnbZMg7GojCk2oGU1cw5nUGw7BHAZWJD6oVhLFzSDCPCacljGP/J7xAm6Hu0ew6 + STIXkcvckN7ig8XHVCjvUiNvdwAmW0Twms6FayS7meM4REoihxPoeT4u10nsZ0LKhhdsIxZEsVcLtOyL + pHffVcd+IJjI7uGHsRscJEPURMMn2FMtNTwuFusPrjFl48ji7nIAAAAASUVORK5CYII= + + + + + iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 + YQUAAAAZdEVYdFNvZnR3YXJlAEFkb2JlIEltYWdlUmVhZHlxyWU8AAADZmlUWHRYTUw6Y29tLmFkb2Jl + LnhtcAAAAAAAPD94cGFja2V0IGJlZ2luPSLvu78iIGlkPSJXNU0wTXBDZWhpSHpyZVN6TlRjemtjOWQi + Pz4gPHg6eG1wbWV0YSB4bWxuczp4PSJhZG9iZTpuczptZXRhLyIgeDp4bXB0az0iQWRvYmUgWE1QIENv + cmUgNS4zLWMwMTEgNjYuMTQ1NjYxLCAyMDEyLzAyLzA2LTE0OjU2OjI3ICAgICAgICAiPiA8cmRmOlJE + RiB4bWxuczpyZGY9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkvMDIvMjItcmRmLXN5bnRheC1ucyMiPiA8 + cmRmOkRlc2NyaXB0aW9uIHJkZjphYm91dD0iIiB4bWxuczp4bXBNTT0iaHR0cDovL25zLmFkb2JlLmNv + bS94YXAvMS4wL21tLyIgeG1sbnM6c3RSZWY9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlw + ZS9SZXNvdXJjZVJlZiMiIHhtbG5zOnhtcD0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wLyIgeG1w + TU06T3JpZ2luYWxEb2N1bWVudElEPSJ4bXAuZGlkOjYzQTM5NEY4Mjg0OUU0MTE5NDBEQTc4ODZEQzk5 + N0NGIiB4bXBNTTpEb2N1bWVudElEPSJ4bXAuZGlkOkUyMTg3NjEyNDlEODExRTQ4NjNGQjM2Mzk1QkNB + RkQwIiB4bXBNTTpJbnN0YW5jZUlEPSJ4bXAuaWlkOkUyMTg3NjExNDlEODExRTQ4NjNGQjM2Mzk1QkNB + RkQwIiB4bXA6Q3JlYXRvclRvb2w9IkFkb2JlIFBob3Rvc2hvcCBDUzYgKFdpbmRvd3MpIj4gPHhtcE1N + OkRlcml2ZWRGcm9tIHN0UmVmOmluc3RhbmNlSUQ9InhtcC5paWQ6NkJCNTE0NDlEODQ5RTQxMUE0QzNB + MjdEOTJBQzc3QkMiIHN0UmVmOmRvY3VtZW50SUQ9InhtcC5kaWQ6NjNBMzk0RjgyODQ5RTQxMTk0MERB + Nzg4NkRDOTk3Q0YiLz4gPC9yZGY6RGVzY3JpcHRpb24+IDwvcmRmOlJERj4gPC94OnhtcG1ldGE+IDw/ + eHBhY2tldCBlbmQ9InIiPz5e5MstAAADiUlEQVRIS+2UW0yTdxjGcePwtYyVVpAUCi1tv9ImrVbxhAei + kjGphAgFT4jzEJ0gGuJhDk0sml0sglmWmC1hqHNKWwI4srgNh3phpjg1O1yIN5DMbFHQZUu42O76+D4f + 3Fl6Z7ILn+SXvH3f533++X/98iUBeKW81v9Uwx1G1+1240EhfKfdeE/4U3qTAqaZZO/2aeN9IXLrY+Ph + wVOZHll9YyohgYZOGS4JsYdXVDy+NQ8Tvy3BP6OlmPyjDP9OBDRYs8cZPfRy5/uQISIRqcIsLSye+j7I + wN+PluOvhyWY+NmL8fsOjP9kxdN7BRh/YJHfFjy5m48nd4ThQjy968bEgwV49usicFciTEKKFhZPXXv1 + eHxtLsYGPBjttwsWjF0xY+ybOfj9uylYs8cZPfQS7kpEnqDTwuLp9GYlfKZeifUfzcb1j/Iw/IkNv3Q6 + MfKVC6O9bg3W7HFGD73cORlMG5AIizDzAaVtunD5ESXWfNSEY/tNCO00oG1zOkJBBSeqUjVYh6R3Qmat + zSY0Hjah7IASW7hPuSoRvIGihcVTSauCppvFODRUjJZvPWgaKMTuXgt2RHOxLTwHDd3EjPfCudgesWJX + jxM7eryo7/Ni8SGFj8gp6LWwePLvS0Og043A5y5UdtkQOJeLivM5ePf8bJSfM04zG2u7chDoysW6Thsq + zqpY0+GAvymNB/gEgxYWT64tKdGihpSYv8WEpSEzVp0pwDuf2SVQReCiS4M1e5zRQy937NXJ1yRirjDz + AVmVJyNZa9+PObauh7ptKdR6FY6N2SisTYe1OlmDNXtqvRNqwxLYt1TCVLY1ZijZOSQRbuEtLSyeTOXH + sfLDH1EauoFFx6/Cd6Qf7pYI1ObLsO+9iMLdF+DccwEuqd2Nl+Br6sbCxiiKd/XBuPogH1HiAzJXHMC8 + YA98td1wb4rCuaEH1roo8oMR5JGaMPIFa10Ejtowiuouw1vzJTwVXyBz+X4ekPgRZfgbohkLtsfMy47B + tqYdakUnPFUM6YUv+LUGa/Y4o8e8rBXcSffWDkpE4j9ZpEvNmb9KsZV16BzrBnVq1YjeVf1MX1Tzn74o + iCmkdq1/LrNHOkfgB6Vg9afJRrVOdv2ClRkMmklvCnyPs4V8ge81v5RegddnCGHNHmf00JslcJcZCcWv + IU1pAhcyhLcFXj1zGtbscUYPvdyZ+Uv6Wi8rKekFBjoX2627by8AAAAASUVORK5CYII= + + + + + iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 + YQUAAAAZdEVYdFNvZnR3YXJlAEFkb2JlIEltYWdlUmVhZHlxyWU8AAADZmlUWHRYTUw6Y29tLmFkb2Jl + LnhtcAAAAAAAPD94cGFja2V0IGJlZ2luPSLvu78iIGlkPSJXNU0wTXBDZWhpSHpyZVN6TlRjemtjOWQi + Pz4gPHg6eG1wbWV0YSB4bWxuczp4PSJhZG9iZTpuczptZXRhLyIgeDp4bXB0az0iQWRvYmUgWE1QIENv + cmUgNS4zLWMwMTEgNjYuMTQ1NjYxLCAyMDEyLzAyLzA2LTE0OjU2OjI3ICAgICAgICAiPiA8cmRmOlJE + RiB4bWxuczpyZGY9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkvMDIvMjItcmRmLXN5bnRheC1ucyMiPiA8 + cmRmOkRlc2NyaXB0aW9uIHJkZjphYm91dD0iIiB4bWxuczp4bXBNTT0iaHR0cDovL25zLmFkb2JlLmNv + bS94YXAvMS4wL21tLyIgeG1sbnM6c3RSZWY9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlw + ZS9SZXNvdXJjZVJlZiMiIHhtbG5zOnhtcD0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wLyIgeG1w + TU06T3JpZ2luYWxEb2N1bWVudElEPSJ4bXAuZGlkOjYzQTM5NEY4Mjg0OUU0MTE5NDBEQTc4ODZEQzk5 + N0NGIiB4bXBNTTpEb2N1bWVudElEPSJ4bXAuZGlkOkE2Q0VGMDE2NDlEQTExRTQ4NTlCQTI3NTMyOEY5 + NEU2IiB4bXBNTTpJbnN0YW5jZUlEPSJ4bXAuaWlkOkE2Q0VGMDE1NDlEQTExRTQ4NTlCQTI3NTMyOEY5 + NEU2IiB4bXA6Q3JlYXRvclRvb2w9IkFkb2JlIFBob3Rvc2hvcCBDUzYgKFdpbmRvd3MpIj4gPHhtcE1N + OkRlcml2ZWRGcm9tIHN0UmVmOmluc3RhbmNlSUQ9InhtcC5paWQ6NjA1MjM3NzFEOTQ5RTQxMUE0QzNB + MjdEOTJBQzc3QkMiIHN0UmVmOmRvY3VtZW50SUQ9InhtcC5kaWQ6NjNBMzk0RjgyODQ5RTQxMTk0MERB + Nzg4NkRDOTk3Q0YiLz4gPC9yZGY6RGVzY3JpcHRpb24+IDwvcmRmOlJERj4gPC94OnhtcG1ldGE+IDw/ + eHBhY2tldCBlbmQ9InIiPz6UH16BAAABrElEQVRIS63N70tTURzH8fsnKSGCCEIQCBKISMq2iILCgQOL + JUxQAoVKdMGQuwgWFepsMGjFZCMuorsIJV4WFatpvzdr1ZAFsaIHn8559v1eDsI91wevJ/ee7/tjbMRH + fAFwJOWRF6oopTzyQhWlVEdBwRbgUhICAnuvilKGtXDGzW6WV/CvbjE/xTfxr+R6q4xSxtP5YTf8rVn4 + s5dG+809Rv5zvVVGKaNwfYgyBfhksoH83CCF9seiL7LBBnLXTlP4/W4dza0ZLS0nCdlgA9npAQq/qk/Q + sKa0NJ8nIBtsIBPrp9CqPMJBYVLLj+04ZIMNrF49ReHwVRafH1/R8m3zJmSDDdy/fJJC88Ua3mcjWurW + LGSDDaQifRS+O8uopsNaPhVnIBts4E64l0Jj5y4qDy5q+ZCPQTbYgHmph8LXZ0m8TJ3Xsp+LQjbYQOJC + N4XadgLl22e1vM1OQDbYwK1zXRS+lBbhmEHsLgU8kTeVh+OQDTawEDpB2U4mitfpMS22GYJssIH5QCcV + FGwBmuRtkA3cGO3whcZUlEdeqKKU8sgLVZRSfjw+MP4DJ2GPpDR9OIsAAAAASUVORK5CYII= + + + + + iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 + YQUAAAAZdEVYdFNvZnR3YXJlAEFkb2JlIEltYWdlUmVhZHlxyWU8AAADZmlUWHRYTUw6Y29tLmFkb2Jl + LnhtcAAAAAAAPD94cGFja2V0IGJlZ2luPSLvu78iIGlkPSJXNU0wTXBDZWhpSHpyZVN6TlRjemtjOWQi + Pz4gPHg6eG1wbWV0YSB4bWxuczp4PSJhZG9iZTpuczptZXRhLyIgeDp4bXB0az0iQWRvYmUgWE1QIENv + cmUgNS4zLWMwMTEgNjYuMTQ1NjYxLCAyMDEyLzAyLzA2LTE0OjU2OjI3ICAgICAgICAiPiA8cmRmOlJE + RiB4bWxuczpyZGY9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkvMDIvMjItcmRmLXN5bnRheC1ucyMiPiA8 + cmRmOkRlc2NyaXB0aW9uIHJkZjphYm91dD0iIiB4bWxuczp4bXBNTT0iaHR0cDovL25zLmFkb2JlLmNv + bS94YXAvMS4wL21tLyIgeG1sbnM6c3RSZWY9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlw + ZS9SZXNvdXJjZVJlZiMiIHhtbG5zOnhtcD0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wLyIgeG1w + TU06T3JpZ2luYWxEb2N1bWVudElEPSJ4bXAuZGlkOjYzQTM5NEY4Mjg0OUU0MTE5NDBEQTc4ODZEQzk5 + N0NGIiB4bXBNTTpEb2N1bWVudElEPSJ4bXAuZGlkOjJGRTU5OEQ1NDlEQjExRTRBRUVDOTkyMjQ5NzEw + REUwIiB4bXBNTTpJbnN0YW5jZUlEPSJ4bXAuaWlkOjJGRTU5OEQ0NDlEQjExRTRBRUVDOTkyMjQ5NzEw + REUwIiB4bXA6Q3JlYXRvclRvb2w9IkFkb2JlIFBob3Rvc2hvcCBDUzYgKFdpbmRvd3MpIj4gPHhtcE1N + OkRlcml2ZWRGcm9tIHN0UmVmOmluc3RhbmNlSUQ9InhtcC5paWQ6MTY0MkI1RjlEQTQ5RTQxMUE0QzNB + MjdEOTJBQzc3QkMiIHN0UmVmOmRvY3VtZW50SUQ9InhtcC5kaWQ6NjNBMzk0RjgyODQ5RTQxMTk0MERB + Nzg4NkRDOTk3Q0YiLz4gPC9yZGY6RGVzY3JpcHRpb24+IDwvcmRmOlJERj4gPC94OnhtcG1ldGE+IDw/ + eHBhY2tldCBlbmQ9InIiPz6B5sF9AAACe0lEQVRIS7WVb2jMcRzHL7UHanF/Mts5prE/1li3kAfu5Ak7 + 5IHNobBkSC2UIuGJkrrSWRvTmHQWK8U1T8jqUtYwkZpaGjV/Js6to5YwfXze39+fu/v23f36hXe9us+f + 7/v9rd/dr3MQ0X/F4Zm3+K9QhWajNNlBFZqN0mQHS6lMdrCUyqSgimllUsy4XmOmp+QRDllQWbygjjq6 + uimZStOX8a+ixox3pXrM1JLCDAqYJmY7c669M0bff07mcLbtEl9QE8k6V6BH5ooXMsHZZX7ae+AY7W45 + SrPm19LbsSR9m/iRA2bYGefggVePzUgKBzeu9sQpmZ4QcG/WMtk7eLjv0WMz0kOz+TX6MUXvP6cFeNbD + bz6YvQFm2Bk9PPByZO6jksLB5KvRTzTyLikIrG2ktsvXzd4g2hGjYP1ms4eHvb850qkl65LCQW/ntVs0 + 9HpMcPx0K1X4V1Ff/3NzhnphbVDsjBk8Lm/VE44s0ZJ1KS4Ie8uXUvPBE7Tn0ElCzTMqrV5BO/cfEaDG + TD5X6PFFONLygsTF7jj1vxihyPkYNTS1iFrFxm37KHIhJmp43L7qZxzp0pJ1SeHhQGgLJQaH6fb9R1QX + 2EB3Ek9FryLe95j8K9eLT/TB0FZcskOP1iRdkIh23aR7Ay9pzaZddKY9Jup8nIpeoXXhZlHD655b85Bj + p2npLOmCML+dD/iTZhaX3+UvbRB1PpzeygFnSUUvatecRUMzisoOc+x0LZ3FixxYhQyK1cxyZhkTYhqY + RgnM6hmcwVl4ljDI0KS4AC+Kmyli8Jv2MF7GNwXY4QzOwgNv5mWTL7CLpVQmO1hKZbKDpVR/1P8OcvwB + lh7gOXXZq9sAAAAASUVORK5CYII= + + iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 @@ -598,147 +738,7 @@ 1BGxz38BvCwLsyQ3iHgAAAAASUVORK5CYII= - - - iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAZdEVYdFNvZnR3YXJlAEFkb2JlIEltYWdlUmVhZHlxyWU8AAADZmlUWHRYTUw6Y29tLmFkb2Jl - LnhtcAAAAAAAPD94cGFja2V0IGJlZ2luPSLvu78iIGlkPSJXNU0wTXBDZWhpSHpyZVN6TlRjemtjOWQi - Pz4gPHg6eG1wbWV0YSB4bWxuczp4PSJhZG9iZTpuczptZXRhLyIgeDp4bXB0az0iQWRvYmUgWE1QIENv - cmUgNS4zLWMwMTEgNjYuMTQ1NjYxLCAyMDEyLzAyLzA2LTE0OjU2OjI3ICAgICAgICAiPiA8cmRmOlJE - RiB4bWxuczpyZGY9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkvMDIvMjItcmRmLXN5bnRheC1ucyMiPiA8 - cmRmOkRlc2NyaXB0aW9uIHJkZjphYm91dD0iIiB4bWxuczp4bXBNTT0iaHR0cDovL25zLmFkb2JlLmNv - bS94YXAvMS4wL21tLyIgeG1sbnM6c3RSZWY9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlw - ZS9SZXNvdXJjZVJlZiMiIHhtbG5zOnhtcD0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wLyIgeG1w - TU06T3JpZ2luYWxEb2N1bWVudElEPSJ4bXAuZGlkOjYzQTM5NEY4Mjg0OUU0MTE5NDBEQTc4ODZEQzk5 - N0NGIiB4bXBNTTpEb2N1bWVudElEPSJ4bXAuZGlkOjEwQ0IxNzBBNEM1QzExRTRBNkNGQzRBMjhDQzI0 - MkY4IiB4bXBNTTpJbnN0YW5jZUlEPSJ4bXAuaWlkOjEwQ0IxNzA5NEM1QzExRTRBNkNGQzRBMjhDQzI0 - MkY4IiB4bXA6Q3JlYXRvclRvb2w9IkFkb2JlIFBob3Rvc2hvcCBDUzYgKFdpbmRvd3MpIj4gPHhtcE1N - OkRlcml2ZWRGcm9tIHN0UmVmOmluc3RhbmNlSUQ9InhtcC5paWQ6NTEzMDNDMjA1QjRDRTQxMTg4NERE - MUVBOEQ4QTgyNTUiIHN0UmVmOmRvY3VtZW50SUQ9InhtcC5kaWQ6NjNBMzk0RjgyODQ5RTQxMTk0MERB - Nzg4NkRDOTk3Q0YiLz4gPC9yZGY6RGVzY3JpcHRpb24+IDwvcmRmOlJERj4gPC94OnhtcG1ldGE+IDw/ - eHBhY2tldCBlbmQ9InIiPz43wa2/AAAFaUlEQVRIS6WUC0xTVxzGKy0UkSmlFGjBFilSkNpSaAWRh63y - sIiAArKs4spLRLQoiEJlSMGoMCc6CBOnYHzMOHUqqOhEHOqCbjNu6kCd6KYje5mZ6KbObd/OuVL3cEzj - /skv997/+b7v39PTW9aj3/BM+OKxPEIZoW/gyrOuPbP+GvRPSNBQQqXYLwSW1etw7cYt5kqfaZ+uD8QM - Xg8f/f4UxGhHMHv4qlG6vAb9394G6T+BPpdV1oCuUx3VD8Q9XT8//PUJRMghlLhLg1C41IK+r/pB+oNC - 16mO6qmP+gdi/6y793+hwTYEk9uoQOSaStHzxQ2Q/nND9XMKy0D9NIfmDcSzaLhI4KXE7LwinLtwGXfu - PXhhqJ/m0DyS62EdUGWpqcf3P97DD3d++t/QnKraBjpghXWAiC+WN0ZNScOe1mP45vbdF2ZvWwdoDs/D - b6ejs6ecxHPoAG/l+Fhkzy+FyCcY0YkG7D/yAW5+d+e5oXrqo36aQ/McnNyjyAAuHWA05pfgzPlehhyT - mflV6FOMaDt2Ctf7bw8KXac6qqc+a4Zx3hLwRLJCZgcJjcPIEPkyIZmeX1SB7vOX0dn9KQy5jw8r8eVc - HOrsxidXP0d9hxlzd4QgeYMzEt7kQVvOR0pFFNpOHmd81E9znIS+dSTc1foVGWfNKUZjyy6Ex6SQl0cD - 09IVxHAFh0+cReqr+QjK8ERqEw+VHWOwoycSR/v1OHwzDlsvhcNCeqkbedAYxQiPm87kZOQVw0nkW0QG - 2DFnIA+JRm3DFpzr/RKNW3ZDE5UAsX8ocizZiFs7DEUHvPFunw4Hb05B+y09jn49lYHe0x5doxqqLVlf - DJrnyB+pIQNs6QAhf6R8tZu3CqpwPdZu2I6PLl3HwnV5iHv9JVSeUOKdqzq81xeDvddiYG73R0aLEIZm - IRa1jUbjxQnYRHa17YqW0VJPwHT3LocRbirrDiymspXo6L6AgiXV8JSNQ2i6GpNWOqK4U4n1n0Vge68W - 9ecmIKnBBSqDCIp4P2RWGDB/QxqS6l1QcToIld3BqDobgsXEQ73+Se5HrGcgdJEokGzIx66DXXi7dRvC - yx2Q2RqApR+GoPbjCag8pUZ6sxjqWRKEldljRr07ZjaKmHt5qpBZKzkeiIJ2BbIPKmA8MIbJUC/ghrM0 - RfYsDtdhqJNIVulK/ku0BQokbfZGZrsKBR3BmEsMOfvl0FY7o7ypDPo1brCcGc+QUCdExabXEFsjQO4B - ObL2BSBlqx8SWwibvBE0334nK3Ael+yEbIW81DZszlhZ2oieuAYvpO5VIHGzP9J2+CN9pz/CzDwExMox - eZUbFnZpkEc+gLZagJjMWOiqXZDVqmC0+kZf6Nb4IHKFCPIsu92sgCw7BlJswjBJLCdenmuPyFUS6Gp9 - oG/yRdJWGSKqhYjKDgLRImK5ACGlzsy9d/zwXn2DBMZDSkZLPaHlnpBncyGO5kxj+Rps/wYdJE2xzfOb - zcU4sye0b0gRu3E0Ypt8ELTICRFGNcShUgjHuZyWxNu2096sdiXS9o1ltNQjyyDhes4SkuXEGpXC+Ve8 - kjlzpDPtoCkVQrdOihgyIHmXP6LryGEX86Ba6ISJNR7IeF+JV8gAfbOM0XoTj8dktpmEOxM4rJHTBscz - njNNnMiBagEfU98ajRnbZMg7GojCk2oGU1cw5nUGw7BHAZWJD6oVhLFzSDCPCacljGP/J7xAm6Hu0ew6 - STIXkcvckN7ig8XHVCjvUiNvdwAmW0Twms6FayS7meM4REoihxPoeT4u10nsZ0LKhhdsIxZEsVcLtOyL - pHffVcd+IJjI7uGHsRscJEPURMMn2FMtNTwuFusPrjFl48ji7nIAAAAASUVORK5CYII= - - - - - iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAZdEVYdFNvZnR3YXJlAEFkb2JlIEltYWdlUmVhZHlxyWU8AAADZmlUWHRYTUw6Y29tLmFkb2Jl - LnhtcAAAAAAAPD94cGFja2V0IGJlZ2luPSLvu78iIGlkPSJXNU0wTXBDZWhpSHpyZVN6TlRjemtjOWQi - Pz4gPHg6eG1wbWV0YSB4bWxuczp4PSJhZG9iZTpuczptZXRhLyIgeDp4bXB0az0iQWRvYmUgWE1QIENv - cmUgNS4zLWMwMTEgNjYuMTQ1NjYxLCAyMDEyLzAyLzA2LTE0OjU2OjI3ICAgICAgICAiPiA8cmRmOlJE - RiB4bWxuczpyZGY9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkvMDIvMjItcmRmLXN5bnRheC1ucyMiPiA8 - cmRmOkRlc2NyaXB0aW9uIHJkZjphYm91dD0iIiB4bWxuczp4bXBNTT0iaHR0cDovL25zLmFkb2JlLmNv - bS94YXAvMS4wL21tLyIgeG1sbnM6c3RSZWY9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlw - ZS9SZXNvdXJjZVJlZiMiIHhtbG5zOnhtcD0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wLyIgeG1w - TU06T3JpZ2luYWxEb2N1bWVudElEPSJ4bXAuZGlkOjYzQTM5NEY4Mjg0OUU0MTE5NDBEQTc4ODZEQzk5 - N0NGIiB4bXBNTTpEb2N1bWVudElEPSJ4bXAuZGlkOkUyMTg3NjEyNDlEODExRTQ4NjNGQjM2Mzk1QkNB - RkQwIiB4bXBNTTpJbnN0YW5jZUlEPSJ4bXAuaWlkOkUyMTg3NjExNDlEODExRTQ4NjNGQjM2Mzk1QkNB - RkQwIiB4bXA6Q3JlYXRvclRvb2w9IkFkb2JlIFBob3Rvc2hvcCBDUzYgKFdpbmRvd3MpIj4gPHhtcE1N - OkRlcml2ZWRGcm9tIHN0UmVmOmluc3RhbmNlSUQ9InhtcC5paWQ6NkJCNTE0NDlEODQ5RTQxMUE0QzNB - MjdEOTJBQzc3QkMiIHN0UmVmOmRvY3VtZW50SUQ9InhtcC5kaWQ6NjNBMzk0RjgyODQ5RTQxMTk0MERB - Nzg4NkRDOTk3Q0YiLz4gPC9yZGY6RGVzY3JpcHRpb24+IDwvcmRmOlJERj4gPC94OnhtcG1ldGE+IDw/ - eHBhY2tldCBlbmQ9InIiPz5e5MstAAADiUlEQVRIS+2UW0yTdxjGcePwtYyVVpAUCi1tv9ImrVbxhAei - kjGphAgFT4jzEJ0gGuJhDk0sml0sglmWmC1hqHNKWwI4srgNh3phpjg1O1yIN5DMbFHQZUu42O76+D4f - 3Fl6Z7ILn+SXvH3f533++X/98iUBeKW81v9Uwx1G1+1240EhfKfdeE/4U3qTAqaZZO/2aeN9IXLrY+Ph - wVOZHll9YyohgYZOGS4JsYdXVDy+NQ8Tvy3BP6OlmPyjDP9OBDRYs8cZPfRy5/uQISIRqcIsLSye+j7I - wN+PluOvhyWY+NmL8fsOjP9kxdN7BRh/YJHfFjy5m48nd4ThQjy968bEgwV49usicFciTEKKFhZPXXv1 - eHxtLsYGPBjttwsWjF0xY+ybOfj9uylYs8cZPfQS7kpEnqDTwuLp9GYlfKZeifUfzcb1j/Iw/IkNv3Q6 - MfKVC6O9bg3W7HFGD73cORlMG5AIizDzAaVtunD5ESXWfNSEY/tNCO00oG1zOkJBBSeqUjVYh6R3Qmat - zSY0Hjah7IASW7hPuSoRvIGihcVTSauCppvFODRUjJZvPWgaKMTuXgt2RHOxLTwHDd3EjPfCudgesWJX - jxM7eryo7/Ni8SGFj8gp6LWwePLvS0Og043A5y5UdtkQOJeLivM5ePf8bJSfM04zG2u7chDoysW6Thsq - zqpY0+GAvymNB/gEgxYWT64tKdGihpSYv8WEpSEzVp0pwDuf2SVQReCiS4M1e5zRQy937NXJ1yRirjDz - AVmVJyNZa9+PObauh7ptKdR6FY6N2SisTYe1OlmDNXtqvRNqwxLYt1TCVLY1ZijZOSQRbuEtLSyeTOXH - sfLDH1EauoFFx6/Cd6Qf7pYI1ObLsO+9iMLdF+DccwEuqd2Nl+Br6sbCxiiKd/XBuPogH1HiAzJXHMC8 - YA98td1wb4rCuaEH1roo8oMR5JGaMPIFa10Ejtowiuouw1vzJTwVXyBz+X4ekPgRZfgbohkLtsfMy47B - tqYdakUnPFUM6YUv+LUGa/Y4o8e8rBXcSffWDkpE4j9ZpEvNmb9KsZV16BzrBnVq1YjeVf1MX1Tzn74o - iCmkdq1/LrNHOkfgB6Vg9afJRrVOdv2ClRkMmklvCnyPs4V8ge81v5RegddnCGHNHmf00JslcJcZCcWv - IU1pAhcyhLcFXj1zGtbscUYPvdyZ+Uv6Wi8rKekFBjoX2627by8AAAAASUVORK5CYII= - - - - - iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAZdEVYdFNvZnR3YXJlAEFkb2JlIEltYWdlUmVhZHlxyWU8AAADZmlUWHRYTUw6Y29tLmFkb2Jl - LnhtcAAAAAAAPD94cGFja2V0IGJlZ2luPSLvu78iIGlkPSJXNU0wTXBDZWhpSHpyZVN6TlRjemtjOWQi - Pz4gPHg6eG1wbWV0YSB4bWxuczp4PSJhZG9iZTpuczptZXRhLyIgeDp4bXB0az0iQWRvYmUgWE1QIENv - cmUgNS4zLWMwMTEgNjYuMTQ1NjYxLCAyMDEyLzAyLzA2LTE0OjU2OjI3ICAgICAgICAiPiA8cmRmOlJE - RiB4bWxuczpyZGY9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkvMDIvMjItcmRmLXN5bnRheC1ucyMiPiA8 - cmRmOkRlc2NyaXB0aW9uIHJkZjphYm91dD0iIiB4bWxuczp4bXBNTT0iaHR0cDovL25zLmFkb2JlLmNv - bS94YXAvMS4wL21tLyIgeG1sbnM6c3RSZWY9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlw - ZS9SZXNvdXJjZVJlZiMiIHhtbG5zOnhtcD0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wLyIgeG1w - TU06T3JpZ2luYWxEb2N1bWVudElEPSJ4bXAuZGlkOjYzQTM5NEY4Mjg0OUU0MTE5NDBEQTc4ODZEQzk5 - N0NGIiB4bXBNTTpEb2N1bWVudElEPSJ4bXAuZGlkOkE2Q0VGMDE2NDlEQTExRTQ4NTlCQTI3NTMyOEY5 - NEU2IiB4bXBNTTpJbnN0YW5jZUlEPSJ4bXAuaWlkOkE2Q0VGMDE1NDlEQTExRTQ4NTlCQTI3NTMyOEY5 - NEU2IiB4bXA6Q3JlYXRvclRvb2w9IkFkb2JlIFBob3Rvc2hvcCBDUzYgKFdpbmRvd3MpIj4gPHhtcE1N - OkRlcml2ZWRGcm9tIHN0UmVmOmluc3RhbmNlSUQ9InhtcC5paWQ6NjA1MjM3NzFEOTQ5RTQxMUE0QzNB - MjdEOTJBQzc3QkMiIHN0UmVmOmRvY3VtZW50SUQ9InhtcC5kaWQ6NjNBMzk0RjgyODQ5RTQxMTk0MERB - Nzg4NkRDOTk3Q0YiLz4gPC9yZGY6RGVzY3JpcHRpb24+IDwvcmRmOlJERj4gPC94OnhtcG1ldGE+IDw/ - eHBhY2tldCBlbmQ9InIiPz6UH16BAAABrElEQVRIS63N70tTURzH8fsnKSGCCEIQCBKISMq2iILCgQOL - JUxQAoVKdMGQuwgWFepsMGjFZCMuorsIJV4WFatpvzdr1ZAFsaIHn8559v1eDsI91wevJ/ee7/tjbMRH - fAFwJOWRF6oopTzyQhWlVEdBwRbgUhICAnuvilKGtXDGzW6WV/CvbjE/xTfxr+R6q4xSxtP5YTf8rVn4 - s5dG+809Rv5zvVVGKaNwfYgyBfhksoH83CCF9seiL7LBBnLXTlP4/W4dza0ZLS0nCdlgA9npAQq/qk/Q - sKa0NJ8nIBtsIBPrp9CqPMJBYVLLj+04ZIMNrF49ReHwVRafH1/R8m3zJmSDDdy/fJJC88Ua3mcjWurW - LGSDDaQifRS+O8uopsNaPhVnIBts4E64l0Jj5y4qDy5q+ZCPQTbYgHmph8LXZ0m8TJ3Xsp+LQjbYQOJC - N4XadgLl22e1vM1OQDbYwK1zXRS+lBbhmEHsLgU8kTeVh+OQDTawEDpB2U4mitfpMS22GYJssIH5QCcV - FGwBmuRtkA3cGO3whcZUlEdeqKKU8sgLVZRSfjw+MP4DJ2GPpDR9OIsAAAAASUVORK5CYII= - - - - - iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAZdEVYdFNvZnR3YXJlAEFkb2JlIEltYWdlUmVhZHlxyWU8AAADZmlUWHRYTUw6Y29tLmFkb2Jl - LnhtcAAAAAAAPD94cGFja2V0IGJlZ2luPSLvu78iIGlkPSJXNU0wTXBDZWhpSHpyZVN6TlRjemtjOWQi - Pz4gPHg6eG1wbWV0YSB4bWxuczp4PSJhZG9iZTpuczptZXRhLyIgeDp4bXB0az0iQWRvYmUgWE1QIENv - cmUgNS4zLWMwMTEgNjYuMTQ1NjYxLCAyMDEyLzAyLzA2LTE0OjU2OjI3ICAgICAgICAiPiA8cmRmOlJE - RiB4bWxuczpyZGY9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkvMDIvMjItcmRmLXN5bnRheC1ucyMiPiA8 - cmRmOkRlc2NyaXB0aW9uIHJkZjphYm91dD0iIiB4bWxuczp4bXBNTT0iaHR0cDovL25zLmFkb2JlLmNv - bS94YXAvMS4wL21tLyIgeG1sbnM6c3RSZWY9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlw - ZS9SZXNvdXJjZVJlZiMiIHhtbG5zOnhtcD0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wLyIgeG1w - TU06T3JpZ2luYWxEb2N1bWVudElEPSJ4bXAuZGlkOjYzQTM5NEY4Mjg0OUU0MTE5NDBEQTc4ODZEQzk5 - N0NGIiB4bXBNTTpEb2N1bWVudElEPSJ4bXAuZGlkOjJGRTU5OEQ1NDlEQjExRTRBRUVDOTkyMjQ5NzEw - REUwIiB4bXBNTTpJbnN0YW5jZUlEPSJ4bXAuaWlkOjJGRTU5OEQ0NDlEQjExRTRBRUVDOTkyMjQ5NzEw - REUwIiB4bXA6Q3JlYXRvclRvb2w9IkFkb2JlIFBob3Rvc2hvcCBDUzYgKFdpbmRvd3MpIj4gPHhtcE1N - OkRlcml2ZWRGcm9tIHN0UmVmOmluc3RhbmNlSUQ9InhtcC5paWQ6MTY0MkI1RjlEQTQ5RTQxMUE0QzNB - MjdEOTJBQzc3QkMiIHN0UmVmOmRvY3VtZW50SUQ9InhtcC5kaWQ6NjNBMzk0RjgyODQ5RTQxMTk0MERB - Nzg4NkRDOTk3Q0YiLz4gPC9yZGY6RGVzY3JpcHRpb24+IDwvcmRmOlJERj4gPC94OnhtcG1ldGE+IDw/ - eHBhY2tldCBlbmQ9InIiPz6B5sF9AAACe0lEQVRIS7WVb2jMcRzHL7UHanF/Mts5prE/1li3kAfu5Ak7 - 5IHNobBkSC2UIuGJkrrSWRvTmHQWK8U1T8jqUtYwkZpaGjV/Js6to5YwfXze39+fu/v23f36hXe9us+f - 7/v9rd/dr3MQ0X/F4Zm3+K9QhWajNNlBFZqN0mQHS6lMdrCUyqSgimllUsy4XmOmp+QRDllQWbygjjq6 - uimZStOX8a+ixox3pXrM1JLCDAqYJmY7c669M0bff07mcLbtEl9QE8k6V6BH5ooXMsHZZX7ae+AY7W45 - SrPm19LbsSR9m/iRA2bYGefggVePzUgKBzeu9sQpmZ4QcG/WMtk7eLjv0WMz0kOz+TX6MUXvP6cFeNbD - bz6YvQFm2Bk9PPByZO6jksLB5KvRTzTyLikIrG2ktsvXzd4g2hGjYP1ms4eHvb850qkl65LCQW/ntVs0 - 9HpMcPx0K1X4V1Ff/3NzhnphbVDsjBk8Lm/VE44s0ZJ1KS4Ie8uXUvPBE7Tn0ElCzTMqrV5BO/cfEaDG - TD5X6PFFONLygsTF7jj1vxihyPkYNTS1iFrFxm37KHIhJmp43L7qZxzp0pJ1SeHhQGgLJQaH6fb9R1QX - 2EB3Ek9FryLe95j8K9eLT/TB0FZcskOP1iRdkIh23aR7Ay9pzaZddKY9Jup8nIpeoXXhZlHD655b85Bj - p2npLOmCML+dD/iTZhaX3+UvbRB1PpzeygFnSUUvatecRUMzisoOc+x0LZ3FixxYhQyK1cxyZhkTYhqY - RgnM6hmcwVl4ljDI0KS4AC+Kmyli8Jv2MF7GNwXY4QzOwgNv5mWTL7CLpVQmO1hKZbKDpVR/1P8OcvwB - lh7gOXXZq9sAAAAASUVORK5CYII= - - - + iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 YQUAAAAZdEVYdFNvZnR3YXJlAEFkb2JlIEltYWdlUmVhZHlxyWU8AAADZmlUWHRYTUw6Y29tLmFkb2Jl @@ -750,26 +750,244 @@ bS94YXAvMS4wL21tLyIgeG1sbnM6c3RSZWY9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlw ZS9SZXNvdXJjZVJlZiMiIHhtbG5zOnhtcD0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wLyIgeG1w TU06T3JpZ2luYWxEb2N1bWVudElEPSJ4bXAuZGlkOjJGQzkyMzc0Rjk0OUU0MTE5NjNCQjRENDMzQjlC - MUM4IiB4bXBNTTpEb2N1bWVudElEPSJ4bXAuZGlkOjJERjY3MEZENEQyMzExRTRCNDlGQUMwMzk0OTAw - Qzc4IiB4bXBNTTpJbnN0YW5jZUlEPSJ4bXAuaWlkOjJERjY3MEZDNEQyMzExRTRCNDlGQUMwMzk0OTAw - Qzc4IiB4bXA6Q3JlYXRvclRvb2w9IkFkb2JlIFBob3Rvc2hvcCBDUzYgKFdpbmRvd3MpIj4gPHhtcE1N - OkRlcml2ZWRGcm9tIHN0UmVmOmluc3RhbmNlSUQ9InhtcC5paWQ6NjhGOUEyRDEyMTRERTQxMUIzNkJE + MUM4IiB4bXBNTTpEb2N1bWVudElEPSJ4bXAuZGlkOjlDMzFEOUI4NEFBRjExRTQ4OTA5OUYwQ0QzM0Q2 + NEI4IiB4bXBNTTpJbnN0YW5jZUlEPSJ4bXAuaWlkOjlDMzFEOUI3NEFBRjExRTQ4OTA5OUYwQ0QzM0Q2 + NEI4IiB4bXA6Q3JlYXRvclRvb2w9IkFkb2JlIFBob3Rvc2hvcCBDUzYgKFdpbmRvd3MpIj4gPHhtcE1N + OkRlcml2ZWRGcm9tIHN0UmVmOmluc3RhbmNlSUQ9InhtcC5paWQ6MDk5Mzk2NTZBRjRBRTQxMTk3NEFD + QUFFQjRCMzVENkUiIHN0UmVmOmRvY3VtZW50SUQ9InhtcC5kaWQ6MkZDOTIzNzRGOTQ5RTQxMTk2M0JC + NEQ0MzNCOUIxQzgiLz4gPC9yZGY6RGVzY3JpcHRpb24+IDwvcmRmOlJERj4gPC94OnhtcG1ldGE+IDw/ + eHBhY2tldCBlbmQ9InIiPz73sIMwAAADIElEQVRIS7WVa0iTYRTH56Uiysvm3TkvpLl5DRIvQYWVWl+6 + iNEVg0yhQqloQZHkLT+Y0YdAs75IpEUhzERZoZhsRpZlS7soblotsRwoxhqWeTrnYZtv+u7NsB74cZ5z + zv89/z17HzYRAPxXeIv/EpFXcOyi4BvKhfehv4FvKBfeh+ayqIUDlIgBgT8whpRYoT2fhgvNVJKBQT9s + hB8/QZDPpnEIjEhg0J5Pw4Vm0mwygG9T06BSqQQhTUhUMoRGpyxYT7OZwfhXC6jVakFIYzNYqN5uMGKa + BI1GIwhpghXJaJJi13d0dEB2bj74hsWzSDlXbzfQG02g0+kEIU2wIomdovzKdVifngnFFytBeb4cLN+n + WaSc6hfKKqB/eHTWoHfwExgMBkFII5MnQUD4WlAWloO26wVs35MDmifPmQFFyqlO/aKKqlmDp31DYDKZ + BCGNTJ4IPqHx8LJvACbNUw7p6e2HuJQMNIhhBuaHj3vBYrEI0tb1BoIiE9kJ9h7Oh7EJM+g/jEJuwVlY + s24ri5RTnfo5BedAIoueIYPumvomuHzjzm9cq2uCq7UNUH2rEarr7kNd0yP26Y+eKoSWtk4wfpmAg7kn + ITY5DUorq1g8cOQEqze3aplOEhRtJoMcL1mMTixV9IgD5a/tSBVDYql8AKOBQLEJtTP08gY/jjFiktKg + 5FIV21Ok3NazvmR2AvrFkCAJyGYk1comZAuHDM/AyLvHThfBveZ26NOPwI59eey7LsbhFCmnOvVJ5+Ef + rrYZLEU8EZ85+HLwW7ZCLMVTFWdkHoLut+/hgbYHaE9XN31XNsupTrWV3jKVs+uS3cyAD0cLe331jW3Q + qRt0CPUlQVHDKI+fN9iGo4W90uNnyuA2vvRtWTlQgxeg/dk7FimnOvU9/CNqUe47b7ANRwt7AfjpKvAK + Gt18Qur35ymhRfsKKLr5hN7EyzDq7humWrrcfSfKxbz/QlwcLDck1snZJdUzYHUDmk57+K1qdXJyzsL6 + RmQD9ZmObygXB8sVIRO6fXQB4hC6eRQppzr1XXmHclnAckFomLc1Um5dItEvhZ97MQXP9N0AAAAASUVO + RK5CYII= + + + + + iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 + YQUAAAAZdEVYdFNvZnR3YXJlAEFkb2JlIEltYWdlUmVhZHlxyWU8AAADZmlUWHRYTUw6Y29tLmFkb2Jl + LnhtcAAAAAAAPD94cGFja2V0IGJlZ2luPSLvu78iIGlkPSJXNU0wTXBDZWhpSHpyZVN6TlRjemtjOWQi + Pz4gPHg6eG1wbWV0YSB4bWxuczp4PSJhZG9iZTpuczptZXRhLyIgeDp4bXB0az0iQWRvYmUgWE1QIENv + cmUgNS4zLWMwMTEgNjYuMTQ1NjYxLCAyMDEyLzAyLzA2LTE0OjU2OjI3ICAgICAgICAiPiA8cmRmOlJE + RiB4bWxuczpyZGY9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkvMDIvMjItcmRmLXN5bnRheC1ucyMiPiA8 + cmRmOkRlc2NyaXB0aW9uIHJkZjphYm91dD0iIiB4bWxuczp4bXBNTT0iaHR0cDovL25zLmFkb2JlLmNv + bS94YXAvMS4wL21tLyIgeG1sbnM6c3RSZWY9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlw + ZS9SZXNvdXJjZVJlZiMiIHhtbG5zOnhtcD0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wLyIgeG1w + TU06T3JpZ2luYWxEb2N1bWVudElEPSJ4bXAuZGlkOjJGQzkyMzc0Rjk0OUU0MTE5NjNCQjRENDMzQjlC + MUM4IiB4bXBNTTpEb2N1bWVudElEPSJ4bXAuZGlkOjhDMTdBQjRENEFBRTExRTQ4QjQyODY0MDNBNTJE + NzNCIiB4bXBNTTpJbnN0YW5jZUlEPSJ4bXAuaWlkOjhDMTdBQjRDNEFBRTExRTQ4QjQyODY0MDNBNTJE + NzNCIiB4bXA6Q3JlYXRvclRvb2w9IkFkb2JlIFBob3Rvc2hvcCBDUzYgKFdpbmRvd3MpIj4gPHhtcE1N + OkRlcml2ZWRGcm9tIHN0UmVmOmluc3RhbmNlSUQ9InhtcC5paWQ6NUQyMjc4QTlBQjRBRTQxMTk3NEFD + QUFFQjRCMzVENkUiIHN0UmVmOmRvY3VtZW50SUQ9InhtcC5kaWQ6MkZDOTIzNzRGOTQ5RTQxMTk2M0JC + NEQ0MzNCOUIxQzgiLz4gPC9yZGY6RGVzY3JpcHRpb24+IDwvcmRmOlJERj4gPC94OnhtcG1ldGE+IDw/ + eHBhY2tldCBlbmQ9InIiPz4eHsDfAAAB00lEQVRIS7XVWytEURQH8HniTTNHLs0NCXNcXjTN5dH9g/gM + 3jx590QhFDJS0gyTGmpqaqJIMW4hzlAoOaWISS7LWifntI3ddnTGrl92e/57/We/DBsA/CvuYSHZSr0t + lvCGsriX/oI3lMW9lM/SwgF9SEHwizs08IX2vAyLZvZRgXJ+cQWv7yB0q96Ds86voT0vw6KZNJsK4Pnl + DWKxmBBlqhpDUN0UNp2n2VrB/WMOEomEEGX0ArN5o+BGfYB0Oi1EGa8cwpKw6bxRcH6lQiaTEaKMVw5q + rzCbNwr2z65BURQhynh8Qe0VZvNGwdZBFlRVFaKMxxfQXmE2rxc8rW3sQy6XE0puHoG7IaC9YnV9j5th + pbZPqOCDCrbH5uIwOD7/zWgkDkNTizAyuwQjkWWIxFNQWduqmVxI/MiPz6/A8HTUuDMTTYLkbrqhgt5S + T3PG4ZJ3HE7focElZx0u3yn+VQiG1ZLymmm7s74f88f42S6bl9zyJZ6d6Xckd+Mt5ieogH4xJORHHajt + SzvqZPSgECpHZSiA2DztuxBlad+NgnpBEbIjusiiYboKRF+kGFHegUR5ImkFv7G0eAPzWVq8gfksLd5/ + oULiHhYS97BwwPYJlSCUgVubViQAAAAASUVORK5CYII= + + + + + iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 + YQUAAAAZdEVYdFNvZnR3YXJlAEFkb2JlIEltYWdlUmVhZHlxyWU8AAADZmlUWHRYTUw6Y29tLmFkb2Jl + LnhtcAAAAAAAPD94cGFja2V0IGJlZ2luPSLvu78iIGlkPSJXNU0wTXBDZWhpSHpyZVN6TlRjemtjOWQi + Pz4gPHg6eG1wbWV0YSB4bWxuczp4PSJhZG9iZTpuczptZXRhLyIgeDp4bXB0az0iQWRvYmUgWE1QIENv + cmUgNS4zLWMwMTEgNjYuMTQ1NjYxLCAyMDEyLzAyLzA2LTE0OjU2OjI3ICAgICAgICAiPiA8cmRmOlJE + RiB4bWxuczpyZGY9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkvMDIvMjItcmRmLXN5bnRheC1ucyMiPiA8 + cmRmOkRlc2NyaXB0aW9uIHJkZjphYm91dD0iIiB4bWxuczp4bXBNTT0iaHR0cDovL25zLmFkb2JlLmNv + bS94YXAvMS4wL21tLyIgeG1sbnM6c3RSZWY9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlw + ZS9SZXNvdXJjZVJlZiMiIHhtbG5zOnhtcD0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wLyIgeG1w + TU06T3JpZ2luYWxEb2N1bWVudElEPSJ4bXAuZGlkOjJGQzkyMzc0Rjk0OUU0MTE5NjNCQjRENDMzQjlC + MUM4IiB4bXBNTTpEb2N1bWVudElEPSJ4bXAuZGlkOjJEMDQyOEZBNEFEMjExRTRBN0MxRDBCNzJGRUND + MDEzIiB4bXBNTTpJbnN0YW5jZUlEPSJ4bXAuaWlkOjJEMDQyOEY5NEFEMjExRTRBN0MxRDBCNzJGRUND + MDEzIiB4bXA6Q3JlYXRvclRvb2w9IkFkb2JlIFBob3Rvc2hvcCBDUzYgKFdpbmRvd3MpIj4gPHhtcE1N + OkRlcml2ZWRGcm9tIHN0UmVmOmluc3RhbmNlSUQ9InhtcC5paWQ6QkRDRkI1RDVEMTRBRTQxMTk3NEFD + QUFFQjRCMzVENkUiIHN0UmVmOmRvY3VtZW50SUQ9InhtcC5kaWQ6MkZDOTIzNzRGOTQ5RTQxMTk2M0JC + NEQ0MzNCOUIxQzgiLz4gPC9yZGY6RGVzY3JpcHRpb24+IDwvcmRmOlJERj4gPC94OnhtcG1ldGE+IDw/ + eHBhY2tldCBlbmQ9InIiPz59jfe3AAAEbUlEQVRIS8WTeUybZRzHF48/pnFOuQRajkFLgQFb5iRLNJr4 + l/EPgsniUI4xZDAY1zyxwApsMJyIME61rByl3DfoYGBrgbWUY06FcZSCha4rQ8jYxkqPr2/fvkv8o2Sg + S/wkT970eb6/T5/39z7Prv8dt/Oql4mR4HZJ3ccoXFxhVCzB9DT9JueJdSq6c1wzVZFupepVzxu34XVj + CaEDi1jX6hF8ZQoeokl4iBVwzV9YdU1XRlIl28eVo8phCdXwGltEeOUsro6psaHVwcSDh5volc4iOO8X + 7KuVwb1hEi7J8myq9PEQO//I85oafr0KtEpUpNSETm+AwWDAvfv3YTQaybnm/t/AyO6Ga+UonJOnIijF + 1hA9tWI2qle9RxcI+RIpmZpTIfBULhIyyqHVahHPKcN70TmYnFFCp9OhqXcc9KwW0DOHVl3YU1aUyjJu + F1SpfhO3EM6bMMsVt+D8Zhz2HIpC4oU6bG5uIu4cD3tfTwAjIBNypQYbGxsISquBU34PaDHiVEplGXee + SuIjVaBv3Lz7gJg8vHg4FlZvc+ATVoLipiHsD8qCXWAO7IPK8MG5FjLXKboOeoYADkldUkplGWb7vOb4 + 4BzxIXXQE/1m59WDXdgBvxPfwz6UC4eQUth/WIBDZ2qQXj+K7IYRImeE5s5fOFrcDPvPapcJzVNmmwVY + VxWG9U09uau1tTVymPpc0iYFLew7OEUJ4BwtALfvJpl5xMrKCu6s3cUrn5YbCM1us80CrJZZVWjXr7j3 + 4CE0y8v4IrcaH+cK4Bv+DRyPl8ApphYuia3wZ3eCUzOA1PIfcVuzjHnlIgK/vgy7mHzTG+w12yzA5E53 + edYPo1c2i/X1dQTEfwvbwDQ4hhXg8OcN4P48Df+UTrgkNIAeW4Hg3Hbo9Xq0iGSgs4ls5CUhoXnObLOA + S8pkhG/bdZzgDZJnffT3GXieLAA9XgB2/RjZjuQqMWhxfBw824H55XWyhcfy+HDNqoB1SH4Codn6G7iw + p3d78EaVPlXX0CaZgkqlgly1gpCiK0htHCH/IL6oFcEF3ZjT3CUvXqv0DzDSS0FPq1a/8EbYS5Rqa+if + SAJ8KoeNR7gitEsnoVQqSbGOkJmYX1ggxaY70SabwIGMUrjn8I3WIXnBRPnWu/8nDnE9Sd7cAaP/ZSES + 6/rRKJRArpiHXC7HzekZNIukiCyrhW9mGZgXa4w2kUVnibJnzdXbxP5URzyDO4QjxGl5i9uNpMZeKP5U + IrywAq9yCnGAOGGMonbYxpVnEPGdyR9BO/MTj8kfgXeNFPt5IngVtoF1kQ9WcTs8qgfgmNreQMS21xZL + 0E6Ln6ef75tg8sfgXT8O77oReAkkYNXJ4PRV/4ztyfo9VPTf4xjdf9CpQKzdxxuGe6UMbhXEmc8V6mze + r3qNivx3HGN7UmglQ6CVDMIxXwybo5UcaunJQD8te9rhyx4JrWwItlGNUut3y5+hlp4cDhFCpl14k9jq + nR+Y1NTjIe7NlmMnWKoHsOtvjWYcKpheqFQAAAAASUVORK5CYII= + + + + + iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 + YQUAAAAZdEVYdFNvZnR3YXJlAEFkb2JlIEltYWdlUmVhZHlxyWU8AAADZmlUWHRYTUw6Y29tLmFkb2Jl + LnhtcAAAAAAAPD94cGFja2V0IGJlZ2luPSLvu78iIGlkPSJXNU0wTXBDZWhpSHpyZVN6TlRjemtjOWQi + Pz4gPHg6eG1wbWV0YSB4bWxuczp4PSJhZG9iZTpuczptZXRhLyIgeDp4bXB0az0iQWRvYmUgWE1QIENv + cmUgNS4zLWMwMTEgNjYuMTQ1NjYxLCAyMDEyLzAyLzA2LTE0OjU2OjI3ICAgICAgICAiPiA8cmRmOlJE + RiB4bWxuczpyZGY9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkvMDIvMjItcmRmLXN5bnRheC1ucyMiPiA8 + cmRmOkRlc2NyaXB0aW9uIHJkZjphYm91dD0iIiB4bWxuczp4bXBNTT0iaHR0cDovL25zLmFkb2JlLmNv + bS94YXAvMS4wL21tLyIgeG1sbnM6c3RSZWY9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlw + ZS9SZXNvdXJjZVJlZiMiIHhtbG5zOnhtcD0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wLyIgeG1w + TU06T3JpZ2luYWxEb2N1bWVudElEPSJ4bXAuZGlkOjJGQzkyMzc0Rjk0OUU0MTE5NjNCQjRENDMzQjlC + MUM4IiB4bXBNTTpEb2N1bWVudElEPSJ4bXAuZGlkOjJERTg4QTFENEQyMjExRTRBODEyODk0M0RBMTc5 + Qjg3IiB4bXBNTTpJbnN0YW5jZUlEPSJ4bXAuaWlkOjJERTg4QTFDNEQyMjExRTRBODEyODk0M0RBMTc5 + Qjg3IiB4bXA6Q3JlYXRvclRvb2w9IkFkb2JlIFBob3Rvc2hvcCBDUzYgKFdpbmRvd3MpIj4gPHhtcE1N + OkRlcml2ZWRGcm9tIHN0UmVmOmluc3RhbmNlSUQ9InhtcC5paWQ6NjJGOUEyRDEyMTRERTQxMUIzNkJE NUVDQjU5MzE1NjIiIHN0UmVmOmRvY3VtZW50SUQ9InhtcC5kaWQ6MkZDOTIzNzRGOTQ5RTQxMTk2M0JC NEQ0MzNCOUIxQzgiLz4gPC9yZGY6RGVzY3JpcHRpb24+IDwvcmRmOlJERj4gPC94OnhtcG1ldGE+IDw/ - eHBhY2tldCBlbmQ9InIiPz6GKmpFAAAC+UlEQVRIS63T20vTYRzH8Yforj/Ei24UiSgKIygKi8oyxZQo - cvNYeXaesmzqPGu2POd0ulSsnIdaurTSTJ3O6UxTPGya5vCQx5AuPn39RbHop7nZxQt+z3ie93e/Z4w1 - p7nsCoBt8R6yBF/UHPv+Wb0rfFFzm99CRIwEW1gnqXzxTXxRc0ydctm4OlID2sxrw6iCtiwItC+A2P/D - frLnjwGNSZdMq6N1WOvLwFpP4l/WdRlY6Jaio9Ab7QXba8sVoDHZGdT8PYS9THDqMGnLsKpNw0qXGCua - BO55VZdNQ6U/DRRibVCGb+N1pH5bukoRqHmDHOIG1N8/X2F4I8WyNhtf2+9hqSsZxqZ4upbb6HsSZLHO - Im90ym6hNVcIaktYTexZyUelGEvaHMy/jcFiZxo0xX5Y7ivGcn8JkVmA9uvlWBmqwpJeAWovs+poR99O - eRgWtQWYVUdgrj0FH+i+F3XF3NoappZYGJrEoLaOVYpOOTY/FGJB+xjTqnDMtMTTAC/Ma/Ix/TLUKl9e - x0JfFQpql7PykBP7lWIXzPeUYLIhHCPKCLr/AMy2ZsKoDLTKdNNdvM8TgNpRTBZwfJ885CTmaIChPhwa - mS+GnkdhqjEWY9X+VplqvIMXEhdQ24mZeuSs0N/BNNWWj4k6EdSZHhhXxWH0aSCGFd4c4Tk7zk7XBlUM - FKLToK4Nm+0qYnneRzqGGiSYaIiiyZdhVCdgqFSIwRJPjucZW85O1pvnRmvDkO9zFNTdy2Y6HjGp4HCF - 5kk4xhoiURd/EROv4tBfeM0qAyUC9Mp9QM0+7o829T6LZV0/mNycS6+nFKFWfAGj9ZHozfGwil7miZYH - 7qCmghsw+S6VpV894KuUuKFbfhNNqa749CwY3dm0toK+VABl3HlQM5obYHybwFLc7W1y/Y5BlX6FfgNn - DNcEY0DhZZX+MiGKbh0DNR24AYYWMSfJzc6GZBApwS5skIzNODcg0dV2V36FtsJ7yBJ8UXO8hyzBFzXH - ++H/A/YDv9/V87iOlrYAAAAASUVORK5CYII= + eHBhY2tldCBlbmQ9InIiPz6wJF34AAACl0lEQVRIS62Vy08TURSH73/QhQtXVnBhxEcMiUkhbEg0hB1R + Q1i68C8wIW5cEqMLN7ho2Ji4YiEhWq0prYUhfULbadN3obTaChobtZEUsFY9nnPS6WM6HYowyZf87j33 + nG/amaai9geOBYA+4pTxihmBE8DcTQB4J8em/9IwSQyagmrtL+z9rMFmvnhkKvtV7tcVHPz6DVsftulA + AckdhUg8zf19eoLKAd597iMLMItewfOxUDTN/bqCH3tVSG8VWIBZ9AoJApEk9+sKvu/uQ2IjzwJkGtH8 + OrTwy3Hu77vIAnV9mgWlcgWiqRwLjAMmkOMbPbNTKnN/JJntqJGEBZ++7oKcyLLgLN4JrU8Cms2C4pcy + BKKZumCI18temQ/8DzSLZlBmQX7nG/jCKdpgAa0driCtY5iFHuqHSjNoFtaags1iCdzBBG+QgNY2aZ0F + mIUe6osENAtrTUEq/7kDq9PHAszU5yYoq9f1i9cUSCD5ozxDEeTsrhAoONwyxLLb8MrhYQFmZYCHsnpd + v3hNgQROb5hnKIK29944MAThTBEWbS4WYBZ6qC/sKSy5ZJ6BGUQg8b4Bbhjod4AZXlhXWdBa10LrIVul + AM9ggS+aa6AIMMO8ZYUO0KeyIOMtZyaQpXpNi4LFucYzMINwhbMNcMNw5oIJMMNKIA0LNg88mZuH/ssj + dPgBMnN+cBRmny1wrRtSMMMzWCCFMg0UAeY2Fh0+GL5xG8Zu3oHXUrCj3g0WONdTbeBm21/o1N17gPtg + 98Xh3VoS3qzKMDI22agfglnY/Uld8NDc/ZlZwAwvl4Ngun6LGh8rdfVDViNs3rguOOzq6XOD8PDpc7g2 + OkHDH7XWtYa2It66Y4eCQ8cRfpvUNa2hTUD8A6JMaBvCyTdJAAAAAElFTkSuQmCC + + + + + iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 + YQUAAAAZdEVYdFNvZnR3YXJlAEFkb2JlIEltYWdlUmVhZHlxyWU8AAADZmlUWHRYTUw6Y29tLmFkb2Jl + LnhtcAAAAAAAPD94cGFja2V0IGJlZ2luPSLvu78iIGlkPSJXNU0wTXBDZWhpSHpyZVN6TlRjemtjOWQi + Pz4gPHg6eG1wbWV0YSB4bWxuczp4PSJhZG9iZTpuczptZXRhLyIgeDp4bXB0az0iQWRvYmUgWE1QIENv + cmUgNS4zLWMwMTEgNjYuMTQ1NjYxLCAyMDEyLzAyLzA2LTE0OjU2OjI3ICAgICAgICAiPiA8cmRmOlJE + RiB4bWxuczpyZGY9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkvMDIvMjItcmRmLXN5bnRheC1ucyMiPiA8 + cmRmOkRlc2NyaXB0aW9uIHJkZjphYm91dD0iIiB4bWxuczp4bXBNTT0iaHR0cDovL25zLmFkb2JlLmNv + bS94YXAvMS4wL21tLyIgeG1sbnM6c3RSZWY9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlw + ZS9SZXNvdXJjZVJlZiMiIHhtbG5zOnhtcD0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wLyIgeG1w + TU06T3JpZ2luYWxEb2N1bWVudElEPSJ4bXAuZGlkOjJGQzkyMzc0Rjk0OUU0MTE5NjNCQjRENDMzQjlC + MUM4IiB4bXBNTTpEb2N1bWVudElEPSJ4bXAuZGlkOkUzNzJDMjE3NEFENjExRTRCNjE0OEVEQzI4MEM0 + RTZDIiB4bXBNTTpJbnN0YW5jZUlEPSJ4bXAuaWlkOkUzNzJDMjE2NEFENjExRTRCNjE0OEVEQzI4MEM0 + RTZDIiB4bXA6Q3JlYXRvclRvb2w9IkFkb2JlIFBob3Rvc2hvcCBDUzYgKFdpbmRvd3MpIj4gPHhtcE1N + OkRlcml2ZWRGcm9tIHN0UmVmOmluc3RhbmNlSUQ9InhtcC5paWQ6RkI3NUQ0QkNENDRBRTQxMTk3NEFD + QUFFQjRCMzVENkUiIHN0UmVmOmRvY3VtZW50SUQ9InhtcC5kaWQ6MkZDOTIzNzRGOTQ5RTQxMTk2M0JC + NEQ0MzNCOUIxQzgiLz4gPC9yZGY6RGVzY3JpcHRpb24+IDwvcmRmOlJERj4gPC94OnhtcG1ldGE+IDw/ + eHBhY2tldCBlbmQ9InIiPz6PyaLfAAADMElEQVRIS6VUXUiTYRT+vi3Tzd+ps23+3KRigtiPkolEQReG + UYTkhWatpWlWGkRdddfdSPImqUAJjSIT00oxLJIk0cR+tFSyzDJtgaMkDEPkdM7ZPvm2vS6jBx6es3Pe + 8zzvtm+TohLS/ov+AACStLgEQuJyLRJWYK1yzh/+FgCoQrpnfM4fOGBhcUlIMkEVkma4H4i1y2kFcMD8 + wqKQZILKZqTqmlTAWrfvMjhgbv63Dwm0hLWQohn1eNEbzrlfPiTQAtZCKjP1GXdAIC+r4XD+9CGBFrDm + RVJ1re6pZ0GyHHMvIawauYVNCFPfvvuQQAtYC6meKXU0amNsaGN/ZR60xIf9aIgN3cpGE9OzZCZ85nEm + pGiWlLABmuJCnUOXrNB7chdct4TUo32ANDbp4NuielDpqWfePdaPX6GrohSK4uLhlCEo96YlZLbOFHzH + oJXjMSBcGn4/zQGovEDqXXtzeTb+BTrKj0J3+Q54djYP7EZdTU2MPjFSK8eieQR9QtLg6GcOQPWgqKeQ + ZyOfoK30CDw+lg2Ot3Z4VLoNqo269mCNHIa2WjYn9A1PcAAqU6m9VV3TF9psOwwPS3JgZugCdNoyocwU + jU+RlImWBpezGz0vxzkA1YOiHvPFO7Ca1kGHLQtmXp2HdutmqN+/F6JiU+h3kOpyVeHJwBgHoLIpqajm + 189HoaG4CNqsGTA1UAWth9Lg6r490PygGyLjUikgzuWqQlffCAegelDdUwLqigqhpXgjTPYeh+bCFCg2 + RkEk3vxuVz/P0c43oLP3DQegLhspNalSFxiNcLswHT48LYNbBUlQk7ebzenmyhm08w1o7xmiAP6hRZiT + 70eYkzpctUuJWdHmwWs74+F1Uz7cyE+E4ohQB5mHm9a3GywpTXzektyKduIAIsKI3ISkL4rIdYle05C9 + VrZVBmvtl7eboUyv7V4jSQdwRn8FdI72iErtCUxnIuifkJ5hUqUOq9Jr7OeCNU6bTpNVqtMcDJSldOwn + KnOk+jypJ5QANRWc0cs5SEelXr54QidfwVYAMoiHq4W/gNM6OaNCJ+diaUIqN/43+Atwg27t+9ZXBUn6 + A2MdqQeVc5pWAAAAAElFTkSuQmCC + + + + + iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAIAAABvFaqvAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 + YQUAAAAZdEVYdFNvZnR3YXJlAEFkb2JlIEltYWdlUmVhZHlxyWU8AAADZmlUWHRYTUw6Y29tLmFkb2Jl + LnhtcAAAAAAAPD94cGFja2V0IGJlZ2luPSLvu78iIGlkPSJXNU0wTXBDZWhpSHpyZVN6TlRjemtjOWQi + Pz4gPHg6eG1wbWV0YSB4bWxuczp4PSJhZG9iZTpuczptZXRhLyIgeDp4bXB0az0iQWRvYmUgWE1QIENv + cmUgNS4zLWMwMTEgNjYuMTQ1NjYxLCAyMDEyLzAyLzA2LTE0OjU2OjI3ICAgICAgICAiPiA8cmRmOlJE + RiB4bWxuczpyZGY9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkvMDIvMjItcmRmLXN5bnRheC1ucyMiPiA8 + cmRmOkRlc2NyaXB0aW9uIHJkZjphYm91dD0iIiB4bWxuczp4bXBNTT0iaHR0cDovL25zLmFkb2JlLmNv + bS94YXAvMS4wL21tLyIgeG1sbnM6c3RSZWY9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlw + ZS9SZXNvdXJjZVJlZiMiIHhtbG5zOnhtcD0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wLyIgeG1w + TU06T3JpZ2luYWxEb2N1bWVudElEPSJ4bXAuZGlkOjJGQzkyMzc0Rjk0OUU0MTE5NjNCQjRENDMzQjlC + MUM4IiB4bXBNTTpEb2N1bWVudElEPSJ4bXAuZGlkOjUzQzNGNDI5NEQyQzExRTQ4QkE1QUNCMEVDRDZF + MDVEIiB4bXBNTTpJbnN0YW5jZUlEPSJ4bXAuaWlkOjUzQzNGNDI4NEQyQzExRTQ4QkE1QUNCMEVDRDZF + MDVEIiB4bXA6Q3JlYXRvclRvb2w9IkFkb2JlIFBob3Rvc2hvcCBDUzYgKFdpbmRvd3MpIj4gPHhtcE1N + OkRlcml2ZWRGcm9tIHN0UmVmOmluc3RhbmNlSUQ9InhtcC5paWQ6RkI1NUY4OTYyQTRERTQxMUIzNkJE + NUVDQjU5MzE1NjIiIHN0UmVmOmRvY3VtZW50SUQ9InhtcC5kaWQ6MkZDOTIzNzRGOTQ5RTQxMTk2M0JC + NEQ0MzNCOUIxQzgiLz4gPC9yZGY6RGVzY3JpcHRpb24+IDwvcmRmOlJERj4gPC94OnhtcG1ldGE+IDw/ + eHBhY2tldCBlbmQ9InIiPz6IsaOmAAADF0lEQVQ4T62U/UuTURTH+0nICqRI1ERMMyNQe8N0ChqBwQhN + yvwhEgJjVCqJ/qCibZo6tzQ339h6Nre5prapUzc1XzItX1ilzuWMLLVAen+xf6DTuTxjdxsFVj58ebjc + c+7nnud7z3228DbpIaDFH/CfoqCn72DIDvNfPDM2KAqyr8PcJxqY+QBTb8kkjocXQTsKigGwfqYJHqIg + 1OxHGHvlWPx4hXB1YyA3g4CBhqst+piEnrDA3rA95vBAY1x8d7lq/DVZwm5PQZNvoKYdypSgHgbVEIh1 + cLOZzOCbSSsyRQRba6uWtcpVLbPcwlglInNUCJNWWKqABqMLCGvGlfpJELaQ/V1Vd1lujAhe0chtUrH5 + ZExnmJ85MdomEa+qZMbIEF2BHGunILSjdZwYgTt4gJqjjj0Rltml1Zq9AeL0Mn71Wn2mtDU80MIvsFTw + O+KPIoWC8BNYRIUaqrRQroJKjQOk9N+xLBF2pXJFKfnsDGYa8gS6xOO2whyMuoHaHpGzZ/pBM0IMrtXD + nT4HqNHXe0lYoogMFeQP4jbSDkCPTUyXmnNoPutSo+9WN5DEQDyeWCWnhqm4p7Oimt3b54rzmmKPVHKz + 0Xg0AU1pz87VJp+yXOfd9t3mBmLXsGrsJhSsDtF4iOWxKdpzyQNnuRW7vEUp13obFG05OVUBPtO5V1Sn + k5q4SX8ENfWA6C7xHsP981Bb2sf38ZKd4JhSuXUJHPHhg/WJnAeZFw0Xzt/w8erRtLmBnB/CSmaC599I + 2PYVRl+CXigu3R9SfCC0Pf1MZ1oqvqvjogX7gtRFJfb1n24g7GblfQcFP2fkBYm5anxqQcbLKgzyK/Df + WRTkV5+RMTg84ZrgAOHo4ZIDVNdJw67CpsVLZ5gifj97Typlq2ZFQXj8LKh5EHpnaIar8N+Al5l9Y9Vs + T7OiIAzjqaMsa6QJnBkeWvgOHdPkAuIV67PSeQpCYYZplsZ+KyyWLRyFF8D553EDbURY770J0rrYJbda + SYE4iWb9NcgpRKDrOMAWwYP6d5BTaC52zyaAWDlAm/DweL8AX9zXukfxHsIAAAAASUVORK5CYII= + + + + + iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 + YQUAAAAZdEVYdFNvZnR3YXJlAEFkb2JlIEltYWdlUmVhZHlxyWU8AAADZmlUWHRYTUw6Y29tLmFkb2Jl + LnhtcAAAAAAAPD94cGFja2V0IGJlZ2luPSLvu78iIGlkPSJXNU0wTXBDZWhpSHpyZVN6TlRjemtjOWQi + Pz4gPHg6eG1wbWV0YSB4bWxuczp4PSJhZG9iZTpuczptZXRhLyIgeDp4bXB0az0iQWRvYmUgWE1QIENv + cmUgNS4zLWMwMTEgNjYuMTQ1NjYxLCAyMDEyLzAyLzA2LTE0OjU2OjI3ICAgICAgICAiPiA8cmRmOlJE + RiB4bWxuczpyZGY9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkvMDIvMjItcmRmLXN5bnRheC1ucyMiPiA8 + cmRmOkRlc2NyaXB0aW9uIHJkZjphYm91dD0iIiB4bWxuczp4bXBNTT0iaHR0cDovL25zLmFkb2JlLmNv + bS94YXAvMS4wL21tLyIgeG1sbnM6c3RSZWY9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlw + ZS9SZXNvdXJjZVJlZiMiIHhtbG5zOnhtcD0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wLyIgeG1w + TU06T3JpZ2luYWxEb2N1bWVudElEPSJ4bXAuZGlkOjJGQzkyMzc0Rjk0OUU0MTE5NjNCQjRENDMzQjlC + MUM4IiB4bXBNTTpEb2N1bWVudElEPSJ4bXAuZGlkOkVENUYwQThBNEQyOTExRTQ5QzUzQzdFMkFGQkQy + NTA1IiB4bXBNTTpJbnN0YW5jZUlEPSJ4bXAuaWlkOkVENUYwQTg5NEQyOTExRTQ5QzUzQzdFMkFGQkQy + NTA1IiB4bXA6Q3JlYXRvclRvb2w9IkFkb2JlIFBob3Rvc2hvcCBDUzYgKFdpbmRvd3MpIj4gPHhtcE1N + OkRlcml2ZWRGcm9tIHN0UmVmOmluc3RhbmNlSUQ9InhtcC5paWQ6MkRGNkEzOUYyOTRERTQxMUIzNkJE + NUVDQjU5MzE1NjIiIHN0UmVmOmRvY3VtZW50SUQ9InhtcC5kaWQ6MkZDOTIzNzRGOTQ5RTQxMTk2M0JC + NEQ0MzNCOUIxQzgiLz4gPC9yZGY6RGVzY3JpcHRpb24+IDwvcmRmOlJERj4gPC94OnhtcG1ldGE+IDw/ + eHBhY2tldCBlbmQ9InIiPz6npMy1AAAGEUlEQVRIS7WVeVDUZRjHf7Ase8ECu+wl4LIXcqyyHC783AWW + 5QaRFTHkMi9SQvE+UhLzwk0BUcQSgQBBgcYDzStMSzOPcpqcmo5pmqk/+rOapqb+iG/PbzfFcSz/6pn5 + zPN739/7fp/nvZn/3TSLjj+XJy2/RaItPCT5vaBd8m1+q2Qku1lcrcvki+iXr7fFU6ZZeOx5KDU1b7jU + 1Z2bVPMPWNMbRXrXkWAc+ywVLbcS8fKwFjlu8VdpW0XzSc6f8PEIPzJ19dFnU3WEJdHL9P3X9O1nkdB8 + CQrX7i3mKn9zfqsUq29ZsPfjRBx5aMO2cTMy94gm7FuF7XyJTwDJTo5GVdHxNALVgsPd5Ceye+9g8b0f + UXbjB8RtH4Msd+MeXS7f6twjxbILZiy7pEHDtTBsvG7BqivTUXpsClLWCbtJNpDwBlGVH3ySIFV520eW + nedRcf0HVJGwbeRrOHs/h2n1CGRZDe7wND/W1hiI8sEYlJ4KRcVpJcrfVqByNBILhqLh3KeA+UXBOpL2 + jkRZduARPGXZ/vH4pnMou/gd7INfIPn4QyQc/RSOzk9hrBtEiKPerUn1Y5PXBaDojWlwdgUjr0+G/H4Z + cnpCUNJrQNZ+LeLrBD/LYnixFEDAKFz7vJQ0r49dO4zikS8x8/ADxLd9jIT2B5ix/z7SX78Pw+K3EJy2 + wq1M4rEz6sRwthgw82Ag2KNS2I5JPZ4rZx00ImGNHIZSfisFkDGhxbs5AkKLd/3kaLkDlgTjXrsNc/Md + mPfeQeyOD2HbcRu6yi4E2Wrd8ngeG71IBPtePWa4JUhsD0DykQAkHQqApUWCFLcGyZvDoZ/P/5oCTGXk + hU2MvGB7rbGmG47dd2Fa+x6iX/kAMa/eQvS2m4jaeAPspvcROb8TQexid3CcL2usFCJjnwE5nQYU9RhR + PGDC7D4TCrqMyDqkR9oePbRz/SZEKh8rI8vdyshyXhmzLD8DS/1VGOquwtgw7glkXH0Nhvp3kbL2GrSl + hyC11ril03xZfbkQKZuVsDeq4NihRtYuDbJ2auBoUsO2TQXrJiWMlWIExflWMiHOjRzfJy0bg776HCKX + vANd7WXol1/xeN3Si7A2XIXW1YbAxAq3UO0zPTSd1yG38bplLK//vxBrffKY4PQ1HH9aKk8jonQUUyvO + Qlt9HtqaCx4/tXIMyXWXMXXOAQTEv+D2zCvDhBBTCN1zCGOCZq3k+DXO1YcpRYOY4hpF2LzTCCs74/VE + 3IvnEVd1EhGFblBbWot6BKXWQZq64tlYa2+TuJwQM9KU5cRL35hyOxCe2w913hA0hcPQFI16KRzxEFtO + a1Q9htSVN5C+5S5x7x/uIm3DR7CvuomUReOImt1FU7nwEolHECImMGkJE5i46EJkejNM+X1QOPqhzBqC + KvskVDmnJuHKT/K4bgjKzBMItXcjJv84NOwWiKPndJK40TOCgPgaRmIur1dZ1yM6txvyWT0ITR+AImOQ + gg39N1ybDBJP60PorC5My3oTwQm18FdNryBxbq0EJL6AEUTYZBTkF0NGKyKdvZDb3qJOAxSIOqcP/jtp + JyC3D1BSvYgp6EN4aiNlP/cTEk4gFASPEUeXkWd8RaY5jcrEBkTn9UCT4Q3gzfBfRvJE9rrsfpicHSRe + NsFXmJeSXhTBXXY+jMjk8uArVkpExuKb6pkbYJ7L7Ria37xTUBeMeCkcncRTN0z/TyLKNYy4khNQJq2G + IMLBXdUWQkXwCYYR6md7IPP1k8WEC3UFDzSpG2BZeAZJtXQWFpyls3HOC50JzkdQnbFqDInLLiC2rBcq + 6xoSzzzP+NDVwDBaQkx4XzahNv8xZH48sVotCHeOUnnCWNJG18Q4UjddB7vlfbBbPwC7+YannLTyIrS5 + OyHU5v3hr07poL7JBHe4Jh8bzgQROY8h46IKCAVfbi73D3PcpfoJlX0VtEVN0JXsQlj2ZoRaaynj7N/8 + NfZLPLFmHrXnpiWSCCL8iMl32T/M6YGMq+R+covD7QADwfoIgqt4QVGtfvIZJ4lRv5CY4zypbjfjy+eE + M4l4gtuSwYSQ4DS4EZAew/wNiCYQJlvQU3cAAAAASUVORK5CYII= @@ -1054,142 +1272,6 @@ R2K5fxKLWbbp/7Dc0CBY8Q+pPmOq0VkzzQAAAABJRU5ErkJggg== - - - iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAZdEVYdFNvZnR3YXJlAEFkb2JlIEltYWdlUmVhZHlxyWU8AAADZmlUWHRYTUw6Y29tLmFkb2Jl - LnhtcAAAAAAAPD94cGFja2V0IGJlZ2luPSLvu78iIGlkPSJXNU0wTXBDZWhpSHpyZVN6TlRjemtjOWQi - Pz4gPHg6eG1wbWV0YSB4bWxuczp4PSJhZG9iZTpuczptZXRhLyIgeDp4bXB0az0iQWRvYmUgWE1QIENv - cmUgNS4zLWMwMTEgNjYuMTQ1NjYxLCAyMDEyLzAyLzA2LTE0OjU2OjI3ICAgICAgICAiPiA8cmRmOlJE - RiB4bWxuczpyZGY9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkvMDIvMjItcmRmLXN5bnRheC1ucyMiPiA8 - cmRmOkRlc2NyaXB0aW9uIHJkZjphYm91dD0iIiB4bWxuczp4bXBNTT0iaHR0cDovL25zLmFkb2JlLmNv - bS94YXAvMS4wL21tLyIgeG1sbnM6c3RSZWY9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlw - ZS9SZXNvdXJjZVJlZiMiIHhtbG5zOnhtcD0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wLyIgeG1w - TU06T3JpZ2luYWxEb2N1bWVudElEPSJ4bXAuZGlkOjJGQzkyMzc0Rjk0OUU0MTE5NjNCQjRENDMzQjlC - MUM4IiB4bXBNTTpEb2N1bWVudElEPSJ4bXAuZGlkOjlDMzFEOUI4NEFBRjExRTQ4OTA5OUYwQ0QzM0Q2 - NEI4IiB4bXBNTTpJbnN0YW5jZUlEPSJ4bXAuaWlkOjlDMzFEOUI3NEFBRjExRTQ4OTA5OUYwQ0QzM0Q2 - NEI4IiB4bXA6Q3JlYXRvclRvb2w9IkFkb2JlIFBob3Rvc2hvcCBDUzYgKFdpbmRvd3MpIj4gPHhtcE1N - OkRlcml2ZWRGcm9tIHN0UmVmOmluc3RhbmNlSUQ9InhtcC5paWQ6MDk5Mzk2NTZBRjRBRTQxMTk3NEFD - QUFFQjRCMzVENkUiIHN0UmVmOmRvY3VtZW50SUQ9InhtcC5kaWQ6MkZDOTIzNzRGOTQ5RTQxMTk2M0JC - NEQ0MzNCOUIxQzgiLz4gPC9yZGY6RGVzY3JpcHRpb24+IDwvcmRmOlJERj4gPC94OnhtcG1ldGE+IDw/ - eHBhY2tldCBlbmQ9InIiPz73sIMwAAADIElEQVRIS7WVa0iTYRTH56Uiysvm3TkvpLl5DRIvQYWVWl+6 - iNEVg0yhQqloQZHkLT+Y0YdAs75IpEUhzERZoZhsRpZlS7soblotsRwoxhqWeTrnYZtv+u7NsB74cZ5z - zv89/z17HzYRAPxXeIv/EpFXcOyi4BvKhfehv4FvKBfeh+ayqIUDlIgBgT8whpRYoT2fhgvNVJKBQT9s - hB8/QZDPpnEIjEhg0J5Pw4Vm0mwygG9T06BSqQQhTUhUMoRGpyxYT7OZwfhXC6jVakFIYzNYqN5uMGKa - BI1GIwhpghXJaJJi13d0dEB2bj74hsWzSDlXbzfQG02g0+kEIU2wIomdovzKdVifngnFFytBeb4cLN+n - WaSc6hfKKqB/eHTWoHfwExgMBkFII5MnQUD4WlAWloO26wVs35MDmifPmQFFyqlO/aKKqlmDp31DYDKZ - BCGNTJ4IPqHx8LJvACbNUw7p6e2HuJQMNIhhBuaHj3vBYrEI0tb1BoIiE9kJ9h7Oh7EJM+g/jEJuwVlY - s24ri5RTnfo5BedAIoueIYPumvomuHzjzm9cq2uCq7UNUH2rEarr7kNd0yP26Y+eKoSWtk4wfpmAg7kn - ITY5DUorq1g8cOQEqze3aplOEhRtJoMcL1mMTixV9IgD5a/tSBVDYql8AKOBQLEJtTP08gY/jjFiktKg - 5FIV21Ok3NazvmR2AvrFkCAJyGYk1comZAuHDM/AyLvHThfBveZ26NOPwI59eey7LsbhFCmnOvVJ5+Ef - rrYZLEU8EZ85+HLwW7ZCLMVTFWdkHoLut+/hgbYHaE9XN31XNsupTrWV3jKVs+uS3cyAD0cLe331jW3Q - qRt0CPUlQVHDKI+fN9iGo4W90uNnyuA2vvRtWTlQgxeg/dk7FimnOvU9/CNqUe47b7ANRwt7AfjpKvAK - Gt18Qur35ymhRfsKKLr5hN7EyzDq7humWrrcfSfKxbz/QlwcLDck1snZJdUzYHUDmk57+K1qdXJyzsL6 - RmQD9ZmObygXB8sVIRO6fXQB4hC6eRQppzr1XXmHclnAckFomLc1Um5dItEvhZ97MQXP9N0AAAAASUVO - RK5CYII= - - - - - iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAZdEVYdFNvZnR3YXJlAEFkb2JlIEltYWdlUmVhZHlxyWU8AAADZmlUWHRYTUw6Y29tLmFkb2Jl - LnhtcAAAAAAAPD94cGFja2V0IGJlZ2luPSLvu78iIGlkPSJXNU0wTXBDZWhpSHpyZVN6TlRjemtjOWQi - Pz4gPHg6eG1wbWV0YSB4bWxuczp4PSJhZG9iZTpuczptZXRhLyIgeDp4bXB0az0iQWRvYmUgWE1QIENv - cmUgNS4zLWMwMTEgNjYuMTQ1NjYxLCAyMDEyLzAyLzA2LTE0OjU2OjI3ICAgICAgICAiPiA8cmRmOlJE - RiB4bWxuczpyZGY9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkvMDIvMjItcmRmLXN5bnRheC1ucyMiPiA8 - cmRmOkRlc2NyaXB0aW9uIHJkZjphYm91dD0iIiB4bWxuczp4bXBNTT0iaHR0cDovL25zLmFkb2JlLmNv - bS94YXAvMS4wL21tLyIgeG1sbnM6c3RSZWY9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlw - ZS9SZXNvdXJjZVJlZiMiIHhtbG5zOnhtcD0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wLyIgeG1w - TU06T3JpZ2luYWxEb2N1bWVudElEPSJ4bXAuZGlkOjJGQzkyMzc0Rjk0OUU0MTE5NjNCQjRENDMzQjlC - MUM4IiB4bXBNTTpEb2N1bWVudElEPSJ4bXAuZGlkOjhDMTdBQjRENEFBRTExRTQ4QjQyODY0MDNBNTJE - NzNCIiB4bXBNTTpJbnN0YW5jZUlEPSJ4bXAuaWlkOjhDMTdBQjRDNEFBRTExRTQ4QjQyODY0MDNBNTJE - NzNCIiB4bXA6Q3JlYXRvclRvb2w9IkFkb2JlIFBob3Rvc2hvcCBDUzYgKFdpbmRvd3MpIj4gPHhtcE1N - OkRlcml2ZWRGcm9tIHN0UmVmOmluc3RhbmNlSUQ9InhtcC5paWQ6NUQyMjc4QTlBQjRBRTQxMTk3NEFD - QUFFQjRCMzVENkUiIHN0UmVmOmRvY3VtZW50SUQ9InhtcC5kaWQ6MkZDOTIzNzRGOTQ5RTQxMTk2M0JC - NEQ0MzNCOUIxQzgiLz4gPC9yZGY6RGVzY3JpcHRpb24+IDwvcmRmOlJERj4gPC94OnhtcG1ldGE+IDw/ - eHBhY2tldCBlbmQ9InIiPz4eHsDfAAAB00lEQVRIS7XVWytEURQH8HniTTNHLs0NCXNcXjTN5dH9g/gM - 3jx590QhFDJS0gyTGmpqaqJIMW4hzlAoOaWISS7LWifntI3ddnTGrl92e/57/We/DBsA/CvuYSHZSr0t - lvCGsriX/oI3lMW9lM/SwgF9SEHwizs08IX2vAyLZvZRgXJ+cQWv7yB0q96Ds86voT0vw6KZNJsK4Pnl - DWKxmBBlqhpDUN0UNp2n2VrB/WMOEomEEGX0ArN5o+BGfYB0Oi1EGa8cwpKw6bxRcH6lQiaTEaKMVw5q - rzCbNwr2z65BURQhynh8Qe0VZvNGwdZBFlRVFaKMxxfQXmE2rxc8rW3sQy6XE0puHoG7IaC9YnV9j5th - pbZPqOCDCrbH5uIwOD7/zWgkDkNTizAyuwQjkWWIxFNQWduqmVxI/MiPz6/A8HTUuDMTTYLkbrqhgt5S - T3PG4ZJ3HE7focElZx0u3yn+VQiG1ZLymmm7s74f88f42S6bl9zyJZ6d6Xckd+Mt5ieogH4xJORHHajt - SzvqZPSgECpHZSiA2DztuxBlad+NgnpBEbIjusiiYboKRF+kGFHegUR5ImkFv7G0eAPzWVq8gfksLd5/ - oULiHhYS97BwwPYJlSCUgVubViQAAAAASUVORK5CYII= - - - - - iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAZdEVYdFNvZnR3YXJlAEFkb2JlIEltYWdlUmVhZHlxyWU8AAADZmlUWHRYTUw6Y29tLmFkb2Jl - LnhtcAAAAAAAPD94cGFja2V0IGJlZ2luPSLvu78iIGlkPSJXNU0wTXBDZWhpSHpyZVN6TlRjemtjOWQi - Pz4gPHg6eG1wbWV0YSB4bWxuczp4PSJhZG9iZTpuczptZXRhLyIgeDp4bXB0az0iQWRvYmUgWE1QIENv - cmUgNS4zLWMwMTEgNjYuMTQ1NjYxLCAyMDEyLzAyLzA2LTE0OjU2OjI3ICAgICAgICAiPiA8cmRmOlJE - RiB4bWxuczpyZGY9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkvMDIvMjItcmRmLXN5bnRheC1ucyMiPiA8 - cmRmOkRlc2NyaXB0aW9uIHJkZjphYm91dD0iIiB4bWxuczp4bXBNTT0iaHR0cDovL25zLmFkb2JlLmNv - bS94YXAvMS4wL21tLyIgeG1sbnM6c3RSZWY9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlw - ZS9SZXNvdXJjZVJlZiMiIHhtbG5zOnhtcD0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wLyIgeG1w - TU06T3JpZ2luYWxEb2N1bWVudElEPSJ4bXAuZGlkOjJGQzkyMzc0Rjk0OUU0MTE5NjNCQjRENDMzQjlC - MUM4IiB4bXBNTTpEb2N1bWVudElEPSJ4bXAuZGlkOjJEMDQyOEZBNEFEMjExRTRBN0MxRDBCNzJGRUND - MDEzIiB4bXBNTTpJbnN0YW5jZUlEPSJ4bXAuaWlkOjJEMDQyOEY5NEFEMjExRTRBN0MxRDBCNzJGRUND - MDEzIiB4bXA6Q3JlYXRvclRvb2w9IkFkb2JlIFBob3Rvc2hvcCBDUzYgKFdpbmRvd3MpIj4gPHhtcE1N - OkRlcml2ZWRGcm9tIHN0UmVmOmluc3RhbmNlSUQ9InhtcC5paWQ6QkRDRkI1RDVEMTRBRTQxMTk3NEFD - QUFFQjRCMzVENkUiIHN0UmVmOmRvY3VtZW50SUQ9InhtcC5kaWQ6MkZDOTIzNzRGOTQ5RTQxMTk2M0JC - NEQ0MzNCOUIxQzgiLz4gPC9yZGY6RGVzY3JpcHRpb24+IDwvcmRmOlJERj4gPC94OnhtcG1ldGE+IDw/ - eHBhY2tldCBlbmQ9InIiPz59jfe3AAAEbUlEQVRIS8WTeUybZRzHF48/pnFOuQRajkFLgQFb5iRLNJr4 - l/EPgsniUI4xZDAY1zyxwApsMJyIME61rByl3DfoYGBrgbWUY06FcZSCha4rQ8jYxkqPr2/fvkv8o2Sg - S/wkT970eb6/T5/39z7Prv8dt/Oql4mR4HZJ3ccoXFxhVCzB9DT9JueJdSq6c1wzVZFupepVzxu34XVj - CaEDi1jX6hF8ZQoeokl4iBVwzV9YdU1XRlIl28eVo8phCdXwGltEeOUsro6psaHVwcSDh5volc4iOO8X - 7KuVwb1hEi7J8myq9PEQO//I85oafr0KtEpUpNSETm+AwWDAvfv3YTQaybnm/t/AyO6Ga+UonJOnIijF - 1hA9tWI2qle9RxcI+RIpmZpTIfBULhIyyqHVahHPKcN70TmYnFFCp9OhqXcc9KwW0DOHVl3YU1aUyjJu - F1SpfhO3EM6bMMsVt+D8Zhz2HIpC4oU6bG5uIu4cD3tfTwAjIBNypQYbGxsISquBU34PaDHiVEplGXee - SuIjVaBv3Lz7gJg8vHg4FlZvc+ATVoLipiHsD8qCXWAO7IPK8MG5FjLXKboOeoYADkldUkplGWb7vOb4 - 4BzxIXXQE/1m59WDXdgBvxPfwz6UC4eQUth/WIBDZ2qQXj+K7IYRImeE5s5fOFrcDPvPapcJzVNmmwVY - VxWG9U09uau1tTVymPpc0iYFLew7OEUJ4BwtALfvJpl5xMrKCu6s3cUrn5YbCM1us80CrJZZVWjXr7j3 - 4CE0y8v4IrcaH+cK4Bv+DRyPl8ApphYuia3wZ3eCUzOA1PIfcVuzjHnlIgK/vgy7mHzTG+w12yzA5E53 - edYPo1c2i/X1dQTEfwvbwDQ4hhXg8OcN4P48Df+UTrgkNIAeW4Hg3Hbo9Xq0iGSgs4ls5CUhoXnObLOA - S8pkhG/bdZzgDZJnffT3GXieLAA9XgB2/RjZjuQqMWhxfBw824H55XWyhcfy+HDNqoB1SH4Codn6G7iw - p3d78EaVPlXX0CaZgkqlgly1gpCiK0htHCH/IL6oFcEF3ZjT3CUvXqv0DzDSS0FPq1a/8EbYS5Rqa+if - SAJ8KoeNR7gitEsnoVQqSbGOkJmYX1ggxaY70SabwIGMUrjn8I3WIXnBRPnWu/8nDnE9Sd7cAaP/ZSES - 6/rRKJRArpiHXC7HzekZNIukiCyrhW9mGZgXa4w2kUVnibJnzdXbxP5URzyDO4QjxGl5i9uNpMZeKP5U - IrywAq9yCnGAOGGMonbYxpVnEPGdyR9BO/MTj8kfgXeNFPt5IngVtoF1kQ9WcTs8qgfgmNreQMS21xZL - 0E6Ln6ef75tg8sfgXT8O77oReAkkYNXJ4PRV/4ztyfo9VPTf4xjdf9CpQKzdxxuGe6UMbhXEmc8V6mze - r3qNivx3HGN7UmglQ6CVDMIxXwybo5UcaunJQD8te9rhyx4JrWwItlGNUut3y5+hlp4cDhFCpl14k9jq - nR+Y1NTjIe7NlmMnWKoHsOtvjWYcKpheqFQAAAAASUVORK5CYII= - - - - - iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAZdEVYdFNvZnR3YXJlAEFkb2JlIEltYWdlUmVhZHlxyWU8AAADZmlUWHRYTUw6Y29tLmFkb2Jl - LnhtcAAAAAAAPD94cGFja2V0IGJlZ2luPSLvu78iIGlkPSJXNU0wTXBDZWhpSHpyZVN6TlRjemtjOWQi - Pz4gPHg6eG1wbWV0YSB4bWxuczp4PSJhZG9iZTpuczptZXRhLyIgeDp4bXB0az0iQWRvYmUgWE1QIENv - cmUgNS4zLWMwMTEgNjYuMTQ1NjYxLCAyMDEyLzAyLzA2LTE0OjU2OjI3ICAgICAgICAiPiA8cmRmOlJE - RiB4bWxuczpyZGY9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkvMDIvMjItcmRmLXN5bnRheC1ucyMiPiA8 - cmRmOkRlc2NyaXB0aW9uIHJkZjphYm91dD0iIiB4bWxuczp4bXBNTT0iaHR0cDovL25zLmFkb2JlLmNv - bS94YXAvMS4wL21tLyIgeG1sbnM6c3RSZWY9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlw - ZS9SZXNvdXJjZVJlZiMiIHhtbG5zOnhtcD0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wLyIgeG1w - TU06T3JpZ2luYWxEb2N1bWVudElEPSJ4bXAuZGlkOjJGQzkyMzc0Rjk0OUU0MTE5NjNCQjRENDMzQjlC - MUM4IiB4bXBNTTpEb2N1bWVudElEPSJ4bXAuZGlkOjJERTg4QTFENEQyMjExRTRBODEyODk0M0RBMTc5 - Qjg3IiB4bXBNTTpJbnN0YW5jZUlEPSJ4bXAuaWlkOjJERTg4QTFDNEQyMjExRTRBODEyODk0M0RBMTc5 - Qjg3IiB4bXA6Q3JlYXRvclRvb2w9IkFkb2JlIFBob3Rvc2hvcCBDUzYgKFdpbmRvd3MpIj4gPHhtcE1N - OkRlcml2ZWRGcm9tIHN0UmVmOmluc3RhbmNlSUQ9InhtcC5paWQ6NjJGOUEyRDEyMTRERTQxMUIzNkJE - NUVDQjU5MzE1NjIiIHN0UmVmOmRvY3VtZW50SUQ9InhtcC5kaWQ6MkZDOTIzNzRGOTQ5RTQxMTk2M0JC - NEQ0MzNCOUIxQzgiLz4gPC9yZGY6RGVzY3JpcHRpb24+IDwvcmRmOlJERj4gPC94OnhtcG1ldGE+IDw/ - eHBhY2tldCBlbmQ9InIiPz6wJF34AAACl0lEQVRIS62Vy08TURSH73/QhQtXVnBhxEcMiUkhbEg0hB1R - Q1i68C8wIW5cEqMLN7ho2Ji4YiEhWq0prYUhfULbadN3obTaChobtZEUsFY9nnPS6WM6HYowyZf87j33 - nG/amaai9geOBYA+4pTxihmBE8DcTQB4J8em/9IwSQyagmrtL+z9rMFmvnhkKvtV7tcVHPz6DVsftulA - AckdhUg8zf19eoLKAd597iMLMItewfOxUDTN/bqCH3tVSG8VWIBZ9AoJApEk9+sKvu/uQ2IjzwJkGtH8 - OrTwy3Hu77vIAnV9mgWlcgWiqRwLjAMmkOMbPbNTKnN/JJntqJGEBZ++7oKcyLLgLN4JrU8Cms2C4pcy - BKKZumCI18temQ/8DzSLZlBmQX7nG/jCKdpgAa0driCtY5iFHuqHSjNoFtaags1iCdzBBG+QgNY2aZ0F - mIUe6osENAtrTUEq/7kDq9PHAszU5yYoq9f1i9cUSCD5ozxDEeTsrhAoONwyxLLb8MrhYQFmZYCHsnpd - v3hNgQROb5hnKIK29944MAThTBEWbS4WYBZ6qC/sKSy5ZJ6BGUQg8b4Bbhjod4AZXlhXWdBa10LrIVul - AM9ggS+aa6AIMMO8ZYUO0KeyIOMtZyaQpXpNi4LFucYzMINwhbMNcMNw5oIJMMNKIA0LNg88mZuH/ssj - dPgBMnN+cBRmny1wrRtSMMMzWCCFMg0UAeY2Fh0+GL5xG8Zu3oHXUrCj3g0WONdTbeBm21/o1N17gPtg - 98Xh3VoS3qzKMDI22agfglnY/Uld8NDc/ZlZwAwvl4Ngun6LGh8rdfVDViNs3rguOOzq6XOD8PDpc7g2 - OkHDH7XWtYa2It66Y4eCQ8cRfpvUNa2hTUD8A6JMaBvCyTdJAAAAAElFTkSuQmCC - - iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 @@ -1403,7 +1485,7 @@ AAAASUVORK5CYII= - + iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 YQUAAAAZdEVYdFNvZnR3YXJlAEFkb2JlIEltYWdlUmVhZHlxyWU8AAADZmlUWHRYTUw6Y29tLmFkb2Jl @@ -1415,108 +1497,26 @@ bS94YXAvMS4wL21tLyIgeG1sbnM6c3RSZWY9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlw ZS9SZXNvdXJjZVJlZiMiIHhtbG5zOnhtcD0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wLyIgeG1w TU06T3JpZ2luYWxEb2N1bWVudElEPSJ4bXAuZGlkOjJGQzkyMzc0Rjk0OUU0MTE5NjNCQjRENDMzQjlC - MUM4IiB4bXBNTTpEb2N1bWVudElEPSJ4bXAuZGlkOkUzNzJDMjE3NEFENjExRTRCNjE0OEVEQzI4MEM0 - RTZDIiB4bXBNTTpJbnN0YW5jZUlEPSJ4bXAuaWlkOkUzNzJDMjE2NEFENjExRTRCNjE0OEVEQzI4MEM0 - RTZDIiB4bXA6Q3JlYXRvclRvb2w9IkFkb2JlIFBob3Rvc2hvcCBDUzYgKFdpbmRvd3MpIj4gPHhtcE1N - OkRlcml2ZWRGcm9tIHN0UmVmOmluc3RhbmNlSUQ9InhtcC5paWQ6RkI3NUQ0QkNENDRBRTQxMTk3NEFD - QUFFQjRCMzVENkUiIHN0UmVmOmRvY3VtZW50SUQ9InhtcC5kaWQ6MkZDOTIzNzRGOTQ5RTQxMTk2M0JC - NEQ0MzNCOUIxQzgiLz4gPC9yZGY6RGVzY3JpcHRpb24+IDwvcmRmOlJERj4gPC94OnhtcG1ldGE+IDw/ - eHBhY2tldCBlbmQ9InIiPz6PyaLfAAADMElEQVRIS6VUXUiTYRT+vi3Tzd+ps23+3KRigtiPkolEQReG - UYTkhWatpWlWGkRdddfdSPImqUAJjSIT00oxLJIk0cR+tFSyzDJtgaMkDEPkdM7ZPvm2vS6jBx6es3Pe - 8zzvtm+TohLS/ov+AACStLgEQuJyLRJWYK1yzh/+FgCoQrpnfM4fOGBhcUlIMkEVkma4H4i1y2kFcMD8 - wqKQZILKZqTqmlTAWrfvMjhgbv63Dwm0hLWQohn1eNEbzrlfPiTQAtZCKjP1GXdAIC+r4XD+9CGBFrDm - RVJ1re6pZ0GyHHMvIawauYVNCFPfvvuQQAtYC6meKXU0amNsaGN/ZR60xIf9aIgN3cpGE9OzZCZ85nEm - pGiWlLABmuJCnUOXrNB7chdct4TUo32ANDbp4NuielDpqWfePdaPX6GrohSK4uLhlCEo96YlZLbOFHzH - oJXjMSBcGn4/zQGovEDqXXtzeTb+BTrKj0J3+Q54djYP7EZdTU2MPjFSK8eieQR9QtLg6GcOQPWgqKeQ - ZyOfoK30CDw+lg2Ot3Z4VLoNqo269mCNHIa2WjYn9A1PcAAqU6m9VV3TF9psOwwPS3JgZugCdNoyocwU - jU+RlImWBpezGz0vxzkA1YOiHvPFO7Ca1kGHLQtmXp2HdutmqN+/F6JiU+h3kOpyVeHJwBgHoLIpqajm - 189HoaG4CNqsGTA1UAWth9Lg6r490PygGyLjUikgzuWqQlffCAegelDdUwLqigqhpXgjTPYeh+bCFCg2 - RkEk3vxuVz/P0c43oLP3DQegLhspNalSFxiNcLswHT48LYNbBUlQk7ebzenmyhm08w1o7xmiAP6hRZiT - 70eYkzpctUuJWdHmwWs74+F1Uz7cyE+E4ohQB5mHm9a3GywpTXzektyKduIAIsKI3ISkL4rIdYle05C9 - VrZVBmvtl7eboUyv7V4jSQdwRn8FdI72iErtCUxnIuifkJ5hUqUOq9Jr7OeCNU6bTpNVqtMcDJSldOwn - KnOk+jypJ5QANRWc0cs5SEelXr54QidfwVYAMoiHq4W/gNM6OaNCJ+diaUIqN/43+Atwg27t+9ZXBUn6 - A2MdqQeVc5pWAAAAAElFTkSuQmCC - - - - - iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAIAAABvFaqvAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAZdEVYdFNvZnR3YXJlAEFkb2JlIEltYWdlUmVhZHlxyWU8AAADZmlUWHRYTUw6Y29tLmFkb2Jl - LnhtcAAAAAAAPD94cGFja2V0IGJlZ2luPSLvu78iIGlkPSJXNU0wTXBDZWhpSHpyZVN6TlRjemtjOWQi - Pz4gPHg6eG1wbWV0YSB4bWxuczp4PSJhZG9iZTpuczptZXRhLyIgeDp4bXB0az0iQWRvYmUgWE1QIENv - cmUgNS4zLWMwMTEgNjYuMTQ1NjYxLCAyMDEyLzAyLzA2LTE0OjU2OjI3ICAgICAgICAiPiA8cmRmOlJE - RiB4bWxuczpyZGY9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkvMDIvMjItcmRmLXN5bnRheC1ucyMiPiA8 - cmRmOkRlc2NyaXB0aW9uIHJkZjphYm91dD0iIiB4bWxuczp4bXBNTT0iaHR0cDovL25zLmFkb2JlLmNv - bS94YXAvMS4wL21tLyIgeG1sbnM6c3RSZWY9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlw - ZS9SZXNvdXJjZVJlZiMiIHhtbG5zOnhtcD0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wLyIgeG1w - TU06T3JpZ2luYWxEb2N1bWVudElEPSJ4bXAuZGlkOjJGQzkyMzc0Rjk0OUU0MTE5NjNCQjRENDMzQjlC - MUM4IiB4bXBNTTpEb2N1bWVudElEPSJ4bXAuZGlkOjUzQzNGNDI5NEQyQzExRTQ4QkE1QUNCMEVDRDZF - MDVEIiB4bXBNTTpJbnN0YW5jZUlEPSJ4bXAuaWlkOjUzQzNGNDI4NEQyQzExRTQ4QkE1QUNCMEVDRDZF - MDVEIiB4bXA6Q3JlYXRvclRvb2w9IkFkb2JlIFBob3Rvc2hvcCBDUzYgKFdpbmRvd3MpIj4gPHhtcE1N - OkRlcml2ZWRGcm9tIHN0UmVmOmluc3RhbmNlSUQ9InhtcC5paWQ6RkI1NUY4OTYyQTRERTQxMUIzNkJE + MUM4IiB4bXBNTTpEb2N1bWVudElEPSJ4bXAuZGlkOjJERjY3MEZENEQyMzExRTRCNDlGQUMwMzk0OTAw + Qzc4IiB4bXBNTTpJbnN0YW5jZUlEPSJ4bXAuaWlkOjJERjY3MEZDNEQyMzExRTRCNDlGQUMwMzk0OTAw + Qzc4IiB4bXA6Q3JlYXRvclRvb2w9IkFkb2JlIFBob3Rvc2hvcCBDUzYgKFdpbmRvd3MpIj4gPHhtcE1N + OkRlcml2ZWRGcm9tIHN0UmVmOmluc3RhbmNlSUQ9InhtcC5paWQ6NjhGOUEyRDEyMTRERTQxMUIzNkJE NUVDQjU5MzE1NjIiIHN0UmVmOmRvY3VtZW50SUQ9InhtcC5kaWQ6MkZDOTIzNzRGOTQ5RTQxMTk2M0JC NEQ0MzNCOUIxQzgiLz4gPC9yZGY6RGVzY3JpcHRpb24+IDwvcmRmOlJERj4gPC94OnhtcG1ldGE+IDw/ - eHBhY2tldCBlbmQ9InIiPz6IsaOmAAADF0lEQVQ4T62U/UuTURTH+0nICqRI1ERMMyNQe8N0ChqBwQhN - yvwhEgJjVCqJ/qCibZo6tzQ339h6Nre5prapUzc1XzItX1ilzuWMLLVAen+xf6DTuTxjdxsFVj58ebjc - c+7nnud7z3228DbpIaDFH/CfoqCn72DIDvNfPDM2KAqyr8PcJxqY+QBTb8kkjocXQTsKigGwfqYJHqIg - 1OxHGHvlWPx4hXB1YyA3g4CBhqst+piEnrDA3rA95vBAY1x8d7lq/DVZwm5PQZNvoKYdypSgHgbVEIh1 - cLOZzOCbSSsyRQRba6uWtcpVLbPcwlglInNUCJNWWKqABqMLCGvGlfpJELaQ/V1Vd1lujAhe0chtUrH5 - ZExnmJ85MdomEa+qZMbIEF2BHGunILSjdZwYgTt4gJqjjj0Rltml1Zq9AeL0Mn71Wn2mtDU80MIvsFTw - O+KPIoWC8BNYRIUaqrRQroJKjQOk9N+xLBF2pXJFKfnsDGYa8gS6xOO2whyMuoHaHpGzZ/pBM0IMrtXD - nT4HqNHXe0lYoogMFeQP4jbSDkCPTUyXmnNoPutSo+9WN5DEQDyeWCWnhqm4p7Oimt3b54rzmmKPVHKz - 0Xg0AU1pz87VJp+yXOfd9t3mBmLXsGrsJhSsDtF4iOWxKdpzyQNnuRW7vEUp13obFG05OVUBPtO5V1Sn - k5q4SX8ENfWA6C7xHsP981Bb2sf38ZKd4JhSuXUJHPHhg/WJnAeZFw0Xzt/w8erRtLmBnB/CSmaC599I - 2PYVRl+CXigu3R9SfCC0Pf1MZ1oqvqvjogX7gtRFJfb1n24g7GblfQcFP2fkBYm5anxqQcbLKgzyK/Df - WRTkV5+RMTg84ZrgAOHo4ZIDVNdJw67CpsVLZ5gifj97Typlq2ZFQXj8LKh5EHpnaIar8N+Al5l9Y9Vs - T7OiIAzjqaMsa6QJnBkeWvgOHdPkAuIV67PSeQpCYYZplsZ+KyyWLRyFF8D553EDbURY770J0rrYJbda - SYE4iWb9NcgpRKDrOMAWwYP6d5BTaC52zyaAWDlAm/DweL8AX9zXukfxHsIAAAAASUVORK5CYII= - - - - - iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAZdEVYdFNvZnR3YXJlAEFkb2JlIEltYWdlUmVhZHlxyWU8AAADZmlUWHRYTUw6Y29tLmFkb2Jl - LnhtcAAAAAAAPD94cGFja2V0IGJlZ2luPSLvu78iIGlkPSJXNU0wTXBDZWhpSHpyZVN6TlRjemtjOWQi - Pz4gPHg6eG1wbWV0YSB4bWxuczp4PSJhZG9iZTpuczptZXRhLyIgeDp4bXB0az0iQWRvYmUgWE1QIENv - cmUgNS4zLWMwMTEgNjYuMTQ1NjYxLCAyMDEyLzAyLzA2LTE0OjU2OjI3ICAgICAgICAiPiA8cmRmOlJE - RiB4bWxuczpyZGY9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkvMDIvMjItcmRmLXN5bnRheC1ucyMiPiA8 - cmRmOkRlc2NyaXB0aW9uIHJkZjphYm91dD0iIiB4bWxuczp4bXBNTT0iaHR0cDovL25zLmFkb2JlLmNv - bS94YXAvMS4wL21tLyIgeG1sbnM6c3RSZWY9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlw - ZS9SZXNvdXJjZVJlZiMiIHhtbG5zOnhtcD0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wLyIgeG1w - TU06T3JpZ2luYWxEb2N1bWVudElEPSJ4bXAuZGlkOjJGQzkyMzc0Rjk0OUU0MTE5NjNCQjRENDMzQjlC - MUM4IiB4bXBNTTpEb2N1bWVudElEPSJ4bXAuZGlkOkVENUYwQThBNEQyOTExRTQ5QzUzQzdFMkFGQkQy - NTA1IiB4bXBNTTpJbnN0YW5jZUlEPSJ4bXAuaWlkOkVENUYwQTg5NEQyOTExRTQ5QzUzQzdFMkFGQkQy - NTA1IiB4bXA6Q3JlYXRvclRvb2w9IkFkb2JlIFBob3Rvc2hvcCBDUzYgKFdpbmRvd3MpIj4gPHhtcE1N - OkRlcml2ZWRGcm9tIHN0UmVmOmluc3RhbmNlSUQ9InhtcC5paWQ6MkRGNkEzOUYyOTRERTQxMUIzNkJE - NUVDQjU5MzE1NjIiIHN0UmVmOmRvY3VtZW50SUQ9InhtcC5kaWQ6MkZDOTIzNzRGOTQ5RTQxMTk2M0JC - NEQ0MzNCOUIxQzgiLz4gPC9yZGY6RGVzY3JpcHRpb24+IDwvcmRmOlJERj4gPC94OnhtcG1ldGE+IDw/ - eHBhY2tldCBlbmQ9InIiPz6npMy1AAAGEUlEQVRIS7WVeVDUZRjHf7Ase8ECu+wl4LIXcqyyHC783AWW - 5QaRFTHkMi9SQvE+UhLzwk0BUcQSgQBBgcYDzStMSzOPcpqcmo5pmqk/+rOapqb+iG/PbzfFcSz/6pn5 - zPN739/7fp/nvZn/3TSLjj+XJy2/RaItPCT5vaBd8m1+q2Qku1lcrcvki+iXr7fFU6ZZeOx5KDU1b7jU - 1Z2bVPMPWNMbRXrXkWAc+ywVLbcS8fKwFjlu8VdpW0XzSc6f8PEIPzJ19dFnU3WEJdHL9P3X9O1nkdB8 - CQrX7i3mKn9zfqsUq29ZsPfjRBx5aMO2cTMy94gm7FuF7XyJTwDJTo5GVdHxNALVgsPd5Ceye+9g8b0f - UXbjB8RtH4Msd+MeXS7f6twjxbILZiy7pEHDtTBsvG7BqivTUXpsClLWCbtJNpDwBlGVH3ySIFV520eW - nedRcf0HVJGwbeRrOHs/h2n1CGRZDe7wND/W1hiI8sEYlJ4KRcVpJcrfVqByNBILhqLh3KeA+UXBOpL2 - jkRZduARPGXZ/vH4pnMou/gd7INfIPn4QyQc/RSOzk9hrBtEiKPerUn1Y5PXBaDojWlwdgUjr0+G/H4Z - cnpCUNJrQNZ+LeLrBD/LYnixFEDAKFz7vJQ0r49dO4zikS8x8/ADxLd9jIT2B5ix/z7SX78Pw+K3EJy2 - wq1M4rEz6sRwthgw82Ag2KNS2I5JPZ4rZx00ImGNHIZSfisFkDGhxbs5AkKLd/3kaLkDlgTjXrsNc/Md - mPfeQeyOD2HbcRu6yi4E2Wrd8ngeG71IBPtePWa4JUhsD0DykQAkHQqApUWCFLcGyZvDoZ/P/5oCTGXk - hU2MvGB7rbGmG47dd2Fa+x6iX/kAMa/eQvS2m4jaeAPspvcROb8TQexid3CcL2usFCJjnwE5nQYU9RhR - PGDC7D4TCrqMyDqkR9oePbRz/SZEKh8rI8vdyshyXhmzLD8DS/1VGOquwtgw7glkXH0Nhvp3kbL2GrSl - hyC11ril03xZfbkQKZuVsDeq4NihRtYuDbJ2auBoUsO2TQXrJiWMlWIExflWMiHOjRzfJy0bg776HCKX - vANd7WXol1/xeN3Si7A2XIXW1YbAxAq3UO0zPTSd1yG38bplLK//vxBrffKY4PQ1HH9aKk8jonQUUyvO - Qlt9HtqaCx4/tXIMyXWXMXXOAQTEv+D2zCvDhBBTCN1zCGOCZq3k+DXO1YcpRYOY4hpF2LzTCCs74/VE - 3IvnEVd1EhGFblBbWot6BKXWQZq64tlYa2+TuJwQM9KU5cRL35hyOxCe2w913hA0hcPQFI16KRzxEFtO - a1Q9htSVN5C+5S5x7x/uIm3DR7CvuomUReOImt1FU7nwEolHECImMGkJE5i46EJkejNM+X1QOPqhzBqC - KvskVDmnJuHKT/K4bgjKzBMItXcjJv84NOwWiKPndJK40TOCgPgaRmIur1dZ1yM6txvyWT0ITR+AImOQ - gg39N1ybDBJP60PorC5My3oTwQm18FdNryBxbq0EJL6AEUTYZBTkF0NGKyKdvZDb3qJOAxSIOqcP/jtp - JyC3D1BSvYgp6EN4aiNlP/cTEk4gFASPEUeXkWd8RaY5jcrEBkTn9UCT4Q3gzfBfRvJE9rrsfpicHSRe - NsFXmJeSXhTBXXY+jMjk8uArVkpExuKb6pkbYJ7L7Ria37xTUBeMeCkcncRTN0z/TyLKNYy4khNQJq2G - IMLBXdUWQkXwCYYR6md7IPP1k8WEC3UFDzSpG2BZeAZJtXQWFpyls3HOC50JzkdQnbFqDInLLiC2rBcq - 6xoSzzzP+NDVwDBaQkx4XzahNv8xZH48sVotCHeOUnnCWNJG18Q4UjddB7vlfbBbPwC7+YannLTyIrS5 - OyHU5v3hr07poL7JBHe4Jh8bzgQROY8h46IKCAVfbi73D3PcpfoJlX0VtEVN0JXsQlj2ZoRaaynj7N/8 - NfZLPLFmHrXnpiWSCCL8iMl32T/M6YGMq+R+covD7QADwfoIgqt4QVGtfvIZJ4lRv5CY4zypbjfjy+eE - M4l4gtuSwYSQ4DS4EZAew/wNiCYQJlvQU3cAAAAASUVORK5CYII= + eHBhY2tldCBlbmQ9InIiPz6GKmpFAAAC+UlEQVRIS63T20vTYRzH8Yforj/Ei24UiSgKIygKi8oyxZQo + cvNYeXaesmzqPGu2POd0ulSsnIdaurTSTJ3O6UxTPGya5vCQx5AuPn39RbHop7nZxQt+z3ie93e/Z4w1 + p7nsCoBt8R6yBF/UHPv+Wb0rfFFzm99CRIwEW1gnqXzxTXxRc0ydctm4OlID2sxrw6iCtiwItC+A2P/D + frLnjwGNSZdMq6N1WOvLwFpP4l/WdRlY6Jaio9Ab7QXba8sVoDHZGdT8PYS9THDqMGnLsKpNw0qXGCua + BO55VZdNQ6U/DRRibVCGb+N1pH5bukoRqHmDHOIG1N8/X2F4I8WyNhtf2+9hqSsZxqZ4upbb6HsSZLHO + Im90ym6hNVcIaktYTexZyUelGEvaHMy/jcFiZxo0xX5Y7ivGcn8JkVmA9uvlWBmqwpJeAWovs+poR99O + eRgWtQWYVUdgrj0FH+i+F3XF3NoappZYGJrEoLaOVYpOOTY/FGJB+xjTqnDMtMTTAC/Ma/Ix/TLUKl9e + x0JfFQpql7PykBP7lWIXzPeUYLIhHCPKCLr/AMy2ZsKoDLTKdNNdvM8TgNpRTBZwfJ885CTmaIChPhwa + mS+GnkdhqjEWY9X+VplqvIMXEhdQ24mZeuSs0N/BNNWWj4k6EdSZHhhXxWH0aSCGFd4c4Tk7zk7XBlUM + FKLToK4Nm+0qYnneRzqGGiSYaIiiyZdhVCdgqFSIwRJPjucZW85O1pvnRmvDkO9zFNTdy2Y6HjGp4HCF + 5kk4xhoiURd/EROv4tBfeM0qAyUC9Mp9QM0+7o829T6LZV0/mNycS6+nFKFWfAGj9ZHozfGwil7miZYH + 7qCmghsw+S6VpV894KuUuKFbfhNNqa749CwY3dm0toK+VABl3HlQM5obYHybwFLc7W1y/Y5BlX6FfgNn + DNcEY0DhZZX+MiGKbh0DNR24AYYWMSfJzc6GZBApwS5skIzNODcg0dV2V36FtsJ7yBJ8UXO8hyzBFzXH + ++H/A/YDv9/V87iOlrYAAAAASUVORK5CYII= @@ -3164,9 +3164,6 @@ 864, 17 - - 864, 17 - iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 diff --git a/Program.cs b/Program.cs index e38f7b8..a76d0d4 100644 --- a/Program.cs +++ b/Program.cs @@ -16,14 +16,14 @@ [STAThread] static void Main() { - ValidateInfo validateInfo = ValidateConfig.LoadConfig(); + ValidateConfig.LoadConfig(); string localConfigPath = Application.StartupPath + "/Config.xml"; //获取程序及版本信息 string currentVersionCode = Assembly.GetExecutingAssembly().GetName().Version.ToString(); //获取文件版本信息 FileVersionInfo.GetVersionInfo(Application.ExecutablePath); - + Utility.SysInfoConfig(); string configUrl = getProgramUrl(localConfigPath, "configurl"); if (configUrl != "") { diff --git a/TreeUtils.cs b/TreeUtils.cs index 1f055b5..ad39643 100644 --- a/TreeUtils.cs +++ b/TreeUtils.cs @@ -19,7 +19,7 @@ public static void InitLayerTree(GSOGlobeControl gsoGlobeControl, TreeView treeView, string viewDatasrc) { // treeView.Nodes.Clear(); - LayerConfig layerConfig = Utility.layerConfig;//layertree所在的配置文件 + LayerConfig layerConfig = Utility.LayerConfig;//layertree所在的配置文件 List datasrcs = layerConfig.datasrcs; foreach (DataSrc datasrc in datasrcs) { diff --git a/Utility.cs b/Utility.cs index c03e405..ab947a3 100644 --- a/Utility.cs +++ b/Utility.cs @@ -20,7 +20,7 @@ public static string dbdatabase; public static string userID; - public static Hashtable Pipe_QueryFields; +// public static Hashtable Pipe_QueryFields; public static string DBPassword; public static string DBServer; public static string DBBackUp; @@ -38,7 +38,7 @@ public static List listPipelineType; public static string PicRootURL; public static string PicDefaultURL; - public static double dFlyAboveLine = 2; +// public static double dFlyAboveLine = 2; public static string userName; public static string projectStr; public static string userRole; @@ -85,12 +85,17 @@ public static List pipefittingLayerNames = new List();//管件图层名称 public static List sgPipeLayersNames = new List();//施工管线图层名称 -// public static Dictionary dictionaryNetLayerNameAndCaption = new Dictionary(); - public static HashSet layerNameSet = new HashSet(); + public static HashSet layerNameSet = new HashSet();//记录有哪些图层要显示 public static string roadLayerName = ""; #endregion wxl - public static LayerConfig layerConfig; + public static LayerConfig LayerConfig; + + public static string RoleServer; + public static string TitleImagePath; + public static string SysnameVersion; + public static string Copyright; + public static void SetBallons(GSOBalloon featureTooltip, GSOBalloonEx balloonEx) { featureTooltip.CacheFilePath = Application.StartupPath + "/GeoScene/Globe/Temp"; @@ -188,25 +193,6 @@ } return s.ToString(); } - public static GSOFeatures Table2Features(DataTable table, string currentQueryLayer, GSOGlobeControl globeControl1) - { - GSOFeatures features = new GSOFeatures(); - for (int i = 0; i < table.Rows.Count; i++) - { - DataRow row = table.Rows[i]; - - string featureName = row["编号"].ToString(); - featureName = featureName.Trim(); - GSOLayer layer = globeControl1.Globe.Layers.GetLayerByCaption(currentQueryLayer); - GSOFeatures tempfeatures = layer.GetFeatureByName(featureName, false); - if (tempfeatures.Length > 0) - { - features.Add(tempfeatures[0]); - } - } - return features; - } - //程序启动的时候读取配置文件 public static void SetParams() @@ -358,8 +344,8 @@ #region wxl 从layerconfig.xml中读取 - layerConfig = XmlTools.DeserializeFromXml(layerConfigFile); - List dataSrcs = layerConfig.datasrcs; + LayerConfig = XmlTools.DeserializeFromXml(layerConfigFile); + List dataSrcs = LayerConfig.datasrcs; foreach (var dataSrc in dataSrcs) { @@ -598,76 +584,49 @@ #endregion } - /* - //判断网络是否连接 - public static bool isNetworkConnectionSuccess(string ipAdress) + /// + /// 获取Config.xml配置文件中的roleurl配置，并返回 + /// + /// 请求综合信息平台的服务地址 + public static void SysInfoConfig() { - //return true; - if (ipAdress == null) - { - return false; - } - if (ipAdress.Contains("\\")) - { - ipAdress = ipAdress.Substring(0, ipAdress.LastIndexOf('\\')); - } - if (ipAdress.Trim() == "localhost" || ipAdress.Trim() == "127.0.0.1" || ipAdress.Trim() == Dns.GetHostName()) - { - return true; - } - Ping ping = new Ping(); + if (!File.Exists(filename)) return; + + XmlTextReader xmlReader = new XmlTextReader(filename); try { - PingReply pr = ping.Send(ipAdress.Trim(), 3000); - if (pr.Status == IPStatus.Success) + while (xmlReader.Read()) { - return true; + if (xmlReader.Name.Equals("roleurl")) + { + RoleServer = xmlReader.ReadElementString(); + } + else if (xmlReader.Name.Equals("titleimgpath")) + { + TitleImagePath = xmlReader.ReadElementString(); + } + else if (xmlReader.Name.Equals("sysname")) + { + SysnameVersion = xmlReader.ReadElementString(); + } + else if (xmlReader.Name.Equals("copyright")) + { + Copyright = xmlReader.ReadElementString(); + } } - else - { - return false; - } + } catch (Exception ex) { - LogError.PublishError(ex); - return false; + + LogHelper.Error("在config.xml配置文件中读取roleurl时出错"); } - } - */ - - - //TODO LIST:下面两个方法移到featueTools.cs中 - //根据附属物图层名字得到里面含有的附属物 - public static string[] getAccStrsByLayer(string layername) - { - string[] accStrs = null; - string sql = "select 附属物名称 from " + layername + " group by 附属物名称"; - DataSet dataset = OledbHelper.getDataSet(sql, layername); - if (dataset == null) return null; - accStrs = new string[dataset.Tables[0].Rows.Count]; - for (int i = 0; i < dataset.Tables[0].Rows.Count; i++) + finally { - accStrs[i] = dataset.Tables[0].Rows[i][0].ToString(); + xmlReader.Close(); } - return accStrs; } - //删除内存图层中指定名称的feature - public static void RemoveFeatureFromName(GSOGlobeControl globeControl1, string featureName) - { - GSOFeatures features = globeControl1.Globe.MemoryLayer.GetFeatureByName(featureName, true); - if (features != null) - { - for (int i = features.Length - 1; i >= 0; i--) - { - GSOFeature feature = features[i]; - if (feature != null) - { - globeControl1.Globe.MemoryLayer.RemoveFeatureByID(feature.ID); - } - } - } - globeControl1.Refresh(); - } + + } } diff --git a/ValidateInfo.cs b/ValidateInfo.cs index de75391..01546da 100644 --- a/ValidateInfo.cs +++ b/ValidateInfo.cs @@ -192,7 +192,7 @@ } if (!isSuccess) { - LogHelper.WriteLog(typeof(FieldUniqueValidate), logStr); + LogHelper.Error(logStr); } return isSuccess; } @@ -247,7 +247,7 @@ err += "未找到字段或其类型匹配:" + unFoundField.label + ":" + unFoundField.type + "\r\n"; } - LogHelper.WriteLog(typeof(FieldCountValidate), err); + LogHelper.Error(err); return false; } return true; @@ -316,7 +316,7 @@ { err += "字段:" + field.label + "出错\r\n"; } - LogHelper.WriteLog(typeof(FieldOrderValidate), err); + LogHelper.Error(err); return false; } return true; @@ -388,8 +388,7 @@ } if (isSuccess == false) { - LogHelper.WriteLog(typeof(FieldEmptyValidate), - "字段为空检查失败:\r\n" + err); + LogHelper.Error("字段为空检查失败:\r\n" + err); } return isSuccess; } diff --git a/bin/x86/Debug/Config.xml b/bin/x86/Debug/Config.xml index 6995f64..6a453a3 100644 --- a/bin/x86/Debug/Config.xml +++ b/bin/x86/Debug/Config.xml @@ -25,6 +25,11 @@ http://127.0.0.1/Cyberpipe.msi http://127.0.0.1/Config.xml + http://192.168.0.102:8080/ctrl + /Resource/title.jpg + 智慧太湖新城管网规划分析系统6.0 + @2014-2015 苏州航天系统工程有限公司 版权所有 + 编号,管线编码,管径_毫米,材质,埋设方式,起始地面高程,起始埋深,终止地面高程,终止埋深,建设年代,使用年限,权属单位,设计单位,设计负责人,施工单位,施工负责人,监理单位,监理负责人,业务负责人,备注 编号,管线编码,管径_毫米,材质,埋设方式,起始地面高程,起始埋深,终止地面高程,终止埋深,建设年代,使用年限,权属单位,设计单位,设计负责人,施工单位,施工负责人,监理单位,监理负责人,业务负责人,备注 diff --git a/bin/x86/Debug/config/log4net.config b/bin/x86/Debug/config/log4net.config index 80f9b25..6fbcfa7 100644 --- a/bin/x86/Debug/config/log4net.config +++ b/bin/x86/Debug/config/log4net.config @@ -3,29 +3,118 @@
- - - - - - - - - - - - - - - + + + -property: [%property{NDC}] - %n错误描述：%message%newline %n"/> - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/bin/x86/Debug/glVersion.txt b/bin/x86/Debug/glVersion.txt index cd82eca..755455e 100644 --- a/bin/x86/Debug/glVersion.txt +++ b/bin/x86/Debug/glVersion.txt Binary files differ diff --git a/bin/x86/Debug/log.txt b/bin/x86/Debug/log.txt index a4966d3..2112642 100644 --- a/bin/x86/Debug/log.txt +++ b/bin/x86/Debug/log.txt @@ -430,3 +430,43 @@ exception over ------------------------------------------------------------ + + exception begin -----------------2016/11/29 18:54:54--------------------- + + + + e.Message:第 29 行，位置 4 上的开始标记“titleimagpath”与结束标记“titleimagepath”不匹配。 第 29 行，位置 39。 + + e.Source:System.Xml + + e.TargetSite:Void Throw(System.String, System.String[]) + + e.StackTrace: 在 System.Xml.XmlTextReaderImpl.Throw(String res, String[] args) + 在 System.Xml.XmlTextReaderImpl.ThrowTagMismatch(NodeData startTag) + 在 System.Xml.XmlTextReaderImpl.ParseEndElement() + 在 System.Xml.XmlTextReaderImpl.ParseElementContent() + 在 Cyberpipe.Utility.SetParams() 位置 E:\wxl\work\GHFX_REFACTOR\Utility.cs:行号 208 + + + + exception over ------------------------------------------------------------ + + exception begin -----------------2016/11/29 18:57:17--------------------- + + + + e.Message:第 29 行，位置 4 上的开始标记“titleimagpath”与结束标记“titleimagepath”不匹配。 第 29 行，位置 39。 + + e.Source:System.Xml + + e.TargetSite:Void Throw(System.String, System.String[]) + + e.StackTrace: 在 System.Xml.XmlTextReaderImpl.Throw(String res, String[] args) + 在 System.Xml.XmlTextReaderImpl.ThrowTagMismatch(NodeData startTag) + 在 System.Xml.XmlTextReaderImpl.ParseEndElement() + 在 System.Xml.XmlTextReaderImpl.ParseElementContent() + 在 Cyberpipe.Utility.SetParams() 位置 E:\wxl\work\GHFX_REFACTOR\Utility.cs:行号 208 + + + + exception over ------------------------------------------------------------ diff --git a/bin/x86/Debug/log/2016/201611/20161107.txt b/bin/x86/Debug/log/2016/201611/20161107.txt deleted file mode 100644 index cd32fa6..0000000 --- a/bin/x86/Debug/log/2016/201611/20161107.txt +++ /dev/null @@ -1,152 +0,0 @@ - - -��¼ʱ�䣺2016-11-07 10:30:22,327 -�߳�ID:[9] -��־���� ERROR -�����ࣺCyberpipe.FrmBSQStatis property: [(null)] - -����������1 - - - -��¼ʱ�䣺2016-11-07 10:30:40,660 -�߳�ID:[9] -��־���� ERROR -�����ࣺCyberpipe.FrmBSQStatis property: [(null)] - -����������0 - - - -��¼ʱ�䣺2016-11-07 14:00:27,070 -�߳�ID:[8] -��־���� ERROR -�����ࣺCyberpipe.Forms.FrmPipelineModelDB property: [(null)] - -����������δ�������������õ������ʵ���� - - - -��¼ʱ�䣺2016-11-07 14:00:36,154 -�߳�ID:[8] -��־���� ERROR -�����ࣺCyberpipe.Forms.FrmPipelineModelDB property: [(null)] - -����������δ�������������õ������ʵ���� - - - -��¼ʱ�䣺2016-11-07 14:00:40,186 -�߳�ID:[8] -��־���� ERROR -�����ࣺCyberpipe.Forms.FrmPipelineModelDB property: [(null)] - -����������δ�������������õ������ʵ���� - - - -��¼ʱ�䣺2016-11-07 14:05:46,422 -�߳�ID:[9] -��־���� ERROR -�����ࣺCyberpipe.Forms.FrmPipelineModelDB property: [(null)] - -����������δ�������������õ������ʵ���� - - - -��¼ʱ�䣺2016-11-07 14:06:34,633 -�߳�ID:[10] -��־���� ERROR -�����ࣺCyberpipe.Forms.FrmPipelineModelDB property: [(null)] - -����������δ�������������õ������ʵ���� - - - -��¼ʱ�䣺2016-11-07 14:06:36,301 -�߳�ID:[10] -��־���� ERROR -�����ࣺCyberpipe.Forms.FrmPipelineModelDB property: [(null)] - -����������δ�������������õ������ʵ���� - - - -��¼ʱ�䣺2016-11-07 14:06:44,800 -�߳�ID:[10] -��־���� ERROR -�����ࣺCyberpipe.Forms.FrmPipelineModelDB property: [(null)] - -����������δ�������������õ������ʵ���� - - - -��¼ʱ�䣺2016-11-07 14:07:03,449 -�߳�ID:[10] -��־���� ERROR -�����ࣺCyberpipe.Forms.FrmPipelineModelDB property: [(null)] - -����������δ�������������õ������ʵ���� - - - -��¼ʱ�䣺2016-11-07 14:07:05,165 -�߳�ID:[10] -��־���� ERROR -�����ࣺCyberpipe.Forms.FrmPipelineModelDB property: [(null)] - -����������δ�������������õ������ʵ���� - - - -��¼ʱ�䣺2016-11-07 17:58:24,384 -�߳�ID:[10] -��־���� ERROR -�����ࣺCyberpipe.Forms.FrmPipelineModelDB property: [(null)] - -����������δ�������������õ������ʵ���� - - - -��¼ʱ�䣺2016-11-07 18:11:22,114 -�߳�ID:[8] -��־���� ERROR -�����ࣺCyberpipe.Forms.FrmPipelineModelDB property: [(null)] - -����������δ�������������õ������ʵ���� - - - -��¼ʱ�䣺2016-11-07 18:12:13,619 -�߳�ID:[8] -��־���� ERROR -�����ࣺCyberpipe.Forms.FrmPipelineModelDB property: [(null)] - -����������δ�������������õ������ʵ���� - - - -��¼ʱ�䣺2016-11-07 18:12:33,268 -�߳�ID:[8] -��־���� ERROR -�����ࣺCyberpipe.Forms.FrmPipelineModelDB property: [(null)] - -����������δ�������������õ������ʵ���� - - - -��¼ʱ�䣺2016-11-07 18:12:43,628 -�߳�ID:[8] -��־���� ERROR -�����ࣺCyberpipe.Forms.FrmPipelineModelDB property: [(null)] - -����������δ�������������õ������ʵ���� - - - -��¼ʱ�䣺2016-11-07 18:12:53,488 -�߳�ID:[8] -��־���� ERROR -�����ࣺCyberpipe.Forms.FrmPipelineModelDB property: [(null)] - -����������δ�������������õ������ʵ���� - - - -��¼ʱ�䣺2016-11-07 18:13:31,996 -�߳�ID:[8] -��־���� ERROR -�����ࣺCyberpipe.Forms.FrmPipelineModelDB property: [(null)] - -����������δ�������������õ������ʵ���� - - - -��¼ʱ�䣺2016-11-07 18:16:05,234 -�߳�ID:[9] -��־���� ERROR -�����ࣺCyberpipe.Forms.FrmPipelineModelDB property: [(null)] - -����������δ�������������õ������ʵ���� - diff --git a/bin/x86/Debug/log/2016/201611/20161108.txt b/bin/x86/Debug/log/2016/201611/20161108.txt deleted file mode 100644 index b5c96c9..0000000 --- a/bin/x86/Debug/log/2016/201611/20161108.txt +++ /dev/null @@ -1,40 +0,0 @@ - - -��¼ʱ�䣺2016-11-08 09:53:20,836 -�߳�ID:[10] -��־���� ERROR -�����ࣺCyberpipe.Forms.FrmPipelineModelDB property: [(null)] - -����������δ�������������õ������ʵ���� - - - -��¼ʱ�䣺2016-11-08 09:53:49,986 -�߳�ID:[10] -��־���� ERROR -�����ࣺCyberpipe.Forms.FrmPipelineModelDB property: [(null)] - -����������δ�������������õ������ʵ���� - - - -��¼ʱ�䣺2016-11-08 09:54:25,364 -�߳�ID:[10] -��־���� ERROR -�����ࣺCyberpipe.Forms.FrmPipelineModelDB property: [(null)] - -����������δ�������������õ������ʵ���� - - - -��¼ʱ�䣺2016-11-08 10:33:09,418 -�߳�ID:[11] -��־���� ERROR -�����ࣺCyberpipe.Forms.FrmPipelineModelDB property: [(null)] - -����������δ�������������õ������ʵ���� - - - -��¼ʱ�䣺2016-11-08 10:38:53,638 -�߳�ID:[10] -��־���� ERROR -�����ࣺCyberpipe.Forms.FrmPipelineModelDB property: [(null)] - -����������δ�������������õ������ʵ���� - diff --git a/bin/x86/Debug/log/2016/201611/20161116.txt b/bin/x86/Debug/log/2016/201611/20161116.txt deleted file mode 100644 index d23f760..0000000 --- a/bin/x86/Debug/log/2016/201611/20161116.txt +++ /dev/null @@ -1,8 +0,0 @@ - - -��¼ʱ�䣺2016-11-16 15:06:52,549 -�߳�ID:[9] -��־���� ERROR -�����ࣺCyberpipe.Utility property: [(null)] - -����������������־ - diff --git a/bin/x86/Debug/log/2016/201611/20161118.txt b/bin/x86/Debug/log/2016/201611/20161118.txt deleted file mode 100644 index d03145b..0000000 --- a/bin/x86/Debug/log/2016/201611/20161118.txt +++ /dev/null @@ -1,84 +0,0 @@ - - -��¼ʱ�䣺2016-11-18 15:22:27,833 -�߳�ID:[9] -��־���� ERROR -�����ࣺCyberpipe.Forms.FrmPipelineModelDB property: [(null)] - -���������������ͳ��ȱ������ø��ַ����ڵ�λ�á� -������: length - - - -��¼ʱ�䣺2016-11-18 15:23:05,224 -�߳�ID:[9] -��־���� ERROR -�����ࣺCyberpipe.Forms.FrmPipelineModelDB property: [(null)] - -���������������ͳ��ȱ������ø��ַ����ڵ�λ�á� -������: length - - - -��¼ʱ�䣺2016-11-18 15:24:36,900 -�߳�ID:[9] -��־���� ERROR -�����ࣺCyberpipe.Forms.FrmPipelineModelDB property: [(null)] - -���������������ͳ��ȱ������ø��ַ����ڵ�λ�á� -������: length - - - -��¼ʱ�䣺2016-11-18 15:26:25,752 -�߳�ID:[9] -��־���� ERROR -�����ࣺCyberpipe.Forms.FrmPipelineModelDB property: [(null)] - -���������������ͳ��ȱ������ø��ַ����ڵ�λ�á� -������: length - - - -��¼ʱ�䣺2016-11-18 15:27:04,799 -�߳�ID:[9] -��־���� ERROR -�����ࣺCyberpipe.FieldOrderValidate property: [(null)] - -�����������ֶ�˳����ʧ�� -�ֶ�:��ʼ�ܶ��߳��� -�ֶ�:��ֹ����߳��� -�ֶ�:��ֹ������� -�ֶ�:��ֹ�ܶ��߳��� -�ֶ�:������·���� -�ֶ�:Ȩ����λ���� -�ֶ�:��ע���� - - - - -��¼ʱ�䣺2016-11-18 15:27:11,752 -�߳�ID:[9] -��־���� ERROR -�����ࣺCyberpipe.FieldOrderValidate property: [(null)] - -�����������ֶ�˳����ʧ�� -�ֶ�:��ʼ�ܶ��߳��� -�ֶ�:��ֹ����߳��� -�ֶ�:��ֹ������� -�ֶ�:��ֹ�ܶ��߳��� -�ֶ�:������·���� -�ֶ�:Ȩ����λ���� -�ֶ�:��ע���� - - - - -��¼ʱ�䣺2016-11-18 15:27:27,018 -�߳�ID:[9] -��־���� ERROR -�����ࣺCyberpipe.FieldOrderValidate property: [(null)] - -�����������ֶ�˳����ʧ�� -�ֶ�:��ʼ�ܶ��߳��� -�ֶ�:��ֹ����߳��� -�ֶ�:��ֹ������� -�ֶ�:��ֹ�ܶ��߳��� -�ֶ�:������·���� -�ֶ�:Ȩ����λ���� -�ֶ�:��ע���� - - diff --git a/bin/x86/Debug/log/2016/201611/20161121.txt b/bin/x86/Debug/log/2016/201611/20161121.txt deleted file mode 100644 index e4d7262..0000000 --- a/bin/x86/Debug/log/2016/201611/20161121.txt +++ /dev/null @@ -1,213 +0,0 @@ - - -��¼ʱ�䣺2016-11-21 09:26:43,193 -�߳�ID:[9] -��־���� ERROR -�����ࣺCyberpipe.FieldOrderValidate property: [(null)] - -�����������ֶ�˳����ʧ�� -�ֶ�:��ʼ�ܶ��߳��� -�ֶ�:��ֹ����߳��� -�ֶ�:��ֹ������� -�ֶ�:��ֹ�ܶ��߳��� -�ֶ�:������·���� -�ֶ�:Ȩ����λ���� -�ֶ�:��ע���� - - - - -��¼ʱ�䣺2016-11-21 09:37:42,959 -�߳�ID:[8] -��־���� ERROR -�����ࣺCyberpipe.FieldUniqueValidate property: [(null)] - -�����������ֶ�Ψһ�Լ��ʧ�� -�ֶ���ʼ������ظ� 463.455����:3�ֶ���ʼ������ظ� 463.465����:3�ֶ���ʼ������ظ� 465.377����:3�ֶ���ֹ�ܵ׸��ظ� 462.044����:3 - - - -��¼ʱ�䣺2016-11-21 09:38:27,526 -�߳�ID:[8] -��־���� ERROR -�����ࣺCyberpipe.FieldUniqueValidate property: [(null)] - -�����������ֶ�Ψһ�Լ��ʧ�� -�ֶ���ʼ������ظ� 56.89����:3�ֶ���ʼ������ظ� 58.05����:3�ֶ���ʼ������ظ� 58.74����:3�ֶ���ʼ������ظ� 59.23����:3�ֶ���ʼ������ظ� 58.47����:3�ֶ���ʼ������ظ� 57.8����:3�ֶ���ʼ������ظ� 57.53����:3�ֶ���ʼ������ظ� 57.38����:3�ֶ���ʼ������ظ� 58.4����:3�ֶ���ʼ������ظ� 58.8����:7�ֶ���ֹ�ܵ׸��ظ� 54.94����:3�ֶ���ֹ�ܵ׸��ظ� 58.3����:3�ֶ���ֹ�ܵ׸��ظ� 58.73����:3�ֶ���ֹ�ܵ׸��ظ� 57.83����:3�ֶ���ֹ�ܵ׸��ظ� 58.31����:3 - - - -��¼ʱ�䣺2016-11-21 09:39:05,199 -�߳�ID:[8] -��־���� ERROR -�����ࣺCyberpipe.FieldCountValidate property: [(null)] - -�����������ֶ������Լ��ʧ�� -δ�ҵ��ֶλ�������ƥ��:��ʼ�ܵ׸�:double -δ�ҵ��ֶλ�������ƥ��:��ֹ�ܵ׸�:double - - - - -��¼ʱ�䣺2016-11-21 09:39:16,208 -�߳�ID:[8] -��־���� ERROR -�����ࣺCyberpipe.FieldOrderValidate property: [(null)] - -�����������ֶ�˳����ʧ�� -�ֶ�:��ʼ�ܶ��߳��� -�ֶ�:��ֹ����߳��� -�ֶ�:��ֹ������� -�ֶ�:��ֹ�ܶ��߳��� -�ֶ�:������·���� -�ֶ�:Ȩ����λ���� -�ֶ�:��ע���� - - - - -��¼ʱ�䣺2016-11-21 09:39:37,798 -�߳�ID:[8] -��־���� ERROR -�����ࣺCyberpipe.FieldOrderValidate property: [(null)] - -�����������ֶ�˳����ʧ�� -�ֶ�:��ʼ�ܶ��߳��� -�ֶ�:��ֹ����߳��� -�ֶ�:��ֹ������� -�ֶ�:��ֹ�ܶ��߳��� -�ֶ�:������·���� -�ֶ�:Ȩ����λ���� -�ֶ�:��ע���� - - - - -��¼ʱ�䣺2016-11-21 09:39:56,031 -�߳�ID:[8] -��־���� ERROR -�����ࣺCyberpipe.FieldOrderValidate property: [(null)] - -�����������ֶ�˳����ʧ�� -�ֶ�:��ʼ�ܶ��߳��� -�ֶ�:��ֹ����߳��� -�ֶ�:��ֹ������� -�ֶ�:��ֹ�ܶ��߳��� -�ֶ�:������·���� -�ֶ�:Ȩ����λ���� -�ֶ�:��ע���� - - - - -��¼ʱ�䣺2016-11-21 09:41:01,165 -�߳�ID:[8] -��־���� ERROR -�����ࣺCyberpipe.FieldOrderValidate property: [(null)] - -�����������ֶ�˳����ʧ�� -�ֶ�:��ʼ�ܶ��߳��� -�ֶ�:��ֹ����߳��� -�ֶ�:��ֹ������� -�ֶ�:��ֹ�ܶ��߳��� -�ֶ�:������·���� -�ֶ�:Ȩ����λ���� -�ֶ�:��ע���� - - - - -��¼ʱ�䣺2016-11-21 09:43:35,081 -�߳�ID:[10] -��־���� ERROR -�����ࣺCyberpipe.FieldOrderValidate property: [(null)] - -�����������ֶ�˳����ʧ�� -�ֶ�:��ʼ�ܶ��߳��� -�ֶ�:��ֹ����߳��� -�ֶ�:��ֹ������� -�ֶ�:��ֹ�ܶ��߳��� -�ֶ�:������·���� -�ֶ�:Ȩ����λ���� -�ֶ�:��ע���� - - - - -��¼ʱ�䣺2016-11-21 09:43:46,706 -�߳�ID:[10] -��־���� ERROR -�����ࣺCyberpipe.FieldOrderValidate property: [(null)] - -�����������ֶ�˳����ʧ�� -�ֶ�:��ʼ�ܶ��߳��� -�ֶ�:��ֹ����߳��� -�ֶ�:��ֹ������� -�ֶ�:��ֹ�ܶ��߳��� -�ֶ�:������·���� -�ֶ�:Ȩ����λ���� -�ֶ�:��ע���� - - - - -��¼ʱ�䣺2016-11-21 09:45:33,615 -�߳�ID:[10] -��־���� ERROR -�����ࣺCyberpipe.FieldOrderValidate property: [(null)] - -�����������ֶ�˳����ʧ�� -�ֶ�:��ʼ�ܶ��߳��� -�ֶ�:��ֹ����߳��� -�ֶ�:��ֹ������� -�ֶ�:��ֹ�ܶ��߳��� -�ֶ�:������·���� -�ֶ�:Ȩ����λ���� -�ֶ�:��ע���� - - - - -��¼ʱ�䣺2016-11-21 09:53:43,807 -�߳�ID:[10] -��־���� ERROR -�����ࣺCyberpipe.FieldCountValidate property: [(null)] - -�����������ֶ������Լ��ʧ�� -δ�ҵ��ֶλ�������ƥ��:ͼ����:string - - - - -��¼ʱ�䣺2016-11-21 13:34:03,037 -�߳�ID:[10] -��־���� ERROR -�����ࣺCyberpipe.FieldCountValidate property: [(null)] - -����������BSQ�ֶ������Լ��ʧ�� -δ�ҵ��ֶλ�������ƥ��:ͼ����:string - - - - -��¼ʱ�䣺2016-11-21 13:40:32,041 -�߳�ID:[9] -��־���� ERROR -�����ࣺCyberpipe.FieldCountValidate property: [(null)] - -����������BSQ�ֶ������Լ��ʧ�� -δ�ҵ��ֶλ�������ƥ��:ͼ����:string - - - - -��¼ʱ�䣺2016-11-21 13:43:57,923 -�߳�ID:[9] -��־���� ERROR -�����ࣺCyberpipe.FieldCountValidate property: [(null)] - -����������BSQ�ֶ������Լ��ʧ�� -δ�ҵ��ֶλ�������ƥ��:ͼ����:string - - - - -��¼ʱ�䣺2016-11-21 13:44:42,643 -�߳�ID:[9] -��־���� ERROR -�����ࣺCyberpipe.FieldOrderValidate property: [(null)] - -������������ѹ����-�̲߳����ֶ�˳����ʧ�� -�ֶ�:��ʼ�ܶ��߳��� -�ֶ�:��ֹ����߳��� -�ֶ�:��ֹ������� -�ֶ�:��ֹ�ܶ��߳��� -�ֶ�:������·���� -�ֶ�:Ȩ����λ���� -�ֶ�:��ע���� - - diff --git a/FeatureStatisticsService.cs b/FeatureStatisticsService.cs index 331ee47..b127fe3 100644 --- a/FeatureStatisticsService.cs +++ b/FeatureStatisticsService.cs @@ -190,7 +190,7 @@ List result = new List(); //layer.Name是表名 - string[] accessStrs = Utility.getAccStrsByLayer(layer.Name); + string[] accessStrs = FeatureTools.GetAccStrsByLayer(layer.Name); foreach (string accssname in accessStrs) { diff --git a/FeatureTools.cs b/FeatureTools.cs index be4b469..3c08f34 100644 --- a/FeatureTools.cs +++ b/FeatureTools.cs @@ -1,5 +1,6 @@ using System; using System.Collections.Generic; +using System.Data; using System.Linq; using System.Text; using System.Windows.Forms; @@ -43,7 +44,7 @@ } feature.Delete();//地球上删除该feature string sql = "delete from " + layerName + " where LSSYS_ID =" + feature.ID + " and (编号 is null or substr(编号,length(编号)-2)='TMP')"; - OledbHelper.sqlExecuteNonQuery(sql);//目前无法取到LSSYS_ID，所以这个判断条件不太合适，会导致把该类所有新建的都删除了 + OledbHelper.sqlExecuteNonQuery(sql); } catch (Exception) { @@ -106,5 +107,46 @@ } return value; } + + /// + /// 根据附属物图层名字得到里面含有的附属物 + /// + /// + /// + public static string[] GetAccStrsByLayer(string layername) + { + string[] accStrs = null; + string sql = "select 附属物名称 from " + layername + " group by 附属物名称"; + DataSet dataset = OledbHelper.getDataSet(sql, layername); + if (dataset == null) return null; + accStrs = new string[dataset.Tables[0].Rows.Count]; + for (int i = 0; i < dataset.Tables[0].Rows.Count; i++) + { + accStrs[i] = dataset.Tables[0].Rows[i][0].ToString(); + } + return accStrs; + } + + /// + /// 删除内存图层中指定名称的feature + /// + /// + /// + public static void RemoveFeatureFromName(GSOGlobeControl globeControl1, string featureName) + { + GSOFeatures features = globeControl1.Globe.MemoryLayer.GetFeatureByName(featureName, true); + if (features != null) + { + for (int i = features.Length - 1; i >= 0; i--) + { + GSOFeature feature = features[i]; + if (feature != null) + { + globeControl1.Globe.MemoryLayer.RemoveFeatureByID(feature.ID); + } + } + } + globeControl1.Refresh(); + } } } diff --git a/Forms/FrmPipelineModelDataBase.cs b/Forms/FrmPipelineModelDataBase.cs index b577fd8..bc1e479 100644 --- a/Forms/FrmPipelineModelDataBase.cs +++ b/Forms/FrmPipelineModelDataBase.cs @@ -149,7 +149,7 @@ catch (Exception ex) { LogError.PublishError(ex); - LogHelper.WriteLog(typeof(FrmPipelineModelDB), ex.Message); + LogHelper.Error(ex.Message); } } diff --git a/FrmAccessoriesSensor.cs b/FrmAccessoriesSensor.cs index 98aa1cf..542f19a 100644 --- a/FrmAccessoriesSensor.cs +++ b/FrmAccessoriesSensor.cs @@ -240,7 +240,7 @@ { if (clbPipeLine.CheckedItems.Count > 0) { - Utility.RemoveFeatureFromName(globeControl1, "trackPolygon"); + FeatureTools.RemoveFeatureFromName(globeControl1, "trackPolygon"); globeControl1.Globe.Action = EnumAction3D.TrackPolygon; globeControl1.TrackPolygonEndEvent += globeControl1_TrackPolygonEndEvent; } @@ -259,7 +259,7 @@ private void FrmAccessoriesgather_FormClosing(object sender, FormClosingEventArgs e) { frm = null; - Utility.RemoveFeatureFromName(globeControl1, "trackPolygon"); + FeatureTools.RemoveFeatureFromName(globeControl1, "trackPolygon"); globeControl1.Globe.Action = EnumAction3D.ActionNull; globeControl1.TrackPolygonEndEvent -= globeControl1_TrackPolygonEndEvent; } diff --git a/FrmAccessoriesgather.cs b/FrmAccessoriesgather.cs index e1d176e..c36273b 100644 --- a/FrmAccessoriesgather.cs +++ b/FrmAccessoriesgather.cs @@ -118,7 +118,7 @@ { if (clbPipeLine2.Text!="") { - Utility.RemoveFeatureFromName(globeControl1, "trackPolygon"); + FeatureTools.RemoveFeatureFromName(globeControl1, "trackPolygon"); globeControl1.Globe.Action = EnumAction3D.TrackPolygon; globeControl1.Globe.TrackPolygonTool.TrackMode = EnumTrackMode.SpaceTrack; globeControl1.TrackPolygonEndEvent += globeControl1_TrackPolygonEndEvent; @@ -295,7 +295,7 @@ private void FrmAccessoriesgather_FormClosing(object sender, FormClosingEventArgs e) { frm = null; - Utility.RemoveFeatureFromName(globeControl1, "trackPolygon"); + FeatureTools.RemoveFeatureFromName(globeControl1, "trackPolygon"); globeControl1.TrackPolygonEndEvent -= globeControl1_TrackPolygonEndEvent; globeControl1.Globe.Action = EnumAction3D.ActionNull; diff --git a/FrmAddWellShp.cs b/FrmAddWellShp.cs index 7983349..78d8946 100644 --- a/FrmAddWellShp.cs +++ b/FrmAddWellShp.cs @@ -100,7 +100,7 @@ catch (Exception ex) { LogError.PublishError(ex); - LogHelper.WriteLog(typeof(FrmAddWellShp), ex.Message); + LogHelper.Error(ex.Message); } } diff --git a/FrmBSQStatis.cs b/FrmBSQStatis.cs index 5b05926..b5e581d 100644 --- a/FrmBSQStatis.cs +++ b/FrmBSQStatis.cs @@ -97,7 +97,7 @@ } catch (Exception ex) { - LogHelper.WriteLog(typeof(FrmBSQStatis),ex.Message); + LogHelper.Error(ex.Message); } return typeAndCount; } @@ -108,7 +108,7 @@ GSOLayer layer = globeControl1.Globe.Layers.GetLayerByCaption("标识器"); GSOFeatures bsqFs = FeatureStatisticsService.GetLayerFeatures(polygon, layer); if (bsqFs == null || bsqFs.Length <= 0) { - LogHelper.WriteLog(typeof(FrmBSQStatis),"标识器图层下的Feature为空"); + LogHelper.Error("标识器图层下的Feature为空!"); return null; } diff --git a/FrmBasicQuery.cs b/FrmBasicQuery.cs index baeeade..cc8d3ff 100644 --- a/FrmBasicQuery.cs +++ b/FrmBasicQuery.cs @@ -224,7 +224,7 @@ } catch(Exception ex) { - LogHelper.WriteLog(typeof(FrmBasicQuery), ex.Message); + LogHelper.Error(ex.Message); } } else diff --git a/FrmCodingQuery.cs b/FrmCodingQuery.cs index f1ac322..d4ec095 100644 --- a/FrmCodingQuery.cs +++ b/FrmCodingQuery.cs @@ -82,7 +82,7 @@ } catch (Exception ex) { - LogHelper.WriteLog(typeof(FrmCodingQuery), ex.Message); ; + LogHelper.Error(ex.Message); } } diff --git a/FrmDiameterQuery.cs b/FrmDiameterQuery.cs index e7b3657..75d7949 100644 --- a/FrmDiameterQuery.cs +++ b/FrmDiameterQuery.cs @@ -150,7 +150,7 @@ catch (Exception ex) { //LogError.PublishError(ex); - LogHelper.WriteLog(typeof(FrmDiameterQuery), ex.Message); + LogHelper.Error(ex.Message); MessageBox.Show("请输入正确的管径范围！"); return; } diff --git a/FrmFittingQuery.cs b/FrmFittingQuery.cs index 12f6007..8645011 100644 --- a/FrmFittingQuery.cs +++ b/FrmFittingQuery.cs @@ -69,7 +69,7 @@ } catch (Exception ex) { - LogHelper.WriteLog(typeof(FrmFittingQuery), ex.Message); + LogHelper.Error(ex.Message); } } /// diff --git a/FrmKeywordQuery.cs b/FrmKeywordQuery.cs index 405524f..ede0a93 100644 --- a/FrmKeywordQuery.cs +++ b/FrmKeywordQuery.cs @@ -87,7 +87,7 @@ } catch (Exception ex) { - LogHelper.WriteLog(typeof(FrmKeywordQuery), ex.Message); + LogHelper.Error(ex.Message); } } diff --git a/FrmLogin.cs b/FrmLogin.cs index 1172c23..6fbaed9 100644 --- a/FrmLogin.cs +++ b/FrmLogin.cs @@ -2,6 +2,8 @@ using System.Data; using System.Data.OracleClient; using System.IO; +using System.Net; +using System.Text; using System.Windows.Forms; using System.Xml; using DevComponents.DotNetBar; @@ -10,16 +12,15 @@ { public partial class FrmLogin : Office2007Form { + + //登录界面 -- 配置文件的路径 + public static string filename = Application.StartupPath + "\\login.xml"; + + public FrmLogin() { InitializeComponent(); } - public string rolename = "浏览"; - public string username = ""; - public string department = ""; - - //登录界面 -- 配置文件的路径 - public static string filename = Application.StartupPath + "\\login.xml"; /// /// 登录按钮事件处理 /// @@ -28,9 +29,10 @@ private void button1_Click(object sender, EventArgs e) { bool result = ValidateUser(); +// bool result =ValidateFromUrl();//从平台获取用户角色信息，判断是否能登陆成功 if (result) { - username = txtUser.Text.Trim(); + WriteXml(); Utility.userName = txtUser.Text.Trim(); DialogResult = DialogResult.OK; Close(); @@ -43,80 +45,6 @@ } } /// - /// 关闭按钮事件处理 - /// - /// - /// - private void button2_Click(object sender, EventArgs e) - { - Close(); - } - /// - /// 验证端口号 - /// - /// - //private bool ValiPort() - //{ - // Ping p = new Ping();//创建Ping对象p - // PingReply pr = p.Send(Utility.localicenseserverip);//向指定IP或者主机名的计算机发送ICMP协议的ping数据包 - // if (pr.Status == IPStatus.Success)//如果ping成功 - // { - // try - // { - // TcpClient tcpc = new TcpClient(Utility.localicenseserverip, Utility.localicenseserverport);//对IP地址为"192.168.0.105"的计算机的1500端口提出连接申请 - // tcpc.Close(); - // return true; - // } - // catch (Exception ex) - // { - // LogError.PublishError(ex); - // MessageBox.Show("端口连接错误！" + ex.Message); - // return false; - // } - // } - // else - // { - // int times = 0;//重新连接次数; - // int count = 2;//设置尝试次数 - // while (times < count) - // { - // //Thread.Sleep(1000);//等待时间(方便测试的话，你可以改为1000) - // pr = p.Send(Utility.localicenseserverip); - - // if (pr.Status == IPStatus.Success) - // { - // try - // { - // TcpClient tcpc = new TcpClient(Utility.localicenseserverip, Utility.localicenseserverport);//对IP地址为"192.168.0.105"的计算机的1500端口提出连接申请 - // tcpc.Close(); - // return true; - // } - // catch (Exception ex) - // { - // LogError.PublishError(ex); - // MessageBox.Show("端口连接错误！" + ex.Message); - // return false; - // } - // } - // else - // { - // times++; - // if (times < count) - // { - // continue; - // } - // else - // { - // MessageBox.Show("重新尝试连接失败"); - // return false; - // } - // } - - // } - // return false; - // } - //} - /// /// 验证用户名、密码 /// /// @@ -126,24 +54,64 @@ string sql = "select * from casic_userinfotest where USERNAME='" + txtUser.Text.Trim() + "' and PASSWORD='" + passWord + "' and sysname='GHFX' "; DataTable dt = OledbHelper.QueryTable(sql); - if (dt != null && dt.Rows.Count > 0) + if (dt == null || dt.Rows.Count <= 0) return false; + if (String.IsNullOrEmpty(dt.Rows[0]["rid"].ToString())) return true; + sql = "select gid from casic_userroletest where id=" + dt.Rows[0]["rid"] + " and sysname='GHFX' "; + using (OracleDataReader reader = OracleUtils.ExecuteReader(OracleUtils.ConnectionString, CommandType.Text, sql)) { - WriteXML(); - if (!String.IsNullOrEmpty(dt.Rows[0]["rid"].ToString())) + while (reader.Read()) { - sql = "select gid from casic_userroletest where id=" + dt.Rows[0]["rid"] + " and sysname='GHFX' "; - using (OracleDataReader reader = OracleUtils.ExecuteReader(OracleUtils.ConnectionString, CommandType.Text, sql)) - { - while (reader.Read()) - { - Utility.userRole = reader[0].ToString(); - break; - } - } + Utility.userRole = reader[0].ToString(); + LogHelper.Debug("测试一下"); + break; } - return true; } - return false; + return true; + } + + + + private bool ValidateFromUrl() + { + string user = txtUser.Text.Trim(); + string pwd = textBoxPassWord.Text.Trim(); + //做成配置的 + string roleserver = Utility.RoleServer; + if (roleserver == null || roleserver.Trim().Equals("")) + { + MessageBox.Show("请在Config.xml中配置roleurl！"); + return false; + } + HttpWebRequest request = + WebRequest.Create(roleserver+"/rs/authority/user?username=" + user + "&password=" + pwd + "&appId=21") as HttpWebRequest; + if (request == null) return false; + using (HttpWebResponse response = request.GetResponse() as HttpWebResponse) + { + try + { + if (response == null || response.GetResponseStream() == null) return false; + StreamReader reader = new StreamReader(response.GetResponseStream()); + string[] result = reader.ReadToEnd().Split(','); + //解析result + if (result.Length < 5) return false; + StringBuilder userRole = new StringBuilder(""); + for (int i = 4; i < result.Length; i++) + { + string[] tmpStrings = result[i].Split('_'); + if (tmpStrings.Length < 2) continue; + userRole.Append(tmpStrings[1].Trim() + ","); + } + if (userRole.Length < 3) return false; + userRole.Remove(userRole.Length - 3, 3); + // MessageBox.Show(userRole.ToString()); + Utility.userRole = userRole.ToString(); + return Utility.userRole != null && !Utility.userRole.Equals("null"); + } + catch (Exception e) + { + return false; + } + } } private void FrmLogin_Load(object sender, EventArgs e) @@ -153,74 +121,56 @@ StartPosition = FormStartPosition.CenterScreen; - ReadXML(); + ReadXml(); } /// /// 读取上一次登录的用户名和密码 /// - private void ReadXML() + private void ReadXml() { - if (File.Exists(filename)) + if (!File.Exists(filename)) return; + //初始化XML文档操作类 + XmlDocument myDoc = new XmlDocument(); { - if (!File.Exists(filename)) + //加载XML文件 + try { + myDoc.Load(filename); + } + catch (Exception e) + { + LogError.PublishError(e); return; } - - //初始化XML文档操作类 - XmlDocument myDoc = new XmlDocument(); + //搜索指定的节点 + XmlNode serverRootNode = myDoc.SelectSingleNode("Params"); + XmlNodeList nodes = null; + if (serverRootNode != null) { - //加载XML文件 - try + nodes = serverRootNode.ChildNodes; + } + if (nodes == null) return; + foreach (XmlNode xn in nodes) + { + if (xn.Name.Equals("username")) { - myDoc.Load(filename); + txtUser.Text = xn.InnerText.Trim(); } - catch (Exception e) + else if (xn.Name.Equals("password")) { - LogError.PublishError(e); - return; + textBoxPassWord.Text = xn.InnerText.Trim(); } - //搜索指定的节点 - XmlNode serverRootNode = myDoc.SelectSingleNode("Params"); - XmlNodeList nodes = null; - if (serverRootNode != null) + else if (xn.Name.Equals("isremember")) { - nodes = serverRootNode.ChildNodes; - } - if (nodes != null) - { - foreach (XmlNode xn in nodes) - { - if (xn.Name == "username") - { - txtUser.Text = xn.InnerText.Trim(); - } - else if (xn.Name == "password") - { - textBoxPassWord.Text = xn.InnerText.Trim(); - } - else if (xn.Name == "isremember") - { - if (xn.InnerText.Trim() == "true") - { - checkBoxXRememberPassword.Checked = true; - } - else if (xn.InnerText.Trim() == "false") - { - checkBoxXRememberPassword.Checked = false; - } - } - } - + checkBoxXRememberPassword.Checked = xn.InnerText.Trim().Equals("true"); } } } - } /// /// 记录登录的用户名和密码 /// - private void WriteXML() + private void WriteXml() { if (!File.Exists(filename)) { @@ -252,31 +202,17 @@ foreach (XmlNode xn in nodes) { XmlElement xe = (XmlElement)xn; - if (xe.Name == "username") + if (xe.Name.Equals("username")) { xe.InnerText = txtUser.Text.Trim(); } - else if (xe.Name == "password") + else if (xe.Name.Equals("password")) { - if (checkBoxXRememberPassword.Checked) - { - xe.InnerText = textBoxPassWord.Text.Trim(); - } - else - { - xe.InnerText = ""; - } + xe.InnerText = checkBoxXRememberPassword.Checked ? textBoxPassWord.Text.Trim() : ""; } - else if (xe.Name == "isremember") + else if (xe.Name.Equals("isremember")) { - if (checkBoxXRememberPassword.Checked) - { - xe.InnerText = "true"; - } - else - { - xe.InnerText = "false"; - } + xe.InnerText = checkBoxXRememberPassword.Checked ? "true" : "false"; } } } diff --git a/FrmMaterialSel.cs b/FrmMaterialSel.cs index 8645ab3..d23f385 100644 --- a/FrmMaterialSel.cs +++ b/FrmMaterialSel.cs @@ -157,7 +157,7 @@ } catch (Exception ex) { - LogHelper.WriteLog(typeof(FrmMaterialSel), ex.Message); + LogHelper.Error(ex.Message); } } diff --git a/FrmMetadataStat.cs b/FrmMetadataStat.cs index c3c1359..96029a6 100644 --- a/FrmMetadataStat.cs +++ b/FrmMetadataStat.cs @@ -96,7 +96,7 @@ //统计有多少个图层 private int statistLayer() { - List datasrcs = Utility.layerConfig.datasrcs; + List datasrcs = Utility.LayerConfig.datasrcs; return datasrcs.SelectMany(datasrc => datasrc.layertypes).Sum(layerType => layerType.layers.Count); } diff --git a/FrmpipeDeepstatis.cs b/FrmpipeDeepstatis.cs index 6a5c895..8d915a9 100644 --- a/FrmpipeDeepstatis.cs +++ b/FrmpipeDeepstatis.cs @@ -2,6 +2,7 @@ using System.Collections.Generic; using System.Diagnostics; using System.IO; +using System.Reflection; using System.Text; using System.Windows.Forms; using System.Windows.Forms.DataVisualization.Charting; @@ -320,7 +321,7 @@ MessageBox.Show("请添加分段"); return; } - Utility.RemoveFeatureFromName(globeControl1, "trackPolygon"); + FeatureTools.RemoveFeatureFromName(globeControl1, "trackPolygon"); globeControl1.Globe.Action = EnumAction3D.TrackPolygon; globeControl1.Globe.TrackPolygonTool.TrackMode = EnumTrackMode.SpaceTrack; globeControl1.TrackPolygonEndEvent += globeControl1_TrackPolygonEndEvent; @@ -408,12 +409,11 @@ TextBox control; private void dataGridViewX2_EditingControlShowing(object sender, DataGridViewEditingControlShowingEventArgs e) { - if (e.Control.GetType().BaseType.Name == "TextBox") - { - control = new TextBox(); - control = (TextBox)e.Control; - control.KeyPress += control_KeyPress; - } + MemberInfo memberInfo = e.Control.GetType().BaseType; + if (memberInfo != null && !memberInfo.Name.Equals("TextBox")) return; + control = new TextBox(); + control = (TextBox)e.Control; + control.KeyPress += control_KeyPress; } /// /// 键盘按键按下事件处理 @@ -423,28 +423,24 @@ void control_KeyPress(object sender, KeyPressEventArgs e) { TextBox text = sender as TextBox; + if (text == null) return; if ((e.KeyChar < 48 || e.KeyChar > 57) && (e.KeyChar != 8) && e.KeyChar != 46) { e.Handled = true; } - if (e.KeyChar == 46) //小数点 + if (e.KeyChar != 46) return; + if (text.Text.Length <= 0) + e.Handled = true; //小数点不能在第一位 + else //处理不规则的小数点 { - if (text.Text.Length <= 0) - e.Handled = true; //小数点不能在第一位 - else //处理不规则的小数点 + float f; + float oldf; + bool b1 = false, b2 = false; + b1 = float.TryParse(text.Text, out oldf); + b2 = float.TryParse(text.Text + e.KeyChar, out f); + if (!b2) { - float f; - float oldf; - bool b1 = false, b2 = false; - b1 = float.TryParse(text.Text, out oldf); - b2 = float.TryParse(text.Text + e.KeyChar, out f); - if (b2 == false) - { - if (b1) - e.Handled = true; - else - e.Handled = false; - } + e.Handled = b1; } } } @@ -457,7 +453,7 @@ { frm = null; - Utility.RemoveFeatureFromName(globeControl1, "trackPolygon"); + FeatureTools.RemoveFeatureFromName(globeControl1, "trackPolygon"); globeControl1.TrackPolygonEndEvent -= globeControl1_TrackPolygonEndEvent; globeControl1.Globe.Action = EnumAction3D.ActionNull; diff --git a/FrmpipeDiametergather.cs b/FrmpipeDiametergather.cs index a9d96fa..c09aaf1 100644 --- a/FrmpipeDiametergather.cs +++ b/FrmpipeDiametergather.cs @@ -154,7 +154,7 @@ MessageBox.Show("请选择图层！"); return; } - Utility.RemoveFeatureFromName(globeControl1, "trackPolygon"); + FeatureTools.RemoveFeatureFromName(globeControl1, "trackPolygon"); globeControl1.Globe.Action = EnumAction3D.TrackPolygon; globeControl1.Globe.TrackPolygonTool.TrackMode = EnumTrackMode.SpaceTrack; globeControl1.TrackPolygonEndEvent += globeControl1_TrackPolygonEndEvent; @@ -392,7 +392,7 @@ private void FrmpipeDiametergather_FormClosing(object sender, FormClosingEventArgs e) { frm = null; - Utility.RemoveFeatureFromName(globeControl1, "trackPolygon"); + FeatureTools.RemoveFeatureFromName(globeControl1, "trackPolygon"); globeControl1.TrackPolygonEndEvent -= globeControl1_TrackPolygonEndEvent; globeControl1.Globe.Action = EnumAction3D.ActionNull; diff --git a/FrmpipeMaterialGather.cs b/FrmpipeMaterialGather.cs index 44e7f24..5ca8144 100644 --- a/FrmpipeMaterialGather.cs +++ b/FrmpipeMaterialGather.cs @@ -58,10 +58,9 @@ for (int i = 0; i < pipeLayerNames.Count; i++) { clbPipeLine.Items.Add(pipeLayerNames[i]); - GSOLayer layer = globeControl1.Globe.Layers.GetLayerByCaption(pipeLayerNames[i]); - if (layer.Dataset == null || !layer.Dataset.IsFeatureDataset || layer.Type != EnumLayerType.FeatureLayer) continue; + GSOLayer layer = globeControl1.Globe.Layers.GetLayerByCaption(pipeLayerNames[i]); + if (layer == null || layer.Dataset == null || !layer.Dataset.IsFeatureDataset || layer.Type != EnumLayerType.FeatureLayer) continue; - string name = layer.Name; GSOFeatureLayer flayer = layer as GSOFeatureLayer; GSOFeatures feats = flayer.GetAllFeatures(); @@ -205,7 +204,7 @@ { chart1.Series.Add(clbPipeLine.CheckedItems[i].ToString()); GSOLayer layer = globeControl1.Globe.Layers.GetLayerByCaption(clbPipeLine.CheckedItems[i].ToString()); - if (layer != null && layer is GSOFeatureLayer) + if (layer is GSOFeatureLayer) { GSOFeatureLayer flayer = layer as GSOFeatureLayer; GSOFeatures features = flayer.GetAllFeatures(); @@ -240,10 +239,9 @@ labeStyleAxisX.Enabled = true; chart1.ChartAreas["ChartArea1"].AxisX.LabelStyle = labeStyleAxisX; - Dictionary dic1 = new Dictionary(); for (int j = 0; j < chart1.Series.Count; j++) { - dic1 = new Dictionary(); + Dictionary dic1 = new Dictionary(); foreach (string key in dic.Keys) { if (key.Contains(chart1.Series[j].Name)) @@ -304,7 +302,7 @@ MessageBox.Show("请选择材质类型！"); return; } - Utility.RemoveFeatureFromName(globeControl1, "trackPolygon"); + FeatureTools.RemoveFeatureFromName(globeControl1, "trackPolygon"); globeControl1.Globe.Action = EnumAction3D.TrackPolygon; globeControl1.Globe.TrackPolygonTool.TrackMode = EnumTrackMode.SpaceTrack; globeControl1.TrackPolygonEndEvent += globeControl1_TrackPolygonEndEvent; @@ -318,7 +316,7 @@ private void FrmpipeMaterialGather_FormClosing(object sender, FormClosingEventArgs e) { frm = null; - Utility.RemoveFeatureFromName(globeControl1, "trackPolygon"); + FeatureTools.RemoveFeatureFromName(globeControl1, "trackPolygon"); globeControl1.TrackPolygonEndEvent -= globeControl1_TrackPolygonEndEvent; globeControl1.Globe.Action = EnumAction3D.ActionNull; diff --git a/Frmpipediameterstatis.cs b/Frmpipediameterstatis.cs index 4fb25a8..631a996 100644 --- a/Frmpipediameterstatis.cs +++ b/Frmpipediameterstatis.cs @@ -202,8 +202,8 @@ } catch (Exception ex) { - LogHelper.WriteLog(typeof(Frmpipediameterstatis), ex.Message); //MessageBox.Show(ex.Message); + LogHelper.Error(ex.Message); LogError.PublishError(ex); } } @@ -372,7 +372,7 @@ MessageBox.Show("请添加分段！"); return; } - Utility.RemoveFeatureFromName(globeControl1, "trackPolygon"); + FeatureTools.RemoveFeatureFromName(globeControl1, "trackPolygon"); globeControl1.Globe.Action = EnumAction3D.TrackPolygon; globeControl1.Globe.TrackPolygonTool.TrackMode = EnumTrackMode.SpaceTrack; globeControl1.TrackPolygonEndEvent += globeControl1_TrackPolygonEndEvent; @@ -422,7 +422,7 @@ globeControl1.Globe.Action = EnumAction3D.ActionNull; globeControl1.TrackPolygonEndEvent -= globeControl1_TrackPolygonEndEvent; - Utility.RemoveFeatureFromName(globeControl1, "trackPolygon"); + FeatureTools.RemoveFeatureFromName(globeControl1, "trackPolygon"); globeControl1.Globe.MemoryLayer.RemoveAllFeature(); } diff --git a/LineBuilder.cs b/LineBuilder.cs index 33a216c..b6a8516 100644 --- a/LineBuilder.cs +++ b/LineBuilder.cs @@ -43,8 +43,8 @@ GSOGeoPolyline3D lineeee = f.Geometry as GSOGeoPolyline3D; if (lineeee == null || lineeee.GetSpaceLength(true, 6378137) == 0) { - LogHelper.WriteLog(typeof(LineBuilder), "出现数据无法入库:"+f.ID); - continue; //TODO LIST:判断是否会出现部署数据无法入库情况,Log2Net + LogHelper.Error("出现数据无法入库:" + f.ID); + continue; } GSOFeature newFeature = newFeatureSet.CreateFeature(); diff --git a/LogHelper.cs b/LogHelper.cs index 9ef5f27..04573cf 100644 --- a/LogHelper.cs +++ b/LogHelper.cs @@ -1,4 +1,5 @@ using System; +using System.Diagnostics; using log4net; using log4net.Config; @@ -7,35 +8,82 @@ { public class LogHelper { - /// - /// 输出日志到Log4Net - /// - /// - /// - #region static void WriteLog(Type t, Exception ex) - public static void WriteLog(Type t, Exception ex) + private static ILog _logdebug = log4net.LogManager.GetLogger("logdebug"); + private static ILog _loginfo = log4net.LogManager.GetLogger("loginfo"); + private static ILog _logwarn = log4net.LogManager.GetLogger("logwarn"); + private static ILog _logerror = log4net.LogManager.GetLogger("logerror"); + private static ILog _logfatal = log4net.LogManager.GetLogger("logfatal"); + + public static void Debug(string msg) { - ILog log = log4net.LogManager.GetLogger(t); - log.Error("Error", ex); + StackFrame sf = new StackFrame(1); + msg = string.Format("{0}.{1}:{2}", sf.GetMethod().ReflectedType.FullName, sf.GetMethod().Name, msg); + _logdebug.Debug(msg); + } + public static void Debug(string msg, Exception e) + { + StackFrame sf = new StackFrame(1); + msg = string.Format("{0}.{1}:{2}", sf.GetMethod().ReflectedType.FullName, sf.GetMethod().Name, msg); + _logdebug.Debug(msg, e); } - #endregion - /// - /// 输出日志到Log4Net - /// - /// - /// - #region static void WriteLog(Type t, string msg) - - public static void WriteLog(Type t, string msg) + public static void Info(string msg) { - ILog log = log4net.LogManager.GetLogger(t); - log.Error(msg); + StackFrame sf = new StackFrame(1); + msg = string.Format("{0}.{1}:{2}", sf.GetMethod().ReflectedType.FullName, sf.GetMethod().Name, msg); + _loginfo.Info(msg); + } + public static void Info(string msg, Exception e) + { + StackFrame sf = new StackFrame(1); + msg = string.Format("{0}.{1}:{2}", sf.GetMethod().ReflectedType.FullName, sf.GetMethod().Name, msg); + _loginfo.Info(msg, e); } - #endregion + + public static void Warn(string msg) + { + StackFrame sf = new StackFrame(1); + msg = string.Format("{0}.{1}:{2}", sf.GetMethod().ReflectedType.FullName, sf.GetMethod().Name, msg); + _logwarn.Warn(msg); + } + public static void Warn(string msg, Exception e) + { + StackFrame sf = new StackFrame(1); + msg = string.Format("{0}.{1}:{2}", sf.GetMethod().ReflectedType.FullName, sf.GetMethod().Name, msg); + _logwarn.Warn(msg, e); + } + + + public static void Error(string msg) + { + StackFrame sf = new StackFrame(1); + msg = string.Format("{0}.{1}:{2}", sf.GetMethod().ReflectedType.FullName, sf.GetMethod().Name, msg); + _logerror.Error(msg); + } + public static void Error(string msg, Exception e) + { + StackFrame sf = new StackFrame(1); + msg = string.Format("{0}.{1}:{2}", sf.GetMethod().ReflectedType.FullName, sf.GetMethod().Name, msg); + _logerror.Error(msg, e); + } + + + public static void Fatal(string msg) + { + StackFrame sf = new StackFrame(1); + msg = string.Format("{0}.{1}:{2}", sf.GetMethod().ReflectedType.FullName, sf.GetMethod().Name, msg); + _logfatal.Fatal(msg); + } + public static void Fatal(string msg, Exception e) + { + StackFrame sf = new StackFrame(1); + msg = string.Format("{0}.{1}:{2}", sf.GetMethod().ReflectedType.FullName, sf.GetMethod().Name, msg); + _logfatal.Fatal(msg, e); + } + } diff --git a/MainFrm.cs b/MainFrm.cs index 43de664..51f362a 100644 --- a/MainFrm.cs +++ b/MainFrm.cs @@ -18,7 +18,6 @@ using GeoScene.Data; using GeoScene.Engine; using GeoScene.Globe; -using Timer = System.Windows.Forms.Timer; using ToolTip = System.Windows.Forms.ToolTip; namespace Cyberpipe @@ -163,6 +162,7 @@ /// private void AddGZ() { + lendendGZ50 = new GSOHudButton(); lendendGZ50.SetImage(Application.StartupPath + "/Resource/管纵/50.png"); lendendGZ50.SetOffset(0, 0); @@ -1294,18 +1294,19 @@ private void MainFrm_Load(object sender, EventArgs e) { + layerTree.Nodes.Add("正在加载，请稍后……");//树状图加载在图层加载之后，故增加提示 initGlobalControl(); - //initGlobalMap(); - //initLayerTree(); initMarkerTree(); initLayout(); loadData(); - double x = Convert.ToDouble(Utility.Query_Roads["定位"].ToString().Split(',')[0]); - double y = Convert.ToDouble(Utility.Query_Roads["定位"].ToString().Split(',')[1]); - double z = Convert.ToDouble(Utility.Query_Roads["定位"].ToString().Split(',')[2]); + + double x = Convert.ToDouble(Utility.Query_Roads["绿岛"].ToString().Split(',')[0]); + double y = Convert.ToDouble(Utility.Query_Roads["绿岛"].ToString().Split(',')[1]); + double z = Convert.ToDouble(Utility.Query_Roads["绿岛"].ToString().Split(',')[2]); jumpToCameraState(x, y, z); + } #endregion @@ -1315,11 +1316,17 @@ if (e.Layer == null || !e.Layer.Caption.Equals(Utility.roadLayerName)) return; foreach (TreeNode layerTreeNode in layerTree.Nodes) { - foreach (TreeNode node in layerTreeNode.Nodes) + for (int i=0;i dt, DataGridView dataGridView) @@ -7330,7 +7337,7 @@ } catch (Exception ex) { - LogHelper.WriteLog(typeof(MainFrm), ex); + LogHelper.Debug("", ex); } } } @@ -7362,7 +7369,7 @@ GSOLayer layer = globeControl1.Globe.Layers.Add(strDataPath); if (layer == null) {//wxl - LogHelper.WriteLog(typeof(MainFrm), "buttonItemHX1_Click操作中，" + strDataPath + "的layer为空"); + LogHelper.Error("buttonItemHX1_Click操作中，" + strDataPath + "的layer为空"); continue; } GSOFeatures redFeatures = layer.GetAllFeatures(); @@ -7457,17 +7464,12 @@ { try { + globeControl1.BeforeSceneRenderEvent -= globeControl1_BeforeSceneRenderEvent; globeControl2.BeforeSceneRenderEvent -= globeControl2_BeforeSceneRenderEvent; - double x = Convert.ToDouble(Utility.Query_Roads["定位"].ToString().Split(',')[0]); - double y = Convert.ToDouble(Utility.Query_Roads["定位"].ToString().Split(',')[1]); - double z = Convert.ToDouble(Utility.Query_Roads["定位"].ToString().Split(',')[2]); - jumpToCameraState(x, y, z); - /* globeControl1.Globe.FlyToPosition(new GSOPoint3d(120.610963, 31.188121, 50), EnumAltitudeMode.Absolute, -4, 50, 800); globeControl1.Globe.FlyToPointSpeed = 10000000; - * */ globeControl1.Globe.Action = EnumAction3D.SelectObject; globeControl1.Refresh(); @@ -7489,6 +7491,37 @@ } } /// + /// 基础工具 + /// + /// + /// + private void ribbonTabItem1_MouseDown(object sender, MouseEventArgs e) + { + try + { + + globeControl1.BeforeSceneRenderEvent -= globeControl1_BeforeSceneRenderEvent; + globeControl2.BeforeSceneRenderEvent -= globeControl2_BeforeSceneRenderEvent; + + globeControl1.Globe.Action = EnumAction3D.ActionNull; + dataGridViewX1.AutoSizeColumnsMode = DataGridViewAutoSizeColumnsMode.AllCells; + //zhanshi = false; + redSH = false; + splitContainer1.Panel2Collapsed = true; + panelOfTable.Visible = false; + legendSC.Visible = false; + legendSG.Visible = false; + ClearGZData(); + GSOLayer redLayer = globeControl1.Globe.Layers.GetLayerByCaption("红线"); + if (redLayer == null) return; + redLayer.Visible = false; + } + catch (Exception ex) + { + //MessageBox.Show("系统运行错误:" + ex.ToString(), "错误", MessageBoxButtons.OK, MessageBoxIcon.Error); + } + } + /// /// 一键审核 /// /// @@ -7497,6 +7530,7 @@ { try { + globeControl1.BeforeSceneRenderEvent -= globeControl1_BeforeSceneRenderEvent; globeControl2.BeforeSceneRenderEvent -= globeControl2_BeforeSceneRenderEvent; @@ -7518,32 +7552,7 @@ //MessageBox.Show("系统运行错误:" + ex.ToString(), "错误", MessageBoxButtons.OK, MessageBoxIcon.Error); } } - - void ResetRibbonTab() - { - try - { - globeControl1.BeforeSceneRenderEvent -= globeControl1_BeforeSceneRenderEvent; - globeControl2.BeforeSceneRenderEvent -= globeControl2_BeforeSceneRenderEvent; - - globeControl1.Globe.Action = EnumAction3D.ActionNull; - dataGridViewX1.AutoSizeColumnsMode = DataGridViewAutoSizeColumnsMode.AllCells; - //zhanshi = false; - redSH = false; - splitContainer1.Panel2Collapsed = true; - panelOfTable.Visible = false; - legendSC.Visible = false; - legendSG.Visible = false; - ClearGZData(); - GSOLayer redLayer = globeControl1.Globe.Layers.GetLayerByCaption("红线"); - if (redLayer == null) return; - redLayer.Visible = false; - } - catch (Exception ex) - { - LogHelper.WriteLog(typeof(MainFrm), ex); - } - } + /// /// 双屏对比 /// @@ -7553,8 +7562,8 @@ { try { - globeControl1.BeforeSceneRenderEvent += new BeforeSceneRenderEventHandler(globeControl1_BeforeSceneRenderEvent); - globeControl2.BeforeSceneRenderEvent += new BeforeSceneRenderEventHandler(globeControl2_BeforeSceneRenderEvent); + globeControl1.BeforeSceneRenderEvent += globeControl1_BeforeSceneRenderEvent; + globeControl2.BeforeSceneRenderEvent += globeControl2_BeforeSceneRenderEvent; globeControl1.Globe.Action = EnumAction3D.ActionNull; panelOfTable.Visible = false; @@ -7570,32 +7579,43 @@ GSOLayer redLayer = globeControl1.Globe.Layers.GetLayerByCaption("红线"); if (redLayer != null) - { redLayer.Visible = false; - } } catch (Exception ex) { - LogHelper.WriteLog(typeof(MainFrm), ex); + //MessageBox.Show("系统运行错误:" + ex.ToString(), "错误", MessageBoxButtons.OK, MessageBoxIcon.Error); } } /// - /// 基础工具 - /// - /// - /// - private void ribbonTabItem1_MouseDown(object sender, MouseEventArgs e) - { - ResetRibbonTab(); - } - /// /// 文档管理 /// /// /// private void ribbonTabItem4_MouseDown(object sender, MouseEventArgs e) { - ResetRibbonTab(); + try + { + + globeControl1.BeforeSceneRenderEvent -= globeControl1_BeforeSceneRenderEvent; + globeControl2.BeforeSceneRenderEvent -= globeControl2_BeforeSceneRenderEvent; + + globeControl1.Globe.Action = EnumAction3D.ActionNull; + panelOfTable.Visible = false; + //zhanshi = false; + redSH = false; + splitContainer1.Panel2Collapsed = true; + dataGridViewX1.AutoSizeColumnsMode = DataGridViewAutoSizeColumnsMode.AllCells; + legendSC.Visible = false; + legendSG.Visible = false; + ClearGZData(); + GSOLayer redLayer = globeControl1.Globe.Layers.GetLayerByCaption("红线"); + if (redLayer != null) + redLayer.Visible = false; + } + catch (Exception ex) + { + //MessageBox.Show("系统运行错误:" + ex.ToString(), "错误", MessageBoxButtons.OK, MessageBoxIcon.Error); + } } /// /// 基础管理 @@ -7604,7 +7624,29 @@ /// private void ribbonTabItem14_MouseDown(object sender, MouseEventArgs e) { - ResetRibbonTab(); + try + { + globeControl1.BeforeSceneRenderEvent -= globeControl1_BeforeSceneRenderEvent; + globeControl2.BeforeSceneRenderEvent -= globeControl2_BeforeSceneRenderEvent; + + globeControl1.Globe.Action = EnumAction3D.ActionNull; + panelOfTable.Visible = false; + //zhanshi = false; + redSH = false; + splitContainer1.Panel2Collapsed = true; + dataGridViewX1.AutoSizeColumnsMode = DataGridViewAutoSizeColumnsMode.AllCells; + legendSC.Visible = false; + legendSG.Visible = false; + ClearGZData(); + + GSOLayer redLayer = globeControl1.Globe.Layers.GetLayerByCaption("红线"); + if (redLayer != null) + redLayer.Visible = false; + } + catch (Exception ex) + { + //MessageBox.Show("系统运行错误:" + ex.ToString(), "错误", MessageBoxButtons.OK, MessageBoxIcon.Error); + } } /// /// 权限管理 @@ -7613,26 +7655,31 @@ /// private void ribbonTabItem2_MouseDown(object sender, MouseEventArgs e) { - ResetRibbonTab(); + try + { + globeControl1.BeforeSceneRenderEvent -= globeControl1_BeforeSceneRenderEvent; + globeControl2.BeforeSceneRenderEvent -= globeControl2_BeforeSceneRenderEvent; + + globeControl1.Globe.Action = EnumAction3D.ActionNull; + panelOfTable.Visible = false; + //zhanshi = false; + redSH = false; + splitContainer1.Panel2Collapsed = true; + dataGridViewX1.AutoSizeColumnsMode = DataGridViewAutoSizeColumnsMode.AllCells; + legendSC.Visible = false; + legendSG.Visible = false; + ClearGZData(); + + GSOLayer redLayer = globeControl1.Globe.Layers.GetLayerByCaption("红线"); + if (redLayer == null) return; + redLayer.Visible = false; + } + catch (Exception ex) + { + //MessageBox.Show("系统运行错误:" + ex.ToString(), "错误", MessageBoxButtons.OK, MessageBoxIcon.Error); + } } - /// - /// 管线定位 - /// - /// - /// - private void ribbonTabItem7_MouseDown(object sender, MouseEventArgs e) - { - ResetRibbonTab(); - } - /// - /// 标识器管理 - /// - /// - /// - private void ribbonTabItem5_MouseDown(object sender, MouseEventArgs e) - { - ResetRibbonTab(); - } + //GSOFeature dpFeatuer = null; /// /// 双屏分析，点击管段分析 @@ -8017,7 +8064,9 @@ private void btn_flag_Click(object sender, EventArgs e) { if (FrmFlagManagers.IS_OPEN) + { return; + } FrmFlagManagers frm = new FrmFlagManagers(globeControl1); frm.Show(this); } diff --git a/MainFrm.designer.cs b/MainFrm.designer.cs index e3dca41..73398c0 100644 --- a/MainFrm.designer.cs +++ b/MainFrm.designer.cs @@ -4,6 +4,7 @@ using DevComponents.DotNetBar; using DevComponents.DotNetBar.Controls; using DevComponents.Editors; +using System.Drawing; namespace Cyberpipe { @@ -89,6 +90,7 @@ this.sideBar1 = new DevComponents.DotNetBar.SideBar(); this.panelEx3 = new DevComponents.DotNetBar.PanelEx(); this.layerSensorTree = new System.Windows.Forms.TreeView(); + this.layerTree = new Cyberpipe.MyTreeView(); this.sideBarPanelItem3 = new DevComponents.DotNetBar.SideBarPanelItem(); this.controlContainerItem3 = new DevComponents.DotNetBar.ControlContainerItem(); this.sideBarPanelItem4 = new DevComponents.DotNetBar.SideBarPanelItem(); @@ -243,42 +245,18 @@ this.保存ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.定位ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.ribbonControl1 = new DevComponents.DotNetBar.RibbonControl(); - this.ribbonPanel6 = new DevComponents.DotNetBar.RibbonPanel(); - this.ribbonBar6 = new DevComponents.DotNetBar.RibbonBar(); - this.buttonItemSPSZ = new DevComponents.DotNetBar.ButtonItem(); - this.buttonItem8 = new DevComponents.DotNetBar.ButtonItem(); - this.buttonItemLocation = new DevComponents.DotNetBar.ButtonItem(); - this.sliderItem2 = new DevComponents.DotNetBar.SliderItem(); - this.buttonItemGBJC = new DevComponents.DotNetBar.ButtonItem(); - this.ribbonPanel5 = new DevComponents.DotNetBar.RibbonPanel(); - this.ribbonBar2 = new DevComponents.DotNetBar.RibbonBar(); - this.buttonItemHX1 = new DevComponents.DotNetBar.ButtonItem(); - this.buttonItemHX2 = new DevComponents.DotNetBar.ButtonItem(); - this.buttonItemDCTP = new DevComponents.DotNetBar.ButtonItem(); - this.sliderItem3 = new DevComponents.DotNetBar.SliderItem(); - this.ribbonPanel1 = new DevComponents.DotNetBar.RibbonPanel(); - this.ribbonBar21 = new DevComponents.DotNetBar.RibbonBar(); - this.buttonItem87 = new DevComponents.DotNetBar.ButtonItem(); - this.buttonItem88 = new DevComponents.DotNetBar.ButtonItem(); - this.buttonItem27 = new DevComponents.DotNetBar.ButtonItem(); - this.buttonItem91 = new DevComponents.DotNetBar.ButtonItem(); - this.buttonItem1 = new DevComponents.DotNetBar.ButtonItem(); - this.btnlegendSet = new DevComponents.DotNetBar.ButtonItem(); - this.buttonItem89 = new DevComponents.DotNetBar.ButtonItem(); - this.btnOutputJPG = new DevComponents.DotNetBar.ButtonItem(); - this.ribbonPanel12 = new DevComponents.DotNetBar.RibbonPanel(); - this.ribbonBar18 = new DevComponents.DotNetBar.RibbonBar(); - this.buttonItem133 = new DevComponents.DotNetBar.ButtonItem(); - this.ribbonBar13 = new DevComponents.DotNetBar.RibbonBar(); - this.buttonItem127 = new DevComponents.DotNetBar.ButtonItem(); - this.buttonItem128 = new DevComponents.DotNetBar.ButtonItem(); - this.sliderItem1 = new DevComponents.DotNetBar.SliderItem(); - this.buttonItem134 = new DevComponents.DotNetBar.ButtonItem(); - this.buttonItem130 = new DevComponents.DotNetBar.ButtonItem(); - this.btn_check_history = new DevComponents.DotNetBar.ButtonItem(); - this.ribbonPanel4 = new DevComponents.DotNetBar.RibbonPanel(); - this.ribbonBar1 = new DevComponents.DotNetBar.RibbonBar(); - this.btn_document_info = new DevComponents.DotNetBar.ButtonItem(); + this.ribbonPanel3 = new DevComponents.DotNetBar.RibbonPanel(); + this.ribbonBar4 = new DevComponents.DotNetBar.RibbonBar(); + this.btn_flag = new DevComponents.DotNetBar.ButtonItem(); + this.slider4ground = new DevComponents.DotNetBar.SliderItem(); + this.ribbonPanel7 = new DevComponents.DotNetBar.RibbonPanel(); + this.gxdw_ribbonbar = new DevComponents.DotNetBar.RibbonBar(); + this.buttonItem9 = new DevComponents.DotNetBar.ButtonItem(); + this.buttonItem10 = new DevComponents.DotNetBar.ButtonItem(); + this.buttonItem11 = new DevComponents.DotNetBar.ButtonItem(); + this.buttonItem12 = new DevComponents.DotNetBar.ButtonItem(); + this.buttonItem13 = new DevComponents.DotNetBar.ButtonItem(); + this.buttonItem14 = new DevComponents.DotNetBar.ButtonItem(); this.ribbonPanel15 = new DevComponents.DotNetBar.RibbonPanel(); this.ribbonBar20 = new DevComponents.DotNetBar.RibbonBar(); this.buttonItemSH = new DevComponents.DotNetBar.ButtonItem(); @@ -334,18 +312,6 @@ this.buttonItemXT4 = new DevComponents.DotNetBar.ButtonItem(); this.buttonItemXT4_1 = new DevComponents.DotNetBar.ButtonItem(); this.buttonItemXT4_2 = new DevComponents.DotNetBar.ButtonItem(); - this.ribbonPanel3 = new DevComponents.DotNetBar.RibbonPanel(); - this.ribbonBar4 = new DevComponents.DotNetBar.RibbonBar(); - this.btn_flag = new DevComponents.DotNetBar.ButtonItem(); - this.slider4ground = new DevComponents.DotNetBar.SliderItem(); - this.ribbonPanel7 = new DevComponents.DotNetBar.RibbonPanel(); - this.gxdw_ribbonbar = new DevComponents.DotNetBar.RibbonBar(); - this.buttonItem9 = new DevComponents.DotNetBar.ButtonItem(); - this.buttonItem10 = new DevComponents.DotNetBar.ButtonItem(); - this.buttonItem11 = new DevComponents.DotNetBar.ButtonItem(); - this.buttonItem12 = new DevComponents.DotNetBar.ButtonItem(); - this.buttonItem13 = new DevComponents.DotNetBar.ButtonItem(); - this.buttonItem14 = new DevComponents.DotNetBar.ButtonItem(); this.ribbonPanel2 = new DevComponents.DotNetBar.RibbonPanel(); this.ribbonBar3 = new DevComponents.DotNetBar.RibbonBar(); this.btn_user_info = new DevComponents.DotNetBar.ButtonItem(); @@ -355,6 +321,43 @@ this.btn_user_role = new DevComponents.DotNetBar.ButtonItem(); this.btn_password_edit = new DevComponents.DotNetBar.ButtonItem(); this.buttonItemPasswordReset = new DevComponents.DotNetBar.ButtonItem(); + this.ribbonPanel6 = new DevComponents.DotNetBar.RibbonPanel(); + this.ribbonBar6 = new DevComponents.DotNetBar.RibbonBar(); + this.buttonItemSPSZ = new DevComponents.DotNetBar.ButtonItem(); + this.buttonItem8 = new DevComponents.DotNetBar.ButtonItem(); + this.buttonItemLocation = new DevComponents.DotNetBar.ButtonItem(); + this.sliderItem2 = new DevComponents.DotNetBar.SliderItem(); + this.buttonItemGBJC = new DevComponents.DotNetBar.ButtonItem(); + this.ribbonPanel5 = new DevComponents.DotNetBar.RibbonPanel(); + this.ribbonBar2 = new DevComponents.DotNetBar.RibbonBar(); + this.buttonItemHX1 = new DevComponents.DotNetBar.ButtonItem(); + this.buttonItemHX2 = new DevComponents.DotNetBar.ButtonItem(); + this.buttonItemDCTP = new DevComponents.DotNetBar.ButtonItem(); + this.sliderItem3 = new DevComponents.DotNetBar.SliderItem(); + this.ribbonPanel1 = new DevComponents.DotNetBar.RibbonPanel(); + this.ribbonBar21 = new DevComponents.DotNetBar.RibbonBar(); + this.buttonItem87 = new DevComponents.DotNetBar.ButtonItem(); + this.buttonItem88 = new DevComponents.DotNetBar.ButtonItem(); + this.buttonItem27 = new DevComponents.DotNetBar.ButtonItem(); + this.buttonItem91 = new DevComponents.DotNetBar.ButtonItem(); + this.buttonItem1 = new DevComponents.DotNetBar.ButtonItem(); + this.btnlegendSet = new DevComponents.DotNetBar.ButtonItem(); + this.buttonItem89 = new DevComponents.DotNetBar.ButtonItem(); + this.btnOutputJPG = new DevComponents.DotNetBar.ButtonItem(); + this.ribbonPanel12 = new DevComponents.DotNetBar.RibbonPanel(); + this.ribbonBar18 = new DevComponents.DotNetBar.RibbonBar(); + this.buttonItem133 = new DevComponents.DotNetBar.ButtonItem(); + this.buttonItem132 = new DevComponents.DotNetBar.ButtonItem(); + this.ribbonBar13 = new DevComponents.DotNetBar.RibbonBar(); + this.buttonItem127 = new DevComponents.DotNetBar.ButtonItem(); + this.buttonItem128 = new DevComponents.DotNetBar.ButtonItem(); + this.sliderItem1 = new DevComponents.DotNetBar.SliderItem(); + this.buttonItem134 = new DevComponents.DotNetBar.ButtonItem(); + this.buttonItem130 = new DevComponents.DotNetBar.ButtonItem(); + this.btn_check_history = new DevComponents.DotNetBar.ButtonItem(); + this.ribbonPanel4 = new DevComponents.DotNetBar.RibbonPanel(); + this.ribbonBar1 = new DevComponents.DotNetBar.RibbonBar(); + this.btn_document_info = new DevComponents.DotNetBar.ButtonItem(); this.ribbonTabItem1 = new DevComponents.DotNetBar.RibbonTabItem(); this.ribbonTabItem11 = new DevComponents.DotNetBar.RibbonTabItem(); this.ribbonTabItem6 = new DevComponents.DotNetBar.RibbonTabItem(); @@ -516,7 +519,6 @@ this.labelX17 = new DevComponents.DotNetBar.LabelX(); this.panelEx4 = new DevComponents.DotNetBar.PanelEx(); this.pictureBox1 = new System.Windows.Forms.PictureBox(); - this.layerTree = new Cyberpipe.MyTreeView(); this.statusStrip1.SuspendLayout(); this.sideBar1.SuspendLayout(); this.panelEx3.SuspendLayout(); @@ -527,15 +529,15 @@ this.contextMenuStrip3.SuspendLayout(); this.contextMenuStripDeleteLayerNode.SuspendLayout(); this.ribbonControl1.SuspendLayout(); + this.ribbonPanel3.SuspendLayout(); + this.ribbonPanel7.SuspendLayout(); + this.ribbonPanel15.SuspendLayout(); + this.ribbonPanel2.SuspendLayout(); this.ribbonPanel6.SuspendLayout(); this.ribbonPanel5.SuspendLayout(); this.ribbonPanel1.SuspendLayout(); this.ribbonPanel12.SuspendLayout(); this.ribbonPanel4.SuspendLayout(); - this.ribbonPanel15.SuspendLayout(); - this.ribbonPanel3.SuspendLayout(); - this.ribbonPanel7.SuspendLayout(); - this.ribbonPanel2.SuspendLayout(); this.panelOfTable.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.dataGridViewX1)).BeginInit(); this.statusStrip2.SuspendLayout(); @@ -711,7 +713,8 @@ this.statusLabel.Name = "statusLabel"; this.statusLabel.Size = new System.Drawing.Size(1313, 17); this.statusLabel.Spring = true; - this.statusLabel.Text = " ©2014-2015 苏州航天系统工程有限公司 版权所有"; + this.statusLabel.Text = Utility.Copyright; +// this.statusLabel.Text = " ©2014-2015 苏州航天系统工程有限公司 版权所有"; // // toolStripDropDownButton1 // @@ -956,6 +959,18 @@ this.layerSensorTree.NodeMouseClick += new System.Windows.Forms.TreeNodeMouseClickEventHandler(this.layerMarkerTree_NodeMouseClick); this.layerSensorTree.NodeMouseDoubleClick += new System.Windows.Forms.TreeNodeMouseClickEventHandler(this.layerTree_NodeMouseDoubleClick); // + // layerTree + // + this.layerTree.CheckBoxes = true; + this.layerTree.ItemHeight = 18; + this.layerTree.Location = new System.Drawing.Point(30, 78); + this.layerTree.Name = "layerTree"; + this.layerTree.Size = new System.Drawing.Size(121, 97); + this.layerTree.TabIndex = 1; + this.layerTree.AfterCheck += new System.Windows.Forms.TreeViewEventHandler(this.layerTree_AfterCheck); + this.layerTree.NodeMouseClick += new System.Windows.Forms.TreeNodeMouseClickEventHandler(this.layerTree_NodeMouseClick); + this.layerTree.NodeMouseDoubleClick += new System.Windows.Forms.TreeNodeMouseClickEventHandler(this.layerTree_NodeMouseDoubleClick); + // // sideBarPanelItem3 // this.sideBarPanelItem3.FontBold = true; @@ -2150,13 +2165,13 @@ this.ribbonControl1.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.ribbonControl1.Controls.Add(this.ribbonPanel3); this.ribbonControl1.Controls.Add(this.ribbonPanel7); - this.ribbonControl1.Controls.Add(this.ribbonPanel2); this.ribbonControl1.Controls.Add(this.ribbonPanel15); - this.ribbonControl1.Controls.Add(this.ribbonPanel4); - this.ribbonControl1.Controls.Add(this.ribbonPanel1); + this.ribbonControl1.Controls.Add(this.ribbonPanel2); this.ribbonControl1.Controls.Add(this.ribbonPanel6); - this.ribbonControl1.Controls.Add(this.ribbonPanel12); this.ribbonControl1.Controls.Add(this.ribbonPanel5); + this.ribbonControl1.Controls.Add(this.ribbonPanel1); + this.ribbonControl1.Controls.Add(this.ribbonPanel12); + this.ribbonControl1.Controls.Add(this.ribbonPanel4); this.ribbonControl1.Dock = System.Windows.Forms.DockStyle.Top; this.ribbonControl1.ImeMode = System.Windows.Forms.ImeMode.NoControl; this.ribbonControl1.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { @@ -2200,609 +2215,216 @@ this.ribbonControl1.Text = "ribbonControl1"; this.ribbonControl1.UseCustomizeDialog = false; // - // ribbonPanel6 + // ribbonPanel3 // - this.ribbonPanel6.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.ribbonPanel6.Controls.Add(this.ribbonBar6); - this.ribbonPanel6.Dock = System.Windows.Forms.DockStyle.Fill; - this.ribbonPanel6.Location = new System.Drawing.Point(0, 0); - this.ribbonPanel6.Name = "ribbonPanel6"; - this.ribbonPanel6.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); - this.ribbonPanel6.Size = new System.Drawing.Size(1328, 95); + this.ribbonPanel3.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.ribbonPanel3.Controls.Add(this.ribbonBar4); + this.ribbonPanel3.Dock = System.Windows.Forms.DockStyle.Fill; + this.ribbonPanel3.Location = new System.Drawing.Point(0, 33); + this.ribbonPanel3.Name = "ribbonPanel3"; + this.ribbonPanel3.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); + this.ribbonPanel3.Size = new System.Drawing.Size(1328, 62); // // // - this.ribbonPanel6.Style.Class = ""; - this.ribbonPanel6.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonPanel3.Style.Class = ""; + this.ribbonPanel3.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; // // // - this.ribbonPanel6.StyleMouseDown.Class = ""; - this.ribbonPanel6.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonPanel3.StyleMouseDown.Class = ""; + this.ribbonPanel3.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; // // // - this.ribbonPanel6.StyleMouseOver.Class = ""; - this.ribbonPanel6.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonPanel6.TabIndex = 38; - this.ribbonPanel6.Visible = false; + this.ribbonPanel3.StyleMouseOver.Class = ""; + this.ribbonPanel3.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonPanel3.TabIndex = 40; // - // ribbonBar6 + // ribbonBar4 // - this.ribbonBar6.AutoOverflowEnabled = true; + this.ribbonBar4.AutoOverflowEnabled = true; // // // - this.ribbonBar6.BackgroundMouseOverStyle.Class = ""; - this.ribbonBar6.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar4.BackgroundMouseOverStyle.Class = ""; + this.ribbonBar4.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; // // // - this.ribbonBar6.BackgroundStyle.Class = ""; - this.ribbonBar6.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonBar6.ContainerControlProcessDialogKey = true; - this.ribbonBar6.Dock = System.Windows.Forms.DockStyle.Left; - this.ribbonBar6.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { - this.buttonItemSPSZ, - this.buttonItem8, - this.buttonItemLocation, - this.sliderItem2, - this.buttonItemGBJC}); - this.ribbonBar6.Location = new System.Drawing.Point(3, 0); - this.ribbonBar6.Name = "ribbonBar6"; - this.ribbonBar6.Size = new System.Drawing.Size(427, 92); - this.ribbonBar6.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.ribbonBar6.TabIndex = 0; + this.ribbonBar4.BackgroundStyle.Class = ""; + this.ribbonBar4.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar4.ContainerControlProcessDialogKey = true; + this.ribbonBar4.Dock = System.Windows.Forms.DockStyle.Left; + this.ribbonBar4.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { + this.btn_flag, + this.slider4ground}); + this.ribbonBar4.Location = new System.Drawing.Point(3, 0); + this.ribbonBar4.Name = "ribbonBar4"; + this.ribbonBar4.Size = new System.Drawing.Size(634, 59); + this.ribbonBar4.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.ribbonBar4.TabIndex = 0; // // // - this.ribbonBar6.TitleStyle.Class = ""; - this.ribbonBar6.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar4.TitleStyle.Class = ""; + this.ribbonBar4.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; // // // - this.ribbonBar6.TitleStyleMouseOver.Class = ""; - this.ribbonBar6.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonBar6.TitleVisible = false; + this.ribbonBar4.TitleStyleMouseOver.Class = ""; + this.ribbonBar4.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar4.TitleVisible = false; // - // buttonItemSPSZ + // btn_flag // - this.buttonItemSPSZ.Image = ((System.Drawing.Image)(resources.GetObject("buttonItemSPSZ.Image"))); - this.buttonItemSPSZ.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItemSPSZ.Name = "buttonItemSPSZ"; - this.buttonItemSPSZ.SubItemsExpandWidth = 14; - this.buttonItemSPSZ.Text = "双屏设置"; - this.buttonItemSPSZ.Click += new System.EventHandler(this.buttonItemSPSZ_Click); + this.btn_flag.Image = global::Cyberpipe.Properties.Resources._24x24icon_03_hover; + this.btn_flag.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.btn_flag.Name = "btn_flag"; + this.btn_flag.SubItemsExpandWidth = 14; + this.btn_flag.Text = "标识器管理"; + this.btn_flag.Click += new System.EventHandler(this.btn_flag_Click); // - // buttonItem8 + // slider4ground // - this.buttonItem8.Image = ((System.Drawing.Image)(resources.GetObject("buttonItem8.Image"))); - this.buttonItem8.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem8.Name = "buttonItem8"; - this.buttonItem8.SubItemsExpandWidth = 14; - this.buttonItem8.Text = "双屏分析"; - this.buttonItem8.Click += new System.EventHandler(this.buttonItem8_Click); + this.slider4ground.LabelPosition = DevComponents.DotNetBar.eSliderLabelPosition.Top; + this.slider4ground.LabelWidth = 50; + this.slider4ground.Name = "slider4ground"; + this.slider4ground.Text = "地面透明度"; + this.slider4ground.TextColor = System.Drawing.Color.Black; + this.slider4ground.Value = 0; + this.slider4ground.ValueChanged += new System.EventHandler(this.slider4ground_ValueChanged); // - // buttonItemLocation + // ribbonPanel7 // - this.buttonItemLocation.Image = ((System.Drawing.Image)(resources.GetObject("buttonItemLocation.Image"))); - this.buttonItemLocation.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItemLocation.Name = "buttonItemLocation"; - this.buttonItemLocation.SubItemsExpandWidth = 14; - this.buttonItemLocation.Text = "快速定位"; - this.buttonItemLocation.Click += new System.EventHandler(this.buttonItemLocation_Click); + this.ribbonPanel7.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.ribbonPanel7.Controls.Add(this.gxdw_ribbonbar); + this.ribbonPanel7.Dock = System.Windows.Forms.DockStyle.Fill; + this.ribbonPanel7.Location = new System.Drawing.Point(0, 33); + this.ribbonPanel7.Name = "ribbonPanel7"; + this.ribbonPanel7.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); + this.ribbonPanel7.Size = new System.Drawing.Size(1328, 62); // - // sliderItem2 // - this.sliderItem2.LabelPosition = DevComponents.DotNetBar.eSliderLabelPosition.Top; - this.sliderItem2.LabelWidth = 50; - this.sliderItem2.Name = "sliderItem2"; - this.sliderItem2.Text = "地面透明度"; - this.sliderItem2.TextColor = System.Drawing.Color.Black; - this.sliderItem2.Value = 0; - this.sliderItem2.ValueChanged += new System.EventHandler(this.sliderItem2_ValueChanged); // - // buttonItemGBJC + this.ribbonPanel7.Style.Class = ""; + this.ribbonPanel7.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; // - this.buttonItemGBJC.Image = ((System.Drawing.Image)(resources.GetObject("buttonItemGBJC.Image"))); - this.buttonItemGBJC.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItemGBJC.Name = "buttonItemGBJC"; - this.buttonItemGBJC.SubItemsExpandWidth = 14; - this.buttonItemGBJC.Text = "国标检测"; - this.buttonItemGBJC.Click += new System.EventHandler(this.buttonItemGBJC_Click); // - // ribbonPanel5 // - this.ribbonPanel5.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.ribbonPanel5.Controls.Add(this.ribbonBar2); - this.ribbonPanel5.Dock = System.Windows.Forms.DockStyle.Fill; - this.ribbonPanel5.Location = new System.Drawing.Point(0, 0); - this.ribbonPanel5.Name = "ribbonPanel5"; - this.ribbonPanel5.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); - this.ribbonPanel5.Size = new System.Drawing.Size(1328, 95); + this.ribbonPanel7.StyleMouseDown.Class = ""; + this.ribbonPanel7.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; // // // - this.ribbonPanel5.Style.Class = ""; - this.ribbonPanel5.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonPanel7.StyleMouseOver.Class = ""; + this.ribbonPanel7.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonPanel7.TabIndex = 41; + this.ribbonPanel7.Visible = false; // + // gxdw_ribbonbar // + this.gxdw_ribbonbar.AutoOverflowEnabled = true; // - this.ribbonPanel5.StyleMouseDown.Class = ""; - this.ribbonPanel5.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; // // + this.gxdw_ribbonbar.BackgroundMouseOverStyle.Class = ""; + this.gxdw_ribbonbar.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; // - this.ribbonPanel5.StyleMouseOver.Class = ""; - this.ribbonPanel5.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonPanel5.TabIndex = 37; - this.ribbonPanel5.Visible = false; // - // ribbonBar2 // - this.ribbonBar2.AutoOverflowEnabled = true; + this.gxdw_ribbonbar.BackgroundStyle.Class = ""; + this.gxdw_ribbonbar.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.gxdw_ribbonbar.ContainerControlProcessDialogKey = true; + this.gxdw_ribbonbar.Dock = System.Windows.Forms.DockStyle.Left; + this.gxdw_ribbonbar.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { + this.buttonItem9, + this.buttonItem10, + this.buttonItem11, + this.buttonItem12, + this.buttonItem13, + this.buttonItem14}); + this.gxdw_ribbonbar.Location = new System.Drawing.Point(3, 0); + this.gxdw_ribbonbar.Name = "gxdw_ribbonbar"; + this.gxdw_ribbonbar.Size = new System.Drawing.Size(564, 59); + this.gxdw_ribbonbar.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.gxdw_ribbonbar.TabIndex = 0; + this.gxdw_ribbonbar.Text = "ribbonBar5"; // // // - this.ribbonBar2.BackgroundMouseOverStyle.Class = ""; - this.ribbonBar2.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.gxdw_ribbonbar.TitleStyle.Class = ""; + this.gxdw_ribbonbar.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; // // // - this.ribbonBar2.BackgroundStyle.Class = ""; - this.ribbonBar2.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonBar2.ContainerControlProcessDialogKey = true; - this.ribbonBar2.Dock = System.Windows.Forms.DockStyle.Left; - this.ribbonBar2.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { - this.buttonItemHX1, - this.buttonItemHX2, - this.buttonItemDCTP, - this.sliderItem3}); - this.ribbonBar2.Location = new System.Drawing.Point(3, 0); - this.ribbonBar2.Name = "ribbonBar2"; - this.ribbonBar2.Size = new System.Drawing.Size(350, 92); - this.ribbonBar2.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.ribbonBar2.TabIndex = 0; + this.gxdw_ribbonbar.TitleStyleMouseOver.Class = ""; + this.gxdw_ribbonbar.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.gxdw_ribbonbar.TitleVisible = false; // + // buttonItem9 // + this.buttonItem9.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__76; + this.buttonItem9.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem9.Name = "buttonItem9"; + this.buttonItem9.SubItemsExpandWidth = 14; + this.buttonItem9.Text = "工单管理"; + this.buttonItem9.Click += new System.EventHandler(this.buttonItem9_Click); // - this.ribbonBar2.TitleStyle.Class = ""; - this.ribbonBar2.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // buttonItem10 // + this.buttonItem10.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__69; + this.buttonItem10.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem10.Name = "buttonItem10"; + this.buttonItem10.SubItemsExpandWidth = 14; + this.buttonItem10.Text = "在线任务"; + this.buttonItem10.Click += new System.EventHandler(this.buttonItem10_Click); // + // buttonItem11 // - this.ribbonBar2.TitleStyleMouseOver.Class = ""; - this.ribbonBar2.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonBar2.TitleVisible = false; + this.buttonItem11.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__72; + this.buttonItem11.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem11.Name = "buttonItem11"; + this.buttonItem11.SubItemsExpandWidth = 14; + this.buttonItem11.Text = "事件管理"; + this.buttonItem11.Click += new System.EventHandler(this.buttonItem11_Click); // - // buttonItemHX1 + // buttonItem12 // - this.buttonItemHX1.AutoExpandOnClick = true; - this.buttonItemHX1.Image = ((System.Drawing.Image)(resources.GetObject("buttonItemHX1.Image"))); - this.buttonItemHX1.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItemHX1.Name = "buttonItemHX1"; - this.buttonItemHX1.SubItemsExpandWidth = 14; - this.buttonItemHX1.Text = "导入红线"; - this.buttonItemHX1.Click += new System.EventHandler(this.buttonItemHX1_Click); + this.buttonItem12.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__34; + this.buttonItem12.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem12.Name = "buttonItem12"; + this.buttonItem12.SubItemsExpandWidth = 14; + this.buttonItem12.Text = "探测仪管理"; + this.buttonItem12.Click += new System.EventHandler(this.buttonItem12_Click); // - // buttonItemHX2 + // buttonItem13 // - this.buttonItemHX2.Image = ((System.Drawing.Image)(resources.GetObject("buttonItemHX2.Image"))); - this.buttonItemHX2.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItemHX2.Name = "buttonItemHX2"; - this.buttonItemHX2.SubItemsExpandWidth = 14; - this.buttonItemHX2.Text = "红线审核"; - this.buttonItemHX2.Click += new System.EventHandler(this.buttonItemHX2_Click); + this.buttonItem13.Image = global::Cyberpipe.Properties.Resources._24x24icon_13_hover; + this.buttonItem13.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem13.Name = "buttonItem13"; + this.buttonItem13.SubItemsExpandWidth = 14; + this.buttonItem13.Text = "巡检人员维护"; + this.buttonItem13.Click += new System.EventHandler(this.buttonItem13_Click); // - // buttonItemDCTP + // buttonItem14 // - this.buttonItemDCTP.Image = ((System.Drawing.Image)(resources.GetObject("buttonItemDCTP.Image"))); - this.buttonItemDCTP.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItemDCTP.Name = "buttonItemDCTP"; - this.buttonItemDCTP.SubItemsExpandWidth = 14; - this.buttonItemDCTP.Text = "导出图片"; - this.buttonItemDCTP.Click += new System.EventHandler(this.buttonItemDCTP_Click); - // - // sliderItem3 - // - this.sliderItem3.LabelPosition = DevComponents.DotNetBar.eSliderLabelPosition.Top; - this.sliderItem3.LabelWidth = 50; - this.sliderItem3.Name = "sliderItem3"; - this.sliderItem3.Text = "地面透明度"; - this.sliderItem3.TextColor = System.Drawing.Color.Black; - this.sliderItem3.Value = 0; - this.sliderItem3.ValueChanged += new System.EventHandler(this.sliderItem3_ValueChanged); - // - // ribbonPanel1 - // - this.ribbonPanel1.AutoSize = true; - this.ribbonPanel1.CanvasColor = System.Drawing.Color.Gray; - this.ribbonPanel1.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.ribbonPanel1.Controls.Add(this.ribbonBar21); - this.ribbonPanel1.Dock = System.Windows.Forms.DockStyle.Fill; - this.ribbonPanel1.Location = new System.Drawing.Point(0, 0); - this.ribbonPanel1.Name = "ribbonPanel1"; - this.ribbonPanel1.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); - this.ribbonPanel1.Size = new System.Drawing.Size(1328, 95); - // - // - // - this.ribbonPanel1.Style.Class = ""; - this.ribbonPanel1.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonPanel1.StyleMouseDown.Class = ""; - this.ribbonPanel1.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonPanel1.StyleMouseOver.Class = ""; - this.ribbonPanel1.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonPanel1.TabIndex = 1; - this.ribbonPanel1.Visible = false; - // - // ribbonBar21 - // - this.ribbonBar21.AutoOverflowEnabled = true; - this.ribbonBar21.BackColor = System.Drawing.Color.White; - // - // - // - this.ribbonBar21.BackgroundMouseOverStyle.Class = ""; - this.ribbonBar21.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonBar21.BackgroundStyle.Class = ""; - this.ribbonBar21.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonBar21.ContainerControlProcessDialogKey = true; - this.ribbonBar21.Dock = System.Windows.Forms.DockStyle.Left; - this.ribbonBar21.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { - this.buttonItem87, - this.buttonItem88, - this.buttonItem27, - this.sliderGroundTransSet1, - this.buttonItem91, - this.buttonItem1, - this.btnlegendSet, - this.buttonItem89, - this.btnOutputJPG}); - this.ribbonBar21.Location = new System.Drawing.Point(3, 0); - this.ribbonBar21.Name = "ribbonBar21"; - this.ribbonBar21.Size = new System.Drawing.Size(649, 92); - this.ribbonBar21.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.ribbonBar21.TabIndex = 2; - this.ribbonBar21.Text = "浏览模式"; - // - // - // - this.ribbonBar21.TitleStyle.Class = ""; - this.ribbonBar21.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonBar21.TitleStyleMouseOver.Class = ""; - this.ribbonBar21.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonBar21.TitleVisible = false; - // - // buttonItem87 - // - this.buttonItem87.Image = ((System.Drawing.Image)(resources.GetObject("buttonItem87.Image"))); - this.buttonItem87.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem87.Name = "buttonItem87"; - this.buttonItem87.SubItemsExpandWidth = 14; - this.buttonItem87.Text = "地上模式"; - this.buttonItem87.Click += new System.EventHandler(this.buttonItem87_Click); - // - // buttonItem88 - // - this.buttonItem88.Image = ((System.Drawing.Image)(resources.GetObject("buttonItem88.Image"))); - this.buttonItem88.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem88.Name = "buttonItem88"; - this.buttonItem88.SubItemsExpandWidth = 14; - this.buttonItem88.Text = "地下模式"; - this.buttonItem88.Click += new System.EventHandler(this.buttonItem88_Click); - // - // buttonItem27 - // - this.buttonItem27.Image = ((System.Drawing.Image)(resources.GetObject("buttonItem27.Image"))); - this.buttonItem27.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem27.Name = "buttonItem27"; - this.buttonItem27.SubItemsExpandWidth = 14; - this.buttonItem27.Text = "行走模式"; - this.buttonItem27.Click += new System.EventHandler(this.buttonItem27_Click); - // - // buttonItem91 - // - this.buttonItem91.ForeColor = System.Drawing.Color.Black; - this.buttonItem91.Image = ((System.Drawing.Image)(resources.GetObject("buttonItem91.Image"))); - this.buttonItem91.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem91.Name = "buttonItem91"; - this.buttonItem91.SubItemsExpandWidth = 14; - this.buttonItem91.Text = "快速定位"; - this.buttonItem91.Click += new System.EventHandler(this.buttonItem91_Click); - // - // buttonItem1 - // - this.buttonItem1.Image = ((System.Drawing.Image)(resources.GetObject("buttonItem1.Image"))); - this.buttonItem1.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem1.Name = "buttonItem1"; - this.buttonItem1.SubItemsExpandWidth = 14; - this.buttonItem1.Text = "图层管理"; - this.buttonItem1.Click += new System.EventHandler(this.buttonItem1_Click); - // - // btnlegendSet - // - this.btnlegendSet.Image = ((System.Drawing.Image)(resources.GetObject("btnlegendSet.Image"))); - this.btnlegendSet.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.btnlegendSet.Name = "btnlegendSet"; - this.btnlegendSet.SubItemsExpandWidth = 14; - this.btnlegendSet.Text = "图例"; - this.btnlegendSet.Click += new System.EventHandler(this.btnlegendSet_Click); - // - // buttonItem89 - // - this.buttonItem89.Image = ((System.Drawing.Image)(resources.GetObject("buttonItem89.Image"))); - this.buttonItem89.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem89.Name = "buttonItem89"; - this.buttonItem89.SubItemsExpandWidth = 14; - this.buttonItem89.Text = "全屏显示"; - this.buttonItem89.Click += new System.EventHandler(this.buttonItem89_Click); - // - // btnOutputJPG - // - this.btnOutputJPG.Image = ((System.Drawing.Image)(resources.GetObject("btnOutputJPG.Image"))); - this.btnOutputJPG.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.btnOutputJPG.Name = "btnOutputJPG"; - this.btnOutputJPG.SubItemsExpandWidth = 14; - this.btnOutputJPG.Text = "导出图片"; - this.btnOutputJPG.Click += new System.EventHandler(this.btnOutputJPG_Click); - // - // ribbonPanel12 - // - this.ribbonPanel12.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.ribbonPanel12.Controls.Add(this.ribbonBar18); - this.ribbonPanel12.Controls.Add(this.ribbonBar13); - this.ribbonPanel12.Dock = System.Windows.Forms.DockStyle.Fill; - this.ribbonPanel12.Location = new System.Drawing.Point(0, 0); - this.ribbonPanel12.Name = "ribbonPanel12"; - this.ribbonPanel12.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); - this.ribbonPanel12.Size = new System.Drawing.Size(1328, 95); - // - // - // - this.ribbonPanel12.Style.Class = ""; - this.ribbonPanel12.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonPanel12.StyleMouseDown.Class = ""; - this.ribbonPanel12.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonPanel12.StyleMouseOver.Class = ""; - this.ribbonPanel12.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonPanel12.TabIndex = 34; - this.ribbonPanel12.Visible = false; - // - // ribbonBar18 - // - this.ribbonBar18.AutoOverflowEnabled = true; - // - // - // - this.ribbonBar18.BackgroundMouseOverStyle.Class = ""; - this.ribbonBar18.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonBar18.BackgroundStyle.Class = ""; - this.ribbonBar18.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonBar18.ContainerControlProcessDialogKey = true; - this.ribbonBar18.Dock = System.Windows.Forms.DockStyle.Left; - this.ribbonBar18.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { - this.buttonItem133}); - this.ribbonBar18.Location = new System.Drawing.Point(531, 0); - this.ribbonBar18.Name = "ribbonBar18"; - this.ribbonBar18.Size = new System.Drawing.Size(129, 92); - this.ribbonBar18.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.ribbonBar18.TabIndex = 1; - // - // - // - this.ribbonBar18.TitleStyle.Class = ""; - this.ribbonBar18.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonBar18.TitleStyleMouseOver.Class = ""; - this.ribbonBar18.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonBar18.TitleVisible = false; - // - // buttonItem133 - // - this.buttonItem133.Image = ((System.Drawing.Image)(resources.GetObject("buttonItem133.Image"))); - this.buttonItem133.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem133.Name = "buttonItem133"; - this.buttonItem133.SubItemsExpandWidth = 14; - this.buttonItem133.Text = "审核入库"; - this.buttonItem133.Click += new System.EventHandler(this.buttonItem133_Click_1); - // - // ribbonBar13 - // - this.ribbonBar13.AutoOverflowEnabled = true; - // - // - // - this.ribbonBar13.BackgroundMouseOverStyle.Class = ""; - this.ribbonBar13.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonBar13.BackgroundStyle.Class = ""; - this.ribbonBar13.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonBar13.ContainerControlProcessDialogKey = true; - this.ribbonBar13.Dock = System.Windows.Forms.DockStyle.Left; - this.ribbonBar13.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { - this.buttonItem127, - this.buttonItem128, - this.sliderItem1, - this.buttonItem134, - this.buttonItem130, - this.btn_check_history}); - this.ribbonBar13.Location = new System.Drawing.Point(3, 0); - this.ribbonBar13.Name = "ribbonBar13"; - this.ribbonBar13.Size = new System.Drawing.Size(528, 92); - this.ribbonBar13.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.ribbonBar13.TabIndex = 0; - // - // - // - this.ribbonBar13.TitleStyle.Class = ""; - this.ribbonBar13.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonBar13.TitleStyleMouseOver.Class = ""; - this.ribbonBar13.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonBar13.TitleVisible = false; - // - // buttonItem127 - // - this.buttonItem127.Image = ((System.Drawing.Image)(resources.GetObject("buttonItem127.Image"))); - this.buttonItem127.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem127.Name = "buttonItem127"; - this.buttonItem127.SubItemsExpandWidth = 14; - this.buttonItem127.Text = "打开数据"; - this.buttonItem127.Click += new System.EventHandler(this.buttonItem127_Click_2); - // - // buttonItem128 - // - this.buttonItem128.Image = ((System.Drawing.Image)(resources.GetObject("buttonItem128.Image"))); - this.buttonItem128.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem128.Name = "buttonItem128"; - this.buttonItem128.SubItemsExpandWidth = 14; - this.buttonItem128.Text = "一键审核"; - this.buttonItem128.Click += new System.EventHandler(this.buttonItem128_Click); - // - // sliderItem1 - // - this.sliderItem1.LabelPosition = DevComponents.DotNetBar.eSliderLabelPosition.Top; - this.sliderItem1.LabelWidth = 50; - this.sliderItem1.Name = "sliderItem1"; - this.sliderItem1.Text = "地面透明度"; - this.sliderItem1.TextColor = System.Drawing.Color.Black; - this.sliderItem1.Value = 0; - this.sliderItem1.ValueChanged += new System.EventHandler(this.sliderItem1_ValueChanged); - // - // buttonItem134 - // - this.buttonItem134.Image = ((System.Drawing.Image)(resources.GetObject("buttonItem134.Image"))); - this.buttonItem134.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem134.Name = "buttonItem134"; - this.buttonItem134.SubItemsExpandWidth = 14; - this.buttonItem134.Text = "模拟设计修改"; - this.buttonItem134.Click += new System.EventHandler(this.buttonItem134_Click_1); - // - // buttonItem130 - // - this.buttonItem130.Image = ((System.Drawing.Image)(resources.GetObject("buttonItem130.Image"))); - this.buttonItem130.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem130.Name = "buttonItem130"; - this.buttonItem130.SubItemsExpandWidth = 14; - this.buttonItem130.Text = "导出审核图"; - this.buttonItem130.Click += new System.EventHandler(this.buttonItem130_Click_1); - // - // btn_check_history - // - this.btn_check_history.Image = ((System.Drawing.Image)(resources.GetObject("btn_check_history.Image"))); - this.btn_check_history.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.btn_check_history.Name = "btn_check_history"; - this.btn_check_history.SubItemsExpandWidth = 14; - this.btn_check_history.Text = "审核历史"; - this.btn_check_history.Click += new System.EventHandler(this.btn_check_history_Click); - // - // ribbonPanel4 - // - this.ribbonPanel4.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.ribbonPanel4.Controls.Add(this.ribbonBar1); - this.ribbonPanel4.Dock = System.Windows.Forms.DockStyle.Fill; - this.ribbonPanel4.Location = new System.Drawing.Point(0, 0); - this.ribbonPanel4.Name = "ribbonPanel4"; - this.ribbonPanel4.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); - this.ribbonPanel4.Size = new System.Drawing.Size(1328, 95); - // - // - // - this.ribbonPanel4.Style.Class = ""; - this.ribbonPanel4.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonPanel4.StyleMouseDown.Class = ""; - this.ribbonPanel4.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonPanel4.StyleMouseOver.Class = ""; - this.ribbonPanel4.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonPanel4.TabIndex = 36; - this.ribbonPanel4.Visible = false; - // - // ribbonBar1 - // - this.ribbonBar1.AutoOverflowEnabled = true; - // - // - // - this.ribbonBar1.BackgroundMouseOverStyle.Class = ""; - this.ribbonBar1.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonBar1.BackgroundStyle.Class = ""; - this.ribbonBar1.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonBar1.ContainerControlProcessDialogKey = true; - this.ribbonBar1.Dock = System.Windows.Forms.DockStyle.Left; - this.ribbonBar1.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { - this.btn_document_info}); - this.ribbonBar1.Location = new System.Drawing.Point(3, 0); - this.ribbonBar1.Name = "ribbonBar1"; - this.ribbonBar1.Size = new System.Drawing.Size(88, 92); - this.ribbonBar1.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.ribbonBar1.TabIndex = 0; - // - // - // - this.ribbonBar1.TitleStyle.Class = ""; - this.ribbonBar1.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonBar1.TitleStyleMouseOver.Class = ""; - this.ribbonBar1.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonBar1.TitleVisible = false; - // - // btn_document_info - // - this.btn_document_info.Image = ((System.Drawing.Image)(resources.GetObject("btn_document_info.Image"))); - this.btn_document_info.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.btn_document_info.Name = "btn_document_info"; - this.btn_document_info.SubItemsExpandWidth = 14; - this.btn_document_info.Text = "文档管理"; - this.btn_document_info.Click += new System.EventHandler(this.btn_document_info_Click); + this.buttonItem14.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__56; + this.buttonItem14.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem14.Name = "buttonItem14"; + this.buttonItem14.SubItemsExpandWidth = 14; + this.buttonItem14.Text = "导出施工图"; + this.buttonItem14.Click += new System.EventHandler(this.buttonItem14_Click); // // ribbonPanel15 // this.ribbonPanel15.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; this.ribbonPanel15.Controls.Add(this.ribbonBar20); this.ribbonPanel15.Dock = System.Windows.Forms.DockStyle.Fill; - this.ribbonPanel15.Location = new System.Drawing.Point(0, 0); + this.ribbonPanel15.Location = new System.Drawing.Point(0, 33); this.ribbonPanel15.Name = "ribbonPanel15"; this.ribbonPanel15.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); - this.ribbonPanel15.Size = new System.Drawing.Size(1328, 95); + this.ribbonPanel15.Size = new System.Drawing.Size(1328, 62); // // // @@ -2843,7 +2465,7 @@ this.buttonItemXTGL}); this.ribbonBar20.Location = new System.Drawing.Point(3, 0); this.ribbonBar20.Name = "ribbonBar20"; - this.ribbonBar20.Size = new System.Drawing.Size(283, 92); + this.ribbonBar20.Size = new System.Drawing.Size(283, 59); this.ribbonBar20.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; this.ribbonBar20.TabIndex = 0; // @@ -3274,216 +2896,15 @@ this.buttonItemXT4_2.Text = "人员修改"; this.buttonItemXT4_2.Click += new System.EventHandler(this.buttonItemXT4_2_Click); // - // ribbonPanel3 - // - this.ribbonPanel3.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.ribbonPanel3.Controls.Add(this.ribbonBar4); - this.ribbonPanel3.Dock = System.Windows.Forms.DockStyle.Fill; - this.ribbonPanel3.Location = new System.Drawing.Point(0, 33); - this.ribbonPanel3.Name = "ribbonPanel3"; - this.ribbonPanel3.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); - this.ribbonPanel3.Size = new System.Drawing.Size(1328, 62); - // - // - // - this.ribbonPanel3.Style.Class = ""; - this.ribbonPanel3.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonPanel3.StyleMouseDown.Class = ""; - this.ribbonPanel3.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonPanel3.StyleMouseOver.Class = ""; - this.ribbonPanel3.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonPanel3.TabIndex = 40; - // - // ribbonBar4 - // - this.ribbonBar4.AutoOverflowEnabled = true; - // - // - // - this.ribbonBar4.BackgroundMouseOverStyle.Class = ""; - this.ribbonBar4.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonBar4.BackgroundStyle.Class = ""; - this.ribbonBar4.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonBar4.ContainerControlProcessDialogKey = true; - this.ribbonBar4.Dock = System.Windows.Forms.DockStyle.Left; - this.ribbonBar4.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { - this.btn_flag, - this.slider4ground}); - this.ribbonBar4.Location = new System.Drawing.Point(3, 0); - this.ribbonBar4.Name = "ribbonBar4"; - this.ribbonBar4.Size = new System.Drawing.Size(321, 59); - this.ribbonBar4.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.ribbonBar4.TabIndex = 0; - // - // - // - this.ribbonBar4.TitleStyle.Class = ""; - this.ribbonBar4.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonBar4.TitleStyleMouseOver.Class = ""; - this.ribbonBar4.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonBar4.TitleVisible = false; - // - // btn_flag - // - this.btn_flag.Image = global::Cyberpipe.Properties.Resources._24x24icon_03_hover; - this.btn_flag.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.btn_flag.Name = "btn_flag"; - this.btn_flag.SubItemsExpandWidth = 14; - this.btn_flag.Text = "标识器管理"; - this.btn_flag.Click += new System.EventHandler(this.btn_flag_Click); - // - // slider4ground - // - this.slider4ground.LabelPosition = DevComponents.DotNetBar.eSliderLabelPosition.Top; - this.slider4ground.LabelWidth = 50; - this.slider4ground.Name = "slider4ground"; - this.slider4ground.Text = "地面透明度"; - this.slider4ground.TextColor = System.Drawing.Color.Black; - this.slider4ground.Value = 0; - this.slider4ground.ValueChanged += new System.EventHandler(this.slider4ground_ValueChanged); - // - // ribbonPanel7 - // - this.ribbonPanel7.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.ribbonPanel7.Controls.Add(this.gxdw_ribbonbar); - this.ribbonPanel7.Dock = System.Windows.Forms.DockStyle.Fill; - this.ribbonPanel7.Location = new System.Drawing.Point(0, 33); - this.ribbonPanel7.Name = "ribbonPanel7"; - this.ribbonPanel7.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); - this.ribbonPanel7.Size = new System.Drawing.Size(1328, 62); - // - // - // - this.ribbonPanel7.Style.Class = ""; - this.ribbonPanel7.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonPanel7.StyleMouseDown.Class = ""; - this.ribbonPanel7.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonPanel7.StyleMouseOver.Class = ""; - this.ribbonPanel7.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonPanel7.TabIndex = 41; - this.ribbonPanel7.Visible = false; - // - // gxdw_ribbonbar - // - this.gxdw_ribbonbar.AutoOverflowEnabled = true; - // - // - // - this.gxdw_ribbonbar.BackgroundMouseOverStyle.Class = ""; - this.gxdw_ribbonbar.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.gxdw_ribbonbar.BackgroundStyle.Class = ""; - this.gxdw_ribbonbar.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.gxdw_ribbonbar.ContainerControlProcessDialogKey = true; - this.gxdw_ribbonbar.Dock = System.Windows.Forms.DockStyle.Left; - this.gxdw_ribbonbar.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { - this.buttonItem9, - this.buttonItem10, - this.buttonItem11, - this.buttonItem12, - this.buttonItem13, - this.buttonItem14}); - this.gxdw_ribbonbar.Location = new System.Drawing.Point(3, 0); - this.gxdw_ribbonbar.Name = "gxdw_ribbonbar"; - this.gxdw_ribbonbar.Size = new System.Drawing.Size(522, 59); - this.gxdw_ribbonbar.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.gxdw_ribbonbar.TabIndex = 0; - this.gxdw_ribbonbar.Text = "ribbonBar5"; - // - // - // - this.gxdw_ribbonbar.TitleStyle.Class = ""; - this.gxdw_ribbonbar.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.gxdw_ribbonbar.TitleStyleMouseOver.Class = ""; - this.gxdw_ribbonbar.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.gxdw_ribbonbar.TitleVisible = false; - // - // buttonItem9 - // - this.buttonItem9.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__76; - this.buttonItem9.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem9.Name = "buttonItem9"; - this.buttonItem9.SubItemsExpandWidth = 14; - this.buttonItem9.Text = "工单管理"; - this.buttonItem9.Click += new System.EventHandler(this.buttonItem9_Click); - // - // buttonItem10 - // - this.buttonItem10.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__69; - this.buttonItem10.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem10.Name = "buttonItem10"; - this.buttonItem10.SubItemsExpandWidth = 14; - this.buttonItem10.Text = "在线任务"; - this.buttonItem10.Click += new System.EventHandler(this.buttonItem10_Click); - // - // buttonItem11 - // - this.buttonItem11.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__72; - this.buttonItem11.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem11.Name = "buttonItem11"; - this.buttonItem11.SubItemsExpandWidth = 14; - this.buttonItem11.Text = "事件管理"; - this.buttonItem11.Click += new System.EventHandler(this.buttonItem11_Click); - // - // buttonItem12 - // - this.buttonItem12.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__34; - this.buttonItem12.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem12.Name = "buttonItem12"; - this.buttonItem12.SubItemsExpandWidth = 14; - this.buttonItem12.Text = "探测仪管理"; - this.buttonItem12.Click += new System.EventHandler(this.buttonItem12_Click); - // - // buttonItem13 - // - this.buttonItem13.Image = global::Cyberpipe.Properties.Resources._24x24icon_13_hover; - this.buttonItem13.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem13.Name = "buttonItem13"; - this.buttonItem13.SubItemsExpandWidth = 14; - this.buttonItem13.Text = "巡检人员维护"; - this.buttonItem13.Click += new System.EventHandler(this.buttonItem13_Click); - // - // buttonItem14 - // - this.buttonItem14.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__56; - this.buttonItem14.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem14.Name = "buttonItem14"; - this.buttonItem14.SubItemsExpandWidth = 14; - this.buttonItem14.Text = "导出施工图"; - this.buttonItem14.Click += new System.EventHandler(this.buttonItem14_Click); - // // ribbonPanel2 // this.ribbonPanel2.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; this.ribbonPanel2.Controls.Add(this.ribbonBar3); this.ribbonPanel2.Dock = System.Windows.Forms.DockStyle.Fill; - this.ribbonPanel2.Location = new System.Drawing.Point(0, 33); + this.ribbonPanel2.Location = new System.Drawing.Point(0, 0); this.ribbonPanel2.Name = "ribbonPanel2"; this.ribbonPanel2.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); - this.ribbonPanel2.Size = new System.Drawing.Size(1328, 62); + this.ribbonPanel2.Size = new System.Drawing.Size(1328, 95); // // // @@ -3527,7 +2948,7 @@ this.buttonItemPasswordReset}); this.ribbonBar3.Location = new System.Drawing.Point(3, 0); this.ribbonBar3.Name = "ribbonBar3"; - this.ribbonBar3.Size = new System.Drawing.Size(551, 59); + this.ribbonBar3.Size = new System.Drawing.Size(551, 92); this.ribbonBar3.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; this.ribbonBar3.TabIndex = 1; // @@ -3567,6 +2988,7 @@ this.btn_resc_info.Name = "btn_resc_info"; this.btn_resc_info.SubItemsExpandWidth = 14; this.btn_resc_info.Text = "资源管理"; + this.btn_resc_info.Visible = false; this.btn_resc_info.Click += new System.EventHandler(this.btn_resc_info_Click); // // btn_role_resc @@ -3605,6 +3027,605 @@ this.buttonItemPasswordReset.Text = "重置密码"; this.buttonItemPasswordReset.Click += new System.EventHandler(this.buttonItemPasswordReset_Click); // + // ribbonPanel6 + // + this.ribbonPanel6.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.ribbonPanel6.Controls.Add(this.ribbonBar6); + this.ribbonPanel6.Dock = System.Windows.Forms.DockStyle.Fill; + this.ribbonPanel6.Location = new System.Drawing.Point(0, 0); + this.ribbonPanel6.Name = "ribbonPanel6"; + this.ribbonPanel6.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); + this.ribbonPanel6.Size = new System.Drawing.Size(1328, 95); + // + // + // + this.ribbonPanel6.Style.Class = ""; + this.ribbonPanel6.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonPanel6.StyleMouseDown.Class = ""; + this.ribbonPanel6.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonPanel6.StyleMouseOver.Class = ""; + this.ribbonPanel6.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonPanel6.TabIndex = 38; + this.ribbonPanel6.Visible = false; + // + // ribbonBar6 + // + this.ribbonBar6.AutoOverflowEnabled = true; + // + // + // + this.ribbonBar6.BackgroundMouseOverStyle.Class = ""; + this.ribbonBar6.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonBar6.BackgroundStyle.Class = ""; + this.ribbonBar6.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar6.ContainerControlProcessDialogKey = true; + this.ribbonBar6.Dock = System.Windows.Forms.DockStyle.Left; + this.ribbonBar6.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { + this.buttonItemSPSZ, + this.buttonItem8, + this.buttonItemLocation, + this.sliderItem2, + this.buttonItemGBJC}); + this.ribbonBar6.Location = new System.Drawing.Point(3, 0); + this.ribbonBar6.Name = "ribbonBar6"; + this.ribbonBar6.Size = new System.Drawing.Size(427, 92); + this.ribbonBar6.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.ribbonBar6.TabIndex = 0; + // + // + // + this.ribbonBar6.TitleStyle.Class = ""; + this.ribbonBar6.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonBar6.TitleStyleMouseOver.Class = ""; + this.ribbonBar6.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar6.TitleVisible = false; + // + // buttonItemSPSZ + // + this.buttonItemSPSZ.Image = ((System.Drawing.Image)(resources.GetObject("buttonItemSPSZ.Image"))); + this.buttonItemSPSZ.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItemSPSZ.Name = "buttonItemSPSZ"; + this.buttonItemSPSZ.SubItemsExpandWidth = 14; + this.buttonItemSPSZ.Text = "双屏设置"; + this.buttonItemSPSZ.Click += new System.EventHandler(this.buttonItemSPSZ_Click); + // + // buttonItem8 + // + this.buttonItem8.Image = ((System.Drawing.Image)(resources.GetObject("buttonItem8.Image"))); + this.buttonItem8.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem8.Name = "buttonItem8"; + this.buttonItem8.SubItemsExpandWidth = 14; + this.buttonItem8.Text = "双屏分析"; + this.buttonItem8.Click += new System.EventHandler(this.buttonItem8_Click); + // + // buttonItemLocation + // + this.buttonItemLocation.Image = ((System.Drawing.Image)(resources.GetObject("buttonItemLocation.Image"))); + this.buttonItemLocation.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItemLocation.Name = "buttonItemLocation"; + this.buttonItemLocation.SubItemsExpandWidth = 14; + this.buttonItemLocation.Text = "快速定位"; + this.buttonItemLocation.Click += new System.EventHandler(this.buttonItemLocation_Click); + // + // sliderItem2 + // + this.sliderItem2.LabelPosition = DevComponents.DotNetBar.eSliderLabelPosition.Top; + this.sliderItem2.LabelWidth = 50; + this.sliderItem2.Name = "sliderItem2"; + this.sliderItem2.Text = "地面透明度"; + this.sliderItem2.TextColor = System.Drawing.Color.Black; + this.sliderItem2.Value = 0; + this.sliderItem2.ValueChanged += new System.EventHandler(this.sliderItem2_ValueChanged); + // + // buttonItemGBJC + // + this.buttonItemGBJC.Image = ((System.Drawing.Image)(resources.GetObject("buttonItemGBJC.Image"))); + this.buttonItemGBJC.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItemGBJC.Name = "buttonItemGBJC"; + this.buttonItemGBJC.SubItemsExpandWidth = 14; + this.buttonItemGBJC.Text = "国标检测"; + this.buttonItemGBJC.Click += new System.EventHandler(this.buttonItemGBJC_Click); + // + // ribbonPanel5 + // + this.ribbonPanel5.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.ribbonPanel5.Controls.Add(this.ribbonBar2); + this.ribbonPanel5.Dock = System.Windows.Forms.DockStyle.Fill; + this.ribbonPanel5.Location = new System.Drawing.Point(0, 33); + this.ribbonPanel5.Name = "ribbonPanel5"; + this.ribbonPanel5.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); + this.ribbonPanel5.Size = new System.Drawing.Size(1328, 62); + // + // + // + this.ribbonPanel5.Style.Class = ""; + this.ribbonPanel5.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonPanel5.StyleMouseDown.Class = ""; + this.ribbonPanel5.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonPanel5.StyleMouseOver.Class = ""; + this.ribbonPanel5.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonPanel5.TabIndex = 37; + this.ribbonPanel5.Visible = false; + // + // ribbonBar2 + // + this.ribbonBar2.AutoOverflowEnabled = true; + // + // + // + this.ribbonBar2.BackgroundMouseOverStyle.Class = ""; + this.ribbonBar2.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonBar2.BackgroundStyle.Class = ""; + this.ribbonBar2.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar2.ContainerControlProcessDialogKey = true; + this.ribbonBar2.Dock = System.Windows.Forms.DockStyle.Left; + this.ribbonBar2.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { + this.buttonItemHX1, + this.buttonItemHX2, + this.buttonItemDCTP, + this.sliderItem3}); + this.ribbonBar2.Location = new System.Drawing.Point(3, 0); + this.ribbonBar2.Name = "ribbonBar2"; + this.ribbonBar2.Size = new System.Drawing.Size(350, 59); + this.ribbonBar2.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.ribbonBar2.TabIndex = 0; + // + // + // + this.ribbonBar2.TitleStyle.Class = ""; + this.ribbonBar2.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonBar2.TitleStyleMouseOver.Class = ""; + this.ribbonBar2.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar2.TitleVisible = false; + // + // buttonItemHX1 + // + this.buttonItemHX1.AutoExpandOnClick = true; + this.buttonItemHX1.Image = ((System.Drawing.Image)(resources.GetObject("buttonItemHX1.Image"))); + this.buttonItemHX1.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItemHX1.Name = "buttonItemHX1"; + this.buttonItemHX1.SubItemsExpandWidth = 14; + this.buttonItemHX1.Text = "导入红线"; + this.buttonItemHX1.Click += new System.EventHandler(this.buttonItemHX1_Click); + // + // buttonItemHX2 + // + this.buttonItemHX2.Image = ((System.Drawing.Image)(resources.GetObject("buttonItemHX2.Image"))); + this.buttonItemHX2.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItemHX2.Name = "buttonItemHX2"; + this.buttonItemHX2.SubItemsExpandWidth = 14; + this.buttonItemHX2.Text = "红线审核"; + this.buttonItemHX2.Click += new System.EventHandler(this.buttonItemHX2_Click); + // + // buttonItemDCTP + // + this.buttonItemDCTP.Image = ((System.Drawing.Image)(resources.GetObject("buttonItemDCTP.Image"))); + this.buttonItemDCTP.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItemDCTP.Name = "buttonItemDCTP"; + this.buttonItemDCTP.SubItemsExpandWidth = 14; + this.buttonItemDCTP.Text = "导出图片"; + this.buttonItemDCTP.Click += new System.EventHandler(this.buttonItemDCTP_Click); + // + // sliderItem3 + // + this.sliderItem3.LabelPosition = DevComponents.DotNetBar.eSliderLabelPosition.Top; + this.sliderItem3.LabelWidth = 50; + this.sliderItem3.Name = "sliderItem3"; + this.sliderItem3.Text = "地面透明度"; + this.sliderItem3.TextColor = System.Drawing.Color.Black; + this.sliderItem3.Value = 0; + this.sliderItem3.ValueChanged += new System.EventHandler(this.sliderItem3_ValueChanged); + // + // ribbonPanel1 + // + this.ribbonPanel1.AutoSize = true; + this.ribbonPanel1.CanvasColor = System.Drawing.Color.Gray; + this.ribbonPanel1.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.ribbonPanel1.Controls.Add(this.ribbonBar21); + this.ribbonPanel1.Dock = System.Windows.Forms.DockStyle.Fill; + this.ribbonPanel1.Location = new System.Drawing.Point(0, 33); + this.ribbonPanel1.Name = "ribbonPanel1"; + this.ribbonPanel1.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); + this.ribbonPanel1.Size = new System.Drawing.Size(1328, 62); + // + // + // + this.ribbonPanel1.Style.Class = ""; + this.ribbonPanel1.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonPanel1.StyleMouseDown.Class = ""; + this.ribbonPanel1.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonPanel1.StyleMouseOver.Class = ""; + this.ribbonPanel1.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonPanel1.TabIndex = 1; + this.ribbonPanel1.Visible = false; + // + // ribbonBar21 + // + this.ribbonBar21.AutoOverflowEnabled = true; + this.ribbonBar21.BackColor = System.Drawing.Color.White; + // + // + // + this.ribbonBar21.BackgroundMouseOverStyle.Class = ""; + this.ribbonBar21.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonBar21.BackgroundStyle.Class = ""; + this.ribbonBar21.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar21.ContainerControlProcessDialogKey = true; + this.ribbonBar21.Dock = System.Windows.Forms.DockStyle.Left; + this.ribbonBar21.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { + this.buttonItem87, + this.buttonItem88, + this.buttonItem27, + this.sliderGroundTransSet1, + this.buttonItem91, + this.buttonItem1, + this.btnlegendSet, + this.buttonItem89, + this.btnOutputJPG}); + this.ribbonBar21.Location = new System.Drawing.Point(3, 0); + this.ribbonBar21.Name = "ribbonBar21"; + this.ribbonBar21.Size = new System.Drawing.Size(649, 59); + this.ribbonBar21.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.ribbonBar21.TabIndex = 2; + this.ribbonBar21.Text = "浏览模式"; + // + // + // + this.ribbonBar21.TitleStyle.Class = ""; + this.ribbonBar21.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonBar21.TitleStyleMouseOver.Class = ""; + this.ribbonBar21.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar21.TitleVisible = false; + // + // buttonItem87 + // + this.buttonItem87.Image = ((System.Drawing.Image)(resources.GetObject("buttonItem87.Image"))); + this.buttonItem87.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem87.Name = "buttonItem87"; + this.buttonItem87.SubItemsExpandWidth = 14; + this.buttonItem87.Text = "地上模式"; + this.buttonItem87.Click += new System.EventHandler(this.buttonItem87_Click); + // + // buttonItem88 + // + this.buttonItem88.Image = ((System.Drawing.Image)(resources.GetObject("buttonItem88.Image"))); + this.buttonItem88.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem88.Name = "buttonItem88"; + this.buttonItem88.SubItemsExpandWidth = 14; + this.buttonItem88.Text = "地下模式"; + this.buttonItem88.Click += new System.EventHandler(this.buttonItem88_Click); + // + // buttonItem27 + // + this.buttonItem27.Image = ((System.Drawing.Image)(resources.GetObject("buttonItem27.Image"))); + this.buttonItem27.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem27.Name = "buttonItem27"; + this.buttonItem27.SubItemsExpandWidth = 14; + this.buttonItem27.Text = "行走模式"; + this.buttonItem27.Click += new System.EventHandler(this.buttonItem27_Click); + // + // buttonItem91 + // + this.buttonItem91.ForeColor = System.Drawing.Color.Black; + this.buttonItem91.Image = ((System.Drawing.Image)(resources.GetObject("buttonItem91.Image"))); + this.buttonItem91.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem91.Name = "buttonItem91"; + this.buttonItem91.SubItemsExpandWidth = 14; + this.buttonItem91.Text = "快速定位"; + this.buttonItem91.Click += new System.EventHandler(this.buttonItem91_Click); + // + // buttonItem1 + // + this.buttonItem1.Image = ((System.Drawing.Image)(resources.GetObject("buttonItem1.Image"))); + this.buttonItem1.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem1.Name = "buttonItem1"; + this.buttonItem1.SubItemsExpandWidth = 14; + this.buttonItem1.Text = "图层管理"; + this.buttonItem1.Click += new System.EventHandler(this.buttonItem1_Click); + // + // btnlegendSet + // + this.btnlegendSet.Image = ((System.Drawing.Image)(resources.GetObject("btnlegendSet.Image"))); + this.btnlegendSet.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.btnlegendSet.Name = "btnlegendSet"; + this.btnlegendSet.SubItemsExpandWidth = 14; + this.btnlegendSet.Text = "图例"; + this.btnlegendSet.Click += new System.EventHandler(this.btnlegendSet_Click); + // + // buttonItem89 + // + this.buttonItem89.Image = ((System.Drawing.Image)(resources.GetObject("buttonItem89.Image"))); + this.buttonItem89.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem89.Name = "buttonItem89"; + this.buttonItem89.SubItemsExpandWidth = 14; + this.buttonItem89.Text = "全屏显示"; + this.buttonItem89.Click += new System.EventHandler(this.buttonItem89_Click); + // + // btnOutputJPG + // + this.btnOutputJPG.Image = ((System.Drawing.Image)(resources.GetObject("btnOutputJPG.Image"))); + this.btnOutputJPG.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.btnOutputJPG.Name = "btnOutputJPG"; + this.btnOutputJPG.SubItemsExpandWidth = 14; + this.btnOutputJPG.Text = "导出图片"; + this.btnOutputJPG.Click += new System.EventHandler(this.btnOutputJPG_Click); + // + // ribbonPanel12 + // + this.ribbonPanel12.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.ribbonPanel12.Controls.Add(this.ribbonBar18); + this.ribbonPanel12.Controls.Add(this.ribbonBar13); + this.ribbonPanel12.Dock = System.Windows.Forms.DockStyle.Fill; + this.ribbonPanel12.Location = new System.Drawing.Point(0, 33); + this.ribbonPanel12.Name = "ribbonPanel12"; + this.ribbonPanel12.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); + this.ribbonPanel12.Size = new System.Drawing.Size(1328, 62); + // + // + // + this.ribbonPanel12.Style.Class = ""; + this.ribbonPanel12.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonPanel12.StyleMouseDown.Class = ""; + this.ribbonPanel12.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonPanel12.StyleMouseOver.Class = ""; + this.ribbonPanel12.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonPanel12.TabIndex = 34; + this.ribbonPanel12.Visible = false; + // + // ribbonBar18 + // + this.ribbonBar18.AutoOverflowEnabled = true; + // + // + // + this.ribbonBar18.BackgroundMouseOverStyle.Class = ""; + this.ribbonBar18.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonBar18.BackgroundStyle.Class = ""; + this.ribbonBar18.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar18.ContainerControlProcessDialogKey = true; + this.ribbonBar18.Dock = System.Windows.Forms.DockStyle.Left; + this.ribbonBar18.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { + this.buttonItem133, + this.buttonItem132}); + this.ribbonBar18.Location = new System.Drawing.Point(508, 0); + this.ribbonBar18.Name = "ribbonBar18"; + this.ribbonBar18.Size = new System.Drawing.Size(75, 59); + this.ribbonBar18.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.ribbonBar18.TabIndex = 1; + // + // + // + this.ribbonBar18.TitleStyle.Class = ""; + this.ribbonBar18.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonBar18.TitleStyleMouseOver.Class = ""; + this.ribbonBar18.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar18.TitleVisible = false; + // + // buttonItem133 + // + this.buttonItem133.Image = ((System.Drawing.Image)(resources.GetObject("buttonItem133.Image"))); + this.buttonItem133.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem133.Name = "buttonItem133"; + this.buttonItem133.SubItemsExpandWidth = 14; + this.buttonItem133.Text = "审核入库"; + this.buttonItem133.Click += new System.EventHandler(this.buttonItem133_Click_1); + // + // buttonItem132 + // + this.buttonItem132.Name = "buttonItem132"; + // + // ribbonBar13 + // + this.ribbonBar13.AutoOverflowEnabled = true; + // + // + // + this.ribbonBar13.BackgroundMouseOverStyle.Class = ""; + this.ribbonBar13.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonBar13.BackgroundStyle.Class = ""; + this.ribbonBar13.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar13.ContainerControlProcessDialogKey = true; + this.ribbonBar13.Dock = System.Windows.Forms.DockStyle.Left; + this.ribbonBar13.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { + this.buttonItem127, + this.buttonItem128, + this.sliderItem1, + this.buttonItem134, + this.buttonItem130, + this.btn_check_history}); + this.ribbonBar13.Location = new System.Drawing.Point(3, 0); + this.ribbonBar13.Name = "ribbonBar13"; + this.ribbonBar13.Size = new System.Drawing.Size(505, 59); + this.ribbonBar13.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.ribbonBar13.TabIndex = 0; + // + // + // + this.ribbonBar13.TitleStyle.Class = ""; + this.ribbonBar13.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonBar13.TitleStyleMouseOver.Class = ""; + this.ribbonBar13.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar13.TitleVisible = false; + // + // buttonItem127 + // + this.buttonItem127.Image = ((System.Drawing.Image)(resources.GetObject("buttonItem127.Image"))); + this.buttonItem127.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem127.Name = "buttonItem127"; + this.buttonItem127.SubItemsExpandWidth = 14; + this.buttonItem127.Text = "打开数据"; + this.buttonItem127.Click += new System.EventHandler(this.buttonItem127_Click_2); + // + // buttonItem128 + // + this.buttonItem128.Image = ((System.Drawing.Image)(resources.GetObject("buttonItem128.Image"))); + this.buttonItem128.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem128.Name = "buttonItem128"; + this.buttonItem128.SubItemsExpandWidth = 14; + this.buttonItem128.Text = "一键审核"; + this.buttonItem128.Click += new System.EventHandler(this.buttonItem128_Click); + // + // sliderItem1 + // + this.sliderItem1.LabelPosition = DevComponents.DotNetBar.eSliderLabelPosition.Top; + this.sliderItem1.LabelWidth = 50; + this.sliderItem1.Name = "sliderItem1"; + this.sliderItem1.Text = "地面透明度"; + this.sliderItem1.TextColor = System.Drawing.Color.Black; + this.sliderItem1.Value = 0; + this.sliderItem1.ValueChanged += new System.EventHandler(this.sliderItem1_ValueChanged); + // + // buttonItem134 + // + this.buttonItem134.Image = ((System.Drawing.Image)(resources.GetObject("buttonItem134.Image"))); + this.buttonItem134.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem134.Name = "buttonItem134"; + this.buttonItem134.SubItemsExpandWidth = 14; + this.buttonItem134.Text = "模拟设计修改"; + this.buttonItem134.Click += new System.EventHandler(this.buttonItem134_Click_1); + // + // buttonItem130 + // + this.buttonItem130.Image = ((System.Drawing.Image)(resources.GetObject("buttonItem130.Image"))); + this.buttonItem130.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem130.Name = "buttonItem130"; + this.buttonItem130.SubItemsExpandWidth = 14; + this.buttonItem130.Text = "导出审核图"; + this.buttonItem130.Click += new System.EventHandler(this.buttonItem130_Click_1); + // + // btn_check_history + // + this.btn_check_history.Image = ((System.Drawing.Image)(resources.GetObject("btn_check_history.Image"))); + this.btn_check_history.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.btn_check_history.Name = "btn_check_history"; + this.btn_check_history.SubItemsExpandWidth = 14; + this.btn_check_history.Text = "审核历史"; + this.btn_check_history.Click += new System.EventHandler(this.btn_check_history_Click); + // + // ribbonPanel4 + // + this.ribbonPanel4.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.ribbonPanel4.Controls.Add(this.ribbonBar1); + this.ribbonPanel4.Dock = System.Windows.Forms.DockStyle.Fill; + this.ribbonPanel4.Location = new System.Drawing.Point(0, 33); + this.ribbonPanel4.Name = "ribbonPanel4"; + this.ribbonPanel4.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); + this.ribbonPanel4.Size = new System.Drawing.Size(1328, 62); + // + // + // + this.ribbonPanel4.Style.Class = ""; + this.ribbonPanel4.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonPanel4.StyleMouseDown.Class = ""; + this.ribbonPanel4.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonPanel4.StyleMouseOver.Class = ""; + this.ribbonPanel4.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonPanel4.TabIndex = 36; + this.ribbonPanel4.Visible = false; + // + // ribbonBar1 + // + this.ribbonBar1.AutoOverflowEnabled = true; + // + // + // + this.ribbonBar1.BackgroundMouseOverStyle.Class = ""; + this.ribbonBar1.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonBar1.BackgroundStyle.Class = ""; + this.ribbonBar1.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar1.ContainerControlProcessDialogKey = true; + this.ribbonBar1.Dock = System.Windows.Forms.DockStyle.Left; + this.ribbonBar1.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { + this.btn_document_info}); + this.ribbonBar1.Location = new System.Drawing.Point(3, 0); + this.ribbonBar1.Name = "ribbonBar1"; + this.ribbonBar1.Size = new System.Drawing.Size(88, 59); + this.ribbonBar1.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.ribbonBar1.TabIndex = 0; + // + // + // + this.ribbonBar1.TitleStyle.Class = ""; + this.ribbonBar1.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonBar1.TitleStyleMouseOver.Class = ""; + this.ribbonBar1.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar1.TitleVisible = false; + // + // btn_document_info + // + this.btn_document_info.Image = ((System.Drawing.Image)(resources.GetObject("btn_document_info.Image"))); + this.btn_document_info.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.btn_document_info.Name = "btn_document_info"; + this.btn_document_info.SubItemsExpandWidth = 14; + this.btn_document_info.Text = "文档管理"; + this.btn_document_info.Click += new System.EventHandler(this.btn_document_info_Click); + // // ribbonTabItem1 // this.ribbonTabItem1.ButtonStyle = DevComponents.DotNetBar.eButtonStyle.ImageAndText; @@ -3673,7 +3694,6 @@ this.ribbonTabItem7.Name = "ribbonTabItem7"; this.ribbonTabItem7.Panel = this.ribbonPanel7; this.ribbonTabItem7.Text = "管线定位"; - this.ribbonTabItem7.MouseDown += new System.Windows.Forms.MouseEventHandler(this.ribbonTabItem7_MouseDown); // // ribbonTabItem5 // @@ -3684,7 +3704,6 @@ this.ribbonTabItem5.Name = "ribbonTabItem5"; this.ribbonTabItem5.Panel = this.ribbonPanel3; this.ribbonTabItem5.Text = "标识器管理"; - this.ribbonTabItem5.MouseDown += new System.Windows.Forms.MouseEventHandler(this.ribbonTabItem5_MouseDown); // // ribbonTabItem2 // @@ -4451,7 +4470,7 @@ this.dataGridViewX2.ReadOnly = true; this.dataGridViewX2.RowHeadersVisible = false; this.dataGridViewX2.RowTemplate.Height = 23; - this.dataGridViewX2.Size = new System.Drawing.Size(31081, 92); + this.dataGridViewX2.Size = new System.Drawing.Size(31378, 92); this.dataGridViewX2.TabIndex = 11; // // dataGridViewTextBoxColumn10 @@ -4545,7 +4564,7 @@ this.dataGridViewX3.ReadOnly = true; this.dataGridViewX3.RowHeadersVisible = false; this.dataGridViewX3.RowTemplate.Height = 23; - this.dataGridViewX3.Size = new System.Drawing.Size(31080, 127); + this.dataGridViewX3.Size = new System.Drawing.Size(31377, 127); this.dataGridViewX3.TabIndex = 5; this.dataGridViewX3.MouseDoubleClick += new System.Windows.Forms.MouseEventHandler(this.dataGridViewX3_MouseDoubleClick); // @@ -5722,7 +5741,8 @@ // pictureBox1 // this.pictureBox1.Dock = System.Windows.Forms.DockStyle.Top; - this.pictureBox1.Image = ((System.Drawing.Image)(resources.GetObject("pictureBox1.Image"))); +// this.pictureBox1.Image = ((System.Drawing.Image)(resources.GetObject("pictureBox1.Image"))); + this.pictureBox1.Image = Image.FromFile(Application.StartupPath + Utility.TitleImagePath); this.pictureBox1.Location = new System.Drawing.Point(0, 0); this.pictureBox1.Margin = new System.Windows.Forms.Padding(0); this.pictureBox1.Name = "pictureBox1"; @@ -5732,18 +5752,6 @@ this.pictureBox1.TabStop = false; this.pictureBox1.Paint += new System.Windows.Forms.PaintEventHandler(this.pictureBox1_Paint); // - // layerTree - // - this.layerTree.CheckBoxes = true; - this.layerTree.ItemHeight = 18; - this.layerTree.Location = new System.Drawing.Point(30, 78); - this.layerTree.Name = "layerTree"; - this.layerTree.Size = new System.Drawing.Size(121, 97); - this.layerTree.TabIndex = 1; - this.layerTree.AfterCheck += new System.Windows.Forms.TreeViewEventHandler(this.layerTree_AfterCheck); - this.layerTree.NodeMouseClick += new System.Windows.Forms.TreeNodeMouseClickEventHandler(this.layerTree_NodeMouseClick); - this.layerTree.NodeMouseDoubleClick += new System.Windows.Forms.TreeNodeMouseClickEventHandler(this.layerTree_NodeMouseDoubleClick); - // // MainFrm // this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Inherit; @@ -5770,7 +5778,8 @@ this.KeyPreview = true; this.Name = "MainFrm"; this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen; - this.Text = "智慧太湖新城管网规划分析系统6.0"; +// this.Text = "智慧太湖新城管网规划分析系统6.0"; + this.Text = Utility.SysnameVersion; this.WindowState = System.Windows.Forms.FormWindowState.Maximized; this.FormClosing += new System.Windows.Forms.FormClosingEventHandler(this.MainFrm_FormClosing); this.Load += new System.EventHandler(this.MainFrm_Load); @@ -5787,15 +5796,15 @@ this.contextMenuStripDeleteLayerNode.ResumeLayout(false); this.ribbonControl1.ResumeLayout(false); this.ribbonControl1.PerformLayout(); + this.ribbonPanel3.ResumeLayout(false); + this.ribbonPanel7.ResumeLayout(false); + this.ribbonPanel15.ResumeLayout(false); + this.ribbonPanel2.ResumeLayout(false); this.ribbonPanel6.ResumeLayout(false); this.ribbonPanel5.ResumeLayout(false); this.ribbonPanel1.ResumeLayout(false); this.ribbonPanel12.ResumeLayout(false); this.ribbonPanel4.ResumeLayout(false); - this.ribbonPanel15.ResumeLayout(false); - this.ribbonPanel3.ResumeLayout(false); - this.ribbonPanel7.ResumeLayout(false); - this.ribbonPanel2.ResumeLayout(false); this.panelOfTable.ResumeLayout(false); this.panelOfTable.PerformLayout(); ((System.ComponentModel.ISupportInitialize)(this.dataGridViewX1)).EndInit(); @@ -5955,6 +5964,7 @@ private RibbonTabItem ribbonTabItem11; private ButtonItem buttonItem130; private RibbonBar ribbonBar18; + private ButtonItem buttonItem132; private SliderItem sliderItem1; private ButtonItem buttonItem133; private ButtonItem buttonItem134; diff --git a/MainFrm.resx b/MainFrm.resx index 9f9bba4..ce490c1 100644 --- a/MainFrm.resx +++ b/MainFrm.resx @@ -351,6 +351,146 @@ 766, 54 + + + iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 + YQUAAAAZdEVYdFNvZnR3YXJlAEFkb2JlIEltYWdlUmVhZHlxyWU8AAADZmlUWHRYTUw6Y29tLmFkb2Jl + LnhtcAAAAAAAPD94cGFja2V0IGJlZ2luPSLvu78iIGlkPSJXNU0wTXBDZWhpSHpyZVN6TlRjemtjOWQi + Pz4gPHg6eG1wbWV0YSB4bWxuczp4PSJhZG9iZTpuczptZXRhLyIgeDp4bXB0az0iQWRvYmUgWE1QIENv + cmUgNS4zLWMwMTEgNjYuMTQ1NjYxLCAyMDEyLzAyLzA2LTE0OjU2OjI3ICAgICAgICAiPiA8cmRmOlJE + RiB4bWxuczpyZGY9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkvMDIvMjItcmRmLXN5bnRheC1ucyMiPiA8 + cmRmOkRlc2NyaXB0aW9uIHJkZjphYm91dD0iIiB4bWxuczp4bXBNTT0iaHR0cDovL25zLmFkb2JlLmNv + bS94YXAvMS4wL21tLyIgeG1sbnM6c3RSZWY9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlw + ZS9SZXNvdXJjZVJlZiMiIHhtbG5zOnhtcD0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wLyIgeG1w + TU06T3JpZ2luYWxEb2N1bWVudElEPSJ4bXAuZGlkOjYzQTM5NEY4Mjg0OUU0MTE5NDBEQTc4ODZEQzk5 + N0NGIiB4bXBNTTpEb2N1bWVudElEPSJ4bXAuZGlkOjEwQ0IxNzBBNEM1QzExRTRBNkNGQzRBMjhDQzI0 + MkY4IiB4bXBNTTpJbnN0YW5jZUlEPSJ4bXAuaWlkOjEwQ0IxNzA5NEM1QzExRTRBNkNGQzRBMjhDQzI0 + MkY4IiB4bXA6Q3JlYXRvclRvb2w9IkFkb2JlIFBob3Rvc2hvcCBDUzYgKFdpbmRvd3MpIj4gPHhtcE1N + OkRlcml2ZWRGcm9tIHN0UmVmOmluc3RhbmNlSUQ9InhtcC5paWQ6NTEzMDNDMjA1QjRDRTQxMTg4NERE + MUVBOEQ4QTgyNTUiIHN0UmVmOmRvY3VtZW50SUQ9InhtcC5kaWQ6NjNBMzk0RjgyODQ5RTQxMTk0MERB + Nzg4NkRDOTk3Q0YiLz4gPC9yZGY6RGVzY3JpcHRpb24+IDwvcmRmOlJERj4gPC94OnhtcG1ldGE+IDw/ + eHBhY2tldCBlbmQ9InIiPz43wa2/AAAFaUlEQVRIS6WUC0xTVxzGKy0UkSmlFGjBFilSkNpSaAWRh63y + sIiAArKs4spLRLQoiEJlSMGoMCc6CBOnYHzMOHUqqOhEHOqCbjNu6kCd6KYje5mZ6KbObd/OuVL3cEzj + /skv997/+b7v39PTW9aj3/BM+OKxPEIZoW/gyrOuPbP+GvRPSNBQQqXYLwSW1etw7cYt5kqfaZ+uD8QM + Xg8f/f4UxGhHMHv4qlG6vAb9394G6T+BPpdV1oCuUx3VD8Q9XT8//PUJRMghlLhLg1C41IK+r/pB+oNC + 16mO6qmP+gdi/6y793+hwTYEk9uoQOSaStHzxQ2Q/nND9XMKy0D9NIfmDcSzaLhI4KXE7LwinLtwGXfu + PXhhqJ/m0DyS62EdUGWpqcf3P97DD3d++t/QnKraBjpghXWAiC+WN0ZNScOe1mP45vbdF2ZvWwdoDs/D + b6ejs6ecxHPoAG/l+Fhkzy+FyCcY0YkG7D/yAW5+d+e5oXrqo36aQ/McnNyjyAAuHWA05pfgzPlehhyT + mflV6FOMaDt2Ctf7bw8KXac6qqc+a4Zx3hLwRLJCZgcJjcPIEPkyIZmeX1SB7vOX0dn9KQy5jw8r8eVc + HOrsxidXP0d9hxlzd4QgeYMzEt7kQVvOR0pFFNpOHmd81E9znIS+dSTc1foVGWfNKUZjyy6Ex6SQl0cD + 09IVxHAFh0+cReqr+QjK8ERqEw+VHWOwoycSR/v1OHwzDlsvhcNCeqkbedAYxQiPm87kZOQVw0nkW0QG + 2DFnIA+JRm3DFpzr/RKNW3ZDE5UAsX8ocizZiFs7DEUHvPFunw4Hb05B+y09jn49lYHe0x5doxqqLVlf + DJrnyB+pIQNs6QAhf6R8tZu3CqpwPdZu2I6PLl3HwnV5iHv9JVSeUOKdqzq81xeDvddiYG73R0aLEIZm + IRa1jUbjxQnYRHa17YqW0VJPwHT3LocRbirrDiymspXo6L6AgiXV8JSNQ2i6GpNWOqK4U4n1n0Vge68W + 9ecmIKnBBSqDCIp4P2RWGDB/QxqS6l1QcToIld3BqDobgsXEQ73+Se5HrGcgdJEokGzIx66DXXi7dRvC + yx2Q2RqApR+GoPbjCag8pUZ6sxjqWRKEldljRr07ZjaKmHt5qpBZKzkeiIJ2BbIPKmA8MIbJUC/ghrM0 + RfYsDtdhqJNIVulK/ku0BQokbfZGZrsKBR3BmEsMOfvl0FY7o7ypDPo1brCcGc+QUCdExabXEFsjQO4B + ObL2BSBlqx8SWwibvBE0334nK3Ael+yEbIW81DZszlhZ2oieuAYvpO5VIHGzP9J2+CN9pz/CzDwExMox + eZUbFnZpkEc+gLZagJjMWOiqXZDVqmC0+kZf6Nb4IHKFCPIsu92sgCw7BlJswjBJLCdenmuPyFUS6Gp9 + oG/yRdJWGSKqhYjKDgLRImK5ACGlzsy9d/zwXn2DBMZDSkZLPaHlnpBncyGO5kxj+Rps/wYdJE2xzfOb + zcU4sye0b0gRu3E0Ypt8ELTICRFGNcShUgjHuZyWxNu2096sdiXS9o1ltNQjyyDhes4SkuXEGpXC+Ve8 + kjlzpDPtoCkVQrdOihgyIHmXP6LryGEX86Ba6ISJNR7IeF+JV8gAfbOM0XoTj8dktpmEOxM4rJHTBscz + njNNnMiBagEfU98ajRnbZMg7GojCk2oGU1cw5nUGw7BHAZWJD6oVhLFzSDCPCacljGP/J7xAm6Hu0ew6 + STIXkcvckN7ig8XHVCjvUiNvdwAmW0Twms6FayS7meM4REoihxPoeT4u10nsZ0LKhhdsIxZEsVcLtOyL + pHffVcd+IJjI7uGHsRscJEPURMMn2FMtNTwuFusPrjFl48ji7nIAAAAASUVORK5CYII= + + + + + iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 + YQUAAAAZdEVYdFNvZnR3YXJlAEFkb2JlIEltYWdlUmVhZHlxyWU8AAADZmlUWHRYTUw6Y29tLmFkb2Jl + LnhtcAAAAAAAPD94cGFja2V0IGJlZ2luPSLvu78iIGlkPSJXNU0wTXBDZWhpSHpyZVN6TlRjemtjOWQi + Pz4gPHg6eG1wbWV0YSB4bWxuczp4PSJhZG9iZTpuczptZXRhLyIgeDp4bXB0az0iQWRvYmUgWE1QIENv + cmUgNS4zLWMwMTEgNjYuMTQ1NjYxLCAyMDEyLzAyLzA2LTE0OjU2OjI3ICAgICAgICAiPiA8cmRmOlJE + RiB4bWxuczpyZGY9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkvMDIvMjItcmRmLXN5bnRheC1ucyMiPiA8 + cmRmOkRlc2NyaXB0aW9uIHJkZjphYm91dD0iIiB4bWxuczp4bXBNTT0iaHR0cDovL25zLmFkb2JlLmNv + bS94YXAvMS4wL21tLyIgeG1sbnM6c3RSZWY9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlw + ZS9SZXNvdXJjZVJlZiMiIHhtbG5zOnhtcD0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wLyIgeG1w + TU06T3JpZ2luYWxEb2N1bWVudElEPSJ4bXAuZGlkOjYzQTM5NEY4Mjg0OUU0MTE5NDBEQTc4ODZEQzk5 + N0NGIiB4bXBNTTpEb2N1bWVudElEPSJ4bXAuZGlkOkUyMTg3NjEyNDlEODExRTQ4NjNGQjM2Mzk1QkNB + RkQwIiB4bXBNTTpJbnN0YW5jZUlEPSJ4bXAuaWlkOkUyMTg3NjExNDlEODExRTQ4NjNGQjM2Mzk1QkNB + RkQwIiB4bXA6Q3JlYXRvclRvb2w9IkFkb2JlIFBob3Rvc2hvcCBDUzYgKFdpbmRvd3MpIj4gPHhtcE1N + OkRlcml2ZWRGcm9tIHN0UmVmOmluc3RhbmNlSUQ9InhtcC5paWQ6NkJCNTE0NDlEODQ5RTQxMUE0QzNB + MjdEOTJBQzc3QkMiIHN0UmVmOmRvY3VtZW50SUQ9InhtcC5kaWQ6NjNBMzk0RjgyODQ5RTQxMTk0MERB + Nzg4NkRDOTk3Q0YiLz4gPC9yZGY6RGVzY3JpcHRpb24+IDwvcmRmOlJERj4gPC94OnhtcG1ldGE+IDw/ + eHBhY2tldCBlbmQ9InIiPz5e5MstAAADiUlEQVRIS+2UW0yTdxjGcePwtYyVVpAUCi1tv9ImrVbxhAei + kjGphAgFT4jzEJ0gGuJhDk0sml0sglmWmC1hqHNKWwI4srgNh3phpjg1O1yIN5DMbFHQZUu42O76+D4f + 3Fl6Z7ILn+SXvH3f533++X/98iUBeKW81v9Uwx1G1+1240EhfKfdeE/4U3qTAqaZZO/2aeN9IXLrY+Ph + wVOZHll9YyohgYZOGS4JsYdXVDy+NQ8Tvy3BP6OlmPyjDP9OBDRYs8cZPfRy5/uQISIRqcIsLSye+j7I + wN+PluOvhyWY+NmL8fsOjP9kxdN7BRh/YJHfFjy5m48nd4ThQjy968bEgwV49usicFciTEKKFhZPXXv1 + eHxtLsYGPBjttwsWjF0xY+ybOfj9uylYs8cZPfQS7kpEnqDTwuLp9GYlfKZeifUfzcb1j/Iw/IkNv3Q6 + MfKVC6O9bg3W7HFGD73cORlMG5AIizDzAaVtunD5ESXWfNSEY/tNCO00oG1zOkJBBSeqUjVYh6R3Qmat + zSY0Hjah7IASW7hPuSoRvIGihcVTSauCppvFODRUjJZvPWgaKMTuXgt2RHOxLTwHDd3EjPfCudgesWJX + jxM7eryo7/Ni8SGFj8gp6LWwePLvS0Og043A5y5UdtkQOJeLivM5ePf8bJSfM04zG2u7chDoysW6Thsq + zqpY0+GAvymNB/gEgxYWT64tKdGihpSYv8WEpSEzVp0pwDuf2SVQReCiS4M1e5zRQy937NXJ1yRirjDz + AVmVJyNZa9+PObauh7ptKdR6FY6N2SisTYe1OlmDNXtqvRNqwxLYt1TCVLY1ZijZOSQRbuEtLSyeTOXH + sfLDH1EauoFFx6/Cd6Qf7pYI1ObLsO+9iMLdF+DccwEuqd2Nl+Br6sbCxiiKd/XBuPogH1HiAzJXHMC8 + YA98td1wb4rCuaEH1roo8oMR5JGaMPIFa10Ejtowiuouw1vzJTwVXyBz+X4ekPgRZfgbohkLtsfMy47B + tqYdakUnPFUM6YUv+LUGa/Y4o8e8rBXcSffWDkpE4j9ZpEvNmb9KsZV16BzrBnVq1YjeVf1MX1Tzn74o + iCmkdq1/LrNHOkfgB6Vg9afJRrVOdv2ClRkMmklvCnyPs4V8ge81v5RegddnCGHNHmf00JslcJcZCcWv + IU1pAhcyhLcFXj1zGtbscUYPvdyZ+Uv6Wi8rKekFBjoX2627by8AAAAASUVORK5CYII= + + + + + iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 + YQUAAAAZdEVYdFNvZnR3YXJlAEFkb2JlIEltYWdlUmVhZHlxyWU8AAADZmlUWHRYTUw6Y29tLmFkb2Jl + LnhtcAAAAAAAPD94cGFja2V0IGJlZ2luPSLvu78iIGlkPSJXNU0wTXBDZWhpSHpyZVN6TlRjemtjOWQi + Pz4gPHg6eG1wbWV0YSB4bWxuczp4PSJhZG9iZTpuczptZXRhLyIgeDp4bXB0az0iQWRvYmUgWE1QIENv + cmUgNS4zLWMwMTEgNjYuMTQ1NjYxLCAyMDEyLzAyLzA2LTE0OjU2OjI3ICAgICAgICAiPiA8cmRmOlJE + RiB4bWxuczpyZGY9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkvMDIvMjItcmRmLXN5bnRheC1ucyMiPiA8 + cmRmOkRlc2NyaXB0aW9uIHJkZjphYm91dD0iIiB4bWxuczp4bXBNTT0iaHR0cDovL25zLmFkb2JlLmNv + bS94YXAvMS4wL21tLyIgeG1sbnM6c3RSZWY9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlw + ZS9SZXNvdXJjZVJlZiMiIHhtbG5zOnhtcD0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wLyIgeG1w + TU06T3JpZ2luYWxEb2N1bWVudElEPSJ4bXAuZGlkOjYzQTM5NEY4Mjg0OUU0MTE5NDBEQTc4ODZEQzk5 + N0NGIiB4bXBNTTpEb2N1bWVudElEPSJ4bXAuZGlkOkE2Q0VGMDE2NDlEQTExRTQ4NTlCQTI3NTMyOEY5 + NEU2IiB4bXBNTTpJbnN0YW5jZUlEPSJ4bXAuaWlkOkE2Q0VGMDE1NDlEQTExRTQ4NTlCQTI3NTMyOEY5 + NEU2IiB4bXA6Q3JlYXRvclRvb2w9IkFkb2JlIFBob3Rvc2hvcCBDUzYgKFdpbmRvd3MpIj4gPHhtcE1N + OkRlcml2ZWRGcm9tIHN0UmVmOmluc3RhbmNlSUQ9InhtcC5paWQ6NjA1MjM3NzFEOTQ5RTQxMUE0QzNB + MjdEOTJBQzc3QkMiIHN0UmVmOmRvY3VtZW50SUQ9InhtcC5kaWQ6NjNBMzk0RjgyODQ5RTQxMTk0MERB + Nzg4NkRDOTk3Q0YiLz4gPC9yZGY6RGVzY3JpcHRpb24+IDwvcmRmOlJERj4gPC94OnhtcG1ldGE+IDw/ + eHBhY2tldCBlbmQ9InIiPz6UH16BAAABrElEQVRIS63N70tTURzH8fsnKSGCCEIQCBKISMq2iILCgQOL + JUxQAoVKdMGQuwgWFepsMGjFZCMuorsIJV4WFatpvzdr1ZAFsaIHn8559v1eDsI91wevJ/ee7/tjbMRH + fAFwJOWRF6oopTzyQhWlVEdBwRbgUhICAnuvilKGtXDGzW6WV/CvbjE/xTfxr+R6q4xSxtP5YTf8rVn4 + s5dG+809Rv5zvVVGKaNwfYgyBfhksoH83CCF9seiL7LBBnLXTlP4/W4dza0ZLS0nCdlgA9npAQq/qk/Q + sKa0NJ8nIBtsIBPrp9CqPMJBYVLLj+04ZIMNrF49ReHwVRafH1/R8m3zJmSDDdy/fJJC88Ua3mcjWurW + LGSDDaQifRS+O8uopsNaPhVnIBts4E64l0Jj5y4qDy5q+ZCPQTbYgHmph8LXZ0m8TJ3Xsp+LQjbYQOJC + N4XadgLl22e1vM1OQDbYwK1zXRS+lBbhmEHsLgU8kTeVh+OQDTawEDpB2U4mitfpMS22GYJssIH5QCcV + FGwBmuRtkA3cGO3whcZUlEdeqKKU8sgLVZRSfjw+MP4DJ2GPpDR9OIsAAAAASUVORK5CYII= + + + + + iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 + YQUAAAAZdEVYdFNvZnR3YXJlAEFkb2JlIEltYWdlUmVhZHlxyWU8AAADZmlUWHRYTUw6Y29tLmFkb2Jl + LnhtcAAAAAAAPD94cGFja2V0IGJlZ2luPSLvu78iIGlkPSJXNU0wTXBDZWhpSHpyZVN6TlRjemtjOWQi + Pz4gPHg6eG1wbWV0YSB4bWxuczp4PSJhZG9iZTpuczptZXRhLyIgeDp4bXB0az0iQWRvYmUgWE1QIENv + cmUgNS4zLWMwMTEgNjYuMTQ1NjYxLCAyMDEyLzAyLzA2LTE0OjU2OjI3ICAgICAgICAiPiA8cmRmOlJE + RiB4bWxuczpyZGY9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkvMDIvMjItcmRmLXN5bnRheC1ucyMiPiA8 + cmRmOkRlc2NyaXB0aW9uIHJkZjphYm91dD0iIiB4bWxuczp4bXBNTT0iaHR0cDovL25zLmFkb2JlLmNv + bS94YXAvMS4wL21tLyIgeG1sbnM6c3RSZWY9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlw + ZS9SZXNvdXJjZVJlZiMiIHhtbG5zOnhtcD0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wLyIgeG1w + TU06T3JpZ2luYWxEb2N1bWVudElEPSJ4bXAuZGlkOjYzQTM5NEY4Mjg0OUU0MTE5NDBEQTc4ODZEQzk5 + N0NGIiB4bXBNTTpEb2N1bWVudElEPSJ4bXAuZGlkOjJGRTU5OEQ1NDlEQjExRTRBRUVDOTkyMjQ5NzEw + REUwIiB4bXBNTTpJbnN0YW5jZUlEPSJ4bXAuaWlkOjJGRTU5OEQ0NDlEQjExRTRBRUVDOTkyMjQ5NzEw + REUwIiB4bXA6Q3JlYXRvclRvb2w9IkFkb2JlIFBob3Rvc2hvcCBDUzYgKFdpbmRvd3MpIj4gPHhtcE1N + OkRlcml2ZWRGcm9tIHN0UmVmOmluc3RhbmNlSUQ9InhtcC5paWQ6MTY0MkI1RjlEQTQ5RTQxMUE0QzNB + MjdEOTJBQzc3QkMiIHN0UmVmOmRvY3VtZW50SUQ9InhtcC5kaWQ6NjNBMzk0RjgyODQ5RTQxMTk0MERB + Nzg4NkRDOTk3Q0YiLz4gPC9yZGY6RGVzY3JpcHRpb24+IDwvcmRmOlJERj4gPC94OnhtcG1ldGE+IDw/ + eHBhY2tldCBlbmQ9InIiPz6B5sF9AAACe0lEQVRIS7WVb2jMcRzHL7UHanF/Mts5prE/1li3kAfu5Ak7 + 5IHNobBkSC2UIuGJkrrSWRvTmHQWK8U1T8jqUtYwkZpaGjV/Js6to5YwfXze39+fu/v23f36hXe9us+f + 7/v9rd/dr3MQ0X/F4Zm3+K9QhWajNNlBFZqN0mQHS6lMdrCUyqSgimllUsy4XmOmp+QRDllQWbygjjq6 + uimZStOX8a+ixox3pXrM1JLCDAqYJmY7c669M0bff07mcLbtEl9QE8k6V6BH5ooXMsHZZX7ae+AY7W45 + SrPm19LbsSR9m/iRA2bYGefggVePzUgKBzeu9sQpmZ4QcG/WMtk7eLjv0WMz0kOz+TX6MUXvP6cFeNbD + bz6YvQFm2Bk9PPByZO6jksLB5KvRTzTyLikIrG2ktsvXzd4g2hGjYP1ms4eHvb850qkl65LCQW/ntVs0 + 9HpMcPx0K1X4V1Ff/3NzhnphbVDsjBk8Lm/VE44s0ZJ1KS4Ie8uXUvPBE7Tn0ElCzTMqrV5BO/cfEaDG + TD5X6PFFONLygsTF7jj1vxihyPkYNTS1iFrFxm37KHIhJmp43L7qZxzp0pJ1SeHhQGgLJQaH6fb9R1QX + 2EB3Ek9FryLe95j8K9eLT/TB0FZcskOP1iRdkIh23aR7Ay9pzaZddKY9Jup8nIpeoXXhZlHD655b85Bj + p2npLOmCML+dD/iTZhaX3+UvbRB1PpzeygFnSUUvatecRUMzisoOc+x0LZ3FixxYhQyK1cxyZhkTYhqY + RgnM6hmcwVl4ljDI0KS4AC+Kmyli8Jv2MF7GNwXY4QzOwgNv5mWTL7CLpVQmO1hKZbKDpVR/1P8OcvwB + lh7gOXXZq9sAAAAASUVORK5CYII= + + iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 @@ -598,147 +738,7 @@ 1BGxz38BvCwLsyQ3iHgAAAAASUVORK5CYII= - - - iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAZdEVYdFNvZnR3YXJlAEFkb2JlIEltYWdlUmVhZHlxyWU8AAADZmlUWHRYTUw6Y29tLmFkb2Jl - LnhtcAAAAAAAPD94cGFja2V0IGJlZ2luPSLvu78iIGlkPSJXNU0wTXBDZWhpSHpyZVN6TlRjemtjOWQi - Pz4gPHg6eG1wbWV0YSB4bWxuczp4PSJhZG9iZTpuczptZXRhLyIgeDp4bXB0az0iQWRvYmUgWE1QIENv - cmUgNS4zLWMwMTEgNjYuMTQ1NjYxLCAyMDEyLzAyLzA2LTE0OjU2OjI3ICAgICAgICAiPiA8cmRmOlJE - RiB4bWxuczpyZGY9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkvMDIvMjItcmRmLXN5bnRheC1ucyMiPiA8 - cmRmOkRlc2NyaXB0aW9uIHJkZjphYm91dD0iIiB4bWxuczp4bXBNTT0iaHR0cDovL25zLmFkb2JlLmNv - bS94YXAvMS4wL21tLyIgeG1sbnM6c3RSZWY9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlw - ZS9SZXNvdXJjZVJlZiMiIHhtbG5zOnhtcD0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wLyIgeG1w - TU06T3JpZ2luYWxEb2N1bWVudElEPSJ4bXAuZGlkOjYzQTM5NEY4Mjg0OUU0MTE5NDBEQTc4ODZEQzk5 - N0NGIiB4bXBNTTpEb2N1bWVudElEPSJ4bXAuZGlkOjEwQ0IxNzBBNEM1QzExRTRBNkNGQzRBMjhDQzI0 - MkY4IiB4bXBNTTpJbnN0YW5jZUlEPSJ4bXAuaWlkOjEwQ0IxNzA5NEM1QzExRTRBNkNGQzRBMjhDQzI0 - MkY4IiB4bXA6Q3JlYXRvclRvb2w9IkFkb2JlIFBob3Rvc2hvcCBDUzYgKFdpbmRvd3MpIj4gPHhtcE1N - OkRlcml2ZWRGcm9tIHN0UmVmOmluc3RhbmNlSUQ9InhtcC5paWQ6NTEzMDNDMjA1QjRDRTQxMTg4NERE - MUVBOEQ4QTgyNTUiIHN0UmVmOmRvY3VtZW50SUQ9InhtcC5kaWQ6NjNBMzk0RjgyODQ5RTQxMTk0MERB - Nzg4NkRDOTk3Q0YiLz4gPC9yZGY6RGVzY3JpcHRpb24+IDwvcmRmOlJERj4gPC94OnhtcG1ldGE+IDw/ - eHBhY2tldCBlbmQ9InIiPz43wa2/AAAFaUlEQVRIS6WUC0xTVxzGKy0UkSmlFGjBFilSkNpSaAWRh63y - sIiAArKs4spLRLQoiEJlSMGoMCc6CBOnYHzMOHUqqOhEHOqCbjNu6kCd6KYje5mZ6KbObd/OuVL3cEzj - /skv997/+b7v39PTW9aj3/BM+OKxPEIZoW/gyrOuPbP+GvRPSNBQQqXYLwSW1etw7cYt5kqfaZ+uD8QM - Xg8f/f4UxGhHMHv4qlG6vAb9394G6T+BPpdV1oCuUx3VD8Q9XT8//PUJRMghlLhLg1C41IK+r/pB+oNC - 16mO6qmP+gdi/6y793+hwTYEk9uoQOSaStHzxQ2Q/nND9XMKy0D9NIfmDcSzaLhI4KXE7LwinLtwGXfu - PXhhqJ/m0DyS62EdUGWpqcf3P97DD3d++t/QnKraBjpghXWAiC+WN0ZNScOe1mP45vbdF2ZvWwdoDs/D - b6ejs6ecxHPoAG/l+Fhkzy+FyCcY0YkG7D/yAW5+d+e5oXrqo36aQ/McnNyjyAAuHWA05pfgzPlehhyT - mflV6FOMaDt2Ctf7bw8KXac6qqc+a4Zx3hLwRLJCZgcJjcPIEPkyIZmeX1SB7vOX0dn9KQy5jw8r8eVc - HOrsxidXP0d9hxlzd4QgeYMzEt7kQVvOR0pFFNpOHmd81E9znIS+dSTc1foVGWfNKUZjyy6Ex6SQl0cD - 09IVxHAFh0+cReqr+QjK8ERqEw+VHWOwoycSR/v1OHwzDlsvhcNCeqkbedAYxQiPm87kZOQVw0nkW0QG - 2DFnIA+JRm3DFpzr/RKNW3ZDE5UAsX8ocizZiFs7DEUHvPFunw4Hb05B+y09jn49lYHe0x5doxqqLVlf - DJrnyB+pIQNs6QAhf6R8tZu3CqpwPdZu2I6PLl3HwnV5iHv9JVSeUOKdqzq81xeDvddiYG73R0aLEIZm - IRa1jUbjxQnYRHa17YqW0VJPwHT3LocRbirrDiymspXo6L6AgiXV8JSNQ2i6GpNWOqK4U4n1n0Vge68W - 9ecmIKnBBSqDCIp4P2RWGDB/QxqS6l1QcToIld3BqDobgsXEQ73+Se5HrGcgdJEokGzIx66DXXi7dRvC - yx2Q2RqApR+GoPbjCag8pUZ6sxjqWRKEldljRr07ZjaKmHt5qpBZKzkeiIJ2BbIPKmA8MIbJUC/ghrM0 - RfYsDtdhqJNIVulK/ku0BQokbfZGZrsKBR3BmEsMOfvl0FY7o7ypDPo1brCcGc+QUCdExabXEFsjQO4B - ObL2BSBlqx8SWwibvBE0334nK3Ael+yEbIW81DZszlhZ2oieuAYvpO5VIHGzP9J2+CN9pz/CzDwExMox - eZUbFnZpkEc+gLZagJjMWOiqXZDVqmC0+kZf6Nb4IHKFCPIsu92sgCw7BlJswjBJLCdenmuPyFUS6Gp9 - oG/yRdJWGSKqhYjKDgLRImK5ACGlzsy9d/zwXn2DBMZDSkZLPaHlnpBncyGO5kxj+Rps/wYdJE2xzfOb - zcU4sye0b0gRu3E0Ypt8ELTICRFGNcShUgjHuZyWxNu2096sdiXS9o1ltNQjyyDhes4SkuXEGpXC+Ve8 - kjlzpDPtoCkVQrdOihgyIHmXP6LryGEX86Ba6ISJNR7IeF+JV8gAfbOM0XoTj8dktpmEOxM4rJHTBscz - njNNnMiBagEfU98ajRnbZMg7GojCk2oGU1cw5nUGw7BHAZWJD6oVhLFzSDCPCacljGP/J7xAm6Hu0ew6 - STIXkcvckN7ig8XHVCjvUiNvdwAmW0Twms6FayS7meM4REoihxPoeT4u10nsZ0LKhhdsIxZEsVcLtOyL - pHffVcd+IJjI7uGHsRscJEPURMMn2FMtNTwuFusPrjFl48ji7nIAAAAASUVORK5CYII= - - - - - iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAZdEVYdFNvZnR3YXJlAEFkb2JlIEltYWdlUmVhZHlxyWU8AAADZmlUWHRYTUw6Y29tLmFkb2Jl - LnhtcAAAAAAAPD94cGFja2V0IGJlZ2luPSLvu78iIGlkPSJXNU0wTXBDZWhpSHpyZVN6TlRjemtjOWQi - Pz4gPHg6eG1wbWV0YSB4bWxuczp4PSJhZG9iZTpuczptZXRhLyIgeDp4bXB0az0iQWRvYmUgWE1QIENv - cmUgNS4zLWMwMTEgNjYuMTQ1NjYxLCAyMDEyLzAyLzA2LTE0OjU2OjI3ICAgICAgICAiPiA8cmRmOlJE - RiB4bWxuczpyZGY9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkvMDIvMjItcmRmLXN5bnRheC1ucyMiPiA8 - cmRmOkRlc2NyaXB0aW9uIHJkZjphYm91dD0iIiB4bWxuczp4bXBNTT0iaHR0cDovL25zLmFkb2JlLmNv - bS94YXAvMS4wL21tLyIgeG1sbnM6c3RSZWY9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlw - ZS9SZXNvdXJjZVJlZiMiIHhtbG5zOnhtcD0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wLyIgeG1w - TU06T3JpZ2luYWxEb2N1bWVudElEPSJ4bXAuZGlkOjYzQTM5NEY4Mjg0OUU0MTE5NDBEQTc4ODZEQzk5 - N0NGIiB4bXBNTTpEb2N1bWVudElEPSJ4bXAuZGlkOkUyMTg3NjEyNDlEODExRTQ4NjNGQjM2Mzk1QkNB - RkQwIiB4bXBNTTpJbnN0YW5jZUlEPSJ4bXAuaWlkOkUyMTg3NjExNDlEODExRTQ4NjNGQjM2Mzk1QkNB - RkQwIiB4bXA6Q3JlYXRvclRvb2w9IkFkb2JlIFBob3Rvc2hvcCBDUzYgKFdpbmRvd3MpIj4gPHhtcE1N - OkRlcml2ZWRGcm9tIHN0UmVmOmluc3RhbmNlSUQ9InhtcC5paWQ6NkJCNTE0NDlEODQ5RTQxMUE0QzNB - MjdEOTJBQzc3QkMiIHN0UmVmOmRvY3VtZW50SUQ9InhtcC5kaWQ6NjNBMzk0RjgyODQ5RTQxMTk0MERB - Nzg4NkRDOTk3Q0YiLz4gPC9yZGY6RGVzY3JpcHRpb24+IDwvcmRmOlJERj4gPC94OnhtcG1ldGE+IDw/ - eHBhY2tldCBlbmQ9InIiPz5e5MstAAADiUlEQVRIS+2UW0yTdxjGcePwtYyVVpAUCi1tv9ImrVbxhAei - kjGphAgFT4jzEJ0gGuJhDk0sml0sglmWmC1hqHNKWwI4srgNh3phpjg1O1yIN5DMbFHQZUu42O76+D4f - 3Fl6Z7ILn+SXvH3f533++X/98iUBeKW81v9Uwx1G1+1240EhfKfdeE/4U3qTAqaZZO/2aeN9IXLrY+Ph - wVOZHll9YyohgYZOGS4JsYdXVDy+NQ8Tvy3BP6OlmPyjDP9OBDRYs8cZPfRy5/uQISIRqcIsLSye+j7I - wN+PluOvhyWY+NmL8fsOjP9kxdN7BRh/YJHfFjy5m48nd4ThQjy968bEgwV49usicFciTEKKFhZPXXv1 - eHxtLsYGPBjttwsWjF0xY+ybOfj9uylYs8cZPfQS7kpEnqDTwuLp9GYlfKZeifUfzcb1j/Iw/IkNv3Q6 - MfKVC6O9bg3W7HFGD73cORlMG5AIizDzAaVtunD5ESXWfNSEY/tNCO00oG1zOkJBBSeqUjVYh6R3Qmat - zSY0Hjah7IASW7hPuSoRvIGihcVTSauCppvFODRUjJZvPWgaKMTuXgt2RHOxLTwHDd3EjPfCudgesWJX - jxM7eryo7/Ni8SGFj8gp6LWwePLvS0Og043A5y5UdtkQOJeLivM5ePf8bJSfM04zG2u7chDoysW6Thsq - zqpY0+GAvymNB/gEgxYWT64tKdGihpSYv8WEpSEzVp0pwDuf2SVQReCiS4M1e5zRQy937NXJ1yRirjDz - AVmVJyNZa9+PObauh7ptKdR6FY6N2SisTYe1OlmDNXtqvRNqwxLYt1TCVLY1ZijZOSQRbuEtLSyeTOXH - sfLDH1EauoFFx6/Cd6Qf7pYI1ObLsO+9iMLdF+DccwEuqd2Nl+Br6sbCxiiKd/XBuPogH1HiAzJXHMC8 - YA98td1wb4rCuaEH1roo8oMR5JGaMPIFa10Ejtowiuouw1vzJTwVXyBz+X4ekPgRZfgbohkLtsfMy47B - tqYdakUnPFUM6YUv+LUGa/Y4o8e8rBXcSffWDkpE4j9ZpEvNmb9KsZV16BzrBnVq1YjeVf1MX1Tzn74o - iCmkdq1/LrNHOkfgB6Vg9afJRrVOdv2ClRkMmklvCnyPs4V8ge81v5RegddnCGHNHmf00JslcJcZCcWv - IU1pAhcyhLcFXj1zGtbscUYPvdyZ+Uv6Wi8rKekFBjoX2627by8AAAAASUVORK5CYII= - - - - - iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAZdEVYdFNvZnR3YXJlAEFkb2JlIEltYWdlUmVhZHlxyWU8AAADZmlUWHRYTUw6Y29tLmFkb2Jl - LnhtcAAAAAAAPD94cGFja2V0IGJlZ2luPSLvu78iIGlkPSJXNU0wTXBDZWhpSHpyZVN6TlRjemtjOWQi - Pz4gPHg6eG1wbWV0YSB4bWxuczp4PSJhZG9iZTpuczptZXRhLyIgeDp4bXB0az0iQWRvYmUgWE1QIENv - cmUgNS4zLWMwMTEgNjYuMTQ1NjYxLCAyMDEyLzAyLzA2LTE0OjU2OjI3ICAgICAgICAiPiA8cmRmOlJE - RiB4bWxuczpyZGY9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkvMDIvMjItcmRmLXN5bnRheC1ucyMiPiA8 - cmRmOkRlc2NyaXB0aW9uIHJkZjphYm91dD0iIiB4bWxuczp4bXBNTT0iaHR0cDovL25zLmFkb2JlLmNv - bS94YXAvMS4wL21tLyIgeG1sbnM6c3RSZWY9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlw - ZS9SZXNvdXJjZVJlZiMiIHhtbG5zOnhtcD0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wLyIgeG1w - TU06T3JpZ2luYWxEb2N1bWVudElEPSJ4bXAuZGlkOjYzQTM5NEY4Mjg0OUU0MTE5NDBEQTc4ODZEQzk5 - N0NGIiB4bXBNTTpEb2N1bWVudElEPSJ4bXAuZGlkOkE2Q0VGMDE2NDlEQTExRTQ4NTlCQTI3NTMyOEY5 - NEU2IiB4bXBNTTpJbnN0YW5jZUlEPSJ4bXAuaWlkOkE2Q0VGMDE1NDlEQTExRTQ4NTlCQTI3NTMyOEY5 - NEU2IiB4bXA6Q3JlYXRvclRvb2w9IkFkb2JlIFBob3Rvc2hvcCBDUzYgKFdpbmRvd3MpIj4gPHhtcE1N - OkRlcml2ZWRGcm9tIHN0UmVmOmluc3RhbmNlSUQ9InhtcC5paWQ6NjA1MjM3NzFEOTQ5RTQxMUE0QzNB - MjdEOTJBQzc3QkMiIHN0UmVmOmRvY3VtZW50SUQ9InhtcC5kaWQ6NjNBMzk0RjgyODQ5RTQxMTk0MERB - Nzg4NkRDOTk3Q0YiLz4gPC9yZGY6RGVzY3JpcHRpb24+IDwvcmRmOlJERj4gPC94OnhtcG1ldGE+IDw/ - eHBhY2tldCBlbmQ9InIiPz6UH16BAAABrElEQVRIS63N70tTURzH8fsnKSGCCEIQCBKISMq2iILCgQOL - JUxQAoVKdMGQuwgWFepsMGjFZCMuorsIJV4WFatpvzdr1ZAFsaIHn8559v1eDsI91wevJ/ee7/tjbMRH - fAFwJOWRF6oopTzyQhWlVEdBwRbgUhICAnuvilKGtXDGzW6WV/CvbjE/xTfxr+R6q4xSxtP5YTf8rVn4 - s5dG+809Rv5zvVVGKaNwfYgyBfhksoH83CCF9seiL7LBBnLXTlP4/W4dza0ZLS0nCdlgA9npAQq/qk/Q - sKa0NJ8nIBtsIBPrp9CqPMJBYVLLj+04ZIMNrF49ReHwVRafH1/R8m3zJmSDDdy/fJJC88Ua3mcjWurW - LGSDDaQifRS+O8uopsNaPhVnIBts4E64l0Jj5y4qDy5q+ZCPQTbYgHmph8LXZ0m8TJ3Xsp+LQjbYQOJC - N4XadgLl22e1vM1OQDbYwK1zXRS+lBbhmEHsLgU8kTeVh+OQDTawEDpB2U4mitfpMS22GYJssIH5QCcV - FGwBmuRtkA3cGO3whcZUlEdeqKKU8sgLVZRSfjw+MP4DJ2GPpDR9OIsAAAAASUVORK5CYII= - - - - - iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAZdEVYdFNvZnR3YXJlAEFkb2JlIEltYWdlUmVhZHlxyWU8AAADZmlUWHRYTUw6Y29tLmFkb2Jl - LnhtcAAAAAAAPD94cGFja2V0IGJlZ2luPSLvu78iIGlkPSJXNU0wTXBDZWhpSHpyZVN6TlRjemtjOWQi - Pz4gPHg6eG1wbWV0YSB4bWxuczp4PSJhZG9iZTpuczptZXRhLyIgeDp4bXB0az0iQWRvYmUgWE1QIENv - cmUgNS4zLWMwMTEgNjYuMTQ1NjYxLCAyMDEyLzAyLzA2LTE0OjU2OjI3ICAgICAgICAiPiA8cmRmOlJE - RiB4bWxuczpyZGY9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkvMDIvMjItcmRmLXN5bnRheC1ucyMiPiA8 - cmRmOkRlc2NyaXB0aW9uIHJkZjphYm91dD0iIiB4bWxuczp4bXBNTT0iaHR0cDovL25zLmFkb2JlLmNv - bS94YXAvMS4wL21tLyIgeG1sbnM6c3RSZWY9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlw - ZS9SZXNvdXJjZVJlZiMiIHhtbG5zOnhtcD0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wLyIgeG1w - TU06T3JpZ2luYWxEb2N1bWVudElEPSJ4bXAuZGlkOjYzQTM5NEY4Mjg0OUU0MTE5NDBEQTc4ODZEQzk5 - N0NGIiB4bXBNTTpEb2N1bWVudElEPSJ4bXAuZGlkOjJGRTU5OEQ1NDlEQjExRTRBRUVDOTkyMjQ5NzEw - REUwIiB4bXBNTTpJbnN0YW5jZUlEPSJ4bXAuaWlkOjJGRTU5OEQ0NDlEQjExRTRBRUVDOTkyMjQ5NzEw - REUwIiB4bXA6Q3JlYXRvclRvb2w9IkFkb2JlIFBob3Rvc2hvcCBDUzYgKFdpbmRvd3MpIj4gPHhtcE1N - OkRlcml2ZWRGcm9tIHN0UmVmOmluc3RhbmNlSUQ9InhtcC5paWQ6MTY0MkI1RjlEQTQ5RTQxMUE0QzNB - MjdEOTJBQzc3QkMiIHN0UmVmOmRvY3VtZW50SUQ9InhtcC5kaWQ6NjNBMzk0RjgyODQ5RTQxMTk0MERB - Nzg4NkRDOTk3Q0YiLz4gPC9yZGY6RGVzY3JpcHRpb24+IDwvcmRmOlJERj4gPC94OnhtcG1ldGE+IDw/ - eHBhY2tldCBlbmQ9InIiPz6B5sF9AAACe0lEQVRIS7WVb2jMcRzHL7UHanF/Mts5prE/1li3kAfu5Ak7 - 5IHNobBkSC2UIuGJkrrSWRvTmHQWK8U1T8jqUtYwkZpaGjV/Js6to5YwfXze39+fu/v23f36hXe9us+f - 7/v9rd/dr3MQ0X/F4Zm3+K9QhWajNNlBFZqN0mQHS6lMdrCUyqSgimllUsy4XmOmp+QRDllQWbygjjq6 - uimZStOX8a+ixox3pXrM1JLCDAqYJmY7c669M0bff07mcLbtEl9QE8k6V6BH5ooXMsHZZX7ae+AY7W45 - SrPm19LbsSR9m/iRA2bYGefggVePzUgKBzeu9sQpmZ4QcG/WMtk7eLjv0WMz0kOz+TX6MUXvP6cFeNbD - bz6YvQFm2Bk9PPByZO6jksLB5KvRTzTyLikIrG2ktsvXzd4g2hGjYP1ms4eHvb850qkl65LCQW/ntVs0 - 9HpMcPx0K1X4V1Ff/3NzhnphbVDsjBk8Lm/VE44s0ZJ1KS4Ie8uXUvPBE7Tn0ElCzTMqrV5BO/cfEaDG - TD5X6PFFONLygsTF7jj1vxihyPkYNTS1iFrFxm37KHIhJmp43L7qZxzp0pJ1SeHhQGgLJQaH6fb9R1QX - 2EB3Ek9FryLe95j8K9eLT/TB0FZcskOP1iRdkIh23aR7Ay9pzaZddKY9Jup8nIpeoXXhZlHD655b85Bj - p2npLOmCML+dD/iTZhaX3+UvbRB1PpzeygFnSUUvatecRUMzisoOc+x0LZ3FixxYhQyK1cxyZhkTYhqY - RgnM6hmcwVl4ljDI0KS4AC+Kmyli8Jv2MF7GNwXY4QzOwgNv5mWTL7CLpVQmO1hKZbKDpVR/1P8OcvwB - lh7gOXXZq9sAAAAASUVORK5CYII= - - - + iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 YQUAAAAZdEVYdFNvZnR3YXJlAEFkb2JlIEltYWdlUmVhZHlxyWU8AAADZmlUWHRYTUw6Y29tLmFkb2Jl @@ -750,26 +750,244 @@ bS94YXAvMS4wL21tLyIgeG1sbnM6c3RSZWY9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlw ZS9SZXNvdXJjZVJlZiMiIHhtbG5zOnhtcD0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wLyIgeG1w TU06T3JpZ2luYWxEb2N1bWVudElEPSJ4bXAuZGlkOjJGQzkyMzc0Rjk0OUU0MTE5NjNCQjRENDMzQjlC - MUM4IiB4bXBNTTpEb2N1bWVudElEPSJ4bXAuZGlkOjJERjY3MEZENEQyMzExRTRCNDlGQUMwMzk0OTAw - Qzc4IiB4bXBNTTpJbnN0YW5jZUlEPSJ4bXAuaWlkOjJERjY3MEZDNEQyMzExRTRCNDlGQUMwMzk0OTAw - Qzc4IiB4bXA6Q3JlYXRvclRvb2w9IkFkb2JlIFBob3Rvc2hvcCBDUzYgKFdpbmRvd3MpIj4gPHhtcE1N - OkRlcml2ZWRGcm9tIHN0UmVmOmluc3RhbmNlSUQ9InhtcC5paWQ6NjhGOUEyRDEyMTRERTQxMUIzNkJE + MUM4IiB4bXBNTTpEb2N1bWVudElEPSJ4bXAuZGlkOjlDMzFEOUI4NEFBRjExRTQ4OTA5OUYwQ0QzM0Q2 + NEI4IiB4bXBNTTpJbnN0YW5jZUlEPSJ4bXAuaWlkOjlDMzFEOUI3NEFBRjExRTQ4OTA5OUYwQ0QzM0Q2 + NEI4IiB4bXA6Q3JlYXRvclRvb2w9IkFkb2JlIFBob3Rvc2hvcCBDUzYgKFdpbmRvd3MpIj4gPHhtcE1N + OkRlcml2ZWRGcm9tIHN0UmVmOmluc3RhbmNlSUQ9InhtcC5paWQ6MDk5Mzk2NTZBRjRBRTQxMTk3NEFD + QUFFQjRCMzVENkUiIHN0UmVmOmRvY3VtZW50SUQ9InhtcC5kaWQ6MkZDOTIzNzRGOTQ5RTQxMTk2M0JC + NEQ0MzNCOUIxQzgiLz4gPC9yZGY6RGVzY3JpcHRpb24+IDwvcmRmOlJERj4gPC94OnhtcG1ldGE+IDw/ + eHBhY2tldCBlbmQ9InIiPz73sIMwAAADIElEQVRIS7WVa0iTYRTH56Uiysvm3TkvpLl5DRIvQYWVWl+6 + iNEVg0yhQqloQZHkLT+Y0YdAs75IpEUhzERZoZhsRpZlS7soblotsRwoxhqWeTrnYZtv+u7NsB74cZ5z + zv89/z17HzYRAPxXeIv/EpFXcOyi4BvKhfehv4FvKBfeh+ayqIUDlIgBgT8whpRYoT2fhgvNVJKBQT9s + hB8/QZDPpnEIjEhg0J5Pw4Vm0mwygG9T06BSqQQhTUhUMoRGpyxYT7OZwfhXC6jVakFIYzNYqN5uMGKa + BI1GIwhpghXJaJJi13d0dEB2bj74hsWzSDlXbzfQG02g0+kEIU2wIomdovzKdVifngnFFytBeb4cLN+n + WaSc6hfKKqB/eHTWoHfwExgMBkFII5MnQUD4WlAWloO26wVs35MDmifPmQFFyqlO/aKKqlmDp31DYDKZ + BCGNTJ4IPqHx8LJvACbNUw7p6e2HuJQMNIhhBuaHj3vBYrEI0tb1BoIiE9kJ9h7Oh7EJM+g/jEJuwVlY + s24ri5RTnfo5BedAIoueIYPumvomuHzjzm9cq2uCq7UNUH2rEarr7kNd0yP26Y+eKoSWtk4wfpmAg7kn + ITY5DUorq1g8cOQEqze3aplOEhRtJoMcL1mMTixV9IgD5a/tSBVDYql8AKOBQLEJtTP08gY/jjFiktKg + 5FIV21Ok3NazvmR2AvrFkCAJyGYk1comZAuHDM/AyLvHThfBveZ26NOPwI59eey7LsbhFCmnOvVJ5+Ef + rrYZLEU8EZ85+HLwW7ZCLMVTFWdkHoLut+/hgbYHaE9XN31XNsupTrWV3jKVs+uS3cyAD0cLe331jW3Q + qRt0CPUlQVHDKI+fN9iGo4W90uNnyuA2vvRtWTlQgxeg/dk7FimnOvU9/CNqUe47b7ANRwt7AfjpKvAK + Gt18Qur35ymhRfsKKLr5hN7EyzDq7humWrrcfSfKxbz/QlwcLDck1snZJdUzYHUDmk57+K1qdXJyzsL6 + RmQD9ZmObygXB8sVIRO6fXQB4hC6eRQppzr1XXmHclnAckFomLc1Um5dItEvhZ97MQXP9N0AAAAASUVO + RK5CYII= + + + + + iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 + YQUAAAAZdEVYdFNvZnR3YXJlAEFkb2JlIEltYWdlUmVhZHlxyWU8AAADZmlUWHRYTUw6Y29tLmFkb2Jl + LnhtcAAAAAAAPD94cGFja2V0IGJlZ2luPSLvu78iIGlkPSJXNU0wTXBDZWhpSHpyZVN6TlRjemtjOWQi + Pz4gPHg6eG1wbWV0YSB4bWxuczp4PSJhZG9iZTpuczptZXRhLyIgeDp4bXB0az0iQWRvYmUgWE1QIENv + cmUgNS4zLWMwMTEgNjYuMTQ1NjYxLCAyMDEyLzAyLzA2LTE0OjU2OjI3ICAgICAgICAiPiA8cmRmOlJE + RiB4bWxuczpyZGY9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkvMDIvMjItcmRmLXN5bnRheC1ucyMiPiA8 + cmRmOkRlc2NyaXB0aW9uIHJkZjphYm91dD0iIiB4bWxuczp4bXBNTT0iaHR0cDovL25zLmFkb2JlLmNv + bS94YXAvMS4wL21tLyIgeG1sbnM6c3RSZWY9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlw + ZS9SZXNvdXJjZVJlZiMiIHhtbG5zOnhtcD0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wLyIgeG1w + TU06T3JpZ2luYWxEb2N1bWVudElEPSJ4bXAuZGlkOjJGQzkyMzc0Rjk0OUU0MTE5NjNCQjRENDMzQjlC + MUM4IiB4bXBNTTpEb2N1bWVudElEPSJ4bXAuZGlkOjhDMTdBQjRENEFBRTExRTQ4QjQyODY0MDNBNTJE + NzNCIiB4bXBNTTpJbnN0YW5jZUlEPSJ4bXAuaWlkOjhDMTdBQjRDNEFBRTExRTQ4QjQyODY0MDNBNTJE + NzNCIiB4bXA6Q3JlYXRvclRvb2w9IkFkb2JlIFBob3Rvc2hvcCBDUzYgKFdpbmRvd3MpIj4gPHhtcE1N + OkRlcml2ZWRGcm9tIHN0UmVmOmluc3RhbmNlSUQ9InhtcC5paWQ6NUQyMjc4QTlBQjRBRTQxMTk3NEFD + QUFFQjRCMzVENkUiIHN0UmVmOmRvY3VtZW50SUQ9InhtcC5kaWQ6MkZDOTIzNzRGOTQ5RTQxMTk2M0JC + NEQ0MzNCOUIxQzgiLz4gPC9yZGY6RGVzY3JpcHRpb24+IDwvcmRmOlJERj4gPC94OnhtcG1ldGE+IDw/ + eHBhY2tldCBlbmQ9InIiPz4eHsDfAAAB00lEQVRIS7XVWytEURQH8HniTTNHLs0NCXNcXjTN5dH9g/gM + 3jx590QhFDJS0gyTGmpqaqJIMW4hzlAoOaWISS7LWifntI3ddnTGrl92e/57/We/DBsA/CvuYSHZSr0t + lvCGsriX/oI3lMW9lM/SwgF9SEHwizs08IX2vAyLZvZRgXJ+cQWv7yB0q96Ds86voT0vw6KZNJsK4Pnl + DWKxmBBlqhpDUN0UNp2n2VrB/WMOEomEEGX0ArN5o+BGfYB0Oi1EGa8cwpKw6bxRcH6lQiaTEaKMVw5q + rzCbNwr2z65BURQhynh8Qe0VZvNGwdZBFlRVFaKMxxfQXmE2rxc8rW3sQy6XE0puHoG7IaC9YnV9j5th + pbZPqOCDCrbH5uIwOD7/zWgkDkNTizAyuwQjkWWIxFNQWduqmVxI/MiPz6/A8HTUuDMTTYLkbrqhgt5S + T3PG4ZJ3HE7focElZx0u3yn+VQiG1ZLymmm7s74f88f42S6bl9zyJZ6d6Xckd+Mt5ieogH4xJORHHajt + SzvqZPSgECpHZSiA2DztuxBlad+NgnpBEbIjusiiYboKRF+kGFHegUR5ImkFv7G0eAPzWVq8gfksLd5/ + oULiHhYS97BwwPYJlSCUgVubViQAAAAASUVORK5CYII= + + + + + iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 + YQUAAAAZdEVYdFNvZnR3YXJlAEFkb2JlIEltYWdlUmVhZHlxyWU8AAADZmlUWHRYTUw6Y29tLmFkb2Jl + LnhtcAAAAAAAPD94cGFja2V0IGJlZ2luPSLvu78iIGlkPSJXNU0wTXBDZWhpSHpyZVN6TlRjemtjOWQi + Pz4gPHg6eG1wbWV0YSB4bWxuczp4PSJhZG9iZTpuczptZXRhLyIgeDp4bXB0az0iQWRvYmUgWE1QIENv + cmUgNS4zLWMwMTEgNjYuMTQ1NjYxLCAyMDEyLzAyLzA2LTE0OjU2OjI3ICAgICAgICAiPiA8cmRmOlJE + RiB4bWxuczpyZGY9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkvMDIvMjItcmRmLXN5bnRheC1ucyMiPiA8 + cmRmOkRlc2NyaXB0aW9uIHJkZjphYm91dD0iIiB4bWxuczp4bXBNTT0iaHR0cDovL25zLmFkb2JlLmNv + bS94YXAvMS4wL21tLyIgeG1sbnM6c3RSZWY9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlw + ZS9SZXNvdXJjZVJlZiMiIHhtbG5zOnhtcD0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wLyIgeG1w + TU06T3JpZ2luYWxEb2N1bWVudElEPSJ4bXAuZGlkOjJGQzkyMzc0Rjk0OUU0MTE5NjNCQjRENDMzQjlC + MUM4IiB4bXBNTTpEb2N1bWVudElEPSJ4bXAuZGlkOjJEMDQyOEZBNEFEMjExRTRBN0MxRDBCNzJGRUND + MDEzIiB4bXBNTTpJbnN0YW5jZUlEPSJ4bXAuaWlkOjJEMDQyOEY5NEFEMjExRTRBN0MxRDBCNzJGRUND + MDEzIiB4bXA6Q3JlYXRvclRvb2w9IkFkb2JlIFBob3Rvc2hvcCBDUzYgKFdpbmRvd3MpIj4gPHhtcE1N + OkRlcml2ZWRGcm9tIHN0UmVmOmluc3RhbmNlSUQ9InhtcC5paWQ6QkRDRkI1RDVEMTRBRTQxMTk3NEFD + QUFFQjRCMzVENkUiIHN0UmVmOmRvY3VtZW50SUQ9InhtcC5kaWQ6MkZDOTIzNzRGOTQ5RTQxMTk2M0JC + NEQ0MzNCOUIxQzgiLz4gPC9yZGY6RGVzY3JpcHRpb24+IDwvcmRmOlJERj4gPC94OnhtcG1ldGE+IDw/ + eHBhY2tldCBlbmQ9InIiPz59jfe3AAAEbUlEQVRIS8WTeUybZRzHF48/pnFOuQRajkFLgQFb5iRLNJr4 + l/EPgsniUI4xZDAY1zyxwApsMJyIME61rByl3DfoYGBrgbWUY06FcZSCha4rQ8jYxkqPr2/fvkv8o2Sg + S/wkT970eb6/T5/39z7Prv8dt/Oql4mR4HZJ3ccoXFxhVCzB9DT9JueJdSq6c1wzVZFupepVzxu34XVj + CaEDi1jX6hF8ZQoeokl4iBVwzV9YdU1XRlIl28eVo8phCdXwGltEeOUsro6psaHVwcSDh5volc4iOO8X + 7KuVwb1hEi7J8myq9PEQO//I85oafr0KtEpUpNSETm+AwWDAvfv3YTQaybnm/t/AyO6Ga+UonJOnIijF + 1hA9tWI2qle9RxcI+RIpmZpTIfBULhIyyqHVahHPKcN70TmYnFFCp9OhqXcc9KwW0DOHVl3YU1aUyjJu + F1SpfhO3EM6bMMsVt+D8Zhz2HIpC4oU6bG5uIu4cD3tfTwAjIBNypQYbGxsISquBU34PaDHiVEplGXee + SuIjVaBv3Lz7gJg8vHg4FlZvc+ATVoLipiHsD8qCXWAO7IPK8MG5FjLXKboOeoYADkldUkplGWb7vOb4 + 4BzxIXXQE/1m59WDXdgBvxPfwz6UC4eQUth/WIBDZ2qQXj+K7IYRImeE5s5fOFrcDPvPapcJzVNmmwVY + VxWG9U09uau1tTVymPpc0iYFLew7OEUJ4BwtALfvJpl5xMrKCu6s3cUrn5YbCM1us80CrJZZVWjXr7j3 + 4CE0y8v4IrcaH+cK4Bv+DRyPl8ApphYuia3wZ3eCUzOA1PIfcVuzjHnlIgK/vgy7mHzTG+w12yzA5E53 + edYPo1c2i/X1dQTEfwvbwDQ4hhXg8OcN4P48Df+UTrgkNIAeW4Hg3Hbo9Xq0iGSgs4ls5CUhoXnObLOA + S8pkhG/bdZzgDZJnffT3GXieLAA9XgB2/RjZjuQqMWhxfBw824H55XWyhcfy+HDNqoB1SH4Codn6G7iw + p3d78EaVPlXX0CaZgkqlgly1gpCiK0htHCH/IL6oFcEF3ZjT3CUvXqv0DzDSS0FPq1a/8EbYS5Rqa+if + SAJ8KoeNR7gitEsnoVQqSbGOkJmYX1ggxaY70SabwIGMUrjn8I3WIXnBRPnWu/8nDnE9Sd7cAaP/ZSES + 6/rRKJRArpiHXC7HzekZNIukiCyrhW9mGZgXa4w2kUVnibJnzdXbxP5URzyDO4QjxGl5i9uNpMZeKP5U + IrywAq9yCnGAOGGMonbYxpVnEPGdyR9BO/MTj8kfgXeNFPt5IngVtoF1kQ9WcTs8qgfgmNreQMS21xZL + 0E6Ln6ef75tg8sfgXT8O77oReAkkYNXJ4PRV/4ztyfo9VPTf4xjdf9CpQKzdxxuGe6UMbhXEmc8V6mze + r3qNivx3HGN7UmglQ6CVDMIxXwybo5UcaunJQD8te9rhyx4JrWwItlGNUut3y5+hlp4cDhFCpl14k9jq + nR+Y1NTjIe7NlmMnWKoHsOtvjWYcKpheqFQAAAAASUVORK5CYII= + + + + + iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 + YQUAAAAZdEVYdFNvZnR3YXJlAEFkb2JlIEltYWdlUmVhZHlxyWU8AAADZmlUWHRYTUw6Y29tLmFkb2Jl + LnhtcAAAAAAAPD94cGFja2V0IGJlZ2luPSLvu78iIGlkPSJXNU0wTXBDZWhpSHpyZVN6TlRjemtjOWQi + Pz4gPHg6eG1wbWV0YSB4bWxuczp4PSJhZG9iZTpuczptZXRhLyIgeDp4bXB0az0iQWRvYmUgWE1QIENv + cmUgNS4zLWMwMTEgNjYuMTQ1NjYxLCAyMDEyLzAyLzA2LTE0OjU2OjI3ICAgICAgICAiPiA8cmRmOlJE + RiB4bWxuczpyZGY9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkvMDIvMjItcmRmLXN5bnRheC1ucyMiPiA8 + cmRmOkRlc2NyaXB0aW9uIHJkZjphYm91dD0iIiB4bWxuczp4bXBNTT0iaHR0cDovL25zLmFkb2JlLmNv + bS94YXAvMS4wL21tLyIgeG1sbnM6c3RSZWY9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlw + ZS9SZXNvdXJjZVJlZiMiIHhtbG5zOnhtcD0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wLyIgeG1w + TU06T3JpZ2luYWxEb2N1bWVudElEPSJ4bXAuZGlkOjJGQzkyMzc0Rjk0OUU0MTE5NjNCQjRENDMzQjlC + MUM4IiB4bXBNTTpEb2N1bWVudElEPSJ4bXAuZGlkOjJERTg4QTFENEQyMjExRTRBODEyODk0M0RBMTc5 + Qjg3IiB4bXBNTTpJbnN0YW5jZUlEPSJ4bXAuaWlkOjJERTg4QTFDNEQyMjExRTRBODEyODk0M0RBMTc5 + Qjg3IiB4bXA6Q3JlYXRvclRvb2w9IkFkb2JlIFBob3Rvc2hvcCBDUzYgKFdpbmRvd3MpIj4gPHhtcE1N + OkRlcml2ZWRGcm9tIHN0UmVmOmluc3RhbmNlSUQ9InhtcC5paWQ6NjJGOUEyRDEyMTRERTQxMUIzNkJE NUVDQjU5MzE1NjIiIHN0UmVmOmRvY3VtZW50SUQ9InhtcC5kaWQ6MkZDOTIzNzRGOTQ5RTQxMTk2M0JC NEQ0MzNCOUIxQzgiLz4gPC9yZGY6RGVzY3JpcHRpb24+IDwvcmRmOlJERj4gPC94OnhtcG1ldGE+IDw/ - eHBhY2tldCBlbmQ9InIiPz6GKmpFAAAC+UlEQVRIS63T20vTYRzH8Yforj/Ei24UiSgKIygKi8oyxZQo - cvNYeXaesmzqPGu2POd0ulSsnIdaurTSTJ3O6UxTPGya5vCQx5AuPn39RbHop7nZxQt+z3ie93e/Z4w1 - p7nsCoBt8R6yBF/UHPv+Wb0rfFFzm99CRIwEW1gnqXzxTXxRc0ydctm4OlID2sxrw6iCtiwItC+A2P/D - frLnjwGNSZdMq6N1WOvLwFpP4l/WdRlY6Jaio9Ab7QXba8sVoDHZGdT8PYS9THDqMGnLsKpNw0qXGCua - BO55VZdNQ6U/DRRibVCGb+N1pH5bukoRqHmDHOIG1N8/X2F4I8WyNhtf2+9hqSsZxqZ4upbb6HsSZLHO - Im90ym6hNVcIaktYTexZyUelGEvaHMy/jcFiZxo0xX5Y7ivGcn8JkVmA9uvlWBmqwpJeAWovs+poR99O - eRgWtQWYVUdgrj0FH+i+F3XF3NoappZYGJrEoLaOVYpOOTY/FGJB+xjTqnDMtMTTAC/Ma/Ix/TLUKl9e - x0JfFQpql7PykBP7lWIXzPeUYLIhHCPKCLr/AMy2ZsKoDLTKdNNdvM8TgNpRTBZwfJ885CTmaIChPhwa - mS+GnkdhqjEWY9X+VplqvIMXEhdQ24mZeuSs0N/BNNWWj4k6EdSZHhhXxWH0aSCGFd4c4Tk7zk7XBlUM - FKLToK4Nm+0qYnneRzqGGiSYaIiiyZdhVCdgqFSIwRJPjucZW85O1pvnRmvDkO9zFNTdy2Y6HjGp4HCF - 5kk4xhoiURd/EROv4tBfeM0qAyUC9Mp9QM0+7o829T6LZV0/mNycS6+nFKFWfAGj9ZHozfGwil7miZYH - 7qCmghsw+S6VpV894KuUuKFbfhNNqa749CwY3dm0toK+VABl3HlQM5obYHybwFLc7W1y/Y5BlX6FfgNn - DNcEY0DhZZX+MiGKbh0DNR24AYYWMSfJzc6GZBApwS5skIzNODcg0dV2V36FtsJ7yBJ8UXO8hyzBFzXH - ++H/A/YDv9/V87iOlrYAAAAASUVORK5CYII= + eHBhY2tldCBlbmQ9InIiPz6wJF34AAACl0lEQVRIS62Vy08TURSH73/QhQtXVnBhxEcMiUkhbEg0hB1R + Q1i68C8wIW5cEqMLN7ho2Ji4YiEhWq0prYUhfULbadN3obTaChobtZEUsFY9nnPS6WM6HYowyZf87j33 + nG/amaai9geOBYA+4pTxihmBE8DcTQB4J8em/9IwSQyagmrtL+z9rMFmvnhkKvtV7tcVHPz6DVsftulA + AckdhUg8zf19eoLKAd597iMLMItewfOxUDTN/bqCH3tVSG8VWIBZ9AoJApEk9+sKvu/uQ2IjzwJkGtH8 + OrTwy3Hu77vIAnV9mgWlcgWiqRwLjAMmkOMbPbNTKnN/JJntqJGEBZ++7oKcyLLgLN4JrU8Cms2C4pcy + BKKZumCI18temQ/8DzSLZlBmQX7nG/jCKdpgAa0driCtY5iFHuqHSjNoFtaags1iCdzBBG+QgNY2aZ0F + mIUe6osENAtrTUEq/7kDq9PHAszU5yYoq9f1i9cUSCD5ozxDEeTsrhAoONwyxLLb8MrhYQFmZYCHsnpd + v3hNgQROb5hnKIK29944MAThTBEWbS4WYBZ6qC/sKSy5ZJ6BGUQg8b4Bbhjod4AZXlhXWdBa10LrIVul + AM9ggS+aa6AIMMO8ZYUO0KeyIOMtZyaQpXpNi4LFucYzMINwhbMNcMNw5oIJMMNKIA0LNg88mZuH/ssj + dPgBMnN+cBRmny1wrRtSMMMzWCCFMg0UAeY2Fh0+GL5xG8Zu3oHXUrCj3g0WONdTbeBm21/o1N17gPtg + 98Xh3VoS3qzKMDI22agfglnY/Uld8NDc/ZlZwAwvl4Ngun6LGh8rdfVDViNs3rguOOzq6XOD8PDpc7g2 + OkHDH7XWtYa2It66Y4eCQ8cRfpvUNa2hTUD8A6JMaBvCyTdJAAAAAElFTkSuQmCC + + + + + iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 + YQUAAAAZdEVYdFNvZnR3YXJlAEFkb2JlIEltYWdlUmVhZHlxyWU8AAADZmlUWHRYTUw6Y29tLmFkb2Jl + LnhtcAAAAAAAPD94cGFja2V0IGJlZ2luPSLvu78iIGlkPSJXNU0wTXBDZWhpSHpyZVN6TlRjemtjOWQi + Pz4gPHg6eG1wbWV0YSB4bWxuczp4PSJhZG9iZTpuczptZXRhLyIgeDp4bXB0az0iQWRvYmUgWE1QIENv + cmUgNS4zLWMwMTEgNjYuMTQ1NjYxLCAyMDEyLzAyLzA2LTE0OjU2OjI3ICAgICAgICAiPiA8cmRmOlJE + RiB4bWxuczpyZGY9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkvMDIvMjItcmRmLXN5bnRheC1ucyMiPiA8 + cmRmOkRlc2NyaXB0aW9uIHJkZjphYm91dD0iIiB4bWxuczp4bXBNTT0iaHR0cDovL25zLmFkb2JlLmNv + bS94YXAvMS4wL21tLyIgeG1sbnM6c3RSZWY9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlw + ZS9SZXNvdXJjZVJlZiMiIHhtbG5zOnhtcD0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wLyIgeG1w + TU06T3JpZ2luYWxEb2N1bWVudElEPSJ4bXAuZGlkOjJGQzkyMzc0Rjk0OUU0MTE5NjNCQjRENDMzQjlC + MUM4IiB4bXBNTTpEb2N1bWVudElEPSJ4bXAuZGlkOkUzNzJDMjE3NEFENjExRTRCNjE0OEVEQzI4MEM0 + RTZDIiB4bXBNTTpJbnN0YW5jZUlEPSJ4bXAuaWlkOkUzNzJDMjE2NEFENjExRTRCNjE0OEVEQzI4MEM0 + RTZDIiB4bXA6Q3JlYXRvclRvb2w9IkFkb2JlIFBob3Rvc2hvcCBDUzYgKFdpbmRvd3MpIj4gPHhtcE1N + OkRlcml2ZWRGcm9tIHN0UmVmOmluc3RhbmNlSUQ9InhtcC5paWQ6RkI3NUQ0QkNENDRBRTQxMTk3NEFD + QUFFQjRCMzVENkUiIHN0UmVmOmRvY3VtZW50SUQ9InhtcC5kaWQ6MkZDOTIzNzRGOTQ5RTQxMTk2M0JC + NEQ0MzNCOUIxQzgiLz4gPC9yZGY6RGVzY3JpcHRpb24+IDwvcmRmOlJERj4gPC94OnhtcG1ldGE+IDw/ + eHBhY2tldCBlbmQ9InIiPz6PyaLfAAADMElEQVRIS6VUXUiTYRT+vi3Tzd+ps23+3KRigtiPkolEQReG + UYTkhWatpWlWGkRdddfdSPImqUAJjSIT00oxLJIk0cR+tFSyzDJtgaMkDEPkdM7ZPvm2vS6jBx6es3Pe + 8zzvtm+TohLS/ov+AACStLgEQuJyLRJWYK1yzh/+FgCoQrpnfM4fOGBhcUlIMkEVkma4H4i1y2kFcMD8 + wqKQZILKZqTqmlTAWrfvMjhgbv63Dwm0hLWQohn1eNEbzrlfPiTQAtZCKjP1GXdAIC+r4XD+9CGBFrDm + RVJ1re6pZ0GyHHMvIawauYVNCFPfvvuQQAtYC6meKXU0amNsaGN/ZR60xIf9aIgN3cpGE9OzZCZ85nEm + pGiWlLABmuJCnUOXrNB7chdct4TUo32ANDbp4NuielDpqWfePdaPX6GrohSK4uLhlCEo96YlZLbOFHzH + oJXjMSBcGn4/zQGovEDqXXtzeTb+BTrKj0J3+Q54djYP7EZdTU2MPjFSK8eieQR9QtLg6GcOQPWgqKeQ + ZyOfoK30CDw+lg2Ot3Z4VLoNqo269mCNHIa2WjYn9A1PcAAqU6m9VV3TF9psOwwPS3JgZugCdNoyocwU + jU+RlImWBpezGz0vxzkA1YOiHvPFO7Ca1kGHLQtmXp2HdutmqN+/F6JiU+h3kOpyVeHJwBgHoLIpqajm + 189HoaG4CNqsGTA1UAWth9Lg6r490PygGyLjUikgzuWqQlffCAegelDdUwLqigqhpXgjTPYeh+bCFCg2 + RkEk3vxuVz/P0c43oLP3DQegLhspNalSFxiNcLswHT48LYNbBUlQk7ebzenmyhm08w1o7xmiAP6hRZiT + 70eYkzpctUuJWdHmwWs74+F1Uz7cyE+E4ohQB5mHm9a3GywpTXzektyKduIAIsKI3ISkL4rIdYle05C9 + VrZVBmvtl7eboUyv7V4jSQdwRn8FdI72iErtCUxnIuifkJ5hUqUOq9Jr7OeCNU6bTpNVqtMcDJSldOwn + KnOk+jypJ5QANRWc0cs5SEelXr54QidfwVYAMoiHq4W/gNM6OaNCJ+diaUIqN/43+Atwg27t+9ZXBUn6 + A2MdqQeVc5pWAAAAAElFTkSuQmCC + + + + + iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAIAAABvFaqvAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 + YQUAAAAZdEVYdFNvZnR3YXJlAEFkb2JlIEltYWdlUmVhZHlxyWU8AAADZmlUWHRYTUw6Y29tLmFkb2Jl + LnhtcAAAAAAAPD94cGFja2V0IGJlZ2luPSLvu78iIGlkPSJXNU0wTXBDZWhpSHpyZVN6TlRjemtjOWQi + Pz4gPHg6eG1wbWV0YSB4bWxuczp4PSJhZG9iZTpuczptZXRhLyIgeDp4bXB0az0iQWRvYmUgWE1QIENv + cmUgNS4zLWMwMTEgNjYuMTQ1NjYxLCAyMDEyLzAyLzA2LTE0OjU2OjI3ICAgICAgICAiPiA8cmRmOlJE + RiB4bWxuczpyZGY9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkvMDIvMjItcmRmLXN5bnRheC1ucyMiPiA8 + cmRmOkRlc2NyaXB0aW9uIHJkZjphYm91dD0iIiB4bWxuczp4bXBNTT0iaHR0cDovL25zLmFkb2JlLmNv + bS94YXAvMS4wL21tLyIgeG1sbnM6c3RSZWY9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlw + ZS9SZXNvdXJjZVJlZiMiIHhtbG5zOnhtcD0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wLyIgeG1w + TU06T3JpZ2luYWxEb2N1bWVudElEPSJ4bXAuZGlkOjJGQzkyMzc0Rjk0OUU0MTE5NjNCQjRENDMzQjlC + MUM4IiB4bXBNTTpEb2N1bWVudElEPSJ4bXAuZGlkOjUzQzNGNDI5NEQyQzExRTQ4QkE1QUNCMEVDRDZF + MDVEIiB4bXBNTTpJbnN0YW5jZUlEPSJ4bXAuaWlkOjUzQzNGNDI4NEQyQzExRTQ4QkE1QUNCMEVDRDZF + MDVEIiB4bXA6Q3JlYXRvclRvb2w9IkFkb2JlIFBob3Rvc2hvcCBDUzYgKFdpbmRvd3MpIj4gPHhtcE1N + OkRlcml2ZWRGcm9tIHN0UmVmOmluc3RhbmNlSUQ9InhtcC5paWQ6RkI1NUY4OTYyQTRERTQxMUIzNkJE + NUVDQjU5MzE1NjIiIHN0UmVmOmRvY3VtZW50SUQ9InhtcC5kaWQ6MkZDOTIzNzRGOTQ5RTQxMTk2M0JC + NEQ0MzNCOUIxQzgiLz4gPC9yZGY6RGVzY3JpcHRpb24+IDwvcmRmOlJERj4gPC94OnhtcG1ldGE+IDw/ + eHBhY2tldCBlbmQ9InIiPz6IsaOmAAADF0lEQVQ4T62U/UuTURTH+0nICqRI1ERMMyNQe8N0ChqBwQhN + yvwhEgJjVCqJ/qCibZo6tzQ339h6Nre5prapUzc1XzItX1ilzuWMLLVAen+xf6DTuTxjdxsFVj58ebjc + c+7nnud7z3228DbpIaDFH/CfoqCn72DIDvNfPDM2KAqyr8PcJxqY+QBTb8kkjocXQTsKigGwfqYJHqIg + 1OxHGHvlWPx4hXB1YyA3g4CBhqst+piEnrDA3rA95vBAY1x8d7lq/DVZwm5PQZNvoKYdypSgHgbVEIh1 + cLOZzOCbSSsyRQRba6uWtcpVLbPcwlglInNUCJNWWKqABqMLCGvGlfpJELaQ/V1Vd1lujAhe0chtUrH5 + ZExnmJ85MdomEa+qZMbIEF2BHGunILSjdZwYgTt4gJqjjj0Rltml1Zq9AeL0Mn71Wn2mtDU80MIvsFTw + O+KPIoWC8BNYRIUaqrRQroJKjQOk9N+xLBF2pXJFKfnsDGYa8gS6xOO2whyMuoHaHpGzZ/pBM0IMrtXD + nT4HqNHXe0lYoogMFeQP4jbSDkCPTUyXmnNoPutSo+9WN5DEQDyeWCWnhqm4p7Oimt3b54rzmmKPVHKz + 0Xg0AU1pz87VJp+yXOfd9t3mBmLXsGrsJhSsDtF4iOWxKdpzyQNnuRW7vEUp13obFG05OVUBPtO5V1Sn + k5q4SX8ENfWA6C7xHsP981Bb2sf38ZKd4JhSuXUJHPHhg/WJnAeZFw0Xzt/w8erRtLmBnB/CSmaC599I + 2PYVRl+CXigu3R9SfCC0Pf1MZ1oqvqvjogX7gtRFJfb1n24g7GblfQcFP2fkBYm5anxqQcbLKgzyK/Df + WRTkV5+RMTg84ZrgAOHo4ZIDVNdJw67CpsVLZ5gifj97Typlq2ZFQXj8LKh5EHpnaIar8N+Al5l9Y9Vs + T7OiIAzjqaMsa6QJnBkeWvgOHdPkAuIV67PSeQpCYYZplsZ+KyyWLRyFF8D553EDbURY770J0rrYJbda + SYE4iWb9NcgpRKDrOMAWwYP6d5BTaC52zyaAWDlAm/DweL8AX9zXukfxHsIAAAAASUVORK5CYII= + + + + + iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 + YQUAAAAZdEVYdFNvZnR3YXJlAEFkb2JlIEltYWdlUmVhZHlxyWU8AAADZmlUWHRYTUw6Y29tLmFkb2Jl + LnhtcAAAAAAAPD94cGFja2V0IGJlZ2luPSLvu78iIGlkPSJXNU0wTXBDZWhpSHpyZVN6TlRjemtjOWQi + Pz4gPHg6eG1wbWV0YSB4bWxuczp4PSJhZG9iZTpuczptZXRhLyIgeDp4bXB0az0iQWRvYmUgWE1QIENv + cmUgNS4zLWMwMTEgNjYuMTQ1NjYxLCAyMDEyLzAyLzA2LTE0OjU2OjI3ICAgICAgICAiPiA8cmRmOlJE + RiB4bWxuczpyZGY9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkvMDIvMjItcmRmLXN5bnRheC1ucyMiPiA8 + cmRmOkRlc2NyaXB0aW9uIHJkZjphYm91dD0iIiB4bWxuczp4bXBNTT0iaHR0cDovL25zLmFkb2JlLmNv + bS94YXAvMS4wL21tLyIgeG1sbnM6c3RSZWY9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlw + ZS9SZXNvdXJjZVJlZiMiIHhtbG5zOnhtcD0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wLyIgeG1w + TU06T3JpZ2luYWxEb2N1bWVudElEPSJ4bXAuZGlkOjJGQzkyMzc0Rjk0OUU0MTE5NjNCQjRENDMzQjlC + MUM4IiB4bXBNTTpEb2N1bWVudElEPSJ4bXAuZGlkOkVENUYwQThBNEQyOTExRTQ5QzUzQzdFMkFGQkQy + NTA1IiB4bXBNTTpJbnN0YW5jZUlEPSJ4bXAuaWlkOkVENUYwQTg5NEQyOTExRTQ5QzUzQzdFMkFGQkQy + NTA1IiB4bXA6Q3JlYXRvclRvb2w9IkFkb2JlIFBob3Rvc2hvcCBDUzYgKFdpbmRvd3MpIj4gPHhtcE1N + OkRlcml2ZWRGcm9tIHN0UmVmOmluc3RhbmNlSUQ9InhtcC5paWQ6MkRGNkEzOUYyOTRERTQxMUIzNkJE + NUVDQjU5MzE1NjIiIHN0UmVmOmRvY3VtZW50SUQ9InhtcC5kaWQ6MkZDOTIzNzRGOTQ5RTQxMTk2M0JC + NEQ0MzNCOUIxQzgiLz4gPC9yZGY6RGVzY3JpcHRpb24+IDwvcmRmOlJERj4gPC94OnhtcG1ldGE+IDw/ + eHBhY2tldCBlbmQ9InIiPz6npMy1AAAGEUlEQVRIS7WVeVDUZRjHf7Ase8ECu+wl4LIXcqyyHC783AWW + 5QaRFTHkMi9SQvE+UhLzwk0BUcQSgQBBgcYDzStMSzOPcpqcmo5pmqk/+rOapqb+iG/PbzfFcSz/6pn5 + zPN739/7fp/nvZn/3TSLjj+XJy2/RaItPCT5vaBd8m1+q2Qku1lcrcvki+iXr7fFU6ZZeOx5KDU1b7jU + 1Z2bVPMPWNMbRXrXkWAc+ywVLbcS8fKwFjlu8VdpW0XzSc6f8PEIPzJ19dFnU3WEJdHL9P3X9O1nkdB8 + CQrX7i3mKn9zfqsUq29ZsPfjRBx5aMO2cTMy94gm7FuF7XyJTwDJTo5GVdHxNALVgsPd5Ceye+9g8b0f + UXbjB8RtH4Msd+MeXS7f6twjxbILZiy7pEHDtTBsvG7BqivTUXpsClLWCbtJNpDwBlGVH3ySIFV520eW + nedRcf0HVJGwbeRrOHs/h2n1CGRZDe7wND/W1hiI8sEYlJ4KRcVpJcrfVqByNBILhqLh3KeA+UXBOpL2 + jkRZduARPGXZ/vH4pnMou/gd7INfIPn4QyQc/RSOzk9hrBtEiKPerUn1Y5PXBaDojWlwdgUjr0+G/H4Z + cnpCUNJrQNZ+LeLrBD/LYnixFEDAKFz7vJQ0r49dO4zikS8x8/ADxLd9jIT2B5ix/z7SX78Pw+K3EJy2 + wq1M4rEz6sRwthgw82Ag2KNS2I5JPZ4rZx00ImGNHIZSfisFkDGhxbs5AkKLd/3kaLkDlgTjXrsNc/Md + mPfeQeyOD2HbcRu6yi4E2Wrd8ngeG71IBPtePWa4JUhsD0DykQAkHQqApUWCFLcGyZvDoZ/P/5oCTGXk + hU2MvGB7rbGmG47dd2Fa+x6iX/kAMa/eQvS2m4jaeAPspvcROb8TQexid3CcL2usFCJjnwE5nQYU9RhR + PGDC7D4TCrqMyDqkR9oePbRz/SZEKh8rI8vdyshyXhmzLD8DS/1VGOquwtgw7glkXH0Nhvp3kbL2GrSl + hyC11ril03xZfbkQKZuVsDeq4NihRtYuDbJ2auBoUsO2TQXrJiWMlWIExflWMiHOjRzfJy0bg776HCKX + vANd7WXol1/xeN3Si7A2XIXW1YbAxAq3UO0zPTSd1yG38bplLK//vxBrffKY4PQ1HH9aKk8jonQUUyvO + Qlt9HtqaCx4/tXIMyXWXMXXOAQTEv+D2zCvDhBBTCN1zCGOCZq3k+DXO1YcpRYOY4hpF2LzTCCs74/VE + 3IvnEVd1EhGFblBbWot6BKXWQZq64tlYa2+TuJwQM9KU5cRL35hyOxCe2w913hA0hcPQFI16KRzxEFtO + a1Q9htSVN5C+5S5x7x/uIm3DR7CvuomUReOImt1FU7nwEolHECImMGkJE5i46EJkejNM+X1QOPqhzBqC + KvskVDmnJuHKT/K4bgjKzBMItXcjJv84NOwWiKPndJK40TOCgPgaRmIur1dZ1yM6txvyWT0ITR+AImOQ + gg39N1ybDBJP60PorC5My3oTwQm18FdNryBxbq0EJL6AEUTYZBTkF0NGKyKdvZDb3qJOAxSIOqcP/jtp + JyC3D1BSvYgp6EN4aiNlP/cTEk4gFASPEUeXkWd8RaY5jcrEBkTn9UCT4Q3gzfBfRvJE9rrsfpicHSRe + NsFXmJeSXhTBXXY+jMjk8uArVkpExuKb6pkbYJ7L7Ria37xTUBeMeCkcncRTN0z/TyLKNYy4khNQJq2G + IMLBXdUWQkXwCYYR6md7IPP1k8WEC3UFDzSpG2BZeAZJtXQWFpyls3HOC50JzkdQnbFqDInLLiC2rBcq + 6xoSzzzP+NDVwDBaQkx4XzahNv8xZH48sVotCHeOUnnCWNJG18Q4UjddB7vlfbBbPwC7+YannLTyIrS5 + OyHU5v3hr07poL7JBHe4Jh8bzgQROY8h46IKCAVfbi73D3PcpfoJlX0VtEVN0JXsQlj2ZoRaaynj7N/8 + NfZLPLFmHrXnpiWSCCL8iMl32T/M6YGMq+R+covD7QADwfoIgqt4QVGtfvIZJ4lRv5CY4zypbjfjy+eE + M4l4gtuSwYSQ4DS4EZAew/wNiCYQJlvQU3cAAAAASUVORK5CYII= @@ -1054,142 +1272,6 @@ R2K5fxKLWbbp/7Dc0CBY8Q+pPmOq0VkzzQAAAABJRU5ErkJggg== - - - iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAZdEVYdFNvZnR3YXJlAEFkb2JlIEltYWdlUmVhZHlxyWU8AAADZmlUWHRYTUw6Y29tLmFkb2Jl - LnhtcAAAAAAAPD94cGFja2V0IGJlZ2luPSLvu78iIGlkPSJXNU0wTXBDZWhpSHpyZVN6TlRjemtjOWQi - Pz4gPHg6eG1wbWV0YSB4bWxuczp4PSJhZG9iZTpuczptZXRhLyIgeDp4bXB0az0iQWRvYmUgWE1QIENv - cmUgNS4zLWMwMTEgNjYuMTQ1NjYxLCAyMDEyLzAyLzA2LTE0OjU2OjI3ICAgICAgICAiPiA8cmRmOlJE - RiB4bWxuczpyZGY9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkvMDIvMjItcmRmLXN5bnRheC1ucyMiPiA8 - cmRmOkRlc2NyaXB0aW9uIHJkZjphYm91dD0iIiB4bWxuczp4bXBNTT0iaHR0cDovL25zLmFkb2JlLmNv - bS94YXAvMS4wL21tLyIgeG1sbnM6c3RSZWY9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlw - ZS9SZXNvdXJjZVJlZiMiIHhtbG5zOnhtcD0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wLyIgeG1w - TU06T3JpZ2luYWxEb2N1bWVudElEPSJ4bXAuZGlkOjJGQzkyMzc0Rjk0OUU0MTE5NjNCQjRENDMzQjlC - MUM4IiB4bXBNTTpEb2N1bWVudElEPSJ4bXAuZGlkOjlDMzFEOUI4NEFBRjExRTQ4OTA5OUYwQ0QzM0Q2 - NEI4IiB4bXBNTTpJbnN0YW5jZUlEPSJ4bXAuaWlkOjlDMzFEOUI3NEFBRjExRTQ4OTA5OUYwQ0QzM0Q2 - NEI4IiB4bXA6Q3JlYXRvclRvb2w9IkFkb2JlIFBob3Rvc2hvcCBDUzYgKFdpbmRvd3MpIj4gPHhtcE1N - OkRlcml2ZWRGcm9tIHN0UmVmOmluc3RhbmNlSUQ9InhtcC5paWQ6MDk5Mzk2NTZBRjRBRTQxMTk3NEFD - QUFFQjRCMzVENkUiIHN0UmVmOmRvY3VtZW50SUQ9InhtcC5kaWQ6MkZDOTIzNzRGOTQ5RTQxMTk2M0JC - NEQ0MzNCOUIxQzgiLz4gPC9yZGY6RGVzY3JpcHRpb24+IDwvcmRmOlJERj4gPC94OnhtcG1ldGE+IDw/ - eHBhY2tldCBlbmQ9InIiPz73sIMwAAADIElEQVRIS7WVa0iTYRTH56Uiysvm3TkvpLl5DRIvQYWVWl+6 - iNEVg0yhQqloQZHkLT+Y0YdAs75IpEUhzERZoZhsRpZlS7soblotsRwoxhqWeTrnYZtv+u7NsB74cZ5z - zv89/z17HzYRAPxXeIv/EpFXcOyi4BvKhfehv4FvKBfeh+ayqIUDlIgBgT8whpRYoT2fhgvNVJKBQT9s - hB8/QZDPpnEIjEhg0J5Pw4Vm0mwygG9T06BSqQQhTUhUMoRGpyxYT7OZwfhXC6jVakFIYzNYqN5uMGKa - BI1GIwhpghXJaJJi13d0dEB2bj74hsWzSDlXbzfQG02g0+kEIU2wIomdovzKdVifngnFFytBeb4cLN+n - WaSc6hfKKqB/eHTWoHfwExgMBkFII5MnQUD4WlAWloO26wVs35MDmifPmQFFyqlO/aKKqlmDp31DYDKZ - BCGNTJ4IPqHx8LJvACbNUw7p6e2HuJQMNIhhBuaHj3vBYrEI0tb1BoIiE9kJ9h7Oh7EJM+g/jEJuwVlY - s24ri5RTnfo5BedAIoueIYPumvomuHzjzm9cq2uCq7UNUH2rEarr7kNd0yP26Y+eKoSWtk4wfpmAg7kn - ITY5DUorq1g8cOQEqze3aplOEhRtJoMcL1mMTixV9IgD5a/tSBVDYql8AKOBQLEJtTP08gY/jjFiktKg - 5FIV21Ok3NazvmR2AvrFkCAJyGYk1comZAuHDM/AyLvHThfBveZ26NOPwI59eey7LsbhFCmnOvVJ5+Ef - rrYZLEU8EZ85+HLwW7ZCLMVTFWdkHoLut+/hgbYHaE9XN31XNsupTrWV3jKVs+uS3cyAD0cLe331jW3Q - qRt0CPUlQVHDKI+fN9iGo4W90uNnyuA2vvRtWTlQgxeg/dk7FimnOvU9/CNqUe47b7ANRwt7AfjpKvAK - Gt18Qur35ymhRfsKKLr5hN7EyzDq7humWrrcfSfKxbz/QlwcLDck1snZJdUzYHUDmk57+K1qdXJyzsL6 - RmQD9ZmObygXB8sVIRO6fXQB4hC6eRQppzr1XXmHclnAckFomLc1Um5dItEvhZ97MQXP9N0AAAAASUVO - RK5CYII= - - - - - iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAZdEVYdFNvZnR3YXJlAEFkb2JlIEltYWdlUmVhZHlxyWU8AAADZmlUWHRYTUw6Y29tLmFkb2Jl - LnhtcAAAAAAAPD94cGFja2V0IGJlZ2luPSLvu78iIGlkPSJXNU0wTXBDZWhpSHpyZVN6TlRjemtjOWQi - Pz4gPHg6eG1wbWV0YSB4bWxuczp4PSJhZG9iZTpuczptZXRhLyIgeDp4bXB0az0iQWRvYmUgWE1QIENv - cmUgNS4zLWMwMTEgNjYuMTQ1NjYxLCAyMDEyLzAyLzA2LTE0OjU2OjI3ICAgICAgICAiPiA8cmRmOlJE - RiB4bWxuczpyZGY9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkvMDIvMjItcmRmLXN5bnRheC1ucyMiPiA8 - cmRmOkRlc2NyaXB0aW9uIHJkZjphYm91dD0iIiB4bWxuczp4bXBNTT0iaHR0cDovL25zLmFkb2JlLmNv - bS94YXAvMS4wL21tLyIgeG1sbnM6c3RSZWY9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlw - ZS9SZXNvdXJjZVJlZiMiIHhtbG5zOnhtcD0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wLyIgeG1w - TU06T3JpZ2luYWxEb2N1bWVudElEPSJ4bXAuZGlkOjJGQzkyMzc0Rjk0OUU0MTE5NjNCQjRENDMzQjlC - MUM4IiB4bXBNTTpEb2N1bWVudElEPSJ4bXAuZGlkOjhDMTdBQjRENEFBRTExRTQ4QjQyODY0MDNBNTJE - NzNCIiB4bXBNTTpJbnN0YW5jZUlEPSJ4bXAuaWlkOjhDMTdBQjRDNEFBRTExRTQ4QjQyODY0MDNBNTJE - NzNCIiB4bXA6Q3JlYXRvclRvb2w9IkFkb2JlIFBob3Rvc2hvcCBDUzYgKFdpbmRvd3MpIj4gPHhtcE1N - OkRlcml2ZWRGcm9tIHN0UmVmOmluc3RhbmNlSUQ9InhtcC5paWQ6NUQyMjc4QTlBQjRBRTQxMTk3NEFD - QUFFQjRCMzVENkUiIHN0UmVmOmRvY3VtZW50SUQ9InhtcC5kaWQ6MkZDOTIzNzRGOTQ5RTQxMTk2M0JC - NEQ0MzNCOUIxQzgiLz4gPC9yZGY6RGVzY3JpcHRpb24+IDwvcmRmOlJERj4gPC94OnhtcG1ldGE+IDw/ - eHBhY2tldCBlbmQ9InIiPz4eHsDfAAAB00lEQVRIS7XVWytEURQH8HniTTNHLs0NCXNcXjTN5dH9g/gM - 3jx590QhFDJS0gyTGmpqaqJIMW4hzlAoOaWISS7LWifntI3ddnTGrl92e/57/We/DBsA/CvuYSHZSr0t - lvCGsriX/oI3lMW9lM/SwgF9SEHwizs08IX2vAyLZvZRgXJ+cQWv7yB0q96Ds86voT0vw6KZNJsK4Pnl - DWKxmBBlqhpDUN0UNp2n2VrB/WMOEomEEGX0ArN5o+BGfYB0Oi1EGa8cwpKw6bxRcH6lQiaTEaKMVw5q - rzCbNwr2z65BURQhynh8Qe0VZvNGwdZBFlRVFaKMxxfQXmE2rxc8rW3sQy6XE0puHoG7IaC9YnV9j5th - pbZPqOCDCrbH5uIwOD7/zWgkDkNTizAyuwQjkWWIxFNQWduqmVxI/MiPz6/A8HTUuDMTTYLkbrqhgt5S - T3PG4ZJ3HE7focElZx0u3yn+VQiG1ZLymmm7s74f88f42S6bl9zyJZ6d6Xckd+Mt5ieogH4xJORHHajt - SzvqZPSgECpHZSiA2DztuxBlad+NgnpBEbIjusiiYboKRF+kGFHegUR5ImkFv7G0eAPzWVq8gfksLd5/ - oULiHhYS97BwwPYJlSCUgVubViQAAAAASUVORK5CYII= - - - - - iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAZdEVYdFNvZnR3YXJlAEFkb2JlIEltYWdlUmVhZHlxyWU8AAADZmlUWHRYTUw6Y29tLmFkb2Jl - LnhtcAAAAAAAPD94cGFja2V0IGJlZ2luPSLvu78iIGlkPSJXNU0wTXBDZWhpSHpyZVN6TlRjemtjOWQi - Pz4gPHg6eG1wbWV0YSB4bWxuczp4PSJhZG9iZTpuczptZXRhLyIgeDp4bXB0az0iQWRvYmUgWE1QIENv - cmUgNS4zLWMwMTEgNjYuMTQ1NjYxLCAyMDEyLzAyLzA2LTE0OjU2OjI3ICAgICAgICAiPiA8cmRmOlJE - RiB4bWxuczpyZGY9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkvMDIvMjItcmRmLXN5bnRheC1ucyMiPiA8 - cmRmOkRlc2NyaXB0aW9uIHJkZjphYm91dD0iIiB4bWxuczp4bXBNTT0iaHR0cDovL25zLmFkb2JlLmNv - bS94YXAvMS4wL21tLyIgeG1sbnM6c3RSZWY9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlw - ZS9SZXNvdXJjZVJlZiMiIHhtbG5zOnhtcD0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wLyIgeG1w - TU06T3JpZ2luYWxEb2N1bWVudElEPSJ4bXAuZGlkOjJGQzkyMzc0Rjk0OUU0MTE5NjNCQjRENDMzQjlC - MUM4IiB4bXBNTTpEb2N1bWVudElEPSJ4bXAuZGlkOjJEMDQyOEZBNEFEMjExRTRBN0MxRDBCNzJGRUND - MDEzIiB4bXBNTTpJbnN0YW5jZUlEPSJ4bXAuaWlkOjJEMDQyOEY5NEFEMjExRTRBN0MxRDBCNzJGRUND - MDEzIiB4bXA6Q3JlYXRvclRvb2w9IkFkb2JlIFBob3Rvc2hvcCBDUzYgKFdpbmRvd3MpIj4gPHhtcE1N - OkRlcml2ZWRGcm9tIHN0UmVmOmluc3RhbmNlSUQ9InhtcC5paWQ6QkRDRkI1RDVEMTRBRTQxMTk3NEFD - QUFFQjRCMzVENkUiIHN0UmVmOmRvY3VtZW50SUQ9InhtcC5kaWQ6MkZDOTIzNzRGOTQ5RTQxMTk2M0JC - NEQ0MzNCOUIxQzgiLz4gPC9yZGY6RGVzY3JpcHRpb24+IDwvcmRmOlJERj4gPC94OnhtcG1ldGE+IDw/ - eHBhY2tldCBlbmQ9InIiPz59jfe3AAAEbUlEQVRIS8WTeUybZRzHF48/pnFOuQRajkFLgQFb5iRLNJr4 - l/EPgsniUI4xZDAY1zyxwApsMJyIME61rByl3DfoYGBrgbWUY06FcZSCha4rQ8jYxkqPr2/fvkv8o2Sg - S/wkT970eb6/T5/39z7Prv8dt/Oql4mR4HZJ3ccoXFxhVCzB9DT9JueJdSq6c1wzVZFupepVzxu34XVj - CaEDi1jX6hF8ZQoeokl4iBVwzV9YdU1XRlIl28eVo8phCdXwGltEeOUsro6psaHVwcSDh5volc4iOO8X - 7KuVwb1hEi7J8myq9PEQO//I85oafr0KtEpUpNSETm+AwWDAvfv3YTQaybnm/t/AyO6Ga+UonJOnIijF - 1hA9tWI2qle9RxcI+RIpmZpTIfBULhIyyqHVahHPKcN70TmYnFFCp9OhqXcc9KwW0DOHVl3YU1aUyjJu - F1SpfhO3EM6bMMsVt+D8Zhz2HIpC4oU6bG5uIu4cD3tfTwAjIBNypQYbGxsISquBU34PaDHiVEplGXee - SuIjVaBv3Lz7gJg8vHg4FlZvc+ATVoLipiHsD8qCXWAO7IPK8MG5FjLXKboOeoYADkldUkplGWb7vOb4 - 4BzxIXXQE/1m59WDXdgBvxPfwz6UC4eQUth/WIBDZ2qQXj+K7IYRImeE5s5fOFrcDPvPapcJzVNmmwVY - VxWG9U09uau1tTVymPpc0iYFLew7OEUJ4BwtALfvJpl5xMrKCu6s3cUrn5YbCM1us80CrJZZVWjXr7j3 - 4CE0y8v4IrcaH+cK4Bv+DRyPl8ApphYuia3wZ3eCUzOA1PIfcVuzjHnlIgK/vgy7mHzTG+w12yzA5E53 - edYPo1c2i/X1dQTEfwvbwDQ4hhXg8OcN4P48Df+UTrgkNIAeW4Hg3Hbo9Xq0iGSgs4ls5CUhoXnObLOA - S8pkhG/bdZzgDZJnffT3GXieLAA9XgB2/RjZjuQqMWhxfBw824H55XWyhcfy+HDNqoB1SH4Codn6G7iw - p3d78EaVPlXX0CaZgkqlgly1gpCiK0htHCH/IL6oFcEF3ZjT3CUvXqv0DzDSS0FPq1a/8EbYS5Rqa+if - SAJ8KoeNR7gitEsnoVQqSbGOkJmYX1ggxaY70SabwIGMUrjn8I3WIXnBRPnWu/8nDnE9Sd7cAaP/ZSES - 6/rRKJRArpiHXC7HzekZNIukiCyrhW9mGZgXa4w2kUVnibJnzdXbxP5URzyDO4QjxGl5i9uNpMZeKP5U - IrywAq9yCnGAOGGMonbYxpVnEPGdyR9BO/MTj8kfgXeNFPt5IngVtoF1kQ9WcTs8qgfgmNreQMS21xZL - 0E6Ln6ef75tg8sfgXT8O77oReAkkYNXJ4PRV/4ztyfo9VPTf4xjdf9CpQKzdxxuGe6UMbhXEmc8V6mze - r3qNivx3HGN7UmglQ6CVDMIxXwybo5UcaunJQD8te9rhyx4JrWwItlGNUut3y5+hlp4cDhFCpl14k9jq - nR+Y1NTjIe7NlmMnWKoHsOtvjWYcKpheqFQAAAAASUVORK5CYII= - - - - - iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAZdEVYdFNvZnR3YXJlAEFkb2JlIEltYWdlUmVhZHlxyWU8AAADZmlUWHRYTUw6Y29tLmFkb2Jl - LnhtcAAAAAAAPD94cGFja2V0IGJlZ2luPSLvu78iIGlkPSJXNU0wTXBDZWhpSHpyZVN6TlRjemtjOWQi - Pz4gPHg6eG1wbWV0YSB4bWxuczp4PSJhZG9iZTpuczptZXRhLyIgeDp4bXB0az0iQWRvYmUgWE1QIENv - cmUgNS4zLWMwMTEgNjYuMTQ1NjYxLCAyMDEyLzAyLzA2LTE0OjU2OjI3ICAgICAgICAiPiA8cmRmOlJE - RiB4bWxuczpyZGY9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkvMDIvMjItcmRmLXN5bnRheC1ucyMiPiA8 - cmRmOkRlc2NyaXB0aW9uIHJkZjphYm91dD0iIiB4bWxuczp4bXBNTT0iaHR0cDovL25zLmFkb2JlLmNv - bS94YXAvMS4wL21tLyIgeG1sbnM6c3RSZWY9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlw - ZS9SZXNvdXJjZVJlZiMiIHhtbG5zOnhtcD0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wLyIgeG1w - TU06T3JpZ2luYWxEb2N1bWVudElEPSJ4bXAuZGlkOjJGQzkyMzc0Rjk0OUU0MTE5NjNCQjRENDMzQjlC - MUM4IiB4bXBNTTpEb2N1bWVudElEPSJ4bXAuZGlkOjJERTg4QTFENEQyMjExRTRBODEyODk0M0RBMTc5 - Qjg3IiB4bXBNTTpJbnN0YW5jZUlEPSJ4bXAuaWlkOjJERTg4QTFDNEQyMjExRTRBODEyODk0M0RBMTc5 - Qjg3IiB4bXA6Q3JlYXRvclRvb2w9IkFkb2JlIFBob3Rvc2hvcCBDUzYgKFdpbmRvd3MpIj4gPHhtcE1N - OkRlcml2ZWRGcm9tIHN0UmVmOmluc3RhbmNlSUQ9InhtcC5paWQ6NjJGOUEyRDEyMTRERTQxMUIzNkJE - NUVDQjU5MzE1NjIiIHN0UmVmOmRvY3VtZW50SUQ9InhtcC5kaWQ6MkZDOTIzNzRGOTQ5RTQxMTk2M0JC - NEQ0MzNCOUIxQzgiLz4gPC9yZGY6RGVzY3JpcHRpb24+IDwvcmRmOlJERj4gPC94OnhtcG1ldGE+IDw/ - eHBhY2tldCBlbmQ9InIiPz6wJF34AAACl0lEQVRIS62Vy08TURSH73/QhQtXVnBhxEcMiUkhbEg0hB1R - Q1i68C8wIW5cEqMLN7ho2Ji4YiEhWq0prYUhfULbadN3obTaChobtZEUsFY9nnPS6WM6HYowyZf87j33 - nG/amaai9geOBYA+4pTxihmBE8DcTQB4J8em/9IwSQyagmrtL+z9rMFmvnhkKvtV7tcVHPz6DVsftulA - AckdhUg8zf19eoLKAd597iMLMItewfOxUDTN/bqCH3tVSG8VWIBZ9AoJApEk9+sKvu/uQ2IjzwJkGtH8 - OrTwy3Hu77vIAnV9mgWlcgWiqRwLjAMmkOMbPbNTKnN/JJntqJGEBZ++7oKcyLLgLN4JrU8Cms2C4pcy - BKKZumCI18temQ/8DzSLZlBmQX7nG/jCKdpgAa0driCtY5iFHuqHSjNoFtaags1iCdzBBG+QgNY2aZ0F - mIUe6osENAtrTUEq/7kDq9PHAszU5yYoq9f1i9cUSCD5ozxDEeTsrhAoONwyxLLb8MrhYQFmZYCHsnpd - v3hNgQROb5hnKIK29944MAThTBEWbS4WYBZ6qC/sKSy5ZJ6BGUQg8b4Bbhjod4AZXlhXWdBa10LrIVul - AM9ggS+aa6AIMMO8ZYUO0KeyIOMtZyaQpXpNi4LFucYzMINwhbMNcMNw5oIJMMNKIA0LNg88mZuH/ssj - dPgBMnN+cBRmny1wrRtSMMMzWCCFMg0UAeY2Fh0+GL5xG8Zu3oHXUrCj3g0WONdTbeBm21/o1N17gPtg - 98Xh3VoS3qzKMDI22agfglnY/Uld8NDc/ZlZwAwvl4Ngun6LGh8rdfVDViNs3rguOOzq6XOD8PDpc7g2 - OkHDH7XWtYa2It66Y4eCQ8cRfpvUNa2hTUD8A6JMaBvCyTdJAAAAAElFTkSuQmCC - - iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 @@ -1403,7 +1485,7 @@ AAAASUVORK5CYII= - + iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 YQUAAAAZdEVYdFNvZnR3YXJlAEFkb2JlIEltYWdlUmVhZHlxyWU8AAADZmlUWHRYTUw6Y29tLmFkb2Jl @@ -1415,108 +1497,26 @@ bS94YXAvMS4wL21tLyIgeG1sbnM6c3RSZWY9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlw ZS9SZXNvdXJjZVJlZiMiIHhtbG5zOnhtcD0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wLyIgeG1w TU06T3JpZ2luYWxEb2N1bWVudElEPSJ4bXAuZGlkOjJGQzkyMzc0Rjk0OUU0MTE5NjNCQjRENDMzQjlC - MUM4IiB4bXBNTTpEb2N1bWVudElEPSJ4bXAuZGlkOkUzNzJDMjE3NEFENjExRTRCNjE0OEVEQzI4MEM0 - RTZDIiB4bXBNTTpJbnN0YW5jZUlEPSJ4bXAuaWlkOkUzNzJDMjE2NEFENjExRTRCNjE0OEVEQzI4MEM0 - RTZDIiB4bXA6Q3JlYXRvclRvb2w9IkFkb2JlIFBob3Rvc2hvcCBDUzYgKFdpbmRvd3MpIj4gPHhtcE1N - OkRlcml2ZWRGcm9tIHN0UmVmOmluc3RhbmNlSUQ9InhtcC5paWQ6RkI3NUQ0QkNENDRBRTQxMTk3NEFD - QUFFQjRCMzVENkUiIHN0UmVmOmRvY3VtZW50SUQ9InhtcC5kaWQ6MkZDOTIzNzRGOTQ5RTQxMTk2M0JC - NEQ0MzNCOUIxQzgiLz4gPC9yZGY6RGVzY3JpcHRpb24+IDwvcmRmOlJERj4gPC94OnhtcG1ldGE+IDw/ - eHBhY2tldCBlbmQ9InIiPz6PyaLfAAADMElEQVRIS6VUXUiTYRT+vi3Tzd+ps23+3KRigtiPkolEQReG - UYTkhWatpWlWGkRdddfdSPImqUAJjSIT00oxLJIk0cR+tFSyzDJtgaMkDEPkdM7ZPvm2vS6jBx6es3Pe - 8zzvtm+TohLS/ov+AACStLgEQuJyLRJWYK1yzh/+FgCoQrpnfM4fOGBhcUlIMkEVkma4H4i1y2kFcMD8 - wqKQZILKZqTqmlTAWrfvMjhgbv63Dwm0hLWQohn1eNEbzrlfPiTQAtZCKjP1GXdAIC+r4XD+9CGBFrDm - RVJ1re6pZ0GyHHMvIawauYVNCFPfvvuQQAtYC6meKXU0amNsaGN/ZR60xIf9aIgN3cpGE9OzZCZ85nEm - pGiWlLABmuJCnUOXrNB7chdct4TUo32ANDbp4NuielDpqWfePdaPX6GrohSK4uLhlCEo96YlZLbOFHzH - oJXjMSBcGn4/zQGovEDqXXtzeTb+BTrKj0J3+Q54djYP7EZdTU2MPjFSK8eieQR9QtLg6GcOQPWgqKeQ - ZyOfoK30CDw+lg2Ot3Z4VLoNqo269mCNHIa2WjYn9A1PcAAqU6m9VV3TF9psOwwPS3JgZugCdNoyocwU - jU+RlImWBpezGz0vxzkA1YOiHvPFO7Ca1kGHLQtmXp2HdutmqN+/F6JiU+h3kOpyVeHJwBgHoLIpqajm - 189HoaG4CNqsGTA1UAWth9Lg6r490PygGyLjUikgzuWqQlffCAegelDdUwLqigqhpXgjTPYeh+bCFCg2 - RkEk3vxuVz/P0c43oLP3DQegLhspNalSFxiNcLswHT48LYNbBUlQk7ebzenmyhm08w1o7xmiAP6hRZiT - 70eYkzpctUuJWdHmwWs74+F1Uz7cyE+E4ohQB5mHm9a3GywpTXzektyKduIAIsKI3ISkL4rIdYle05C9 - VrZVBmvtl7eboUyv7V4jSQdwRn8FdI72iErtCUxnIuifkJ5hUqUOq9Jr7OeCNU6bTpNVqtMcDJSldOwn - KnOk+jypJ5QANRWc0cs5SEelXr54QidfwVYAMoiHq4W/gNM6OaNCJ+diaUIqN/43+Atwg27t+9ZXBUn6 - A2MdqQeVc5pWAAAAAElFTkSuQmCC - - - - - iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAIAAABvFaqvAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAZdEVYdFNvZnR3YXJlAEFkb2JlIEltYWdlUmVhZHlxyWU8AAADZmlUWHRYTUw6Y29tLmFkb2Jl - LnhtcAAAAAAAPD94cGFja2V0IGJlZ2luPSLvu78iIGlkPSJXNU0wTXBDZWhpSHpyZVN6TlRjemtjOWQi - Pz4gPHg6eG1wbWV0YSB4bWxuczp4PSJhZG9iZTpuczptZXRhLyIgeDp4bXB0az0iQWRvYmUgWE1QIENv - cmUgNS4zLWMwMTEgNjYuMTQ1NjYxLCAyMDEyLzAyLzA2LTE0OjU2OjI3ICAgICAgICAiPiA8cmRmOlJE - RiB4bWxuczpyZGY9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkvMDIvMjItcmRmLXN5bnRheC1ucyMiPiA8 - cmRmOkRlc2NyaXB0aW9uIHJkZjphYm91dD0iIiB4bWxuczp4bXBNTT0iaHR0cDovL25zLmFkb2JlLmNv - bS94YXAvMS4wL21tLyIgeG1sbnM6c3RSZWY9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlw - ZS9SZXNvdXJjZVJlZiMiIHhtbG5zOnhtcD0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wLyIgeG1w - TU06T3JpZ2luYWxEb2N1bWVudElEPSJ4bXAuZGlkOjJGQzkyMzc0Rjk0OUU0MTE5NjNCQjRENDMzQjlC - MUM4IiB4bXBNTTpEb2N1bWVudElEPSJ4bXAuZGlkOjUzQzNGNDI5NEQyQzExRTQ4QkE1QUNCMEVDRDZF - MDVEIiB4bXBNTTpJbnN0YW5jZUlEPSJ4bXAuaWlkOjUzQzNGNDI4NEQyQzExRTQ4QkE1QUNCMEVDRDZF - MDVEIiB4bXA6Q3JlYXRvclRvb2w9IkFkb2JlIFBob3Rvc2hvcCBDUzYgKFdpbmRvd3MpIj4gPHhtcE1N - OkRlcml2ZWRGcm9tIHN0UmVmOmluc3RhbmNlSUQ9InhtcC5paWQ6RkI1NUY4OTYyQTRERTQxMUIzNkJE + MUM4IiB4bXBNTTpEb2N1bWVudElEPSJ4bXAuZGlkOjJERjY3MEZENEQyMzExRTRCNDlGQUMwMzk0OTAw + Qzc4IiB4bXBNTTpJbnN0YW5jZUlEPSJ4bXAuaWlkOjJERjY3MEZDNEQyMzExRTRCNDlGQUMwMzk0OTAw + Qzc4IiB4bXA6Q3JlYXRvclRvb2w9IkFkb2JlIFBob3Rvc2hvcCBDUzYgKFdpbmRvd3MpIj4gPHhtcE1N + OkRlcml2ZWRGcm9tIHN0UmVmOmluc3RhbmNlSUQ9InhtcC5paWQ6NjhGOUEyRDEyMTRERTQxMUIzNkJE NUVDQjU5MzE1NjIiIHN0UmVmOmRvY3VtZW50SUQ9InhtcC5kaWQ6MkZDOTIzNzRGOTQ5RTQxMTk2M0JC NEQ0MzNCOUIxQzgiLz4gPC9yZGY6RGVzY3JpcHRpb24+IDwvcmRmOlJERj4gPC94OnhtcG1ldGE+IDw/ - eHBhY2tldCBlbmQ9InIiPz6IsaOmAAADF0lEQVQ4T62U/UuTURTH+0nICqRI1ERMMyNQe8N0ChqBwQhN - yvwhEgJjVCqJ/qCibZo6tzQ339h6Nre5prapUzc1XzItX1ilzuWMLLVAen+xf6DTuTxjdxsFVj58ebjc - c+7nnud7z3228DbpIaDFH/CfoqCn72DIDvNfPDM2KAqyr8PcJxqY+QBTb8kkjocXQTsKigGwfqYJHqIg - 1OxHGHvlWPx4hXB1YyA3g4CBhqst+piEnrDA3rA95vBAY1x8d7lq/DVZwm5PQZNvoKYdypSgHgbVEIh1 - cLOZzOCbSSsyRQRba6uWtcpVLbPcwlglInNUCJNWWKqABqMLCGvGlfpJELaQ/V1Vd1lujAhe0chtUrH5 - ZExnmJ85MdomEa+qZMbIEF2BHGunILSjdZwYgTt4gJqjjj0Rltml1Zq9AeL0Mn71Wn2mtDU80MIvsFTw - O+KPIoWC8BNYRIUaqrRQroJKjQOk9N+xLBF2pXJFKfnsDGYa8gS6xOO2whyMuoHaHpGzZ/pBM0IMrtXD - nT4HqNHXe0lYoogMFeQP4jbSDkCPTUyXmnNoPutSo+9WN5DEQDyeWCWnhqm4p7Oimt3b54rzmmKPVHKz - 0Xg0AU1pz87VJp+yXOfd9t3mBmLXsGrsJhSsDtF4iOWxKdpzyQNnuRW7vEUp13obFG05OVUBPtO5V1Sn - k5q4SX8ENfWA6C7xHsP981Bb2sf38ZKd4JhSuXUJHPHhg/WJnAeZFw0Xzt/w8erRtLmBnB/CSmaC599I - 2PYVRl+CXigu3R9SfCC0Pf1MZ1oqvqvjogX7gtRFJfb1n24g7GblfQcFP2fkBYm5anxqQcbLKgzyK/Df - WRTkV5+RMTg84ZrgAOHo4ZIDVNdJw67CpsVLZ5gifj97Typlq2ZFQXj8LKh5EHpnaIar8N+Al5l9Y9Vs - T7OiIAzjqaMsa6QJnBkeWvgOHdPkAuIV67PSeQpCYYZplsZ+KyyWLRyFF8D553EDbURY770J0rrYJbda - SYE4iWb9NcgpRKDrOMAWwYP6d5BTaC52zyaAWDlAm/DweL8AX9zXukfxHsIAAAAASUVORK5CYII= - - - - - iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAZdEVYdFNvZnR3YXJlAEFkb2JlIEltYWdlUmVhZHlxyWU8AAADZmlUWHRYTUw6Y29tLmFkb2Jl - LnhtcAAAAAAAPD94cGFja2V0IGJlZ2luPSLvu78iIGlkPSJXNU0wTXBDZWhpSHpyZVN6TlRjemtjOWQi - Pz4gPHg6eG1wbWV0YSB4bWxuczp4PSJhZG9iZTpuczptZXRhLyIgeDp4bXB0az0iQWRvYmUgWE1QIENv - cmUgNS4zLWMwMTEgNjYuMTQ1NjYxLCAyMDEyLzAyLzA2LTE0OjU2OjI3ICAgICAgICAiPiA8cmRmOlJE - RiB4bWxuczpyZGY9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkvMDIvMjItcmRmLXN5bnRheC1ucyMiPiA8 - cmRmOkRlc2NyaXB0aW9uIHJkZjphYm91dD0iIiB4bWxuczp4bXBNTT0iaHR0cDovL25zLmFkb2JlLmNv - bS94YXAvMS4wL21tLyIgeG1sbnM6c3RSZWY9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlw - ZS9SZXNvdXJjZVJlZiMiIHhtbG5zOnhtcD0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wLyIgeG1w - TU06T3JpZ2luYWxEb2N1bWVudElEPSJ4bXAuZGlkOjJGQzkyMzc0Rjk0OUU0MTE5NjNCQjRENDMzQjlC - MUM4IiB4bXBNTTpEb2N1bWVudElEPSJ4bXAuZGlkOkVENUYwQThBNEQyOTExRTQ5QzUzQzdFMkFGQkQy - NTA1IiB4bXBNTTpJbnN0YW5jZUlEPSJ4bXAuaWlkOkVENUYwQTg5NEQyOTExRTQ5QzUzQzdFMkFGQkQy - NTA1IiB4bXA6Q3JlYXRvclRvb2w9IkFkb2JlIFBob3Rvc2hvcCBDUzYgKFdpbmRvd3MpIj4gPHhtcE1N - OkRlcml2ZWRGcm9tIHN0UmVmOmluc3RhbmNlSUQ9InhtcC5paWQ6MkRGNkEzOUYyOTRERTQxMUIzNkJE - NUVDQjU5MzE1NjIiIHN0UmVmOmRvY3VtZW50SUQ9InhtcC5kaWQ6MkZDOTIzNzRGOTQ5RTQxMTk2M0JC - NEQ0MzNCOUIxQzgiLz4gPC9yZGY6RGVzY3JpcHRpb24+IDwvcmRmOlJERj4gPC94OnhtcG1ldGE+IDw/ - eHBhY2tldCBlbmQ9InIiPz6npMy1AAAGEUlEQVRIS7WVeVDUZRjHf7Ase8ECu+wl4LIXcqyyHC783AWW - 5QaRFTHkMi9SQvE+UhLzwk0BUcQSgQBBgcYDzStMSzOPcpqcmo5pmqk/+rOapqb+iG/PbzfFcSz/6pn5 - zPN739/7fp/nvZn/3TSLjj+XJy2/RaItPCT5vaBd8m1+q2Qku1lcrcvki+iXr7fFU6ZZeOx5KDU1b7jU - 1Z2bVPMPWNMbRXrXkWAc+ywVLbcS8fKwFjlu8VdpW0XzSc6f8PEIPzJ19dFnU3WEJdHL9P3X9O1nkdB8 - CQrX7i3mKn9zfqsUq29ZsPfjRBx5aMO2cTMy94gm7FuF7XyJTwDJTo5GVdHxNALVgsPd5Ceye+9g8b0f - UXbjB8RtH4Msd+MeXS7f6twjxbILZiy7pEHDtTBsvG7BqivTUXpsClLWCbtJNpDwBlGVH3ySIFV520eW - nedRcf0HVJGwbeRrOHs/h2n1CGRZDe7wND/W1hiI8sEYlJ4KRcVpJcrfVqByNBILhqLh3KeA+UXBOpL2 - jkRZduARPGXZ/vH4pnMou/gd7INfIPn4QyQc/RSOzk9hrBtEiKPerUn1Y5PXBaDojWlwdgUjr0+G/H4Z - cnpCUNJrQNZ+LeLrBD/LYnixFEDAKFz7vJQ0r49dO4zikS8x8/ADxLd9jIT2B5ix/z7SX78Pw+K3EJy2 - wq1M4rEz6sRwthgw82Ag2KNS2I5JPZ4rZx00ImGNHIZSfisFkDGhxbs5AkKLd/3kaLkDlgTjXrsNc/Md - mPfeQeyOD2HbcRu6yi4E2Wrd8ngeG71IBPtePWa4JUhsD0DykQAkHQqApUWCFLcGyZvDoZ/P/5oCTGXk - hU2MvGB7rbGmG47dd2Fa+x6iX/kAMa/eQvS2m4jaeAPspvcROb8TQexid3CcL2usFCJjnwE5nQYU9RhR - PGDC7D4TCrqMyDqkR9oePbRz/SZEKh8rI8vdyshyXhmzLD8DS/1VGOquwtgw7glkXH0Nhvp3kbL2GrSl - hyC11ril03xZfbkQKZuVsDeq4NihRtYuDbJ2auBoUsO2TQXrJiWMlWIExflWMiHOjRzfJy0bg776HCKX - vANd7WXol1/xeN3Si7A2XIXW1YbAxAq3UO0zPTSd1yG38bplLK//vxBrffKY4PQ1HH9aKk8jonQUUyvO - Qlt9HtqaCx4/tXIMyXWXMXXOAQTEv+D2zCvDhBBTCN1zCGOCZq3k+DXO1YcpRYOY4hpF2LzTCCs74/VE - 3IvnEVd1EhGFblBbWot6BKXWQZq64tlYa2+TuJwQM9KU5cRL35hyOxCe2w913hA0hcPQFI16KRzxEFtO - a1Q9htSVN5C+5S5x7x/uIm3DR7CvuomUReOImt1FU7nwEolHECImMGkJE5i46EJkejNM+X1QOPqhzBqC - KvskVDmnJuHKT/K4bgjKzBMItXcjJv84NOwWiKPndJK40TOCgPgaRmIur1dZ1yM6txvyWT0ITR+AImOQ - gg39N1ybDBJP60PorC5My3oTwQm18FdNryBxbq0EJL6AEUTYZBTkF0NGKyKdvZDb3qJOAxSIOqcP/jtp - JyC3D1BSvYgp6EN4aiNlP/cTEk4gFASPEUeXkWd8RaY5jcrEBkTn9UCT4Q3gzfBfRvJE9rrsfpicHSRe - NsFXmJeSXhTBXXY+jMjk8uArVkpExuKb6pkbYJ7L7Ria37xTUBeMeCkcncRTN0z/TyLKNYy4khNQJq2G - IMLBXdUWQkXwCYYR6md7IPP1k8WEC3UFDzSpG2BZeAZJtXQWFpyls3HOC50JzkdQnbFqDInLLiC2rBcq - 6xoSzzzP+NDVwDBaQkx4XzahNv8xZH48sVotCHeOUnnCWNJG18Q4UjddB7vlfbBbPwC7+YannLTyIrS5 - OyHU5v3hr07poL7JBHe4Jh8bzgQROY8h46IKCAVfbi73D3PcpfoJlX0VtEVN0JXsQlj2ZoRaaynj7N/8 - NfZLPLFmHrXnpiWSCCL8iMl32T/M6YGMq+R+covD7QADwfoIgqt4QVGtfvIZJ4lRv5CY4zypbjfjy+eE - M4l4gtuSwYSQ4DS4EZAew/wNiCYQJlvQU3cAAAAASUVORK5CYII= + eHBhY2tldCBlbmQ9InIiPz6GKmpFAAAC+UlEQVRIS63T20vTYRzH8Yforj/Ei24UiSgKIygKi8oyxZQo + cvNYeXaesmzqPGu2POd0ulSsnIdaurTSTJ3O6UxTPGya5vCQx5AuPn39RbHop7nZxQt+z3ie93e/Z4w1 + p7nsCoBt8R6yBF/UHPv+Wb0rfFFzm99CRIwEW1gnqXzxTXxRc0ydctm4OlID2sxrw6iCtiwItC+A2P/D + frLnjwGNSZdMq6N1WOvLwFpP4l/WdRlY6Jaio9Ab7QXba8sVoDHZGdT8PYS9THDqMGnLsKpNw0qXGCua + BO55VZdNQ6U/DRRibVCGb+N1pH5bukoRqHmDHOIG1N8/X2F4I8WyNhtf2+9hqSsZxqZ4upbb6HsSZLHO + Im90ym6hNVcIaktYTexZyUelGEvaHMy/jcFiZxo0xX5Y7ivGcn8JkVmA9uvlWBmqwpJeAWovs+poR99O + eRgWtQWYVUdgrj0FH+i+F3XF3NoappZYGJrEoLaOVYpOOTY/FGJB+xjTqnDMtMTTAC/Ma/Ix/TLUKl9e + x0JfFQpql7PykBP7lWIXzPeUYLIhHCPKCLr/AMy2ZsKoDLTKdNNdvM8TgNpRTBZwfJ885CTmaIChPhwa + mS+GnkdhqjEWY9X+VplqvIMXEhdQ24mZeuSs0N/BNNWWj4k6EdSZHhhXxWH0aSCGFd4c4Tk7zk7XBlUM + FKLToK4Nm+0qYnneRzqGGiSYaIiiyZdhVCdgqFSIwRJPjucZW85O1pvnRmvDkO9zFNTdy2Y6HjGp4HCF + 5kk4xhoiURd/EROv4tBfeM0qAyUC9Mp9QM0+7o829T6LZV0/mNycS6+nFKFWfAGj9ZHozfGwil7miZYH + 7qCmghsw+S6VpV894KuUuKFbfhNNqa749CwY3dm0toK+VABl3HlQM5obYHybwFLc7W1y/Y5BlX6FfgNn + DNcEY0DhZZX+MiGKbh0DNR24AYYWMSfJzc6GZBApwS5skIzNODcg0dV2V36FtsJ7yBJ8UXO8hyzBFzXH + ++H/A/YDv9/V87iOlrYAAAAASUVORK5CYII= @@ -3164,9 +3164,6 @@ 864, 17 - - 864, 17 - iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 diff --git a/Program.cs b/Program.cs index e38f7b8..a76d0d4 100644 --- a/Program.cs +++ b/Program.cs @@ -16,14 +16,14 @@ [STAThread] static void Main() { - ValidateInfo validateInfo = ValidateConfig.LoadConfig(); + ValidateConfig.LoadConfig(); string localConfigPath = Application.StartupPath + "/Config.xml"; //获取程序及版本信息 string currentVersionCode = Assembly.GetExecutingAssembly().GetName().Version.ToString(); //获取文件版本信息 FileVersionInfo.GetVersionInfo(Application.ExecutablePath); - + Utility.SysInfoConfig(); string configUrl = getProgramUrl(localConfigPath, "configurl"); if (configUrl != "") { diff --git a/TreeUtils.cs b/TreeUtils.cs index 1f055b5..ad39643 100644 --- a/TreeUtils.cs +++ b/TreeUtils.cs @@ -19,7 +19,7 @@ public static void InitLayerTree(GSOGlobeControl gsoGlobeControl, TreeView treeView, string viewDatasrc) { // treeView.Nodes.Clear(); - LayerConfig layerConfig = Utility.layerConfig;//layertree所在的配置文件 + LayerConfig layerConfig = Utility.LayerConfig;//layertree所在的配置文件 List datasrcs = layerConfig.datasrcs; foreach (DataSrc datasrc in datasrcs) { diff --git a/Utility.cs b/Utility.cs index c03e405..ab947a3 100644 --- a/Utility.cs +++ b/Utility.cs @@ -20,7 +20,7 @@ public static string dbdatabase; public static string userID; - public static Hashtable Pipe_QueryFields; +// public static Hashtable Pipe_QueryFields; public static string DBPassword; public static string DBServer; public static string DBBackUp; @@ -38,7 +38,7 @@ public static List listPipelineType; public static string PicRootURL; public static string PicDefaultURL; - public static double dFlyAboveLine = 2; +// public static double dFlyAboveLine = 2; public static string userName; public static string projectStr; public static string userRole; @@ -85,12 +85,17 @@ public static List pipefittingLayerNames = new List();//管件图层名称 public static List sgPipeLayersNames = new List();//施工管线图层名称 -// public static Dictionary dictionaryNetLayerNameAndCaption = new Dictionary(); - public static HashSet layerNameSet = new HashSet(); + public static HashSet layerNameSet = new HashSet();//记录有哪些图层要显示 public static string roadLayerName = ""; #endregion wxl - public static LayerConfig layerConfig; + public static LayerConfig LayerConfig; + + public static string RoleServer; + public static string TitleImagePath; + public static string SysnameVersion; + public static string Copyright; + public static void SetBallons(GSOBalloon featureTooltip, GSOBalloonEx balloonEx) { featureTooltip.CacheFilePath = Application.StartupPath + "/GeoScene/Globe/Temp"; @@ -188,25 +193,6 @@ } return s.ToString(); } - public static GSOFeatures Table2Features(DataTable table, string currentQueryLayer, GSOGlobeControl globeControl1) - { - GSOFeatures features = new GSOFeatures(); - for (int i = 0; i < table.Rows.Count; i++) - { - DataRow row = table.Rows[i]; - - string featureName = row["编号"].ToString(); - featureName = featureName.Trim(); - GSOLayer layer = globeControl1.Globe.Layers.GetLayerByCaption(currentQueryLayer); - GSOFeatures tempfeatures = layer.GetFeatureByName(featureName, false); - if (tempfeatures.Length > 0) - { - features.Add(tempfeatures[0]); - } - } - return features; - } - //程序启动的时候读取配置文件 public static void SetParams() @@ -358,8 +344,8 @@ #region wxl 从layerconfig.xml中读取 - layerConfig = XmlTools.DeserializeFromXml(layerConfigFile); - List dataSrcs = layerConfig.datasrcs; + LayerConfig = XmlTools.DeserializeFromXml(layerConfigFile); + List dataSrcs = LayerConfig.datasrcs; foreach (var dataSrc in dataSrcs) { @@ -598,76 +584,49 @@ #endregion } - /* - //判断网络是否连接 - public static bool isNetworkConnectionSuccess(string ipAdress) + /// + /// 获取Config.xml配置文件中的roleurl配置，并返回 + /// + /// 请求综合信息平台的服务地址 + public static void SysInfoConfig() { - //return true; - if (ipAdress == null) - { - return false; - } - if (ipAdress.Contains("\\")) - { - ipAdress = ipAdress.Substring(0, ipAdress.LastIndexOf('\\')); - } - if (ipAdress.Trim() == "localhost" || ipAdress.Trim() == "127.0.0.1" || ipAdress.Trim() == Dns.GetHostName()) - { - return true; - } - Ping ping = new Ping(); + if (!File.Exists(filename)) return; + + XmlTextReader xmlReader = new XmlTextReader(filename); try { - PingReply pr = ping.Send(ipAdress.Trim(), 3000); - if (pr.Status == IPStatus.Success) + while (xmlReader.Read()) { - return true; + if (xmlReader.Name.Equals("roleurl")) + { + RoleServer = xmlReader.ReadElementString(); + } + else if (xmlReader.Name.Equals("titleimgpath")) + { + TitleImagePath = xmlReader.ReadElementString(); + } + else if (xmlReader.Name.Equals("sysname")) + { + SysnameVersion = xmlReader.ReadElementString(); + } + else if (xmlReader.Name.Equals("copyright")) + { + Copyright = xmlReader.ReadElementString(); + } } - else - { - return false; - } + } catch (Exception ex) { - LogError.PublishError(ex); - return false; + + LogHelper.Error("在config.xml配置文件中读取roleurl时出错"); } - } - */ - - - //TODO LIST:下面两个方法移到featueTools.cs中 - //根据附属物图层名字得到里面含有的附属物 - public static string[] getAccStrsByLayer(string layername) - { - string[] accStrs = null; - string sql = "select 附属物名称 from " + layername + " group by 附属物名称"; - DataSet dataset = OledbHelper.getDataSet(sql, layername); - if (dataset == null) return null; - accStrs = new string[dataset.Tables[0].Rows.Count]; - for (int i = 0; i < dataset.Tables[0].Rows.Count; i++) + finally { - accStrs[i] = dataset.Tables[0].Rows[i][0].ToString(); + xmlReader.Close(); } - return accStrs; } - //删除内存图层中指定名称的feature - public static void RemoveFeatureFromName(GSOGlobeControl globeControl1, string featureName) - { - GSOFeatures features = globeControl1.Globe.MemoryLayer.GetFeatureByName(featureName, true); - if (features != null) - { - for (int i = features.Length - 1; i >= 0; i--) - { - GSOFeature feature = features[i]; - if (feature != null) - { - globeControl1.Globe.MemoryLayer.RemoveFeatureByID(feature.ID); - } - } - } - globeControl1.Refresh(); - } + + } } diff --git a/ValidateInfo.cs b/ValidateInfo.cs index de75391..01546da 100644 --- a/ValidateInfo.cs +++ b/ValidateInfo.cs @@ -192,7 +192,7 @@ } if (!isSuccess) { - LogHelper.WriteLog(typeof(FieldUniqueValidate), logStr); + LogHelper.Error(logStr); } return isSuccess; } @@ -247,7 +247,7 @@ err += "未找到字段或其类型匹配:" + unFoundField.label + ":" + unFoundField.type + "\r\n"; } - LogHelper.WriteLog(typeof(FieldCountValidate), err); + LogHelper.Error(err); return false; } return true; @@ -316,7 +316,7 @@ { err += "字段:" + field.label + "出错\r\n"; } - LogHelper.WriteLog(typeof(FieldOrderValidate), err); + LogHelper.Error(err); return false; } return true; @@ -388,8 +388,7 @@ } if (isSuccess == false) { - LogHelper.WriteLog(typeof(FieldEmptyValidate), - "字段为空检查失败:\r\n" + err); + LogHelper.Error("字段为空检查失败:\r\n" + err); } return isSuccess; } diff --git a/bin/x86/Debug/Config.xml b/bin/x86/Debug/Config.xml index 6995f64..6a453a3 100644 --- a/bin/x86/Debug/Config.xml +++ b/bin/x86/Debug/Config.xml @@ -25,6 +25,11 @@ http://127.0.0.1/Cyberpipe.msi http://127.0.0.1/Config.xml + http://192.168.0.102:8080/ctrl + /Resource/title.jpg + 智慧太湖新城管网规划分析系统6.0 + @2014-2015 苏州航天系统工程有限公司 版权所有 + 编号,管线编码,管径_毫米,材质,埋设方式,起始地面高程,起始埋深,终止地面高程,终止埋深,建设年代,使用年限,权属单位,设计单位,设计负责人,施工单位,施工负责人,监理单位,监理负责人,业务负责人,备注 编号,管线编码,管径_毫米,材质,埋设方式,起始地面高程,起始埋深,终止地面高程,终止埋深,建设年代,使用年限,权属单位,设计单位,设计负责人,施工单位,施工负责人,监理单位,监理负责人,业务负责人,备注 diff --git a/bin/x86/Debug/config/log4net.config b/bin/x86/Debug/config/log4net.config index 80f9b25..6fbcfa7 100644 --- a/bin/x86/Debug/config/log4net.config +++ b/bin/x86/Debug/config/log4net.config @@ -3,29 +3,118 @@
- - - - - - - - - - - - - - - + + + -property: [%property{NDC}] - %n错误描述：%message%newline %n"/> - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/bin/x86/Debug/glVersion.txt b/bin/x86/Debug/glVersion.txt index cd82eca..755455e 100644 --- a/bin/x86/Debug/glVersion.txt +++ b/bin/x86/Debug/glVersion.txt Binary files differ diff --git a/bin/x86/Debug/log.txt b/bin/x86/Debug/log.txt index a4966d3..2112642 100644 --- a/bin/x86/Debug/log.txt +++ b/bin/x86/Debug/log.txt @@ -430,3 +430,43 @@ exception over ------------------------------------------------------------ + + exception begin -----------------2016/11/29 18:54:54--------------------- + + + + e.Message:第 29 行，位置 4 上的开始标记“titleimagpath”与结束标记“titleimagepath”不匹配。 第 29 行，位置 39。 + + e.Source:System.Xml + + e.TargetSite:Void Throw(System.String, System.String[]) + + e.StackTrace: 在 System.Xml.XmlTextReaderImpl.Throw(String res, String[] args) + 在 System.Xml.XmlTextReaderImpl.ThrowTagMismatch(NodeData startTag) + 在 System.Xml.XmlTextReaderImpl.ParseEndElement() + 在 System.Xml.XmlTextReaderImpl.ParseElementContent() + 在 Cyberpipe.Utility.SetParams() 位置 E:\wxl\work\GHFX_REFACTOR\Utility.cs:行号 208 + + + + exception over ------------------------------------------------------------ + + exception begin -----------------2016/11/29 18:57:17--------------------- + + + + e.Message:第 29 行，位置 4 上的开始标记“titleimagpath”与结束标记“titleimagepath”不匹配。 第 29 行，位置 39。 + + e.Source:System.Xml + + e.TargetSite:Void Throw(System.String, System.String[]) + + e.StackTrace: 在 System.Xml.XmlTextReaderImpl.Throw(String res, String[] args) + 在 System.Xml.XmlTextReaderImpl.ThrowTagMismatch(NodeData startTag) + 在 System.Xml.XmlTextReaderImpl.ParseEndElement() + 在 System.Xml.XmlTextReaderImpl.ParseElementContent() + 在 Cyberpipe.Utility.SetParams() 位置 E:\wxl\work\GHFX_REFACTOR\Utility.cs:行号 208 + + + + exception over ------------------------------------------------------------ diff --git a/bin/x86/Debug/log/2016/201611/20161107.txt b/bin/x86/Debug/log/2016/201611/20161107.txt deleted file mode 100644 index cd32fa6..0000000 --- a/bin/x86/Debug/log/2016/201611/20161107.txt +++ /dev/null @@ -1,152 +0,0 @@ - - -��¼ʱ�䣺2016-11-07 10:30:22,327 -�߳�ID:[9] -��־���� ERROR -�����ࣺCyberpipe.FrmBSQStatis property: [(null)] - -����������1 - - - -��¼ʱ�䣺2016-11-07 10:30:40,660 -�߳�ID:[9] -��־���� ERROR -�����ࣺCyberpipe.FrmBSQStatis property: [(null)] - -����������0 - - - -��¼ʱ�䣺2016-11-07 14:00:27,070 -�߳�ID:[8] -��־���� ERROR -�����ࣺCyberpipe.Forms.FrmPipelineModelDB property: [(null)] - -����������δ�������������õ������ʵ���� - - - -��¼ʱ�䣺2016-11-07 14:00:36,154 -�߳�ID:[8] -��־���� ERROR -�����ࣺCyberpipe.Forms.FrmPipelineModelDB property: [(null)] - -����������δ�������������õ������ʵ���� - - - -��¼ʱ�䣺2016-11-07 14:00:40,186 -�߳�ID:[8] -��־���� ERROR -�����ࣺCyberpipe.Forms.FrmPipelineModelDB property: [(null)] - -����������δ�������������õ������ʵ���� - - - -��¼ʱ�䣺2016-11-07 14:05:46,422 -�߳�ID:[9] -��־���� ERROR -�����ࣺCyberpipe.Forms.FrmPipelineModelDB property: [(null)] - -����������δ�������������õ������ʵ���� - - - -��¼ʱ�䣺2016-11-07 14:06:34,633 -�߳�ID:[10] -��־���� ERROR -�����ࣺCyberpipe.Forms.FrmPipelineModelDB property: [(null)] - -����������δ�������������õ������ʵ���� - - - -��¼ʱ�䣺2016-11-07 14:06:36,301 -�߳�ID:[10] -��־���� ERROR -�����ࣺCyberpipe.Forms.FrmPipelineModelDB property: [(null)] - -����������δ�������������õ������ʵ���� - - - -��¼ʱ�䣺2016-11-07 14:06:44,800 -�߳�ID:[10] -��־���� ERROR -�����ࣺCyberpipe.Forms.FrmPipelineModelDB property: [(null)] - -����������δ�������������õ������ʵ���� - - - -��¼ʱ�䣺2016-11-07 14:07:03,449 -�߳�ID:[10] -��־���� ERROR -�����ࣺCyberpipe.Forms.FrmPipelineModelDB property: [(null)] - -����������δ�������������õ������ʵ���� - - - -��¼ʱ�䣺2016-11-07 14:07:05,165 -�߳�ID:[10] -��־���� ERROR -�����ࣺCyberpipe.Forms.FrmPipelineModelDB property: [(null)] - -����������δ�������������õ������ʵ���� - - - -��¼ʱ�䣺2016-11-07 17:58:24,384 -�߳�ID:[10] -��־���� ERROR -�����ࣺCyberpipe.Forms.FrmPipelineModelDB property: [(null)] - -����������δ�������������õ������ʵ���� - - - -��¼ʱ�䣺2016-11-07 18:11:22,114 -�߳�ID:[8] -��־���� ERROR -�����ࣺCyberpipe.Forms.FrmPipelineModelDB property: [(null)] - -����������δ�������������õ������ʵ���� - - - -��¼ʱ�䣺2016-11-07 18:12:13,619 -�߳�ID:[8] -��־���� ERROR -�����ࣺCyberpipe.Forms.FrmPipelineModelDB property: [(null)] - -����������δ�������������õ������ʵ���� - - - -��¼ʱ�䣺2016-11-07 18:12:33,268 -�߳�ID:[8] -��־���� ERROR -�����ࣺCyberpipe.Forms.FrmPipelineModelDB property: [(null)] - -����������δ�������������õ������ʵ���� - - - -��¼ʱ�䣺2016-11-07 18:12:43,628 -�߳�ID:[8] -��־���� ERROR -�����ࣺCyberpipe.Forms.FrmPipelineModelDB property: [(null)] - -����������δ�������������õ������ʵ���� - - - -��¼ʱ�䣺2016-11-07 18:12:53,488 -�߳�ID:[8] -��־���� ERROR -�����ࣺCyberpipe.Forms.FrmPipelineModelDB property: [(null)] - -����������δ�������������õ������ʵ���� - - - -��¼ʱ�䣺2016-11-07 18:13:31,996 -�߳�ID:[8] -��־���� ERROR -�����ࣺCyberpipe.Forms.FrmPipelineModelDB property: [(null)] - -����������δ�������������õ������ʵ���� - - - -��¼ʱ�䣺2016-11-07 18:16:05,234 -�߳�ID:[9] -��־���� ERROR -�����ࣺCyberpipe.Forms.FrmPipelineModelDB property: [(null)] - -����������δ�������������õ������ʵ���� - diff --git a/bin/x86/Debug/log/2016/201611/20161108.txt b/bin/x86/Debug/log/2016/201611/20161108.txt deleted file mode 100644 index b5c96c9..0000000 --- a/bin/x86/Debug/log/2016/201611/20161108.txt +++ /dev/null @@ -1,40 +0,0 @@ - - -��¼ʱ�䣺2016-11-08 09:53:20,836 -�߳�ID:[10] -��־���� ERROR -�����ࣺCyberpipe.Forms.FrmPipelineModelDB property: [(null)] - -����������δ�������������õ������ʵ���� - - - -��¼ʱ�䣺2016-11-08 09:53:49,986 -�߳�ID:[10] -��־���� ERROR -�����ࣺCyberpipe.Forms.FrmPipelineModelDB property: [(null)] - -����������δ�������������õ������ʵ���� - - - -��¼ʱ�䣺2016-11-08 09:54:25,364 -�߳�ID:[10] -��־���� ERROR -�����ࣺCyberpipe.Forms.FrmPipelineModelDB property: [(null)] - -����������δ�������������õ������ʵ���� - - - -��¼ʱ�䣺2016-11-08 10:33:09,418 -�߳�ID:[11] -��־���� ERROR -�����ࣺCyberpipe.Forms.FrmPipelineModelDB property: [(null)] - -����������δ�������������õ������ʵ���� - - - -��¼ʱ�䣺2016-11-08 10:38:53,638 -�߳�ID:[10] -��־���� ERROR -�����ࣺCyberpipe.Forms.FrmPipelineModelDB property: [(null)] - -����������δ�������������õ������ʵ���� - diff --git a/bin/x86/Debug/log/2016/201611/20161116.txt b/bin/x86/Debug/log/2016/201611/20161116.txt deleted file mode 100644 index d23f760..0000000 --- a/bin/x86/Debug/log/2016/201611/20161116.txt +++ /dev/null @@ -1,8 +0,0 @@ - - -��¼ʱ�䣺2016-11-16 15:06:52,549 -�߳�ID:[9] -��־���� ERROR -�����ࣺCyberpipe.Utility property: [(null)] - -����������������־ - diff --git a/bin/x86/Debug/log/2016/201611/20161118.txt b/bin/x86/Debug/log/2016/201611/20161118.txt deleted file mode 100644 index d03145b..0000000 --- a/bin/x86/Debug/log/2016/201611/20161118.txt +++ /dev/null @@ -1,84 +0,0 @@ - - -��¼ʱ�䣺2016-11-18 15:22:27,833 -�߳�ID:[9] -��־���� ERROR -�����ࣺCyberpipe.Forms.FrmPipelineModelDB property: [(null)] - -���������������ͳ��ȱ������ø��ַ����ڵ�λ�á� -������: length - - - -��¼ʱ�䣺2016-11-18 15:23:05,224 -�߳�ID:[9] -��־���� ERROR -�����ࣺCyberpipe.Forms.FrmPipelineModelDB property: [(null)] - -���������������ͳ��ȱ������ø��ַ����ڵ�λ�á� -������: length - - - -��¼ʱ�䣺2016-11-18 15:24:36,900 -�߳�ID:[9] -��־���� ERROR -�����ࣺCyberpipe.Forms.FrmPipelineModelDB property: [(null)] - -���������������ͳ��ȱ������ø��ַ����ڵ�λ�á� -������: length - - - -��¼ʱ�䣺2016-11-18 15:26:25,752 -�߳�ID:[9] -��־���� ERROR -�����ࣺCyberpipe.Forms.FrmPipelineModelDB property: [(null)] - -���������������ͳ��ȱ������ø��ַ����ڵ�λ�á� -������: length - - - -��¼ʱ�䣺2016-11-18 15:27:04,799 -�߳�ID:[9] -��־���� ERROR -�����ࣺCyberpipe.FieldOrderValidate property: [(null)] - -�����������ֶ�˳����ʧ�� -�ֶ�:��ʼ�ܶ��߳��� -�ֶ�:��ֹ����߳��� -�ֶ�:��ֹ������� -�ֶ�:��ֹ�ܶ��߳��� -�ֶ�:������·���� -�ֶ�:Ȩ����λ���� -�ֶ�:��ע���� - - - - -��¼ʱ�䣺2016-11-18 15:27:11,752 -�߳�ID:[9] -��־���� ERROR -�����ࣺCyberpipe.FieldOrderValidate property: [(null)] - -�����������ֶ�˳����ʧ�� -�ֶ�:��ʼ�ܶ��߳��� -�ֶ�:��ֹ����߳��� -�ֶ�:��ֹ������� -�ֶ�:��ֹ�ܶ��߳��� -�ֶ�:������·���� -�ֶ�:Ȩ����λ���� -�ֶ�:��ע���� - - - - -��¼ʱ�䣺2016-11-18 15:27:27,018 -�߳�ID:[9] -��־���� ERROR -�����ࣺCyberpipe.FieldOrderValidate property: [(null)] - -�����������ֶ�˳����ʧ�� -�ֶ�:��ʼ�ܶ��߳��� -�ֶ�:��ֹ����߳��� -�ֶ�:��ֹ������� -�ֶ�:��ֹ�ܶ��߳��� -�ֶ�:������·���� -�ֶ�:Ȩ����λ���� -�ֶ�:��ע���� - - diff --git a/bin/x86/Debug/log/2016/201611/20161121.txt b/bin/x86/Debug/log/2016/201611/20161121.txt deleted file mode 100644 index e4d7262..0000000 --- a/bin/x86/Debug/log/2016/201611/20161121.txt +++ /dev/null @@ -1,213 +0,0 @@ - - -��¼ʱ�䣺2016-11-21 09:26:43,193 -�߳�ID:[9] -��־���� ERROR -�����ࣺCyberpipe.FieldOrderValidate property: [(null)] - -�����������ֶ�˳����ʧ�� -�ֶ�:��ʼ�ܶ��߳��� -�ֶ�:��ֹ����߳��� -�ֶ�:��ֹ������� -�ֶ�:��ֹ�ܶ��߳��� -�ֶ�:������·���� -�ֶ�:Ȩ����λ���� -�ֶ�:��ע���� - - - - -��¼ʱ�䣺2016-11-21 09:37:42,959 -�߳�ID:[8] -��־���� ERROR -�����ࣺCyberpipe.FieldUniqueValidate property: [(null)] - -�����������ֶ�Ψһ�Լ��ʧ�� -�ֶ���ʼ������ظ� 463.455����:3�ֶ���ʼ������ظ� 463.465����:3�ֶ���ʼ������ظ� 465.377����:3�ֶ���ֹ�ܵ׸��ظ� 462.044����:3 - - - -��¼ʱ�䣺2016-11-21 09:38:27,526 -�߳�ID:[8] -��־���� ERROR -�����ࣺCyberpipe.FieldUniqueValidate property: [(null)] - -�����������ֶ�Ψһ�Լ��ʧ�� -�ֶ���ʼ������ظ� 56.89����:3�ֶ���ʼ������ظ� 58.05����:3�ֶ���ʼ������ظ� 58.74����:3�ֶ���ʼ������ظ� 59.23����:3�ֶ���ʼ������ظ� 58.47����:3�ֶ���ʼ������ظ� 57.8����:3�ֶ���ʼ������ظ� 57.53����:3�ֶ���ʼ������ظ� 57.38����:3�ֶ���ʼ������ظ� 58.4����:3�ֶ���ʼ������ظ� 58.8����:7�ֶ���ֹ�ܵ׸��ظ� 54.94����:3�ֶ���ֹ�ܵ׸��ظ� 58.3����:3�ֶ���ֹ�ܵ׸��ظ� 58.73����:3�ֶ���ֹ�ܵ׸��ظ� 57.83����:3�ֶ���ֹ�ܵ׸��ظ� 58.31����:3 - - - -��¼ʱ�䣺2016-11-21 09:39:05,199 -�߳�ID:[8] -��־���� ERROR -�����ࣺCyberpipe.FieldCountValidate property: [(null)] - -�����������ֶ������Լ��ʧ�� -δ�ҵ��ֶλ�������ƥ��:��ʼ�ܵ׸�:double -δ�ҵ��ֶλ�������ƥ��:��ֹ�ܵ׸�:double - - - - -��¼ʱ�䣺2016-11-21 09:39:16,208 -�߳�ID:[8] -��־���� ERROR -�����ࣺCyberpipe.FieldOrderValidate property: [(null)] - -�����������ֶ�˳����ʧ�� -�ֶ�:��ʼ�ܶ��߳��� -�ֶ�:��ֹ����߳��� -�ֶ�:��ֹ������� -�ֶ�:��ֹ�ܶ��߳��� -�ֶ�:������·���� -�ֶ�:Ȩ����λ���� -�ֶ�:��ע���� - - - - -��¼ʱ�䣺2016-11-21 09:39:37,798 -�߳�ID:[8] -��־���� ERROR -�����ࣺCyberpipe.FieldOrderValidate property: [(null)] - -�����������ֶ�˳����ʧ�� -�ֶ�:��ʼ�ܶ��߳��� -�ֶ�:��ֹ����߳��� -�ֶ�:��ֹ������� -�ֶ�:��ֹ�ܶ��߳��� -�ֶ�:������·���� -�ֶ�:Ȩ����λ���� -�ֶ�:��ע���� - - - - -��¼ʱ�䣺2016-11-21 09:39:56,031 -�߳�ID:[8] -��־���� ERROR -�����ࣺCyberpipe.FieldOrderValidate property: [(null)] - -�����������ֶ�˳����ʧ�� -�ֶ�:��ʼ�ܶ��߳��� -�ֶ�:��ֹ����߳��� -�ֶ�:��ֹ������� -�ֶ�:��ֹ�ܶ��߳��� -�ֶ�:������·���� -�ֶ�:Ȩ����λ���� -�ֶ�:��ע���� - - - - -��¼ʱ�䣺2016-11-21 09:41:01,165 -�߳�ID:[8] -��־���� ERROR -�����ࣺCyberpipe.FieldOrderValidate property: [(null)] - -�����������ֶ�˳����ʧ�� -�ֶ�:��ʼ�ܶ��߳��� -�ֶ�:��ֹ����߳��� -�ֶ�:��ֹ������� -�ֶ�:��ֹ�ܶ��߳��� -�ֶ�:������·���� -�ֶ�:Ȩ����λ���� -�ֶ�:��ע���� - - - - -��¼ʱ�䣺2016-11-21 09:43:35,081 -�߳�ID:[10] -��־���� ERROR -�����ࣺCyberpipe.FieldOrderValidate property: [(null)] - -�����������ֶ�˳����ʧ�� -�ֶ�:��ʼ�ܶ��߳��� -�ֶ�:��ֹ����߳��� -�ֶ�:��ֹ������� -�ֶ�:��ֹ�ܶ��߳��� -�ֶ�:������·���� -�ֶ�:Ȩ����λ���� -�ֶ�:��ע���� - - - - -��¼ʱ�䣺2016-11-21 09:43:46,706 -�߳�ID:[10] -��־���� ERROR -�����ࣺCyberpipe.FieldOrderValidate property: [(null)] - -�����������ֶ�˳����ʧ�� -�ֶ�:��ʼ�ܶ��߳��� -�ֶ�:��ֹ����߳��� -�ֶ�:��ֹ������� -�ֶ�:��ֹ�ܶ��߳��� -�ֶ�:������·���� -�ֶ�:Ȩ����λ���� -�ֶ�:��ע���� - - - - -��¼ʱ�䣺2016-11-21 09:45:33,615 -�߳�ID:[10] -��־���� ERROR -�����ࣺCyberpipe.FieldOrderValidate property: [(null)] - -�����������ֶ�˳����ʧ�� -�ֶ�:��ʼ�ܶ��߳��� -�ֶ�:��ֹ����߳��� -�ֶ�:��ֹ������� -�ֶ�:��ֹ�ܶ��߳��� -�ֶ�:������·���� -�ֶ�:Ȩ����λ���� -�ֶ�:��ע���� - - - - -��¼ʱ�䣺2016-11-21 09:53:43,807 -�߳�ID:[10] -��־���� ERROR -�����ࣺCyberpipe.FieldCountValidate property: [(null)] - -�����������ֶ������Լ��ʧ�� -δ�ҵ��ֶλ�������ƥ��:ͼ����:string - - - - -��¼ʱ�䣺2016-11-21 13:34:03,037 -�߳�ID:[10] -��־���� ERROR -�����ࣺCyberpipe.FieldCountValidate property: [(null)] - -����������BSQ�ֶ������Լ��ʧ�� -δ�ҵ��ֶλ�������ƥ��:ͼ����:string - - - - -��¼ʱ�䣺2016-11-21 13:40:32,041 -�߳�ID:[9] -��־���� ERROR -�����ࣺCyberpipe.FieldCountValidate property: [(null)] - -����������BSQ�ֶ������Լ��ʧ�� -δ�ҵ��ֶλ�������ƥ��:ͼ����:string - - - - -��¼ʱ�䣺2016-11-21 13:43:57,923 -�߳�ID:[9] -��־���� ERROR -�����ࣺCyberpipe.FieldCountValidate property: [(null)] - -����������BSQ�ֶ������Լ��ʧ�� -δ�ҵ��ֶλ�������ƥ��:ͼ����:string - - - - -��¼ʱ�䣺2016-11-21 13:44:42,643 -�߳�ID:[9] -��־���� ERROR -�����ࣺCyberpipe.FieldOrderValidate property: [(null)] - -������������ѹ����-�̲߳����ֶ�˳����ʧ�� -�ֶ�:��ʼ�ܶ��߳��� -�ֶ�:��ֹ����߳��� -�ֶ�:��ֹ������� -�ֶ�:��ֹ�ܶ��߳��� -�ֶ�:������·���� -�ֶ�:Ȩ����λ���� -�ֶ�:��ע���� - - diff --git a/bin/x86/Debug/log/2016/201611/20161122.txt b/bin/x86/Debug/log/2016/201611/20161122.txt deleted file mode 100644 index e4c5e13..0000000 --- a/bin/x86/Debug/log/2016/201611/20161122.txt +++ /dev/null @@ -1,113 +0,0 @@ - - -��¼ʱ�䣺2016-11-22 14:24:28,896 -�߳�ID:[10] -��־���� ERROR -�����ࣺCyberpipe.MainFrm property: [(null)] - -����������Error - -System.InvalidOperationException: ������û���е� DataGridView �ؼ�����С�������������С� - �� System.Windows.Forms.DataGridViewRowCollection.AddInternal(Boolean newRow, Object[] values) - �� Cyberpipe.MainFrm.addRedLineDataToDataGridView(List`1 dt, DataGridView dataGridView) λ�� D:\GHFX\GHFX_REFACTOR\MainFrm.cs:�к� 7491 - �� Cyberpipe.MainFrm.buttonItemHX2_Click(Object sender, EventArgs e) λ�� D:\GHFX\GHFX_REFACTOR\MainFrm.cs:�к� 7473 - - -��¼ʱ�䣺2016-11-22 14:24:37,178 -�߳�ID:[10] -��־���� ERROR -�����ࣺCyberpipe.MainFrm property: [(null)] - -����������Error - -System.InvalidOperationException: ������û���е� DataGridView �ؼ�����С�������������С� - �� System.Windows.Forms.DataGridViewRowCollection.AddInternal(Boolean newRow, Object[] values) - �� Cyberpipe.MainFrm.addRedLineDataToDataGridView(List`1 dt, DataGridView dataGridView) λ�� D:\GHFX\GHFX_REFACTOR\MainFrm.cs:�к� 7491 - �� Cyberpipe.MainFrm.buttonItemHX2_Click(Object sender, EventArgs e) λ�� D:\GHFX\GHFX_REFACTOR\MainFrm.cs:�к� 7473 - - -��¼ʱ�䣺2016-11-22 14:24:43,641 -�߳�ID:[10] -��־���� ERROR -�����ࣺCyberpipe.MainFrm property: [(null)] - -����������Error - -System.InvalidOperationException: ������û���е� DataGridView �ؼ�����С�������������С� - �� System.Windows.Forms.DataGridViewRowCollection.AddInternal(Boolean newRow, Object[] values) - �� Cyberpipe.MainFrm.addRedLineDataToDataGridView(List`1 dt, DataGridView dataGridView) λ�� D:\GHFX\GHFX_REFACTOR\MainFrm.cs:�к� 7491 - �� Cyberpipe.MainFrm.buttonItemHX2_Click(Object sender, EventArgs e) λ�� D:\GHFX\GHFX_REFACTOR\MainFrm.cs:�к� 7473 - - -��¼ʱ�䣺2016-11-22 14:36:26,698 -�߳�ID:[9] -��־���� ERROR -�����ࣺCyberpipe.MainFrm property: [(null)] - -����������Error - -System.NullReferenceException: δ�������������õ������ʵ���� - �� Cyberpipe.MainFrm.addRedLineDataToDataGridView(List`1 dt, DataGridView dataGridView) λ�� D:\GHFX\GHFX_REFACTOR\MainFrm.cs:�к� 7504 - �� Cyberpipe.MainFrm.buttonItemHX2_Click(Object sender, EventArgs e) λ�� D:\GHFX\GHFX_REFACTOR\MainFrm.cs:�к� 7473 - - -��¼ʱ�䣺2016-11-22 14:46:24,990 -�߳�ID:[8] -��־���� ERROR -�����ࣺCyberpipe.MainFrm property: [(null)] - -����������Error - -System.NullReferenceException: δ�������������õ������ʵ���� - �� Cyberpipe.MainFrm.addRedLineDataToDataGridView(List`1 dt, DataGridView dataGridView) λ�� D:\GHFX\GHFX_REFACTOR\MainFrm.cs:�к� 7504 - �� Cyberpipe.MainFrm.buttonItemHX2_Click(Object sender, EventArgs e) λ�� D:\GHFX\GHFX_REFACTOR\MainFrm.cs:�к� 7473 - - -��¼ʱ�䣺2016-11-22 14:46:28,876 -�߳�ID:[8] -��־���� ERROR -�����ࣺCyberpipe.MainFrm property: [(null)] - -����������Error - -System.NullReferenceException: δ�������������õ������ʵ���� - �� Cyberpipe.MainFrm.addRedLineDataToDataGridView(List`1 dt, DataGridView dataGridView) λ�� D:\GHFX\GHFX_REFACTOR\MainFrm.cs:�к� 7504 - �� Cyberpipe.MainFrm.buttonItemHX2_Click(Object sender, EventArgs e) λ�� D:\GHFX\GHFX_REFACTOR\MainFrm.cs:�к� 7473 - - -��¼ʱ�䣺2016-11-22 14:49:25,642 -�߳�ID:[8] -��־���� ERROR -�����ࣺCyberpipe.MainFrm property: [(null)] - -����������Error - -System.NullReferenceException: δ�������������õ������ʵ���� - �� Cyberpipe.MainFrm.addRedLineDataToDataGridView(List`1 dt, DataGridView dataGridView) λ�� D:\GHFX\GHFX_REFACTOR\MainFrm.cs:�к� 7504 - �� Cyberpipe.MainFrm.buttonItemHX2_Click(Object sender, EventArgs e) λ�� D:\GHFX\GHFX_REFACTOR\MainFrm.cs:�к� 7473 - - -��¼ʱ�䣺2016-11-22 14:49:33,328 -�߳�ID:[8] -��־���� ERROR -�����ࣺCyberpipe.MainFrm property: [(null)] - -����������Error - -System.NullReferenceException: δ�������������õ������ʵ���� - �� Cyberpipe.MainFrm.addRedLineDataToDataGridView(List`1 dt, DataGridView dataGridView) λ�� D:\GHFX\GHFX_REFACTOR\MainFrm.cs:�к� 7504 - �� Cyberpipe.MainFrm.buttonItemHX2_Click(Object sender, EventArgs e) λ�� D:\GHFX\GHFX_REFACTOR\MainFrm.cs:�к� 7473 - - -��¼ʱ�䣺2016-11-22 15:18:04,198 -�߳�ID:[9] -��־���� ERROR -�����ࣺCyberpipe.MainFrm property: [(null)] - -����������Error - -System.NullReferenceException: δ�������������õ������ʵ���� - �� Cyberpipe.RedLineAnalysisTool.Anaylysis(GSOFeatures redLineFeatures, List`1 layerNames, GSOGlobeControl globe) λ�� D:\GHFX\GHFX_REFACTOR\RedLineAnalysisTool.cs:�к� 114 - �� Cyberpipe.MainFrm.buttonItemHX2_Click(Object sender, EventArgs e) λ�� D:\GHFX\GHFX_REFACTOR\MainFrm.cs:�к� 7469 - - -��¼ʱ�䣺2016-11-22 15:18:07,984 -�߳�ID:[9] -��־���� ERROR -�����ࣺCyberpipe.MainFrm property: [(null)] - -����������Error - -System.NullReferenceException: δ�������������õ������ʵ���� - �� Cyberpipe.RedLineAnalysisTool.Anaylysis(GSOFeatures redLineFeatures, List`1 layerNames, GSOGlobeControl globe) λ�� D:\GHFX\GHFX_REFACTOR\RedLineAnalysisTool.cs:�к� 114 - �� Cyberpipe.MainFrm.buttonItemHX2_Click(Object sender, EventArgs e) λ�� D:\GHFX\GHFX_REFACTOR\MainFrm.cs:�к� 7469 diff --git a/FeatureStatisticsService.cs b/FeatureStatisticsService.cs index 331ee47..b127fe3 100644 --- a/FeatureStatisticsService.cs +++ b/FeatureStatisticsService.cs @@ -190,7 +190,7 @@ List result = new List(); //layer.Name是表名 - string[] accessStrs = Utility.getAccStrsByLayer(layer.Name); + string[] accessStrs = FeatureTools.GetAccStrsByLayer(layer.Name); foreach (string accssname in accessStrs) { diff --git a/FeatureTools.cs b/FeatureTools.cs index be4b469..3c08f34 100644 --- a/FeatureTools.cs +++ b/FeatureTools.cs @@ -1,5 +1,6 @@ using System; using System.Collections.Generic; +using System.Data; using System.Linq; using System.Text; using System.Windows.Forms; @@ -43,7 +44,7 @@ } feature.Delete();//地球上删除该feature string sql = "delete from " + layerName + " where LSSYS_ID =" + feature.ID + " and (编号 is null or substr(编号,length(编号)-2)='TMP')"; - OledbHelper.sqlExecuteNonQuery(sql);//目前无法取到LSSYS_ID，所以这个判断条件不太合适，会导致把该类所有新建的都删除了 + OledbHelper.sqlExecuteNonQuery(sql); } catch (Exception) { @@ -106,5 +107,46 @@ } return value; } + + /// + /// 根据附属物图层名字得到里面含有的附属物 + /// + /// + /// + public static string[] GetAccStrsByLayer(string layername) + { + string[] accStrs = null; + string sql = "select 附属物名称 from " + layername + " group by 附属物名称"; + DataSet dataset = OledbHelper.getDataSet(sql, layername); + if (dataset == null) return null; + accStrs = new string[dataset.Tables[0].Rows.Count]; + for (int i = 0; i < dataset.Tables[0].Rows.Count; i++) + { + accStrs[i] = dataset.Tables[0].Rows[i][0].ToString(); + } + return accStrs; + } + + /// + /// 删除内存图层中指定名称的feature + /// + /// + /// + public static void RemoveFeatureFromName(GSOGlobeControl globeControl1, string featureName) + { + GSOFeatures features = globeControl1.Globe.MemoryLayer.GetFeatureByName(featureName, true); + if (features != null) + { + for (int i = features.Length - 1; i >= 0; i--) + { + GSOFeature feature = features[i]; + if (feature != null) + { + globeControl1.Globe.MemoryLayer.RemoveFeatureByID(feature.ID); + } + } + } + globeControl1.Refresh(); + } } } diff --git a/Forms/FrmPipelineModelDataBase.cs b/Forms/FrmPipelineModelDataBase.cs index b577fd8..bc1e479 100644 --- a/Forms/FrmPipelineModelDataBase.cs +++ b/Forms/FrmPipelineModelDataBase.cs @@ -149,7 +149,7 @@ catch (Exception ex) { LogError.PublishError(ex); - LogHelper.WriteLog(typeof(FrmPipelineModelDB), ex.Message); + LogHelper.Error(ex.Message); } } diff --git a/FrmAccessoriesSensor.cs b/FrmAccessoriesSensor.cs index 98aa1cf..542f19a 100644 --- a/FrmAccessoriesSensor.cs +++ b/FrmAccessoriesSensor.cs @@ -240,7 +240,7 @@ { if (clbPipeLine.CheckedItems.Count > 0) { - Utility.RemoveFeatureFromName(globeControl1, "trackPolygon"); + FeatureTools.RemoveFeatureFromName(globeControl1, "trackPolygon"); globeControl1.Globe.Action = EnumAction3D.TrackPolygon; globeControl1.TrackPolygonEndEvent += globeControl1_TrackPolygonEndEvent; } @@ -259,7 +259,7 @@ private void FrmAccessoriesgather_FormClosing(object sender, FormClosingEventArgs e) { frm = null; - Utility.RemoveFeatureFromName(globeControl1, "trackPolygon"); + FeatureTools.RemoveFeatureFromName(globeControl1, "trackPolygon"); globeControl1.Globe.Action = EnumAction3D.ActionNull; globeControl1.TrackPolygonEndEvent -= globeControl1_TrackPolygonEndEvent; } diff --git a/FrmAccessoriesgather.cs b/FrmAccessoriesgather.cs index e1d176e..c36273b 100644 --- a/FrmAccessoriesgather.cs +++ b/FrmAccessoriesgather.cs @@ -118,7 +118,7 @@ { if (clbPipeLine2.Text!="") { - Utility.RemoveFeatureFromName(globeControl1, "trackPolygon"); + FeatureTools.RemoveFeatureFromName(globeControl1, "trackPolygon"); globeControl1.Globe.Action = EnumAction3D.TrackPolygon; globeControl1.Globe.TrackPolygonTool.TrackMode = EnumTrackMode.SpaceTrack; globeControl1.TrackPolygonEndEvent += globeControl1_TrackPolygonEndEvent; @@ -295,7 +295,7 @@ private void FrmAccessoriesgather_FormClosing(object sender, FormClosingEventArgs e) { frm = null; - Utility.RemoveFeatureFromName(globeControl1, "trackPolygon"); + FeatureTools.RemoveFeatureFromName(globeControl1, "trackPolygon"); globeControl1.TrackPolygonEndEvent -= globeControl1_TrackPolygonEndEvent; globeControl1.Globe.Action = EnumAction3D.ActionNull; diff --git a/FrmAddWellShp.cs b/FrmAddWellShp.cs index 7983349..78d8946 100644 --- a/FrmAddWellShp.cs +++ b/FrmAddWellShp.cs @@ -100,7 +100,7 @@ catch (Exception ex) { LogError.PublishError(ex); - LogHelper.WriteLog(typeof(FrmAddWellShp), ex.Message); + LogHelper.Error(ex.Message); } } diff --git a/FrmBSQStatis.cs b/FrmBSQStatis.cs index 5b05926..b5e581d 100644 --- a/FrmBSQStatis.cs +++ b/FrmBSQStatis.cs @@ -97,7 +97,7 @@ } catch (Exception ex) { - LogHelper.WriteLog(typeof(FrmBSQStatis),ex.Message); + LogHelper.Error(ex.Message); } return typeAndCount; } @@ -108,7 +108,7 @@ GSOLayer layer = globeControl1.Globe.Layers.GetLayerByCaption("标识器"); GSOFeatures bsqFs = FeatureStatisticsService.GetLayerFeatures(polygon, layer); if (bsqFs == null || bsqFs.Length <= 0) { - LogHelper.WriteLog(typeof(FrmBSQStatis),"标识器图层下的Feature为空"); + LogHelper.Error("标识器图层下的Feature为空!"); return null; } diff --git a/FrmBasicQuery.cs b/FrmBasicQuery.cs index baeeade..cc8d3ff 100644 --- a/FrmBasicQuery.cs +++ b/FrmBasicQuery.cs @@ -224,7 +224,7 @@ } catch(Exception ex) { - LogHelper.WriteLog(typeof(FrmBasicQuery), ex.Message); + LogHelper.Error(ex.Message); } } else diff --git a/FrmCodingQuery.cs b/FrmCodingQuery.cs index f1ac322..d4ec095 100644 --- a/FrmCodingQuery.cs +++ b/FrmCodingQuery.cs @@ -82,7 +82,7 @@ } catch (Exception ex) { - LogHelper.WriteLog(typeof(FrmCodingQuery), ex.Message); ; + LogHelper.Error(ex.Message); } } diff --git a/FrmDiameterQuery.cs b/FrmDiameterQuery.cs index e7b3657..75d7949 100644 --- a/FrmDiameterQuery.cs +++ b/FrmDiameterQuery.cs @@ -150,7 +150,7 @@ catch (Exception ex) { //LogError.PublishError(ex); - LogHelper.WriteLog(typeof(FrmDiameterQuery), ex.Message); + LogHelper.Error(ex.Message); MessageBox.Show("请输入正确的管径范围！"); return; } diff --git a/FrmFittingQuery.cs b/FrmFittingQuery.cs index 12f6007..8645011 100644 --- a/FrmFittingQuery.cs +++ b/FrmFittingQuery.cs @@ -69,7 +69,7 @@ } catch (Exception ex) { - LogHelper.WriteLog(typeof(FrmFittingQuery), ex.Message); + LogHelper.Error(ex.Message); } } /// diff --git a/FrmKeywordQuery.cs b/FrmKeywordQuery.cs index 405524f..ede0a93 100644 --- a/FrmKeywordQuery.cs +++ b/FrmKeywordQuery.cs @@ -87,7 +87,7 @@ } catch (Exception ex) { - LogHelper.WriteLog(typeof(FrmKeywordQuery), ex.Message); + LogHelper.Error(ex.Message); } } diff --git a/FrmLogin.cs b/FrmLogin.cs index 1172c23..6fbaed9 100644 --- a/FrmLogin.cs +++ b/FrmLogin.cs @@ -2,6 +2,8 @@ using System.Data; using System.Data.OracleClient; using System.IO; +using System.Net; +using System.Text; using System.Windows.Forms; using System.Xml; using DevComponents.DotNetBar; @@ -10,16 +12,15 @@ { public partial class FrmLogin : Office2007Form { + + //登录界面 -- 配置文件的路径 + public static string filename = Application.StartupPath + "\\login.xml"; + + public FrmLogin() { InitializeComponent(); } - public string rolename = "浏览"; - public string username = ""; - public string department = ""; - - //登录界面 -- 配置文件的路径 - public static string filename = Application.StartupPath + "\\login.xml"; /// /// 登录按钮事件处理 /// @@ -28,9 +29,10 @@ private void button1_Click(object sender, EventArgs e) { bool result = ValidateUser(); +// bool result =ValidateFromUrl();//从平台获取用户角色信息，判断是否能登陆成功 if (result) { - username = txtUser.Text.Trim(); + WriteXml(); Utility.userName = txtUser.Text.Trim(); DialogResult = DialogResult.OK; Close(); @@ -43,80 +45,6 @@ } } /// - /// 关闭按钮事件处理 - /// - /// - /// - private void button2_Click(object sender, EventArgs e) - { - Close(); - } - /// - /// 验证端口号 - /// - /// - //private bool ValiPort() - //{ - // Ping p = new Ping();//创建Ping对象p - // PingReply pr = p.Send(Utility.localicenseserverip);//向指定IP或者主机名的计算机发送ICMP协议的ping数据包 - // if (pr.Status == IPStatus.Success)//如果ping成功 - // { - // try - // { - // TcpClient tcpc = new TcpClient(Utility.localicenseserverip, Utility.localicenseserverport);//对IP地址为"192.168.0.105"的计算机的1500端口提出连接申请 - // tcpc.Close(); - // return true; - // } - // catch (Exception ex) - // { - // LogError.PublishError(ex); - // MessageBox.Show("端口连接错误！" + ex.Message); - // return false; - // } - // } - // else - // { - // int times = 0;//重新连接次数; - // int count = 2;//设置尝试次数 - // while (times < count) - // { - // //Thread.Sleep(1000);//等待时间(方便测试的话，你可以改为1000) - // pr = p.Send(Utility.localicenseserverip); - - // if (pr.Status == IPStatus.Success) - // { - // try - // { - // TcpClient tcpc = new TcpClient(Utility.localicenseserverip, Utility.localicenseserverport);//对IP地址为"192.168.0.105"的计算机的1500端口提出连接申请 - // tcpc.Close(); - // return true; - // } - // catch (Exception ex) - // { - // LogError.PublishError(ex); - // MessageBox.Show("端口连接错误！" + ex.Message); - // return false; - // } - // } - // else - // { - // times++; - // if (times < count) - // { - // continue; - // } - // else - // { - // MessageBox.Show("重新尝试连接失败"); - // return false; - // } - // } - - // } - // return false; - // } - //} - /// /// 验证用户名、密码 /// /// @@ -126,24 +54,64 @@ string sql = "select * from casic_userinfotest where USERNAME='" + txtUser.Text.Trim() + "' and PASSWORD='" + passWord + "' and sysname='GHFX' "; DataTable dt = OledbHelper.QueryTable(sql); - if (dt != null && dt.Rows.Count > 0) + if (dt == null || dt.Rows.Count <= 0) return false; + if (String.IsNullOrEmpty(dt.Rows[0]["rid"].ToString())) return true; + sql = "select gid from casic_userroletest where id=" + dt.Rows[0]["rid"] + " and sysname='GHFX' "; + using (OracleDataReader reader = OracleUtils.ExecuteReader(OracleUtils.ConnectionString, CommandType.Text, sql)) { - WriteXML(); - if (!String.IsNullOrEmpty(dt.Rows[0]["rid"].ToString())) + while (reader.Read()) { - sql = "select gid from casic_userroletest where id=" + dt.Rows[0]["rid"] + " and sysname='GHFX' "; - using (OracleDataReader reader = OracleUtils.ExecuteReader(OracleUtils.ConnectionString, CommandType.Text, sql)) - { - while (reader.Read()) - { - Utility.userRole = reader[0].ToString(); - break; - } - } + Utility.userRole = reader[0].ToString(); + LogHelper.Debug("测试一下"); + break; } - return true; } - return false; + return true; + } + + + + private bool ValidateFromUrl() + { + string user = txtUser.Text.Trim(); + string pwd = textBoxPassWord.Text.Trim(); + //做成配置的 + string roleserver = Utility.RoleServer; + if (roleserver == null || roleserver.Trim().Equals("")) + { + MessageBox.Show("请在Config.xml中配置roleurl！"); + return false; + } + HttpWebRequest request = + WebRequest.Create(roleserver+"/rs/authority/user?username=" + user + "&password=" + pwd + "&appId=21") as HttpWebRequest; + if (request == null) return false; + using (HttpWebResponse response = request.GetResponse() as HttpWebResponse) + { + try + { + if (response == null || response.GetResponseStream() == null) return false; + StreamReader reader = new StreamReader(response.GetResponseStream()); + string[] result = reader.ReadToEnd().Split(','); + //解析result + if (result.Length < 5) return false; + StringBuilder userRole = new StringBuilder(""); + for (int i = 4; i < result.Length; i++) + { + string[] tmpStrings = result[i].Split('_'); + if (tmpStrings.Length < 2) continue; + userRole.Append(tmpStrings[1].Trim() + ","); + } + if (userRole.Length < 3) return false; + userRole.Remove(userRole.Length - 3, 3); + // MessageBox.Show(userRole.ToString()); + Utility.userRole = userRole.ToString(); + return Utility.userRole != null && !Utility.userRole.Equals("null"); + } + catch (Exception e) + { + return false; + } + } } private void FrmLogin_Load(object sender, EventArgs e) @@ -153,74 +121,56 @@ StartPosition = FormStartPosition.CenterScreen; - ReadXML(); + ReadXml(); } /// /// 读取上一次登录的用户名和密码 /// - private void ReadXML() + private void ReadXml() { - if (File.Exists(filename)) + if (!File.Exists(filename)) return; + //初始化XML文档操作类 + XmlDocument myDoc = new XmlDocument(); { - if (!File.Exists(filename)) + //加载XML文件 + try { + myDoc.Load(filename); + } + catch (Exception e) + { + LogError.PublishError(e); return; } - - //初始化XML文档操作类 - XmlDocument myDoc = new XmlDocument(); + //搜索指定的节点 + XmlNode serverRootNode = myDoc.SelectSingleNode("Params"); + XmlNodeList nodes = null; + if (serverRootNode != null) { - //加载XML文件 - try + nodes = serverRootNode.ChildNodes; + } + if (nodes == null) return; + foreach (XmlNode xn in nodes) + { + if (xn.Name.Equals("username")) { - myDoc.Load(filename); + txtUser.Text = xn.InnerText.Trim(); } - catch (Exception e) + else if (xn.Name.Equals("password")) { - LogError.PublishError(e); - return; + textBoxPassWord.Text = xn.InnerText.Trim(); } - //搜索指定的节点 - XmlNode serverRootNode = myDoc.SelectSingleNode("Params"); - XmlNodeList nodes = null; - if (serverRootNode != null) + else if (xn.Name.Equals("isremember")) { - nodes = serverRootNode.ChildNodes; - } - if (nodes != null) - { - foreach (XmlNode xn in nodes) - { - if (xn.Name == "username") - { - txtUser.Text = xn.InnerText.Trim(); - } - else if (xn.Name == "password") - { - textBoxPassWord.Text = xn.InnerText.Trim(); - } - else if (xn.Name == "isremember") - { - if (xn.InnerText.Trim() == "true") - { - checkBoxXRememberPassword.Checked = true; - } - else if (xn.InnerText.Trim() == "false") - { - checkBoxXRememberPassword.Checked = false; - } - } - } - + checkBoxXRememberPassword.Checked = xn.InnerText.Trim().Equals("true"); } } } - } /// /// 记录登录的用户名和密码 /// - private void WriteXML() + private void WriteXml() { if (!File.Exists(filename)) { @@ -252,31 +202,17 @@ foreach (XmlNode xn in nodes) { XmlElement xe = (XmlElement)xn; - if (xe.Name == "username") + if (xe.Name.Equals("username")) { xe.InnerText = txtUser.Text.Trim(); } - else if (xe.Name == "password") + else if (xe.Name.Equals("password")) { - if (checkBoxXRememberPassword.Checked) - { - xe.InnerText = textBoxPassWord.Text.Trim(); - } - else - { - xe.InnerText = ""; - } + xe.InnerText = checkBoxXRememberPassword.Checked ? textBoxPassWord.Text.Trim() : ""; } - else if (xe.Name == "isremember") + else if (xe.Name.Equals("isremember")) { - if (checkBoxXRememberPassword.Checked) - { - xe.InnerText = "true"; - } - else - { - xe.InnerText = "false"; - } + xe.InnerText = checkBoxXRememberPassword.Checked ? "true" : "false"; } } } diff --git a/FrmMaterialSel.cs b/FrmMaterialSel.cs index 8645ab3..d23f385 100644 --- a/FrmMaterialSel.cs +++ b/FrmMaterialSel.cs @@ -157,7 +157,7 @@ } catch (Exception ex) { - LogHelper.WriteLog(typeof(FrmMaterialSel), ex.Message); + LogHelper.Error(ex.Message); } } diff --git a/FrmMetadataStat.cs b/FrmMetadataStat.cs index c3c1359..96029a6 100644 --- a/FrmMetadataStat.cs +++ b/FrmMetadataStat.cs @@ -96,7 +96,7 @@ //统计有多少个图层 private int statistLayer() { - List datasrcs = Utility.layerConfig.datasrcs; + List datasrcs = Utility.LayerConfig.datasrcs; return datasrcs.SelectMany(datasrc => datasrc.layertypes).Sum(layerType => layerType.layers.Count); } diff --git a/FrmpipeDeepstatis.cs b/FrmpipeDeepstatis.cs index 6a5c895..8d915a9 100644 --- a/FrmpipeDeepstatis.cs +++ b/FrmpipeDeepstatis.cs @@ -2,6 +2,7 @@ using System.Collections.Generic; using System.Diagnostics; using System.IO; +using System.Reflection; using System.Text; using System.Windows.Forms; using System.Windows.Forms.DataVisualization.Charting; @@ -320,7 +321,7 @@ MessageBox.Show("请添加分段"); return; } - Utility.RemoveFeatureFromName(globeControl1, "trackPolygon"); + FeatureTools.RemoveFeatureFromName(globeControl1, "trackPolygon"); globeControl1.Globe.Action = EnumAction3D.TrackPolygon; globeControl1.Globe.TrackPolygonTool.TrackMode = EnumTrackMode.SpaceTrack; globeControl1.TrackPolygonEndEvent += globeControl1_TrackPolygonEndEvent; @@ -408,12 +409,11 @@ TextBox control; private void dataGridViewX2_EditingControlShowing(object sender, DataGridViewEditingControlShowingEventArgs e) { - if (e.Control.GetType().BaseType.Name == "TextBox") - { - control = new TextBox(); - control = (TextBox)e.Control; - control.KeyPress += control_KeyPress; - } + MemberInfo memberInfo = e.Control.GetType().BaseType; + if (memberInfo != null && !memberInfo.Name.Equals("TextBox")) return; + control = new TextBox(); + control = (TextBox)e.Control; + control.KeyPress += control_KeyPress; } /// /// 键盘按键按下事件处理 @@ -423,28 +423,24 @@ void control_KeyPress(object sender, KeyPressEventArgs e) { TextBox text = sender as TextBox; + if (text == null) return; if ((e.KeyChar < 48 || e.KeyChar > 57) && (e.KeyChar != 8) && e.KeyChar != 46) { e.Handled = true; } - if (e.KeyChar == 46) //小数点 + if (e.KeyChar != 46) return; + if (text.Text.Length <= 0) + e.Handled = true; //小数点不能在第一位 + else //处理不规则的小数点 { - if (text.Text.Length <= 0) - e.Handled = true; //小数点不能在第一位 - else //处理不规则的小数点 + float f; + float oldf; + bool b1 = false, b2 = false; + b1 = float.TryParse(text.Text, out oldf); + b2 = float.TryParse(text.Text + e.KeyChar, out f); + if (!b2) { - float f; - float oldf; - bool b1 = false, b2 = false; - b1 = float.TryParse(text.Text, out oldf); - b2 = float.TryParse(text.Text + e.KeyChar, out f); - if (b2 == false) - { - if (b1) - e.Handled = true; - else - e.Handled = false; - } + e.Handled = b1; } } } @@ -457,7 +453,7 @@ { frm = null; - Utility.RemoveFeatureFromName(globeControl1, "trackPolygon"); + FeatureTools.RemoveFeatureFromName(globeControl1, "trackPolygon"); globeControl1.TrackPolygonEndEvent -= globeControl1_TrackPolygonEndEvent; globeControl1.Globe.Action = EnumAction3D.ActionNull; diff --git a/FrmpipeDiametergather.cs b/FrmpipeDiametergather.cs index a9d96fa..c09aaf1 100644 --- a/FrmpipeDiametergather.cs +++ b/FrmpipeDiametergather.cs @@ -154,7 +154,7 @@ MessageBox.Show("请选择图层！"); return; } - Utility.RemoveFeatureFromName(globeControl1, "trackPolygon"); + FeatureTools.RemoveFeatureFromName(globeControl1, "trackPolygon"); globeControl1.Globe.Action = EnumAction3D.TrackPolygon; globeControl1.Globe.TrackPolygonTool.TrackMode = EnumTrackMode.SpaceTrack; globeControl1.TrackPolygonEndEvent += globeControl1_TrackPolygonEndEvent; @@ -392,7 +392,7 @@ private void FrmpipeDiametergather_FormClosing(object sender, FormClosingEventArgs e) { frm = null; - Utility.RemoveFeatureFromName(globeControl1, "trackPolygon"); + FeatureTools.RemoveFeatureFromName(globeControl1, "trackPolygon"); globeControl1.TrackPolygonEndEvent -= globeControl1_TrackPolygonEndEvent; globeControl1.Globe.Action = EnumAction3D.ActionNull; diff --git a/FrmpipeMaterialGather.cs b/FrmpipeMaterialGather.cs index 44e7f24..5ca8144 100644 --- a/FrmpipeMaterialGather.cs +++ b/FrmpipeMaterialGather.cs @@ -58,10 +58,9 @@ for (int i = 0; i < pipeLayerNames.Count; i++) { clbPipeLine.Items.Add(pipeLayerNames[i]); - GSOLayer layer = globeControl1.Globe.Layers.GetLayerByCaption(pipeLayerNames[i]); - if (layer.Dataset == null || !layer.Dataset.IsFeatureDataset || layer.Type != EnumLayerType.FeatureLayer) continue; + GSOLayer layer = globeControl1.Globe.Layers.GetLayerByCaption(pipeLayerNames[i]); + if (layer == null || layer.Dataset == null || !layer.Dataset.IsFeatureDataset || layer.Type != EnumLayerType.FeatureLayer) continue; - string name = layer.Name; GSOFeatureLayer flayer = layer as GSOFeatureLayer; GSOFeatures feats = flayer.GetAllFeatures(); @@ -205,7 +204,7 @@ { chart1.Series.Add(clbPipeLine.CheckedItems[i].ToString()); GSOLayer layer = globeControl1.Globe.Layers.GetLayerByCaption(clbPipeLine.CheckedItems[i].ToString()); - if (layer != null && layer is GSOFeatureLayer) + if (layer is GSOFeatureLayer) { GSOFeatureLayer flayer = layer as GSOFeatureLayer; GSOFeatures features = flayer.GetAllFeatures(); @@ -240,10 +239,9 @@ labeStyleAxisX.Enabled = true; chart1.ChartAreas["ChartArea1"].AxisX.LabelStyle = labeStyleAxisX; - Dictionary dic1 = new Dictionary(); for (int j = 0; j < chart1.Series.Count; j++) { - dic1 = new Dictionary(); + Dictionary dic1 = new Dictionary(); foreach (string key in dic.Keys) { if (key.Contains(chart1.Series[j].Name)) @@ -304,7 +302,7 @@ MessageBox.Show("请选择材质类型！"); return; } - Utility.RemoveFeatureFromName(globeControl1, "trackPolygon"); + FeatureTools.RemoveFeatureFromName(globeControl1, "trackPolygon"); globeControl1.Globe.Action = EnumAction3D.TrackPolygon; globeControl1.Globe.TrackPolygonTool.TrackMode = EnumTrackMode.SpaceTrack; globeControl1.TrackPolygonEndEvent += globeControl1_TrackPolygonEndEvent; @@ -318,7 +316,7 @@ private void FrmpipeMaterialGather_FormClosing(object sender, FormClosingEventArgs e) { frm = null; - Utility.RemoveFeatureFromName(globeControl1, "trackPolygon"); + FeatureTools.RemoveFeatureFromName(globeControl1, "trackPolygon"); globeControl1.TrackPolygonEndEvent -= globeControl1_TrackPolygonEndEvent; globeControl1.Globe.Action = EnumAction3D.ActionNull; diff --git a/Frmpipediameterstatis.cs b/Frmpipediameterstatis.cs index 4fb25a8..631a996 100644 --- a/Frmpipediameterstatis.cs +++ b/Frmpipediameterstatis.cs @@ -202,8 +202,8 @@ } catch (Exception ex) { - LogHelper.WriteLog(typeof(Frmpipediameterstatis), ex.Message); //MessageBox.Show(ex.Message); + LogHelper.Error(ex.Message); LogError.PublishError(ex); } } @@ -372,7 +372,7 @@ MessageBox.Show("请添加分段！"); return; } - Utility.RemoveFeatureFromName(globeControl1, "trackPolygon"); + FeatureTools.RemoveFeatureFromName(globeControl1, "trackPolygon"); globeControl1.Globe.Action = EnumAction3D.TrackPolygon; globeControl1.Globe.TrackPolygonTool.TrackMode = EnumTrackMode.SpaceTrack; globeControl1.TrackPolygonEndEvent += globeControl1_TrackPolygonEndEvent; @@ -422,7 +422,7 @@ globeControl1.Globe.Action = EnumAction3D.ActionNull; globeControl1.TrackPolygonEndEvent -= globeControl1_TrackPolygonEndEvent; - Utility.RemoveFeatureFromName(globeControl1, "trackPolygon"); + FeatureTools.RemoveFeatureFromName(globeControl1, "trackPolygon"); globeControl1.Globe.MemoryLayer.RemoveAllFeature(); } diff --git a/LineBuilder.cs b/LineBuilder.cs index 33a216c..b6a8516 100644 --- a/LineBuilder.cs +++ b/LineBuilder.cs @@ -43,8 +43,8 @@ GSOGeoPolyline3D lineeee = f.Geometry as GSOGeoPolyline3D; if (lineeee == null || lineeee.GetSpaceLength(true, 6378137) == 0) { - LogHelper.WriteLog(typeof(LineBuilder), "出现数据无法入库:"+f.ID); - continue; //TODO LIST:判断是否会出现部署数据无法入库情况,Log2Net + LogHelper.Error("出现数据无法入库:" + f.ID); + continue; } GSOFeature newFeature = newFeatureSet.CreateFeature(); diff --git a/LogHelper.cs b/LogHelper.cs index 9ef5f27..04573cf 100644 --- a/LogHelper.cs +++ b/LogHelper.cs @@ -1,4 +1,5 @@ using System; +using System.Diagnostics; using log4net; using log4net.Config; @@ -7,35 +8,82 @@ { public class LogHelper { - /// - /// 输出日志到Log4Net - /// - /// - /// - #region static void WriteLog(Type t, Exception ex) - public static void WriteLog(Type t, Exception ex) + private static ILog _logdebug = log4net.LogManager.GetLogger("logdebug"); + private static ILog _loginfo = log4net.LogManager.GetLogger("loginfo"); + private static ILog _logwarn = log4net.LogManager.GetLogger("logwarn"); + private static ILog _logerror = log4net.LogManager.GetLogger("logerror"); + private static ILog _logfatal = log4net.LogManager.GetLogger("logfatal"); + + public static void Debug(string msg) { - ILog log = log4net.LogManager.GetLogger(t); - log.Error("Error", ex); + StackFrame sf = new StackFrame(1); + msg = string.Format("{0}.{1}:{2}", sf.GetMethod().ReflectedType.FullName, sf.GetMethod().Name, msg); + _logdebug.Debug(msg); + } + public static void Debug(string msg, Exception e) + { + StackFrame sf = new StackFrame(1); + msg = string.Format("{0}.{1}:{2}", sf.GetMethod().ReflectedType.FullName, sf.GetMethod().Name, msg); + _logdebug.Debug(msg, e); } - #endregion - /// - /// 输出日志到Log4Net - /// - /// - /// - #region static void WriteLog(Type t, string msg) - - public static void WriteLog(Type t, string msg) + public static void Info(string msg) { - ILog log = log4net.LogManager.GetLogger(t); - log.Error(msg); + StackFrame sf = new StackFrame(1); + msg = string.Format("{0}.{1}:{2}", sf.GetMethod().ReflectedType.FullName, sf.GetMethod().Name, msg); + _loginfo.Info(msg); + } + public static void Info(string msg, Exception e) + { + StackFrame sf = new StackFrame(1); + msg = string.Format("{0}.{1}:{2}", sf.GetMethod().ReflectedType.FullName, sf.GetMethod().Name, msg); + _loginfo.Info(msg, e); } - #endregion + + public static void Warn(string msg) + { + StackFrame sf = new StackFrame(1); + msg = string.Format("{0}.{1}:{2}", sf.GetMethod().ReflectedType.FullName, sf.GetMethod().Name, msg); + _logwarn.Warn(msg); + } + public static void Warn(string msg, Exception e) + { + StackFrame sf = new StackFrame(1); + msg = string.Format("{0}.{1}:{2}", sf.GetMethod().ReflectedType.FullName, sf.GetMethod().Name, msg); + _logwarn.Warn(msg, e); + } + + + public static void Error(string msg) + { + StackFrame sf = new StackFrame(1); + msg = string.Format("{0}.{1}:{2}", sf.GetMethod().ReflectedType.FullName, sf.GetMethod().Name, msg); + _logerror.Error(msg); + } + public static void Error(string msg, Exception e) + { + StackFrame sf = new StackFrame(1); + msg = string.Format("{0}.{1}:{2}", sf.GetMethod().ReflectedType.FullName, sf.GetMethod().Name, msg); + _logerror.Error(msg, e); + } + + + public static void Fatal(string msg) + { + StackFrame sf = new StackFrame(1); + msg = string.Format("{0}.{1}:{2}", sf.GetMethod().ReflectedType.FullName, sf.GetMethod().Name, msg); + _logfatal.Fatal(msg); + } + public static void Fatal(string msg, Exception e) + { + StackFrame sf = new StackFrame(1); + msg = string.Format("{0}.{1}:{2}", sf.GetMethod().ReflectedType.FullName, sf.GetMethod().Name, msg); + _logfatal.Fatal(msg, e); + } + } diff --git a/MainFrm.cs b/MainFrm.cs index 43de664..51f362a 100644 --- a/MainFrm.cs +++ b/MainFrm.cs @@ -18,7 +18,6 @@ using GeoScene.Data; using GeoScene.Engine; using GeoScene.Globe; -using Timer = System.Windows.Forms.Timer; using ToolTip = System.Windows.Forms.ToolTip; namespace Cyberpipe @@ -163,6 +162,7 @@ /// private void AddGZ() { + lendendGZ50 = new GSOHudButton(); lendendGZ50.SetImage(Application.StartupPath + "/Resource/管纵/50.png"); lendendGZ50.SetOffset(0, 0); @@ -1294,18 +1294,19 @@ private void MainFrm_Load(object sender, EventArgs e) { + layerTree.Nodes.Add("正在加载，请稍后……");//树状图加载在图层加载之后，故增加提示 initGlobalControl(); - //initGlobalMap(); - //initLayerTree(); initMarkerTree(); initLayout(); loadData(); - double x = Convert.ToDouble(Utility.Query_Roads["定位"].ToString().Split(',')[0]); - double y = Convert.ToDouble(Utility.Query_Roads["定位"].ToString().Split(',')[1]); - double z = Convert.ToDouble(Utility.Query_Roads["定位"].ToString().Split(',')[2]); + + double x = Convert.ToDouble(Utility.Query_Roads["绿岛"].ToString().Split(',')[0]); + double y = Convert.ToDouble(Utility.Query_Roads["绿岛"].ToString().Split(',')[1]); + double z = Convert.ToDouble(Utility.Query_Roads["绿岛"].ToString().Split(',')[2]); jumpToCameraState(x, y, z); + } #endregion @@ -1315,11 +1316,17 @@ if (e.Layer == null || !e.Layer.Caption.Equals(Utility.roadLayerName)) return; foreach (TreeNode layerTreeNode in layerTree.Nodes) { - foreach (TreeNode node in layerTreeNode.Nodes) + for (int i=0;i dt, DataGridView dataGridView) @@ -7330,7 +7337,7 @@ } catch (Exception ex) { - LogHelper.WriteLog(typeof(MainFrm), ex); + LogHelper.Debug("", ex); } } } @@ -7362,7 +7369,7 @@ GSOLayer layer = globeControl1.Globe.Layers.Add(strDataPath); if (layer == null) {//wxl - LogHelper.WriteLog(typeof(MainFrm), "buttonItemHX1_Click操作中，" + strDataPath + "的layer为空"); + LogHelper.Error("buttonItemHX1_Click操作中，" + strDataPath + "的layer为空"); continue; } GSOFeatures redFeatures = layer.GetAllFeatures(); @@ -7457,17 +7464,12 @@ { try { + globeControl1.BeforeSceneRenderEvent -= globeControl1_BeforeSceneRenderEvent; globeControl2.BeforeSceneRenderEvent -= globeControl2_BeforeSceneRenderEvent; - double x = Convert.ToDouble(Utility.Query_Roads["定位"].ToString().Split(',')[0]); - double y = Convert.ToDouble(Utility.Query_Roads["定位"].ToString().Split(',')[1]); - double z = Convert.ToDouble(Utility.Query_Roads["定位"].ToString().Split(',')[2]); - jumpToCameraState(x, y, z); - /* globeControl1.Globe.FlyToPosition(new GSOPoint3d(120.610963, 31.188121, 50), EnumAltitudeMode.Absolute, -4, 50, 800); globeControl1.Globe.FlyToPointSpeed = 10000000; - * */ globeControl1.Globe.Action = EnumAction3D.SelectObject; globeControl1.Refresh(); @@ -7489,6 +7491,37 @@ } } /// + /// 基础工具 + /// + /// + /// + private void ribbonTabItem1_MouseDown(object sender, MouseEventArgs e) + { + try + { + + globeControl1.BeforeSceneRenderEvent -= globeControl1_BeforeSceneRenderEvent; + globeControl2.BeforeSceneRenderEvent -= globeControl2_BeforeSceneRenderEvent; + + globeControl1.Globe.Action = EnumAction3D.ActionNull; + dataGridViewX1.AutoSizeColumnsMode = DataGridViewAutoSizeColumnsMode.AllCells; + //zhanshi = false; + redSH = false; + splitContainer1.Panel2Collapsed = true; + panelOfTable.Visible = false; + legendSC.Visible = false; + legendSG.Visible = false; + ClearGZData(); + GSOLayer redLayer = globeControl1.Globe.Layers.GetLayerByCaption("红线"); + if (redLayer == null) return; + redLayer.Visible = false; + } + catch (Exception ex) + { + //MessageBox.Show("系统运行错误:" + ex.ToString(), "错误", MessageBoxButtons.OK, MessageBoxIcon.Error); + } + } + /// /// 一键审核 /// /// @@ -7497,6 +7530,7 @@ { try { + globeControl1.BeforeSceneRenderEvent -= globeControl1_BeforeSceneRenderEvent; globeControl2.BeforeSceneRenderEvent -= globeControl2_BeforeSceneRenderEvent; @@ -7518,32 +7552,7 @@ //MessageBox.Show("系统运行错误:" + ex.ToString(), "错误", MessageBoxButtons.OK, MessageBoxIcon.Error); } } - - void ResetRibbonTab() - { - try - { - globeControl1.BeforeSceneRenderEvent -= globeControl1_BeforeSceneRenderEvent; - globeControl2.BeforeSceneRenderEvent -= globeControl2_BeforeSceneRenderEvent; - - globeControl1.Globe.Action = EnumAction3D.ActionNull; - dataGridViewX1.AutoSizeColumnsMode = DataGridViewAutoSizeColumnsMode.AllCells; - //zhanshi = false; - redSH = false; - splitContainer1.Panel2Collapsed = true; - panelOfTable.Visible = false; - legendSC.Visible = false; - legendSG.Visible = false; - ClearGZData(); - GSOLayer redLayer = globeControl1.Globe.Layers.GetLayerByCaption("红线"); - if (redLayer == null) return; - redLayer.Visible = false; - } - catch (Exception ex) - { - LogHelper.WriteLog(typeof(MainFrm), ex); - } - } + /// /// 双屏对比 /// @@ -7553,8 +7562,8 @@ { try { - globeControl1.BeforeSceneRenderEvent += new BeforeSceneRenderEventHandler(globeControl1_BeforeSceneRenderEvent); - globeControl2.BeforeSceneRenderEvent += new BeforeSceneRenderEventHandler(globeControl2_BeforeSceneRenderEvent); + globeControl1.BeforeSceneRenderEvent += globeControl1_BeforeSceneRenderEvent; + globeControl2.BeforeSceneRenderEvent += globeControl2_BeforeSceneRenderEvent; globeControl1.Globe.Action = EnumAction3D.ActionNull; panelOfTable.Visible = false; @@ -7570,32 +7579,43 @@ GSOLayer redLayer = globeControl1.Globe.Layers.GetLayerByCaption("红线"); if (redLayer != null) - { redLayer.Visible = false; - } } catch (Exception ex) { - LogHelper.WriteLog(typeof(MainFrm), ex); + //MessageBox.Show("系统运行错误:" + ex.ToString(), "错误", MessageBoxButtons.OK, MessageBoxIcon.Error); } } /// - /// 基础工具 - /// - /// - /// - private void ribbonTabItem1_MouseDown(object sender, MouseEventArgs e) - { - ResetRibbonTab(); - } - /// /// 文档管理 /// /// /// private void ribbonTabItem4_MouseDown(object sender, MouseEventArgs e) { - ResetRibbonTab(); + try + { + + globeControl1.BeforeSceneRenderEvent -= globeControl1_BeforeSceneRenderEvent; + globeControl2.BeforeSceneRenderEvent -= globeControl2_BeforeSceneRenderEvent; + + globeControl1.Globe.Action = EnumAction3D.ActionNull; + panelOfTable.Visible = false; + //zhanshi = false; + redSH = false; + splitContainer1.Panel2Collapsed = true; + dataGridViewX1.AutoSizeColumnsMode = DataGridViewAutoSizeColumnsMode.AllCells; + legendSC.Visible = false; + legendSG.Visible = false; + ClearGZData(); + GSOLayer redLayer = globeControl1.Globe.Layers.GetLayerByCaption("红线"); + if (redLayer != null) + redLayer.Visible = false; + } + catch (Exception ex) + { + //MessageBox.Show("系统运行错误:" + ex.ToString(), "错误", MessageBoxButtons.OK, MessageBoxIcon.Error); + } } /// /// 基础管理 @@ -7604,7 +7624,29 @@ /// private void ribbonTabItem14_MouseDown(object sender, MouseEventArgs e) { - ResetRibbonTab(); + try + { + globeControl1.BeforeSceneRenderEvent -= globeControl1_BeforeSceneRenderEvent; + globeControl2.BeforeSceneRenderEvent -= globeControl2_BeforeSceneRenderEvent; + + globeControl1.Globe.Action = EnumAction3D.ActionNull; + panelOfTable.Visible = false; + //zhanshi = false; + redSH = false; + splitContainer1.Panel2Collapsed = true; + dataGridViewX1.AutoSizeColumnsMode = DataGridViewAutoSizeColumnsMode.AllCells; + legendSC.Visible = false; + legendSG.Visible = false; + ClearGZData(); + + GSOLayer redLayer = globeControl1.Globe.Layers.GetLayerByCaption("红线"); + if (redLayer != null) + redLayer.Visible = false; + } + catch (Exception ex) + { + //MessageBox.Show("系统运行错误:" + ex.ToString(), "错误", MessageBoxButtons.OK, MessageBoxIcon.Error); + } } /// /// 权限管理 @@ -7613,26 +7655,31 @@ /// private void ribbonTabItem2_MouseDown(object sender, MouseEventArgs e) { - ResetRibbonTab(); + try + { + globeControl1.BeforeSceneRenderEvent -= globeControl1_BeforeSceneRenderEvent; + globeControl2.BeforeSceneRenderEvent -= globeControl2_BeforeSceneRenderEvent; + + globeControl1.Globe.Action = EnumAction3D.ActionNull; + panelOfTable.Visible = false; + //zhanshi = false; + redSH = false; + splitContainer1.Panel2Collapsed = true; + dataGridViewX1.AutoSizeColumnsMode = DataGridViewAutoSizeColumnsMode.AllCells; + legendSC.Visible = false; + legendSG.Visible = false; + ClearGZData(); + + GSOLayer redLayer = globeControl1.Globe.Layers.GetLayerByCaption("红线"); + if (redLayer == null) return; + redLayer.Visible = false; + } + catch (Exception ex) + { + //MessageBox.Show("系统运行错误:" + ex.ToString(), "错误", MessageBoxButtons.OK, MessageBoxIcon.Error); + } } - /// - /// 管线定位 - /// - /// - /// - private void ribbonTabItem7_MouseDown(object sender, MouseEventArgs e) - { - ResetRibbonTab(); - } - /// - /// 标识器管理 - /// - /// - /// - private void ribbonTabItem5_MouseDown(object sender, MouseEventArgs e) - { - ResetRibbonTab(); - } + //GSOFeature dpFeatuer = null; /// /// 双屏分析，点击管段分析 @@ -8017,7 +8064,9 @@ private void btn_flag_Click(object sender, EventArgs e) { if (FrmFlagManagers.IS_OPEN) + { return; + } FrmFlagManagers frm = new FrmFlagManagers(globeControl1); frm.Show(this); } diff --git a/MainFrm.designer.cs b/MainFrm.designer.cs index e3dca41..73398c0 100644 --- a/MainFrm.designer.cs +++ b/MainFrm.designer.cs @@ -4,6 +4,7 @@ using DevComponents.DotNetBar; using DevComponents.DotNetBar.Controls; using DevComponents.Editors; +using System.Drawing; namespace Cyberpipe { @@ -89,6 +90,7 @@ this.sideBar1 = new DevComponents.DotNetBar.SideBar(); this.panelEx3 = new DevComponents.DotNetBar.PanelEx(); this.layerSensorTree = new System.Windows.Forms.TreeView(); + this.layerTree = new Cyberpipe.MyTreeView(); this.sideBarPanelItem3 = new DevComponents.DotNetBar.SideBarPanelItem(); this.controlContainerItem3 = new DevComponents.DotNetBar.ControlContainerItem(); this.sideBarPanelItem4 = new DevComponents.DotNetBar.SideBarPanelItem(); @@ -243,42 +245,18 @@ this.保存ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.定位ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.ribbonControl1 = new DevComponents.DotNetBar.RibbonControl(); - this.ribbonPanel6 = new DevComponents.DotNetBar.RibbonPanel(); - this.ribbonBar6 = new DevComponents.DotNetBar.RibbonBar(); - this.buttonItemSPSZ = new DevComponents.DotNetBar.ButtonItem(); - this.buttonItem8 = new DevComponents.DotNetBar.ButtonItem(); - this.buttonItemLocation = new DevComponents.DotNetBar.ButtonItem(); - this.sliderItem2 = new DevComponents.DotNetBar.SliderItem(); - this.buttonItemGBJC = new DevComponents.DotNetBar.ButtonItem(); - this.ribbonPanel5 = new DevComponents.DotNetBar.RibbonPanel(); - this.ribbonBar2 = new DevComponents.DotNetBar.RibbonBar(); - this.buttonItemHX1 = new DevComponents.DotNetBar.ButtonItem(); - this.buttonItemHX2 = new DevComponents.DotNetBar.ButtonItem(); - this.buttonItemDCTP = new DevComponents.DotNetBar.ButtonItem(); - this.sliderItem3 = new DevComponents.DotNetBar.SliderItem(); - this.ribbonPanel1 = new DevComponents.DotNetBar.RibbonPanel(); - this.ribbonBar21 = new DevComponents.DotNetBar.RibbonBar(); - this.buttonItem87 = new DevComponents.DotNetBar.ButtonItem(); - this.buttonItem88 = new DevComponents.DotNetBar.ButtonItem(); - this.buttonItem27 = new DevComponents.DotNetBar.ButtonItem(); - this.buttonItem91 = new DevComponents.DotNetBar.ButtonItem(); - this.buttonItem1 = new DevComponents.DotNetBar.ButtonItem(); - this.btnlegendSet = new DevComponents.DotNetBar.ButtonItem(); - this.buttonItem89 = new DevComponents.DotNetBar.ButtonItem(); - this.btnOutputJPG = new DevComponents.DotNetBar.ButtonItem(); - this.ribbonPanel12 = new DevComponents.DotNetBar.RibbonPanel(); - this.ribbonBar18 = new DevComponents.DotNetBar.RibbonBar(); - this.buttonItem133 = new DevComponents.DotNetBar.ButtonItem(); - this.ribbonBar13 = new DevComponents.DotNetBar.RibbonBar(); - this.buttonItem127 = new DevComponents.DotNetBar.ButtonItem(); - this.buttonItem128 = new DevComponents.DotNetBar.ButtonItem(); - this.sliderItem1 = new DevComponents.DotNetBar.SliderItem(); - this.buttonItem134 = new DevComponents.DotNetBar.ButtonItem(); - this.buttonItem130 = new DevComponents.DotNetBar.ButtonItem(); - this.btn_check_history = new DevComponents.DotNetBar.ButtonItem(); - this.ribbonPanel4 = new DevComponents.DotNetBar.RibbonPanel(); - this.ribbonBar1 = new DevComponents.DotNetBar.RibbonBar(); - this.btn_document_info = new DevComponents.DotNetBar.ButtonItem(); + this.ribbonPanel3 = new DevComponents.DotNetBar.RibbonPanel(); + this.ribbonBar4 = new DevComponents.DotNetBar.RibbonBar(); + this.btn_flag = new DevComponents.DotNetBar.ButtonItem(); + this.slider4ground = new DevComponents.DotNetBar.SliderItem(); + this.ribbonPanel7 = new DevComponents.DotNetBar.RibbonPanel(); + this.gxdw_ribbonbar = new DevComponents.DotNetBar.RibbonBar(); + this.buttonItem9 = new DevComponents.DotNetBar.ButtonItem(); + this.buttonItem10 = new DevComponents.DotNetBar.ButtonItem(); + this.buttonItem11 = new DevComponents.DotNetBar.ButtonItem(); + this.buttonItem12 = new DevComponents.DotNetBar.ButtonItem(); + this.buttonItem13 = new DevComponents.DotNetBar.ButtonItem(); + this.buttonItem14 = new DevComponents.DotNetBar.ButtonItem(); this.ribbonPanel15 = new DevComponents.DotNetBar.RibbonPanel(); this.ribbonBar20 = new DevComponents.DotNetBar.RibbonBar(); this.buttonItemSH = new DevComponents.DotNetBar.ButtonItem(); @@ -334,18 +312,6 @@ this.buttonItemXT4 = new DevComponents.DotNetBar.ButtonItem(); this.buttonItemXT4_1 = new DevComponents.DotNetBar.ButtonItem(); this.buttonItemXT4_2 = new DevComponents.DotNetBar.ButtonItem(); - this.ribbonPanel3 = new DevComponents.DotNetBar.RibbonPanel(); - this.ribbonBar4 = new DevComponents.DotNetBar.RibbonBar(); - this.btn_flag = new DevComponents.DotNetBar.ButtonItem(); - this.slider4ground = new DevComponents.DotNetBar.SliderItem(); - this.ribbonPanel7 = new DevComponents.DotNetBar.RibbonPanel(); - this.gxdw_ribbonbar = new DevComponents.DotNetBar.RibbonBar(); - this.buttonItem9 = new DevComponents.DotNetBar.ButtonItem(); - this.buttonItem10 = new DevComponents.DotNetBar.ButtonItem(); - this.buttonItem11 = new DevComponents.DotNetBar.ButtonItem(); - this.buttonItem12 = new DevComponents.DotNetBar.ButtonItem(); - this.buttonItem13 = new DevComponents.DotNetBar.ButtonItem(); - this.buttonItem14 = new DevComponents.DotNetBar.ButtonItem(); this.ribbonPanel2 = new DevComponents.DotNetBar.RibbonPanel(); this.ribbonBar3 = new DevComponents.DotNetBar.RibbonBar(); this.btn_user_info = new DevComponents.DotNetBar.ButtonItem(); @@ -355,6 +321,43 @@ this.btn_user_role = new DevComponents.DotNetBar.ButtonItem(); this.btn_password_edit = new DevComponents.DotNetBar.ButtonItem(); this.buttonItemPasswordReset = new DevComponents.DotNetBar.ButtonItem(); + this.ribbonPanel6 = new DevComponents.DotNetBar.RibbonPanel(); + this.ribbonBar6 = new DevComponents.DotNetBar.RibbonBar(); + this.buttonItemSPSZ = new DevComponents.DotNetBar.ButtonItem(); + this.buttonItem8 = new DevComponents.DotNetBar.ButtonItem(); + this.buttonItemLocation = new DevComponents.DotNetBar.ButtonItem(); + this.sliderItem2 = new DevComponents.DotNetBar.SliderItem(); + this.buttonItemGBJC = new DevComponents.DotNetBar.ButtonItem(); + this.ribbonPanel5 = new DevComponents.DotNetBar.RibbonPanel(); + this.ribbonBar2 = new DevComponents.DotNetBar.RibbonBar(); + this.buttonItemHX1 = new DevComponents.DotNetBar.ButtonItem(); + this.buttonItemHX2 = new DevComponents.DotNetBar.ButtonItem(); + this.buttonItemDCTP = new DevComponents.DotNetBar.ButtonItem(); + this.sliderItem3 = new DevComponents.DotNetBar.SliderItem(); + this.ribbonPanel1 = new DevComponents.DotNetBar.RibbonPanel(); + this.ribbonBar21 = new DevComponents.DotNetBar.RibbonBar(); + this.buttonItem87 = new DevComponents.DotNetBar.ButtonItem(); + this.buttonItem88 = new DevComponents.DotNetBar.ButtonItem(); + this.buttonItem27 = new DevComponents.DotNetBar.ButtonItem(); + this.buttonItem91 = new DevComponents.DotNetBar.ButtonItem(); + this.buttonItem1 = new DevComponents.DotNetBar.ButtonItem(); + this.btnlegendSet = new DevComponents.DotNetBar.ButtonItem(); + this.buttonItem89 = new DevComponents.DotNetBar.ButtonItem(); + this.btnOutputJPG = new DevComponents.DotNetBar.ButtonItem(); + this.ribbonPanel12 = new DevComponents.DotNetBar.RibbonPanel(); + this.ribbonBar18 = new DevComponents.DotNetBar.RibbonBar(); + this.buttonItem133 = new DevComponents.DotNetBar.ButtonItem(); + this.buttonItem132 = new DevComponents.DotNetBar.ButtonItem(); + this.ribbonBar13 = new DevComponents.DotNetBar.RibbonBar(); + this.buttonItem127 = new DevComponents.DotNetBar.ButtonItem(); + this.buttonItem128 = new DevComponents.DotNetBar.ButtonItem(); + this.sliderItem1 = new DevComponents.DotNetBar.SliderItem(); + this.buttonItem134 = new DevComponents.DotNetBar.ButtonItem(); + this.buttonItem130 = new DevComponents.DotNetBar.ButtonItem(); + this.btn_check_history = new DevComponents.DotNetBar.ButtonItem(); + this.ribbonPanel4 = new DevComponents.DotNetBar.RibbonPanel(); + this.ribbonBar1 = new DevComponents.DotNetBar.RibbonBar(); + this.btn_document_info = new DevComponents.DotNetBar.ButtonItem(); this.ribbonTabItem1 = new DevComponents.DotNetBar.RibbonTabItem(); this.ribbonTabItem11 = new DevComponents.DotNetBar.RibbonTabItem(); this.ribbonTabItem6 = new DevComponents.DotNetBar.RibbonTabItem(); @@ -516,7 +519,6 @@ this.labelX17 = new DevComponents.DotNetBar.LabelX(); this.panelEx4 = new DevComponents.DotNetBar.PanelEx(); this.pictureBox1 = new System.Windows.Forms.PictureBox(); - this.layerTree = new Cyberpipe.MyTreeView(); this.statusStrip1.SuspendLayout(); this.sideBar1.SuspendLayout(); this.panelEx3.SuspendLayout(); @@ -527,15 +529,15 @@ this.contextMenuStrip3.SuspendLayout(); this.contextMenuStripDeleteLayerNode.SuspendLayout(); this.ribbonControl1.SuspendLayout(); + this.ribbonPanel3.SuspendLayout(); + this.ribbonPanel7.SuspendLayout(); + this.ribbonPanel15.SuspendLayout(); + this.ribbonPanel2.SuspendLayout(); this.ribbonPanel6.SuspendLayout(); this.ribbonPanel5.SuspendLayout(); this.ribbonPanel1.SuspendLayout(); this.ribbonPanel12.SuspendLayout(); this.ribbonPanel4.SuspendLayout(); - this.ribbonPanel15.SuspendLayout(); - this.ribbonPanel3.SuspendLayout(); - this.ribbonPanel7.SuspendLayout(); - this.ribbonPanel2.SuspendLayout(); this.panelOfTable.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.dataGridViewX1)).BeginInit(); this.statusStrip2.SuspendLayout(); @@ -711,7 +713,8 @@ this.statusLabel.Name = "statusLabel"; this.statusLabel.Size = new System.Drawing.Size(1313, 17); this.statusLabel.Spring = true; - this.statusLabel.Text = " ©2014-2015 苏州航天系统工程有限公司 版权所有"; + this.statusLabel.Text = Utility.Copyright; +// this.statusLabel.Text = " ©2014-2015 苏州航天系统工程有限公司 版权所有"; // // toolStripDropDownButton1 // @@ -956,6 +959,18 @@ this.layerSensorTree.NodeMouseClick += new System.Windows.Forms.TreeNodeMouseClickEventHandler(this.layerMarkerTree_NodeMouseClick); this.layerSensorTree.NodeMouseDoubleClick += new System.Windows.Forms.TreeNodeMouseClickEventHandler(this.layerTree_NodeMouseDoubleClick); // + // layerTree + // + this.layerTree.CheckBoxes = true; + this.layerTree.ItemHeight = 18; + this.layerTree.Location = new System.Drawing.Point(30, 78); + this.layerTree.Name = "layerTree"; + this.layerTree.Size = new System.Drawing.Size(121, 97); + this.layerTree.TabIndex = 1; + this.layerTree.AfterCheck += new System.Windows.Forms.TreeViewEventHandler(this.layerTree_AfterCheck); + this.layerTree.NodeMouseClick += new System.Windows.Forms.TreeNodeMouseClickEventHandler(this.layerTree_NodeMouseClick); + this.layerTree.NodeMouseDoubleClick += new System.Windows.Forms.TreeNodeMouseClickEventHandler(this.layerTree_NodeMouseDoubleClick); + // // sideBarPanelItem3 // this.sideBarPanelItem3.FontBold = true; @@ -2150,13 +2165,13 @@ this.ribbonControl1.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.ribbonControl1.Controls.Add(this.ribbonPanel3); this.ribbonControl1.Controls.Add(this.ribbonPanel7); - this.ribbonControl1.Controls.Add(this.ribbonPanel2); this.ribbonControl1.Controls.Add(this.ribbonPanel15); - this.ribbonControl1.Controls.Add(this.ribbonPanel4); - this.ribbonControl1.Controls.Add(this.ribbonPanel1); + this.ribbonControl1.Controls.Add(this.ribbonPanel2); this.ribbonControl1.Controls.Add(this.ribbonPanel6); - this.ribbonControl1.Controls.Add(this.ribbonPanel12); this.ribbonControl1.Controls.Add(this.ribbonPanel5); + this.ribbonControl1.Controls.Add(this.ribbonPanel1); + this.ribbonControl1.Controls.Add(this.ribbonPanel12); + this.ribbonControl1.Controls.Add(this.ribbonPanel4); this.ribbonControl1.Dock = System.Windows.Forms.DockStyle.Top; this.ribbonControl1.ImeMode = System.Windows.Forms.ImeMode.NoControl; this.ribbonControl1.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { @@ -2200,609 +2215,216 @@ this.ribbonControl1.Text = "ribbonControl1"; this.ribbonControl1.UseCustomizeDialog = false; // - // ribbonPanel6 + // ribbonPanel3 // - this.ribbonPanel6.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.ribbonPanel6.Controls.Add(this.ribbonBar6); - this.ribbonPanel6.Dock = System.Windows.Forms.DockStyle.Fill; - this.ribbonPanel6.Location = new System.Drawing.Point(0, 0); - this.ribbonPanel6.Name = "ribbonPanel6"; - this.ribbonPanel6.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); - this.ribbonPanel6.Size = new System.Drawing.Size(1328, 95); + this.ribbonPanel3.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.ribbonPanel3.Controls.Add(this.ribbonBar4); + this.ribbonPanel3.Dock = System.Windows.Forms.DockStyle.Fill; + this.ribbonPanel3.Location = new System.Drawing.Point(0, 33); + this.ribbonPanel3.Name = "ribbonPanel3"; + this.ribbonPanel3.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); + this.ribbonPanel3.Size = new System.Drawing.Size(1328, 62); // // // - this.ribbonPanel6.Style.Class = ""; - this.ribbonPanel6.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonPanel3.Style.Class = ""; + this.ribbonPanel3.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; // // // - this.ribbonPanel6.StyleMouseDown.Class = ""; - this.ribbonPanel6.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonPanel3.StyleMouseDown.Class = ""; + this.ribbonPanel3.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; // // // - this.ribbonPanel6.StyleMouseOver.Class = ""; - this.ribbonPanel6.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonPanel6.TabIndex = 38; - this.ribbonPanel6.Visible = false; + this.ribbonPanel3.StyleMouseOver.Class = ""; + this.ribbonPanel3.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonPanel3.TabIndex = 40; // - // ribbonBar6 + // ribbonBar4 // - this.ribbonBar6.AutoOverflowEnabled = true; + this.ribbonBar4.AutoOverflowEnabled = true; // // // - this.ribbonBar6.BackgroundMouseOverStyle.Class = ""; - this.ribbonBar6.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar4.BackgroundMouseOverStyle.Class = ""; + this.ribbonBar4.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; // // // - this.ribbonBar6.BackgroundStyle.Class = ""; - this.ribbonBar6.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonBar6.ContainerControlProcessDialogKey = true; - this.ribbonBar6.Dock = System.Windows.Forms.DockStyle.Left; - this.ribbonBar6.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { - this.buttonItemSPSZ, - this.buttonItem8, - this.buttonItemLocation, - this.sliderItem2, - this.buttonItemGBJC}); - this.ribbonBar6.Location = new System.Drawing.Point(3, 0); - this.ribbonBar6.Name = "ribbonBar6"; - this.ribbonBar6.Size = new System.Drawing.Size(427, 92); - this.ribbonBar6.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.ribbonBar6.TabIndex = 0; + this.ribbonBar4.BackgroundStyle.Class = ""; + this.ribbonBar4.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar4.ContainerControlProcessDialogKey = true; + this.ribbonBar4.Dock = System.Windows.Forms.DockStyle.Left; + this.ribbonBar4.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { + this.btn_flag, + this.slider4ground}); + this.ribbonBar4.Location = new System.Drawing.Point(3, 0); + this.ribbonBar4.Name = "ribbonBar4"; + this.ribbonBar4.Size = new System.Drawing.Size(634, 59); + this.ribbonBar4.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.ribbonBar4.TabIndex = 0; // // // - this.ribbonBar6.TitleStyle.Class = ""; - this.ribbonBar6.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar4.TitleStyle.Class = ""; + this.ribbonBar4.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; // // // - this.ribbonBar6.TitleStyleMouseOver.Class = ""; - this.ribbonBar6.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonBar6.TitleVisible = false; + this.ribbonBar4.TitleStyleMouseOver.Class = ""; + this.ribbonBar4.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar4.TitleVisible = false; // - // buttonItemSPSZ + // btn_flag // - this.buttonItemSPSZ.Image = ((System.Drawing.Image)(resources.GetObject("buttonItemSPSZ.Image"))); - this.buttonItemSPSZ.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItemSPSZ.Name = "buttonItemSPSZ"; - this.buttonItemSPSZ.SubItemsExpandWidth = 14; - this.buttonItemSPSZ.Text = "双屏设置"; - this.buttonItemSPSZ.Click += new System.EventHandler(this.buttonItemSPSZ_Click); + this.btn_flag.Image = global::Cyberpipe.Properties.Resources._24x24icon_03_hover; + this.btn_flag.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.btn_flag.Name = "btn_flag"; + this.btn_flag.SubItemsExpandWidth = 14; + this.btn_flag.Text = "标识器管理"; + this.btn_flag.Click += new System.EventHandler(this.btn_flag_Click); // - // buttonItem8 + // slider4ground // - this.buttonItem8.Image = ((System.Drawing.Image)(resources.GetObject("buttonItem8.Image"))); - this.buttonItem8.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem8.Name = "buttonItem8"; - this.buttonItem8.SubItemsExpandWidth = 14; - this.buttonItem8.Text = "双屏分析"; - this.buttonItem8.Click += new System.EventHandler(this.buttonItem8_Click); + this.slider4ground.LabelPosition = DevComponents.DotNetBar.eSliderLabelPosition.Top; + this.slider4ground.LabelWidth = 50; + this.slider4ground.Name = "slider4ground"; + this.slider4ground.Text = "地面透明度"; + this.slider4ground.TextColor = System.Drawing.Color.Black; + this.slider4ground.Value = 0; + this.slider4ground.ValueChanged += new System.EventHandler(this.slider4ground_ValueChanged); // - // buttonItemLocation + // ribbonPanel7 // - this.buttonItemLocation.Image = ((System.Drawing.Image)(resources.GetObject("buttonItemLocation.Image"))); - this.buttonItemLocation.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItemLocation.Name = "buttonItemLocation"; - this.buttonItemLocation.SubItemsExpandWidth = 14; - this.buttonItemLocation.Text = "快速定位"; - this.buttonItemLocation.Click += new System.EventHandler(this.buttonItemLocation_Click); + this.ribbonPanel7.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.ribbonPanel7.Controls.Add(this.gxdw_ribbonbar); + this.ribbonPanel7.Dock = System.Windows.Forms.DockStyle.Fill; + this.ribbonPanel7.Location = new System.Drawing.Point(0, 33); + this.ribbonPanel7.Name = "ribbonPanel7"; + this.ribbonPanel7.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); + this.ribbonPanel7.Size = new System.Drawing.Size(1328, 62); // - // sliderItem2 // - this.sliderItem2.LabelPosition = DevComponents.DotNetBar.eSliderLabelPosition.Top; - this.sliderItem2.LabelWidth = 50; - this.sliderItem2.Name = "sliderItem2"; - this.sliderItem2.Text = "地面透明度"; - this.sliderItem2.TextColor = System.Drawing.Color.Black; - this.sliderItem2.Value = 0; - this.sliderItem2.ValueChanged += new System.EventHandler(this.sliderItem2_ValueChanged); // - // buttonItemGBJC + this.ribbonPanel7.Style.Class = ""; + this.ribbonPanel7.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; // - this.buttonItemGBJC.Image = ((System.Drawing.Image)(resources.GetObject("buttonItemGBJC.Image"))); - this.buttonItemGBJC.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItemGBJC.Name = "buttonItemGBJC"; - this.buttonItemGBJC.SubItemsExpandWidth = 14; - this.buttonItemGBJC.Text = "国标检测"; - this.buttonItemGBJC.Click += new System.EventHandler(this.buttonItemGBJC_Click); // - // ribbonPanel5 // - this.ribbonPanel5.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.ribbonPanel5.Controls.Add(this.ribbonBar2); - this.ribbonPanel5.Dock = System.Windows.Forms.DockStyle.Fill; - this.ribbonPanel5.Location = new System.Drawing.Point(0, 0); - this.ribbonPanel5.Name = "ribbonPanel5"; - this.ribbonPanel5.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); - this.ribbonPanel5.Size = new System.Drawing.Size(1328, 95); + this.ribbonPanel7.StyleMouseDown.Class = ""; + this.ribbonPanel7.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; // // // - this.ribbonPanel5.Style.Class = ""; - this.ribbonPanel5.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonPanel7.StyleMouseOver.Class = ""; + this.ribbonPanel7.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonPanel7.TabIndex = 41; + this.ribbonPanel7.Visible = false; // + // gxdw_ribbonbar // + this.gxdw_ribbonbar.AutoOverflowEnabled = true; // - this.ribbonPanel5.StyleMouseDown.Class = ""; - this.ribbonPanel5.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; // // + this.gxdw_ribbonbar.BackgroundMouseOverStyle.Class = ""; + this.gxdw_ribbonbar.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; // - this.ribbonPanel5.StyleMouseOver.Class = ""; - this.ribbonPanel5.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonPanel5.TabIndex = 37; - this.ribbonPanel5.Visible = false; // - // ribbonBar2 // - this.ribbonBar2.AutoOverflowEnabled = true; + this.gxdw_ribbonbar.BackgroundStyle.Class = ""; + this.gxdw_ribbonbar.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.gxdw_ribbonbar.ContainerControlProcessDialogKey = true; + this.gxdw_ribbonbar.Dock = System.Windows.Forms.DockStyle.Left; + this.gxdw_ribbonbar.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { + this.buttonItem9, + this.buttonItem10, + this.buttonItem11, + this.buttonItem12, + this.buttonItem13, + this.buttonItem14}); + this.gxdw_ribbonbar.Location = new System.Drawing.Point(3, 0); + this.gxdw_ribbonbar.Name = "gxdw_ribbonbar"; + this.gxdw_ribbonbar.Size = new System.Drawing.Size(564, 59); + this.gxdw_ribbonbar.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.gxdw_ribbonbar.TabIndex = 0; + this.gxdw_ribbonbar.Text = "ribbonBar5"; // // // - this.ribbonBar2.BackgroundMouseOverStyle.Class = ""; - this.ribbonBar2.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.gxdw_ribbonbar.TitleStyle.Class = ""; + this.gxdw_ribbonbar.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; // // // - this.ribbonBar2.BackgroundStyle.Class = ""; - this.ribbonBar2.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonBar2.ContainerControlProcessDialogKey = true; - this.ribbonBar2.Dock = System.Windows.Forms.DockStyle.Left; - this.ribbonBar2.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { - this.buttonItemHX1, - this.buttonItemHX2, - this.buttonItemDCTP, - this.sliderItem3}); - this.ribbonBar2.Location = new System.Drawing.Point(3, 0); - this.ribbonBar2.Name = "ribbonBar2"; - this.ribbonBar2.Size = new System.Drawing.Size(350, 92); - this.ribbonBar2.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.ribbonBar2.TabIndex = 0; + this.gxdw_ribbonbar.TitleStyleMouseOver.Class = ""; + this.gxdw_ribbonbar.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.gxdw_ribbonbar.TitleVisible = false; // + // buttonItem9 // + this.buttonItem9.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__76; + this.buttonItem9.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem9.Name = "buttonItem9"; + this.buttonItem9.SubItemsExpandWidth = 14; + this.buttonItem9.Text = "工单管理"; + this.buttonItem9.Click += new System.EventHandler(this.buttonItem9_Click); // - this.ribbonBar2.TitleStyle.Class = ""; - this.ribbonBar2.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // buttonItem10 // + this.buttonItem10.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__69; + this.buttonItem10.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem10.Name = "buttonItem10"; + this.buttonItem10.SubItemsExpandWidth = 14; + this.buttonItem10.Text = "在线任务"; + this.buttonItem10.Click += new System.EventHandler(this.buttonItem10_Click); // + // buttonItem11 // - this.ribbonBar2.TitleStyleMouseOver.Class = ""; - this.ribbonBar2.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonBar2.TitleVisible = false; + this.buttonItem11.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__72; + this.buttonItem11.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem11.Name = "buttonItem11"; + this.buttonItem11.SubItemsExpandWidth = 14; + this.buttonItem11.Text = "事件管理"; + this.buttonItem11.Click += new System.EventHandler(this.buttonItem11_Click); // - // buttonItemHX1 + // buttonItem12 // - this.buttonItemHX1.AutoExpandOnClick = true; - this.buttonItemHX1.Image = ((System.Drawing.Image)(resources.GetObject("buttonItemHX1.Image"))); - this.buttonItemHX1.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItemHX1.Name = "buttonItemHX1"; - this.buttonItemHX1.SubItemsExpandWidth = 14; - this.buttonItemHX1.Text = "导入红线"; - this.buttonItemHX1.Click += new System.EventHandler(this.buttonItemHX1_Click); + this.buttonItem12.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__34; + this.buttonItem12.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem12.Name = "buttonItem12"; + this.buttonItem12.SubItemsExpandWidth = 14; + this.buttonItem12.Text = "探测仪管理"; + this.buttonItem12.Click += new System.EventHandler(this.buttonItem12_Click); // - // buttonItemHX2 + // buttonItem13 // - this.buttonItemHX2.Image = ((System.Drawing.Image)(resources.GetObject("buttonItemHX2.Image"))); - this.buttonItemHX2.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItemHX2.Name = "buttonItemHX2"; - this.buttonItemHX2.SubItemsExpandWidth = 14; - this.buttonItemHX2.Text = "红线审核"; - this.buttonItemHX2.Click += new System.EventHandler(this.buttonItemHX2_Click); + this.buttonItem13.Image = global::Cyberpipe.Properties.Resources._24x24icon_13_hover; + this.buttonItem13.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem13.Name = "buttonItem13"; + this.buttonItem13.SubItemsExpandWidth = 14; + this.buttonItem13.Text = "巡检人员维护"; + this.buttonItem13.Click += new System.EventHandler(this.buttonItem13_Click); // - // buttonItemDCTP + // buttonItem14 // - this.buttonItemDCTP.Image = ((System.Drawing.Image)(resources.GetObject("buttonItemDCTP.Image"))); - this.buttonItemDCTP.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItemDCTP.Name = "buttonItemDCTP"; - this.buttonItemDCTP.SubItemsExpandWidth = 14; - this.buttonItemDCTP.Text = "导出图片"; - this.buttonItemDCTP.Click += new System.EventHandler(this.buttonItemDCTP_Click); - // - // sliderItem3 - // - this.sliderItem3.LabelPosition = DevComponents.DotNetBar.eSliderLabelPosition.Top; - this.sliderItem3.LabelWidth = 50; - this.sliderItem3.Name = "sliderItem3"; - this.sliderItem3.Text = "地面透明度"; - this.sliderItem3.TextColor = System.Drawing.Color.Black; - this.sliderItem3.Value = 0; - this.sliderItem3.ValueChanged += new System.EventHandler(this.sliderItem3_ValueChanged); - // - // ribbonPanel1 - // - this.ribbonPanel1.AutoSize = true; - this.ribbonPanel1.CanvasColor = System.Drawing.Color.Gray; - this.ribbonPanel1.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.ribbonPanel1.Controls.Add(this.ribbonBar21); - this.ribbonPanel1.Dock = System.Windows.Forms.DockStyle.Fill; - this.ribbonPanel1.Location = new System.Drawing.Point(0, 0); - this.ribbonPanel1.Name = "ribbonPanel1"; - this.ribbonPanel1.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); - this.ribbonPanel1.Size = new System.Drawing.Size(1328, 95); - // - // - // - this.ribbonPanel1.Style.Class = ""; - this.ribbonPanel1.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonPanel1.StyleMouseDown.Class = ""; - this.ribbonPanel1.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonPanel1.StyleMouseOver.Class = ""; - this.ribbonPanel1.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonPanel1.TabIndex = 1; - this.ribbonPanel1.Visible = false; - // - // ribbonBar21 - // - this.ribbonBar21.AutoOverflowEnabled = true; - this.ribbonBar21.BackColor = System.Drawing.Color.White; - // - // - // - this.ribbonBar21.BackgroundMouseOverStyle.Class = ""; - this.ribbonBar21.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonBar21.BackgroundStyle.Class = ""; - this.ribbonBar21.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonBar21.ContainerControlProcessDialogKey = true; - this.ribbonBar21.Dock = System.Windows.Forms.DockStyle.Left; - this.ribbonBar21.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { - this.buttonItem87, - this.buttonItem88, - this.buttonItem27, - this.sliderGroundTransSet1, - this.buttonItem91, - this.buttonItem1, - this.btnlegendSet, - this.buttonItem89, - this.btnOutputJPG}); - this.ribbonBar21.Location = new System.Drawing.Point(3, 0); - this.ribbonBar21.Name = "ribbonBar21"; - this.ribbonBar21.Size = new System.Drawing.Size(649, 92); - this.ribbonBar21.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.ribbonBar21.TabIndex = 2; - this.ribbonBar21.Text = "浏览模式"; - // - // - // - this.ribbonBar21.TitleStyle.Class = ""; - this.ribbonBar21.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonBar21.TitleStyleMouseOver.Class = ""; - this.ribbonBar21.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonBar21.TitleVisible = false; - // - // buttonItem87 - // - this.buttonItem87.Image = ((System.Drawing.Image)(resources.GetObject("buttonItem87.Image"))); - this.buttonItem87.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem87.Name = "buttonItem87"; - this.buttonItem87.SubItemsExpandWidth = 14; - this.buttonItem87.Text = "地上模式"; - this.buttonItem87.Click += new System.EventHandler(this.buttonItem87_Click); - // - // buttonItem88 - // - this.buttonItem88.Image = ((System.Drawing.Image)(resources.GetObject("buttonItem88.Image"))); - this.buttonItem88.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem88.Name = "buttonItem88"; - this.buttonItem88.SubItemsExpandWidth = 14; - this.buttonItem88.Text = "地下模式"; - this.buttonItem88.Click += new System.EventHandler(this.buttonItem88_Click); - // - // buttonItem27 - // - this.buttonItem27.Image = ((System.Drawing.Image)(resources.GetObject("buttonItem27.Image"))); - this.buttonItem27.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem27.Name = "buttonItem27"; - this.buttonItem27.SubItemsExpandWidth = 14; - this.buttonItem27.Text = "行走模式"; - this.buttonItem27.Click += new System.EventHandler(this.buttonItem27_Click); - // - // buttonItem91 - // - this.buttonItem91.ForeColor = System.Drawing.Color.Black; - this.buttonItem91.Image = ((System.Drawing.Image)(resources.GetObject("buttonItem91.Image"))); - this.buttonItem91.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem91.Name = "buttonItem91"; - this.buttonItem91.SubItemsExpandWidth = 14; - this.buttonItem91.Text = "快速定位"; - this.buttonItem91.Click += new System.EventHandler(this.buttonItem91_Click); - // - // buttonItem1 - // - this.buttonItem1.Image = ((System.Drawing.Image)(resources.GetObject("buttonItem1.Image"))); - this.buttonItem1.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem1.Name = "buttonItem1"; - this.buttonItem1.SubItemsExpandWidth = 14; - this.buttonItem1.Text = "图层管理"; - this.buttonItem1.Click += new System.EventHandler(this.buttonItem1_Click); - // - // btnlegendSet - // - this.btnlegendSet.Image = ((System.Drawing.Image)(resources.GetObject("btnlegendSet.Image"))); - this.btnlegendSet.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.btnlegendSet.Name = "btnlegendSet"; - this.btnlegendSet.SubItemsExpandWidth = 14; - this.btnlegendSet.Text = "图例"; - this.btnlegendSet.Click += new System.EventHandler(this.btnlegendSet_Click); - // - // buttonItem89 - // - this.buttonItem89.Image = ((System.Drawing.Image)(resources.GetObject("buttonItem89.Image"))); - this.buttonItem89.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem89.Name = "buttonItem89"; - this.buttonItem89.SubItemsExpandWidth = 14; - this.buttonItem89.Text = "全屏显示"; - this.buttonItem89.Click += new System.EventHandler(this.buttonItem89_Click); - // - // btnOutputJPG - // - this.btnOutputJPG.Image = ((System.Drawing.Image)(resources.GetObject("btnOutputJPG.Image"))); - this.btnOutputJPG.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.btnOutputJPG.Name = "btnOutputJPG"; - this.btnOutputJPG.SubItemsExpandWidth = 14; - this.btnOutputJPG.Text = "导出图片"; - this.btnOutputJPG.Click += new System.EventHandler(this.btnOutputJPG_Click); - // - // ribbonPanel12 - // - this.ribbonPanel12.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.ribbonPanel12.Controls.Add(this.ribbonBar18); - this.ribbonPanel12.Controls.Add(this.ribbonBar13); - this.ribbonPanel12.Dock = System.Windows.Forms.DockStyle.Fill; - this.ribbonPanel12.Location = new System.Drawing.Point(0, 0); - this.ribbonPanel12.Name = "ribbonPanel12"; - this.ribbonPanel12.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); - this.ribbonPanel12.Size = new System.Drawing.Size(1328, 95); - // - // - // - this.ribbonPanel12.Style.Class = ""; - this.ribbonPanel12.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonPanel12.StyleMouseDown.Class = ""; - this.ribbonPanel12.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonPanel12.StyleMouseOver.Class = ""; - this.ribbonPanel12.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonPanel12.TabIndex = 34; - this.ribbonPanel12.Visible = false; - // - // ribbonBar18 - // - this.ribbonBar18.AutoOverflowEnabled = true; - // - // - // - this.ribbonBar18.BackgroundMouseOverStyle.Class = ""; - this.ribbonBar18.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonBar18.BackgroundStyle.Class = ""; - this.ribbonBar18.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonBar18.ContainerControlProcessDialogKey = true; - this.ribbonBar18.Dock = System.Windows.Forms.DockStyle.Left; - this.ribbonBar18.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { - this.buttonItem133}); - this.ribbonBar18.Location = new System.Drawing.Point(531, 0); - this.ribbonBar18.Name = "ribbonBar18"; - this.ribbonBar18.Size = new System.Drawing.Size(129, 92); - this.ribbonBar18.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.ribbonBar18.TabIndex = 1; - // - // - // - this.ribbonBar18.TitleStyle.Class = ""; - this.ribbonBar18.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonBar18.TitleStyleMouseOver.Class = ""; - this.ribbonBar18.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonBar18.TitleVisible = false; - // - // buttonItem133 - // - this.buttonItem133.Image = ((System.Drawing.Image)(resources.GetObject("buttonItem133.Image"))); - this.buttonItem133.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem133.Name = "buttonItem133"; - this.buttonItem133.SubItemsExpandWidth = 14; - this.buttonItem133.Text = "审核入库"; - this.buttonItem133.Click += new System.EventHandler(this.buttonItem133_Click_1); - // - // ribbonBar13 - // - this.ribbonBar13.AutoOverflowEnabled = true; - // - // - // - this.ribbonBar13.BackgroundMouseOverStyle.Class = ""; - this.ribbonBar13.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonBar13.BackgroundStyle.Class = ""; - this.ribbonBar13.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonBar13.ContainerControlProcessDialogKey = true; - this.ribbonBar13.Dock = System.Windows.Forms.DockStyle.Left; - this.ribbonBar13.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { - this.buttonItem127, - this.buttonItem128, - this.sliderItem1, - this.buttonItem134, - this.buttonItem130, - this.btn_check_history}); - this.ribbonBar13.Location = new System.Drawing.Point(3, 0); - this.ribbonBar13.Name = "ribbonBar13"; - this.ribbonBar13.Size = new System.Drawing.Size(528, 92); - this.ribbonBar13.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.ribbonBar13.TabIndex = 0; - // - // - // - this.ribbonBar13.TitleStyle.Class = ""; - this.ribbonBar13.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonBar13.TitleStyleMouseOver.Class = ""; - this.ribbonBar13.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonBar13.TitleVisible = false; - // - // buttonItem127 - // - this.buttonItem127.Image = ((System.Drawing.Image)(resources.GetObject("buttonItem127.Image"))); - this.buttonItem127.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem127.Name = "buttonItem127"; - this.buttonItem127.SubItemsExpandWidth = 14; - this.buttonItem127.Text = "打开数据"; - this.buttonItem127.Click += new System.EventHandler(this.buttonItem127_Click_2); - // - // buttonItem128 - // - this.buttonItem128.Image = ((System.Drawing.Image)(resources.GetObject("buttonItem128.Image"))); - this.buttonItem128.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem128.Name = "buttonItem128"; - this.buttonItem128.SubItemsExpandWidth = 14; - this.buttonItem128.Text = "一键审核"; - this.buttonItem128.Click += new System.EventHandler(this.buttonItem128_Click); - // - // sliderItem1 - // - this.sliderItem1.LabelPosition = DevComponents.DotNetBar.eSliderLabelPosition.Top; - this.sliderItem1.LabelWidth = 50; - this.sliderItem1.Name = "sliderItem1"; - this.sliderItem1.Text = "地面透明度"; - this.sliderItem1.TextColor = System.Drawing.Color.Black; - this.sliderItem1.Value = 0; - this.sliderItem1.ValueChanged += new System.EventHandler(this.sliderItem1_ValueChanged); - // - // buttonItem134 - // - this.buttonItem134.Image = ((System.Drawing.Image)(resources.GetObject("buttonItem134.Image"))); - this.buttonItem134.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem134.Name = "buttonItem134"; - this.buttonItem134.SubItemsExpandWidth = 14; - this.buttonItem134.Text = "模拟设计修改"; - this.buttonItem134.Click += new System.EventHandler(this.buttonItem134_Click_1); - // - // buttonItem130 - // - this.buttonItem130.Image = ((System.Drawing.Image)(resources.GetObject("buttonItem130.Image"))); - this.buttonItem130.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem130.Name = "buttonItem130"; - this.buttonItem130.SubItemsExpandWidth = 14; - this.buttonItem130.Text = "导出审核图"; - this.buttonItem130.Click += new System.EventHandler(this.buttonItem130_Click_1); - // - // btn_check_history - // - this.btn_check_history.Image = ((System.Drawing.Image)(resources.GetObject("btn_check_history.Image"))); - this.btn_check_history.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.btn_check_history.Name = "btn_check_history"; - this.btn_check_history.SubItemsExpandWidth = 14; - this.btn_check_history.Text = "审核历史"; - this.btn_check_history.Click += new System.EventHandler(this.btn_check_history_Click); - // - // ribbonPanel4 - // - this.ribbonPanel4.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.ribbonPanel4.Controls.Add(this.ribbonBar1); - this.ribbonPanel4.Dock = System.Windows.Forms.DockStyle.Fill; - this.ribbonPanel4.Location = new System.Drawing.Point(0, 0); - this.ribbonPanel4.Name = "ribbonPanel4"; - this.ribbonPanel4.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); - this.ribbonPanel4.Size = new System.Drawing.Size(1328, 95); - // - // - // - this.ribbonPanel4.Style.Class = ""; - this.ribbonPanel4.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonPanel4.StyleMouseDown.Class = ""; - this.ribbonPanel4.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonPanel4.StyleMouseOver.Class = ""; - this.ribbonPanel4.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonPanel4.TabIndex = 36; - this.ribbonPanel4.Visible = false; - // - // ribbonBar1 - // - this.ribbonBar1.AutoOverflowEnabled = true; - // - // - // - this.ribbonBar1.BackgroundMouseOverStyle.Class = ""; - this.ribbonBar1.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonBar1.BackgroundStyle.Class = ""; - this.ribbonBar1.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonBar1.ContainerControlProcessDialogKey = true; - this.ribbonBar1.Dock = System.Windows.Forms.DockStyle.Left; - this.ribbonBar1.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { - this.btn_document_info}); - this.ribbonBar1.Location = new System.Drawing.Point(3, 0); - this.ribbonBar1.Name = "ribbonBar1"; - this.ribbonBar1.Size = new System.Drawing.Size(88, 92); - this.ribbonBar1.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.ribbonBar1.TabIndex = 0; - // - // - // - this.ribbonBar1.TitleStyle.Class = ""; - this.ribbonBar1.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonBar1.TitleStyleMouseOver.Class = ""; - this.ribbonBar1.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonBar1.TitleVisible = false; - // - // btn_document_info - // - this.btn_document_info.Image = ((System.Drawing.Image)(resources.GetObject("btn_document_info.Image"))); - this.btn_document_info.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.btn_document_info.Name = "btn_document_info"; - this.btn_document_info.SubItemsExpandWidth = 14; - this.btn_document_info.Text = "文档管理"; - this.btn_document_info.Click += new System.EventHandler(this.btn_document_info_Click); + this.buttonItem14.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__56; + this.buttonItem14.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem14.Name = "buttonItem14"; + this.buttonItem14.SubItemsExpandWidth = 14; + this.buttonItem14.Text = "导出施工图"; + this.buttonItem14.Click += new System.EventHandler(this.buttonItem14_Click); // // ribbonPanel15 // this.ribbonPanel15.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; this.ribbonPanel15.Controls.Add(this.ribbonBar20); this.ribbonPanel15.Dock = System.Windows.Forms.DockStyle.Fill; - this.ribbonPanel15.Location = new System.Drawing.Point(0, 0); + this.ribbonPanel15.Location = new System.Drawing.Point(0, 33); this.ribbonPanel15.Name = "ribbonPanel15"; this.ribbonPanel15.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); - this.ribbonPanel15.Size = new System.Drawing.Size(1328, 95); + this.ribbonPanel15.Size = new System.Drawing.Size(1328, 62); // // // @@ -2843,7 +2465,7 @@ this.buttonItemXTGL}); this.ribbonBar20.Location = new System.Drawing.Point(3, 0); this.ribbonBar20.Name = "ribbonBar20"; - this.ribbonBar20.Size = new System.Drawing.Size(283, 92); + this.ribbonBar20.Size = new System.Drawing.Size(283, 59); this.ribbonBar20.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; this.ribbonBar20.TabIndex = 0; // @@ -3274,216 +2896,15 @@ this.buttonItemXT4_2.Text = "人员修改"; this.buttonItemXT4_2.Click += new System.EventHandler(this.buttonItemXT4_2_Click); // - // ribbonPanel3 - // - this.ribbonPanel3.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.ribbonPanel3.Controls.Add(this.ribbonBar4); - this.ribbonPanel3.Dock = System.Windows.Forms.DockStyle.Fill; - this.ribbonPanel3.Location = new System.Drawing.Point(0, 33); - this.ribbonPanel3.Name = "ribbonPanel3"; - this.ribbonPanel3.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); - this.ribbonPanel3.Size = new System.Drawing.Size(1328, 62); - // - // - // - this.ribbonPanel3.Style.Class = ""; - this.ribbonPanel3.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonPanel3.StyleMouseDown.Class = ""; - this.ribbonPanel3.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonPanel3.StyleMouseOver.Class = ""; - this.ribbonPanel3.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonPanel3.TabIndex = 40; - // - // ribbonBar4 - // - this.ribbonBar4.AutoOverflowEnabled = true; - // - // - // - this.ribbonBar4.BackgroundMouseOverStyle.Class = ""; - this.ribbonBar4.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonBar4.BackgroundStyle.Class = ""; - this.ribbonBar4.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonBar4.ContainerControlProcessDialogKey = true; - this.ribbonBar4.Dock = System.Windows.Forms.DockStyle.Left; - this.ribbonBar4.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { - this.btn_flag, - this.slider4ground}); - this.ribbonBar4.Location = new System.Drawing.Point(3, 0); - this.ribbonBar4.Name = "ribbonBar4"; - this.ribbonBar4.Size = new System.Drawing.Size(321, 59); - this.ribbonBar4.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.ribbonBar4.TabIndex = 0; - // - // - // - this.ribbonBar4.TitleStyle.Class = ""; - this.ribbonBar4.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonBar4.TitleStyleMouseOver.Class = ""; - this.ribbonBar4.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonBar4.TitleVisible = false; - // - // btn_flag - // - this.btn_flag.Image = global::Cyberpipe.Properties.Resources._24x24icon_03_hover; - this.btn_flag.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.btn_flag.Name = "btn_flag"; - this.btn_flag.SubItemsExpandWidth = 14; - this.btn_flag.Text = "标识器管理"; - this.btn_flag.Click += new System.EventHandler(this.btn_flag_Click); - // - // slider4ground - // - this.slider4ground.LabelPosition = DevComponents.DotNetBar.eSliderLabelPosition.Top; - this.slider4ground.LabelWidth = 50; - this.slider4ground.Name = "slider4ground"; - this.slider4ground.Text = "地面透明度"; - this.slider4ground.TextColor = System.Drawing.Color.Black; - this.slider4ground.Value = 0; - this.slider4ground.ValueChanged += new System.EventHandler(this.slider4ground_ValueChanged); - // - // ribbonPanel7 - // - this.ribbonPanel7.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.ribbonPanel7.Controls.Add(this.gxdw_ribbonbar); - this.ribbonPanel7.Dock = System.Windows.Forms.DockStyle.Fill; - this.ribbonPanel7.Location = new System.Drawing.Point(0, 33); - this.ribbonPanel7.Name = "ribbonPanel7"; - this.ribbonPanel7.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); - this.ribbonPanel7.Size = new System.Drawing.Size(1328, 62); - // - // - // - this.ribbonPanel7.Style.Class = ""; - this.ribbonPanel7.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonPanel7.StyleMouseDown.Class = ""; - this.ribbonPanel7.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonPanel7.StyleMouseOver.Class = ""; - this.ribbonPanel7.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonPanel7.TabIndex = 41; - this.ribbonPanel7.Visible = false; - // - // gxdw_ribbonbar - // - this.gxdw_ribbonbar.AutoOverflowEnabled = true; - // - // - // - this.gxdw_ribbonbar.BackgroundMouseOverStyle.Class = ""; - this.gxdw_ribbonbar.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.gxdw_ribbonbar.BackgroundStyle.Class = ""; - this.gxdw_ribbonbar.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.gxdw_ribbonbar.ContainerControlProcessDialogKey = true; - this.gxdw_ribbonbar.Dock = System.Windows.Forms.DockStyle.Left; - this.gxdw_ribbonbar.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { - this.buttonItem9, - this.buttonItem10, - this.buttonItem11, - this.buttonItem12, - this.buttonItem13, - this.buttonItem14}); - this.gxdw_ribbonbar.Location = new System.Drawing.Point(3, 0); - this.gxdw_ribbonbar.Name = "gxdw_ribbonbar"; - this.gxdw_ribbonbar.Size = new System.Drawing.Size(522, 59); - this.gxdw_ribbonbar.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.gxdw_ribbonbar.TabIndex = 0; - this.gxdw_ribbonbar.Text = "ribbonBar5"; - // - // - // - this.gxdw_ribbonbar.TitleStyle.Class = ""; - this.gxdw_ribbonbar.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.gxdw_ribbonbar.TitleStyleMouseOver.Class = ""; - this.gxdw_ribbonbar.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.gxdw_ribbonbar.TitleVisible = false; - // - // buttonItem9 - // - this.buttonItem9.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__76; - this.buttonItem9.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem9.Name = "buttonItem9"; - this.buttonItem9.SubItemsExpandWidth = 14; - this.buttonItem9.Text = "工单管理"; - this.buttonItem9.Click += new System.EventHandler(this.buttonItem9_Click); - // - // buttonItem10 - // - this.buttonItem10.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__69; - this.buttonItem10.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem10.Name = "buttonItem10"; - this.buttonItem10.SubItemsExpandWidth = 14; - this.buttonItem10.Text = "在线任务"; - this.buttonItem10.Click += new System.EventHandler(this.buttonItem10_Click); - // - // buttonItem11 - // - this.buttonItem11.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__72; - this.buttonItem11.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem11.Name = "buttonItem11"; - this.buttonItem11.SubItemsExpandWidth = 14; - this.buttonItem11.Text = "事件管理"; - this.buttonItem11.Click += new System.EventHandler(this.buttonItem11_Click); - // - // buttonItem12 - // - this.buttonItem12.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__34; - this.buttonItem12.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem12.Name = "buttonItem12"; - this.buttonItem12.SubItemsExpandWidth = 14; - this.buttonItem12.Text = "探测仪管理"; - this.buttonItem12.Click += new System.EventHandler(this.buttonItem12_Click); - // - // buttonItem13 - // - this.buttonItem13.Image = global::Cyberpipe.Properties.Resources._24x24icon_13_hover; - this.buttonItem13.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem13.Name = "buttonItem13"; - this.buttonItem13.SubItemsExpandWidth = 14; - this.buttonItem13.Text = "巡检人员维护"; - this.buttonItem13.Click += new System.EventHandler(this.buttonItem13_Click); - // - // buttonItem14 - // - this.buttonItem14.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__56; - this.buttonItem14.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem14.Name = "buttonItem14"; - this.buttonItem14.SubItemsExpandWidth = 14; - this.buttonItem14.Text = "导出施工图"; - this.buttonItem14.Click += new System.EventHandler(this.buttonItem14_Click); - // // ribbonPanel2 // this.ribbonPanel2.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; this.ribbonPanel2.Controls.Add(this.ribbonBar3); this.ribbonPanel2.Dock = System.Windows.Forms.DockStyle.Fill; - this.ribbonPanel2.Location = new System.Drawing.Point(0, 33); + this.ribbonPanel2.Location = new System.Drawing.Point(0, 0); this.ribbonPanel2.Name = "ribbonPanel2"; this.ribbonPanel2.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); - this.ribbonPanel2.Size = new System.Drawing.Size(1328, 62); + this.ribbonPanel2.Size = new System.Drawing.Size(1328, 95); // // // @@ -3527,7 +2948,7 @@ this.buttonItemPasswordReset}); this.ribbonBar3.Location = new System.Drawing.Point(3, 0); this.ribbonBar3.Name = "ribbonBar3"; - this.ribbonBar3.Size = new System.Drawing.Size(551, 59); + this.ribbonBar3.Size = new System.Drawing.Size(551, 92); this.ribbonBar3.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; this.ribbonBar3.TabIndex = 1; // @@ -3567,6 +2988,7 @@ this.btn_resc_info.Name = "btn_resc_info"; this.btn_resc_info.SubItemsExpandWidth = 14; this.btn_resc_info.Text = "资源管理"; + this.btn_resc_info.Visible = false; this.btn_resc_info.Click += new System.EventHandler(this.btn_resc_info_Click); // // btn_role_resc @@ -3605,6 +3027,605 @@ this.buttonItemPasswordReset.Text = "重置密码"; this.buttonItemPasswordReset.Click += new System.EventHandler(this.buttonItemPasswordReset_Click); // + // ribbonPanel6 + // + this.ribbonPanel6.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.ribbonPanel6.Controls.Add(this.ribbonBar6); + this.ribbonPanel6.Dock = System.Windows.Forms.DockStyle.Fill; + this.ribbonPanel6.Location = new System.Drawing.Point(0, 0); + this.ribbonPanel6.Name = "ribbonPanel6"; + this.ribbonPanel6.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); + this.ribbonPanel6.Size = new System.Drawing.Size(1328, 95); + // + // + // + this.ribbonPanel6.Style.Class = ""; + this.ribbonPanel6.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonPanel6.StyleMouseDown.Class = ""; + this.ribbonPanel6.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonPanel6.StyleMouseOver.Class = ""; + this.ribbonPanel6.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonPanel6.TabIndex = 38; + this.ribbonPanel6.Visible = false; + // + // ribbonBar6 + // + this.ribbonBar6.AutoOverflowEnabled = true; + // + // + // + this.ribbonBar6.BackgroundMouseOverStyle.Class = ""; + this.ribbonBar6.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonBar6.BackgroundStyle.Class = ""; + this.ribbonBar6.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar6.ContainerControlProcessDialogKey = true; + this.ribbonBar6.Dock = System.Windows.Forms.DockStyle.Left; + this.ribbonBar6.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { + this.buttonItemSPSZ, + this.buttonItem8, + this.buttonItemLocation, + this.sliderItem2, + this.buttonItemGBJC}); + this.ribbonBar6.Location = new System.Drawing.Point(3, 0); + this.ribbonBar6.Name = "ribbonBar6"; + this.ribbonBar6.Size = new System.Drawing.Size(427, 92); + this.ribbonBar6.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.ribbonBar6.TabIndex = 0; + // + // + // + this.ribbonBar6.TitleStyle.Class = ""; + this.ribbonBar6.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonBar6.TitleStyleMouseOver.Class = ""; + this.ribbonBar6.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar6.TitleVisible = false; + // + // buttonItemSPSZ + // + this.buttonItemSPSZ.Image = ((System.Drawing.Image)(resources.GetObject("buttonItemSPSZ.Image"))); + this.buttonItemSPSZ.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItemSPSZ.Name = "buttonItemSPSZ"; + this.buttonItemSPSZ.SubItemsExpandWidth = 14; + this.buttonItemSPSZ.Text = "双屏设置"; + this.buttonItemSPSZ.Click += new System.EventHandler(this.buttonItemSPSZ_Click); + // + // buttonItem8 + // + this.buttonItem8.Image = ((System.Drawing.Image)(resources.GetObject("buttonItem8.Image"))); + this.buttonItem8.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem8.Name = "buttonItem8"; + this.buttonItem8.SubItemsExpandWidth = 14; + this.buttonItem8.Text = "双屏分析"; + this.buttonItem8.Click += new System.EventHandler(this.buttonItem8_Click); + // + // buttonItemLocation + // + this.buttonItemLocation.Image = ((System.Drawing.Image)(resources.GetObject("buttonItemLocation.Image"))); + this.buttonItemLocation.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItemLocation.Name = "buttonItemLocation"; + this.buttonItemLocation.SubItemsExpandWidth = 14; + this.buttonItemLocation.Text = "快速定位"; + this.buttonItemLocation.Click += new System.EventHandler(this.buttonItemLocation_Click); + // + // sliderItem2 + // + this.sliderItem2.LabelPosition = DevComponents.DotNetBar.eSliderLabelPosition.Top; + this.sliderItem2.LabelWidth = 50; + this.sliderItem2.Name = "sliderItem2"; + this.sliderItem2.Text = "地面透明度"; + this.sliderItem2.TextColor = System.Drawing.Color.Black; + this.sliderItem2.Value = 0; + this.sliderItem2.ValueChanged += new System.EventHandler(this.sliderItem2_ValueChanged); + // + // buttonItemGBJC + // + this.buttonItemGBJC.Image = ((System.Drawing.Image)(resources.GetObject("buttonItemGBJC.Image"))); + this.buttonItemGBJC.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItemGBJC.Name = "buttonItemGBJC"; + this.buttonItemGBJC.SubItemsExpandWidth = 14; + this.buttonItemGBJC.Text = "国标检测"; + this.buttonItemGBJC.Click += new System.EventHandler(this.buttonItemGBJC_Click); + // + // ribbonPanel5 + // + this.ribbonPanel5.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.ribbonPanel5.Controls.Add(this.ribbonBar2); + this.ribbonPanel5.Dock = System.Windows.Forms.DockStyle.Fill; + this.ribbonPanel5.Location = new System.Drawing.Point(0, 33); + this.ribbonPanel5.Name = "ribbonPanel5"; + this.ribbonPanel5.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); + this.ribbonPanel5.Size = new System.Drawing.Size(1328, 62); + // + // + // + this.ribbonPanel5.Style.Class = ""; + this.ribbonPanel5.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonPanel5.StyleMouseDown.Class = ""; + this.ribbonPanel5.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonPanel5.StyleMouseOver.Class = ""; + this.ribbonPanel5.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonPanel5.TabIndex = 37; + this.ribbonPanel5.Visible = false; + // + // ribbonBar2 + // + this.ribbonBar2.AutoOverflowEnabled = true; + // + // + // + this.ribbonBar2.BackgroundMouseOverStyle.Class = ""; + this.ribbonBar2.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonBar2.BackgroundStyle.Class = ""; + this.ribbonBar2.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar2.ContainerControlProcessDialogKey = true; + this.ribbonBar2.Dock = System.Windows.Forms.DockStyle.Left; + this.ribbonBar2.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { + this.buttonItemHX1, + this.buttonItemHX2, + this.buttonItemDCTP, + this.sliderItem3}); + this.ribbonBar2.Location = new System.Drawing.Point(3, 0); + this.ribbonBar2.Name = "ribbonBar2"; + this.ribbonBar2.Size = new System.Drawing.Size(350, 59); + this.ribbonBar2.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.ribbonBar2.TabIndex = 0; + // + // + // + this.ribbonBar2.TitleStyle.Class = ""; + this.ribbonBar2.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonBar2.TitleStyleMouseOver.Class = ""; + this.ribbonBar2.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar2.TitleVisible = false; + // + // buttonItemHX1 + // + this.buttonItemHX1.AutoExpandOnClick = true; + this.buttonItemHX1.Image = ((System.Drawing.Image)(resources.GetObject("buttonItemHX1.Image"))); + this.buttonItemHX1.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItemHX1.Name = "buttonItemHX1"; + this.buttonItemHX1.SubItemsExpandWidth = 14; + this.buttonItemHX1.Text = "导入红线"; + this.buttonItemHX1.Click += new System.EventHandler(this.buttonItemHX1_Click); + // + // buttonItemHX2 + // + this.buttonItemHX2.Image = ((System.Drawing.Image)(resources.GetObject("buttonItemHX2.Image"))); + this.buttonItemHX2.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItemHX2.Name = "buttonItemHX2"; + this.buttonItemHX2.SubItemsExpandWidth = 14; + this.buttonItemHX2.Text = "红线审核"; + this.buttonItemHX2.Click += new System.EventHandler(this.buttonItemHX2_Click); + // + // buttonItemDCTP + // + this.buttonItemDCTP.Image = ((System.Drawing.Image)(resources.GetObject("buttonItemDCTP.Image"))); + this.buttonItemDCTP.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItemDCTP.Name = "buttonItemDCTP"; + this.buttonItemDCTP.SubItemsExpandWidth = 14; + this.buttonItemDCTP.Text = "导出图片"; + this.buttonItemDCTP.Click += new System.EventHandler(this.buttonItemDCTP_Click); + // + // sliderItem3 + // + this.sliderItem3.LabelPosition = DevComponents.DotNetBar.eSliderLabelPosition.Top; + this.sliderItem3.LabelWidth = 50; + this.sliderItem3.Name = "sliderItem3"; + this.sliderItem3.Text = "地面透明度"; + this.sliderItem3.TextColor = System.Drawing.Color.Black; + this.sliderItem3.Value = 0; + this.sliderItem3.ValueChanged += new System.EventHandler(this.sliderItem3_ValueChanged); + // + // ribbonPanel1 + // + this.ribbonPanel1.AutoSize = true; + this.ribbonPanel1.CanvasColor = System.Drawing.Color.Gray; + this.ribbonPanel1.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.ribbonPanel1.Controls.Add(this.ribbonBar21); + this.ribbonPanel1.Dock = System.Windows.Forms.DockStyle.Fill; + this.ribbonPanel1.Location = new System.Drawing.Point(0, 33); + this.ribbonPanel1.Name = "ribbonPanel1"; + this.ribbonPanel1.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); + this.ribbonPanel1.Size = new System.Drawing.Size(1328, 62); + // + // + // + this.ribbonPanel1.Style.Class = ""; + this.ribbonPanel1.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonPanel1.StyleMouseDown.Class = ""; + this.ribbonPanel1.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonPanel1.StyleMouseOver.Class = ""; + this.ribbonPanel1.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonPanel1.TabIndex = 1; + this.ribbonPanel1.Visible = false; + // + // ribbonBar21 + // + this.ribbonBar21.AutoOverflowEnabled = true; + this.ribbonBar21.BackColor = System.Drawing.Color.White; + // + // + // + this.ribbonBar21.BackgroundMouseOverStyle.Class = ""; + this.ribbonBar21.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonBar21.BackgroundStyle.Class = ""; + this.ribbonBar21.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar21.ContainerControlProcessDialogKey = true; + this.ribbonBar21.Dock = System.Windows.Forms.DockStyle.Left; + this.ribbonBar21.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { + this.buttonItem87, + this.buttonItem88, + this.buttonItem27, + this.sliderGroundTransSet1, + this.buttonItem91, + this.buttonItem1, + this.btnlegendSet, + this.buttonItem89, + this.btnOutputJPG}); + this.ribbonBar21.Location = new System.Drawing.Point(3, 0); + this.ribbonBar21.Name = "ribbonBar21"; + this.ribbonBar21.Size = new System.Drawing.Size(649, 59); + this.ribbonBar21.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.ribbonBar21.TabIndex = 2; + this.ribbonBar21.Text = "浏览模式"; + // + // + // + this.ribbonBar21.TitleStyle.Class = ""; + this.ribbonBar21.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonBar21.TitleStyleMouseOver.Class = ""; + this.ribbonBar21.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar21.TitleVisible = false; + // + // buttonItem87 + // + this.buttonItem87.Image = ((System.Drawing.Image)(resources.GetObject("buttonItem87.Image"))); + this.buttonItem87.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem87.Name = "buttonItem87"; + this.buttonItem87.SubItemsExpandWidth = 14; + this.buttonItem87.Text = "地上模式"; + this.buttonItem87.Click += new System.EventHandler(this.buttonItem87_Click); + // + // buttonItem88 + // + this.buttonItem88.Image = ((System.Drawing.Image)(resources.GetObject("buttonItem88.Image"))); + this.buttonItem88.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem88.Name = "buttonItem88"; + this.buttonItem88.SubItemsExpandWidth = 14; + this.buttonItem88.Text = "地下模式"; + this.buttonItem88.Click += new System.EventHandler(this.buttonItem88_Click); + // + // buttonItem27 + // + this.buttonItem27.Image = ((System.Drawing.Image)(resources.GetObject("buttonItem27.Image"))); + this.buttonItem27.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem27.Name = "buttonItem27"; + this.buttonItem27.SubItemsExpandWidth = 14; + this.buttonItem27.Text = "行走模式"; + this.buttonItem27.Click += new System.EventHandler(this.buttonItem27_Click); + // + // buttonItem91 + // + this.buttonItem91.ForeColor = System.Drawing.Color.Black; + this.buttonItem91.Image = ((System.Drawing.Image)(resources.GetObject("buttonItem91.Image"))); + this.buttonItem91.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem91.Name = "buttonItem91"; + this.buttonItem91.SubItemsExpandWidth = 14; + this.buttonItem91.Text = "快速定位"; + this.buttonItem91.Click += new System.EventHandler(this.buttonItem91_Click); + // + // buttonItem1 + // + this.buttonItem1.Image = ((System.Drawing.Image)(resources.GetObject("buttonItem1.Image"))); + this.buttonItem1.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem1.Name = "buttonItem1"; + this.buttonItem1.SubItemsExpandWidth = 14; + this.buttonItem1.Text = "图层管理"; + this.buttonItem1.Click += new System.EventHandler(this.buttonItem1_Click); + // + // btnlegendSet + // + this.btnlegendSet.Image = ((System.Drawing.Image)(resources.GetObject("btnlegendSet.Image"))); + this.btnlegendSet.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.btnlegendSet.Name = "btnlegendSet"; + this.btnlegendSet.SubItemsExpandWidth = 14; + this.btnlegendSet.Text = "图例"; + this.btnlegendSet.Click += new System.EventHandler(this.btnlegendSet_Click); + // + // buttonItem89 + // + this.buttonItem89.Image = ((System.Drawing.Image)(resources.GetObject("buttonItem89.Image"))); + this.buttonItem89.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem89.Name = "buttonItem89"; + this.buttonItem89.SubItemsExpandWidth = 14; + this.buttonItem89.Text = "全屏显示"; + this.buttonItem89.Click += new System.EventHandler(this.buttonItem89_Click); + // + // btnOutputJPG + // + this.btnOutputJPG.Image = ((System.Drawing.Image)(resources.GetObject("btnOutputJPG.Image"))); + this.btnOutputJPG.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.btnOutputJPG.Name = "btnOutputJPG"; + this.btnOutputJPG.SubItemsExpandWidth = 14; + this.btnOutputJPG.Text = "导出图片"; + this.btnOutputJPG.Click += new System.EventHandler(this.btnOutputJPG_Click); + // + // ribbonPanel12 + // + this.ribbonPanel12.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.ribbonPanel12.Controls.Add(this.ribbonBar18); + this.ribbonPanel12.Controls.Add(this.ribbonBar13); + this.ribbonPanel12.Dock = System.Windows.Forms.DockStyle.Fill; + this.ribbonPanel12.Location = new System.Drawing.Point(0, 33); + this.ribbonPanel12.Name = "ribbonPanel12"; + this.ribbonPanel12.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); + this.ribbonPanel12.Size = new System.Drawing.Size(1328, 62); + // + // + // + this.ribbonPanel12.Style.Class = ""; + this.ribbonPanel12.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonPanel12.StyleMouseDown.Class = ""; + this.ribbonPanel12.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonPanel12.StyleMouseOver.Class = ""; + this.ribbonPanel12.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonPanel12.TabIndex = 34; + this.ribbonPanel12.Visible = false; + // + // ribbonBar18 + // + this.ribbonBar18.AutoOverflowEnabled = true; + // + // + // + this.ribbonBar18.BackgroundMouseOverStyle.Class = ""; + this.ribbonBar18.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonBar18.BackgroundStyle.Class = ""; + this.ribbonBar18.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar18.ContainerControlProcessDialogKey = true; + this.ribbonBar18.Dock = System.Windows.Forms.DockStyle.Left; + this.ribbonBar18.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { + this.buttonItem133, + this.buttonItem132}); + this.ribbonBar18.Location = new System.Drawing.Point(508, 0); + this.ribbonBar18.Name = "ribbonBar18"; + this.ribbonBar18.Size = new System.Drawing.Size(75, 59); + this.ribbonBar18.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.ribbonBar18.TabIndex = 1; + // + // + // + this.ribbonBar18.TitleStyle.Class = ""; + this.ribbonBar18.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonBar18.TitleStyleMouseOver.Class = ""; + this.ribbonBar18.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar18.TitleVisible = false; + // + // buttonItem133 + // + this.buttonItem133.Image = ((System.Drawing.Image)(resources.GetObject("buttonItem133.Image"))); + this.buttonItem133.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem133.Name = "buttonItem133"; + this.buttonItem133.SubItemsExpandWidth = 14; + this.buttonItem133.Text = "审核入库"; + this.buttonItem133.Click += new System.EventHandler(this.buttonItem133_Click_1); + // + // buttonItem132 + // + this.buttonItem132.Name = "buttonItem132"; + // + // ribbonBar13 + // + this.ribbonBar13.AutoOverflowEnabled = true; + // + // + // + this.ribbonBar13.BackgroundMouseOverStyle.Class = ""; + this.ribbonBar13.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonBar13.BackgroundStyle.Class = ""; + this.ribbonBar13.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar13.ContainerControlProcessDialogKey = true; + this.ribbonBar13.Dock = System.Windows.Forms.DockStyle.Left; + this.ribbonBar13.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { + this.buttonItem127, + this.buttonItem128, + this.sliderItem1, + this.buttonItem134, + this.buttonItem130, + this.btn_check_history}); + this.ribbonBar13.Location = new System.Drawing.Point(3, 0); + this.ribbonBar13.Name = "ribbonBar13"; + this.ribbonBar13.Size = new System.Drawing.Size(505, 59); + this.ribbonBar13.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.ribbonBar13.TabIndex = 0; + // + // + // + this.ribbonBar13.TitleStyle.Class = ""; + this.ribbonBar13.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonBar13.TitleStyleMouseOver.Class = ""; + this.ribbonBar13.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar13.TitleVisible = false; + // + // buttonItem127 + // + this.buttonItem127.Image = ((System.Drawing.Image)(resources.GetObject("buttonItem127.Image"))); + this.buttonItem127.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem127.Name = "buttonItem127"; + this.buttonItem127.SubItemsExpandWidth = 14; + this.buttonItem127.Text = "打开数据"; + this.buttonItem127.Click += new System.EventHandler(this.buttonItem127_Click_2); + // + // buttonItem128 + // + this.buttonItem128.Image = ((System.Drawing.Image)(resources.GetObject("buttonItem128.Image"))); + this.buttonItem128.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem128.Name = "buttonItem128"; + this.buttonItem128.SubItemsExpandWidth = 14; + this.buttonItem128.Text = "一键审核"; + this.buttonItem128.Click += new System.EventHandler(this.buttonItem128_Click); + // + // sliderItem1 + // + this.sliderItem1.LabelPosition = DevComponents.DotNetBar.eSliderLabelPosition.Top; + this.sliderItem1.LabelWidth = 50; + this.sliderItem1.Name = "sliderItem1"; + this.sliderItem1.Text = "地面透明度"; + this.sliderItem1.TextColor = System.Drawing.Color.Black; + this.sliderItem1.Value = 0; + this.sliderItem1.ValueChanged += new System.EventHandler(this.sliderItem1_ValueChanged); + // + // buttonItem134 + // + this.buttonItem134.Image = ((System.Drawing.Image)(resources.GetObject("buttonItem134.Image"))); + this.buttonItem134.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem134.Name = "buttonItem134"; + this.buttonItem134.SubItemsExpandWidth = 14; + this.buttonItem134.Text = "模拟设计修改"; + this.buttonItem134.Click += new System.EventHandler(this.buttonItem134_Click_1); + // + // buttonItem130 + // + this.buttonItem130.Image = ((System.Drawing.Image)(resources.GetObject("buttonItem130.Image"))); + this.buttonItem130.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem130.Name = "buttonItem130"; + this.buttonItem130.SubItemsExpandWidth = 14; + this.buttonItem130.Text = "导出审核图"; + this.buttonItem130.Click += new System.EventHandler(this.buttonItem130_Click_1); + // + // btn_check_history + // + this.btn_check_history.Image = ((System.Drawing.Image)(resources.GetObject("btn_check_history.Image"))); + this.btn_check_history.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.btn_check_history.Name = "btn_check_history"; + this.btn_check_history.SubItemsExpandWidth = 14; + this.btn_check_history.Text = "审核历史"; + this.btn_check_history.Click += new System.EventHandler(this.btn_check_history_Click); + // + // ribbonPanel4 + // + this.ribbonPanel4.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.ribbonPanel4.Controls.Add(this.ribbonBar1); + this.ribbonPanel4.Dock = System.Windows.Forms.DockStyle.Fill; + this.ribbonPanel4.Location = new System.Drawing.Point(0, 33); + this.ribbonPanel4.Name = "ribbonPanel4"; + this.ribbonPanel4.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); + this.ribbonPanel4.Size = new System.Drawing.Size(1328, 62); + // + // + // + this.ribbonPanel4.Style.Class = ""; + this.ribbonPanel4.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonPanel4.StyleMouseDown.Class = ""; + this.ribbonPanel4.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonPanel4.StyleMouseOver.Class = ""; + this.ribbonPanel4.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonPanel4.TabIndex = 36; + this.ribbonPanel4.Visible = false; + // + // ribbonBar1 + // + this.ribbonBar1.AutoOverflowEnabled = true; + // + // + // + this.ribbonBar1.BackgroundMouseOverStyle.Class = ""; + this.ribbonBar1.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonBar1.BackgroundStyle.Class = ""; + this.ribbonBar1.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar1.ContainerControlProcessDialogKey = true; + this.ribbonBar1.Dock = System.Windows.Forms.DockStyle.Left; + this.ribbonBar1.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { + this.btn_document_info}); + this.ribbonBar1.Location = new System.Drawing.Point(3, 0); + this.ribbonBar1.Name = "ribbonBar1"; + this.ribbonBar1.Size = new System.Drawing.Size(88, 59); + this.ribbonBar1.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.ribbonBar1.TabIndex = 0; + // + // + // + this.ribbonBar1.TitleStyle.Class = ""; + this.ribbonBar1.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonBar1.TitleStyleMouseOver.Class = ""; + this.ribbonBar1.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar1.TitleVisible = false; + // + // btn_document_info + // + this.btn_document_info.Image = ((System.Drawing.Image)(resources.GetObject("btn_document_info.Image"))); + this.btn_document_info.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.btn_document_info.Name = "btn_document_info"; + this.btn_document_info.SubItemsExpandWidth = 14; + this.btn_document_info.Text = "文档管理"; + this.btn_document_info.Click += new System.EventHandler(this.btn_document_info_Click); + // // ribbonTabItem1 // this.ribbonTabItem1.ButtonStyle = DevComponents.DotNetBar.eButtonStyle.ImageAndText; @@ -3673,7 +3694,6 @@ this.ribbonTabItem7.Name = "ribbonTabItem7"; this.ribbonTabItem7.Panel = this.ribbonPanel7; this.ribbonTabItem7.Text = "管线定位"; - this.ribbonTabItem7.MouseDown += new System.Windows.Forms.MouseEventHandler(this.ribbonTabItem7_MouseDown); // // ribbonTabItem5 // @@ -3684,7 +3704,6 @@ this.ribbonTabItem5.Name = "ribbonTabItem5"; this.ribbonTabItem5.Panel = this.ribbonPanel3; this.ribbonTabItem5.Text = "标识器管理"; - this.ribbonTabItem5.MouseDown += new System.Windows.Forms.MouseEventHandler(this.ribbonTabItem5_MouseDown); // // ribbonTabItem2 // @@ -4451,7 +4470,7 @@ this.dataGridViewX2.ReadOnly = true; this.dataGridViewX2.RowHeadersVisible = false; this.dataGridViewX2.RowTemplate.Height = 23; - this.dataGridViewX2.Size = new System.Drawing.Size(31081, 92); + this.dataGridViewX2.Size = new System.Drawing.Size(31378, 92); this.dataGridViewX2.TabIndex = 11; // // dataGridViewTextBoxColumn10 @@ -4545,7 +4564,7 @@ this.dataGridViewX3.ReadOnly = true; this.dataGridViewX3.RowHeadersVisible = false; this.dataGridViewX3.RowTemplate.Height = 23; - this.dataGridViewX3.Size = new System.Drawing.Size(31080, 127); + this.dataGridViewX3.Size = new System.Drawing.Size(31377, 127); this.dataGridViewX3.TabIndex = 5; this.dataGridViewX3.MouseDoubleClick += new System.Windows.Forms.MouseEventHandler(this.dataGridViewX3_MouseDoubleClick); // @@ -5722,7 +5741,8 @@ // pictureBox1 // this.pictureBox1.Dock = System.Windows.Forms.DockStyle.Top; - this.pictureBox1.Image = ((System.Drawing.Image)(resources.GetObject("pictureBox1.Image"))); +// this.pictureBox1.Image = ((System.Drawing.Image)(resources.GetObject("pictureBox1.Image"))); + this.pictureBox1.Image = Image.FromFile(Application.StartupPath + Utility.TitleImagePath); this.pictureBox1.Location = new System.Drawing.Point(0, 0); this.pictureBox1.Margin = new System.Windows.Forms.Padding(0); this.pictureBox1.Name = "pictureBox1"; @@ -5732,18 +5752,6 @@ this.pictureBox1.TabStop = false; this.pictureBox1.Paint += new System.Windows.Forms.PaintEventHandler(this.pictureBox1_Paint); // - // layerTree - // - this.layerTree.CheckBoxes = true; - this.layerTree.ItemHeight = 18; - this.layerTree.Location = new System.Drawing.Point(30, 78); - this.layerTree.Name = "layerTree"; - this.layerTree.Size = new System.Drawing.Size(121, 97); - this.layerTree.TabIndex = 1; - this.layerTree.AfterCheck += new System.Windows.Forms.TreeViewEventHandler(this.layerTree_AfterCheck); - this.layerTree.NodeMouseClick += new System.Windows.Forms.TreeNodeMouseClickEventHandler(this.layerTree_NodeMouseClick); - this.layerTree.NodeMouseDoubleClick += new System.Windows.Forms.TreeNodeMouseClickEventHandler(this.layerTree_NodeMouseDoubleClick); - // // MainFrm // this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Inherit; @@ -5770,7 +5778,8 @@ this.KeyPreview = true; this.Name = "MainFrm"; this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen; - this.Text = "智慧太湖新城管网规划分析系统6.0"; +// this.Text = "智慧太湖新城管网规划分析系统6.0"; + this.Text = Utility.SysnameVersion; this.WindowState = System.Windows.Forms.FormWindowState.Maximized; this.FormClosing += new System.Windows.Forms.FormClosingEventHandler(this.MainFrm_FormClosing); this.Load += new System.EventHandler(this.MainFrm_Load); @@ -5787,15 +5796,15 @@ this.contextMenuStripDeleteLayerNode.ResumeLayout(false); this.ribbonControl1.ResumeLayout(false); this.ribbonControl1.PerformLayout(); + this.ribbonPanel3.ResumeLayout(false); + this.ribbonPanel7.ResumeLayout(false); + this.ribbonPanel15.ResumeLayout(false); + this.ribbonPanel2.ResumeLayout(false); this.ribbonPanel6.ResumeLayout(false); this.ribbonPanel5.ResumeLayout(false); this.ribbonPanel1.ResumeLayout(false); this.ribbonPanel12.ResumeLayout(false); this.ribbonPanel4.ResumeLayout(false); - this.ribbonPanel15.ResumeLayout(false); - this.ribbonPanel3.ResumeLayout(false); - this.ribbonPanel7.ResumeLayout(false); - this.ribbonPanel2.ResumeLayout(false); this.panelOfTable.ResumeLayout(false); this.panelOfTable.PerformLayout(); ((System.ComponentModel.ISupportInitialize)(this.dataGridViewX1)).EndInit(); @@ -5955,6 +5964,7 @@ private RibbonTabItem ribbonTabItem11; private ButtonItem buttonItem130; private RibbonBar ribbonBar18; + private ButtonItem buttonItem132; private SliderItem sliderItem1; private ButtonItem buttonItem133; private ButtonItem buttonItem134; diff --git a/MainFrm.resx b/MainFrm.resx index 9f9bba4..ce490c1 100644 --- a/MainFrm.resx +++ b/MainFrm.resx @@ -351,6 +351,146 @@ 766, 54 + + + iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 + YQUAAAAZdEVYdFNvZnR3YXJlAEFkb2JlIEltYWdlUmVhZHlxyWU8AAADZmlUWHRYTUw6Y29tLmFkb2Jl + LnhtcAAAAAAAPD94cGFja2V0IGJlZ2luPSLvu78iIGlkPSJXNU0wTXBDZWhpSHpyZVN6TlRjemtjOWQi + Pz4gPHg6eG1wbWV0YSB4bWxuczp4PSJhZG9iZTpuczptZXRhLyIgeDp4bXB0az0iQWRvYmUgWE1QIENv + cmUgNS4zLWMwMTEgNjYuMTQ1NjYxLCAyMDEyLzAyLzA2LTE0OjU2OjI3ICAgICAgICAiPiA8cmRmOlJE + RiB4bWxuczpyZGY9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkvMDIvMjItcmRmLXN5bnRheC1ucyMiPiA8 + cmRmOkRlc2NyaXB0aW9uIHJkZjphYm91dD0iIiB4bWxuczp4bXBNTT0iaHR0cDovL25zLmFkb2JlLmNv + bS94YXAvMS4wL21tLyIgeG1sbnM6c3RSZWY9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlw + ZS9SZXNvdXJjZVJlZiMiIHhtbG5zOnhtcD0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wLyIgeG1w + TU06T3JpZ2luYWxEb2N1bWVudElEPSJ4bXAuZGlkOjYzQTM5NEY4Mjg0OUU0MTE5NDBEQTc4ODZEQzk5 + N0NGIiB4bXBNTTpEb2N1bWVudElEPSJ4bXAuZGlkOjEwQ0IxNzBBNEM1QzExRTRBNkNGQzRBMjhDQzI0 + MkY4IiB4bXBNTTpJbnN0YW5jZUlEPSJ4bXAuaWlkOjEwQ0IxNzA5NEM1QzExRTRBNkNGQzRBMjhDQzI0 + MkY4IiB4bXA6Q3JlYXRvclRvb2w9IkFkb2JlIFBob3Rvc2hvcCBDUzYgKFdpbmRvd3MpIj4gPHhtcE1N + OkRlcml2ZWRGcm9tIHN0UmVmOmluc3RhbmNlSUQ9InhtcC5paWQ6NTEzMDNDMjA1QjRDRTQxMTg4NERE + MUVBOEQ4QTgyNTUiIHN0UmVmOmRvY3VtZW50SUQ9InhtcC5kaWQ6NjNBMzk0RjgyODQ5RTQxMTk0MERB + Nzg4NkRDOTk3Q0YiLz4gPC9yZGY6RGVzY3JpcHRpb24+IDwvcmRmOlJERj4gPC94OnhtcG1ldGE+IDw/ + eHBhY2tldCBlbmQ9InIiPz43wa2/AAAFaUlEQVRIS6WUC0xTVxzGKy0UkSmlFGjBFilSkNpSaAWRh63y + sIiAArKs4spLRLQoiEJlSMGoMCc6CBOnYHzMOHUqqOhEHOqCbjNu6kCd6KYje5mZ6KbObd/OuVL3cEzj + /skv997/+b7v39PTW9aj3/BM+OKxPEIZoW/gyrOuPbP+GvRPSNBQQqXYLwSW1etw7cYt5kqfaZ+uD8QM + Xg8f/f4UxGhHMHv4qlG6vAb9394G6T+BPpdV1oCuUx3VD8Q9XT8//PUJRMghlLhLg1C41IK+r/pB+oNC + 16mO6qmP+gdi/6y793+hwTYEk9uoQOSaStHzxQ2Q/nND9XMKy0D9NIfmDcSzaLhI4KXE7LwinLtwGXfu + PXhhqJ/m0DyS62EdUGWpqcf3P97DD3d++t/QnKraBjpghXWAiC+WN0ZNScOe1mP45vbdF2ZvWwdoDs/D + b6ejs6ecxHPoAG/l+Fhkzy+FyCcY0YkG7D/yAW5+d+e5oXrqo36aQ/McnNyjyAAuHWA05pfgzPlehhyT + mflV6FOMaDt2Ctf7bw8KXac6qqc+a4Zx3hLwRLJCZgcJjcPIEPkyIZmeX1SB7vOX0dn9KQy5jw8r8eVc + HOrsxidXP0d9hxlzd4QgeYMzEt7kQVvOR0pFFNpOHmd81E9znIS+dSTc1foVGWfNKUZjyy6Ex6SQl0cD + 09IVxHAFh0+cReqr+QjK8ERqEw+VHWOwoycSR/v1OHwzDlsvhcNCeqkbedAYxQiPm87kZOQVw0nkW0QG + 2DFnIA+JRm3DFpzr/RKNW3ZDE5UAsX8ocizZiFs7DEUHvPFunw4Hb05B+y09jn49lYHe0x5doxqqLVlf + DJrnyB+pIQNs6QAhf6R8tZu3CqpwPdZu2I6PLl3HwnV5iHv9JVSeUOKdqzq81xeDvddiYG73R0aLEIZm + IRa1jUbjxQnYRHa17YqW0VJPwHT3LocRbirrDiymspXo6L6AgiXV8JSNQ2i6GpNWOqK4U4n1n0Vge68W + 9ecmIKnBBSqDCIp4P2RWGDB/QxqS6l1QcToIld3BqDobgsXEQ73+Se5HrGcgdJEokGzIx66DXXi7dRvC + yx2Q2RqApR+GoPbjCag8pUZ6sxjqWRKEldljRr07ZjaKmHt5qpBZKzkeiIJ2BbIPKmA8MIbJUC/ghrM0 + RfYsDtdhqJNIVulK/ku0BQokbfZGZrsKBR3BmEsMOfvl0FY7o7ypDPo1brCcGc+QUCdExabXEFsjQO4B + ObL2BSBlqx8SWwibvBE0334nK3Ael+yEbIW81DZszlhZ2oieuAYvpO5VIHGzP9J2+CN9pz/CzDwExMox + eZUbFnZpkEc+gLZagJjMWOiqXZDVqmC0+kZf6Nb4IHKFCPIsu92sgCw7BlJswjBJLCdenmuPyFUS6Gp9 + oG/yRdJWGSKqhYjKDgLRImK5ACGlzsy9d/zwXn2DBMZDSkZLPaHlnpBncyGO5kxj+Rps/wYdJE2xzfOb + zcU4sye0b0gRu3E0Ypt8ELTICRFGNcShUgjHuZyWxNu2096sdiXS9o1ltNQjyyDhes4SkuXEGpXC+Ve8 + kjlzpDPtoCkVQrdOihgyIHmXP6LryGEX86Ba6ISJNR7IeF+JV8gAfbOM0XoTj8dktpmEOxM4rJHTBscz + njNNnMiBagEfU98ajRnbZMg7GojCk2oGU1cw5nUGw7BHAZWJD6oVhLFzSDCPCacljGP/J7xAm6Hu0ew6 + STIXkcvckN7ig8XHVCjvUiNvdwAmW0Twms6FayS7meM4REoihxPoeT4u10nsZ0LKhhdsIxZEsVcLtOyL + pHffVcd+IJjI7uGHsRscJEPURMMn2FMtNTwuFusPrjFl48ji7nIAAAAASUVORK5CYII= + + + + + iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 + YQUAAAAZdEVYdFNvZnR3YXJlAEFkb2JlIEltYWdlUmVhZHlxyWU8AAADZmlUWHRYTUw6Y29tLmFkb2Jl + LnhtcAAAAAAAPD94cGFja2V0IGJlZ2luPSLvu78iIGlkPSJXNU0wTXBDZWhpSHpyZVN6TlRjemtjOWQi + Pz4gPHg6eG1wbWV0YSB4bWxuczp4PSJhZG9iZTpuczptZXRhLyIgeDp4bXB0az0iQWRvYmUgWE1QIENv + cmUgNS4zLWMwMTEgNjYuMTQ1NjYxLCAyMDEyLzAyLzA2LTE0OjU2OjI3ICAgICAgICAiPiA8cmRmOlJE + RiB4bWxuczpyZGY9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkvMDIvMjItcmRmLXN5bnRheC1ucyMiPiA8 + cmRmOkRlc2NyaXB0aW9uIHJkZjphYm91dD0iIiB4bWxuczp4bXBNTT0iaHR0cDovL25zLmFkb2JlLmNv + bS94YXAvMS4wL21tLyIgeG1sbnM6c3RSZWY9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlw + ZS9SZXNvdXJjZVJlZiMiIHhtbG5zOnhtcD0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wLyIgeG1w + TU06T3JpZ2luYWxEb2N1bWVudElEPSJ4bXAuZGlkOjYzQTM5NEY4Mjg0OUU0MTE5NDBEQTc4ODZEQzk5 + N0NGIiB4bXBNTTpEb2N1bWVudElEPSJ4bXAuZGlkOkUyMTg3NjEyNDlEODExRTQ4NjNGQjM2Mzk1QkNB + RkQwIiB4bXBNTTpJbnN0YW5jZUlEPSJ4bXAuaWlkOkUyMTg3NjExNDlEODExRTQ4NjNGQjM2Mzk1QkNB + RkQwIiB4bXA6Q3JlYXRvclRvb2w9IkFkb2JlIFBob3Rvc2hvcCBDUzYgKFdpbmRvd3MpIj4gPHhtcE1N + OkRlcml2ZWRGcm9tIHN0UmVmOmluc3RhbmNlSUQ9InhtcC5paWQ6NkJCNTE0NDlEODQ5RTQxMUE0QzNB + MjdEOTJBQzc3QkMiIHN0UmVmOmRvY3VtZW50SUQ9InhtcC5kaWQ6NjNBMzk0RjgyODQ5RTQxMTk0MERB + Nzg4NkRDOTk3Q0YiLz4gPC9yZGY6RGVzY3JpcHRpb24+IDwvcmRmOlJERj4gPC94OnhtcG1ldGE+IDw/ + eHBhY2tldCBlbmQ9InIiPz5e5MstAAADiUlEQVRIS+2UW0yTdxjGcePwtYyVVpAUCi1tv9ImrVbxhAei + kjGphAgFT4jzEJ0gGuJhDk0sml0sglmWmC1hqHNKWwI4srgNh3phpjg1O1yIN5DMbFHQZUu42O76+D4f + 3Fl6Z7ILn+SXvH3f533++X/98iUBeKW81v9Uwx1G1+1240EhfKfdeE/4U3qTAqaZZO/2aeN9IXLrY+Ph + wVOZHll9YyohgYZOGS4JsYdXVDy+NQ8Tvy3BP6OlmPyjDP9OBDRYs8cZPfRy5/uQISIRqcIsLSye+j7I + wN+PluOvhyWY+NmL8fsOjP9kxdN7BRh/YJHfFjy5m48nd4ThQjy968bEgwV49usicFciTEKKFhZPXXv1 + eHxtLsYGPBjttwsWjF0xY+ybOfj9uylYs8cZPfQS7kpEnqDTwuLp9GYlfKZeifUfzcb1j/Iw/IkNv3Q6 + MfKVC6O9bg3W7HFGD73cORlMG5AIizDzAaVtunD5ESXWfNSEY/tNCO00oG1zOkJBBSeqUjVYh6R3Qmat + zSY0Hjah7IASW7hPuSoRvIGihcVTSauCppvFODRUjJZvPWgaKMTuXgt2RHOxLTwHDd3EjPfCudgesWJX + jxM7eryo7/Ni8SGFj8gp6LWwePLvS0Og043A5y5UdtkQOJeLivM5ePf8bJSfM04zG2u7chDoysW6Thsq + zqpY0+GAvymNB/gEgxYWT64tKdGihpSYv8WEpSEzVp0pwDuf2SVQReCiS4M1e5zRQy937NXJ1yRirjDz + AVmVJyNZa9+PObauh7ptKdR6FY6N2SisTYe1OlmDNXtqvRNqwxLYt1TCVLY1ZijZOSQRbuEtLSyeTOXH + sfLDH1EauoFFx6/Cd6Qf7pYI1ObLsO+9iMLdF+DccwEuqd2Nl+Br6sbCxiiKd/XBuPogH1HiAzJXHMC8 + YA98td1wb4rCuaEH1roo8oMR5JGaMPIFa10Ejtowiuouw1vzJTwVXyBz+X4ekPgRZfgbohkLtsfMy47B + tqYdakUnPFUM6YUv+LUGa/Y4o8e8rBXcSffWDkpE4j9ZpEvNmb9KsZV16BzrBnVq1YjeVf1MX1Tzn74o + iCmkdq1/LrNHOkfgB6Vg9afJRrVOdv2ClRkMmklvCnyPs4V8ge81v5RegddnCGHNHmf00JslcJcZCcWv + IU1pAhcyhLcFXj1zGtbscUYPvdyZ+Uv6Wi8rKekFBjoX2627by8AAAAASUVORK5CYII= + + + + + iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 + YQUAAAAZdEVYdFNvZnR3YXJlAEFkb2JlIEltYWdlUmVhZHlxyWU8AAADZmlUWHRYTUw6Y29tLmFkb2Jl + LnhtcAAAAAAAPD94cGFja2V0IGJlZ2luPSLvu78iIGlkPSJXNU0wTXBDZWhpSHpyZVN6TlRjemtjOWQi + Pz4gPHg6eG1wbWV0YSB4bWxuczp4PSJhZG9iZTpuczptZXRhLyIgeDp4bXB0az0iQWRvYmUgWE1QIENv + cmUgNS4zLWMwMTEgNjYuMTQ1NjYxLCAyMDEyLzAyLzA2LTE0OjU2OjI3ICAgICAgICAiPiA8cmRmOlJE + RiB4bWxuczpyZGY9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkvMDIvMjItcmRmLXN5bnRheC1ucyMiPiA8 + cmRmOkRlc2NyaXB0aW9uIHJkZjphYm91dD0iIiB4bWxuczp4bXBNTT0iaHR0cDovL25zLmFkb2JlLmNv + bS94YXAvMS4wL21tLyIgeG1sbnM6c3RSZWY9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlw + ZS9SZXNvdXJjZVJlZiMiIHhtbG5zOnhtcD0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wLyIgeG1w + TU06T3JpZ2luYWxEb2N1bWVudElEPSJ4bXAuZGlkOjYzQTM5NEY4Mjg0OUU0MTE5NDBEQTc4ODZEQzk5 + N0NGIiB4bXBNTTpEb2N1bWVudElEPSJ4bXAuZGlkOkE2Q0VGMDE2NDlEQTExRTQ4NTlCQTI3NTMyOEY5 + NEU2IiB4bXBNTTpJbnN0YW5jZUlEPSJ4bXAuaWlkOkE2Q0VGMDE1NDlEQTExRTQ4NTlCQTI3NTMyOEY5 + NEU2IiB4bXA6Q3JlYXRvclRvb2w9IkFkb2JlIFBob3Rvc2hvcCBDUzYgKFdpbmRvd3MpIj4gPHhtcE1N + OkRlcml2ZWRGcm9tIHN0UmVmOmluc3RhbmNlSUQ9InhtcC5paWQ6NjA1MjM3NzFEOTQ5RTQxMUE0QzNB + MjdEOTJBQzc3QkMiIHN0UmVmOmRvY3VtZW50SUQ9InhtcC5kaWQ6NjNBMzk0RjgyODQ5RTQxMTk0MERB + Nzg4NkRDOTk3Q0YiLz4gPC9yZGY6RGVzY3JpcHRpb24+IDwvcmRmOlJERj4gPC94OnhtcG1ldGE+IDw/ + eHBhY2tldCBlbmQ9InIiPz6UH16BAAABrElEQVRIS63N70tTURzH8fsnKSGCCEIQCBKISMq2iILCgQOL + JUxQAoVKdMGQuwgWFepsMGjFZCMuorsIJV4WFatpvzdr1ZAFsaIHn8559v1eDsI91wevJ/ee7/tjbMRH + fAFwJOWRF6oopTzyQhWlVEdBwRbgUhICAnuvilKGtXDGzW6WV/CvbjE/xTfxr+R6q4xSxtP5YTf8rVn4 + s5dG+809Rv5zvVVGKaNwfYgyBfhksoH83CCF9seiL7LBBnLXTlP4/W4dza0ZLS0nCdlgA9npAQq/qk/Q + sKa0NJ8nIBtsIBPrp9CqPMJBYVLLj+04ZIMNrF49ReHwVRafH1/R8m3zJmSDDdy/fJJC88Ua3mcjWurW + LGSDDaQifRS+O8uopsNaPhVnIBts4E64l0Jj5y4qDy5q+ZCPQTbYgHmph8LXZ0m8TJ3Xsp+LQjbYQOJC + N4XadgLl22e1vM1OQDbYwK1zXRS+lBbhmEHsLgU8kTeVh+OQDTawEDpB2U4mitfpMS22GYJssIH5QCcV + FGwBmuRtkA3cGO3whcZUlEdeqKKU8sgLVZRSfjw+MP4DJ2GPpDR9OIsAAAAASUVORK5CYII= + + + + + iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 + YQUAAAAZdEVYdFNvZnR3YXJlAEFkb2JlIEltYWdlUmVhZHlxyWU8AAADZmlUWHRYTUw6Y29tLmFkb2Jl + LnhtcAAAAAAAPD94cGFja2V0IGJlZ2luPSLvu78iIGlkPSJXNU0wTXBDZWhpSHpyZVN6TlRjemtjOWQi + Pz4gPHg6eG1wbWV0YSB4bWxuczp4PSJhZG9iZTpuczptZXRhLyIgeDp4bXB0az0iQWRvYmUgWE1QIENv + cmUgNS4zLWMwMTEgNjYuMTQ1NjYxLCAyMDEyLzAyLzA2LTE0OjU2OjI3ICAgICAgICAiPiA8cmRmOlJE + RiB4bWxuczpyZGY9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkvMDIvMjItcmRmLXN5bnRheC1ucyMiPiA8 + cmRmOkRlc2NyaXB0aW9uIHJkZjphYm91dD0iIiB4bWxuczp4bXBNTT0iaHR0cDovL25zLmFkb2JlLmNv + bS94YXAvMS4wL21tLyIgeG1sbnM6c3RSZWY9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlw + ZS9SZXNvdXJjZVJlZiMiIHhtbG5zOnhtcD0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wLyIgeG1w + TU06T3JpZ2luYWxEb2N1bWVudElEPSJ4bXAuZGlkOjYzQTM5NEY4Mjg0OUU0MTE5NDBEQTc4ODZEQzk5 + N0NGIiB4bXBNTTpEb2N1bWVudElEPSJ4bXAuZGlkOjJGRTU5OEQ1NDlEQjExRTRBRUVDOTkyMjQ5NzEw + REUwIiB4bXBNTTpJbnN0YW5jZUlEPSJ4bXAuaWlkOjJGRTU5OEQ0NDlEQjExRTRBRUVDOTkyMjQ5NzEw + REUwIiB4bXA6Q3JlYXRvclRvb2w9IkFkb2JlIFBob3Rvc2hvcCBDUzYgKFdpbmRvd3MpIj4gPHhtcE1N + OkRlcml2ZWRGcm9tIHN0UmVmOmluc3RhbmNlSUQ9InhtcC5paWQ6MTY0MkI1RjlEQTQ5RTQxMUE0QzNB + MjdEOTJBQzc3QkMiIHN0UmVmOmRvY3VtZW50SUQ9InhtcC5kaWQ6NjNBMzk0RjgyODQ5RTQxMTk0MERB + Nzg4NkRDOTk3Q0YiLz4gPC9yZGY6RGVzY3JpcHRpb24+IDwvcmRmOlJERj4gPC94OnhtcG1ldGE+IDw/ + eHBhY2tldCBlbmQ9InIiPz6B5sF9AAACe0lEQVRIS7WVb2jMcRzHL7UHanF/Mts5prE/1li3kAfu5Ak7 + 5IHNobBkSC2UIuGJkrrSWRvTmHQWK8U1T8jqUtYwkZpaGjV/Js6to5YwfXze39+fu/v23f36hXe9us+f + 7/v9rd/dr3MQ0X/F4Zm3+K9QhWajNNlBFZqN0mQHS6lMdrCUyqSgimllUsy4XmOmp+QRDllQWbygjjq6 + uimZStOX8a+ixox3pXrM1JLCDAqYJmY7c669M0bff07mcLbtEl9QE8k6V6BH5ooXMsHZZX7ae+AY7W45 + SrPm19LbsSR9m/iRA2bYGefggVePzUgKBzeu9sQpmZ4QcG/WMtk7eLjv0WMz0kOz+TX6MUXvP6cFeNbD + bz6YvQFm2Bk9PPByZO6jksLB5KvRTzTyLikIrG2ktsvXzd4g2hGjYP1ms4eHvb850qkl65LCQW/ntVs0 + 9HpMcPx0K1X4V1Ff/3NzhnphbVDsjBk8Lm/VE44s0ZJ1KS4Ie8uXUvPBE7Tn0ElCzTMqrV5BO/cfEaDG + TD5X6PFFONLygsTF7jj1vxihyPkYNTS1iFrFxm37KHIhJmp43L7qZxzp0pJ1SeHhQGgLJQaH6fb9R1QX + 2EB3Ek9FryLe95j8K9eLT/TB0FZcskOP1iRdkIh23aR7Ay9pzaZddKY9Jup8nIpeoXXhZlHD655b85Bj + p2npLOmCML+dD/iTZhaX3+UvbRB1PpzeygFnSUUvatecRUMzisoOc+x0LZ3FixxYhQyK1cxyZhkTYhqY + RgnM6hmcwVl4ljDI0KS4AC+Kmyli8Jv2MF7GNwXY4QzOwgNv5mWTL7CLpVQmO1hKZbKDpVR/1P8OcvwB + lh7gOXXZq9sAAAAASUVORK5CYII= + + iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 @@ -598,147 +738,7 @@ 1BGxz38BvCwLsyQ3iHgAAAAASUVORK5CYII= - - - iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAZdEVYdFNvZnR3YXJlAEFkb2JlIEltYWdlUmVhZHlxyWU8AAADZmlUWHRYTUw6Y29tLmFkb2Jl - LnhtcAAAAAAAPD94cGFja2V0IGJlZ2luPSLvu78iIGlkPSJXNU0wTXBDZWhpSHpyZVN6TlRjemtjOWQi - Pz4gPHg6eG1wbWV0YSB4bWxuczp4PSJhZG9iZTpuczptZXRhLyIgeDp4bXB0az0iQWRvYmUgWE1QIENv - cmUgNS4zLWMwMTEgNjYuMTQ1NjYxLCAyMDEyLzAyLzA2LTE0OjU2OjI3ICAgICAgICAiPiA8cmRmOlJE - RiB4bWxuczpyZGY9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkvMDIvMjItcmRmLXN5bnRheC1ucyMiPiA8 - cmRmOkRlc2NyaXB0aW9uIHJkZjphYm91dD0iIiB4bWxuczp4bXBNTT0iaHR0cDovL25zLmFkb2JlLmNv - bS94YXAvMS4wL21tLyIgeG1sbnM6c3RSZWY9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlw - ZS9SZXNvdXJjZVJlZiMiIHhtbG5zOnhtcD0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wLyIgeG1w - TU06T3JpZ2luYWxEb2N1bWVudElEPSJ4bXAuZGlkOjYzQTM5NEY4Mjg0OUU0MTE5NDBEQTc4ODZEQzk5 - N0NGIiB4bXBNTTpEb2N1bWVudElEPSJ4bXAuZGlkOjEwQ0IxNzBBNEM1QzExRTRBNkNGQzRBMjhDQzI0 - MkY4IiB4bXBNTTpJbnN0YW5jZUlEPSJ4bXAuaWlkOjEwQ0IxNzA5NEM1QzExRTRBNkNGQzRBMjhDQzI0 - MkY4IiB4bXA6Q3JlYXRvclRvb2w9IkFkb2JlIFBob3Rvc2hvcCBDUzYgKFdpbmRvd3MpIj4gPHhtcE1N - OkRlcml2ZWRGcm9tIHN0UmVmOmluc3RhbmNlSUQ9InhtcC5paWQ6NTEzMDNDMjA1QjRDRTQxMTg4NERE - MUVBOEQ4QTgyNTUiIHN0UmVmOmRvY3VtZW50SUQ9InhtcC5kaWQ6NjNBMzk0RjgyODQ5RTQxMTk0MERB - Nzg4NkRDOTk3Q0YiLz4gPC9yZGY6RGVzY3JpcHRpb24+IDwvcmRmOlJERj4gPC94OnhtcG1ldGE+IDw/ - eHBhY2tldCBlbmQ9InIiPz43wa2/AAAFaUlEQVRIS6WUC0xTVxzGKy0UkSmlFGjBFilSkNpSaAWRh63y - sIiAArKs4spLRLQoiEJlSMGoMCc6CBOnYHzMOHUqqOhEHOqCbjNu6kCd6KYje5mZ6KbObd/OuVL3cEzj - /skv997/+b7v39PTW9aj3/BM+OKxPEIZoW/gyrOuPbP+GvRPSNBQQqXYLwSW1etw7cYt5kqfaZ+uD8QM - Xg8f/f4UxGhHMHv4qlG6vAb9394G6T+BPpdV1oCuUx3VD8Q9XT8//PUJRMghlLhLg1C41IK+r/pB+oNC - 16mO6qmP+gdi/6y793+hwTYEk9uoQOSaStHzxQ2Q/nND9XMKy0D9NIfmDcSzaLhI4KXE7LwinLtwGXfu - PXhhqJ/m0DyS62EdUGWpqcf3P97DD3d++t/QnKraBjpghXWAiC+WN0ZNScOe1mP45vbdF2ZvWwdoDs/D - b6ejs6ecxHPoAG/l+Fhkzy+FyCcY0YkG7D/yAW5+d+e5oXrqo36aQ/McnNyjyAAuHWA05pfgzPlehhyT - mflV6FOMaDt2Ctf7bw8KXac6qqc+a4Zx3hLwRLJCZgcJjcPIEPkyIZmeX1SB7vOX0dn9KQy5jw8r8eVc - HOrsxidXP0d9hxlzd4QgeYMzEt7kQVvOR0pFFNpOHmd81E9znIS+dSTc1foVGWfNKUZjyy6Ex6SQl0cD - 09IVxHAFh0+cReqr+QjK8ERqEw+VHWOwoycSR/v1OHwzDlsvhcNCeqkbedAYxQiPm87kZOQVw0nkW0QG - 2DFnIA+JRm3DFpzr/RKNW3ZDE5UAsX8ocizZiFs7DEUHvPFunw4Hb05B+y09jn49lYHe0x5doxqqLVlf - DJrnyB+pIQNs6QAhf6R8tZu3CqpwPdZu2I6PLl3HwnV5iHv9JVSeUOKdqzq81xeDvddiYG73R0aLEIZm - IRa1jUbjxQnYRHa17YqW0VJPwHT3LocRbirrDiymspXo6L6AgiXV8JSNQ2i6GpNWOqK4U4n1n0Vge68W - 9ecmIKnBBSqDCIp4P2RWGDB/QxqS6l1QcToIld3BqDobgsXEQ73+Se5HrGcgdJEokGzIx66DXXi7dRvC - yx2Q2RqApR+GoPbjCag8pUZ6sxjqWRKEldljRr07ZjaKmHt5qpBZKzkeiIJ2BbIPKmA8MIbJUC/ghrM0 - RfYsDtdhqJNIVulK/ku0BQokbfZGZrsKBR3BmEsMOfvl0FY7o7ypDPo1brCcGc+QUCdExabXEFsjQO4B - ObL2BSBlqx8SWwibvBE0334nK3Ael+yEbIW81DZszlhZ2oieuAYvpO5VIHGzP9J2+CN9pz/CzDwExMox - eZUbFnZpkEc+gLZagJjMWOiqXZDVqmC0+kZf6Nb4IHKFCPIsu92sgCw7BlJswjBJLCdenmuPyFUS6Gp9 - oG/yRdJWGSKqhYjKDgLRImK5ACGlzsy9d/zwXn2DBMZDSkZLPaHlnpBncyGO5kxj+Rps/wYdJE2xzfOb - zcU4sye0b0gRu3E0Ypt8ELTICRFGNcShUgjHuZyWxNu2096sdiXS9o1ltNQjyyDhes4SkuXEGpXC+Ve8 - kjlzpDPtoCkVQrdOihgyIHmXP6LryGEX86Ba6ISJNR7IeF+JV8gAfbOM0XoTj8dktpmEOxM4rJHTBscz - njNNnMiBagEfU98ajRnbZMg7GojCk2oGU1cw5nUGw7BHAZWJD6oVhLFzSDCPCacljGP/J7xAm6Hu0ew6 - STIXkcvckN7ig8XHVCjvUiNvdwAmW0Twms6FayS7meM4REoihxPoeT4u10nsZ0LKhhdsIxZEsVcLtOyL - pHffVcd+IJjI7uGHsRscJEPURMMn2FMtNTwuFusPrjFl48ji7nIAAAAASUVORK5CYII= - - - - - iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAZdEVYdFNvZnR3YXJlAEFkb2JlIEltYWdlUmVhZHlxyWU8AAADZmlUWHRYTUw6Y29tLmFkb2Jl - LnhtcAAAAAAAPD94cGFja2V0IGJlZ2luPSLvu78iIGlkPSJXNU0wTXBDZWhpSHpyZVN6TlRjemtjOWQi - Pz4gPHg6eG1wbWV0YSB4bWxuczp4PSJhZG9iZTpuczptZXRhLyIgeDp4bXB0az0iQWRvYmUgWE1QIENv - cmUgNS4zLWMwMTEgNjYuMTQ1NjYxLCAyMDEyLzAyLzA2LTE0OjU2OjI3ICAgICAgICAiPiA8cmRmOlJE - RiB4bWxuczpyZGY9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkvMDIvMjItcmRmLXN5bnRheC1ucyMiPiA8 - cmRmOkRlc2NyaXB0aW9uIHJkZjphYm91dD0iIiB4bWxuczp4bXBNTT0iaHR0cDovL25zLmFkb2JlLmNv - bS94YXAvMS4wL21tLyIgeG1sbnM6c3RSZWY9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlw - ZS9SZXNvdXJjZVJlZiMiIHhtbG5zOnhtcD0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wLyIgeG1w - TU06T3JpZ2luYWxEb2N1bWVudElEPSJ4bXAuZGlkOjYzQTM5NEY4Mjg0OUU0MTE5NDBEQTc4ODZEQzk5 - N0NGIiB4bXBNTTpEb2N1bWVudElEPSJ4bXAuZGlkOkUyMTg3NjEyNDlEODExRTQ4NjNGQjM2Mzk1QkNB - RkQwIiB4bXBNTTpJbnN0YW5jZUlEPSJ4bXAuaWlkOkUyMTg3NjExNDlEODExRTQ4NjNGQjM2Mzk1QkNB - RkQwIiB4bXA6Q3JlYXRvclRvb2w9IkFkb2JlIFBob3Rvc2hvcCBDUzYgKFdpbmRvd3MpIj4gPHhtcE1N - OkRlcml2ZWRGcm9tIHN0UmVmOmluc3RhbmNlSUQ9InhtcC5paWQ6NkJCNTE0NDlEODQ5RTQxMUE0QzNB - MjdEOTJBQzc3QkMiIHN0UmVmOmRvY3VtZW50SUQ9InhtcC5kaWQ6NjNBMzk0RjgyODQ5RTQxMTk0MERB - Nzg4NkRDOTk3Q0YiLz4gPC9yZGY6RGVzY3JpcHRpb24+IDwvcmRmOlJERj4gPC94OnhtcG1ldGE+IDw/ - eHBhY2tldCBlbmQ9InIiPz5e5MstAAADiUlEQVRIS+2UW0yTdxjGcePwtYyVVpAUCi1tv9ImrVbxhAei - kjGphAgFT4jzEJ0gGuJhDk0sml0sglmWmC1hqHNKWwI4srgNh3phpjg1O1yIN5DMbFHQZUu42O76+D4f - 3Fl6Z7ILn+SXvH3f533++X/98iUBeKW81v9Uwx1G1+1240EhfKfdeE/4U3qTAqaZZO/2aeN9IXLrY+Ph - wVOZHll9YyohgYZOGS4JsYdXVDy+NQ8Tvy3BP6OlmPyjDP9OBDRYs8cZPfRy5/uQISIRqcIsLSye+j7I - wN+PluOvhyWY+NmL8fsOjP9kxdN7BRh/YJHfFjy5m48nd4ThQjy968bEgwV49usicFciTEKKFhZPXXv1 - eHxtLsYGPBjttwsWjF0xY+ybOfj9uylYs8cZPfQS7kpEnqDTwuLp9GYlfKZeifUfzcb1j/Iw/IkNv3Q6 - MfKVC6O9bg3W7HFGD73cORlMG5AIizDzAaVtunD5ESXWfNSEY/tNCO00oG1zOkJBBSeqUjVYh6R3Qmat - zSY0Hjah7IASW7hPuSoRvIGihcVTSauCppvFODRUjJZvPWgaKMTuXgt2RHOxLTwHDd3EjPfCudgesWJX - jxM7eryo7/Ni8SGFj8gp6LWwePLvS0Og043A5y5UdtkQOJeLivM5ePf8bJSfM04zG2u7chDoysW6Thsq - zqpY0+GAvymNB/gEgxYWT64tKdGihpSYv8WEpSEzVp0pwDuf2SVQReCiS4M1e5zRQy937NXJ1yRirjDz - AVmVJyNZa9+PObauh7ptKdR6FY6N2SisTYe1OlmDNXtqvRNqwxLYt1TCVLY1ZijZOSQRbuEtLSyeTOXH - sfLDH1EauoFFx6/Cd6Qf7pYI1ObLsO+9iMLdF+DccwEuqd2Nl+Br6sbCxiiKd/XBuPogH1HiAzJXHMC8 - YA98td1wb4rCuaEH1roo8oMR5JGaMPIFa10Ejtowiuouw1vzJTwVXyBz+X4ekPgRZfgbohkLtsfMy47B - tqYdakUnPFUM6YUv+LUGa/Y4o8e8rBXcSffWDkpE4j9ZpEvNmb9KsZV16BzrBnVq1YjeVf1MX1Tzn74o - iCmkdq1/LrNHOkfgB6Vg9afJRrVOdv2ClRkMmklvCnyPs4V8ge81v5RegddnCGHNHmf00JslcJcZCcWv - IU1pAhcyhLcFXj1zGtbscUYPvdyZ+Uv6Wi8rKekFBjoX2627by8AAAAASUVORK5CYII= - - - - - iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAZdEVYdFNvZnR3YXJlAEFkb2JlIEltYWdlUmVhZHlxyWU8AAADZmlUWHRYTUw6Y29tLmFkb2Jl - LnhtcAAAAAAAPD94cGFja2V0IGJlZ2luPSLvu78iIGlkPSJXNU0wTXBDZWhpSHpyZVN6TlRjemtjOWQi - Pz4gPHg6eG1wbWV0YSB4bWxuczp4PSJhZG9iZTpuczptZXRhLyIgeDp4bXB0az0iQWRvYmUgWE1QIENv - cmUgNS4zLWMwMTEgNjYuMTQ1NjYxLCAyMDEyLzAyLzA2LTE0OjU2OjI3ICAgICAgICAiPiA8cmRmOlJE - RiB4bWxuczpyZGY9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkvMDIvMjItcmRmLXN5bnRheC1ucyMiPiA8 - cmRmOkRlc2NyaXB0aW9uIHJkZjphYm91dD0iIiB4bWxuczp4bXBNTT0iaHR0cDovL25zLmFkb2JlLmNv - bS94YXAvMS4wL21tLyIgeG1sbnM6c3RSZWY9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlw - ZS9SZXNvdXJjZVJlZiMiIHhtbG5zOnhtcD0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wLyIgeG1w - TU06T3JpZ2luYWxEb2N1bWVudElEPSJ4bXAuZGlkOjYzQTM5NEY4Mjg0OUU0MTE5NDBEQTc4ODZEQzk5 - N0NGIiB4bXBNTTpEb2N1bWVudElEPSJ4bXAuZGlkOkE2Q0VGMDE2NDlEQTExRTQ4NTlCQTI3NTMyOEY5 - NEU2IiB4bXBNTTpJbnN0YW5jZUlEPSJ4bXAuaWlkOkE2Q0VGMDE1NDlEQTExRTQ4NTlCQTI3NTMyOEY5 - NEU2IiB4bXA6Q3JlYXRvclRvb2w9IkFkb2JlIFBob3Rvc2hvcCBDUzYgKFdpbmRvd3MpIj4gPHhtcE1N - OkRlcml2ZWRGcm9tIHN0UmVmOmluc3RhbmNlSUQ9InhtcC5paWQ6NjA1MjM3NzFEOTQ5RTQxMUE0QzNB - MjdEOTJBQzc3QkMiIHN0UmVmOmRvY3VtZW50SUQ9InhtcC5kaWQ6NjNBMzk0RjgyODQ5RTQxMTk0MERB - Nzg4NkRDOTk3Q0YiLz4gPC9yZGY6RGVzY3JpcHRpb24+IDwvcmRmOlJERj4gPC94OnhtcG1ldGE+IDw/ - eHBhY2tldCBlbmQ9InIiPz6UH16BAAABrElEQVRIS63N70tTURzH8fsnKSGCCEIQCBKISMq2iILCgQOL - JUxQAoVKdMGQuwgWFepsMGjFZCMuorsIJV4WFatpvzdr1ZAFsaIHn8559v1eDsI91wevJ/ee7/tjbMRH - fAFwJOWRF6oopTzyQhWlVEdBwRbgUhICAnuvilKGtXDGzW6WV/CvbjE/xTfxr+R6q4xSxtP5YTf8rVn4 - s5dG+809Rv5zvVVGKaNwfYgyBfhksoH83CCF9seiL7LBBnLXTlP4/W4dza0ZLS0nCdlgA9npAQq/qk/Q - sKa0NJ8nIBtsIBPrp9CqPMJBYVLLj+04ZIMNrF49ReHwVRafH1/R8m3zJmSDDdy/fJJC88Ua3mcjWurW - LGSDDaQifRS+O8uopsNaPhVnIBts4E64l0Jj5y4qDy5q+ZCPQTbYgHmph8LXZ0m8TJ3Xsp+LQjbYQOJC - N4XadgLl22e1vM1OQDbYwK1zXRS+lBbhmEHsLgU8kTeVh+OQDTawEDpB2U4mitfpMS22GYJssIH5QCcV - FGwBmuRtkA3cGO3whcZUlEdeqKKU8sgLVZRSfjw+MP4DJ2GPpDR9OIsAAAAASUVORK5CYII= - - - - - iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAZdEVYdFNvZnR3YXJlAEFkb2JlIEltYWdlUmVhZHlxyWU8AAADZmlUWHRYTUw6Y29tLmFkb2Jl - LnhtcAAAAAAAPD94cGFja2V0IGJlZ2luPSLvu78iIGlkPSJXNU0wTXBDZWhpSHpyZVN6TlRjemtjOWQi - Pz4gPHg6eG1wbWV0YSB4bWxuczp4PSJhZG9iZTpuczptZXRhLyIgeDp4bXB0az0iQWRvYmUgWE1QIENv - cmUgNS4zLWMwMTEgNjYuMTQ1NjYxLCAyMDEyLzAyLzA2LTE0OjU2OjI3ICAgICAgICAiPiA8cmRmOlJE - RiB4bWxuczpyZGY9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkvMDIvMjItcmRmLXN5bnRheC1ucyMiPiA8 - cmRmOkRlc2NyaXB0aW9uIHJkZjphYm91dD0iIiB4bWxuczp4bXBNTT0iaHR0cDovL25zLmFkb2JlLmNv - bS94YXAvMS4wL21tLyIgeG1sbnM6c3RSZWY9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlw - ZS9SZXNvdXJjZVJlZiMiIHhtbG5zOnhtcD0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wLyIgeG1w - TU06T3JpZ2luYWxEb2N1bWVudElEPSJ4bXAuZGlkOjYzQTM5NEY4Mjg0OUU0MTE5NDBEQTc4ODZEQzk5 - N0NGIiB4bXBNTTpEb2N1bWVudElEPSJ4bXAuZGlkOjJGRTU5OEQ1NDlEQjExRTRBRUVDOTkyMjQ5NzEw - REUwIiB4bXBNTTpJbnN0YW5jZUlEPSJ4bXAuaWlkOjJGRTU5OEQ0NDlEQjExRTRBRUVDOTkyMjQ5NzEw - REUwIiB4bXA6Q3JlYXRvclRvb2w9IkFkb2JlIFBob3Rvc2hvcCBDUzYgKFdpbmRvd3MpIj4gPHhtcE1N - OkRlcml2ZWRGcm9tIHN0UmVmOmluc3RhbmNlSUQ9InhtcC5paWQ6MTY0MkI1RjlEQTQ5RTQxMUE0QzNB - MjdEOTJBQzc3QkMiIHN0UmVmOmRvY3VtZW50SUQ9InhtcC5kaWQ6NjNBMzk0RjgyODQ5RTQxMTk0MERB - Nzg4NkRDOTk3Q0YiLz4gPC9yZGY6RGVzY3JpcHRpb24+IDwvcmRmOlJERj4gPC94OnhtcG1ldGE+IDw/ - eHBhY2tldCBlbmQ9InIiPz6B5sF9AAACe0lEQVRIS7WVb2jMcRzHL7UHanF/Mts5prE/1li3kAfu5Ak7 - 5IHNobBkSC2UIuGJkrrSWRvTmHQWK8U1T8jqUtYwkZpaGjV/Js6to5YwfXze39+fu/v23f36hXe9us+f - 7/v9rd/dr3MQ0X/F4Zm3+K9QhWajNNlBFZqN0mQHS6lMdrCUyqSgimllUsy4XmOmp+QRDllQWbygjjq6 - uimZStOX8a+ixox3pXrM1JLCDAqYJmY7c669M0bff07mcLbtEl9QE8k6V6BH5ooXMsHZZX7ae+AY7W45 - SrPm19LbsSR9m/iRA2bYGefggVePzUgKBzeu9sQpmZ4QcG/WMtk7eLjv0WMz0kOz+TX6MUXvP6cFeNbD - bz6YvQFm2Bk9PPByZO6jksLB5KvRTzTyLikIrG2ktsvXzd4g2hGjYP1ms4eHvb850qkl65LCQW/ntVs0 - 9HpMcPx0K1X4V1Ff/3NzhnphbVDsjBk8Lm/VE44s0ZJ1KS4Ie8uXUvPBE7Tn0ElCzTMqrV5BO/cfEaDG - TD5X6PFFONLygsTF7jj1vxihyPkYNTS1iFrFxm37KHIhJmp43L7qZxzp0pJ1SeHhQGgLJQaH6fb9R1QX - 2EB3Ek9FryLe95j8K9eLT/TB0FZcskOP1iRdkIh23aR7Ay9pzaZddKY9Jup8nIpeoXXhZlHD655b85Bj - p2npLOmCML+dD/iTZhaX3+UvbRB1PpzeygFnSUUvatecRUMzisoOc+x0LZ3FixxYhQyK1cxyZhkTYhqY - RgnM6hmcwVl4ljDI0KS4AC+Kmyli8Jv2MF7GNwXY4QzOwgNv5mWTL7CLpVQmO1hKZbKDpVR/1P8OcvwB - lh7gOXXZq9sAAAAASUVORK5CYII= - - - + iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 YQUAAAAZdEVYdFNvZnR3YXJlAEFkb2JlIEltYWdlUmVhZHlxyWU8AAADZmlUWHRYTUw6Y29tLmFkb2Jl @@ -750,26 +750,244 @@ bS94YXAvMS4wL21tLyIgeG1sbnM6c3RSZWY9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlw ZS9SZXNvdXJjZVJlZiMiIHhtbG5zOnhtcD0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wLyIgeG1w TU06T3JpZ2luYWxEb2N1bWVudElEPSJ4bXAuZGlkOjJGQzkyMzc0Rjk0OUU0MTE5NjNCQjRENDMzQjlC - MUM4IiB4bXBNTTpEb2N1bWVudElEPSJ4bXAuZGlkOjJERjY3MEZENEQyMzExRTRCNDlGQUMwMzk0OTAw - Qzc4IiB4bXBNTTpJbnN0YW5jZUlEPSJ4bXAuaWlkOjJERjY3MEZDNEQyMzExRTRCNDlGQUMwMzk0OTAw - Qzc4IiB4bXA6Q3JlYXRvclRvb2w9IkFkb2JlIFBob3Rvc2hvcCBDUzYgKFdpbmRvd3MpIj4gPHhtcE1N - OkRlcml2ZWRGcm9tIHN0UmVmOmluc3RhbmNlSUQ9InhtcC5paWQ6NjhGOUEyRDEyMTRERTQxMUIzNkJE + MUM4IiB4bXBNTTpEb2N1bWVudElEPSJ4bXAuZGlkOjlDMzFEOUI4NEFBRjExRTQ4OTA5OUYwQ0QzM0Q2 + NEI4IiB4bXBNTTpJbnN0YW5jZUlEPSJ4bXAuaWlkOjlDMzFEOUI3NEFBRjExRTQ4OTA5OUYwQ0QzM0Q2 + NEI4IiB4bXA6Q3JlYXRvclRvb2w9IkFkb2JlIFBob3Rvc2hvcCBDUzYgKFdpbmRvd3MpIj4gPHhtcE1N + OkRlcml2ZWRGcm9tIHN0UmVmOmluc3RhbmNlSUQ9InhtcC5paWQ6MDk5Mzk2NTZBRjRBRTQxMTk3NEFD + QUFFQjRCMzVENkUiIHN0UmVmOmRvY3VtZW50SUQ9InhtcC5kaWQ6MkZDOTIzNzRGOTQ5RTQxMTk2M0JC + NEQ0MzNCOUIxQzgiLz4gPC9yZGY6RGVzY3JpcHRpb24+IDwvcmRmOlJERj4gPC94OnhtcG1ldGE+IDw/ + eHBhY2tldCBlbmQ9InIiPz73sIMwAAADIElEQVRIS7WVa0iTYRTH56Uiysvm3TkvpLl5DRIvQYWVWl+6 + iNEVg0yhQqloQZHkLT+Y0YdAs75IpEUhzERZoZhsRpZlS7soblotsRwoxhqWeTrnYZtv+u7NsB74cZ5z + zv89/z17HzYRAPxXeIv/EpFXcOyi4BvKhfehv4FvKBfeh+ayqIUDlIgBgT8whpRYoT2fhgvNVJKBQT9s + hB8/QZDPpnEIjEhg0J5Pw4Vm0mwygG9T06BSqQQhTUhUMoRGpyxYT7OZwfhXC6jVakFIYzNYqN5uMGKa + BI1GIwhpghXJaJJi13d0dEB2bj74hsWzSDlXbzfQG02g0+kEIU2wIomdovzKdVifngnFFytBeb4cLN+n + WaSc6hfKKqB/eHTWoHfwExgMBkFII5MnQUD4WlAWloO26wVs35MDmifPmQFFyqlO/aKKqlmDp31DYDKZ + BCGNTJ4IPqHx8LJvACbNUw7p6e2HuJQMNIhhBuaHj3vBYrEI0tb1BoIiE9kJ9h7Oh7EJM+g/jEJuwVlY + s24ri5RTnfo5BedAIoueIYPumvomuHzjzm9cq2uCq7UNUH2rEarr7kNd0yP26Y+eKoSWtk4wfpmAg7kn + ITY5DUorq1g8cOQEqze3aplOEhRtJoMcL1mMTixV9IgD5a/tSBVDYql8AKOBQLEJtTP08gY/jjFiktKg + 5FIV21Ok3NazvmR2AvrFkCAJyGYk1comZAuHDM/AyLvHThfBveZ26NOPwI59eey7LsbhFCmnOvVJ5+Ef + rrYZLEU8EZ85+HLwW7ZCLMVTFWdkHoLut+/hgbYHaE9XN31XNsupTrWV3jKVs+uS3cyAD0cLe331jW3Q + qRt0CPUlQVHDKI+fN9iGo4W90uNnyuA2vvRtWTlQgxeg/dk7FimnOvU9/CNqUe47b7ANRwt7AfjpKvAK + Gt18Qur35ymhRfsKKLr5hN7EyzDq7humWrrcfSfKxbz/QlwcLDck1snZJdUzYHUDmk57+K1qdXJyzsL6 + RmQD9ZmObygXB8sVIRO6fXQB4hC6eRQppzr1XXmHclnAckFomLc1Um5dItEvhZ97MQXP9N0AAAAASUVO + RK5CYII= + + + + + iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 + YQUAAAAZdEVYdFNvZnR3YXJlAEFkb2JlIEltYWdlUmVhZHlxyWU8AAADZmlUWHRYTUw6Y29tLmFkb2Jl + LnhtcAAAAAAAPD94cGFja2V0IGJlZ2luPSLvu78iIGlkPSJXNU0wTXBDZWhpSHpyZVN6TlRjemtjOWQi + Pz4gPHg6eG1wbWV0YSB4bWxuczp4PSJhZG9iZTpuczptZXRhLyIgeDp4bXB0az0iQWRvYmUgWE1QIENv + cmUgNS4zLWMwMTEgNjYuMTQ1NjYxLCAyMDEyLzAyLzA2LTE0OjU2OjI3ICAgICAgICAiPiA8cmRmOlJE + RiB4bWxuczpyZGY9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkvMDIvMjItcmRmLXN5bnRheC1ucyMiPiA8 + cmRmOkRlc2NyaXB0aW9uIHJkZjphYm91dD0iIiB4bWxuczp4bXBNTT0iaHR0cDovL25zLmFkb2JlLmNv + bS94YXAvMS4wL21tLyIgeG1sbnM6c3RSZWY9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlw + ZS9SZXNvdXJjZVJlZiMiIHhtbG5zOnhtcD0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wLyIgeG1w + TU06T3JpZ2luYWxEb2N1bWVudElEPSJ4bXAuZGlkOjJGQzkyMzc0Rjk0OUU0MTE5NjNCQjRENDMzQjlC + MUM4IiB4bXBNTTpEb2N1bWVudElEPSJ4bXAuZGlkOjhDMTdBQjRENEFBRTExRTQ4QjQyODY0MDNBNTJE + NzNCIiB4bXBNTTpJbnN0YW5jZUlEPSJ4bXAuaWlkOjhDMTdBQjRDNEFBRTExRTQ4QjQyODY0MDNBNTJE + NzNCIiB4bXA6Q3JlYXRvclRvb2w9IkFkb2JlIFBob3Rvc2hvcCBDUzYgKFdpbmRvd3MpIj4gPHhtcE1N + OkRlcml2ZWRGcm9tIHN0UmVmOmluc3RhbmNlSUQ9InhtcC5paWQ6NUQyMjc4QTlBQjRBRTQxMTk3NEFD + QUFFQjRCMzVENkUiIHN0UmVmOmRvY3VtZW50SUQ9InhtcC5kaWQ6MkZDOTIzNzRGOTQ5RTQxMTk2M0JC + NEQ0MzNCOUIxQzgiLz4gPC9yZGY6RGVzY3JpcHRpb24+IDwvcmRmOlJERj4gPC94OnhtcG1ldGE+IDw/ + eHBhY2tldCBlbmQ9InIiPz4eHsDfAAAB00lEQVRIS7XVWytEURQH8HniTTNHLs0NCXNcXjTN5dH9g/gM + 3jx590QhFDJS0gyTGmpqaqJIMW4hzlAoOaWISS7LWifntI3ddnTGrl92e/57/We/DBsA/CvuYSHZSr0t + lvCGsriX/oI3lMW9lM/SwgF9SEHwizs08IX2vAyLZvZRgXJ+cQWv7yB0q96Ds86voT0vw6KZNJsK4Pnl + DWKxmBBlqhpDUN0UNp2n2VrB/WMOEomEEGX0ArN5o+BGfYB0Oi1EGa8cwpKw6bxRcH6lQiaTEaKMVw5q + rzCbNwr2z65BURQhynh8Qe0VZvNGwdZBFlRVFaKMxxfQXmE2rxc8rW3sQy6XE0puHoG7IaC9YnV9j5th + pbZPqOCDCrbH5uIwOD7/zWgkDkNTizAyuwQjkWWIxFNQWduqmVxI/MiPz6/A8HTUuDMTTYLkbrqhgt5S + T3PG4ZJ3HE7focElZx0u3yn+VQiG1ZLymmm7s74f88f42S6bl9zyJZ6d6Xckd+Mt5ieogH4xJORHHajt + SzvqZPSgECpHZSiA2DztuxBlad+NgnpBEbIjusiiYboKRF+kGFHegUR5ImkFv7G0eAPzWVq8gfksLd5/ + oULiHhYS97BwwPYJlSCUgVubViQAAAAASUVORK5CYII= + + + + + iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 + YQUAAAAZdEVYdFNvZnR3YXJlAEFkb2JlIEltYWdlUmVhZHlxyWU8AAADZmlUWHRYTUw6Y29tLmFkb2Jl + LnhtcAAAAAAAPD94cGFja2V0IGJlZ2luPSLvu78iIGlkPSJXNU0wTXBDZWhpSHpyZVN6TlRjemtjOWQi + Pz4gPHg6eG1wbWV0YSB4bWxuczp4PSJhZG9iZTpuczptZXRhLyIgeDp4bXB0az0iQWRvYmUgWE1QIENv + cmUgNS4zLWMwMTEgNjYuMTQ1NjYxLCAyMDEyLzAyLzA2LTE0OjU2OjI3ICAgICAgICAiPiA8cmRmOlJE + RiB4bWxuczpyZGY9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkvMDIvMjItcmRmLXN5bnRheC1ucyMiPiA8 + cmRmOkRlc2NyaXB0aW9uIHJkZjphYm91dD0iIiB4bWxuczp4bXBNTT0iaHR0cDovL25zLmFkb2JlLmNv + bS94YXAvMS4wL21tLyIgeG1sbnM6c3RSZWY9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlw + ZS9SZXNvdXJjZVJlZiMiIHhtbG5zOnhtcD0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wLyIgeG1w + TU06T3JpZ2luYWxEb2N1bWVudElEPSJ4bXAuZGlkOjJGQzkyMzc0Rjk0OUU0MTE5NjNCQjRENDMzQjlC + MUM4IiB4bXBNTTpEb2N1bWVudElEPSJ4bXAuZGlkOjJEMDQyOEZBNEFEMjExRTRBN0MxRDBCNzJGRUND + MDEzIiB4bXBNTTpJbnN0YW5jZUlEPSJ4bXAuaWlkOjJEMDQyOEY5NEFEMjExRTRBN0MxRDBCNzJGRUND + MDEzIiB4bXA6Q3JlYXRvclRvb2w9IkFkb2JlIFBob3Rvc2hvcCBDUzYgKFdpbmRvd3MpIj4gPHhtcE1N + OkRlcml2ZWRGcm9tIHN0UmVmOmluc3RhbmNlSUQ9InhtcC5paWQ6QkRDRkI1RDVEMTRBRTQxMTk3NEFD + QUFFQjRCMzVENkUiIHN0UmVmOmRvY3VtZW50SUQ9InhtcC5kaWQ6MkZDOTIzNzRGOTQ5RTQxMTk2M0JC + NEQ0MzNCOUIxQzgiLz4gPC9yZGY6RGVzY3JpcHRpb24+IDwvcmRmOlJERj4gPC94OnhtcG1ldGE+IDw/ + eHBhY2tldCBlbmQ9InIiPz59jfe3AAAEbUlEQVRIS8WTeUybZRzHF48/pnFOuQRajkFLgQFb5iRLNJr4 + l/EPgsniUI4xZDAY1zyxwApsMJyIME61rByl3DfoYGBrgbWUY06FcZSCha4rQ8jYxkqPr2/fvkv8o2Sg + S/wkT970eb6/T5/39z7Prv8dt/Oql4mR4HZJ3ccoXFxhVCzB9DT9JueJdSq6c1wzVZFupepVzxu34XVj + CaEDi1jX6hF8ZQoeokl4iBVwzV9YdU1XRlIl28eVo8phCdXwGltEeOUsro6psaHVwcSDh5volc4iOO8X + 7KuVwb1hEi7J8myq9PEQO//I85oafr0KtEpUpNSETm+AwWDAvfv3YTQaybnm/t/AyO6Ga+UonJOnIijF + 1hA9tWI2qle9RxcI+RIpmZpTIfBULhIyyqHVahHPKcN70TmYnFFCp9OhqXcc9KwW0DOHVl3YU1aUyjJu + F1SpfhO3EM6bMMsVt+D8Zhz2HIpC4oU6bG5uIu4cD3tfTwAjIBNypQYbGxsISquBU34PaDHiVEplGXee + SuIjVaBv3Lz7gJg8vHg4FlZvc+ATVoLipiHsD8qCXWAO7IPK8MG5FjLXKboOeoYADkldUkplGWb7vOb4 + 4BzxIXXQE/1m59WDXdgBvxPfwz6UC4eQUth/WIBDZ2qQXj+K7IYRImeE5s5fOFrcDPvPapcJzVNmmwVY + VxWG9U09uau1tTVymPpc0iYFLew7OEUJ4BwtALfvJpl5xMrKCu6s3cUrn5YbCM1us80CrJZZVWjXr7j3 + 4CE0y8v4IrcaH+cK4Bv+DRyPl8ApphYuia3wZ3eCUzOA1PIfcVuzjHnlIgK/vgy7mHzTG+w12yzA5E53 + edYPo1c2i/X1dQTEfwvbwDQ4hhXg8OcN4P48Df+UTrgkNIAeW4Hg3Hbo9Xq0iGSgs4ls5CUhoXnObLOA + S8pkhG/bdZzgDZJnffT3GXieLAA9XgB2/RjZjuQqMWhxfBw824H55XWyhcfy+HDNqoB1SH4Codn6G7iw + p3d78EaVPlXX0CaZgkqlgly1gpCiK0htHCH/IL6oFcEF3ZjT3CUvXqv0DzDSS0FPq1a/8EbYS5Rqa+if + SAJ8KoeNR7gitEsnoVQqSbGOkJmYX1ggxaY70SabwIGMUrjn8I3WIXnBRPnWu/8nDnE9Sd7cAaP/ZSES + 6/rRKJRArpiHXC7HzekZNIukiCyrhW9mGZgXa4w2kUVnibJnzdXbxP5URzyDO4QjxGl5i9uNpMZeKP5U + IrywAq9yCnGAOGGMonbYxpVnEPGdyR9BO/MTj8kfgXeNFPt5IngVtoF1kQ9WcTs8qgfgmNreQMS21xZL + 0E6Ln6ef75tg8sfgXT8O77oReAkkYNXJ4PRV/4ztyfo9VPTf4xjdf9CpQKzdxxuGe6UMbhXEmc8V6mze + r3qNivx3HGN7UmglQ6CVDMIxXwybo5UcaunJQD8te9rhyx4JrWwItlGNUut3y5+hlp4cDhFCpl14k9jq + nR+Y1NTjIe7NlmMnWKoHsOtvjWYcKpheqFQAAAAASUVORK5CYII= + + + + + iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 + YQUAAAAZdEVYdFNvZnR3YXJlAEFkb2JlIEltYWdlUmVhZHlxyWU8AAADZmlUWHRYTUw6Y29tLmFkb2Jl + LnhtcAAAAAAAPD94cGFja2V0IGJlZ2luPSLvu78iIGlkPSJXNU0wTXBDZWhpSHpyZVN6TlRjemtjOWQi + Pz4gPHg6eG1wbWV0YSB4bWxuczp4PSJhZG9iZTpuczptZXRhLyIgeDp4bXB0az0iQWRvYmUgWE1QIENv + cmUgNS4zLWMwMTEgNjYuMTQ1NjYxLCAyMDEyLzAyLzA2LTE0OjU2OjI3ICAgICAgICAiPiA8cmRmOlJE + RiB4bWxuczpyZGY9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkvMDIvMjItcmRmLXN5bnRheC1ucyMiPiA8 + cmRmOkRlc2NyaXB0aW9uIHJkZjphYm91dD0iIiB4bWxuczp4bXBNTT0iaHR0cDovL25zLmFkb2JlLmNv + bS94YXAvMS4wL21tLyIgeG1sbnM6c3RSZWY9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlw + ZS9SZXNvdXJjZVJlZiMiIHhtbG5zOnhtcD0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wLyIgeG1w + TU06T3JpZ2luYWxEb2N1bWVudElEPSJ4bXAuZGlkOjJGQzkyMzc0Rjk0OUU0MTE5NjNCQjRENDMzQjlC + MUM4IiB4bXBNTTpEb2N1bWVudElEPSJ4bXAuZGlkOjJERTg4QTFENEQyMjExRTRBODEyODk0M0RBMTc5 + Qjg3IiB4bXBNTTpJbnN0YW5jZUlEPSJ4bXAuaWlkOjJERTg4QTFDNEQyMjExRTRBODEyODk0M0RBMTc5 + Qjg3IiB4bXA6Q3JlYXRvclRvb2w9IkFkb2JlIFBob3Rvc2hvcCBDUzYgKFdpbmRvd3MpIj4gPHhtcE1N + OkRlcml2ZWRGcm9tIHN0UmVmOmluc3RhbmNlSUQ9InhtcC5paWQ6NjJGOUEyRDEyMTRERTQxMUIzNkJE NUVDQjU5MzE1NjIiIHN0UmVmOmRvY3VtZW50SUQ9InhtcC5kaWQ6MkZDOTIzNzRGOTQ5RTQxMTk2M0JC NEQ0MzNCOUIxQzgiLz4gPC9yZGY6RGVzY3JpcHRpb24+IDwvcmRmOlJERj4gPC94OnhtcG1ldGE+IDw/ - eHBhY2tldCBlbmQ9InIiPz6GKmpFAAAC+UlEQVRIS63T20vTYRzH8Yforj/Ei24UiSgKIygKi8oyxZQo - cvNYeXaesmzqPGu2POd0ulSsnIdaurTSTJ3O6UxTPGya5vCQx5AuPn39RbHop7nZxQt+z3ie93e/Z4w1 - p7nsCoBt8R6yBF/UHPv+Wb0rfFFzm99CRIwEW1gnqXzxTXxRc0ydctm4OlID2sxrw6iCtiwItC+A2P/D - frLnjwGNSZdMq6N1WOvLwFpP4l/WdRlY6Jaio9Ab7QXba8sVoDHZGdT8PYS9THDqMGnLsKpNw0qXGCua - BO55VZdNQ6U/DRRibVCGb+N1pH5bukoRqHmDHOIG1N8/X2F4I8WyNhtf2+9hqSsZxqZ4upbb6HsSZLHO - Im90ym6hNVcIaktYTexZyUelGEvaHMy/jcFiZxo0xX5Y7ivGcn8JkVmA9uvlWBmqwpJeAWovs+poR99O - eRgWtQWYVUdgrj0FH+i+F3XF3NoappZYGJrEoLaOVYpOOTY/FGJB+xjTqnDMtMTTAC/Ma/Ix/TLUKl9e - x0JfFQpql7PykBP7lWIXzPeUYLIhHCPKCLr/AMy2ZsKoDLTKdNNdvM8TgNpRTBZwfJ885CTmaIChPhwa - mS+GnkdhqjEWY9X+VplqvIMXEhdQ24mZeuSs0N/BNNWWj4k6EdSZHhhXxWH0aSCGFd4c4Tk7zk7XBlUM - FKLToK4Nm+0qYnneRzqGGiSYaIiiyZdhVCdgqFSIwRJPjucZW85O1pvnRmvDkO9zFNTdy2Y6HjGp4HCF - 5kk4xhoiURd/EROv4tBfeM0qAyUC9Mp9QM0+7o829T6LZV0/mNycS6+nFKFWfAGj9ZHozfGwil7miZYH - 7qCmghsw+S6VpV894KuUuKFbfhNNqa749CwY3dm0toK+VABl3HlQM5obYHybwFLc7W1y/Y5BlX6FfgNn - DNcEY0DhZZX+MiGKbh0DNR24AYYWMSfJzc6GZBApwS5skIzNODcg0dV2V36FtsJ7yBJ8UXO8hyzBFzXH - ++H/A/YDv9/V87iOlrYAAAAASUVORK5CYII= + eHBhY2tldCBlbmQ9InIiPz6wJF34AAACl0lEQVRIS62Vy08TURSH73/QhQtXVnBhxEcMiUkhbEg0hB1R + Q1i68C8wIW5cEqMLN7ho2Ji4YiEhWq0prYUhfULbadN3obTaChobtZEUsFY9nnPS6WM6HYowyZf87j33 + nG/amaai9geOBYA+4pTxihmBE8DcTQB4J8em/9IwSQyagmrtL+z9rMFmvnhkKvtV7tcVHPz6DVsftulA + AckdhUg8zf19eoLKAd597iMLMItewfOxUDTN/bqCH3tVSG8VWIBZ9AoJApEk9+sKvu/uQ2IjzwJkGtH8 + OrTwy3Hu77vIAnV9mgWlcgWiqRwLjAMmkOMbPbNTKnN/JJntqJGEBZ++7oKcyLLgLN4JrU8Cms2C4pcy + BKKZumCI18temQ/8DzSLZlBmQX7nG/jCKdpgAa0driCtY5iFHuqHSjNoFtaags1iCdzBBG+QgNY2aZ0F + mIUe6osENAtrTUEq/7kDq9PHAszU5yYoq9f1i9cUSCD5ozxDEeTsrhAoONwyxLLb8MrhYQFmZYCHsnpd + v3hNgQROb5hnKIK29944MAThTBEWbS4WYBZ6qC/sKSy5ZJ6BGUQg8b4Bbhjod4AZXlhXWdBa10LrIVul + AM9ggS+aa6AIMMO8ZYUO0KeyIOMtZyaQpXpNi4LFucYzMINwhbMNcMNw5oIJMMNKIA0LNg88mZuH/ssj + dPgBMnN+cBRmny1wrRtSMMMzWCCFMg0UAeY2Fh0+GL5xG8Zu3oHXUrCj3g0WONdTbeBm21/o1N17gPtg + 98Xh3VoS3qzKMDI22agfglnY/Uld8NDc/ZlZwAwvl4Ngun6LGh8rdfVDViNs3rguOOzq6XOD8PDpc7g2 + OkHDH7XWtYa2It66Y4eCQ8cRfpvUNa2hTUD8A6JMaBvCyTdJAAAAAElFTkSuQmCC + + + + + iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 + YQUAAAAZdEVYdFNvZnR3YXJlAEFkb2JlIEltYWdlUmVhZHlxyWU8AAADZmlUWHRYTUw6Y29tLmFkb2Jl + LnhtcAAAAAAAPD94cGFja2V0IGJlZ2luPSLvu78iIGlkPSJXNU0wTXBDZWhpSHpyZVN6TlRjemtjOWQi + Pz4gPHg6eG1wbWV0YSB4bWxuczp4PSJhZG9iZTpuczptZXRhLyIgeDp4bXB0az0iQWRvYmUgWE1QIENv + cmUgNS4zLWMwMTEgNjYuMTQ1NjYxLCAyMDEyLzAyLzA2LTE0OjU2OjI3ICAgICAgICAiPiA8cmRmOlJE + RiB4bWxuczpyZGY9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkvMDIvMjItcmRmLXN5bnRheC1ucyMiPiA8 + cmRmOkRlc2NyaXB0aW9uIHJkZjphYm91dD0iIiB4bWxuczp4bXBNTT0iaHR0cDovL25zLmFkb2JlLmNv + bS94YXAvMS4wL21tLyIgeG1sbnM6c3RSZWY9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlw + ZS9SZXNvdXJjZVJlZiMiIHhtbG5zOnhtcD0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wLyIgeG1w + TU06T3JpZ2luYWxEb2N1bWVudElEPSJ4bXAuZGlkOjJGQzkyMzc0Rjk0OUU0MTE5NjNCQjRENDMzQjlC + MUM4IiB4bXBNTTpEb2N1bWVudElEPSJ4bXAuZGlkOkUzNzJDMjE3NEFENjExRTRCNjE0OEVEQzI4MEM0 + RTZDIiB4bXBNTTpJbnN0YW5jZUlEPSJ4bXAuaWlkOkUzNzJDMjE2NEFENjExRTRCNjE0OEVEQzI4MEM0 + RTZDIiB4bXA6Q3JlYXRvclRvb2w9IkFkb2JlIFBob3Rvc2hvcCBDUzYgKFdpbmRvd3MpIj4gPHhtcE1N + OkRlcml2ZWRGcm9tIHN0UmVmOmluc3RhbmNlSUQ9InhtcC5paWQ6RkI3NUQ0QkNENDRBRTQxMTk3NEFD + QUFFQjRCMzVENkUiIHN0UmVmOmRvY3VtZW50SUQ9InhtcC5kaWQ6MkZDOTIzNzRGOTQ5RTQxMTk2M0JC + NEQ0MzNCOUIxQzgiLz4gPC9yZGY6RGVzY3JpcHRpb24+IDwvcmRmOlJERj4gPC94OnhtcG1ldGE+IDw/ + eHBhY2tldCBlbmQ9InIiPz6PyaLfAAADMElEQVRIS6VUXUiTYRT+vi3Tzd+ps23+3KRigtiPkolEQReG + UYTkhWatpWlWGkRdddfdSPImqUAJjSIT00oxLJIk0cR+tFSyzDJtgaMkDEPkdM7ZPvm2vS6jBx6es3Pe + 8zzvtm+TohLS/ov+AACStLgEQuJyLRJWYK1yzh/+FgCoQrpnfM4fOGBhcUlIMkEVkma4H4i1y2kFcMD8 + wqKQZILKZqTqmlTAWrfvMjhgbv63Dwm0hLWQohn1eNEbzrlfPiTQAtZCKjP1GXdAIC+r4XD+9CGBFrDm + RVJ1re6pZ0GyHHMvIawauYVNCFPfvvuQQAtYC6meKXU0amNsaGN/ZR60xIf9aIgN3cpGE9OzZCZ85nEm + pGiWlLABmuJCnUOXrNB7chdct4TUo32ANDbp4NuielDpqWfePdaPX6GrohSK4uLhlCEo96YlZLbOFHzH + oJXjMSBcGn4/zQGovEDqXXtzeTb+BTrKj0J3+Q54djYP7EZdTU2MPjFSK8eieQR9QtLg6GcOQPWgqKeQ + ZyOfoK30CDw+lg2Ot3Z4VLoNqo269mCNHIa2WjYn9A1PcAAqU6m9VV3TF9psOwwPS3JgZugCdNoyocwU + jU+RlImWBpezGz0vxzkA1YOiHvPFO7Ca1kGHLQtmXp2HdutmqN+/F6JiU+h3kOpyVeHJwBgHoLIpqajm + 189HoaG4CNqsGTA1UAWth9Lg6r490PygGyLjUikgzuWqQlffCAegelDdUwLqigqhpXgjTPYeh+bCFCg2 + RkEk3vxuVz/P0c43oLP3DQegLhspNalSFxiNcLswHT48LYNbBUlQk7ebzenmyhm08w1o7xmiAP6hRZiT + 70eYkzpctUuJWdHmwWs74+F1Uz7cyE+E4ohQB5mHm9a3GywpTXzektyKduIAIsKI3ISkL4rIdYle05C9 + VrZVBmvtl7eboUyv7V4jSQdwRn8FdI72iErtCUxnIuifkJ5hUqUOq9Jr7OeCNU6bTpNVqtMcDJSldOwn + KnOk+jypJ5QANRWc0cs5SEelXr54QidfwVYAMoiHq4W/gNM6OaNCJ+diaUIqN/43+Atwg27t+9ZXBUn6 + A2MdqQeVc5pWAAAAAElFTkSuQmCC + + + + + iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAIAAABvFaqvAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 + YQUAAAAZdEVYdFNvZnR3YXJlAEFkb2JlIEltYWdlUmVhZHlxyWU8AAADZmlUWHRYTUw6Y29tLmFkb2Jl + LnhtcAAAAAAAPD94cGFja2V0IGJlZ2luPSLvu78iIGlkPSJXNU0wTXBDZWhpSHpyZVN6TlRjemtjOWQi + Pz4gPHg6eG1wbWV0YSB4bWxuczp4PSJhZG9iZTpuczptZXRhLyIgeDp4bXB0az0iQWRvYmUgWE1QIENv + cmUgNS4zLWMwMTEgNjYuMTQ1NjYxLCAyMDEyLzAyLzA2LTE0OjU2OjI3ICAgICAgICAiPiA8cmRmOlJE + RiB4bWxuczpyZGY9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkvMDIvMjItcmRmLXN5bnRheC1ucyMiPiA8 + cmRmOkRlc2NyaXB0aW9uIHJkZjphYm91dD0iIiB4bWxuczp4bXBNTT0iaHR0cDovL25zLmFkb2JlLmNv + bS94YXAvMS4wL21tLyIgeG1sbnM6c3RSZWY9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlw + ZS9SZXNvdXJjZVJlZiMiIHhtbG5zOnhtcD0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wLyIgeG1w + TU06T3JpZ2luYWxEb2N1bWVudElEPSJ4bXAuZGlkOjJGQzkyMzc0Rjk0OUU0MTE5NjNCQjRENDMzQjlC + MUM4IiB4bXBNTTpEb2N1bWVudElEPSJ4bXAuZGlkOjUzQzNGNDI5NEQyQzExRTQ4QkE1QUNCMEVDRDZF + MDVEIiB4bXBNTTpJbnN0YW5jZUlEPSJ4bXAuaWlkOjUzQzNGNDI4NEQyQzExRTQ4QkE1QUNCMEVDRDZF + MDVEIiB4bXA6Q3JlYXRvclRvb2w9IkFkb2JlIFBob3Rvc2hvcCBDUzYgKFdpbmRvd3MpIj4gPHhtcE1N + OkRlcml2ZWRGcm9tIHN0UmVmOmluc3RhbmNlSUQ9InhtcC5paWQ6RkI1NUY4OTYyQTRERTQxMUIzNkJE + NUVDQjU5MzE1NjIiIHN0UmVmOmRvY3VtZW50SUQ9InhtcC5kaWQ6MkZDOTIzNzRGOTQ5RTQxMTk2M0JC + NEQ0MzNCOUIxQzgiLz4gPC9yZGY6RGVzY3JpcHRpb24+IDwvcmRmOlJERj4gPC94OnhtcG1ldGE+IDw/ + eHBhY2tldCBlbmQ9InIiPz6IsaOmAAADF0lEQVQ4T62U/UuTURTH+0nICqRI1ERMMyNQe8N0ChqBwQhN + yvwhEgJjVCqJ/qCibZo6tzQ339h6Nre5prapUzc1XzItX1ilzuWMLLVAen+xf6DTuTxjdxsFVj58ebjc + c+7nnud7z3228DbpIaDFH/CfoqCn72DIDvNfPDM2KAqyr8PcJxqY+QBTb8kkjocXQTsKigGwfqYJHqIg + 1OxHGHvlWPx4hXB1YyA3g4CBhqst+piEnrDA3rA95vBAY1x8d7lq/DVZwm5PQZNvoKYdypSgHgbVEIh1 + cLOZzOCbSSsyRQRba6uWtcpVLbPcwlglInNUCJNWWKqABqMLCGvGlfpJELaQ/V1Vd1lujAhe0chtUrH5 + ZExnmJ85MdomEa+qZMbIEF2BHGunILSjdZwYgTt4gJqjjj0Rltml1Zq9AeL0Mn71Wn2mtDU80MIvsFTw + O+KPIoWC8BNYRIUaqrRQroJKjQOk9N+xLBF2pXJFKfnsDGYa8gS6xOO2whyMuoHaHpGzZ/pBM0IMrtXD + nT4HqNHXe0lYoogMFeQP4jbSDkCPTUyXmnNoPutSo+9WN5DEQDyeWCWnhqm4p7Oimt3b54rzmmKPVHKz + 0Xg0AU1pz87VJp+yXOfd9t3mBmLXsGrsJhSsDtF4iOWxKdpzyQNnuRW7vEUp13obFG05OVUBPtO5V1Sn + k5q4SX8ENfWA6C7xHsP981Bb2sf38ZKd4JhSuXUJHPHhg/WJnAeZFw0Xzt/w8erRtLmBnB/CSmaC599I + 2PYVRl+CXigu3R9SfCC0Pf1MZ1oqvqvjogX7gtRFJfb1n24g7GblfQcFP2fkBYm5anxqQcbLKgzyK/Df + WRTkV5+RMTg84ZrgAOHo4ZIDVNdJw67CpsVLZ5gifj97Typlq2ZFQXj8LKh5EHpnaIar8N+Al5l9Y9Vs + T7OiIAzjqaMsa6QJnBkeWvgOHdPkAuIV67PSeQpCYYZplsZ+KyyWLRyFF8D553EDbURY770J0rrYJbda + SYE4iWb9NcgpRKDrOMAWwYP6d5BTaC52zyaAWDlAm/DweL8AX9zXukfxHsIAAAAASUVORK5CYII= + + + + + iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 + YQUAAAAZdEVYdFNvZnR3YXJlAEFkb2JlIEltYWdlUmVhZHlxyWU8AAADZmlUWHRYTUw6Y29tLmFkb2Jl + LnhtcAAAAAAAPD94cGFja2V0IGJlZ2luPSLvu78iIGlkPSJXNU0wTXBDZWhpSHpyZVN6TlRjemtjOWQi + Pz4gPHg6eG1wbWV0YSB4bWxuczp4PSJhZG9iZTpuczptZXRhLyIgeDp4bXB0az0iQWRvYmUgWE1QIENv + cmUgNS4zLWMwMTEgNjYuMTQ1NjYxLCAyMDEyLzAyLzA2LTE0OjU2OjI3ICAgICAgICAiPiA8cmRmOlJE + RiB4bWxuczpyZGY9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkvMDIvMjItcmRmLXN5bnRheC1ucyMiPiA8 + cmRmOkRlc2NyaXB0aW9uIHJkZjphYm91dD0iIiB4bWxuczp4bXBNTT0iaHR0cDovL25zLmFkb2JlLmNv + bS94YXAvMS4wL21tLyIgeG1sbnM6c3RSZWY9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlw + ZS9SZXNvdXJjZVJlZiMiIHhtbG5zOnhtcD0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wLyIgeG1w + TU06T3JpZ2luYWxEb2N1bWVudElEPSJ4bXAuZGlkOjJGQzkyMzc0Rjk0OUU0MTE5NjNCQjRENDMzQjlC + MUM4IiB4bXBNTTpEb2N1bWVudElEPSJ4bXAuZGlkOkVENUYwQThBNEQyOTExRTQ5QzUzQzdFMkFGQkQy + NTA1IiB4bXBNTTpJbnN0YW5jZUlEPSJ4bXAuaWlkOkVENUYwQTg5NEQyOTExRTQ5QzUzQzdFMkFGQkQy + NTA1IiB4bXA6Q3JlYXRvclRvb2w9IkFkb2JlIFBob3Rvc2hvcCBDUzYgKFdpbmRvd3MpIj4gPHhtcE1N + OkRlcml2ZWRGcm9tIHN0UmVmOmluc3RhbmNlSUQ9InhtcC5paWQ6MkRGNkEzOUYyOTRERTQxMUIzNkJE + NUVDQjU5MzE1NjIiIHN0UmVmOmRvY3VtZW50SUQ9InhtcC5kaWQ6MkZDOTIzNzRGOTQ5RTQxMTk2M0JC + NEQ0MzNCOUIxQzgiLz4gPC9yZGY6RGVzY3JpcHRpb24+IDwvcmRmOlJERj4gPC94OnhtcG1ldGE+IDw/ + eHBhY2tldCBlbmQ9InIiPz6npMy1AAAGEUlEQVRIS7WVeVDUZRjHf7Ase8ECu+wl4LIXcqyyHC783AWW + 5QaRFTHkMi9SQvE+UhLzwk0BUcQSgQBBgcYDzStMSzOPcpqcmo5pmqk/+rOapqb+iG/PbzfFcSz/6pn5 + zPN739/7fp/nvZn/3TSLjj+XJy2/RaItPCT5vaBd8m1+q2Qku1lcrcvki+iXr7fFU6ZZeOx5KDU1b7jU + 1Z2bVPMPWNMbRXrXkWAc+ywVLbcS8fKwFjlu8VdpW0XzSc6f8PEIPzJ19dFnU3WEJdHL9P3X9O1nkdB8 + CQrX7i3mKn9zfqsUq29ZsPfjRBx5aMO2cTMy94gm7FuF7XyJTwDJTo5GVdHxNALVgsPd5Ceye+9g8b0f + UXbjB8RtH4Msd+MeXS7f6twjxbILZiy7pEHDtTBsvG7BqivTUXpsClLWCbtJNpDwBlGVH3ySIFV520eW + nedRcf0HVJGwbeRrOHs/h2n1CGRZDe7wND/W1hiI8sEYlJ4KRcVpJcrfVqByNBILhqLh3KeA+UXBOpL2 + jkRZduARPGXZ/vH4pnMou/gd7INfIPn4QyQc/RSOzk9hrBtEiKPerUn1Y5PXBaDojWlwdgUjr0+G/H4Z + cnpCUNJrQNZ+LeLrBD/LYnixFEDAKFz7vJQ0r49dO4zikS8x8/ADxLd9jIT2B5ix/z7SX78Pw+K3EJy2 + wq1M4rEz6sRwthgw82Ag2KNS2I5JPZ4rZx00ImGNHIZSfisFkDGhxbs5AkKLd/3kaLkDlgTjXrsNc/Md + mPfeQeyOD2HbcRu6yi4E2Wrd8ngeG71IBPtePWa4JUhsD0DykQAkHQqApUWCFLcGyZvDoZ/P/5oCTGXk + hU2MvGB7rbGmG47dd2Fa+x6iX/kAMa/eQvS2m4jaeAPspvcROb8TQexid3CcL2usFCJjnwE5nQYU9RhR + PGDC7D4TCrqMyDqkR9oePbRz/SZEKh8rI8vdyshyXhmzLD8DS/1VGOquwtgw7glkXH0Nhvp3kbL2GrSl + hyC11ril03xZfbkQKZuVsDeq4NihRtYuDbJ2auBoUsO2TQXrJiWMlWIExflWMiHOjRzfJy0bg776HCKX + vANd7WXol1/xeN3Si7A2XIXW1YbAxAq3UO0zPTSd1yG38bplLK//vxBrffKY4PQ1HH9aKk8jonQUUyvO + Qlt9HtqaCx4/tXIMyXWXMXXOAQTEv+D2zCvDhBBTCN1zCGOCZq3k+DXO1YcpRYOY4hpF2LzTCCs74/VE + 3IvnEVd1EhGFblBbWot6BKXWQZq64tlYa2+TuJwQM9KU5cRL35hyOxCe2w913hA0hcPQFI16KRzxEFtO + a1Q9htSVN5C+5S5x7x/uIm3DR7CvuomUReOImt1FU7nwEolHECImMGkJE5i46EJkejNM+X1QOPqhzBqC + KvskVDmnJuHKT/K4bgjKzBMItXcjJv84NOwWiKPndJK40TOCgPgaRmIur1dZ1yM6txvyWT0ITR+AImOQ + gg39N1ybDBJP60PorC5My3oTwQm18FdNryBxbq0EJL6AEUTYZBTkF0NGKyKdvZDb3qJOAxSIOqcP/jtp + JyC3D1BSvYgp6EN4aiNlP/cTEk4gFASPEUeXkWd8RaY5jcrEBkTn9UCT4Q3gzfBfRvJE9rrsfpicHSRe + NsFXmJeSXhTBXXY+jMjk8uArVkpExuKb6pkbYJ7L7Ria37xTUBeMeCkcncRTN0z/TyLKNYy4khNQJq2G + IMLBXdUWQkXwCYYR6md7IPP1k8WEC3UFDzSpG2BZeAZJtXQWFpyls3HOC50JzkdQnbFqDInLLiC2rBcq + 6xoSzzzP+NDVwDBaQkx4XzahNv8xZH48sVotCHeOUnnCWNJG18Q4UjddB7vlfbBbPwC7+YannLTyIrS5 + OyHU5v3hr07poL7JBHe4Jh8bzgQROY8h46IKCAVfbi73D3PcpfoJlX0VtEVN0JXsQlj2ZoRaaynj7N/8 + NfZLPLFmHrXnpiWSCCL8iMl32T/M6YGMq+R+covD7QADwfoIgqt4QVGtfvIZJ4lRv5CY4zypbjfjy+eE + M4l4gtuSwYSQ4DS4EZAew/wNiCYQJlvQU3cAAAAASUVORK5CYII= @@ -1054,142 +1272,6 @@ R2K5fxKLWbbp/7Dc0CBY8Q+pPmOq0VkzzQAAAABJRU5ErkJggg== - - - iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAZdEVYdFNvZnR3YXJlAEFkb2JlIEltYWdlUmVhZHlxyWU8AAADZmlUWHRYTUw6Y29tLmFkb2Jl - LnhtcAAAAAAAPD94cGFja2V0IGJlZ2luPSLvu78iIGlkPSJXNU0wTXBDZWhpSHpyZVN6TlRjemtjOWQi - Pz4gPHg6eG1wbWV0YSB4bWxuczp4PSJhZG9iZTpuczptZXRhLyIgeDp4bXB0az0iQWRvYmUgWE1QIENv - cmUgNS4zLWMwMTEgNjYuMTQ1NjYxLCAyMDEyLzAyLzA2LTE0OjU2OjI3ICAgICAgICAiPiA8cmRmOlJE - RiB4bWxuczpyZGY9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkvMDIvMjItcmRmLXN5bnRheC1ucyMiPiA8 - cmRmOkRlc2NyaXB0aW9uIHJkZjphYm91dD0iIiB4bWxuczp4bXBNTT0iaHR0cDovL25zLmFkb2JlLmNv - bS94YXAvMS4wL21tLyIgeG1sbnM6c3RSZWY9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlw - ZS9SZXNvdXJjZVJlZiMiIHhtbG5zOnhtcD0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wLyIgeG1w - TU06T3JpZ2luYWxEb2N1bWVudElEPSJ4bXAuZGlkOjJGQzkyMzc0Rjk0OUU0MTE5NjNCQjRENDMzQjlC - MUM4IiB4bXBNTTpEb2N1bWVudElEPSJ4bXAuZGlkOjlDMzFEOUI4NEFBRjExRTQ4OTA5OUYwQ0QzM0Q2 - NEI4IiB4bXBNTTpJbnN0YW5jZUlEPSJ4bXAuaWlkOjlDMzFEOUI3NEFBRjExRTQ4OTA5OUYwQ0QzM0Q2 - NEI4IiB4bXA6Q3JlYXRvclRvb2w9IkFkb2JlIFBob3Rvc2hvcCBDUzYgKFdpbmRvd3MpIj4gPHhtcE1N - OkRlcml2ZWRGcm9tIHN0UmVmOmluc3RhbmNlSUQ9InhtcC5paWQ6MDk5Mzk2NTZBRjRBRTQxMTk3NEFD - QUFFQjRCMzVENkUiIHN0UmVmOmRvY3VtZW50SUQ9InhtcC5kaWQ6MkZDOTIzNzRGOTQ5RTQxMTk2M0JC - NEQ0MzNCOUIxQzgiLz4gPC9yZGY6RGVzY3JpcHRpb24+IDwvcmRmOlJERj4gPC94OnhtcG1ldGE+IDw/ - eHBhY2tldCBlbmQ9InIiPz73sIMwAAADIElEQVRIS7WVa0iTYRTH56Uiysvm3TkvpLl5DRIvQYWVWl+6 - iNEVg0yhQqloQZHkLT+Y0YdAs75IpEUhzERZoZhsRpZlS7soblotsRwoxhqWeTrnYZtv+u7NsB74cZ5z - zv89/z17HzYRAPxXeIv/EpFXcOyi4BvKhfehv4FvKBfeh+ayqIUDlIgBgT8whpRYoT2fhgvNVJKBQT9s - hB8/QZDPpnEIjEhg0J5Pw4Vm0mwygG9T06BSqQQhTUhUMoRGpyxYT7OZwfhXC6jVakFIYzNYqN5uMGKa - BI1GIwhpghXJaJJi13d0dEB2bj74hsWzSDlXbzfQG02g0+kEIU2wIomdovzKdVifngnFFytBeb4cLN+n - WaSc6hfKKqB/eHTWoHfwExgMBkFII5MnQUD4WlAWloO26wVs35MDmifPmQFFyqlO/aKKqlmDp31DYDKZ - BCGNTJ4IPqHx8LJvACbNUw7p6e2HuJQMNIhhBuaHj3vBYrEI0tb1BoIiE9kJ9h7Oh7EJM+g/jEJuwVlY - s24ri5RTnfo5BedAIoueIYPumvomuHzjzm9cq2uCq7UNUH2rEarr7kNd0yP26Y+eKoSWtk4wfpmAg7kn - ITY5DUorq1g8cOQEqze3aplOEhRtJoMcL1mMTixV9IgD5a/tSBVDYql8AKOBQLEJtTP08gY/jjFiktKg - 5FIV21Ok3NazvmR2AvrFkCAJyGYk1comZAuHDM/AyLvHThfBveZ26NOPwI59eey7LsbhFCmnOvVJ5+Ef - rrYZLEU8EZ85+HLwW7ZCLMVTFWdkHoLut+/hgbYHaE9XN31XNsupTrWV3jKVs+uS3cyAD0cLe331jW3Q - qRt0CPUlQVHDKI+fN9iGo4W90uNnyuA2vvRtWTlQgxeg/dk7FimnOvU9/CNqUe47b7ANRwt7AfjpKvAK - Gt18Qur35ymhRfsKKLr5hN7EyzDq7humWrrcfSfKxbz/QlwcLDck1snZJdUzYHUDmk57+K1qdXJyzsL6 - RmQD9ZmObygXB8sVIRO6fXQB4hC6eRQppzr1XXmHclnAckFomLc1Um5dItEvhZ97MQXP9N0AAAAASUVO - RK5CYII= - - - - - iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAZdEVYdFNvZnR3YXJlAEFkb2JlIEltYWdlUmVhZHlxyWU8AAADZmlUWHRYTUw6Y29tLmFkb2Jl - LnhtcAAAAAAAPD94cGFja2V0IGJlZ2luPSLvu78iIGlkPSJXNU0wTXBDZWhpSHpyZVN6TlRjemtjOWQi - Pz4gPHg6eG1wbWV0YSB4bWxuczp4PSJhZG9iZTpuczptZXRhLyIgeDp4bXB0az0iQWRvYmUgWE1QIENv - cmUgNS4zLWMwMTEgNjYuMTQ1NjYxLCAyMDEyLzAyLzA2LTE0OjU2OjI3ICAgICAgICAiPiA8cmRmOlJE - RiB4bWxuczpyZGY9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkvMDIvMjItcmRmLXN5bnRheC1ucyMiPiA8 - cmRmOkRlc2NyaXB0aW9uIHJkZjphYm91dD0iIiB4bWxuczp4bXBNTT0iaHR0cDovL25zLmFkb2JlLmNv - bS94YXAvMS4wL21tLyIgeG1sbnM6c3RSZWY9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlw - ZS9SZXNvdXJjZVJlZiMiIHhtbG5zOnhtcD0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wLyIgeG1w - TU06T3JpZ2luYWxEb2N1bWVudElEPSJ4bXAuZGlkOjJGQzkyMzc0Rjk0OUU0MTE5NjNCQjRENDMzQjlC - MUM4IiB4bXBNTTpEb2N1bWVudElEPSJ4bXAuZGlkOjhDMTdBQjRENEFBRTExRTQ4QjQyODY0MDNBNTJE - NzNCIiB4bXBNTTpJbnN0YW5jZUlEPSJ4bXAuaWlkOjhDMTdBQjRDNEFBRTExRTQ4QjQyODY0MDNBNTJE - NzNCIiB4bXA6Q3JlYXRvclRvb2w9IkFkb2JlIFBob3Rvc2hvcCBDUzYgKFdpbmRvd3MpIj4gPHhtcE1N - OkRlcml2ZWRGcm9tIHN0UmVmOmluc3RhbmNlSUQ9InhtcC5paWQ6NUQyMjc4QTlBQjRBRTQxMTk3NEFD - QUFFQjRCMzVENkUiIHN0UmVmOmRvY3VtZW50SUQ9InhtcC5kaWQ6MkZDOTIzNzRGOTQ5RTQxMTk2M0JC - NEQ0MzNCOUIxQzgiLz4gPC9yZGY6RGVzY3JpcHRpb24+IDwvcmRmOlJERj4gPC94OnhtcG1ldGE+IDw/ - eHBhY2tldCBlbmQ9InIiPz4eHsDfAAAB00lEQVRIS7XVWytEURQH8HniTTNHLs0NCXNcXjTN5dH9g/gM - 3jx590QhFDJS0gyTGmpqaqJIMW4hzlAoOaWISS7LWifntI3ddnTGrl92e/57/We/DBsA/CvuYSHZSr0t - lvCGsriX/oI3lMW9lM/SwgF9SEHwizs08IX2vAyLZvZRgXJ+cQWv7yB0q96Ds86voT0vw6KZNJsK4Pnl - DWKxmBBlqhpDUN0UNp2n2VrB/WMOEomEEGX0ArN5o+BGfYB0Oi1EGa8cwpKw6bxRcH6lQiaTEaKMVw5q - rzCbNwr2z65BURQhynh8Qe0VZvNGwdZBFlRVFaKMxxfQXmE2rxc8rW3sQy6XE0puHoG7IaC9YnV9j5th - pbZPqOCDCrbH5uIwOD7/zWgkDkNTizAyuwQjkWWIxFNQWduqmVxI/MiPz6/A8HTUuDMTTYLkbrqhgt5S - T3PG4ZJ3HE7focElZx0u3yn+VQiG1ZLymmm7s74f88f42S6bl9zyJZ6d6Xckd+Mt5ieogH4xJORHHajt - SzvqZPSgECpHZSiA2DztuxBlad+NgnpBEbIjusiiYboKRF+kGFHegUR5ImkFv7G0eAPzWVq8gfksLd5/ - oULiHhYS97BwwPYJlSCUgVubViQAAAAASUVORK5CYII= - - - - - iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAZdEVYdFNvZnR3YXJlAEFkb2JlIEltYWdlUmVhZHlxyWU8AAADZmlUWHRYTUw6Y29tLmFkb2Jl - LnhtcAAAAAAAPD94cGFja2V0IGJlZ2luPSLvu78iIGlkPSJXNU0wTXBDZWhpSHpyZVN6TlRjemtjOWQi - Pz4gPHg6eG1wbWV0YSB4bWxuczp4PSJhZG9iZTpuczptZXRhLyIgeDp4bXB0az0iQWRvYmUgWE1QIENv - cmUgNS4zLWMwMTEgNjYuMTQ1NjYxLCAyMDEyLzAyLzA2LTE0OjU2OjI3ICAgICAgICAiPiA8cmRmOlJE - RiB4bWxuczpyZGY9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkvMDIvMjItcmRmLXN5bnRheC1ucyMiPiA8 - cmRmOkRlc2NyaXB0aW9uIHJkZjphYm91dD0iIiB4bWxuczp4bXBNTT0iaHR0cDovL25zLmFkb2JlLmNv - bS94YXAvMS4wL21tLyIgeG1sbnM6c3RSZWY9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlw - ZS9SZXNvdXJjZVJlZiMiIHhtbG5zOnhtcD0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wLyIgeG1w - TU06T3JpZ2luYWxEb2N1bWVudElEPSJ4bXAuZGlkOjJGQzkyMzc0Rjk0OUU0MTE5NjNCQjRENDMzQjlC - MUM4IiB4bXBNTTpEb2N1bWVudElEPSJ4bXAuZGlkOjJEMDQyOEZBNEFEMjExRTRBN0MxRDBCNzJGRUND - MDEzIiB4bXBNTTpJbnN0YW5jZUlEPSJ4bXAuaWlkOjJEMDQyOEY5NEFEMjExRTRBN0MxRDBCNzJGRUND - MDEzIiB4bXA6Q3JlYXRvclRvb2w9IkFkb2JlIFBob3Rvc2hvcCBDUzYgKFdpbmRvd3MpIj4gPHhtcE1N - OkRlcml2ZWRGcm9tIHN0UmVmOmluc3RhbmNlSUQ9InhtcC5paWQ6QkRDRkI1RDVEMTRBRTQxMTk3NEFD - QUFFQjRCMzVENkUiIHN0UmVmOmRvY3VtZW50SUQ9InhtcC5kaWQ6MkZDOTIzNzRGOTQ5RTQxMTk2M0JC - NEQ0MzNCOUIxQzgiLz4gPC9yZGY6RGVzY3JpcHRpb24+IDwvcmRmOlJERj4gPC94OnhtcG1ldGE+IDw/ - eHBhY2tldCBlbmQ9InIiPz59jfe3AAAEbUlEQVRIS8WTeUybZRzHF48/pnFOuQRajkFLgQFb5iRLNJr4 - l/EPgsniUI4xZDAY1zyxwApsMJyIME61rByl3DfoYGBrgbWUY06FcZSCha4rQ8jYxkqPr2/fvkv8o2Sg - S/wkT970eb6/T5/39z7Prv8dt/Oql4mR4HZJ3ccoXFxhVCzB9DT9JueJdSq6c1wzVZFupepVzxu34XVj - CaEDi1jX6hF8ZQoeokl4iBVwzV9YdU1XRlIl28eVo8phCdXwGltEeOUsro6psaHVwcSDh5volc4iOO8X - 7KuVwb1hEi7J8myq9PEQO//I85oafr0KtEpUpNSETm+AwWDAvfv3YTQaybnm/t/AyO6Ga+UonJOnIijF - 1hA9tWI2qle9RxcI+RIpmZpTIfBULhIyyqHVahHPKcN70TmYnFFCp9OhqXcc9KwW0DOHVl3YU1aUyjJu - F1SpfhO3EM6bMMsVt+D8Zhz2HIpC4oU6bG5uIu4cD3tfTwAjIBNypQYbGxsISquBU34PaDHiVEplGXee - SuIjVaBv3Lz7gJg8vHg4FlZvc+ATVoLipiHsD8qCXWAO7IPK8MG5FjLXKboOeoYADkldUkplGWb7vOb4 - 4BzxIXXQE/1m59WDXdgBvxPfwz6UC4eQUth/WIBDZ2qQXj+K7IYRImeE5s5fOFrcDPvPapcJzVNmmwVY - VxWG9U09uau1tTVymPpc0iYFLew7OEUJ4BwtALfvJpl5xMrKCu6s3cUrn5YbCM1us80CrJZZVWjXr7j3 - 4CE0y8v4IrcaH+cK4Bv+DRyPl8ApphYuia3wZ3eCUzOA1PIfcVuzjHnlIgK/vgy7mHzTG+w12yzA5E53 - edYPo1c2i/X1dQTEfwvbwDQ4hhXg8OcN4P48Df+UTrgkNIAeW4Hg3Hbo9Xq0iGSgs4ls5CUhoXnObLOA - S8pkhG/bdZzgDZJnffT3GXieLAA9XgB2/RjZjuQqMWhxfBw824H55XWyhcfy+HDNqoB1SH4Codn6G7iw - p3d78EaVPlXX0CaZgkqlgly1gpCiK0htHCH/IL6oFcEF3ZjT3CUvXqv0DzDSS0FPq1a/8EbYS5Rqa+if - SAJ8KoeNR7gitEsnoVQqSbGOkJmYX1ggxaY70SabwIGMUrjn8I3WIXnBRPnWu/8nDnE9Sd7cAaP/ZSES - 6/rRKJRArpiHXC7HzekZNIukiCyrhW9mGZgXa4w2kUVnibJnzdXbxP5URzyDO4QjxGl5i9uNpMZeKP5U - IrywAq9yCnGAOGGMonbYxpVnEPGdyR9BO/MTj8kfgXeNFPt5IngVtoF1kQ9WcTs8qgfgmNreQMS21xZL - 0E6Ln6ef75tg8sfgXT8O77oReAkkYNXJ4PRV/4ztyfo9VPTf4xjdf9CpQKzdxxuGe6UMbhXEmc8V6mze - r3qNivx3HGN7UmglQ6CVDMIxXwybo5UcaunJQD8te9rhyx4JrWwItlGNUut3y5+hlp4cDhFCpl14k9jq - nR+Y1NTjIe7NlmMnWKoHsOtvjWYcKpheqFQAAAAASUVORK5CYII= - - - - - iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAZdEVYdFNvZnR3YXJlAEFkb2JlIEltYWdlUmVhZHlxyWU8AAADZmlUWHRYTUw6Y29tLmFkb2Jl - LnhtcAAAAAAAPD94cGFja2V0IGJlZ2luPSLvu78iIGlkPSJXNU0wTXBDZWhpSHpyZVN6TlRjemtjOWQi - Pz4gPHg6eG1wbWV0YSB4bWxuczp4PSJhZG9iZTpuczptZXRhLyIgeDp4bXB0az0iQWRvYmUgWE1QIENv - cmUgNS4zLWMwMTEgNjYuMTQ1NjYxLCAyMDEyLzAyLzA2LTE0OjU2OjI3ICAgICAgICAiPiA8cmRmOlJE - RiB4bWxuczpyZGY9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkvMDIvMjItcmRmLXN5bnRheC1ucyMiPiA8 - cmRmOkRlc2NyaXB0aW9uIHJkZjphYm91dD0iIiB4bWxuczp4bXBNTT0iaHR0cDovL25zLmFkb2JlLmNv - bS94YXAvMS4wL21tLyIgeG1sbnM6c3RSZWY9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlw - ZS9SZXNvdXJjZVJlZiMiIHhtbG5zOnhtcD0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wLyIgeG1w - TU06T3JpZ2luYWxEb2N1bWVudElEPSJ4bXAuZGlkOjJGQzkyMzc0Rjk0OUU0MTE5NjNCQjRENDMzQjlC - MUM4IiB4bXBNTTpEb2N1bWVudElEPSJ4bXAuZGlkOjJERTg4QTFENEQyMjExRTRBODEyODk0M0RBMTc5 - Qjg3IiB4bXBNTTpJbnN0YW5jZUlEPSJ4bXAuaWlkOjJERTg4QTFDNEQyMjExRTRBODEyODk0M0RBMTc5 - Qjg3IiB4bXA6Q3JlYXRvclRvb2w9IkFkb2JlIFBob3Rvc2hvcCBDUzYgKFdpbmRvd3MpIj4gPHhtcE1N - OkRlcml2ZWRGcm9tIHN0UmVmOmluc3RhbmNlSUQ9InhtcC5paWQ6NjJGOUEyRDEyMTRERTQxMUIzNkJE - NUVDQjU5MzE1NjIiIHN0UmVmOmRvY3VtZW50SUQ9InhtcC5kaWQ6MkZDOTIzNzRGOTQ5RTQxMTk2M0JC - NEQ0MzNCOUIxQzgiLz4gPC9yZGY6RGVzY3JpcHRpb24+IDwvcmRmOlJERj4gPC94OnhtcG1ldGE+IDw/ - eHBhY2tldCBlbmQ9InIiPz6wJF34AAACl0lEQVRIS62Vy08TURSH73/QhQtXVnBhxEcMiUkhbEg0hB1R - Q1i68C8wIW5cEqMLN7ho2Ji4YiEhWq0prYUhfULbadN3obTaChobtZEUsFY9nnPS6WM6HYowyZf87j33 - nG/amaai9geOBYA+4pTxihmBE8DcTQB4J8em/9IwSQyagmrtL+z9rMFmvnhkKvtV7tcVHPz6DVsftulA - AckdhUg8zf19eoLKAd597iMLMItewfOxUDTN/bqCH3tVSG8VWIBZ9AoJApEk9+sKvu/uQ2IjzwJkGtH8 - OrTwy3Hu77vIAnV9mgWlcgWiqRwLjAMmkOMbPbNTKnN/JJntqJGEBZ++7oKcyLLgLN4JrU8Cms2C4pcy - BKKZumCI18temQ/8DzSLZlBmQX7nG/jCKdpgAa0driCtY5iFHuqHSjNoFtaags1iCdzBBG+QgNY2aZ0F - mIUe6osENAtrTUEq/7kDq9PHAszU5yYoq9f1i9cUSCD5ozxDEeTsrhAoONwyxLLb8MrhYQFmZYCHsnpd - v3hNgQROb5hnKIK29944MAThTBEWbS4WYBZ6qC/sKSy5ZJ6BGUQg8b4Bbhjod4AZXlhXWdBa10LrIVul - AM9ggS+aa6AIMMO8ZYUO0KeyIOMtZyaQpXpNi4LFucYzMINwhbMNcMNw5oIJMMNKIA0LNg88mZuH/ssj - dPgBMnN+cBRmny1wrRtSMMMzWCCFMg0UAeY2Fh0+GL5xG8Zu3oHXUrCj3g0WONdTbeBm21/o1N17gPtg - 98Xh3VoS3qzKMDI22agfglnY/Uld8NDc/ZlZwAwvl4Ngun6LGh8rdfVDViNs3rguOOzq6XOD8PDpc7g2 - OkHDH7XWtYa2It66Y4eCQ8cRfpvUNa2hTUD8A6JMaBvCyTdJAAAAAElFTkSuQmCC - - iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 @@ -1403,7 +1485,7 @@ AAAASUVORK5CYII= - + iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 YQUAAAAZdEVYdFNvZnR3YXJlAEFkb2JlIEltYWdlUmVhZHlxyWU8AAADZmlUWHRYTUw6Y29tLmFkb2Jl @@ -1415,108 +1497,26 @@ bS94YXAvMS4wL21tLyIgeG1sbnM6c3RSZWY9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlw ZS9SZXNvdXJjZVJlZiMiIHhtbG5zOnhtcD0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wLyIgeG1w TU06T3JpZ2luYWxEb2N1bWVudElEPSJ4bXAuZGlkOjJGQzkyMzc0Rjk0OUU0MTE5NjNCQjRENDMzQjlC - MUM4IiB4bXBNTTpEb2N1bWVudElEPSJ4bXAuZGlkOkUzNzJDMjE3NEFENjExRTRCNjE0OEVEQzI4MEM0 - RTZDIiB4bXBNTTpJbnN0YW5jZUlEPSJ4bXAuaWlkOkUzNzJDMjE2NEFENjExRTRCNjE0OEVEQzI4MEM0 - RTZDIiB4bXA6Q3JlYXRvclRvb2w9IkFkb2JlIFBob3Rvc2hvcCBDUzYgKFdpbmRvd3MpIj4gPHhtcE1N - OkRlcml2ZWRGcm9tIHN0UmVmOmluc3RhbmNlSUQ9InhtcC5paWQ6RkI3NUQ0QkNENDRBRTQxMTk3NEFD - QUFFQjRCMzVENkUiIHN0UmVmOmRvY3VtZW50SUQ9InhtcC5kaWQ6MkZDOTIzNzRGOTQ5RTQxMTk2M0JC - NEQ0MzNCOUIxQzgiLz4gPC9yZGY6RGVzY3JpcHRpb24+IDwvcmRmOlJERj4gPC94OnhtcG1ldGE+IDw/ - eHBhY2tldCBlbmQ9InIiPz6PyaLfAAADMElEQVRIS6VUXUiTYRT+vi3Tzd+ps23+3KRigtiPkolEQReG - UYTkhWatpWlWGkRdddfdSPImqUAJjSIT00oxLJIk0cR+tFSyzDJtgaMkDEPkdM7ZPvm2vS6jBx6es3Pe - 8zzvtm+TohLS/ov+AACStLgEQuJyLRJWYK1yzh/+FgCoQrpnfM4fOGBhcUlIMkEVkma4H4i1y2kFcMD8 - wqKQZILKZqTqmlTAWrfvMjhgbv63Dwm0hLWQohn1eNEbzrlfPiTQAtZCKjP1GXdAIC+r4XD+9CGBFrDm - RVJ1re6pZ0GyHHMvIawauYVNCFPfvvuQQAtYC6meKXU0amNsaGN/ZR60xIf9aIgN3cpGE9OzZCZ85nEm - pGiWlLABmuJCnUOXrNB7chdct4TUo32ANDbp4NuielDpqWfePdaPX6GrohSK4uLhlCEo96YlZLbOFHzH - oJXjMSBcGn4/zQGovEDqXXtzeTb+BTrKj0J3+Q54djYP7EZdTU2MPjFSK8eieQR9QtLg6GcOQPWgqKeQ - ZyOfoK30CDw+lg2Ot3Z4VLoNqo269mCNHIa2WjYn9A1PcAAqU6m9VV3TF9psOwwPS3JgZugCdNoyocwU - jU+RlImWBpezGz0vxzkA1YOiHvPFO7Ca1kGHLQtmXp2HdutmqN+/F6JiU+h3kOpyVeHJwBgHoLIpqajm - 189HoaG4CNqsGTA1UAWth9Lg6r490PygGyLjUikgzuWqQlffCAegelDdUwLqigqhpXgjTPYeh+bCFCg2 - RkEk3vxuVz/P0c43oLP3DQegLhspNalSFxiNcLswHT48LYNbBUlQk7ebzenmyhm08w1o7xmiAP6hRZiT - 70eYkzpctUuJWdHmwWs74+F1Uz7cyE+E4ohQB5mHm9a3GywpTXzektyKduIAIsKI3ISkL4rIdYle05C9 - VrZVBmvtl7eboUyv7V4jSQdwRn8FdI72iErtCUxnIuifkJ5hUqUOq9Jr7OeCNU6bTpNVqtMcDJSldOwn - KnOk+jypJ5QANRWc0cs5SEelXr54QidfwVYAMoiHq4W/gNM6OaNCJ+diaUIqN/43+Atwg27t+9ZXBUn6 - A2MdqQeVc5pWAAAAAElFTkSuQmCC - - - - - iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAIAAABvFaqvAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAZdEVYdFNvZnR3YXJlAEFkb2JlIEltYWdlUmVhZHlxyWU8AAADZmlUWHRYTUw6Y29tLmFkb2Jl - LnhtcAAAAAAAPD94cGFja2V0IGJlZ2luPSLvu78iIGlkPSJXNU0wTXBDZWhpSHpyZVN6TlRjemtjOWQi - Pz4gPHg6eG1wbWV0YSB4bWxuczp4PSJhZG9iZTpuczptZXRhLyIgeDp4bXB0az0iQWRvYmUgWE1QIENv - cmUgNS4zLWMwMTEgNjYuMTQ1NjYxLCAyMDEyLzAyLzA2LTE0OjU2OjI3ICAgICAgICAiPiA8cmRmOlJE - RiB4bWxuczpyZGY9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkvMDIvMjItcmRmLXN5bnRheC1ucyMiPiA8 - cmRmOkRlc2NyaXB0aW9uIHJkZjphYm91dD0iIiB4bWxuczp4bXBNTT0iaHR0cDovL25zLmFkb2JlLmNv - bS94YXAvMS4wL21tLyIgeG1sbnM6c3RSZWY9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlw - ZS9SZXNvdXJjZVJlZiMiIHhtbG5zOnhtcD0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wLyIgeG1w - TU06T3JpZ2luYWxEb2N1bWVudElEPSJ4bXAuZGlkOjJGQzkyMzc0Rjk0OUU0MTE5NjNCQjRENDMzQjlC - MUM4IiB4bXBNTTpEb2N1bWVudElEPSJ4bXAuZGlkOjUzQzNGNDI5NEQyQzExRTQ4QkE1QUNCMEVDRDZF - MDVEIiB4bXBNTTpJbnN0YW5jZUlEPSJ4bXAuaWlkOjUzQzNGNDI4NEQyQzExRTQ4QkE1QUNCMEVDRDZF - MDVEIiB4bXA6Q3JlYXRvclRvb2w9IkFkb2JlIFBob3Rvc2hvcCBDUzYgKFdpbmRvd3MpIj4gPHhtcE1N - OkRlcml2ZWRGcm9tIHN0UmVmOmluc3RhbmNlSUQ9InhtcC5paWQ6RkI1NUY4OTYyQTRERTQxMUIzNkJE + MUM4IiB4bXBNTTpEb2N1bWVudElEPSJ4bXAuZGlkOjJERjY3MEZENEQyMzExRTRCNDlGQUMwMzk0OTAw + Qzc4IiB4bXBNTTpJbnN0YW5jZUlEPSJ4bXAuaWlkOjJERjY3MEZDNEQyMzExRTRCNDlGQUMwMzk0OTAw + Qzc4IiB4bXA6Q3JlYXRvclRvb2w9IkFkb2JlIFBob3Rvc2hvcCBDUzYgKFdpbmRvd3MpIj4gPHhtcE1N + OkRlcml2ZWRGcm9tIHN0UmVmOmluc3RhbmNlSUQ9InhtcC5paWQ6NjhGOUEyRDEyMTRERTQxMUIzNkJE NUVDQjU5MzE1NjIiIHN0UmVmOmRvY3VtZW50SUQ9InhtcC5kaWQ6MkZDOTIzNzRGOTQ5RTQxMTk2M0JC NEQ0MzNCOUIxQzgiLz4gPC9yZGY6RGVzY3JpcHRpb24+IDwvcmRmOlJERj4gPC94OnhtcG1ldGE+IDw/ - eHBhY2tldCBlbmQ9InIiPz6IsaOmAAADF0lEQVQ4T62U/UuTURTH+0nICqRI1ERMMyNQe8N0ChqBwQhN - yvwhEgJjVCqJ/qCibZo6tzQ339h6Nre5prapUzc1XzItX1ilzuWMLLVAen+xf6DTuTxjdxsFVj58ebjc - c+7nnud7z3228DbpIaDFH/CfoqCn72DIDvNfPDM2KAqyr8PcJxqY+QBTb8kkjocXQTsKigGwfqYJHqIg - 1OxHGHvlWPx4hXB1YyA3g4CBhqst+piEnrDA3rA95vBAY1x8d7lq/DVZwm5PQZNvoKYdypSgHgbVEIh1 - cLOZzOCbSSsyRQRba6uWtcpVLbPcwlglInNUCJNWWKqABqMLCGvGlfpJELaQ/V1Vd1lujAhe0chtUrH5 - ZExnmJ85MdomEa+qZMbIEF2BHGunILSjdZwYgTt4gJqjjj0Rltml1Zq9AeL0Mn71Wn2mtDU80MIvsFTw - O+KPIoWC8BNYRIUaqrRQroJKjQOk9N+xLBF2pXJFKfnsDGYa8gS6xOO2whyMuoHaHpGzZ/pBM0IMrtXD - nT4HqNHXe0lYoogMFeQP4jbSDkCPTUyXmnNoPutSo+9WN5DEQDyeWCWnhqm4p7Oimt3b54rzmmKPVHKz - 0Xg0AU1pz87VJp+yXOfd9t3mBmLXsGrsJhSsDtF4iOWxKdpzyQNnuRW7vEUp13obFG05OVUBPtO5V1Sn - k5q4SX8ENfWA6C7xHsP981Bb2sf38ZKd4JhSuXUJHPHhg/WJnAeZFw0Xzt/w8erRtLmBnB/CSmaC599I - 2PYVRl+CXigu3R9SfCC0Pf1MZ1oqvqvjogX7gtRFJfb1n24g7GblfQcFP2fkBYm5anxqQcbLKgzyK/Df - WRTkV5+RMTg84ZrgAOHo4ZIDVNdJw67CpsVLZ5gifj97Typlq2ZFQXj8LKh5EHpnaIar8N+Al5l9Y9Vs - T7OiIAzjqaMsa6QJnBkeWvgOHdPkAuIV67PSeQpCYYZplsZ+KyyWLRyFF8D553EDbURY770J0rrYJbda - SYE4iWb9NcgpRKDrOMAWwYP6d5BTaC52zyaAWDlAm/DweL8AX9zXukfxHsIAAAAASUVORK5CYII= - - - - - iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAZdEVYdFNvZnR3YXJlAEFkb2JlIEltYWdlUmVhZHlxyWU8AAADZmlUWHRYTUw6Y29tLmFkb2Jl - LnhtcAAAAAAAPD94cGFja2V0IGJlZ2luPSLvu78iIGlkPSJXNU0wTXBDZWhpSHpyZVN6TlRjemtjOWQi - Pz4gPHg6eG1wbWV0YSB4bWxuczp4PSJhZG9iZTpuczptZXRhLyIgeDp4bXB0az0iQWRvYmUgWE1QIENv - cmUgNS4zLWMwMTEgNjYuMTQ1NjYxLCAyMDEyLzAyLzA2LTE0OjU2OjI3ICAgICAgICAiPiA8cmRmOlJE - RiB4bWxuczpyZGY9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkvMDIvMjItcmRmLXN5bnRheC1ucyMiPiA8 - cmRmOkRlc2NyaXB0aW9uIHJkZjphYm91dD0iIiB4bWxuczp4bXBNTT0iaHR0cDovL25zLmFkb2JlLmNv - bS94YXAvMS4wL21tLyIgeG1sbnM6c3RSZWY9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlw - ZS9SZXNvdXJjZVJlZiMiIHhtbG5zOnhtcD0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wLyIgeG1w - TU06T3JpZ2luYWxEb2N1bWVudElEPSJ4bXAuZGlkOjJGQzkyMzc0Rjk0OUU0MTE5NjNCQjRENDMzQjlC - MUM4IiB4bXBNTTpEb2N1bWVudElEPSJ4bXAuZGlkOkVENUYwQThBNEQyOTExRTQ5QzUzQzdFMkFGQkQy - NTA1IiB4bXBNTTpJbnN0YW5jZUlEPSJ4bXAuaWlkOkVENUYwQTg5NEQyOTExRTQ5QzUzQzdFMkFGQkQy - NTA1IiB4bXA6Q3JlYXRvclRvb2w9IkFkb2JlIFBob3Rvc2hvcCBDUzYgKFdpbmRvd3MpIj4gPHhtcE1N - OkRlcml2ZWRGcm9tIHN0UmVmOmluc3RhbmNlSUQ9InhtcC5paWQ6MkRGNkEzOUYyOTRERTQxMUIzNkJE - NUVDQjU5MzE1NjIiIHN0UmVmOmRvY3VtZW50SUQ9InhtcC5kaWQ6MkZDOTIzNzRGOTQ5RTQxMTk2M0JC - NEQ0MzNCOUIxQzgiLz4gPC9yZGY6RGVzY3JpcHRpb24+IDwvcmRmOlJERj4gPC94OnhtcG1ldGE+IDw/ - eHBhY2tldCBlbmQ9InIiPz6npMy1AAAGEUlEQVRIS7WVeVDUZRjHf7Ase8ECu+wl4LIXcqyyHC783AWW - 5QaRFTHkMi9SQvE+UhLzwk0BUcQSgQBBgcYDzStMSzOPcpqcmo5pmqk/+rOapqb+iG/PbzfFcSz/6pn5 - zPN739/7fp/nvZn/3TSLjj+XJy2/RaItPCT5vaBd8m1+q2Qku1lcrcvki+iXr7fFU6ZZeOx5KDU1b7jU - 1Z2bVPMPWNMbRXrXkWAc+ywVLbcS8fKwFjlu8VdpW0XzSc6f8PEIPzJ19dFnU3WEJdHL9P3X9O1nkdB8 - CQrX7i3mKn9zfqsUq29ZsPfjRBx5aMO2cTMy94gm7FuF7XyJTwDJTo5GVdHxNALVgsPd5Ceye+9g8b0f - UXbjB8RtH4Msd+MeXS7f6twjxbILZiy7pEHDtTBsvG7BqivTUXpsClLWCbtJNpDwBlGVH3ySIFV520eW - nedRcf0HVJGwbeRrOHs/h2n1CGRZDe7wND/W1hiI8sEYlJ4KRcVpJcrfVqByNBILhqLh3KeA+UXBOpL2 - jkRZduARPGXZ/vH4pnMou/gd7INfIPn4QyQc/RSOzk9hrBtEiKPerUn1Y5PXBaDojWlwdgUjr0+G/H4Z - cnpCUNJrQNZ+LeLrBD/LYnixFEDAKFz7vJQ0r49dO4zikS8x8/ADxLd9jIT2B5ix/z7SX78Pw+K3EJy2 - wq1M4rEz6sRwthgw82Ag2KNS2I5JPZ4rZx00ImGNHIZSfisFkDGhxbs5AkKLd/3kaLkDlgTjXrsNc/Md - mPfeQeyOD2HbcRu6yi4E2Wrd8ngeG71IBPtePWa4JUhsD0DykQAkHQqApUWCFLcGyZvDoZ/P/5oCTGXk - hU2MvGB7rbGmG47dd2Fa+x6iX/kAMa/eQvS2m4jaeAPspvcROb8TQexid3CcL2usFCJjnwE5nQYU9RhR - PGDC7D4TCrqMyDqkR9oePbRz/SZEKh8rI8vdyshyXhmzLD8DS/1VGOquwtgw7glkXH0Nhvp3kbL2GrSl - hyC11ril03xZfbkQKZuVsDeq4NihRtYuDbJ2auBoUsO2TQXrJiWMlWIExflWMiHOjRzfJy0bg776HCKX - vANd7WXol1/xeN3Si7A2XIXW1YbAxAq3UO0zPTSd1yG38bplLK//vxBrffKY4PQ1HH9aKk8jonQUUyvO - Qlt9HtqaCx4/tXIMyXWXMXXOAQTEv+D2zCvDhBBTCN1zCGOCZq3k+DXO1YcpRYOY4hpF2LzTCCs74/VE - 3IvnEVd1EhGFblBbWot6BKXWQZq64tlYa2+TuJwQM9KU5cRL35hyOxCe2w913hA0hcPQFI16KRzxEFtO - a1Q9htSVN5C+5S5x7x/uIm3DR7CvuomUReOImt1FU7nwEolHECImMGkJE5i46EJkejNM+X1QOPqhzBqC - KvskVDmnJuHKT/K4bgjKzBMItXcjJv84NOwWiKPndJK40TOCgPgaRmIur1dZ1yM6txvyWT0ITR+AImOQ - gg39N1ybDBJP60PorC5My3oTwQm18FdNryBxbq0EJL6AEUTYZBTkF0NGKyKdvZDb3qJOAxSIOqcP/jtp - JyC3D1BSvYgp6EN4aiNlP/cTEk4gFASPEUeXkWd8RaY5jcrEBkTn9UCT4Q3gzfBfRvJE9rrsfpicHSRe - NsFXmJeSXhTBXXY+jMjk8uArVkpExuKb6pkbYJ7L7Ria37xTUBeMeCkcncRTN0z/TyLKNYy4khNQJq2G - IMLBXdUWQkXwCYYR6md7IPP1k8WEC3UFDzSpG2BZeAZJtXQWFpyls3HOC50JzkdQnbFqDInLLiC2rBcq - 6xoSzzzP+NDVwDBaQkx4XzahNv8xZH48sVotCHeOUnnCWNJG18Q4UjddB7vlfbBbPwC7+YannLTyIrS5 - OyHU5v3hr07poL7JBHe4Jh8bzgQROY8h46IKCAVfbi73D3PcpfoJlX0VtEVN0JXsQlj2ZoRaaynj7N/8 - NfZLPLFmHrXnpiWSCCL8iMl32T/M6YGMq+R+covD7QADwfoIgqt4QVGtfvIZJ4lRv5CY4zypbjfjy+eE - M4l4gtuSwYSQ4DS4EZAew/wNiCYQJlvQU3cAAAAASUVORK5CYII= + eHBhY2tldCBlbmQ9InIiPz6GKmpFAAAC+UlEQVRIS63T20vTYRzH8Yforj/Ei24UiSgKIygKi8oyxZQo + cvNYeXaesmzqPGu2POd0ulSsnIdaurTSTJ3O6UxTPGya5vCQx5AuPn39RbHop7nZxQt+z3ie93e/Z4w1 + p7nsCoBt8R6yBF/UHPv+Wb0rfFFzm99CRIwEW1gnqXzxTXxRc0ydctm4OlID2sxrw6iCtiwItC+A2P/D + frLnjwGNSZdMq6N1WOvLwFpP4l/WdRlY6Jaio9Ab7QXba8sVoDHZGdT8PYS9THDqMGnLsKpNw0qXGCua + BO55VZdNQ6U/DRRibVCGb+N1pH5bukoRqHmDHOIG1N8/X2F4I8WyNhtf2+9hqSsZxqZ4upbb6HsSZLHO + Im90ym6hNVcIaktYTexZyUelGEvaHMy/jcFiZxo0xX5Y7ivGcn8JkVmA9uvlWBmqwpJeAWovs+poR99O + eRgWtQWYVUdgrj0FH+i+F3XF3NoappZYGJrEoLaOVYpOOTY/FGJB+xjTqnDMtMTTAC/Ma/Ix/TLUKl9e + x0JfFQpql7PykBP7lWIXzPeUYLIhHCPKCLr/AMy2ZsKoDLTKdNNdvM8TgNpRTBZwfJ885CTmaIChPhwa + mS+GnkdhqjEWY9X+VplqvIMXEhdQ24mZeuSs0N/BNNWWj4k6EdSZHhhXxWH0aSCGFd4c4Tk7zk7XBlUM + FKLToK4Nm+0qYnneRzqGGiSYaIiiyZdhVCdgqFSIwRJPjucZW85O1pvnRmvDkO9zFNTdy2Y6HjGp4HCF + 5kk4xhoiURd/EROv4tBfeM0qAyUC9Mp9QM0+7o829T6LZV0/mNycS6+nFKFWfAGj9ZHozfGwil7miZYH + 7qCmghsw+S6VpV894KuUuKFbfhNNqa749CwY3dm0toK+VABl3HlQM5obYHybwFLc7W1y/Y5BlX6FfgNn + DNcEY0DhZZX+MiGKbh0DNR24AYYWMSfJzc6GZBApwS5skIzNODcg0dV2V36FtsJ7yBJ8UXO8hyzBFzXH + ++H/A/YDv9/V87iOlrYAAAAASUVORK5CYII= @@ -3164,9 +3164,6 @@ 864, 17 - - 864, 17 - iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 diff --git a/Program.cs b/Program.cs index e38f7b8..a76d0d4 100644 --- a/Program.cs +++ b/Program.cs @@ -16,14 +16,14 @@ [STAThread] static void Main() { - ValidateInfo validateInfo = ValidateConfig.LoadConfig(); + ValidateConfig.LoadConfig(); string localConfigPath = Application.StartupPath + "/Config.xml"; //获取程序及版本信息 string currentVersionCode = Assembly.GetExecutingAssembly().GetName().Version.ToString(); //获取文件版本信息 FileVersionInfo.GetVersionInfo(Application.ExecutablePath); - + Utility.SysInfoConfig(); string configUrl = getProgramUrl(localConfigPath, "configurl"); if (configUrl != "") { diff --git a/TreeUtils.cs b/TreeUtils.cs index 1f055b5..ad39643 100644 --- a/TreeUtils.cs +++ b/TreeUtils.cs @@ -19,7 +19,7 @@ public static void InitLayerTree(GSOGlobeControl gsoGlobeControl, TreeView treeView, string viewDatasrc) { // treeView.Nodes.Clear(); - LayerConfig layerConfig = Utility.layerConfig;//layertree所在的配置文件 + LayerConfig layerConfig = Utility.LayerConfig;//layertree所在的配置文件 List datasrcs = layerConfig.datasrcs; foreach (DataSrc datasrc in datasrcs) { diff --git a/Utility.cs b/Utility.cs index c03e405..ab947a3 100644 --- a/Utility.cs +++ b/Utility.cs @@ -20,7 +20,7 @@ public static string dbdatabase; public static string userID; - public static Hashtable Pipe_QueryFields; +// public static Hashtable Pipe_QueryFields; public static string DBPassword; public static string DBServer; public static string DBBackUp; @@ -38,7 +38,7 @@ public static List listPipelineType; public static string PicRootURL; public static string PicDefaultURL; - public static double dFlyAboveLine = 2; +// public static double dFlyAboveLine = 2; public static string userName; public static string projectStr; public static string userRole; @@ -85,12 +85,17 @@ public static List pipefittingLayerNames = new List();//管件图层名称 public static List sgPipeLayersNames = new List();//施工管线图层名称 -// public static Dictionary dictionaryNetLayerNameAndCaption = new Dictionary(); - public static HashSet layerNameSet = new HashSet(); + public static HashSet layerNameSet = new HashSet();//记录有哪些图层要显示 public static string roadLayerName = ""; #endregion wxl - public static LayerConfig layerConfig; + public static LayerConfig LayerConfig; + + public static string RoleServer; + public static string TitleImagePath; + public static string SysnameVersion; + public static string Copyright; + public static void SetBallons(GSOBalloon featureTooltip, GSOBalloonEx balloonEx) { featureTooltip.CacheFilePath = Application.StartupPath + "/GeoScene/Globe/Temp"; @@ -188,25 +193,6 @@ } return s.ToString(); } - public static GSOFeatures Table2Features(DataTable table, string currentQueryLayer, GSOGlobeControl globeControl1) - { - GSOFeatures features = new GSOFeatures(); - for (int i = 0; i < table.Rows.Count; i++) - { - DataRow row = table.Rows[i]; - - string featureName = row["编号"].ToString(); - featureName = featureName.Trim(); - GSOLayer layer = globeControl1.Globe.Layers.GetLayerByCaption(currentQueryLayer); - GSOFeatures tempfeatures = layer.GetFeatureByName(featureName, false); - if (tempfeatures.Length > 0) - { - features.Add(tempfeatures[0]); - } - } - return features; - } - //程序启动的时候读取配置文件 public static void SetParams() @@ -358,8 +344,8 @@ #region wxl 从layerconfig.xml中读取 - layerConfig = XmlTools.DeserializeFromXml(layerConfigFile); - List dataSrcs = layerConfig.datasrcs; + LayerConfig = XmlTools.DeserializeFromXml(layerConfigFile); + List dataSrcs = LayerConfig.datasrcs; foreach (var dataSrc in dataSrcs) { @@ -598,76 +584,49 @@ #endregion } - /* - //判断网络是否连接 - public static bool isNetworkConnectionSuccess(string ipAdress) + /// + /// 获取Config.xml配置文件中的roleurl配置，并返回 + /// + /// 请求综合信息平台的服务地址 + public static void SysInfoConfig() { - //return true; - if (ipAdress == null) - { - return false; - } - if (ipAdress.Contains("\\")) - { - ipAdress = ipAdress.Substring(0, ipAdress.LastIndexOf('\\')); - } - if (ipAdress.Trim() == "localhost" || ipAdress.Trim() == "127.0.0.1" || ipAdress.Trim() == Dns.GetHostName()) - { - return true; - } - Ping ping = new Ping(); + if (!File.Exists(filename)) return; + + XmlTextReader xmlReader = new XmlTextReader(filename); try { - PingReply pr = ping.Send(ipAdress.Trim(), 3000); - if (pr.Status == IPStatus.Success) + while (xmlReader.Read()) { - return true; + if (xmlReader.Name.Equals("roleurl")) + { + RoleServer = xmlReader.ReadElementString(); + } + else if (xmlReader.Name.Equals("titleimgpath")) + { + TitleImagePath = xmlReader.ReadElementString(); + } + else if (xmlReader.Name.Equals("sysname")) + { + SysnameVersion = xmlReader.ReadElementString(); + } + else if (xmlReader.Name.Equals("copyright")) + { + Copyright = xmlReader.ReadElementString(); + } } - else - { - return false; - } + } catch (Exception ex) { - LogError.PublishError(ex); - return false; + + LogHelper.Error("在config.xml配置文件中读取roleurl时出错"); } - } - */ - - - //TODO LIST:下面两个方法移到featueTools.cs中 - //根据附属物图层名字得到里面含有的附属物 - public static string[] getAccStrsByLayer(string layername) - { - string[] accStrs = null; - string sql = "select 附属物名称 from " + layername + " group by 附属物名称"; - DataSet dataset = OledbHelper.getDataSet(sql, layername); - if (dataset == null) return null; - accStrs = new string[dataset.Tables[0].Rows.Count]; - for (int i = 0; i < dataset.Tables[0].Rows.Count; i++) + finally { - accStrs[i] = dataset.Tables[0].Rows[i][0].ToString(); + xmlReader.Close(); } - return accStrs; } - //删除内存图层中指定名称的feature - public static void RemoveFeatureFromName(GSOGlobeControl globeControl1, string featureName) - { - GSOFeatures features = globeControl1.Globe.MemoryLayer.GetFeatureByName(featureName, true); - if (features != null) - { - for (int i = features.Length - 1; i >= 0; i--) - { - GSOFeature feature = features[i]; - if (feature != null) - { - globeControl1.Globe.MemoryLayer.RemoveFeatureByID(feature.ID); - } - } - } - globeControl1.Refresh(); - } + + } } diff --git a/ValidateInfo.cs b/ValidateInfo.cs index de75391..01546da 100644 --- a/ValidateInfo.cs +++ b/ValidateInfo.cs @@ -192,7 +192,7 @@ } if (!isSuccess) { - LogHelper.WriteLog(typeof(FieldUniqueValidate), logStr); + LogHelper.Error(logStr); } return isSuccess; } @@ -247,7 +247,7 @@ err += "未找到字段或其类型匹配:" + unFoundField.label + ":" + unFoundField.type + "\r\n"; } - LogHelper.WriteLog(typeof(FieldCountValidate), err); + LogHelper.Error(err); return false; } return true; @@ -316,7 +316,7 @@ { err += "字段:" + field.label + "出错\r\n"; } - LogHelper.WriteLog(typeof(FieldOrderValidate), err); + LogHelper.Error(err); return false; } return true; @@ -388,8 +388,7 @@ } if (isSuccess == false) { - LogHelper.WriteLog(typeof(FieldEmptyValidate), - "字段为空检查失败:\r\n" + err); + LogHelper.Error("字段为空检查失败:\r\n" + err); } return isSuccess; } diff --git a/bin/x86/Debug/Config.xml b/bin/x86/Debug/Config.xml index 6995f64..6a453a3 100644 --- a/bin/x86/Debug/Config.xml +++ b/bin/x86/Debug/Config.xml @@ -25,6 +25,11 @@ http://127.0.0.1/Cyberpipe.msi http://127.0.0.1/Config.xml + http://192.168.0.102:8080/ctrl + /Resource/title.jpg + 智慧太湖新城管网规划分析系统6.0 + @2014-2015 苏州航天系统工程有限公司 版权所有 + 编号,管线编码,管径_毫米,材质,埋设方式,起始地面高程,起始埋深,终止地面高程,终止埋深,建设年代,使用年限,权属单位,设计单位,设计负责人,施工单位,施工负责人,监理单位,监理负责人,业务负责人,备注 编号,管线编码,管径_毫米,材质,埋设方式,起始地面高程,起始埋深,终止地面高程,终止埋深,建设年代,使用年限,权属单位,设计单位,设计负责人,施工单位,施工负责人,监理单位,监理负责人,业务负责人,备注 diff --git a/bin/x86/Debug/config/log4net.config b/bin/x86/Debug/config/log4net.config index 80f9b25..6fbcfa7 100644 --- a/bin/x86/Debug/config/log4net.config +++ b/bin/x86/Debug/config/log4net.config @@ -3,29 +3,118 @@
- - - - - - - - - - - - - - - + + + -property: [%property{NDC}] - %n错误描述：%message%newline %n"/> - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/bin/x86/Debug/glVersion.txt b/bin/x86/Debug/glVersion.txt index cd82eca..755455e 100644 --- a/bin/x86/Debug/glVersion.txt +++ b/bin/x86/Debug/glVersion.txt Binary files differ diff --git a/bin/x86/Debug/log.txt b/bin/x86/Debug/log.txt index a4966d3..2112642 100644 --- a/bin/x86/Debug/log.txt +++ b/bin/x86/Debug/log.txt @@ -430,3 +430,43 @@ exception over ------------------------------------------------------------ + + exception begin -----------------2016/11/29 18:54:54--------------------- + + + + e.Message:第 29 行，位置 4 上的开始标记“titleimagpath”与结束标记“titleimagepath”不匹配。 第 29 行，位置 39。 + + e.Source:System.Xml + + e.TargetSite:Void Throw(System.String, System.String[]) + + e.StackTrace: 在 System.Xml.XmlTextReaderImpl.Throw(String res, String[] args) + 在 System.Xml.XmlTextReaderImpl.ThrowTagMismatch(NodeData startTag) + 在 System.Xml.XmlTextReaderImpl.ParseEndElement() + 在 System.Xml.XmlTextReaderImpl.ParseElementContent() + 在 Cyberpipe.Utility.SetParams() 位置 E:\wxl\work\GHFX_REFACTOR\Utility.cs:行号 208 + + + + exception over ------------------------------------------------------------ + + exception begin -----------------2016/11/29 18:57:17--------------------- + + + + e.Message:第 29 行，位置 4 上的开始标记“titleimagpath”与结束标记“titleimagepath”不匹配。 第 29 行，位置 39。 + + e.Source:System.Xml + + e.TargetSite:Void Throw(System.String, System.String[]) + + e.StackTrace: 在 System.Xml.XmlTextReaderImpl.Throw(String res, String[] args) + 在 System.Xml.XmlTextReaderImpl.ThrowTagMismatch(NodeData startTag) + 在 System.Xml.XmlTextReaderImpl.ParseEndElement() + 在 System.Xml.XmlTextReaderImpl.ParseElementContent() + 在 Cyberpipe.Utility.SetParams() 位置 E:\wxl\work\GHFX_REFACTOR\Utility.cs:行号 208 + + + + exception over ------------------------------------------------------------ diff --git a/bin/x86/Debug/log/2016/201611/20161107.txt b/bin/x86/Debug/log/2016/201611/20161107.txt deleted file mode 100644 index cd32fa6..0000000 --- a/bin/x86/Debug/log/2016/201611/20161107.txt +++ /dev/null @@ -1,152 +0,0 @@ - - -��¼ʱ�䣺2016-11-07 10:30:22,327 -�߳�ID:[9] -��־���� ERROR -�����ࣺCyberpipe.FrmBSQStatis property: [(null)] - -����������1 - - - -��¼ʱ�䣺2016-11-07 10:30:40,660 -�߳�ID:[9] -��־���� ERROR -�����ࣺCyberpipe.FrmBSQStatis property: [(null)] - -����������0 - - - -��¼ʱ�䣺2016-11-07 14:00:27,070 -�߳�ID:[8] -��־���� ERROR -�����ࣺCyberpipe.Forms.FrmPipelineModelDB property: [(null)] - -����������δ�������������õ������ʵ���� - - - -��¼ʱ�䣺2016-11-07 14:00:36,154 -�߳�ID:[8] -��־���� ERROR -�����ࣺCyberpipe.Forms.FrmPipelineModelDB property: [(null)] - -����������δ�������������õ������ʵ���� - - - -��¼ʱ�䣺2016-11-07 14:00:40,186 -�߳�ID:[8] -��־���� ERROR -�����ࣺCyberpipe.Forms.FrmPipelineModelDB property: [(null)] - -����������δ�������������õ������ʵ���� - - - -��¼ʱ�䣺2016-11-07 14:05:46,422 -�߳�ID:[9] -��־���� ERROR -�����ࣺCyberpipe.Forms.FrmPipelineModelDB property: [(null)] - -����������δ�������������õ������ʵ���� - - - -��¼ʱ�䣺2016-11-07 14:06:34,633 -�߳�ID:[10] -��־���� ERROR -�����ࣺCyberpipe.Forms.FrmPipelineModelDB property: [(null)] - -����������δ�������������õ������ʵ���� - - - -��¼ʱ�䣺2016-11-07 14:06:36,301 -�߳�ID:[10] -��־���� ERROR -�����ࣺCyberpipe.Forms.FrmPipelineModelDB property: [(null)] - -����������δ�������������õ������ʵ���� - - - -��¼ʱ�䣺2016-11-07 14:06:44,800 -�߳�ID:[10] -��־���� ERROR -�����ࣺCyberpipe.Forms.FrmPipelineModelDB property: [(null)] - -����������δ�������������õ������ʵ���� - - - -��¼ʱ�䣺2016-11-07 14:07:03,449 -�߳�ID:[10] -��־���� ERROR -�����ࣺCyberpipe.Forms.FrmPipelineModelDB property: [(null)] - -����������δ�������������õ������ʵ���� - - - -��¼ʱ�䣺2016-11-07 14:07:05,165 -�߳�ID:[10] -��־���� ERROR -�����ࣺCyberpipe.Forms.FrmPipelineModelDB property: [(null)] - -����������δ�������������õ������ʵ���� - - - -��¼ʱ�䣺2016-11-07 17:58:24,384 -�߳�ID:[10] -��־���� ERROR -�����ࣺCyberpipe.Forms.FrmPipelineModelDB property: [(null)] - -����������δ�������������õ������ʵ���� - - - -��¼ʱ�䣺2016-11-07 18:11:22,114 -�߳�ID:[8] -��־���� ERROR -�����ࣺCyberpipe.Forms.FrmPipelineModelDB property: [(null)] - -����������δ�������������õ������ʵ���� - - - -��¼ʱ�䣺2016-11-07 18:12:13,619 -�߳�ID:[8] -��־���� ERROR -�����ࣺCyberpipe.Forms.FrmPipelineModelDB property: [(null)] - -����������δ�������������õ������ʵ���� - - - -��¼ʱ�䣺2016-11-07 18:12:33,268 -�߳�ID:[8] -��־���� ERROR -�����ࣺCyberpipe.Forms.FrmPipelineModelDB property: [(null)] - -����������δ�������������õ������ʵ���� - - - -��¼ʱ�䣺2016-11-07 18:12:43,628 -�߳�ID:[8] -��־���� ERROR -�����ࣺCyberpipe.Forms.FrmPipelineModelDB property: [(null)] - -����������δ�������������õ������ʵ���� - - - -��¼ʱ�䣺2016-11-07 18:12:53,488 -�߳�ID:[8] -��־���� ERROR -�����ࣺCyberpipe.Forms.FrmPipelineModelDB property: [(null)] - -����������δ�������������õ������ʵ���� - - - -��¼ʱ�䣺2016-11-07 18:13:31,996 -�߳�ID:[8] -��־���� ERROR -�����ࣺCyberpipe.Forms.FrmPipelineModelDB property: [(null)] - -����������δ�������������õ������ʵ���� - - - -��¼ʱ�䣺2016-11-07 18:16:05,234 -�߳�ID:[9] -��־���� ERROR -�����ࣺCyberpipe.Forms.FrmPipelineModelDB property: [(null)] - -����������δ�������������õ������ʵ���� - diff --git a/bin/x86/Debug/log/2016/201611/20161108.txt b/bin/x86/Debug/log/2016/201611/20161108.txt deleted file mode 100644 index b5c96c9..0000000 --- a/bin/x86/Debug/log/2016/201611/20161108.txt +++ /dev/null @@ -1,40 +0,0 @@ - - -��¼ʱ�䣺2016-11-08 09:53:20,836 -�߳�ID:[10] -��־���� ERROR -�����ࣺCyberpipe.Forms.FrmPipelineModelDB property: [(null)] - -����������δ�������������õ������ʵ���� - - - -��¼ʱ�䣺2016-11-08 09:53:49,986 -�߳�ID:[10] -��־���� ERROR -�����ࣺCyberpipe.Forms.FrmPipelineModelDB property: [(null)] - -����������δ�������������õ������ʵ���� - - - -��¼ʱ�䣺2016-11-08 09:54:25,364 -�߳�ID:[10] -��־���� ERROR -�����ࣺCyberpipe.Forms.FrmPipelineModelDB property: [(null)] - -����������δ�������������õ������ʵ���� - - - -��¼ʱ�䣺2016-11-08 10:33:09,418 -�߳�ID:[11] -��־���� ERROR -�����ࣺCyberpipe.Forms.FrmPipelineModelDB property: [(null)] - -����������δ�������������õ������ʵ���� - - - -��¼ʱ�䣺2016-11-08 10:38:53,638 -�߳�ID:[10] -��־���� ERROR -�����ࣺCyberpipe.Forms.FrmPipelineModelDB property: [(null)] - -����������δ�������������õ������ʵ���� - diff --git a/bin/x86/Debug/log/2016/201611/20161116.txt b/bin/x86/Debug/log/2016/201611/20161116.txt deleted file mode 100644 index d23f760..0000000 --- a/bin/x86/Debug/log/2016/201611/20161116.txt +++ /dev/null @@ -1,8 +0,0 @@ - - -��¼ʱ�䣺2016-11-16 15:06:52,549 -�߳�ID:[9] -��־���� ERROR -�����ࣺCyberpipe.Utility property: [(null)] - -����������������־ - diff --git a/bin/x86/Debug/log/2016/201611/20161118.txt b/bin/x86/Debug/log/2016/201611/20161118.txt deleted file mode 100644 index d03145b..0000000 --- a/bin/x86/Debug/log/2016/201611/20161118.txt +++ /dev/null @@ -1,84 +0,0 @@ - - -��¼ʱ�䣺2016-11-18 15:22:27,833 -�߳�ID:[9] -��־���� ERROR -�����ࣺCyberpipe.Forms.FrmPipelineModelDB property: [(null)] - -���������������ͳ��ȱ������ø��ַ����ڵ�λ�á� -������: length - - - -��¼ʱ�䣺2016-11-18 15:23:05,224 -�߳�ID:[9] -��־���� ERROR -�����ࣺCyberpipe.Forms.FrmPipelineModelDB property: [(null)] - -���������������ͳ��ȱ������ø��ַ����ڵ�λ�á� -������: length - - - -��¼ʱ�䣺2016-11-18 15:24:36,900 -�߳�ID:[9] -��־���� ERROR -�����ࣺCyberpipe.Forms.FrmPipelineModelDB property: [(null)] - -���������������ͳ��ȱ������ø��ַ����ڵ�λ�á� -������: length - - - -��¼ʱ�䣺2016-11-18 15:26:25,752 -�߳�ID:[9] -��־���� ERROR -�����ࣺCyberpipe.Forms.FrmPipelineModelDB property: [(null)] - -���������������ͳ��ȱ������ø��ַ����ڵ�λ�á� -������: length - - - -��¼ʱ�䣺2016-11-18 15:27:04,799 -�߳�ID:[9] -��־���� ERROR -�����ࣺCyberpipe.FieldOrderValidate property: [(null)] - -�����������ֶ�˳����ʧ�� -�ֶ�:��ʼ�ܶ��߳��� -�ֶ�:��ֹ����߳��� -�ֶ�:��ֹ������� -�ֶ�:��ֹ�ܶ��߳��� -�ֶ�:������·���� -�ֶ�:Ȩ����λ���� -�ֶ�:��ע���� - - - - -��¼ʱ�䣺2016-11-18 15:27:11,752 -�߳�ID:[9] -��־���� ERROR -�����ࣺCyberpipe.FieldOrderValidate property: [(null)] - -�����������ֶ�˳����ʧ�� -�ֶ�:��ʼ�ܶ��߳��� -�ֶ�:��ֹ����߳��� -�ֶ�:��ֹ������� -�ֶ�:��ֹ�ܶ��߳��� -�ֶ�:������·���� -�ֶ�:Ȩ����λ���� -�ֶ�:��ע���� - - - - -��¼ʱ�䣺2016-11-18 15:27:27,018 -�߳�ID:[9] -��־���� ERROR -�����ࣺCyberpipe.FieldOrderValidate property: [(null)] - -�����������ֶ�˳����ʧ�� -�ֶ�:��ʼ�ܶ��߳��� -�ֶ�:��ֹ����߳��� -�ֶ�:��ֹ������� -�ֶ�:��ֹ�ܶ��߳��� -�ֶ�:������·���� -�ֶ�:Ȩ����λ���� -�ֶ�:��ע���� - - diff --git a/bin/x86/Debug/log/2016/201611/20161121.txt b/bin/x86/Debug/log/2016/201611/20161121.txt deleted file mode 100644 index e4d7262..0000000 --- a/bin/x86/Debug/log/2016/201611/20161121.txt +++ /dev/null @@ -1,213 +0,0 @@ - - -��¼ʱ�䣺2016-11-21 09:26:43,193 -�߳�ID:[9] -��־���� ERROR -�����ࣺCyberpipe.FieldOrderValidate property: [(null)] - -�����������ֶ�˳����ʧ�� -�ֶ�:��ʼ�ܶ��߳��� -�ֶ�:��ֹ����߳��� -�ֶ�:��ֹ������� -�ֶ�:��ֹ�ܶ��߳��� -�ֶ�:������·���� -�ֶ�:Ȩ����λ���� -�ֶ�:��ע���� - - - - -��¼ʱ�䣺2016-11-21 09:37:42,959 -�߳�ID:[8] -��־���� ERROR -�����ࣺCyberpipe.FieldUniqueValidate property: [(null)] - -�����������ֶ�Ψһ�Լ��ʧ�� -�ֶ���ʼ������ظ� 463.455����:3�ֶ���ʼ������ظ� 463.465����:3�ֶ���ʼ������ظ� 465.377����:3�ֶ���ֹ�ܵ׸��ظ� 462.044����:3 - - - -��¼ʱ�䣺2016-11-21 09:38:27,526 -�߳�ID:[8] -��־���� ERROR -�����ࣺCyberpipe.FieldUniqueValidate property: [(null)] - -�����������ֶ�Ψһ�Լ��ʧ�� -�ֶ���ʼ������ظ� 56.89����:3�ֶ���ʼ������ظ� 58.05����:3�ֶ���ʼ������ظ� 58.74����:3�ֶ���ʼ������ظ� 59.23����:3�ֶ���ʼ������ظ� 58.47����:3�ֶ���ʼ������ظ� 57.8����:3�ֶ���ʼ������ظ� 57.53����:3�ֶ���ʼ������ظ� 57.38����:3�ֶ���ʼ������ظ� 58.4����:3�ֶ���ʼ������ظ� 58.8����:7�ֶ���ֹ�ܵ׸��ظ� 54.94����:3�ֶ���ֹ�ܵ׸��ظ� 58.3����:3�ֶ���ֹ�ܵ׸��ظ� 58.73����:3�ֶ���ֹ�ܵ׸��ظ� 57.83����:3�ֶ���ֹ�ܵ׸��ظ� 58.31����:3 - - - -��¼ʱ�䣺2016-11-21 09:39:05,199 -�߳�ID:[8] -��־���� ERROR -�����ࣺCyberpipe.FieldCountValidate property: [(null)] - -�����������ֶ������Լ��ʧ�� -δ�ҵ��ֶλ�������ƥ��:��ʼ�ܵ׸�:double -δ�ҵ��ֶλ�������ƥ��:��ֹ�ܵ׸�:double - - - - -��¼ʱ�䣺2016-11-21 09:39:16,208 -�߳�ID:[8] -��־���� ERROR -�����ࣺCyberpipe.FieldOrderValidate property: [(null)] - -�����������ֶ�˳����ʧ�� -�ֶ�:��ʼ�ܶ��߳��� -�ֶ�:��ֹ����߳��� -�ֶ�:��ֹ������� -�ֶ�:��ֹ�ܶ��߳��� -�ֶ�:������·���� -�ֶ�:Ȩ����λ���� -�ֶ�:��ע���� - - - - -��¼ʱ�䣺2016-11-21 09:39:37,798 -�߳�ID:[8] -��־���� ERROR -�����ࣺCyberpipe.FieldOrderValidate property: [(null)] - -�����������ֶ�˳����ʧ�� -�ֶ�:��ʼ�ܶ��߳��� -�ֶ�:��ֹ����߳��� -�ֶ�:��ֹ������� -�ֶ�:��ֹ�ܶ��߳��� -�ֶ�:������·���� -�ֶ�:Ȩ����λ���� -�ֶ�:��ע���� - - - - -��¼ʱ�䣺2016-11-21 09:39:56,031 -�߳�ID:[8] -��־���� ERROR -�����ࣺCyberpipe.FieldOrderValidate property: [(null)] - -�����������ֶ�˳����ʧ�� -�ֶ�:��ʼ�ܶ��߳��� -�ֶ�:��ֹ����߳��� -�ֶ�:��ֹ������� -�ֶ�:��ֹ�ܶ��߳��� -�ֶ�:������·���� -�ֶ�:Ȩ����λ���� -�ֶ�:��ע���� - - - - -��¼ʱ�䣺2016-11-21 09:41:01,165 -�߳�ID:[8] -��־���� ERROR -�����ࣺCyberpipe.FieldOrderValidate property: [(null)] - -�����������ֶ�˳����ʧ�� -�ֶ�:��ʼ�ܶ��߳��� -�ֶ�:��ֹ����߳��� -�ֶ�:��ֹ������� -�ֶ�:��ֹ�ܶ��߳��� -�ֶ�:������·���� -�ֶ�:Ȩ����λ���� -�ֶ�:��ע���� - - - - -��¼ʱ�䣺2016-11-21 09:43:35,081 -�߳�ID:[10] -��־���� ERROR -�����ࣺCyberpipe.FieldOrderValidate property: [(null)] - -�����������ֶ�˳����ʧ�� -�ֶ�:��ʼ�ܶ��߳��� -�ֶ�:��ֹ����߳��� -�ֶ�:��ֹ������� -�ֶ�:��ֹ�ܶ��߳��� -�ֶ�:������·���� -�ֶ�:Ȩ����λ���� -�ֶ�:��ע���� - - - - -��¼ʱ�䣺2016-11-21 09:43:46,706 -�߳�ID:[10] -��־���� ERROR -�����ࣺCyberpipe.FieldOrderValidate property: [(null)] - -�����������ֶ�˳����ʧ�� -�ֶ�:��ʼ�ܶ��߳��� -�ֶ�:��ֹ����߳��� -�ֶ�:��ֹ������� -�ֶ�:��ֹ�ܶ��߳��� -�ֶ�:������·���� -�ֶ�:Ȩ����λ���� -�ֶ�:��ע���� - - - - -��¼ʱ�䣺2016-11-21 09:45:33,615 -�߳�ID:[10] -��־���� ERROR -�����ࣺCyberpipe.FieldOrderValidate property: [(null)] - -�����������ֶ�˳����ʧ�� -�ֶ�:��ʼ�ܶ��߳��� -�ֶ�:��ֹ����߳��� -�ֶ�:��ֹ������� -�ֶ�:��ֹ�ܶ��߳��� -�ֶ�:������·���� -�ֶ�:Ȩ����λ���� -�ֶ�:��ע���� - - - - -��¼ʱ�䣺2016-11-21 09:53:43,807 -�߳�ID:[10] -��־���� ERROR -�����ࣺCyberpipe.FieldCountValidate property: [(null)] - -�����������ֶ������Լ��ʧ�� -δ�ҵ��ֶλ�������ƥ��:ͼ����:string - - - - -��¼ʱ�䣺2016-11-21 13:34:03,037 -�߳�ID:[10] -��־���� ERROR -�����ࣺCyberpipe.FieldCountValidate property: [(null)] - -����������BSQ�ֶ������Լ��ʧ�� -δ�ҵ��ֶλ�������ƥ��:ͼ����:string - - - - -��¼ʱ�䣺2016-11-21 13:40:32,041 -�߳�ID:[9] -��־���� ERROR -�����ࣺCyberpipe.FieldCountValidate property: [(null)] - -����������BSQ�ֶ������Լ��ʧ�� -δ�ҵ��ֶλ�������ƥ��:ͼ����:string - - - - -��¼ʱ�䣺2016-11-21 13:43:57,923 -�߳�ID:[9] -��־���� ERROR -�����ࣺCyberpipe.FieldCountValidate property: [(null)] - -����������BSQ�ֶ������Լ��ʧ�� -δ�ҵ��ֶλ�������ƥ��:ͼ����:string - - - - -��¼ʱ�䣺2016-11-21 13:44:42,643 -�߳�ID:[9] -��־���� ERROR -�����ࣺCyberpipe.FieldOrderValidate property: [(null)] - -������������ѹ����-�̲߳����ֶ�˳����ʧ�� -�ֶ�:��ʼ�ܶ��߳��� -�ֶ�:��ֹ����߳��� -�ֶ�:��ֹ������� -�ֶ�:��ֹ�ܶ��߳��� -�ֶ�:������·���� -�ֶ�:Ȩ����λ���� -�ֶ�:��ע���� - - diff --git a/bin/x86/Debug/log/2016/201611/20161122.txt b/bin/x86/Debug/log/2016/201611/20161122.txt deleted file mode 100644 index e4c5e13..0000000 --- a/bin/x86/Debug/log/2016/201611/20161122.txt +++ /dev/null @@ -1,113 +0,0 @@ - - -��¼ʱ�䣺2016-11-22 14:24:28,896 -�߳�ID:[10] -��־���� ERROR -�����ࣺCyberpipe.MainFrm property: [(null)] - -����������Error - -System.InvalidOperationException: ������û���е� DataGridView �ؼ�����С�������������С� - �� System.Windows.Forms.DataGridViewRowCollection.AddInternal(Boolean newRow, Object[] values) - �� Cyberpipe.MainFrm.addRedLineDataToDataGridView(List`1 dt, DataGridView dataGridView) λ�� D:\GHFX\GHFX_REFACTOR\MainFrm.cs:�к� 7491 - �� Cyberpipe.MainFrm.buttonItemHX2_Click(Object sender, EventArgs e) λ�� D:\GHFX\GHFX_REFACTOR\MainFrm.cs:�к� 7473 - - -��¼ʱ�䣺2016-11-22 14:24:37,178 -�߳�ID:[10] -��־���� ERROR -�����ࣺCyberpipe.MainFrm property: [(null)] - -����������Error - -System.InvalidOperationException: ������û���е� DataGridView �ؼ�����С�������������С� - �� System.Windows.Forms.DataGridViewRowCollection.AddInternal(Boolean newRow, Object[] values) - �� Cyberpipe.MainFrm.addRedLineDataToDataGridView(List`1 dt, DataGridView dataGridView) λ�� D:\GHFX\GHFX_REFACTOR\MainFrm.cs:�к� 7491 - �� Cyberpipe.MainFrm.buttonItemHX2_Click(Object sender, EventArgs e) λ�� D:\GHFX\GHFX_REFACTOR\MainFrm.cs:�к� 7473 - - -��¼ʱ�䣺2016-11-22 14:24:43,641 -�߳�ID:[10] -��־���� ERROR -�����ࣺCyberpipe.MainFrm property: [(null)] - -����������Error - -System.InvalidOperationException: ������û���е� DataGridView �ؼ�����С�������������С� - �� System.Windows.Forms.DataGridViewRowCollection.AddInternal(Boolean newRow, Object[] values) - �� Cyberpipe.MainFrm.addRedLineDataToDataGridView(List`1 dt, DataGridView dataGridView) λ�� D:\GHFX\GHFX_REFACTOR\MainFrm.cs:�к� 7491 - �� Cyberpipe.MainFrm.buttonItemHX2_Click(Object sender, EventArgs e) λ�� D:\GHFX\GHFX_REFACTOR\MainFrm.cs:�к� 7473 - - -��¼ʱ�䣺2016-11-22 14:36:26,698 -�߳�ID:[9] -��־���� ERROR -�����ࣺCyberpipe.MainFrm property: [(null)] - -����������Error - -System.NullReferenceException: δ�������������õ������ʵ���� - �� Cyberpipe.MainFrm.addRedLineDataToDataGridView(List`1 dt, DataGridView dataGridView) λ�� D:\GHFX\GHFX_REFACTOR\MainFrm.cs:�к� 7504 - �� Cyberpipe.MainFrm.buttonItemHX2_Click(Object sender, EventArgs e) λ�� D:\GHFX\GHFX_REFACTOR\MainFrm.cs:�к� 7473 - - -��¼ʱ�䣺2016-11-22 14:46:24,990 -�߳�ID:[8] -��־���� ERROR -�����ࣺCyberpipe.MainFrm property: [(null)] - -����������Error - -System.NullReferenceException: δ�������������õ������ʵ���� - �� Cyberpipe.MainFrm.addRedLineDataToDataGridView(List`1 dt, DataGridView dataGridView) λ�� D:\GHFX\GHFX_REFACTOR\MainFrm.cs:�к� 7504 - �� Cyberpipe.MainFrm.buttonItemHX2_Click(Object sender, EventArgs e) λ�� D:\GHFX\GHFX_REFACTOR\MainFrm.cs:�к� 7473 - - -��¼ʱ�䣺2016-11-22 14:46:28,876 -�߳�ID:[8] -��־���� ERROR -�����ࣺCyberpipe.MainFrm property: [(null)] - -����������Error - -System.NullReferenceException: δ�������������õ������ʵ���� - �� Cyberpipe.MainFrm.addRedLineDataToDataGridView(List`1 dt, DataGridView dataGridView) λ�� D:\GHFX\GHFX_REFACTOR\MainFrm.cs:�к� 7504 - �� Cyberpipe.MainFrm.buttonItemHX2_Click(Object sender, EventArgs e) λ�� D:\GHFX\GHFX_REFACTOR\MainFrm.cs:�к� 7473 - - -��¼ʱ�䣺2016-11-22 14:49:25,642 -�߳�ID:[8] -��־���� ERROR -�����ࣺCyberpipe.MainFrm property: [(null)] - -����������Error - -System.NullReferenceException: δ�������������õ������ʵ���� - �� Cyberpipe.MainFrm.addRedLineDataToDataGridView(List`1 dt, DataGridView dataGridView) λ�� D:\GHFX\GHFX_REFACTOR\MainFrm.cs:�к� 7504 - �� Cyberpipe.MainFrm.buttonItemHX2_Click(Object sender, EventArgs e) λ�� D:\GHFX\GHFX_REFACTOR\MainFrm.cs:�к� 7473 - - -��¼ʱ�䣺2016-11-22 14:49:33,328 -�߳�ID:[8] -��־���� ERROR -�����ࣺCyberpipe.MainFrm property: [(null)] - -����������Error - -System.NullReferenceException: δ�������������õ������ʵ���� - �� Cyberpipe.MainFrm.addRedLineDataToDataGridView(List`1 dt, DataGridView dataGridView) λ�� D:\GHFX\GHFX_REFACTOR\MainFrm.cs:�к� 7504 - �� Cyberpipe.MainFrm.buttonItemHX2_Click(Object sender, EventArgs e) λ�� D:\GHFX\GHFX_REFACTOR\MainFrm.cs:�к� 7473 - - -��¼ʱ�䣺2016-11-22 15:18:04,198 -�߳�ID:[9] -��־���� ERROR -�����ࣺCyberpipe.MainFrm property: [(null)] - -����������Error - -System.NullReferenceException: δ�������������õ������ʵ���� - �� Cyberpipe.RedLineAnalysisTool.Anaylysis(GSOFeatures redLineFeatures, List`1 layerNames, GSOGlobeControl globe) λ�� D:\GHFX\GHFX_REFACTOR\RedLineAnalysisTool.cs:�к� 114 - �� Cyberpipe.MainFrm.buttonItemHX2_Click(Object sender, EventArgs e) λ�� D:\GHFX\GHFX_REFACTOR\MainFrm.cs:�к� 7469 - - -��¼ʱ�䣺2016-11-22 15:18:07,984 -�߳�ID:[9] -��־���� ERROR -�����ࣺCyberpipe.MainFrm property: [(null)] - -����������Error - -System.NullReferenceException: δ�������������õ������ʵ���� - �� Cyberpipe.RedLineAnalysisTool.Anaylysis(GSOFeatures redLineFeatures, List`1 layerNames, GSOGlobeControl globe) λ�� D:\GHFX\GHFX_REFACTOR\RedLineAnalysisTool.cs:�к� 114 - �� Cyberpipe.MainFrm.buttonItemHX2_Click(Object sender, EventArgs e) λ�� D:\GHFX\GHFX_REFACTOR\MainFrm.cs:�к� 7469 diff --git a/bin/x86/Debug/log/2016/201611/20161129.txt b/bin/x86/Debug/log/2016/201611/20161129.txt deleted file mode 100644 index 42eb54e..0000000 --- a/bin/x86/Debug/log/2016/201611/20161129.txt +++ /dev/null @@ -1,22 +0,0 @@ - - -��¼ʱ�䣺2016-11-29 10:07:53,467 -�߳�ID:[9] -��־���� ERROR -�����ࣺCyberpipe.FieldOrderValidate property: [(null)] - -������������ʶ�����ֶ�˳����ʧ�� -�ֶ�:�Ƿ�ؼ������ -�ֶ�:ͼ���ų��� -�ֶ�:��ע���� - - - - -��¼ʱ�䣺2016-11-29 10:09:38,422 -�߳�ID:[9] -��־���� ERROR -�����ࣺCyberpipe.FieldCountValidate property: [(null)] - -����������BSQ���ֶ������Լ��ʧ�� -δ�ҵ��ֶλ�������ƥ��:ͼ����:string - - diff --git a/FeatureStatisticsService.cs b/FeatureStatisticsService.cs index 331ee47..b127fe3 100644 --- a/FeatureStatisticsService.cs +++ b/FeatureStatisticsService.cs @@ -190,7 +190,7 @@ List result = new List(); //layer.Name是表名 - string[] accessStrs = Utility.getAccStrsByLayer(layer.Name); + string[] accessStrs = FeatureTools.GetAccStrsByLayer(layer.Name); foreach (string accssname in accessStrs) { diff --git a/FeatureTools.cs b/FeatureTools.cs index be4b469..3c08f34 100644 --- a/FeatureTools.cs +++ b/FeatureTools.cs @@ -1,5 +1,6 @@ using System; using System.Collections.Generic; +using System.Data; using System.Linq; using System.Text; using System.Windows.Forms; @@ -43,7 +44,7 @@ } feature.Delete();//地球上删除该feature string sql = "delete from " + layerName + " where LSSYS_ID =" + feature.ID + " and (编号 is null or substr(编号,length(编号)-2)='TMP')"; - OledbHelper.sqlExecuteNonQuery(sql);//目前无法取到LSSYS_ID，所以这个判断条件不太合适，会导致把该类所有新建的都删除了 + OledbHelper.sqlExecuteNonQuery(sql); } catch (Exception) { @@ -106,5 +107,46 @@ } return value; } + + /// + /// 根据附属物图层名字得到里面含有的附属物 + /// + /// + /// + public static string[] GetAccStrsByLayer(string layername) + { + string[] accStrs = null; + string sql = "select 附属物名称 from " + layername + " group by 附属物名称"; + DataSet dataset = OledbHelper.getDataSet(sql, layername); + if (dataset == null) return null; + accStrs = new string[dataset.Tables[0].Rows.Count]; + for (int i = 0; i < dataset.Tables[0].Rows.Count; i++) + { + accStrs[i] = dataset.Tables[0].Rows[i][0].ToString(); + } + return accStrs; + } + + /// + /// 删除内存图层中指定名称的feature + /// + /// + /// + public static void RemoveFeatureFromName(GSOGlobeControl globeControl1, string featureName) + { + GSOFeatures features = globeControl1.Globe.MemoryLayer.GetFeatureByName(featureName, true); + if (features != null) + { + for (int i = features.Length - 1; i >= 0; i--) + { + GSOFeature feature = features[i]; + if (feature != null) + { + globeControl1.Globe.MemoryLayer.RemoveFeatureByID(feature.ID); + } + } + } + globeControl1.Refresh(); + } } } diff --git a/Forms/FrmPipelineModelDataBase.cs b/Forms/FrmPipelineModelDataBase.cs index b577fd8..bc1e479 100644 --- a/Forms/FrmPipelineModelDataBase.cs +++ b/Forms/FrmPipelineModelDataBase.cs @@ -149,7 +149,7 @@ catch (Exception ex) { LogError.PublishError(ex); - LogHelper.WriteLog(typeof(FrmPipelineModelDB), ex.Message); + LogHelper.Error(ex.Message); } } diff --git a/FrmAccessoriesSensor.cs b/FrmAccessoriesSensor.cs index 98aa1cf..542f19a 100644 --- a/FrmAccessoriesSensor.cs +++ b/FrmAccessoriesSensor.cs @@ -240,7 +240,7 @@ { if (clbPipeLine.CheckedItems.Count > 0) { - Utility.RemoveFeatureFromName(globeControl1, "trackPolygon"); + FeatureTools.RemoveFeatureFromName(globeControl1, "trackPolygon"); globeControl1.Globe.Action = EnumAction3D.TrackPolygon; globeControl1.TrackPolygonEndEvent += globeControl1_TrackPolygonEndEvent; } @@ -259,7 +259,7 @@ private void FrmAccessoriesgather_FormClosing(object sender, FormClosingEventArgs e) { frm = null; - Utility.RemoveFeatureFromName(globeControl1, "trackPolygon"); + FeatureTools.RemoveFeatureFromName(globeControl1, "trackPolygon"); globeControl1.Globe.Action = EnumAction3D.ActionNull; globeControl1.TrackPolygonEndEvent -= globeControl1_TrackPolygonEndEvent; } diff --git a/FrmAccessoriesgather.cs b/FrmAccessoriesgather.cs index e1d176e..c36273b 100644 --- a/FrmAccessoriesgather.cs +++ b/FrmAccessoriesgather.cs @@ -118,7 +118,7 @@ { if (clbPipeLine2.Text!="") { - Utility.RemoveFeatureFromName(globeControl1, "trackPolygon"); + FeatureTools.RemoveFeatureFromName(globeControl1, "trackPolygon"); globeControl1.Globe.Action = EnumAction3D.TrackPolygon; globeControl1.Globe.TrackPolygonTool.TrackMode = EnumTrackMode.SpaceTrack; globeControl1.TrackPolygonEndEvent += globeControl1_TrackPolygonEndEvent; @@ -295,7 +295,7 @@ private void FrmAccessoriesgather_FormClosing(object sender, FormClosingEventArgs e) { frm = null; - Utility.RemoveFeatureFromName(globeControl1, "trackPolygon"); + FeatureTools.RemoveFeatureFromName(globeControl1, "trackPolygon"); globeControl1.TrackPolygonEndEvent -= globeControl1_TrackPolygonEndEvent; globeControl1.Globe.Action = EnumAction3D.ActionNull; diff --git a/FrmAddWellShp.cs b/FrmAddWellShp.cs index 7983349..78d8946 100644 --- a/FrmAddWellShp.cs +++ b/FrmAddWellShp.cs @@ -100,7 +100,7 @@ catch (Exception ex) { LogError.PublishError(ex); - LogHelper.WriteLog(typeof(FrmAddWellShp), ex.Message); + LogHelper.Error(ex.Message); } } diff --git a/FrmBSQStatis.cs b/FrmBSQStatis.cs index 5b05926..b5e581d 100644 --- a/FrmBSQStatis.cs +++ b/FrmBSQStatis.cs @@ -97,7 +97,7 @@ } catch (Exception ex) { - LogHelper.WriteLog(typeof(FrmBSQStatis),ex.Message); + LogHelper.Error(ex.Message); } return typeAndCount; } @@ -108,7 +108,7 @@ GSOLayer layer = globeControl1.Globe.Layers.GetLayerByCaption("标识器"); GSOFeatures bsqFs = FeatureStatisticsService.GetLayerFeatures(polygon, layer); if (bsqFs == null || bsqFs.Length <= 0) { - LogHelper.WriteLog(typeof(FrmBSQStatis),"标识器图层下的Feature为空"); + LogHelper.Error("标识器图层下的Feature为空!"); return null; } diff --git a/FrmBasicQuery.cs b/FrmBasicQuery.cs index baeeade..cc8d3ff 100644 --- a/FrmBasicQuery.cs +++ b/FrmBasicQuery.cs @@ -224,7 +224,7 @@ } catch(Exception ex) { - LogHelper.WriteLog(typeof(FrmBasicQuery), ex.Message); + LogHelper.Error(ex.Message); } } else diff --git a/FrmCodingQuery.cs b/FrmCodingQuery.cs index f1ac322..d4ec095 100644 --- a/FrmCodingQuery.cs +++ b/FrmCodingQuery.cs @@ -82,7 +82,7 @@ } catch (Exception ex) { - LogHelper.WriteLog(typeof(FrmCodingQuery), ex.Message); ; + LogHelper.Error(ex.Message); } } diff --git a/FrmDiameterQuery.cs b/FrmDiameterQuery.cs index e7b3657..75d7949 100644 --- a/FrmDiameterQuery.cs +++ b/FrmDiameterQuery.cs @@ -150,7 +150,7 @@ catch (Exception ex) { //LogError.PublishError(ex); - LogHelper.WriteLog(typeof(FrmDiameterQuery), ex.Message); + LogHelper.Error(ex.Message); MessageBox.Show("请输入正确的管径范围！"); return; } diff --git a/FrmFittingQuery.cs b/FrmFittingQuery.cs index 12f6007..8645011 100644 --- a/FrmFittingQuery.cs +++ b/FrmFittingQuery.cs @@ -69,7 +69,7 @@ } catch (Exception ex) { - LogHelper.WriteLog(typeof(FrmFittingQuery), ex.Message); + LogHelper.Error(ex.Message); } } /// diff --git a/FrmKeywordQuery.cs b/FrmKeywordQuery.cs index 405524f..ede0a93 100644 --- a/FrmKeywordQuery.cs +++ b/FrmKeywordQuery.cs @@ -87,7 +87,7 @@ } catch (Exception ex) { - LogHelper.WriteLog(typeof(FrmKeywordQuery), ex.Message); + LogHelper.Error(ex.Message); } } diff --git a/FrmLogin.cs b/FrmLogin.cs index 1172c23..6fbaed9 100644 --- a/FrmLogin.cs +++ b/FrmLogin.cs @@ -2,6 +2,8 @@ using System.Data; using System.Data.OracleClient; using System.IO; +using System.Net; +using System.Text; using System.Windows.Forms; using System.Xml; using DevComponents.DotNetBar; @@ -10,16 +12,15 @@ { public partial class FrmLogin : Office2007Form { + + //登录界面 -- 配置文件的路径 + public static string filename = Application.StartupPath + "\\login.xml"; + + public FrmLogin() { InitializeComponent(); } - public string rolename = "浏览"; - public string username = ""; - public string department = ""; - - //登录界面 -- 配置文件的路径 - public static string filename = Application.StartupPath + "\\login.xml"; /// /// 登录按钮事件处理 /// @@ -28,9 +29,10 @@ private void button1_Click(object sender, EventArgs e) { bool result = ValidateUser(); +// bool result =ValidateFromUrl();//从平台获取用户角色信息，判断是否能登陆成功 if (result) { - username = txtUser.Text.Trim(); + WriteXml(); Utility.userName = txtUser.Text.Trim(); DialogResult = DialogResult.OK; Close(); @@ -43,80 +45,6 @@ } } /// - /// 关闭按钮事件处理 - /// - /// - /// - private void button2_Click(object sender, EventArgs e) - { - Close(); - } - /// - /// 验证端口号 - /// - /// - //private bool ValiPort() - //{ - // Ping p = new Ping();//创建Ping对象p - // PingReply pr = p.Send(Utility.localicenseserverip);//向指定IP或者主机名的计算机发送ICMP协议的ping数据包 - // if (pr.Status == IPStatus.Success)//如果ping成功 - // { - // try - // { - // TcpClient tcpc = new TcpClient(Utility.localicenseserverip, Utility.localicenseserverport);//对IP地址为"192.168.0.105"的计算机的1500端口提出连接申请 - // tcpc.Close(); - // return true; - // } - // catch (Exception ex) - // { - // LogError.PublishError(ex); - // MessageBox.Show("端口连接错误！" + ex.Message); - // return false; - // } - // } - // else - // { - // int times = 0;//重新连接次数; - // int count = 2;//设置尝试次数 - // while (times < count) - // { - // //Thread.Sleep(1000);//等待时间(方便测试的话，你可以改为1000) - // pr = p.Send(Utility.localicenseserverip); - - // if (pr.Status == IPStatus.Success) - // { - // try - // { - // TcpClient tcpc = new TcpClient(Utility.localicenseserverip, Utility.localicenseserverport);//对IP地址为"192.168.0.105"的计算机的1500端口提出连接申请 - // tcpc.Close(); - // return true; - // } - // catch (Exception ex) - // { - // LogError.PublishError(ex); - // MessageBox.Show("端口连接错误！" + ex.Message); - // return false; - // } - // } - // else - // { - // times++; - // if (times < count) - // { - // continue; - // } - // else - // { - // MessageBox.Show("重新尝试连接失败"); - // return false; - // } - // } - - // } - // return false; - // } - //} - /// /// 验证用户名、密码 /// /// @@ -126,24 +54,64 @@ string sql = "select * from casic_userinfotest where USERNAME='" + txtUser.Text.Trim() + "' and PASSWORD='" + passWord + "' and sysname='GHFX' "; DataTable dt = OledbHelper.QueryTable(sql); - if (dt != null && dt.Rows.Count > 0) + if (dt == null || dt.Rows.Count <= 0) return false; + if (String.IsNullOrEmpty(dt.Rows[0]["rid"].ToString())) return true; + sql = "select gid from casic_userroletest where id=" + dt.Rows[0]["rid"] + " and sysname='GHFX' "; + using (OracleDataReader reader = OracleUtils.ExecuteReader(OracleUtils.ConnectionString, CommandType.Text, sql)) { - WriteXML(); - if (!String.IsNullOrEmpty(dt.Rows[0]["rid"].ToString())) + while (reader.Read()) { - sql = "select gid from casic_userroletest where id=" + dt.Rows[0]["rid"] + " and sysname='GHFX' "; - using (OracleDataReader reader = OracleUtils.ExecuteReader(OracleUtils.ConnectionString, CommandType.Text, sql)) - { - while (reader.Read()) - { - Utility.userRole = reader[0].ToString(); - break; - } - } + Utility.userRole = reader[0].ToString(); + LogHelper.Debug("测试一下"); + break; } - return true; } - return false; + return true; + } + + + + private bool ValidateFromUrl() + { + string user = txtUser.Text.Trim(); + string pwd = textBoxPassWord.Text.Trim(); + //做成配置的 + string roleserver = Utility.RoleServer; + if (roleserver == null || roleserver.Trim().Equals("")) + { + MessageBox.Show("请在Config.xml中配置roleurl！"); + return false; + } + HttpWebRequest request = + WebRequest.Create(roleserver+"/rs/authority/user?username=" + user + "&password=" + pwd + "&appId=21") as HttpWebRequest; + if (request == null) return false; + using (HttpWebResponse response = request.GetResponse() as HttpWebResponse) + { + try + { + if (response == null || response.GetResponseStream() == null) return false; + StreamReader reader = new StreamReader(response.GetResponseStream()); + string[] result = reader.ReadToEnd().Split(','); + //解析result + if (result.Length < 5) return false; + StringBuilder userRole = new StringBuilder(""); + for (int i = 4; i < result.Length; i++) + { + string[] tmpStrings = result[i].Split('_'); + if (tmpStrings.Length < 2) continue; + userRole.Append(tmpStrings[1].Trim() + ","); + } + if (userRole.Length < 3) return false; + userRole.Remove(userRole.Length - 3, 3); + // MessageBox.Show(userRole.ToString()); + Utility.userRole = userRole.ToString(); + return Utility.userRole != null && !Utility.userRole.Equals("null"); + } + catch (Exception e) + { + return false; + } + } } private void FrmLogin_Load(object sender, EventArgs e) @@ -153,74 +121,56 @@ StartPosition = FormStartPosition.CenterScreen; - ReadXML(); + ReadXml(); } /// /// 读取上一次登录的用户名和密码 /// - private void ReadXML() + private void ReadXml() { - if (File.Exists(filename)) + if (!File.Exists(filename)) return; + //初始化XML文档操作类 + XmlDocument myDoc = new XmlDocument(); { - if (!File.Exists(filename)) + //加载XML文件 + try { + myDoc.Load(filename); + } + catch (Exception e) + { + LogError.PublishError(e); return; } - - //初始化XML文档操作类 - XmlDocument myDoc = new XmlDocument(); + //搜索指定的节点 + XmlNode serverRootNode = myDoc.SelectSingleNode("Params"); + XmlNodeList nodes = null; + if (serverRootNode != null) { - //加载XML文件 - try + nodes = serverRootNode.ChildNodes; + } + if (nodes == null) return; + foreach (XmlNode xn in nodes) + { + if (xn.Name.Equals("username")) { - myDoc.Load(filename); + txtUser.Text = xn.InnerText.Trim(); } - catch (Exception e) + else if (xn.Name.Equals("password")) { - LogError.PublishError(e); - return; + textBoxPassWord.Text = xn.InnerText.Trim(); } - //搜索指定的节点 - XmlNode serverRootNode = myDoc.SelectSingleNode("Params"); - XmlNodeList nodes = null; - if (serverRootNode != null) + else if (xn.Name.Equals("isremember")) { - nodes = serverRootNode.ChildNodes; - } - if (nodes != null) - { - foreach (XmlNode xn in nodes) - { - if (xn.Name == "username") - { - txtUser.Text = xn.InnerText.Trim(); - } - else if (xn.Name == "password") - { - textBoxPassWord.Text = xn.InnerText.Trim(); - } - else if (xn.Name == "isremember") - { - if (xn.InnerText.Trim() == "true") - { - checkBoxXRememberPassword.Checked = true; - } - else if (xn.InnerText.Trim() == "false") - { - checkBoxXRememberPassword.Checked = false; - } - } - } - + checkBoxXRememberPassword.Checked = xn.InnerText.Trim().Equals("true"); } } } - } /// /// 记录登录的用户名和密码 /// - private void WriteXML() + private void WriteXml() { if (!File.Exists(filename)) { @@ -252,31 +202,17 @@ foreach (XmlNode xn in nodes) { XmlElement xe = (XmlElement)xn; - if (xe.Name == "username") + if (xe.Name.Equals("username")) { xe.InnerText = txtUser.Text.Trim(); } - else if (xe.Name == "password") + else if (xe.Name.Equals("password")) { - if (checkBoxXRememberPassword.Checked) - { - xe.InnerText = textBoxPassWord.Text.Trim(); - } - else - { - xe.InnerText = ""; - } + xe.InnerText = checkBoxXRememberPassword.Checked ? textBoxPassWord.Text.Trim() : ""; } - else if (xe.Name == "isremember") + else if (xe.Name.Equals("isremember")) { - if (checkBoxXRememberPassword.Checked) - { - xe.InnerText = "true"; - } - else - { - xe.InnerText = "false"; - } + xe.InnerText = checkBoxXRememberPassword.Checked ? "true" : "false"; } } } diff --git a/FrmMaterialSel.cs b/FrmMaterialSel.cs index 8645ab3..d23f385 100644 --- a/FrmMaterialSel.cs +++ b/FrmMaterialSel.cs @@ -157,7 +157,7 @@ } catch (Exception ex) { - LogHelper.WriteLog(typeof(FrmMaterialSel), ex.Message); + LogHelper.Error(ex.Message); } } diff --git a/FrmMetadataStat.cs b/FrmMetadataStat.cs index c3c1359..96029a6 100644 --- a/FrmMetadataStat.cs +++ b/FrmMetadataStat.cs @@ -96,7 +96,7 @@ //统计有多少个图层 private int statistLayer() { - List datasrcs = Utility.layerConfig.datasrcs; + List datasrcs = Utility.LayerConfig.datasrcs; return datasrcs.SelectMany(datasrc => datasrc.layertypes).Sum(layerType => layerType.layers.Count); } diff --git a/FrmpipeDeepstatis.cs b/FrmpipeDeepstatis.cs index 6a5c895..8d915a9 100644 --- a/FrmpipeDeepstatis.cs +++ b/FrmpipeDeepstatis.cs @@ -2,6 +2,7 @@ using System.Collections.Generic; using System.Diagnostics; using System.IO; +using System.Reflection; using System.Text; using System.Windows.Forms; using System.Windows.Forms.DataVisualization.Charting; @@ -320,7 +321,7 @@ MessageBox.Show("请添加分段"); return; } - Utility.RemoveFeatureFromName(globeControl1, "trackPolygon"); + FeatureTools.RemoveFeatureFromName(globeControl1, "trackPolygon"); globeControl1.Globe.Action = EnumAction3D.TrackPolygon; globeControl1.Globe.TrackPolygonTool.TrackMode = EnumTrackMode.SpaceTrack; globeControl1.TrackPolygonEndEvent += globeControl1_TrackPolygonEndEvent; @@ -408,12 +409,11 @@ TextBox control; private void dataGridViewX2_EditingControlShowing(object sender, DataGridViewEditingControlShowingEventArgs e) { - if (e.Control.GetType().BaseType.Name == "TextBox") - { - control = new TextBox(); - control = (TextBox)e.Control; - control.KeyPress += control_KeyPress; - } + MemberInfo memberInfo = e.Control.GetType().BaseType; + if (memberInfo != null && !memberInfo.Name.Equals("TextBox")) return; + control = new TextBox(); + control = (TextBox)e.Control; + control.KeyPress += control_KeyPress; } /// /// 键盘按键按下事件处理 @@ -423,28 +423,24 @@ void control_KeyPress(object sender, KeyPressEventArgs e) { TextBox text = sender as TextBox; + if (text == null) return; if ((e.KeyChar < 48 || e.KeyChar > 57) && (e.KeyChar != 8) && e.KeyChar != 46) { e.Handled = true; } - if (e.KeyChar == 46) //小数点 + if (e.KeyChar != 46) return; + if (text.Text.Length <= 0) + e.Handled = true; //小数点不能在第一位 + else //处理不规则的小数点 { - if (text.Text.Length <= 0) - e.Handled = true; //小数点不能在第一位 - else //处理不规则的小数点 + float f; + float oldf; + bool b1 = false, b2 = false; + b1 = float.TryParse(text.Text, out oldf); + b2 = float.TryParse(text.Text + e.KeyChar, out f); + if (!b2) { - float f; - float oldf; - bool b1 = false, b2 = false; - b1 = float.TryParse(text.Text, out oldf); - b2 = float.TryParse(text.Text + e.KeyChar, out f); - if (b2 == false) - { - if (b1) - e.Handled = true; - else - e.Handled = false; - } + e.Handled = b1; } } } @@ -457,7 +453,7 @@ { frm = null; - Utility.RemoveFeatureFromName(globeControl1, "trackPolygon"); + FeatureTools.RemoveFeatureFromName(globeControl1, "trackPolygon"); globeControl1.TrackPolygonEndEvent -= globeControl1_TrackPolygonEndEvent; globeControl1.Globe.Action = EnumAction3D.ActionNull; diff --git a/FrmpipeDiametergather.cs b/FrmpipeDiametergather.cs index a9d96fa..c09aaf1 100644 --- a/FrmpipeDiametergather.cs +++ b/FrmpipeDiametergather.cs @@ -154,7 +154,7 @@ MessageBox.Show("请选择图层！"); return; } - Utility.RemoveFeatureFromName(globeControl1, "trackPolygon"); + FeatureTools.RemoveFeatureFromName(globeControl1, "trackPolygon"); globeControl1.Globe.Action = EnumAction3D.TrackPolygon; globeControl1.Globe.TrackPolygonTool.TrackMode = EnumTrackMode.SpaceTrack; globeControl1.TrackPolygonEndEvent += globeControl1_TrackPolygonEndEvent; @@ -392,7 +392,7 @@ private void FrmpipeDiametergather_FormClosing(object sender, FormClosingEventArgs e) { frm = null; - Utility.RemoveFeatureFromName(globeControl1, "trackPolygon"); + FeatureTools.RemoveFeatureFromName(globeControl1, "trackPolygon"); globeControl1.TrackPolygonEndEvent -= globeControl1_TrackPolygonEndEvent; globeControl1.Globe.Action = EnumAction3D.ActionNull; diff --git a/FrmpipeMaterialGather.cs b/FrmpipeMaterialGather.cs index 44e7f24..5ca8144 100644 --- a/FrmpipeMaterialGather.cs +++ b/FrmpipeMaterialGather.cs @@ -58,10 +58,9 @@ for (int i = 0; i < pipeLayerNames.Count; i++) { clbPipeLine.Items.Add(pipeLayerNames[i]); - GSOLayer layer = globeControl1.Globe.Layers.GetLayerByCaption(pipeLayerNames[i]); - if (layer.Dataset == null || !layer.Dataset.IsFeatureDataset || layer.Type != EnumLayerType.FeatureLayer) continue; + GSOLayer layer = globeControl1.Globe.Layers.GetLayerByCaption(pipeLayerNames[i]); + if (layer == null || layer.Dataset == null || !layer.Dataset.IsFeatureDataset || layer.Type != EnumLayerType.FeatureLayer) continue; - string name = layer.Name; GSOFeatureLayer flayer = layer as GSOFeatureLayer; GSOFeatures feats = flayer.GetAllFeatures(); @@ -205,7 +204,7 @@ { chart1.Series.Add(clbPipeLine.CheckedItems[i].ToString()); GSOLayer layer = globeControl1.Globe.Layers.GetLayerByCaption(clbPipeLine.CheckedItems[i].ToString()); - if (layer != null && layer is GSOFeatureLayer) + if (layer is GSOFeatureLayer) { GSOFeatureLayer flayer = layer as GSOFeatureLayer; GSOFeatures features = flayer.GetAllFeatures(); @@ -240,10 +239,9 @@ labeStyleAxisX.Enabled = true; chart1.ChartAreas["ChartArea1"].AxisX.LabelStyle = labeStyleAxisX; - Dictionary dic1 = new Dictionary(); for (int j = 0; j < chart1.Series.Count; j++) { - dic1 = new Dictionary(); + Dictionary dic1 = new Dictionary(); foreach (string key in dic.Keys) { if (key.Contains(chart1.Series[j].Name)) @@ -304,7 +302,7 @@ MessageBox.Show("请选择材质类型！"); return; } - Utility.RemoveFeatureFromName(globeControl1, "trackPolygon"); + FeatureTools.RemoveFeatureFromName(globeControl1, "trackPolygon"); globeControl1.Globe.Action = EnumAction3D.TrackPolygon; globeControl1.Globe.TrackPolygonTool.TrackMode = EnumTrackMode.SpaceTrack; globeControl1.TrackPolygonEndEvent += globeControl1_TrackPolygonEndEvent; @@ -318,7 +316,7 @@ private void FrmpipeMaterialGather_FormClosing(object sender, FormClosingEventArgs e) { frm = null; - Utility.RemoveFeatureFromName(globeControl1, "trackPolygon"); + FeatureTools.RemoveFeatureFromName(globeControl1, "trackPolygon"); globeControl1.TrackPolygonEndEvent -= globeControl1_TrackPolygonEndEvent; globeControl1.Globe.Action = EnumAction3D.ActionNull; diff --git a/Frmpipediameterstatis.cs b/Frmpipediameterstatis.cs index 4fb25a8..631a996 100644 --- a/Frmpipediameterstatis.cs +++ b/Frmpipediameterstatis.cs @@ -202,8 +202,8 @@ } catch (Exception ex) { - LogHelper.WriteLog(typeof(Frmpipediameterstatis), ex.Message); //MessageBox.Show(ex.Message); + LogHelper.Error(ex.Message); LogError.PublishError(ex); } } @@ -372,7 +372,7 @@ MessageBox.Show("请添加分段！"); return; } - Utility.RemoveFeatureFromName(globeControl1, "trackPolygon"); + FeatureTools.RemoveFeatureFromName(globeControl1, "trackPolygon"); globeControl1.Globe.Action = EnumAction3D.TrackPolygon; globeControl1.Globe.TrackPolygonTool.TrackMode = EnumTrackMode.SpaceTrack; globeControl1.TrackPolygonEndEvent += globeControl1_TrackPolygonEndEvent; @@ -422,7 +422,7 @@ globeControl1.Globe.Action = EnumAction3D.ActionNull; globeControl1.TrackPolygonEndEvent -= globeControl1_TrackPolygonEndEvent; - Utility.RemoveFeatureFromName(globeControl1, "trackPolygon"); + FeatureTools.RemoveFeatureFromName(globeControl1, "trackPolygon"); globeControl1.Globe.MemoryLayer.RemoveAllFeature(); } diff --git a/LineBuilder.cs b/LineBuilder.cs index 33a216c..b6a8516 100644 --- a/LineBuilder.cs +++ b/LineBuilder.cs @@ -43,8 +43,8 @@ GSOGeoPolyline3D lineeee = f.Geometry as GSOGeoPolyline3D; if (lineeee == null || lineeee.GetSpaceLength(true, 6378137) == 0) { - LogHelper.WriteLog(typeof(LineBuilder), "出现数据无法入库:"+f.ID); - continue; //TODO LIST:判断是否会出现部署数据无法入库情况,Log2Net + LogHelper.Error("出现数据无法入库:" + f.ID); + continue; } GSOFeature newFeature = newFeatureSet.CreateFeature(); diff --git a/LogHelper.cs b/LogHelper.cs index 9ef5f27..04573cf 100644 --- a/LogHelper.cs +++ b/LogHelper.cs @@ -1,4 +1,5 @@ using System; +using System.Diagnostics; using log4net; using log4net.Config; @@ -7,35 +8,82 @@ { public class LogHelper { - /// - /// 输出日志到Log4Net - /// - /// - /// - #region static void WriteLog(Type t, Exception ex) - public static void WriteLog(Type t, Exception ex) + private static ILog _logdebug = log4net.LogManager.GetLogger("logdebug"); + private static ILog _loginfo = log4net.LogManager.GetLogger("loginfo"); + private static ILog _logwarn = log4net.LogManager.GetLogger("logwarn"); + private static ILog _logerror = log4net.LogManager.GetLogger("logerror"); + private static ILog _logfatal = log4net.LogManager.GetLogger("logfatal"); + + public static void Debug(string msg) { - ILog log = log4net.LogManager.GetLogger(t); - log.Error("Error", ex); + StackFrame sf = new StackFrame(1); + msg = string.Format("{0}.{1}:{2}", sf.GetMethod().ReflectedType.FullName, sf.GetMethod().Name, msg); + _logdebug.Debug(msg); + } + public static void Debug(string msg, Exception e) + { + StackFrame sf = new StackFrame(1); + msg = string.Format("{0}.{1}:{2}", sf.GetMethod().ReflectedType.FullName, sf.GetMethod().Name, msg); + _logdebug.Debug(msg, e); } - #endregion - /// - /// 输出日志到Log4Net - /// - /// - /// - #region static void WriteLog(Type t, string msg) - - public static void WriteLog(Type t, string msg) + public static void Info(string msg) { - ILog log = log4net.LogManager.GetLogger(t); - log.Error(msg); + StackFrame sf = new StackFrame(1); + msg = string.Format("{0}.{1}:{2}", sf.GetMethod().ReflectedType.FullName, sf.GetMethod().Name, msg); + _loginfo.Info(msg); + } + public static void Info(string msg, Exception e) + { + StackFrame sf = new StackFrame(1); + msg = string.Format("{0}.{1}:{2}", sf.GetMethod().ReflectedType.FullName, sf.GetMethod().Name, msg); + _loginfo.Info(msg, e); } - #endregion + + public static void Warn(string msg) + { + StackFrame sf = new StackFrame(1); + msg = string.Format("{0}.{1}:{2}", sf.GetMethod().ReflectedType.FullName, sf.GetMethod().Name, msg); + _logwarn.Warn(msg); + } + public static void Warn(string msg, Exception e) + { + StackFrame sf = new StackFrame(1); + msg = string.Format("{0}.{1}:{2}", sf.GetMethod().ReflectedType.FullName, sf.GetMethod().Name, msg); + _logwarn.Warn(msg, e); + } + + + public static void Error(string msg) + { + StackFrame sf = new StackFrame(1); + msg = string.Format("{0}.{1}:{2}", sf.GetMethod().ReflectedType.FullName, sf.GetMethod().Name, msg); + _logerror.Error(msg); + } + public static void Error(string msg, Exception e) + { + StackFrame sf = new StackFrame(1); + msg = string.Format("{0}.{1}:{2}", sf.GetMethod().ReflectedType.FullName, sf.GetMethod().Name, msg); + _logerror.Error(msg, e); + } + + + public static void Fatal(string msg) + { + StackFrame sf = new StackFrame(1); + msg = string.Format("{0}.{1}:{2}", sf.GetMethod().ReflectedType.FullName, sf.GetMethod().Name, msg); + _logfatal.Fatal(msg); + } + public static void Fatal(string msg, Exception e) + { + StackFrame sf = new StackFrame(1); + msg = string.Format("{0}.{1}:{2}", sf.GetMethod().ReflectedType.FullName, sf.GetMethod().Name, msg); + _logfatal.Fatal(msg, e); + } + } diff --git a/MainFrm.cs b/MainFrm.cs index 43de664..51f362a 100644 --- a/MainFrm.cs +++ b/MainFrm.cs @@ -18,7 +18,6 @@ using GeoScene.Data; using GeoScene.Engine; using GeoScene.Globe; -using Timer = System.Windows.Forms.Timer; using ToolTip = System.Windows.Forms.ToolTip; namespace Cyberpipe @@ -163,6 +162,7 @@ /// private void AddGZ() { + lendendGZ50 = new GSOHudButton(); lendendGZ50.SetImage(Application.StartupPath + "/Resource/管纵/50.png"); lendendGZ50.SetOffset(0, 0); @@ -1294,18 +1294,19 @@ private void MainFrm_Load(object sender, EventArgs e) { + layerTree.Nodes.Add("正在加载，请稍后……");//树状图加载在图层加载之后，故增加提示 initGlobalControl(); - //initGlobalMap(); - //initLayerTree(); initMarkerTree(); initLayout(); loadData(); - double x = Convert.ToDouble(Utility.Query_Roads["定位"].ToString().Split(',')[0]); - double y = Convert.ToDouble(Utility.Query_Roads["定位"].ToString().Split(',')[1]); - double z = Convert.ToDouble(Utility.Query_Roads["定位"].ToString().Split(',')[2]); + + double x = Convert.ToDouble(Utility.Query_Roads["绿岛"].ToString().Split(',')[0]); + double y = Convert.ToDouble(Utility.Query_Roads["绿岛"].ToString().Split(',')[1]); + double z = Convert.ToDouble(Utility.Query_Roads["绿岛"].ToString().Split(',')[2]); jumpToCameraState(x, y, z); + } #endregion @@ -1315,11 +1316,17 @@ if (e.Layer == null || !e.Layer.Caption.Equals(Utility.roadLayerName)) return; foreach (TreeNode layerTreeNode in layerTree.Nodes) { - foreach (TreeNode node in layerTreeNode.Nodes) + for (int i=0;i dt, DataGridView dataGridView) @@ -7330,7 +7337,7 @@ } catch (Exception ex) { - LogHelper.WriteLog(typeof(MainFrm), ex); + LogHelper.Debug("", ex); } } } @@ -7362,7 +7369,7 @@ GSOLayer layer = globeControl1.Globe.Layers.Add(strDataPath); if (layer == null) {//wxl - LogHelper.WriteLog(typeof(MainFrm), "buttonItemHX1_Click操作中，" + strDataPath + "的layer为空"); + LogHelper.Error("buttonItemHX1_Click操作中，" + strDataPath + "的layer为空"); continue; } GSOFeatures redFeatures = layer.GetAllFeatures(); @@ -7457,17 +7464,12 @@ { try { + globeControl1.BeforeSceneRenderEvent -= globeControl1_BeforeSceneRenderEvent; globeControl2.BeforeSceneRenderEvent -= globeControl2_BeforeSceneRenderEvent; - double x = Convert.ToDouble(Utility.Query_Roads["定位"].ToString().Split(',')[0]); - double y = Convert.ToDouble(Utility.Query_Roads["定位"].ToString().Split(',')[1]); - double z = Convert.ToDouble(Utility.Query_Roads["定位"].ToString().Split(',')[2]); - jumpToCameraState(x, y, z); - /* globeControl1.Globe.FlyToPosition(new GSOPoint3d(120.610963, 31.188121, 50), EnumAltitudeMode.Absolute, -4, 50, 800); globeControl1.Globe.FlyToPointSpeed = 10000000; - * */ globeControl1.Globe.Action = EnumAction3D.SelectObject; globeControl1.Refresh(); @@ -7489,6 +7491,37 @@ } } /// + /// 基础工具 + /// + /// + /// + private void ribbonTabItem1_MouseDown(object sender, MouseEventArgs e) + { + try + { + + globeControl1.BeforeSceneRenderEvent -= globeControl1_BeforeSceneRenderEvent; + globeControl2.BeforeSceneRenderEvent -= globeControl2_BeforeSceneRenderEvent; + + globeControl1.Globe.Action = EnumAction3D.ActionNull; + dataGridViewX1.AutoSizeColumnsMode = DataGridViewAutoSizeColumnsMode.AllCells; + //zhanshi = false; + redSH = false; + splitContainer1.Panel2Collapsed = true; + panelOfTable.Visible = false; + legendSC.Visible = false; + legendSG.Visible = false; + ClearGZData(); + GSOLayer redLayer = globeControl1.Globe.Layers.GetLayerByCaption("红线"); + if (redLayer == null) return; + redLayer.Visible = false; + } + catch (Exception ex) + { + //MessageBox.Show("系统运行错误:" + ex.ToString(), "错误", MessageBoxButtons.OK, MessageBoxIcon.Error); + } + } + /// /// 一键审核 /// /// @@ -7497,6 +7530,7 @@ { try { + globeControl1.BeforeSceneRenderEvent -= globeControl1_BeforeSceneRenderEvent; globeControl2.BeforeSceneRenderEvent -= globeControl2_BeforeSceneRenderEvent; @@ -7518,32 +7552,7 @@ //MessageBox.Show("系统运行错误:" + ex.ToString(), "错误", MessageBoxButtons.OK, MessageBoxIcon.Error); } } - - void ResetRibbonTab() - { - try - { - globeControl1.BeforeSceneRenderEvent -= globeControl1_BeforeSceneRenderEvent; - globeControl2.BeforeSceneRenderEvent -= globeControl2_BeforeSceneRenderEvent; - - globeControl1.Globe.Action = EnumAction3D.ActionNull; - dataGridViewX1.AutoSizeColumnsMode = DataGridViewAutoSizeColumnsMode.AllCells; - //zhanshi = false; - redSH = false; - splitContainer1.Panel2Collapsed = true; - panelOfTable.Visible = false; - legendSC.Visible = false; - legendSG.Visible = false; - ClearGZData(); - GSOLayer redLayer = globeControl1.Globe.Layers.GetLayerByCaption("红线"); - if (redLayer == null) return; - redLayer.Visible = false; - } - catch (Exception ex) - { - LogHelper.WriteLog(typeof(MainFrm), ex); - } - } + /// /// 双屏对比 /// @@ -7553,8 +7562,8 @@ { try { - globeControl1.BeforeSceneRenderEvent += new BeforeSceneRenderEventHandler(globeControl1_BeforeSceneRenderEvent); - globeControl2.BeforeSceneRenderEvent += new BeforeSceneRenderEventHandler(globeControl2_BeforeSceneRenderEvent); + globeControl1.BeforeSceneRenderEvent += globeControl1_BeforeSceneRenderEvent; + globeControl2.BeforeSceneRenderEvent += globeControl2_BeforeSceneRenderEvent; globeControl1.Globe.Action = EnumAction3D.ActionNull; panelOfTable.Visible = false; @@ -7570,32 +7579,43 @@ GSOLayer redLayer = globeControl1.Globe.Layers.GetLayerByCaption("红线"); if (redLayer != null) - { redLayer.Visible = false; - } } catch (Exception ex) { - LogHelper.WriteLog(typeof(MainFrm), ex); + //MessageBox.Show("系统运行错误:" + ex.ToString(), "错误", MessageBoxButtons.OK, MessageBoxIcon.Error); } } /// - /// 基础工具 - /// - /// - /// - private void ribbonTabItem1_MouseDown(object sender, MouseEventArgs e) - { - ResetRibbonTab(); - } - /// /// 文档管理 /// /// /// private void ribbonTabItem4_MouseDown(object sender, MouseEventArgs e) { - ResetRibbonTab(); + try + { + + globeControl1.BeforeSceneRenderEvent -= globeControl1_BeforeSceneRenderEvent; + globeControl2.BeforeSceneRenderEvent -= globeControl2_BeforeSceneRenderEvent; + + globeControl1.Globe.Action = EnumAction3D.ActionNull; + panelOfTable.Visible = false; + //zhanshi = false; + redSH = false; + splitContainer1.Panel2Collapsed = true; + dataGridViewX1.AutoSizeColumnsMode = DataGridViewAutoSizeColumnsMode.AllCells; + legendSC.Visible = false; + legendSG.Visible = false; + ClearGZData(); + GSOLayer redLayer = globeControl1.Globe.Layers.GetLayerByCaption("红线"); + if (redLayer != null) + redLayer.Visible = false; + } + catch (Exception ex) + { + //MessageBox.Show("系统运行错误:" + ex.ToString(), "错误", MessageBoxButtons.OK, MessageBoxIcon.Error); + } } /// /// 基础管理 @@ -7604,7 +7624,29 @@ /// private void ribbonTabItem14_MouseDown(object sender, MouseEventArgs e) { - ResetRibbonTab(); + try + { + globeControl1.BeforeSceneRenderEvent -= globeControl1_BeforeSceneRenderEvent; + globeControl2.BeforeSceneRenderEvent -= globeControl2_BeforeSceneRenderEvent; + + globeControl1.Globe.Action = EnumAction3D.ActionNull; + panelOfTable.Visible = false; + //zhanshi = false; + redSH = false; + splitContainer1.Panel2Collapsed = true; + dataGridViewX1.AutoSizeColumnsMode = DataGridViewAutoSizeColumnsMode.AllCells; + legendSC.Visible = false; + legendSG.Visible = false; + ClearGZData(); + + GSOLayer redLayer = globeControl1.Globe.Layers.GetLayerByCaption("红线"); + if (redLayer != null) + redLayer.Visible = false; + } + catch (Exception ex) + { + //MessageBox.Show("系统运行错误:" + ex.ToString(), "错误", MessageBoxButtons.OK, MessageBoxIcon.Error); + } } /// /// 权限管理 @@ -7613,26 +7655,31 @@ /// private void ribbonTabItem2_MouseDown(object sender, MouseEventArgs e) { - ResetRibbonTab(); + try + { + globeControl1.BeforeSceneRenderEvent -= globeControl1_BeforeSceneRenderEvent; + globeControl2.BeforeSceneRenderEvent -= globeControl2_BeforeSceneRenderEvent; + + globeControl1.Globe.Action = EnumAction3D.ActionNull; + panelOfTable.Visible = false; + //zhanshi = false; + redSH = false; + splitContainer1.Panel2Collapsed = true; + dataGridViewX1.AutoSizeColumnsMode = DataGridViewAutoSizeColumnsMode.AllCells; + legendSC.Visible = false; + legendSG.Visible = false; + ClearGZData(); + + GSOLayer redLayer = globeControl1.Globe.Layers.GetLayerByCaption("红线"); + if (redLayer == null) return; + redLayer.Visible = false; + } + catch (Exception ex) + { + //MessageBox.Show("系统运行错误:" + ex.ToString(), "错误", MessageBoxButtons.OK, MessageBoxIcon.Error); + } } - /// - /// 管线定位 - /// - /// - /// - private void ribbonTabItem7_MouseDown(object sender, MouseEventArgs e) - { - ResetRibbonTab(); - } - /// - /// 标识器管理 - /// - /// - /// - private void ribbonTabItem5_MouseDown(object sender, MouseEventArgs e) - { - ResetRibbonTab(); - } + //GSOFeature dpFeatuer = null; /// /// 双屏分析，点击管段分析 @@ -8017,7 +8064,9 @@ private void btn_flag_Click(object sender, EventArgs e) { if (FrmFlagManagers.IS_OPEN) + { return; + } FrmFlagManagers frm = new FrmFlagManagers(globeControl1); frm.Show(this); } diff --git a/MainFrm.designer.cs b/MainFrm.designer.cs index e3dca41..73398c0 100644 --- a/MainFrm.designer.cs +++ b/MainFrm.designer.cs @@ -4,6 +4,7 @@ using DevComponents.DotNetBar; using DevComponents.DotNetBar.Controls; using DevComponents.Editors; +using System.Drawing; namespace Cyberpipe { @@ -89,6 +90,7 @@ this.sideBar1 = new DevComponents.DotNetBar.SideBar(); this.panelEx3 = new DevComponents.DotNetBar.PanelEx(); this.layerSensorTree = new System.Windows.Forms.TreeView(); + this.layerTree = new Cyberpipe.MyTreeView(); this.sideBarPanelItem3 = new DevComponents.DotNetBar.SideBarPanelItem(); this.controlContainerItem3 = new DevComponents.DotNetBar.ControlContainerItem(); this.sideBarPanelItem4 = new DevComponents.DotNetBar.SideBarPanelItem(); @@ -243,42 +245,18 @@ this.保存ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.定位ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.ribbonControl1 = new DevComponents.DotNetBar.RibbonControl(); - this.ribbonPanel6 = new DevComponents.DotNetBar.RibbonPanel(); - this.ribbonBar6 = new DevComponents.DotNetBar.RibbonBar(); - this.buttonItemSPSZ = new DevComponents.DotNetBar.ButtonItem(); - this.buttonItem8 = new DevComponents.DotNetBar.ButtonItem(); - this.buttonItemLocation = new DevComponents.DotNetBar.ButtonItem(); - this.sliderItem2 = new DevComponents.DotNetBar.SliderItem(); - this.buttonItemGBJC = new DevComponents.DotNetBar.ButtonItem(); - this.ribbonPanel5 = new DevComponents.DotNetBar.RibbonPanel(); - this.ribbonBar2 = new DevComponents.DotNetBar.RibbonBar(); - this.buttonItemHX1 = new DevComponents.DotNetBar.ButtonItem(); - this.buttonItemHX2 = new DevComponents.DotNetBar.ButtonItem(); - this.buttonItemDCTP = new DevComponents.DotNetBar.ButtonItem(); - this.sliderItem3 = new DevComponents.DotNetBar.SliderItem(); - this.ribbonPanel1 = new DevComponents.DotNetBar.RibbonPanel(); - this.ribbonBar21 = new DevComponents.DotNetBar.RibbonBar(); - this.buttonItem87 = new DevComponents.DotNetBar.ButtonItem(); - this.buttonItem88 = new DevComponents.DotNetBar.ButtonItem(); - this.buttonItem27 = new DevComponents.DotNetBar.ButtonItem(); - this.buttonItem91 = new DevComponents.DotNetBar.ButtonItem(); - this.buttonItem1 = new DevComponents.DotNetBar.ButtonItem(); - this.btnlegendSet = new DevComponents.DotNetBar.ButtonItem(); - this.buttonItem89 = new DevComponents.DotNetBar.ButtonItem(); - this.btnOutputJPG = new DevComponents.DotNetBar.ButtonItem(); - this.ribbonPanel12 = new DevComponents.DotNetBar.RibbonPanel(); - this.ribbonBar18 = new DevComponents.DotNetBar.RibbonBar(); - this.buttonItem133 = new DevComponents.DotNetBar.ButtonItem(); - this.ribbonBar13 = new DevComponents.DotNetBar.RibbonBar(); - this.buttonItem127 = new DevComponents.DotNetBar.ButtonItem(); - this.buttonItem128 = new DevComponents.DotNetBar.ButtonItem(); - this.sliderItem1 = new DevComponents.DotNetBar.SliderItem(); - this.buttonItem134 = new DevComponents.DotNetBar.ButtonItem(); - this.buttonItem130 = new DevComponents.DotNetBar.ButtonItem(); - this.btn_check_history = new DevComponents.DotNetBar.ButtonItem(); - this.ribbonPanel4 = new DevComponents.DotNetBar.RibbonPanel(); - this.ribbonBar1 = new DevComponents.DotNetBar.RibbonBar(); - this.btn_document_info = new DevComponents.DotNetBar.ButtonItem(); + this.ribbonPanel3 = new DevComponents.DotNetBar.RibbonPanel(); + this.ribbonBar4 = new DevComponents.DotNetBar.RibbonBar(); + this.btn_flag = new DevComponents.DotNetBar.ButtonItem(); + this.slider4ground = new DevComponents.DotNetBar.SliderItem(); + this.ribbonPanel7 = new DevComponents.DotNetBar.RibbonPanel(); + this.gxdw_ribbonbar = new DevComponents.DotNetBar.RibbonBar(); + this.buttonItem9 = new DevComponents.DotNetBar.ButtonItem(); + this.buttonItem10 = new DevComponents.DotNetBar.ButtonItem(); + this.buttonItem11 = new DevComponents.DotNetBar.ButtonItem(); + this.buttonItem12 = new DevComponents.DotNetBar.ButtonItem(); + this.buttonItem13 = new DevComponents.DotNetBar.ButtonItem(); + this.buttonItem14 = new DevComponents.DotNetBar.ButtonItem(); this.ribbonPanel15 = new DevComponents.DotNetBar.RibbonPanel(); this.ribbonBar20 = new DevComponents.DotNetBar.RibbonBar(); this.buttonItemSH = new DevComponents.DotNetBar.ButtonItem(); @@ -334,18 +312,6 @@ this.buttonItemXT4 = new DevComponents.DotNetBar.ButtonItem(); this.buttonItemXT4_1 = new DevComponents.DotNetBar.ButtonItem(); this.buttonItemXT4_2 = new DevComponents.DotNetBar.ButtonItem(); - this.ribbonPanel3 = new DevComponents.DotNetBar.RibbonPanel(); - this.ribbonBar4 = new DevComponents.DotNetBar.RibbonBar(); - this.btn_flag = new DevComponents.DotNetBar.ButtonItem(); - this.slider4ground = new DevComponents.DotNetBar.SliderItem(); - this.ribbonPanel7 = new DevComponents.DotNetBar.RibbonPanel(); - this.gxdw_ribbonbar = new DevComponents.DotNetBar.RibbonBar(); - this.buttonItem9 = new DevComponents.DotNetBar.ButtonItem(); - this.buttonItem10 = new DevComponents.DotNetBar.ButtonItem(); - this.buttonItem11 = new DevComponents.DotNetBar.ButtonItem(); - this.buttonItem12 = new DevComponents.DotNetBar.ButtonItem(); - this.buttonItem13 = new DevComponents.DotNetBar.ButtonItem(); - this.buttonItem14 = new DevComponents.DotNetBar.ButtonItem(); this.ribbonPanel2 = new DevComponents.DotNetBar.RibbonPanel(); this.ribbonBar3 = new DevComponents.DotNetBar.RibbonBar(); this.btn_user_info = new DevComponents.DotNetBar.ButtonItem(); @@ -355,6 +321,43 @@ this.btn_user_role = new DevComponents.DotNetBar.ButtonItem(); this.btn_password_edit = new DevComponents.DotNetBar.ButtonItem(); this.buttonItemPasswordReset = new DevComponents.DotNetBar.ButtonItem(); + this.ribbonPanel6 = new DevComponents.DotNetBar.RibbonPanel(); + this.ribbonBar6 = new DevComponents.DotNetBar.RibbonBar(); + this.buttonItemSPSZ = new DevComponents.DotNetBar.ButtonItem(); + this.buttonItem8 = new DevComponents.DotNetBar.ButtonItem(); + this.buttonItemLocation = new DevComponents.DotNetBar.ButtonItem(); + this.sliderItem2 = new DevComponents.DotNetBar.SliderItem(); + this.buttonItemGBJC = new DevComponents.DotNetBar.ButtonItem(); + this.ribbonPanel5 = new DevComponents.DotNetBar.RibbonPanel(); + this.ribbonBar2 = new DevComponents.DotNetBar.RibbonBar(); + this.buttonItemHX1 = new DevComponents.DotNetBar.ButtonItem(); + this.buttonItemHX2 = new DevComponents.DotNetBar.ButtonItem(); + this.buttonItemDCTP = new DevComponents.DotNetBar.ButtonItem(); + this.sliderItem3 = new DevComponents.DotNetBar.SliderItem(); + this.ribbonPanel1 = new DevComponents.DotNetBar.RibbonPanel(); + this.ribbonBar21 = new DevComponents.DotNetBar.RibbonBar(); + this.buttonItem87 = new DevComponents.DotNetBar.ButtonItem(); + this.buttonItem88 = new DevComponents.DotNetBar.ButtonItem(); + this.buttonItem27 = new DevComponents.DotNetBar.ButtonItem(); + this.buttonItem91 = new DevComponents.DotNetBar.ButtonItem(); + this.buttonItem1 = new DevComponents.DotNetBar.ButtonItem(); + this.btnlegendSet = new DevComponents.DotNetBar.ButtonItem(); + this.buttonItem89 = new DevComponents.DotNetBar.ButtonItem(); + this.btnOutputJPG = new DevComponents.DotNetBar.ButtonItem(); + this.ribbonPanel12 = new DevComponents.DotNetBar.RibbonPanel(); + this.ribbonBar18 = new DevComponents.DotNetBar.RibbonBar(); + this.buttonItem133 = new DevComponents.DotNetBar.ButtonItem(); + this.buttonItem132 = new DevComponents.DotNetBar.ButtonItem(); + this.ribbonBar13 = new DevComponents.DotNetBar.RibbonBar(); + this.buttonItem127 = new DevComponents.DotNetBar.ButtonItem(); + this.buttonItem128 = new DevComponents.DotNetBar.ButtonItem(); + this.sliderItem1 = new DevComponents.DotNetBar.SliderItem(); + this.buttonItem134 = new DevComponents.DotNetBar.ButtonItem(); + this.buttonItem130 = new DevComponents.DotNetBar.ButtonItem(); + this.btn_check_history = new DevComponents.DotNetBar.ButtonItem(); + this.ribbonPanel4 = new DevComponents.DotNetBar.RibbonPanel(); + this.ribbonBar1 = new DevComponents.DotNetBar.RibbonBar(); + this.btn_document_info = new DevComponents.DotNetBar.ButtonItem(); this.ribbonTabItem1 = new DevComponents.DotNetBar.RibbonTabItem(); this.ribbonTabItem11 = new DevComponents.DotNetBar.RibbonTabItem(); this.ribbonTabItem6 = new DevComponents.DotNetBar.RibbonTabItem(); @@ -516,7 +519,6 @@ this.labelX17 = new DevComponents.DotNetBar.LabelX(); this.panelEx4 = new DevComponents.DotNetBar.PanelEx(); this.pictureBox1 = new System.Windows.Forms.PictureBox(); - this.layerTree = new Cyberpipe.MyTreeView(); this.statusStrip1.SuspendLayout(); this.sideBar1.SuspendLayout(); this.panelEx3.SuspendLayout(); @@ -527,15 +529,15 @@ this.contextMenuStrip3.SuspendLayout(); this.contextMenuStripDeleteLayerNode.SuspendLayout(); this.ribbonControl1.SuspendLayout(); + this.ribbonPanel3.SuspendLayout(); + this.ribbonPanel7.SuspendLayout(); + this.ribbonPanel15.SuspendLayout(); + this.ribbonPanel2.SuspendLayout(); this.ribbonPanel6.SuspendLayout(); this.ribbonPanel5.SuspendLayout(); this.ribbonPanel1.SuspendLayout(); this.ribbonPanel12.SuspendLayout(); this.ribbonPanel4.SuspendLayout(); - this.ribbonPanel15.SuspendLayout(); - this.ribbonPanel3.SuspendLayout(); - this.ribbonPanel7.SuspendLayout(); - this.ribbonPanel2.SuspendLayout(); this.panelOfTable.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.dataGridViewX1)).BeginInit(); this.statusStrip2.SuspendLayout(); @@ -711,7 +713,8 @@ this.statusLabel.Name = "statusLabel"; this.statusLabel.Size = new System.Drawing.Size(1313, 17); this.statusLabel.Spring = true; - this.statusLabel.Text = " ©2014-2015 苏州航天系统工程有限公司 版权所有"; + this.statusLabel.Text = Utility.Copyright; +// this.statusLabel.Text = " ©2014-2015 苏州航天系统工程有限公司 版权所有"; // // toolStripDropDownButton1 // @@ -956,6 +959,18 @@ this.layerSensorTree.NodeMouseClick += new System.Windows.Forms.TreeNodeMouseClickEventHandler(this.layerMarkerTree_NodeMouseClick); this.layerSensorTree.NodeMouseDoubleClick += new System.Windows.Forms.TreeNodeMouseClickEventHandler(this.layerTree_NodeMouseDoubleClick); // + // layerTree + // + this.layerTree.CheckBoxes = true; + this.layerTree.ItemHeight = 18; + this.layerTree.Location = new System.Drawing.Point(30, 78); + this.layerTree.Name = "layerTree"; + this.layerTree.Size = new System.Drawing.Size(121, 97); + this.layerTree.TabIndex = 1; + this.layerTree.AfterCheck += new System.Windows.Forms.TreeViewEventHandler(this.layerTree_AfterCheck); + this.layerTree.NodeMouseClick += new System.Windows.Forms.TreeNodeMouseClickEventHandler(this.layerTree_NodeMouseClick); + this.layerTree.NodeMouseDoubleClick += new System.Windows.Forms.TreeNodeMouseClickEventHandler(this.layerTree_NodeMouseDoubleClick); + // // sideBarPanelItem3 // this.sideBarPanelItem3.FontBold = true; @@ -2150,13 +2165,13 @@ this.ribbonControl1.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.ribbonControl1.Controls.Add(this.ribbonPanel3); this.ribbonControl1.Controls.Add(this.ribbonPanel7); - this.ribbonControl1.Controls.Add(this.ribbonPanel2); this.ribbonControl1.Controls.Add(this.ribbonPanel15); - this.ribbonControl1.Controls.Add(this.ribbonPanel4); - this.ribbonControl1.Controls.Add(this.ribbonPanel1); + this.ribbonControl1.Controls.Add(this.ribbonPanel2); this.ribbonControl1.Controls.Add(this.ribbonPanel6); - this.ribbonControl1.Controls.Add(this.ribbonPanel12); this.ribbonControl1.Controls.Add(this.ribbonPanel5); + this.ribbonControl1.Controls.Add(this.ribbonPanel1); + this.ribbonControl1.Controls.Add(this.ribbonPanel12); + this.ribbonControl1.Controls.Add(this.ribbonPanel4); this.ribbonControl1.Dock = System.Windows.Forms.DockStyle.Top; this.ribbonControl1.ImeMode = System.Windows.Forms.ImeMode.NoControl; this.ribbonControl1.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { @@ -2200,609 +2215,216 @@ this.ribbonControl1.Text = "ribbonControl1"; this.ribbonControl1.UseCustomizeDialog = false; // - // ribbonPanel6 + // ribbonPanel3 // - this.ribbonPanel6.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.ribbonPanel6.Controls.Add(this.ribbonBar6); - this.ribbonPanel6.Dock = System.Windows.Forms.DockStyle.Fill; - this.ribbonPanel6.Location = new System.Drawing.Point(0, 0); - this.ribbonPanel6.Name = "ribbonPanel6"; - this.ribbonPanel6.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); - this.ribbonPanel6.Size = new System.Drawing.Size(1328, 95); + this.ribbonPanel3.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.ribbonPanel3.Controls.Add(this.ribbonBar4); + this.ribbonPanel3.Dock = System.Windows.Forms.DockStyle.Fill; + this.ribbonPanel3.Location = new System.Drawing.Point(0, 33); + this.ribbonPanel3.Name = "ribbonPanel3"; + this.ribbonPanel3.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); + this.ribbonPanel3.Size = new System.Drawing.Size(1328, 62); // // // - this.ribbonPanel6.Style.Class = ""; - this.ribbonPanel6.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonPanel3.Style.Class = ""; + this.ribbonPanel3.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; // // // - this.ribbonPanel6.StyleMouseDown.Class = ""; - this.ribbonPanel6.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonPanel3.StyleMouseDown.Class = ""; + this.ribbonPanel3.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; // // // - this.ribbonPanel6.StyleMouseOver.Class = ""; - this.ribbonPanel6.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonPanel6.TabIndex = 38; - this.ribbonPanel6.Visible = false; + this.ribbonPanel3.StyleMouseOver.Class = ""; + this.ribbonPanel3.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonPanel3.TabIndex = 40; // - // ribbonBar6 + // ribbonBar4 // - this.ribbonBar6.AutoOverflowEnabled = true; + this.ribbonBar4.AutoOverflowEnabled = true; // // // - this.ribbonBar6.BackgroundMouseOverStyle.Class = ""; - this.ribbonBar6.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar4.BackgroundMouseOverStyle.Class = ""; + this.ribbonBar4.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; // // // - this.ribbonBar6.BackgroundStyle.Class = ""; - this.ribbonBar6.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonBar6.ContainerControlProcessDialogKey = true; - this.ribbonBar6.Dock = System.Windows.Forms.DockStyle.Left; - this.ribbonBar6.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { - this.buttonItemSPSZ, - this.buttonItem8, - this.buttonItemLocation, - this.sliderItem2, - this.buttonItemGBJC}); - this.ribbonBar6.Location = new System.Drawing.Point(3, 0); - this.ribbonBar6.Name = "ribbonBar6"; - this.ribbonBar6.Size = new System.Drawing.Size(427, 92); - this.ribbonBar6.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.ribbonBar6.TabIndex = 0; + this.ribbonBar4.BackgroundStyle.Class = ""; + this.ribbonBar4.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar4.ContainerControlProcessDialogKey = true; + this.ribbonBar4.Dock = System.Windows.Forms.DockStyle.Left; + this.ribbonBar4.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { + this.btn_flag, + this.slider4ground}); + this.ribbonBar4.Location = new System.Drawing.Point(3, 0); + this.ribbonBar4.Name = "ribbonBar4"; + this.ribbonBar4.Size = new System.Drawing.Size(634, 59); + this.ribbonBar4.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.ribbonBar4.TabIndex = 0; // // // - this.ribbonBar6.TitleStyle.Class = ""; - this.ribbonBar6.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar4.TitleStyle.Class = ""; + this.ribbonBar4.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; // // // - this.ribbonBar6.TitleStyleMouseOver.Class = ""; - this.ribbonBar6.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonBar6.TitleVisible = false; + this.ribbonBar4.TitleStyleMouseOver.Class = ""; + this.ribbonBar4.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar4.TitleVisible = false; // - // buttonItemSPSZ + // btn_flag // - this.buttonItemSPSZ.Image = ((System.Drawing.Image)(resources.GetObject("buttonItemSPSZ.Image"))); - this.buttonItemSPSZ.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItemSPSZ.Name = "buttonItemSPSZ"; - this.buttonItemSPSZ.SubItemsExpandWidth = 14; - this.buttonItemSPSZ.Text = "双屏设置"; - this.buttonItemSPSZ.Click += new System.EventHandler(this.buttonItemSPSZ_Click); + this.btn_flag.Image = global::Cyberpipe.Properties.Resources._24x24icon_03_hover; + this.btn_flag.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.btn_flag.Name = "btn_flag"; + this.btn_flag.SubItemsExpandWidth = 14; + this.btn_flag.Text = "标识器管理"; + this.btn_flag.Click += new System.EventHandler(this.btn_flag_Click); // - // buttonItem8 + // slider4ground // - this.buttonItem8.Image = ((System.Drawing.Image)(resources.GetObject("buttonItem8.Image"))); - this.buttonItem8.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem8.Name = "buttonItem8"; - this.buttonItem8.SubItemsExpandWidth = 14; - this.buttonItem8.Text = "双屏分析"; - this.buttonItem8.Click += new System.EventHandler(this.buttonItem8_Click); + this.slider4ground.LabelPosition = DevComponents.DotNetBar.eSliderLabelPosition.Top; + this.slider4ground.LabelWidth = 50; + this.slider4ground.Name = "slider4ground"; + this.slider4ground.Text = "地面透明度"; + this.slider4ground.TextColor = System.Drawing.Color.Black; + this.slider4ground.Value = 0; + this.slider4ground.ValueChanged += new System.EventHandler(this.slider4ground_ValueChanged); // - // buttonItemLocation + // ribbonPanel7 // - this.buttonItemLocation.Image = ((System.Drawing.Image)(resources.GetObject("buttonItemLocation.Image"))); - this.buttonItemLocation.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItemLocation.Name = "buttonItemLocation"; - this.buttonItemLocation.SubItemsExpandWidth = 14; - this.buttonItemLocation.Text = "快速定位"; - this.buttonItemLocation.Click += new System.EventHandler(this.buttonItemLocation_Click); + this.ribbonPanel7.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.ribbonPanel7.Controls.Add(this.gxdw_ribbonbar); + this.ribbonPanel7.Dock = System.Windows.Forms.DockStyle.Fill; + this.ribbonPanel7.Location = new System.Drawing.Point(0, 33); + this.ribbonPanel7.Name = "ribbonPanel7"; + this.ribbonPanel7.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); + this.ribbonPanel7.Size = new System.Drawing.Size(1328, 62); // - // sliderItem2 // - this.sliderItem2.LabelPosition = DevComponents.DotNetBar.eSliderLabelPosition.Top; - this.sliderItem2.LabelWidth = 50; - this.sliderItem2.Name = "sliderItem2"; - this.sliderItem2.Text = "地面透明度"; - this.sliderItem2.TextColor = System.Drawing.Color.Black; - this.sliderItem2.Value = 0; - this.sliderItem2.ValueChanged += new System.EventHandler(this.sliderItem2_ValueChanged); // - // buttonItemGBJC + this.ribbonPanel7.Style.Class = ""; + this.ribbonPanel7.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; // - this.buttonItemGBJC.Image = ((System.Drawing.Image)(resources.GetObject("buttonItemGBJC.Image"))); - this.buttonItemGBJC.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItemGBJC.Name = "buttonItemGBJC"; - this.buttonItemGBJC.SubItemsExpandWidth = 14; - this.buttonItemGBJC.Text = "国标检测"; - this.buttonItemGBJC.Click += new System.EventHandler(this.buttonItemGBJC_Click); // - // ribbonPanel5 // - this.ribbonPanel5.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.ribbonPanel5.Controls.Add(this.ribbonBar2); - this.ribbonPanel5.Dock = System.Windows.Forms.DockStyle.Fill; - this.ribbonPanel5.Location = new System.Drawing.Point(0, 0); - this.ribbonPanel5.Name = "ribbonPanel5"; - this.ribbonPanel5.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); - this.ribbonPanel5.Size = new System.Drawing.Size(1328, 95); + this.ribbonPanel7.StyleMouseDown.Class = ""; + this.ribbonPanel7.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; // // // - this.ribbonPanel5.Style.Class = ""; - this.ribbonPanel5.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonPanel7.StyleMouseOver.Class = ""; + this.ribbonPanel7.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonPanel7.TabIndex = 41; + this.ribbonPanel7.Visible = false; // + // gxdw_ribbonbar // + this.gxdw_ribbonbar.AutoOverflowEnabled = true; // - this.ribbonPanel5.StyleMouseDown.Class = ""; - this.ribbonPanel5.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; // // + this.gxdw_ribbonbar.BackgroundMouseOverStyle.Class = ""; + this.gxdw_ribbonbar.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; // - this.ribbonPanel5.StyleMouseOver.Class = ""; - this.ribbonPanel5.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonPanel5.TabIndex = 37; - this.ribbonPanel5.Visible = false; // - // ribbonBar2 // - this.ribbonBar2.AutoOverflowEnabled = true; + this.gxdw_ribbonbar.BackgroundStyle.Class = ""; + this.gxdw_ribbonbar.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.gxdw_ribbonbar.ContainerControlProcessDialogKey = true; + this.gxdw_ribbonbar.Dock = System.Windows.Forms.DockStyle.Left; + this.gxdw_ribbonbar.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { + this.buttonItem9, + this.buttonItem10, + this.buttonItem11, + this.buttonItem12, + this.buttonItem13, + this.buttonItem14}); + this.gxdw_ribbonbar.Location = new System.Drawing.Point(3, 0); + this.gxdw_ribbonbar.Name = "gxdw_ribbonbar"; + this.gxdw_ribbonbar.Size = new System.Drawing.Size(564, 59); + this.gxdw_ribbonbar.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.gxdw_ribbonbar.TabIndex = 0; + this.gxdw_ribbonbar.Text = "ribbonBar5"; // // // - this.ribbonBar2.BackgroundMouseOverStyle.Class = ""; - this.ribbonBar2.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.gxdw_ribbonbar.TitleStyle.Class = ""; + this.gxdw_ribbonbar.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; // // // - this.ribbonBar2.BackgroundStyle.Class = ""; - this.ribbonBar2.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonBar2.ContainerControlProcessDialogKey = true; - this.ribbonBar2.Dock = System.Windows.Forms.DockStyle.Left; - this.ribbonBar2.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { - this.buttonItemHX1, - this.buttonItemHX2, - this.buttonItemDCTP, - this.sliderItem3}); - this.ribbonBar2.Location = new System.Drawing.Point(3, 0); - this.ribbonBar2.Name = "ribbonBar2"; - this.ribbonBar2.Size = new System.Drawing.Size(350, 92); - this.ribbonBar2.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.ribbonBar2.TabIndex = 0; + this.gxdw_ribbonbar.TitleStyleMouseOver.Class = ""; + this.gxdw_ribbonbar.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.gxdw_ribbonbar.TitleVisible = false; // + // buttonItem9 // + this.buttonItem9.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__76; + this.buttonItem9.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem9.Name = "buttonItem9"; + this.buttonItem9.SubItemsExpandWidth = 14; + this.buttonItem9.Text = "工单管理"; + this.buttonItem9.Click += new System.EventHandler(this.buttonItem9_Click); // - this.ribbonBar2.TitleStyle.Class = ""; - this.ribbonBar2.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // buttonItem10 // + this.buttonItem10.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__69; + this.buttonItem10.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem10.Name = "buttonItem10"; + this.buttonItem10.SubItemsExpandWidth = 14; + this.buttonItem10.Text = "在线任务"; + this.buttonItem10.Click += new System.EventHandler(this.buttonItem10_Click); // + // buttonItem11 // - this.ribbonBar2.TitleStyleMouseOver.Class = ""; - this.ribbonBar2.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonBar2.TitleVisible = false; + this.buttonItem11.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__72; + this.buttonItem11.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem11.Name = "buttonItem11"; + this.buttonItem11.SubItemsExpandWidth = 14; + this.buttonItem11.Text = "事件管理"; + this.buttonItem11.Click += new System.EventHandler(this.buttonItem11_Click); // - // buttonItemHX1 + // buttonItem12 // - this.buttonItemHX1.AutoExpandOnClick = true; - this.buttonItemHX1.Image = ((System.Drawing.Image)(resources.GetObject("buttonItemHX1.Image"))); - this.buttonItemHX1.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItemHX1.Name = "buttonItemHX1"; - this.buttonItemHX1.SubItemsExpandWidth = 14; - this.buttonItemHX1.Text = "导入红线"; - this.buttonItemHX1.Click += new System.EventHandler(this.buttonItemHX1_Click); + this.buttonItem12.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__34; + this.buttonItem12.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem12.Name = "buttonItem12"; + this.buttonItem12.SubItemsExpandWidth = 14; + this.buttonItem12.Text = "探测仪管理"; + this.buttonItem12.Click += new System.EventHandler(this.buttonItem12_Click); // - // buttonItemHX2 + // buttonItem13 // - this.buttonItemHX2.Image = ((System.Drawing.Image)(resources.GetObject("buttonItemHX2.Image"))); - this.buttonItemHX2.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItemHX2.Name = "buttonItemHX2"; - this.buttonItemHX2.SubItemsExpandWidth = 14; - this.buttonItemHX2.Text = "红线审核"; - this.buttonItemHX2.Click += new System.EventHandler(this.buttonItemHX2_Click); + this.buttonItem13.Image = global::Cyberpipe.Properties.Resources._24x24icon_13_hover; + this.buttonItem13.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem13.Name = "buttonItem13"; + this.buttonItem13.SubItemsExpandWidth = 14; + this.buttonItem13.Text = "巡检人员维护"; + this.buttonItem13.Click += new System.EventHandler(this.buttonItem13_Click); // - // buttonItemDCTP + // buttonItem14 // - this.buttonItemDCTP.Image = ((System.Drawing.Image)(resources.GetObject("buttonItemDCTP.Image"))); - this.buttonItemDCTP.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItemDCTP.Name = "buttonItemDCTP"; - this.buttonItemDCTP.SubItemsExpandWidth = 14; - this.buttonItemDCTP.Text = "导出图片"; - this.buttonItemDCTP.Click += new System.EventHandler(this.buttonItemDCTP_Click); - // - // sliderItem3 - // - this.sliderItem3.LabelPosition = DevComponents.DotNetBar.eSliderLabelPosition.Top; - this.sliderItem3.LabelWidth = 50; - this.sliderItem3.Name = "sliderItem3"; - this.sliderItem3.Text = "地面透明度"; - this.sliderItem3.TextColor = System.Drawing.Color.Black; - this.sliderItem3.Value = 0; - this.sliderItem3.ValueChanged += new System.EventHandler(this.sliderItem3_ValueChanged); - // - // ribbonPanel1 - // - this.ribbonPanel1.AutoSize = true; - this.ribbonPanel1.CanvasColor = System.Drawing.Color.Gray; - this.ribbonPanel1.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.ribbonPanel1.Controls.Add(this.ribbonBar21); - this.ribbonPanel1.Dock = System.Windows.Forms.DockStyle.Fill; - this.ribbonPanel1.Location = new System.Drawing.Point(0, 0); - this.ribbonPanel1.Name = "ribbonPanel1"; - this.ribbonPanel1.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); - this.ribbonPanel1.Size = new System.Drawing.Size(1328, 95); - // - // - // - this.ribbonPanel1.Style.Class = ""; - this.ribbonPanel1.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonPanel1.StyleMouseDown.Class = ""; - this.ribbonPanel1.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonPanel1.StyleMouseOver.Class = ""; - this.ribbonPanel1.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonPanel1.TabIndex = 1; - this.ribbonPanel1.Visible = false; - // - // ribbonBar21 - // - this.ribbonBar21.AutoOverflowEnabled = true; - this.ribbonBar21.BackColor = System.Drawing.Color.White; - // - // - // - this.ribbonBar21.BackgroundMouseOverStyle.Class = ""; - this.ribbonBar21.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonBar21.BackgroundStyle.Class = ""; - this.ribbonBar21.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonBar21.ContainerControlProcessDialogKey = true; - this.ribbonBar21.Dock = System.Windows.Forms.DockStyle.Left; - this.ribbonBar21.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { - this.buttonItem87, - this.buttonItem88, - this.buttonItem27, - this.sliderGroundTransSet1, - this.buttonItem91, - this.buttonItem1, - this.btnlegendSet, - this.buttonItem89, - this.btnOutputJPG}); - this.ribbonBar21.Location = new System.Drawing.Point(3, 0); - this.ribbonBar21.Name = "ribbonBar21"; - this.ribbonBar21.Size = new System.Drawing.Size(649, 92); - this.ribbonBar21.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.ribbonBar21.TabIndex = 2; - this.ribbonBar21.Text = "浏览模式"; - // - // - // - this.ribbonBar21.TitleStyle.Class = ""; - this.ribbonBar21.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonBar21.TitleStyleMouseOver.Class = ""; - this.ribbonBar21.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonBar21.TitleVisible = false; - // - // buttonItem87 - // - this.buttonItem87.Image = ((System.Drawing.Image)(resources.GetObject("buttonItem87.Image"))); - this.buttonItem87.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem87.Name = "buttonItem87"; - this.buttonItem87.SubItemsExpandWidth = 14; - this.buttonItem87.Text = "地上模式"; - this.buttonItem87.Click += new System.EventHandler(this.buttonItem87_Click); - // - // buttonItem88 - // - this.buttonItem88.Image = ((System.Drawing.Image)(resources.GetObject("buttonItem88.Image"))); - this.buttonItem88.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem88.Name = "buttonItem88"; - this.buttonItem88.SubItemsExpandWidth = 14; - this.buttonItem88.Text = "地下模式"; - this.buttonItem88.Click += new System.EventHandler(this.buttonItem88_Click); - // - // buttonItem27 - // - this.buttonItem27.Image = ((System.Drawing.Image)(resources.GetObject("buttonItem27.Image"))); - this.buttonItem27.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem27.Name = "buttonItem27"; - this.buttonItem27.SubItemsExpandWidth = 14; - this.buttonItem27.Text = "行走模式"; - this.buttonItem27.Click += new System.EventHandler(this.buttonItem27_Click); - // - // buttonItem91 - // - this.buttonItem91.ForeColor = System.Drawing.Color.Black; - this.buttonItem91.Image = ((System.Drawing.Image)(resources.GetObject("buttonItem91.Image"))); - this.buttonItem91.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem91.Name = "buttonItem91"; - this.buttonItem91.SubItemsExpandWidth = 14; - this.buttonItem91.Text = "快速定位"; - this.buttonItem91.Click += new System.EventHandler(this.buttonItem91_Click); - // - // buttonItem1 - // - this.buttonItem1.Image = ((System.Drawing.Image)(resources.GetObject("buttonItem1.Image"))); - this.buttonItem1.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem1.Name = "buttonItem1"; - this.buttonItem1.SubItemsExpandWidth = 14; - this.buttonItem1.Text = "图层管理"; - this.buttonItem1.Click += new System.EventHandler(this.buttonItem1_Click); - // - // btnlegendSet - // - this.btnlegendSet.Image = ((System.Drawing.Image)(resources.GetObject("btnlegendSet.Image"))); - this.btnlegendSet.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.btnlegendSet.Name = "btnlegendSet"; - this.btnlegendSet.SubItemsExpandWidth = 14; - this.btnlegendSet.Text = "图例"; - this.btnlegendSet.Click += new System.EventHandler(this.btnlegendSet_Click); - // - // buttonItem89 - // - this.buttonItem89.Image = ((System.Drawing.Image)(resources.GetObject("buttonItem89.Image"))); - this.buttonItem89.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem89.Name = "buttonItem89"; - this.buttonItem89.SubItemsExpandWidth = 14; - this.buttonItem89.Text = "全屏显示"; - this.buttonItem89.Click += new System.EventHandler(this.buttonItem89_Click); - // - // btnOutputJPG - // - this.btnOutputJPG.Image = ((System.Drawing.Image)(resources.GetObject("btnOutputJPG.Image"))); - this.btnOutputJPG.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.btnOutputJPG.Name = "btnOutputJPG"; - this.btnOutputJPG.SubItemsExpandWidth = 14; - this.btnOutputJPG.Text = "导出图片"; - this.btnOutputJPG.Click += new System.EventHandler(this.btnOutputJPG_Click); - // - // ribbonPanel12 - // - this.ribbonPanel12.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.ribbonPanel12.Controls.Add(this.ribbonBar18); - this.ribbonPanel12.Controls.Add(this.ribbonBar13); - this.ribbonPanel12.Dock = System.Windows.Forms.DockStyle.Fill; - this.ribbonPanel12.Location = new System.Drawing.Point(0, 0); - this.ribbonPanel12.Name = "ribbonPanel12"; - this.ribbonPanel12.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); - this.ribbonPanel12.Size = new System.Drawing.Size(1328, 95); - // - // - // - this.ribbonPanel12.Style.Class = ""; - this.ribbonPanel12.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonPanel12.StyleMouseDown.Class = ""; - this.ribbonPanel12.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonPanel12.StyleMouseOver.Class = ""; - this.ribbonPanel12.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonPanel12.TabIndex = 34; - this.ribbonPanel12.Visible = false; - // - // ribbonBar18 - // - this.ribbonBar18.AutoOverflowEnabled = true; - // - // - // - this.ribbonBar18.BackgroundMouseOverStyle.Class = ""; - this.ribbonBar18.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonBar18.BackgroundStyle.Class = ""; - this.ribbonBar18.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonBar18.ContainerControlProcessDialogKey = true; - this.ribbonBar18.Dock = System.Windows.Forms.DockStyle.Left; - this.ribbonBar18.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { - this.buttonItem133}); - this.ribbonBar18.Location = new System.Drawing.Point(531, 0); - this.ribbonBar18.Name = "ribbonBar18"; - this.ribbonBar18.Size = new System.Drawing.Size(129, 92); - this.ribbonBar18.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.ribbonBar18.TabIndex = 1; - // - // - // - this.ribbonBar18.TitleStyle.Class = ""; - this.ribbonBar18.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonBar18.TitleStyleMouseOver.Class = ""; - this.ribbonBar18.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonBar18.TitleVisible = false; - // - // buttonItem133 - // - this.buttonItem133.Image = ((System.Drawing.Image)(resources.GetObject("buttonItem133.Image"))); - this.buttonItem133.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem133.Name = "buttonItem133"; - this.buttonItem133.SubItemsExpandWidth = 14; - this.buttonItem133.Text = "审核入库"; - this.buttonItem133.Click += new System.EventHandler(this.buttonItem133_Click_1); - // - // ribbonBar13 - // - this.ribbonBar13.AutoOverflowEnabled = true; - // - // - // - this.ribbonBar13.BackgroundMouseOverStyle.Class = ""; - this.ribbonBar13.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonBar13.BackgroundStyle.Class = ""; - this.ribbonBar13.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonBar13.ContainerControlProcessDialogKey = true; - this.ribbonBar13.Dock = System.Windows.Forms.DockStyle.Left; - this.ribbonBar13.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { - this.buttonItem127, - this.buttonItem128, - this.sliderItem1, - this.buttonItem134, - this.buttonItem130, - this.btn_check_history}); - this.ribbonBar13.Location = new System.Drawing.Point(3, 0); - this.ribbonBar13.Name = "ribbonBar13"; - this.ribbonBar13.Size = new System.Drawing.Size(528, 92); - this.ribbonBar13.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.ribbonBar13.TabIndex = 0; - // - // - // - this.ribbonBar13.TitleStyle.Class = ""; - this.ribbonBar13.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonBar13.TitleStyleMouseOver.Class = ""; - this.ribbonBar13.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonBar13.TitleVisible = false; - // - // buttonItem127 - // - this.buttonItem127.Image = ((System.Drawing.Image)(resources.GetObject("buttonItem127.Image"))); - this.buttonItem127.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem127.Name = "buttonItem127"; - this.buttonItem127.SubItemsExpandWidth = 14; - this.buttonItem127.Text = "打开数据"; - this.buttonItem127.Click += new System.EventHandler(this.buttonItem127_Click_2); - // - // buttonItem128 - // - this.buttonItem128.Image = ((System.Drawing.Image)(resources.GetObject("buttonItem128.Image"))); - this.buttonItem128.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem128.Name = "buttonItem128"; - this.buttonItem128.SubItemsExpandWidth = 14; - this.buttonItem128.Text = "一键审核"; - this.buttonItem128.Click += new System.EventHandler(this.buttonItem128_Click); - // - // sliderItem1 - // - this.sliderItem1.LabelPosition = DevComponents.DotNetBar.eSliderLabelPosition.Top; - this.sliderItem1.LabelWidth = 50; - this.sliderItem1.Name = "sliderItem1"; - this.sliderItem1.Text = "地面透明度"; - this.sliderItem1.TextColor = System.Drawing.Color.Black; - this.sliderItem1.Value = 0; - this.sliderItem1.ValueChanged += new System.EventHandler(this.sliderItem1_ValueChanged); - // - // buttonItem134 - // - this.buttonItem134.Image = ((System.Drawing.Image)(resources.GetObject("buttonItem134.Image"))); - this.buttonItem134.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem134.Name = "buttonItem134"; - this.buttonItem134.SubItemsExpandWidth = 14; - this.buttonItem134.Text = "模拟设计修改"; - this.buttonItem134.Click += new System.EventHandler(this.buttonItem134_Click_1); - // - // buttonItem130 - // - this.buttonItem130.Image = ((System.Drawing.Image)(resources.GetObject("buttonItem130.Image"))); - this.buttonItem130.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem130.Name = "buttonItem130"; - this.buttonItem130.SubItemsExpandWidth = 14; - this.buttonItem130.Text = "导出审核图"; - this.buttonItem130.Click += new System.EventHandler(this.buttonItem130_Click_1); - // - // btn_check_history - // - this.btn_check_history.Image = ((System.Drawing.Image)(resources.GetObject("btn_check_history.Image"))); - this.btn_check_history.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.btn_check_history.Name = "btn_check_history"; - this.btn_check_history.SubItemsExpandWidth = 14; - this.btn_check_history.Text = "审核历史"; - this.btn_check_history.Click += new System.EventHandler(this.btn_check_history_Click); - // - // ribbonPanel4 - // - this.ribbonPanel4.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.ribbonPanel4.Controls.Add(this.ribbonBar1); - this.ribbonPanel4.Dock = System.Windows.Forms.DockStyle.Fill; - this.ribbonPanel4.Location = new System.Drawing.Point(0, 0); - this.ribbonPanel4.Name = "ribbonPanel4"; - this.ribbonPanel4.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); - this.ribbonPanel4.Size = new System.Drawing.Size(1328, 95); - // - // - // - this.ribbonPanel4.Style.Class = ""; - this.ribbonPanel4.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonPanel4.StyleMouseDown.Class = ""; - this.ribbonPanel4.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonPanel4.StyleMouseOver.Class = ""; - this.ribbonPanel4.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonPanel4.TabIndex = 36; - this.ribbonPanel4.Visible = false; - // - // ribbonBar1 - // - this.ribbonBar1.AutoOverflowEnabled = true; - // - // - // - this.ribbonBar1.BackgroundMouseOverStyle.Class = ""; - this.ribbonBar1.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonBar1.BackgroundStyle.Class = ""; - this.ribbonBar1.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonBar1.ContainerControlProcessDialogKey = true; - this.ribbonBar1.Dock = System.Windows.Forms.DockStyle.Left; - this.ribbonBar1.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { - this.btn_document_info}); - this.ribbonBar1.Location = new System.Drawing.Point(3, 0); - this.ribbonBar1.Name = "ribbonBar1"; - this.ribbonBar1.Size = new System.Drawing.Size(88, 92); - this.ribbonBar1.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.ribbonBar1.TabIndex = 0; - // - // - // - this.ribbonBar1.TitleStyle.Class = ""; - this.ribbonBar1.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonBar1.TitleStyleMouseOver.Class = ""; - this.ribbonBar1.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonBar1.TitleVisible = false; - // - // btn_document_info - // - this.btn_document_info.Image = ((System.Drawing.Image)(resources.GetObject("btn_document_info.Image"))); - this.btn_document_info.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.btn_document_info.Name = "btn_document_info"; - this.btn_document_info.SubItemsExpandWidth = 14; - this.btn_document_info.Text = "文档管理"; - this.btn_document_info.Click += new System.EventHandler(this.btn_document_info_Click); + this.buttonItem14.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__56; + this.buttonItem14.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem14.Name = "buttonItem14"; + this.buttonItem14.SubItemsExpandWidth = 14; + this.buttonItem14.Text = "导出施工图"; + this.buttonItem14.Click += new System.EventHandler(this.buttonItem14_Click); // // ribbonPanel15 // this.ribbonPanel15.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; this.ribbonPanel15.Controls.Add(this.ribbonBar20); this.ribbonPanel15.Dock = System.Windows.Forms.DockStyle.Fill; - this.ribbonPanel15.Location = new System.Drawing.Point(0, 0); + this.ribbonPanel15.Location = new System.Drawing.Point(0, 33); this.ribbonPanel15.Name = "ribbonPanel15"; this.ribbonPanel15.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); - this.ribbonPanel15.Size = new System.Drawing.Size(1328, 95); + this.ribbonPanel15.Size = new System.Drawing.Size(1328, 62); // // // @@ -2843,7 +2465,7 @@ this.buttonItemXTGL}); this.ribbonBar20.Location = new System.Drawing.Point(3, 0); this.ribbonBar20.Name = "ribbonBar20"; - this.ribbonBar20.Size = new System.Drawing.Size(283, 92); + this.ribbonBar20.Size = new System.Drawing.Size(283, 59); this.ribbonBar20.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; this.ribbonBar20.TabIndex = 0; // @@ -3274,216 +2896,15 @@ this.buttonItemXT4_2.Text = "人员修改"; this.buttonItemXT4_2.Click += new System.EventHandler(this.buttonItemXT4_2_Click); // - // ribbonPanel3 - // - this.ribbonPanel3.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.ribbonPanel3.Controls.Add(this.ribbonBar4); - this.ribbonPanel3.Dock = System.Windows.Forms.DockStyle.Fill; - this.ribbonPanel3.Location = new System.Drawing.Point(0, 33); - this.ribbonPanel3.Name = "ribbonPanel3"; - this.ribbonPanel3.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); - this.ribbonPanel3.Size = new System.Drawing.Size(1328, 62); - // - // - // - this.ribbonPanel3.Style.Class = ""; - this.ribbonPanel3.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonPanel3.StyleMouseDown.Class = ""; - this.ribbonPanel3.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonPanel3.StyleMouseOver.Class = ""; - this.ribbonPanel3.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonPanel3.TabIndex = 40; - // - // ribbonBar4 - // - this.ribbonBar4.AutoOverflowEnabled = true; - // - // - // - this.ribbonBar4.BackgroundMouseOverStyle.Class = ""; - this.ribbonBar4.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonBar4.BackgroundStyle.Class = ""; - this.ribbonBar4.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonBar4.ContainerControlProcessDialogKey = true; - this.ribbonBar4.Dock = System.Windows.Forms.DockStyle.Left; - this.ribbonBar4.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { - this.btn_flag, - this.slider4ground}); - this.ribbonBar4.Location = new System.Drawing.Point(3, 0); - this.ribbonBar4.Name = "ribbonBar4"; - this.ribbonBar4.Size = new System.Drawing.Size(321, 59); - this.ribbonBar4.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.ribbonBar4.TabIndex = 0; - // - // - // - this.ribbonBar4.TitleStyle.Class = ""; - this.ribbonBar4.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonBar4.TitleStyleMouseOver.Class = ""; - this.ribbonBar4.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonBar4.TitleVisible = false; - // - // btn_flag - // - this.btn_flag.Image = global::Cyberpipe.Properties.Resources._24x24icon_03_hover; - this.btn_flag.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.btn_flag.Name = "btn_flag"; - this.btn_flag.SubItemsExpandWidth = 14; - this.btn_flag.Text = "标识器管理"; - this.btn_flag.Click += new System.EventHandler(this.btn_flag_Click); - // - // slider4ground - // - this.slider4ground.LabelPosition = DevComponents.DotNetBar.eSliderLabelPosition.Top; - this.slider4ground.LabelWidth = 50; - this.slider4ground.Name = "slider4ground"; - this.slider4ground.Text = "地面透明度"; - this.slider4ground.TextColor = System.Drawing.Color.Black; - this.slider4ground.Value = 0; - this.slider4ground.ValueChanged += new System.EventHandler(this.slider4ground_ValueChanged); - // - // ribbonPanel7 - // - this.ribbonPanel7.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.ribbonPanel7.Controls.Add(this.gxdw_ribbonbar); - this.ribbonPanel7.Dock = System.Windows.Forms.DockStyle.Fill; - this.ribbonPanel7.Location = new System.Drawing.Point(0, 33); - this.ribbonPanel7.Name = "ribbonPanel7"; - this.ribbonPanel7.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); - this.ribbonPanel7.Size = new System.Drawing.Size(1328, 62); - // - // - // - this.ribbonPanel7.Style.Class = ""; - this.ribbonPanel7.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonPanel7.StyleMouseDown.Class = ""; - this.ribbonPanel7.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonPanel7.StyleMouseOver.Class = ""; - this.ribbonPanel7.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonPanel7.TabIndex = 41; - this.ribbonPanel7.Visible = false; - // - // gxdw_ribbonbar - // - this.gxdw_ribbonbar.AutoOverflowEnabled = true; - // - // - // - this.gxdw_ribbonbar.BackgroundMouseOverStyle.Class = ""; - this.gxdw_ribbonbar.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.gxdw_ribbonbar.BackgroundStyle.Class = ""; - this.gxdw_ribbonbar.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.gxdw_ribbonbar.ContainerControlProcessDialogKey = true; - this.gxdw_ribbonbar.Dock = System.Windows.Forms.DockStyle.Left; - this.gxdw_ribbonbar.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { - this.buttonItem9, - this.buttonItem10, - this.buttonItem11, - this.buttonItem12, - this.buttonItem13, - this.buttonItem14}); - this.gxdw_ribbonbar.Location = new System.Drawing.Point(3, 0); - this.gxdw_ribbonbar.Name = "gxdw_ribbonbar"; - this.gxdw_ribbonbar.Size = new System.Drawing.Size(522, 59); - this.gxdw_ribbonbar.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.gxdw_ribbonbar.TabIndex = 0; - this.gxdw_ribbonbar.Text = "ribbonBar5"; - // - // - // - this.gxdw_ribbonbar.TitleStyle.Class = ""; - this.gxdw_ribbonbar.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.gxdw_ribbonbar.TitleStyleMouseOver.Class = ""; - this.gxdw_ribbonbar.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.gxdw_ribbonbar.TitleVisible = false; - // - // buttonItem9 - // - this.buttonItem9.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__76; - this.buttonItem9.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem9.Name = "buttonItem9"; - this.buttonItem9.SubItemsExpandWidth = 14; - this.buttonItem9.Text = "工单管理"; - this.buttonItem9.Click += new System.EventHandler(this.buttonItem9_Click); - // - // buttonItem10 - // - this.buttonItem10.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__69; - this.buttonItem10.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem10.Name = "buttonItem10"; - this.buttonItem10.SubItemsExpandWidth = 14; - this.buttonItem10.Text = "在线任务"; - this.buttonItem10.Click += new System.EventHandler(this.buttonItem10_Click); - // - // buttonItem11 - // - this.buttonItem11.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__72; - this.buttonItem11.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem11.Name = "buttonItem11"; - this.buttonItem11.SubItemsExpandWidth = 14; - this.buttonItem11.Text = "事件管理"; - this.buttonItem11.Click += new System.EventHandler(this.buttonItem11_Click); - // - // buttonItem12 - // - this.buttonItem12.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__34; - this.buttonItem12.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem12.Name = "buttonItem12"; - this.buttonItem12.SubItemsExpandWidth = 14; - this.buttonItem12.Text = "探测仪管理"; - this.buttonItem12.Click += new System.EventHandler(this.buttonItem12_Click); - // - // buttonItem13 - // - this.buttonItem13.Image = global::Cyberpipe.Properties.Resources._24x24icon_13_hover; - this.buttonItem13.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem13.Name = "buttonItem13"; - this.buttonItem13.SubItemsExpandWidth = 14; - this.buttonItem13.Text = "巡检人员维护"; - this.buttonItem13.Click += new System.EventHandler(this.buttonItem13_Click); - // - // buttonItem14 - // - this.buttonItem14.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__56; - this.buttonItem14.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem14.Name = "buttonItem14"; - this.buttonItem14.SubItemsExpandWidth = 14; - this.buttonItem14.Text = "导出施工图"; - this.buttonItem14.Click += new System.EventHandler(this.buttonItem14_Click); - // // ribbonPanel2 // this.ribbonPanel2.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; this.ribbonPanel2.Controls.Add(this.ribbonBar3); this.ribbonPanel2.Dock = System.Windows.Forms.DockStyle.Fill; - this.ribbonPanel2.Location = new System.Drawing.Point(0, 33); + this.ribbonPanel2.Location = new System.Drawing.Point(0, 0); this.ribbonPanel2.Name = "ribbonPanel2"; this.ribbonPanel2.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); - this.ribbonPanel2.Size = new System.Drawing.Size(1328, 62); + this.ribbonPanel2.Size = new System.Drawing.Size(1328, 95); // // // @@ -3527,7 +2948,7 @@ this.buttonItemPasswordReset}); this.ribbonBar3.Location = new System.Drawing.Point(3, 0); this.ribbonBar3.Name = "ribbonBar3"; - this.ribbonBar3.Size = new System.Drawing.Size(551, 59); + this.ribbonBar3.Size = new System.Drawing.Size(551, 92); this.ribbonBar3.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; this.ribbonBar3.TabIndex = 1; // @@ -3567,6 +2988,7 @@ this.btn_resc_info.Name = "btn_resc_info"; this.btn_resc_info.SubItemsExpandWidth = 14; this.btn_resc_info.Text = "资源管理"; + this.btn_resc_info.Visible = false; this.btn_resc_info.Click += new System.EventHandler(this.btn_resc_info_Click); // // btn_role_resc @@ -3605,6 +3027,605 @@ this.buttonItemPasswordReset.Text = "重置密码"; this.buttonItemPasswordReset.Click += new System.EventHandler(this.buttonItemPasswordReset_Click); // + // ribbonPanel6 + // + this.ribbonPanel6.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.ribbonPanel6.Controls.Add(this.ribbonBar6); + this.ribbonPanel6.Dock = System.Windows.Forms.DockStyle.Fill; + this.ribbonPanel6.Location = new System.Drawing.Point(0, 0); + this.ribbonPanel6.Name = "ribbonPanel6"; + this.ribbonPanel6.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); + this.ribbonPanel6.Size = new System.Drawing.Size(1328, 95); + // + // + // + this.ribbonPanel6.Style.Class = ""; + this.ribbonPanel6.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonPanel6.StyleMouseDown.Class = ""; + this.ribbonPanel6.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonPanel6.StyleMouseOver.Class = ""; + this.ribbonPanel6.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonPanel6.TabIndex = 38; + this.ribbonPanel6.Visible = false; + // + // ribbonBar6 + // + this.ribbonBar6.AutoOverflowEnabled = true; + // + // + // + this.ribbonBar6.BackgroundMouseOverStyle.Class = ""; + this.ribbonBar6.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonBar6.BackgroundStyle.Class = ""; + this.ribbonBar6.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar6.ContainerControlProcessDialogKey = true; + this.ribbonBar6.Dock = System.Windows.Forms.DockStyle.Left; + this.ribbonBar6.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { + this.buttonItemSPSZ, + this.buttonItem8, + this.buttonItemLocation, + this.sliderItem2, + this.buttonItemGBJC}); + this.ribbonBar6.Location = new System.Drawing.Point(3, 0); + this.ribbonBar6.Name = "ribbonBar6"; + this.ribbonBar6.Size = new System.Drawing.Size(427, 92); + this.ribbonBar6.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.ribbonBar6.TabIndex = 0; + // + // + // + this.ribbonBar6.TitleStyle.Class = ""; + this.ribbonBar6.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonBar6.TitleStyleMouseOver.Class = ""; + this.ribbonBar6.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar6.TitleVisible = false; + // + // buttonItemSPSZ + // + this.buttonItemSPSZ.Image = ((System.Drawing.Image)(resources.GetObject("buttonItemSPSZ.Image"))); + this.buttonItemSPSZ.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItemSPSZ.Name = "buttonItemSPSZ"; + this.buttonItemSPSZ.SubItemsExpandWidth = 14; + this.buttonItemSPSZ.Text = "双屏设置"; + this.buttonItemSPSZ.Click += new System.EventHandler(this.buttonItemSPSZ_Click); + // + // buttonItem8 + // + this.buttonItem8.Image = ((System.Drawing.Image)(resources.GetObject("buttonItem8.Image"))); + this.buttonItem8.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem8.Name = "buttonItem8"; + this.buttonItem8.SubItemsExpandWidth = 14; + this.buttonItem8.Text = "双屏分析"; + this.buttonItem8.Click += new System.EventHandler(this.buttonItem8_Click); + // + // buttonItemLocation + // + this.buttonItemLocation.Image = ((System.Drawing.Image)(resources.GetObject("buttonItemLocation.Image"))); + this.buttonItemLocation.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItemLocation.Name = "buttonItemLocation"; + this.buttonItemLocation.SubItemsExpandWidth = 14; + this.buttonItemLocation.Text = "快速定位"; + this.buttonItemLocation.Click += new System.EventHandler(this.buttonItemLocation_Click); + // + // sliderItem2 + // + this.sliderItem2.LabelPosition = DevComponents.DotNetBar.eSliderLabelPosition.Top; + this.sliderItem2.LabelWidth = 50; + this.sliderItem2.Name = "sliderItem2"; + this.sliderItem2.Text = "地面透明度"; + this.sliderItem2.TextColor = System.Drawing.Color.Black; + this.sliderItem2.Value = 0; + this.sliderItem2.ValueChanged += new System.EventHandler(this.sliderItem2_ValueChanged); + // + // buttonItemGBJC + // + this.buttonItemGBJC.Image = ((System.Drawing.Image)(resources.GetObject("buttonItemGBJC.Image"))); + this.buttonItemGBJC.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItemGBJC.Name = "buttonItemGBJC"; + this.buttonItemGBJC.SubItemsExpandWidth = 14; + this.buttonItemGBJC.Text = "国标检测"; + this.buttonItemGBJC.Click += new System.EventHandler(this.buttonItemGBJC_Click); + // + // ribbonPanel5 + // + this.ribbonPanel5.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.ribbonPanel5.Controls.Add(this.ribbonBar2); + this.ribbonPanel5.Dock = System.Windows.Forms.DockStyle.Fill; + this.ribbonPanel5.Location = new System.Drawing.Point(0, 33); + this.ribbonPanel5.Name = "ribbonPanel5"; + this.ribbonPanel5.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); + this.ribbonPanel5.Size = new System.Drawing.Size(1328, 62); + // + // + // + this.ribbonPanel5.Style.Class = ""; + this.ribbonPanel5.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonPanel5.StyleMouseDown.Class = ""; + this.ribbonPanel5.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonPanel5.StyleMouseOver.Class = ""; + this.ribbonPanel5.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonPanel5.TabIndex = 37; + this.ribbonPanel5.Visible = false; + // + // ribbonBar2 + // + this.ribbonBar2.AutoOverflowEnabled = true; + // + // + // + this.ribbonBar2.BackgroundMouseOverStyle.Class = ""; + this.ribbonBar2.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonBar2.BackgroundStyle.Class = ""; + this.ribbonBar2.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar2.ContainerControlProcessDialogKey = true; + this.ribbonBar2.Dock = System.Windows.Forms.DockStyle.Left; + this.ribbonBar2.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { + this.buttonItemHX1, + this.buttonItemHX2, + this.buttonItemDCTP, + this.sliderItem3}); + this.ribbonBar2.Location = new System.Drawing.Point(3, 0); + this.ribbonBar2.Name = "ribbonBar2"; + this.ribbonBar2.Size = new System.Drawing.Size(350, 59); + this.ribbonBar2.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.ribbonBar2.TabIndex = 0; + // + // + // + this.ribbonBar2.TitleStyle.Class = ""; + this.ribbonBar2.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonBar2.TitleStyleMouseOver.Class = ""; + this.ribbonBar2.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar2.TitleVisible = false; + // + // buttonItemHX1 + // + this.buttonItemHX1.AutoExpandOnClick = true; + this.buttonItemHX1.Image = ((System.Drawing.Image)(resources.GetObject("buttonItemHX1.Image"))); + this.buttonItemHX1.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItemHX1.Name = "buttonItemHX1"; + this.buttonItemHX1.SubItemsExpandWidth = 14; + this.buttonItemHX1.Text = "导入红线"; + this.buttonItemHX1.Click += new System.EventHandler(this.buttonItemHX1_Click); + // + // buttonItemHX2 + // + this.buttonItemHX2.Image = ((System.Drawing.Image)(resources.GetObject("buttonItemHX2.Image"))); + this.buttonItemHX2.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItemHX2.Name = "buttonItemHX2"; + this.buttonItemHX2.SubItemsExpandWidth = 14; + this.buttonItemHX2.Text = "红线审核"; + this.buttonItemHX2.Click += new System.EventHandler(this.buttonItemHX2_Click); + // + // buttonItemDCTP + // + this.buttonItemDCTP.Image = ((System.Drawing.Image)(resources.GetObject("buttonItemDCTP.Image"))); + this.buttonItemDCTP.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItemDCTP.Name = "buttonItemDCTP"; + this.buttonItemDCTP.SubItemsExpandWidth = 14; + this.buttonItemDCTP.Text = "导出图片"; + this.buttonItemDCTP.Click += new System.EventHandler(this.buttonItemDCTP_Click); + // + // sliderItem3 + // + this.sliderItem3.LabelPosition = DevComponents.DotNetBar.eSliderLabelPosition.Top; + this.sliderItem3.LabelWidth = 50; + this.sliderItem3.Name = "sliderItem3"; + this.sliderItem3.Text = "地面透明度"; + this.sliderItem3.TextColor = System.Drawing.Color.Black; + this.sliderItem3.Value = 0; + this.sliderItem3.ValueChanged += new System.EventHandler(this.sliderItem3_ValueChanged); + // + // ribbonPanel1 + // + this.ribbonPanel1.AutoSize = true; + this.ribbonPanel1.CanvasColor = System.Drawing.Color.Gray; + this.ribbonPanel1.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.ribbonPanel1.Controls.Add(this.ribbonBar21); + this.ribbonPanel1.Dock = System.Windows.Forms.DockStyle.Fill; + this.ribbonPanel1.Location = new System.Drawing.Point(0, 33); + this.ribbonPanel1.Name = "ribbonPanel1"; + this.ribbonPanel1.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); + this.ribbonPanel1.Size = new System.Drawing.Size(1328, 62); + // + // + // + this.ribbonPanel1.Style.Class = ""; + this.ribbonPanel1.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonPanel1.StyleMouseDown.Class = ""; + this.ribbonPanel1.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonPanel1.StyleMouseOver.Class = ""; + this.ribbonPanel1.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonPanel1.TabIndex = 1; + this.ribbonPanel1.Visible = false; + // + // ribbonBar21 + // + this.ribbonBar21.AutoOverflowEnabled = true; + this.ribbonBar21.BackColor = System.Drawing.Color.White; + // + // + // + this.ribbonBar21.BackgroundMouseOverStyle.Class = ""; + this.ribbonBar21.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonBar21.BackgroundStyle.Class = ""; + this.ribbonBar21.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar21.ContainerControlProcessDialogKey = true; + this.ribbonBar21.Dock = System.Windows.Forms.DockStyle.Left; + this.ribbonBar21.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { + this.buttonItem87, + this.buttonItem88, + this.buttonItem27, + this.sliderGroundTransSet1, + this.buttonItem91, + this.buttonItem1, + this.btnlegendSet, + this.buttonItem89, + this.btnOutputJPG}); + this.ribbonBar21.Location = new System.Drawing.Point(3, 0); + this.ribbonBar21.Name = "ribbonBar21"; + this.ribbonBar21.Size = new System.Drawing.Size(649, 59); + this.ribbonBar21.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.ribbonBar21.TabIndex = 2; + this.ribbonBar21.Text = "浏览模式"; + // + // + // + this.ribbonBar21.TitleStyle.Class = ""; + this.ribbonBar21.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonBar21.TitleStyleMouseOver.Class = ""; + this.ribbonBar21.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar21.TitleVisible = false; + // + // buttonItem87 + // + this.buttonItem87.Image = ((System.Drawing.Image)(resources.GetObject("buttonItem87.Image"))); + this.buttonItem87.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem87.Name = "buttonItem87"; + this.buttonItem87.SubItemsExpandWidth = 14; + this.buttonItem87.Text = "地上模式"; + this.buttonItem87.Click += new System.EventHandler(this.buttonItem87_Click); + // + // buttonItem88 + // + this.buttonItem88.Image = ((System.Drawing.Image)(resources.GetObject("buttonItem88.Image"))); + this.buttonItem88.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem88.Name = "buttonItem88"; + this.buttonItem88.SubItemsExpandWidth = 14; + this.buttonItem88.Text = "地下模式"; + this.buttonItem88.Click += new System.EventHandler(this.buttonItem88_Click); + // + // buttonItem27 + // + this.buttonItem27.Image = ((System.Drawing.Image)(resources.GetObject("buttonItem27.Image"))); + this.buttonItem27.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem27.Name = "buttonItem27"; + this.buttonItem27.SubItemsExpandWidth = 14; + this.buttonItem27.Text = "行走模式"; + this.buttonItem27.Click += new System.EventHandler(this.buttonItem27_Click); + // + // buttonItem91 + // + this.buttonItem91.ForeColor = System.Drawing.Color.Black; + this.buttonItem91.Image = ((System.Drawing.Image)(resources.GetObject("buttonItem91.Image"))); + this.buttonItem91.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem91.Name = "buttonItem91"; + this.buttonItem91.SubItemsExpandWidth = 14; + this.buttonItem91.Text = "快速定位"; + this.buttonItem91.Click += new System.EventHandler(this.buttonItem91_Click); + // + // buttonItem1 + // + this.buttonItem1.Image = ((System.Drawing.Image)(resources.GetObject("buttonItem1.Image"))); + this.buttonItem1.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem1.Name = "buttonItem1"; + this.buttonItem1.SubItemsExpandWidth = 14; + this.buttonItem1.Text = "图层管理"; + this.buttonItem1.Click += new System.EventHandler(this.buttonItem1_Click); + // + // btnlegendSet + // + this.btnlegendSet.Image = ((System.Drawing.Image)(resources.GetObject("btnlegendSet.Image"))); + this.btnlegendSet.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.btnlegendSet.Name = "btnlegendSet"; + this.btnlegendSet.SubItemsExpandWidth = 14; + this.btnlegendSet.Text = "图例"; + this.btnlegendSet.Click += new System.EventHandler(this.btnlegendSet_Click); + // + // buttonItem89 + // + this.buttonItem89.Image = ((System.Drawing.Image)(resources.GetObject("buttonItem89.Image"))); + this.buttonItem89.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem89.Name = "buttonItem89"; + this.buttonItem89.SubItemsExpandWidth = 14; + this.buttonItem89.Text = "全屏显示"; + this.buttonItem89.Click += new System.EventHandler(this.buttonItem89_Click); + // + // btnOutputJPG + // + this.btnOutputJPG.Image = ((System.Drawing.Image)(resources.GetObject("btnOutputJPG.Image"))); + this.btnOutputJPG.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.btnOutputJPG.Name = "btnOutputJPG"; + this.btnOutputJPG.SubItemsExpandWidth = 14; + this.btnOutputJPG.Text = "导出图片"; + this.btnOutputJPG.Click += new System.EventHandler(this.btnOutputJPG_Click); + // + // ribbonPanel12 + // + this.ribbonPanel12.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.ribbonPanel12.Controls.Add(this.ribbonBar18); + this.ribbonPanel12.Controls.Add(this.ribbonBar13); + this.ribbonPanel12.Dock = System.Windows.Forms.DockStyle.Fill; + this.ribbonPanel12.Location = new System.Drawing.Point(0, 33); + this.ribbonPanel12.Name = "ribbonPanel12"; + this.ribbonPanel12.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); + this.ribbonPanel12.Size = new System.Drawing.Size(1328, 62); + // + // + // + this.ribbonPanel12.Style.Class = ""; + this.ribbonPanel12.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonPanel12.StyleMouseDown.Class = ""; + this.ribbonPanel12.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonPanel12.StyleMouseOver.Class = ""; + this.ribbonPanel12.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonPanel12.TabIndex = 34; + this.ribbonPanel12.Visible = false; + // + // ribbonBar18 + // + this.ribbonBar18.AutoOverflowEnabled = true; + // + // + // + this.ribbonBar18.BackgroundMouseOverStyle.Class = ""; + this.ribbonBar18.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonBar18.BackgroundStyle.Class = ""; + this.ribbonBar18.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar18.ContainerControlProcessDialogKey = true; + this.ribbonBar18.Dock = System.Windows.Forms.DockStyle.Left; + this.ribbonBar18.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { + this.buttonItem133, + this.buttonItem132}); + this.ribbonBar18.Location = new System.Drawing.Point(508, 0); + this.ribbonBar18.Name = "ribbonBar18"; + this.ribbonBar18.Size = new System.Drawing.Size(75, 59); + this.ribbonBar18.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.ribbonBar18.TabIndex = 1; + // + // + // + this.ribbonBar18.TitleStyle.Class = ""; + this.ribbonBar18.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonBar18.TitleStyleMouseOver.Class = ""; + this.ribbonBar18.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar18.TitleVisible = false; + // + // buttonItem133 + // + this.buttonItem133.Image = ((System.Drawing.Image)(resources.GetObject("buttonItem133.Image"))); + this.buttonItem133.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem133.Name = "buttonItem133"; + this.buttonItem133.SubItemsExpandWidth = 14; + this.buttonItem133.Text = "审核入库"; + this.buttonItem133.Click += new System.EventHandler(this.buttonItem133_Click_1); + // + // buttonItem132 + // + this.buttonItem132.Name = "buttonItem132"; + // + // ribbonBar13 + // + this.ribbonBar13.AutoOverflowEnabled = true; + // + // + // + this.ribbonBar13.BackgroundMouseOverStyle.Class = ""; + this.ribbonBar13.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonBar13.BackgroundStyle.Class = ""; + this.ribbonBar13.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar13.ContainerControlProcessDialogKey = true; + this.ribbonBar13.Dock = System.Windows.Forms.DockStyle.Left; + this.ribbonBar13.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { + this.buttonItem127, + this.buttonItem128, + this.sliderItem1, + this.buttonItem134, + this.buttonItem130, + this.btn_check_history}); + this.ribbonBar13.Location = new System.Drawing.Point(3, 0); + this.ribbonBar13.Name = "ribbonBar13"; + this.ribbonBar13.Size = new System.Drawing.Size(505, 59); + this.ribbonBar13.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.ribbonBar13.TabIndex = 0; + // + // + // + this.ribbonBar13.TitleStyle.Class = ""; + this.ribbonBar13.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonBar13.TitleStyleMouseOver.Class = ""; + this.ribbonBar13.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar13.TitleVisible = false; + // + // buttonItem127 + // + this.buttonItem127.Image = ((System.Drawing.Image)(resources.GetObject("buttonItem127.Image"))); + this.buttonItem127.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem127.Name = "buttonItem127"; + this.buttonItem127.SubItemsExpandWidth = 14; + this.buttonItem127.Text = "打开数据"; + this.buttonItem127.Click += new System.EventHandler(this.buttonItem127_Click_2); + // + // buttonItem128 + // + this.buttonItem128.Image = ((System.Drawing.Image)(resources.GetObject("buttonItem128.Image"))); + this.buttonItem128.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem128.Name = "buttonItem128"; + this.buttonItem128.SubItemsExpandWidth = 14; + this.buttonItem128.Text = "一键审核"; + this.buttonItem128.Click += new System.EventHandler(this.buttonItem128_Click); + // + // sliderItem1 + // + this.sliderItem1.LabelPosition = DevComponents.DotNetBar.eSliderLabelPosition.Top; + this.sliderItem1.LabelWidth = 50; + this.sliderItem1.Name = "sliderItem1"; + this.sliderItem1.Text = "地面透明度"; + this.sliderItem1.TextColor = System.Drawing.Color.Black; + this.sliderItem1.Value = 0; + this.sliderItem1.ValueChanged += new System.EventHandler(this.sliderItem1_ValueChanged); + // + // buttonItem134 + // + this.buttonItem134.Image = ((System.Drawing.Image)(resources.GetObject("buttonItem134.Image"))); + this.buttonItem134.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem134.Name = "buttonItem134"; + this.buttonItem134.SubItemsExpandWidth = 14; + this.buttonItem134.Text = "模拟设计修改"; + this.buttonItem134.Click += new System.EventHandler(this.buttonItem134_Click_1); + // + // buttonItem130 + // + this.buttonItem130.Image = ((System.Drawing.Image)(resources.GetObject("buttonItem130.Image"))); + this.buttonItem130.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem130.Name = "buttonItem130"; + this.buttonItem130.SubItemsExpandWidth = 14; + this.buttonItem130.Text = "导出审核图"; + this.buttonItem130.Click += new System.EventHandler(this.buttonItem130_Click_1); + // + // btn_check_history + // + this.btn_check_history.Image = ((System.Drawing.Image)(resources.GetObject("btn_check_history.Image"))); + this.btn_check_history.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.btn_check_history.Name = "btn_check_history"; + this.btn_check_history.SubItemsExpandWidth = 14; + this.btn_check_history.Text = "审核历史"; + this.btn_check_history.Click += new System.EventHandler(this.btn_check_history_Click); + // + // ribbonPanel4 + // + this.ribbonPanel4.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.ribbonPanel4.Controls.Add(this.ribbonBar1); + this.ribbonPanel4.Dock = System.Windows.Forms.DockStyle.Fill; + this.ribbonPanel4.Location = new System.Drawing.Point(0, 33); + this.ribbonPanel4.Name = "ribbonPanel4"; + this.ribbonPanel4.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); + this.ribbonPanel4.Size = new System.Drawing.Size(1328, 62); + // + // + // + this.ribbonPanel4.Style.Class = ""; + this.ribbonPanel4.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonPanel4.StyleMouseDown.Class = ""; + this.ribbonPanel4.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonPanel4.StyleMouseOver.Class = ""; + this.ribbonPanel4.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonPanel4.TabIndex = 36; + this.ribbonPanel4.Visible = false; + // + // ribbonBar1 + // + this.ribbonBar1.AutoOverflowEnabled = true; + // + // + // + this.ribbonBar1.BackgroundMouseOverStyle.Class = ""; + this.ribbonBar1.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonBar1.BackgroundStyle.Class = ""; + this.ribbonBar1.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar1.ContainerControlProcessDialogKey = true; + this.ribbonBar1.Dock = System.Windows.Forms.DockStyle.Left; + this.ribbonBar1.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { + this.btn_document_info}); + this.ribbonBar1.Location = new System.Drawing.Point(3, 0); + this.ribbonBar1.Name = "ribbonBar1"; + this.ribbonBar1.Size = new System.Drawing.Size(88, 59); + this.ribbonBar1.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.ribbonBar1.TabIndex = 0; + // + // + // + this.ribbonBar1.TitleStyle.Class = ""; + this.ribbonBar1.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonBar1.TitleStyleMouseOver.Class = ""; + this.ribbonBar1.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar1.TitleVisible = false; + // + // btn_document_info + // + this.btn_document_info.Image = ((System.Drawing.Image)(resources.GetObject("btn_document_info.Image"))); + this.btn_document_info.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.btn_document_info.Name = "btn_document_info"; + this.btn_document_info.SubItemsExpandWidth = 14; + this.btn_document_info.Text = "文档管理"; + this.btn_document_info.Click += new System.EventHandler(this.btn_document_info_Click); + // // ribbonTabItem1 // this.ribbonTabItem1.ButtonStyle = DevComponents.DotNetBar.eButtonStyle.ImageAndText; @@ -3673,7 +3694,6 @@ this.ribbonTabItem7.Name = "ribbonTabItem7"; this.ribbonTabItem7.Panel = this.ribbonPanel7; this.ribbonTabItem7.Text = "管线定位"; - this.ribbonTabItem7.MouseDown += new System.Windows.Forms.MouseEventHandler(this.ribbonTabItem7_MouseDown); // // ribbonTabItem5 // @@ -3684,7 +3704,6 @@ this.ribbonTabItem5.Name = "ribbonTabItem5"; this.ribbonTabItem5.Panel = this.ribbonPanel3; this.ribbonTabItem5.Text = "标识器管理"; - this.ribbonTabItem5.MouseDown += new System.Windows.Forms.MouseEventHandler(this.ribbonTabItem5_MouseDown); // // ribbonTabItem2 // @@ -4451,7 +4470,7 @@ this.dataGridViewX2.ReadOnly = true; this.dataGridViewX2.RowHeadersVisible = false; this.dataGridViewX2.RowTemplate.Height = 23; - this.dataGridViewX2.Size = new System.Drawing.Size(31081, 92); + this.dataGridViewX2.Size = new System.Drawing.Size(31378, 92); this.dataGridViewX2.TabIndex = 11; // // dataGridViewTextBoxColumn10 @@ -4545,7 +4564,7 @@ this.dataGridViewX3.ReadOnly = true; this.dataGridViewX3.RowHeadersVisible = false; this.dataGridViewX3.RowTemplate.Height = 23; - this.dataGridViewX3.Size = new System.Drawing.Size(31080, 127); + this.dataGridViewX3.Size = new System.Drawing.Size(31377, 127); this.dataGridViewX3.TabIndex = 5; this.dataGridViewX3.MouseDoubleClick += new System.Windows.Forms.MouseEventHandler(this.dataGridViewX3_MouseDoubleClick); // @@ -5722,7 +5741,8 @@ // pictureBox1 // this.pictureBox1.Dock = System.Windows.Forms.DockStyle.Top; - this.pictureBox1.Image = ((System.Drawing.Image)(resources.GetObject("pictureBox1.Image"))); +// this.pictureBox1.Image = ((System.Drawing.Image)(resources.GetObject("pictureBox1.Image"))); + this.pictureBox1.Image = Image.FromFile(Application.StartupPath + Utility.TitleImagePath); this.pictureBox1.Location = new System.Drawing.Point(0, 0); this.pictureBox1.Margin = new System.Windows.Forms.Padding(0); this.pictureBox1.Name = "pictureBox1"; @@ -5732,18 +5752,6 @@ this.pictureBox1.TabStop = false; this.pictureBox1.Paint += new System.Windows.Forms.PaintEventHandler(this.pictureBox1_Paint); // - // layerTree - // - this.layerTree.CheckBoxes = true; - this.layerTree.ItemHeight = 18; - this.layerTree.Location = new System.Drawing.Point(30, 78); - this.layerTree.Name = "layerTree"; - this.layerTree.Size = new System.Drawing.Size(121, 97); - this.layerTree.TabIndex = 1; - this.layerTree.AfterCheck += new System.Windows.Forms.TreeViewEventHandler(this.layerTree_AfterCheck); - this.layerTree.NodeMouseClick += new System.Windows.Forms.TreeNodeMouseClickEventHandler(this.layerTree_NodeMouseClick); - this.layerTree.NodeMouseDoubleClick += new System.Windows.Forms.TreeNodeMouseClickEventHandler(this.layerTree_NodeMouseDoubleClick); - // // MainFrm // this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Inherit; @@ -5770,7 +5778,8 @@ this.KeyPreview = true; this.Name = "MainFrm"; this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen; - this.Text = "智慧太湖新城管网规划分析系统6.0"; +// this.Text = "智慧太湖新城管网规划分析系统6.0"; + this.Text = Utility.SysnameVersion; this.WindowState = System.Windows.Forms.FormWindowState.Maximized; this.FormClosing += new System.Windows.Forms.FormClosingEventHandler(this.MainFrm_FormClosing); this.Load += new System.EventHandler(this.MainFrm_Load); @@ -5787,15 +5796,15 @@ this.contextMenuStripDeleteLayerNode.ResumeLayout(false); this.ribbonControl1.ResumeLayout(false); this.ribbonControl1.PerformLayout(); + this.ribbonPanel3.ResumeLayout(false); + this.ribbonPanel7.ResumeLayout(false); + this.ribbonPanel15.ResumeLayout(false); + this.ribbonPanel2.ResumeLayout(false); this.ribbonPanel6.ResumeLayout(false); this.ribbonPanel5.ResumeLayout(false); this.ribbonPanel1.ResumeLayout(false); this.ribbonPanel12.ResumeLayout(false); this.ribbonPanel4.ResumeLayout(false); - this.ribbonPanel15.ResumeLayout(false); - this.ribbonPanel3.ResumeLayout(false); - this.ribbonPanel7.ResumeLayout(false); - this.ribbonPanel2.ResumeLayout(false); this.panelOfTable.ResumeLayout(false); this.panelOfTable.PerformLayout(); ((System.ComponentModel.ISupportInitialize)(this.dataGridViewX1)).EndInit(); @@ -5955,6 +5964,7 @@ private RibbonTabItem ribbonTabItem11; private ButtonItem buttonItem130; private RibbonBar ribbonBar18; + private ButtonItem buttonItem132; private SliderItem sliderItem1; private ButtonItem buttonItem133; private ButtonItem buttonItem134; diff --git a/MainFrm.resx b/MainFrm.resx index 9f9bba4..ce490c1 100644 --- a/MainFrm.resx +++ b/MainFrm.resx @@ -351,6 +351,146 @@ 766, 54 + + + iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 + YQUAAAAZdEVYdFNvZnR3YXJlAEFkb2JlIEltYWdlUmVhZHlxyWU8AAADZmlUWHRYTUw6Y29tLmFkb2Jl + LnhtcAAAAAAAPD94cGFja2V0IGJlZ2luPSLvu78iIGlkPSJXNU0wTXBDZWhpSHpyZVN6TlRjemtjOWQi + Pz4gPHg6eG1wbWV0YSB4bWxuczp4PSJhZG9iZTpuczptZXRhLyIgeDp4bXB0az0iQWRvYmUgWE1QIENv + cmUgNS4zLWMwMTEgNjYuMTQ1NjYxLCAyMDEyLzAyLzA2LTE0OjU2OjI3ICAgICAgICAiPiA8cmRmOlJE + RiB4bWxuczpyZGY9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkvMDIvMjItcmRmLXN5bnRheC1ucyMiPiA8 + cmRmOkRlc2NyaXB0aW9uIHJkZjphYm91dD0iIiB4bWxuczp4bXBNTT0iaHR0cDovL25zLmFkb2JlLmNv + bS94YXAvMS4wL21tLyIgeG1sbnM6c3RSZWY9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlw + ZS9SZXNvdXJjZVJlZiMiIHhtbG5zOnhtcD0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wLyIgeG1w + TU06T3JpZ2luYWxEb2N1bWVudElEPSJ4bXAuZGlkOjYzQTM5NEY4Mjg0OUU0MTE5NDBEQTc4ODZEQzk5 + N0NGIiB4bXBNTTpEb2N1bWVudElEPSJ4bXAuZGlkOjEwQ0IxNzBBNEM1QzExRTRBNkNGQzRBMjhDQzI0 + MkY4IiB4bXBNTTpJbnN0YW5jZUlEPSJ4bXAuaWlkOjEwQ0IxNzA5NEM1QzExRTRBNkNGQzRBMjhDQzI0 + MkY4IiB4bXA6Q3JlYXRvclRvb2w9IkFkb2JlIFBob3Rvc2hvcCBDUzYgKFdpbmRvd3MpIj4gPHhtcE1N + OkRlcml2ZWRGcm9tIHN0UmVmOmluc3RhbmNlSUQ9InhtcC5paWQ6NTEzMDNDMjA1QjRDRTQxMTg4NERE + MUVBOEQ4QTgyNTUiIHN0UmVmOmRvY3VtZW50SUQ9InhtcC5kaWQ6NjNBMzk0RjgyODQ5RTQxMTk0MERB + Nzg4NkRDOTk3Q0YiLz4gPC9yZGY6RGVzY3JpcHRpb24+IDwvcmRmOlJERj4gPC94OnhtcG1ldGE+IDw/ + eHBhY2tldCBlbmQ9InIiPz43wa2/AAAFaUlEQVRIS6WUC0xTVxzGKy0UkSmlFGjBFilSkNpSaAWRh63y + sIiAArKs4spLRLQoiEJlSMGoMCc6CBOnYHzMOHUqqOhEHOqCbjNu6kCd6KYje5mZ6KbObd/OuVL3cEzj + /skv997/+b7v39PTW9aj3/BM+OKxPEIZoW/gyrOuPbP+GvRPSNBQQqXYLwSW1etw7cYt5kqfaZ+uD8QM + Xg8f/f4UxGhHMHv4qlG6vAb9394G6T+BPpdV1oCuUx3VD8Q9XT8//PUJRMghlLhLg1C41IK+r/pB+oNC + 16mO6qmP+gdi/6y793+hwTYEk9uoQOSaStHzxQ2Q/nND9XMKy0D9NIfmDcSzaLhI4KXE7LwinLtwGXfu + PXhhqJ/m0DyS62EdUGWpqcf3P97DD3d++t/QnKraBjpghXWAiC+WN0ZNScOe1mP45vbdF2ZvWwdoDs/D + b6ejs6ecxHPoAG/l+Fhkzy+FyCcY0YkG7D/yAW5+d+e5oXrqo36aQ/McnNyjyAAuHWA05pfgzPlehhyT + mflV6FOMaDt2Ctf7bw8KXac6qqc+a4Zx3hLwRLJCZgcJjcPIEPkyIZmeX1SB7vOX0dn9KQy5jw8r8eVc + HOrsxidXP0d9hxlzd4QgeYMzEt7kQVvOR0pFFNpOHmd81E9znIS+dSTc1foVGWfNKUZjyy6Ex6SQl0cD + 09IVxHAFh0+cReqr+QjK8ERqEw+VHWOwoycSR/v1OHwzDlsvhcNCeqkbedAYxQiPm87kZOQVw0nkW0QG + 2DFnIA+JRm3DFpzr/RKNW3ZDE5UAsX8ocizZiFs7DEUHvPFunw4Hb05B+y09jn49lYHe0x5doxqqLVlf + DJrnyB+pIQNs6QAhf6R8tZu3CqpwPdZu2I6PLl3HwnV5iHv9JVSeUOKdqzq81xeDvddiYG73R0aLEIZm + IRa1jUbjxQnYRHa17YqW0VJPwHT3LocRbirrDiymspXo6L6AgiXV8JSNQ2i6GpNWOqK4U4n1n0Vge68W + 9ecmIKnBBSqDCIp4P2RWGDB/QxqS6l1QcToIld3BqDobgsXEQ73+Se5HrGcgdJEokGzIx66DXXi7dRvC + yx2Q2RqApR+GoPbjCag8pUZ6sxjqWRKEldljRr07ZjaKmHt5qpBZKzkeiIJ2BbIPKmA8MIbJUC/ghrM0 + RfYsDtdhqJNIVulK/ku0BQokbfZGZrsKBR3BmEsMOfvl0FY7o7ypDPo1brCcGc+QUCdExabXEFsjQO4B + ObL2BSBlqx8SWwibvBE0334nK3Ael+yEbIW81DZszlhZ2oieuAYvpO5VIHGzP9J2+CN9pz/CzDwExMox + eZUbFnZpkEc+gLZagJjMWOiqXZDVqmC0+kZf6Nb4IHKFCPIsu92sgCw7BlJswjBJLCdenmuPyFUS6Gp9 + oG/yRdJWGSKqhYjKDgLRImK5ACGlzsy9d/zwXn2DBMZDSkZLPaHlnpBncyGO5kxj+Rps/wYdJE2xzfOb + zcU4sye0b0gRu3E0Ypt8ELTICRFGNcShUgjHuZyWxNu2096sdiXS9o1ltNQjyyDhes4SkuXEGpXC+Ve8 + kjlzpDPtoCkVQrdOihgyIHmXP6LryGEX86Ba6ISJNR7IeF+JV8gAfbOM0XoTj8dktpmEOxM4rJHTBscz + njNNnMiBagEfU98ajRnbZMg7GojCk2oGU1cw5nUGw7BHAZWJD6oVhLFzSDCPCacljGP/J7xAm6Hu0ew6 + STIXkcvckN7ig8XHVCjvUiNvdwAmW0Twms6FayS7meM4REoihxPoeT4u10nsZ0LKhhdsIxZEsVcLtOyL + pHffVcd+IJjI7uGHsRscJEPURMMn2FMtNTwuFusPrjFl48ji7nIAAAAASUVORK5CYII= + + + + + iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 + YQUAAAAZdEVYdFNvZnR3YXJlAEFkb2JlIEltYWdlUmVhZHlxyWU8AAADZmlUWHRYTUw6Y29tLmFkb2Jl + LnhtcAAAAAAAPD94cGFja2V0IGJlZ2luPSLvu78iIGlkPSJXNU0wTXBDZWhpSHpyZVN6TlRjemtjOWQi + Pz4gPHg6eG1wbWV0YSB4bWxuczp4PSJhZG9iZTpuczptZXRhLyIgeDp4bXB0az0iQWRvYmUgWE1QIENv + cmUgNS4zLWMwMTEgNjYuMTQ1NjYxLCAyMDEyLzAyLzA2LTE0OjU2OjI3ICAgICAgICAiPiA8cmRmOlJE + RiB4bWxuczpyZGY9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkvMDIvMjItcmRmLXN5bnRheC1ucyMiPiA8 + cmRmOkRlc2NyaXB0aW9uIHJkZjphYm91dD0iIiB4bWxuczp4bXBNTT0iaHR0cDovL25zLmFkb2JlLmNv + bS94YXAvMS4wL21tLyIgeG1sbnM6c3RSZWY9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlw + ZS9SZXNvdXJjZVJlZiMiIHhtbG5zOnhtcD0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wLyIgeG1w + TU06T3JpZ2luYWxEb2N1bWVudElEPSJ4bXAuZGlkOjYzQTM5NEY4Mjg0OUU0MTE5NDBEQTc4ODZEQzk5 + N0NGIiB4bXBNTTpEb2N1bWVudElEPSJ4bXAuZGlkOkUyMTg3NjEyNDlEODExRTQ4NjNGQjM2Mzk1QkNB + RkQwIiB4bXBNTTpJbnN0YW5jZUlEPSJ4bXAuaWlkOkUyMTg3NjExNDlEODExRTQ4NjNGQjM2Mzk1QkNB + RkQwIiB4bXA6Q3JlYXRvclRvb2w9IkFkb2JlIFBob3Rvc2hvcCBDUzYgKFdpbmRvd3MpIj4gPHhtcE1N + OkRlcml2ZWRGcm9tIHN0UmVmOmluc3RhbmNlSUQ9InhtcC5paWQ6NkJCNTE0NDlEODQ5RTQxMUE0QzNB + MjdEOTJBQzc3QkMiIHN0UmVmOmRvY3VtZW50SUQ9InhtcC5kaWQ6NjNBMzk0RjgyODQ5RTQxMTk0MERB + Nzg4NkRDOTk3Q0YiLz4gPC9yZGY6RGVzY3JpcHRpb24+IDwvcmRmOlJERj4gPC94OnhtcG1ldGE+IDw/ + eHBhY2tldCBlbmQ9InIiPz5e5MstAAADiUlEQVRIS+2UW0yTdxjGcePwtYyVVpAUCi1tv9ImrVbxhAei + kjGphAgFT4jzEJ0gGuJhDk0sml0sglmWmC1hqHNKWwI4srgNh3phpjg1O1yIN5DMbFHQZUu42O76+D4f + 3Fl6Z7ILn+SXvH3f533++X/98iUBeKW81v9Uwx1G1+1240EhfKfdeE/4U3qTAqaZZO/2aeN9IXLrY+Ph + wVOZHll9YyohgYZOGS4JsYdXVDy+NQ8Tvy3BP6OlmPyjDP9OBDRYs8cZPfRy5/uQISIRqcIsLSye+j7I + wN+PluOvhyWY+NmL8fsOjP9kxdN7BRh/YJHfFjy5m48nd4ThQjy968bEgwV49usicFciTEKKFhZPXXv1 + eHxtLsYGPBjttwsWjF0xY+ybOfj9uylYs8cZPfQS7kpEnqDTwuLp9GYlfKZeifUfzcb1j/Iw/IkNv3Q6 + MfKVC6O9bg3W7HFGD73cORlMG5AIizDzAaVtunD5ESXWfNSEY/tNCO00oG1zOkJBBSeqUjVYh6R3Qmat + zSY0Hjah7IASW7hPuSoRvIGihcVTSauCppvFODRUjJZvPWgaKMTuXgt2RHOxLTwHDd3EjPfCudgesWJX + jxM7eryo7/Ni8SGFj8gp6LWwePLvS0Og043A5y5UdtkQOJeLivM5ePf8bJSfM04zG2u7chDoysW6Thsq + zqpY0+GAvymNB/gEgxYWT64tKdGihpSYv8WEpSEzVp0pwDuf2SVQReCiS4M1e5zRQy937NXJ1yRirjDz + AVmVJyNZa9+PObauh7ptKdR6FY6N2SisTYe1OlmDNXtqvRNqwxLYt1TCVLY1ZijZOSQRbuEtLSyeTOXH + sfLDH1EauoFFx6/Cd6Qf7pYI1ObLsO+9iMLdF+DccwEuqd2Nl+Br6sbCxiiKd/XBuPogH1HiAzJXHMC8 + YA98td1wb4rCuaEH1roo8oMR5JGaMPIFa10Ejtowiuouw1vzJTwVXyBz+X4ekPgRZfgbohkLtsfMy47B + tqYdakUnPFUM6YUv+LUGa/Y4o8e8rBXcSffWDkpE4j9ZpEvNmb9KsZV16BzrBnVq1YjeVf1MX1Tzn74o + iCmkdq1/LrNHOkfgB6Vg9afJRrVOdv2ClRkMmklvCnyPs4V8ge81v5RegddnCGHNHmf00JslcJcZCcWv + IU1pAhcyhLcFXj1zGtbscUYPvdyZ+Uv6Wi8rKekFBjoX2627by8AAAAASUVORK5CYII= + + + + + iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 + YQUAAAAZdEVYdFNvZnR3YXJlAEFkb2JlIEltYWdlUmVhZHlxyWU8AAADZmlUWHRYTUw6Y29tLmFkb2Jl + LnhtcAAAAAAAPD94cGFja2V0IGJlZ2luPSLvu78iIGlkPSJXNU0wTXBDZWhpSHpyZVN6TlRjemtjOWQi + Pz4gPHg6eG1wbWV0YSB4bWxuczp4PSJhZG9iZTpuczptZXRhLyIgeDp4bXB0az0iQWRvYmUgWE1QIENv + cmUgNS4zLWMwMTEgNjYuMTQ1NjYxLCAyMDEyLzAyLzA2LTE0OjU2OjI3ICAgICAgICAiPiA8cmRmOlJE + RiB4bWxuczpyZGY9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkvMDIvMjItcmRmLXN5bnRheC1ucyMiPiA8 + cmRmOkRlc2NyaXB0aW9uIHJkZjphYm91dD0iIiB4bWxuczp4bXBNTT0iaHR0cDovL25zLmFkb2JlLmNv + bS94YXAvMS4wL21tLyIgeG1sbnM6c3RSZWY9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlw + ZS9SZXNvdXJjZVJlZiMiIHhtbG5zOnhtcD0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wLyIgeG1w + TU06T3JpZ2luYWxEb2N1bWVudElEPSJ4bXAuZGlkOjYzQTM5NEY4Mjg0OUU0MTE5NDBEQTc4ODZEQzk5 + N0NGIiB4bXBNTTpEb2N1bWVudElEPSJ4bXAuZGlkOkE2Q0VGMDE2NDlEQTExRTQ4NTlCQTI3NTMyOEY5 + NEU2IiB4bXBNTTpJbnN0YW5jZUlEPSJ4bXAuaWlkOkE2Q0VGMDE1NDlEQTExRTQ4NTlCQTI3NTMyOEY5 + NEU2IiB4bXA6Q3JlYXRvclRvb2w9IkFkb2JlIFBob3Rvc2hvcCBDUzYgKFdpbmRvd3MpIj4gPHhtcE1N + OkRlcml2ZWRGcm9tIHN0UmVmOmluc3RhbmNlSUQ9InhtcC5paWQ6NjA1MjM3NzFEOTQ5RTQxMUE0QzNB + MjdEOTJBQzc3QkMiIHN0UmVmOmRvY3VtZW50SUQ9InhtcC5kaWQ6NjNBMzk0RjgyODQ5RTQxMTk0MERB + Nzg4NkRDOTk3Q0YiLz4gPC9yZGY6RGVzY3JpcHRpb24+IDwvcmRmOlJERj4gPC94OnhtcG1ldGE+IDw/ + eHBhY2tldCBlbmQ9InIiPz6UH16BAAABrElEQVRIS63N70tTURzH8fsnKSGCCEIQCBKISMq2iILCgQOL + JUxQAoVKdMGQuwgWFepsMGjFZCMuorsIJV4WFatpvzdr1ZAFsaIHn8559v1eDsI91wevJ/ee7/tjbMRH + fAFwJOWRF6oopTzyQhWlVEdBwRbgUhICAnuvilKGtXDGzW6WV/CvbjE/xTfxr+R6q4xSxtP5YTf8rVn4 + s5dG+809Rv5zvVVGKaNwfYgyBfhksoH83CCF9seiL7LBBnLXTlP4/W4dza0ZLS0nCdlgA9npAQq/qk/Q + sKa0NJ8nIBtsIBPrp9CqPMJBYVLLj+04ZIMNrF49ReHwVRafH1/R8m3zJmSDDdy/fJJC88Ua3mcjWurW + LGSDDaQifRS+O8uopsNaPhVnIBts4E64l0Jj5y4qDy5q+ZCPQTbYgHmph8LXZ0m8TJ3Xsp+LQjbYQOJC + N4XadgLl22e1vM1OQDbYwK1zXRS+lBbhmEHsLgU8kTeVh+OQDTawEDpB2U4mitfpMS22GYJssIH5QCcV + FGwBmuRtkA3cGO3whcZUlEdeqKKU8sgLVZRSfjw+MP4DJ2GPpDR9OIsAAAAASUVORK5CYII= + + + + + iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 + YQUAAAAZdEVYdFNvZnR3YXJlAEFkb2JlIEltYWdlUmVhZHlxyWU8AAADZmlUWHRYTUw6Y29tLmFkb2Jl + LnhtcAAAAAAAPD94cGFja2V0IGJlZ2luPSLvu78iIGlkPSJXNU0wTXBDZWhpSHpyZVN6TlRjemtjOWQi + Pz4gPHg6eG1wbWV0YSB4bWxuczp4PSJhZG9iZTpuczptZXRhLyIgeDp4bXB0az0iQWRvYmUgWE1QIENv + cmUgNS4zLWMwMTEgNjYuMTQ1NjYxLCAyMDEyLzAyLzA2LTE0OjU2OjI3ICAgICAgICAiPiA8cmRmOlJE + RiB4bWxuczpyZGY9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkvMDIvMjItcmRmLXN5bnRheC1ucyMiPiA8 + cmRmOkRlc2NyaXB0aW9uIHJkZjphYm91dD0iIiB4bWxuczp4bXBNTT0iaHR0cDovL25zLmFkb2JlLmNv + bS94YXAvMS4wL21tLyIgeG1sbnM6c3RSZWY9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlw + ZS9SZXNvdXJjZVJlZiMiIHhtbG5zOnhtcD0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wLyIgeG1w + TU06T3JpZ2luYWxEb2N1bWVudElEPSJ4bXAuZGlkOjYzQTM5NEY4Mjg0OUU0MTE5NDBEQTc4ODZEQzk5 + N0NGIiB4bXBNTTpEb2N1bWVudElEPSJ4bXAuZGlkOjJGRTU5OEQ1NDlEQjExRTRBRUVDOTkyMjQ5NzEw + REUwIiB4bXBNTTpJbnN0YW5jZUlEPSJ4bXAuaWlkOjJGRTU5OEQ0NDlEQjExRTRBRUVDOTkyMjQ5NzEw + REUwIiB4bXA6Q3JlYXRvclRvb2w9IkFkb2JlIFBob3Rvc2hvcCBDUzYgKFdpbmRvd3MpIj4gPHhtcE1N + OkRlcml2ZWRGcm9tIHN0UmVmOmluc3RhbmNlSUQ9InhtcC5paWQ6MTY0MkI1RjlEQTQ5RTQxMUE0QzNB + MjdEOTJBQzc3QkMiIHN0UmVmOmRvY3VtZW50SUQ9InhtcC5kaWQ6NjNBMzk0RjgyODQ5RTQxMTk0MERB + Nzg4NkRDOTk3Q0YiLz4gPC9yZGY6RGVzY3JpcHRpb24+IDwvcmRmOlJERj4gPC94OnhtcG1ldGE+IDw/ + eHBhY2tldCBlbmQ9InIiPz6B5sF9AAACe0lEQVRIS7WVb2jMcRzHL7UHanF/Mts5prE/1li3kAfu5Ak7 + 5IHNobBkSC2UIuGJkrrSWRvTmHQWK8U1T8jqUtYwkZpaGjV/Js6to5YwfXze39+fu/v23f36hXe9us+f + 7/v9rd/dr3MQ0X/F4Zm3+K9QhWajNNlBFZqN0mQHS6lMdrCUyqSgimllUsy4XmOmp+QRDllQWbygjjq6 + uimZStOX8a+ixox3pXrM1JLCDAqYJmY7c669M0bff07mcLbtEl9QE8k6V6BH5ooXMsHZZX7ae+AY7W45 + SrPm19LbsSR9m/iRA2bYGefggVePzUgKBzeu9sQpmZ4QcG/WMtk7eLjv0WMz0kOz+TX6MUXvP6cFeNbD + bz6YvQFm2Bk9PPByZO6jksLB5KvRTzTyLikIrG2ktsvXzd4g2hGjYP1ms4eHvb850qkl65LCQW/ntVs0 + 9HpMcPx0K1X4V1Ff/3NzhnphbVDsjBk8Lm/VE44s0ZJ1KS4Ie8uXUvPBE7Tn0ElCzTMqrV5BO/cfEaDG + TD5X6PFFONLygsTF7jj1vxihyPkYNTS1iFrFxm37KHIhJmp43L7qZxzp0pJ1SeHhQGgLJQaH6fb9R1QX + 2EB3Ek9FryLe95j8K9eLT/TB0FZcskOP1iRdkIh23aR7Ay9pzaZddKY9Jup8nIpeoXXhZlHD655b85Bj + p2npLOmCML+dD/iTZhaX3+UvbRB1PpzeygFnSUUvatecRUMzisoOc+x0LZ3FixxYhQyK1cxyZhkTYhqY + RgnM6hmcwVl4ljDI0KS4AC+Kmyli8Jv2MF7GNwXY4QzOwgNv5mWTL7CLpVQmO1hKZbKDpVR/1P8OcvwB + lh7gOXXZq9sAAAAASUVORK5CYII= + + iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 @@ -598,147 +738,7 @@ 1BGxz38BvCwLsyQ3iHgAAAAASUVORK5CYII= - - - iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAZdEVYdFNvZnR3YXJlAEFkb2JlIEltYWdlUmVhZHlxyWU8AAADZmlUWHRYTUw6Y29tLmFkb2Jl - LnhtcAAAAAAAPD94cGFja2V0IGJlZ2luPSLvu78iIGlkPSJXNU0wTXBDZWhpSHpyZVN6TlRjemtjOWQi - Pz4gPHg6eG1wbWV0YSB4bWxuczp4PSJhZG9iZTpuczptZXRhLyIgeDp4bXB0az0iQWRvYmUgWE1QIENv - cmUgNS4zLWMwMTEgNjYuMTQ1NjYxLCAyMDEyLzAyLzA2LTE0OjU2OjI3ICAgICAgICAiPiA8cmRmOlJE - RiB4bWxuczpyZGY9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkvMDIvMjItcmRmLXN5bnRheC1ucyMiPiA8 - cmRmOkRlc2NyaXB0aW9uIHJkZjphYm91dD0iIiB4bWxuczp4bXBNTT0iaHR0cDovL25zLmFkb2JlLmNv - bS94YXAvMS4wL21tLyIgeG1sbnM6c3RSZWY9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlw - ZS9SZXNvdXJjZVJlZiMiIHhtbG5zOnhtcD0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wLyIgeG1w - TU06T3JpZ2luYWxEb2N1bWVudElEPSJ4bXAuZGlkOjYzQTM5NEY4Mjg0OUU0MTE5NDBEQTc4ODZEQzk5 - N0NGIiB4bXBNTTpEb2N1bWVudElEPSJ4bXAuZGlkOjEwQ0IxNzBBNEM1QzExRTRBNkNGQzRBMjhDQzI0 - MkY4IiB4bXBNTTpJbnN0YW5jZUlEPSJ4bXAuaWlkOjEwQ0IxNzA5NEM1QzExRTRBNkNGQzRBMjhDQzI0 - MkY4IiB4bXA6Q3JlYXRvclRvb2w9IkFkb2JlIFBob3Rvc2hvcCBDUzYgKFdpbmRvd3MpIj4gPHhtcE1N - OkRlcml2ZWRGcm9tIHN0UmVmOmluc3RhbmNlSUQ9InhtcC5paWQ6NTEzMDNDMjA1QjRDRTQxMTg4NERE - MUVBOEQ4QTgyNTUiIHN0UmVmOmRvY3VtZW50SUQ9InhtcC5kaWQ6NjNBMzk0RjgyODQ5RTQxMTk0MERB - Nzg4NkRDOTk3Q0YiLz4gPC9yZGY6RGVzY3JpcHRpb24+IDwvcmRmOlJERj4gPC94OnhtcG1ldGE+IDw/ - eHBhY2tldCBlbmQ9InIiPz43wa2/AAAFaUlEQVRIS6WUC0xTVxzGKy0UkSmlFGjBFilSkNpSaAWRh63y - sIiAArKs4spLRLQoiEJlSMGoMCc6CBOnYHzMOHUqqOhEHOqCbjNu6kCd6KYje5mZ6KbObd/OuVL3cEzj - /skv997/+b7v39PTW9aj3/BM+OKxPEIZoW/gyrOuPbP+GvRPSNBQQqXYLwSW1etw7cYt5kqfaZ+uD8QM - Xg8f/f4UxGhHMHv4qlG6vAb9394G6T+BPpdV1oCuUx3VD8Q9XT8//PUJRMghlLhLg1C41IK+r/pB+oNC - 16mO6qmP+gdi/6y793+hwTYEk9uoQOSaStHzxQ2Q/nND9XMKy0D9NIfmDcSzaLhI4KXE7LwinLtwGXfu - PXhhqJ/m0DyS62EdUGWpqcf3P97DD3d++t/QnKraBjpghXWAiC+WN0ZNScOe1mP45vbdF2ZvWwdoDs/D - b6ejs6ecxHPoAG/l+Fhkzy+FyCcY0YkG7D/yAW5+d+e5oXrqo36aQ/McnNyjyAAuHWA05pfgzPlehhyT - mflV6FOMaDt2Ctf7bw8KXac6qqc+a4Zx3hLwRLJCZgcJjcPIEPkyIZmeX1SB7vOX0dn9KQy5jw8r8eVc - HOrsxidXP0d9hxlzd4QgeYMzEt7kQVvOR0pFFNpOHmd81E9znIS+dSTc1foVGWfNKUZjyy6Ex6SQl0cD - 09IVxHAFh0+cReqr+QjK8ERqEw+VHWOwoycSR/v1OHwzDlsvhcNCeqkbedAYxQiPm87kZOQVw0nkW0QG - 2DFnIA+JRm3DFpzr/RKNW3ZDE5UAsX8ocizZiFs7DEUHvPFunw4Hb05B+y09jn49lYHe0x5doxqqLVlf - DJrnyB+pIQNs6QAhf6R8tZu3CqpwPdZu2I6PLl3HwnV5iHv9JVSeUOKdqzq81xeDvddiYG73R0aLEIZm - IRa1jUbjxQnYRHa17YqW0VJPwHT3LocRbirrDiymspXo6L6AgiXV8JSNQ2i6GpNWOqK4U4n1n0Vge68W - 9ecmIKnBBSqDCIp4P2RWGDB/QxqS6l1QcToIld3BqDobgsXEQ73+Se5HrGcgdJEokGzIx66DXXi7dRvC - yx2Q2RqApR+GoPbjCag8pUZ6sxjqWRKEldljRr07ZjaKmHt5qpBZKzkeiIJ2BbIPKmA8MIbJUC/ghrM0 - RfYsDtdhqJNIVulK/ku0BQokbfZGZrsKBR3BmEsMOfvl0FY7o7ypDPo1brCcGc+QUCdExabXEFsjQO4B - ObL2BSBlqx8SWwibvBE0334nK3Ael+yEbIW81DZszlhZ2oieuAYvpO5VIHGzP9J2+CN9pz/CzDwExMox - eZUbFnZpkEc+gLZagJjMWOiqXZDVqmC0+kZf6Nb4IHKFCPIsu92sgCw7BlJswjBJLCdenmuPyFUS6Gp9 - oG/yRdJWGSKqhYjKDgLRImK5ACGlzsy9d/zwXn2DBMZDSkZLPaHlnpBncyGO5kxj+Rps/wYdJE2xzfOb - zcU4sye0b0gRu3E0Ypt8ELTICRFGNcShUgjHuZyWxNu2096sdiXS9o1ltNQjyyDhes4SkuXEGpXC+Ve8 - kjlzpDPtoCkVQrdOihgyIHmXP6LryGEX86Ba6ISJNR7IeF+JV8gAfbOM0XoTj8dktpmEOxM4rJHTBscz - njNNnMiBagEfU98ajRnbZMg7GojCk2oGU1cw5nUGw7BHAZWJD6oVhLFzSDCPCacljGP/J7xAm6Hu0ew6 - STIXkcvckN7ig8XHVCjvUiNvdwAmW0Twms6FayS7meM4REoihxPoeT4u10nsZ0LKhhdsIxZEsVcLtOyL - pHffVcd+IJjI7uGHsRscJEPURMMn2FMtNTwuFusPrjFl48ji7nIAAAAASUVORK5CYII= - - - - - iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAZdEVYdFNvZnR3YXJlAEFkb2JlIEltYWdlUmVhZHlxyWU8AAADZmlUWHRYTUw6Y29tLmFkb2Jl - LnhtcAAAAAAAPD94cGFja2V0IGJlZ2luPSLvu78iIGlkPSJXNU0wTXBDZWhpSHpyZVN6TlRjemtjOWQi - Pz4gPHg6eG1wbWV0YSB4bWxuczp4PSJhZG9iZTpuczptZXRhLyIgeDp4bXB0az0iQWRvYmUgWE1QIENv - cmUgNS4zLWMwMTEgNjYuMTQ1NjYxLCAyMDEyLzAyLzA2LTE0OjU2OjI3ICAgICAgICAiPiA8cmRmOlJE - RiB4bWxuczpyZGY9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkvMDIvMjItcmRmLXN5bnRheC1ucyMiPiA8 - cmRmOkRlc2NyaXB0aW9uIHJkZjphYm91dD0iIiB4bWxuczp4bXBNTT0iaHR0cDovL25zLmFkb2JlLmNv - bS94YXAvMS4wL21tLyIgeG1sbnM6c3RSZWY9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlw - ZS9SZXNvdXJjZVJlZiMiIHhtbG5zOnhtcD0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wLyIgeG1w - TU06T3JpZ2luYWxEb2N1bWVudElEPSJ4bXAuZGlkOjYzQTM5NEY4Mjg0OUU0MTE5NDBEQTc4ODZEQzk5 - N0NGIiB4bXBNTTpEb2N1bWVudElEPSJ4bXAuZGlkOkUyMTg3NjEyNDlEODExRTQ4NjNGQjM2Mzk1QkNB - RkQwIiB4bXBNTTpJbnN0YW5jZUlEPSJ4bXAuaWlkOkUyMTg3NjExNDlEODExRTQ4NjNGQjM2Mzk1QkNB - RkQwIiB4bXA6Q3JlYXRvclRvb2w9IkFkb2JlIFBob3Rvc2hvcCBDUzYgKFdpbmRvd3MpIj4gPHhtcE1N - OkRlcml2ZWRGcm9tIHN0UmVmOmluc3RhbmNlSUQ9InhtcC5paWQ6NkJCNTE0NDlEODQ5RTQxMUE0QzNB - MjdEOTJBQzc3QkMiIHN0UmVmOmRvY3VtZW50SUQ9InhtcC5kaWQ6NjNBMzk0RjgyODQ5RTQxMTk0MERB - Nzg4NkRDOTk3Q0YiLz4gPC9yZGY6RGVzY3JpcHRpb24+IDwvcmRmOlJERj4gPC94OnhtcG1ldGE+IDw/ - eHBhY2tldCBlbmQ9InIiPz5e5MstAAADiUlEQVRIS+2UW0yTdxjGcePwtYyVVpAUCi1tv9ImrVbxhAei - kjGphAgFT4jzEJ0gGuJhDk0sml0sglmWmC1hqHNKWwI4srgNh3phpjg1O1yIN5DMbFHQZUu42O76+D4f - 3Fl6Z7ILn+SXvH3f533++X/98iUBeKW81v9Uwx1G1+1240EhfKfdeE/4U3qTAqaZZO/2aeN9IXLrY+Ph - wVOZHll9YyohgYZOGS4JsYdXVDy+NQ8Tvy3BP6OlmPyjDP9OBDRYs8cZPfRy5/uQISIRqcIsLSye+j7I - wN+PluOvhyWY+NmL8fsOjP9kxdN7BRh/YJHfFjy5m48nd4ThQjy968bEgwV49usicFciTEKKFhZPXXv1 - eHxtLsYGPBjttwsWjF0xY+ybOfj9uylYs8cZPfQS7kpEnqDTwuLp9GYlfKZeifUfzcb1j/Iw/IkNv3Q6 - MfKVC6O9bg3W7HFGD73cORlMG5AIizDzAaVtunD5ESXWfNSEY/tNCO00oG1zOkJBBSeqUjVYh6R3Qmat - zSY0Hjah7IASW7hPuSoRvIGihcVTSauCppvFODRUjJZvPWgaKMTuXgt2RHOxLTwHDd3EjPfCudgesWJX - jxM7eryo7/Ni8SGFj8gp6LWwePLvS0Og043A5y5UdtkQOJeLivM5ePf8bJSfM04zG2u7chDoysW6Thsq - zqpY0+GAvymNB/gEgxYWT64tKdGihpSYv8WEpSEzVp0pwDuf2SVQReCiS4M1e5zRQy937NXJ1yRirjDz - AVmVJyNZa9+PObauh7ptKdR6FY6N2SisTYe1OlmDNXtqvRNqwxLYt1TCVLY1ZijZOSQRbuEtLSyeTOXH - sfLDH1EauoFFx6/Cd6Qf7pYI1ObLsO+9iMLdF+DccwEuqd2Nl+Br6sbCxiiKd/XBuPogH1HiAzJXHMC8 - YA98td1wb4rCuaEH1roo8oMR5JGaMPIFa10Ejtowiuouw1vzJTwVXyBz+X4ekPgRZfgbohkLtsfMy47B - tqYdakUnPFUM6YUv+LUGa/Y4o8e8rBXcSffWDkpE4j9ZpEvNmb9KsZV16BzrBnVq1YjeVf1MX1Tzn74o - iCmkdq1/LrNHOkfgB6Vg9afJRrVOdv2ClRkMmklvCnyPs4V8ge81v5RegddnCGHNHmf00JslcJcZCcWv - IU1pAhcyhLcFXj1zGtbscUYPvdyZ+Uv6Wi8rKekFBjoX2627by8AAAAASUVORK5CYII= - - - - - iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAZdEVYdFNvZnR3YXJlAEFkb2JlIEltYWdlUmVhZHlxyWU8AAADZmlUWHRYTUw6Y29tLmFkb2Jl - LnhtcAAAAAAAPD94cGFja2V0IGJlZ2luPSLvu78iIGlkPSJXNU0wTXBDZWhpSHpyZVN6TlRjemtjOWQi - Pz4gPHg6eG1wbWV0YSB4bWxuczp4PSJhZG9iZTpuczptZXRhLyIgeDp4bXB0az0iQWRvYmUgWE1QIENv - cmUgNS4zLWMwMTEgNjYuMTQ1NjYxLCAyMDEyLzAyLzA2LTE0OjU2OjI3ICAgICAgICAiPiA8cmRmOlJE - RiB4bWxuczpyZGY9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkvMDIvMjItcmRmLXN5bnRheC1ucyMiPiA8 - cmRmOkRlc2NyaXB0aW9uIHJkZjphYm91dD0iIiB4bWxuczp4bXBNTT0iaHR0cDovL25zLmFkb2JlLmNv - bS94YXAvMS4wL21tLyIgeG1sbnM6c3RSZWY9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlw - ZS9SZXNvdXJjZVJlZiMiIHhtbG5zOnhtcD0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wLyIgeG1w - TU06T3JpZ2luYWxEb2N1bWVudElEPSJ4bXAuZGlkOjYzQTM5NEY4Mjg0OUU0MTE5NDBEQTc4ODZEQzk5 - N0NGIiB4bXBNTTpEb2N1bWVudElEPSJ4bXAuZGlkOkE2Q0VGMDE2NDlEQTExRTQ4NTlCQTI3NTMyOEY5 - NEU2IiB4bXBNTTpJbnN0YW5jZUlEPSJ4bXAuaWlkOkE2Q0VGMDE1NDlEQTExRTQ4NTlCQTI3NTMyOEY5 - NEU2IiB4bXA6Q3JlYXRvclRvb2w9IkFkb2JlIFBob3Rvc2hvcCBDUzYgKFdpbmRvd3MpIj4gPHhtcE1N - OkRlcml2ZWRGcm9tIHN0UmVmOmluc3RhbmNlSUQ9InhtcC5paWQ6NjA1MjM3NzFEOTQ5RTQxMUE0QzNB - MjdEOTJBQzc3QkMiIHN0UmVmOmRvY3VtZW50SUQ9InhtcC5kaWQ6NjNBMzk0RjgyODQ5RTQxMTk0MERB - Nzg4NkRDOTk3Q0YiLz4gPC9yZGY6RGVzY3JpcHRpb24+IDwvcmRmOlJERj4gPC94OnhtcG1ldGE+IDw/ - eHBhY2tldCBlbmQ9InIiPz6UH16BAAABrElEQVRIS63N70tTURzH8fsnKSGCCEIQCBKISMq2iILCgQOL - JUxQAoVKdMGQuwgWFepsMGjFZCMuorsIJV4WFatpvzdr1ZAFsaIHn8559v1eDsI91wevJ/ee7/tjbMRH - fAFwJOWRF6oopTzyQhWlVEdBwRbgUhICAnuvilKGtXDGzW6WV/CvbjE/xTfxr+R6q4xSxtP5YTf8rVn4 - s5dG+809Rv5zvVVGKaNwfYgyBfhksoH83CCF9seiL7LBBnLXTlP4/W4dza0ZLS0nCdlgA9npAQq/qk/Q - sKa0NJ8nIBtsIBPrp9CqPMJBYVLLj+04ZIMNrF49ReHwVRafH1/R8m3zJmSDDdy/fJJC88Ua3mcjWurW - LGSDDaQifRS+O8uopsNaPhVnIBts4E64l0Jj5y4qDy5q+ZCPQTbYgHmph8LXZ0m8TJ3Xsp+LQjbYQOJC - N4XadgLl22e1vM1OQDbYwK1zXRS+lBbhmEHsLgU8kTeVh+OQDTawEDpB2U4mitfpMS22GYJssIH5QCcV - FGwBmuRtkA3cGO3whcZUlEdeqKKU8sgLVZRSfjw+MP4DJ2GPpDR9OIsAAAAASUVORK5CYII= - - - - - iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAZdEVYdFNvZnR3YXJlAEFkb2JlIEltYWdlUmVhZHlxyWU8AAADZmlUWHRYTUw6Y29tLmFkb2Jl - LnhtcAAAAAAAPD94cGFja2V0IGJlZ2luPSLvu78iIGlkPSJXNU0wTXBDZWhpSHpyZVN6TlRjemtjOWQi - Pz4gPHg6eG1wbWV0YSB4bWxuczp4PSJhZG9iZTpuczptZXRhLyIgeDp4bXB0az0iQWRvYmUgWE1QIENv - cmUgNS4zLWMwMTEgNjYuMTQ1NjYxLCAyMDEyLzAyLzA2LTE0OjU2OjI3ICAgICAgICAiPiA8cmRmOlJE - RiB4bWxuczpyZGY9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkvMDIvMjItcmRmLXN5bnRheC1ucyMiPiA8 - cmRmOkRlc2NyaXB0aW9uIHJkZjphYm91dD0iIiB4bWxuczp4bXBNTT0iaHR0cDovL25zLmFkb2JlLmNv - bS94YXAvMS4wL21tLyIgeG1sbnM6c3RSZWY9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlw - ZS9SZXNvdXJjZVJlZiMiIHhtbG5zOnhtcD0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wLyIgeG1w - TU06T3JpZ2luYWxEb2N1bWVudElEPSJ4bXAuZGlkOjYzQTM5NEY4Mjg0OUU0MTE5NDBEQTc4ODZEQzk5 - N0NGIiB4bXBNTTpEb2N1bWVudElEPSJ4bXAuZGlkOjJGRTU5OEQ1NDlEQjExRTRBRUVDOTkyMjQ5NzEw - REUwIiB4bXBNTTpJbnN0YW5jZUlEPSJ4bXAuaWlkOjJGRTU5OEQ0NDlEQjExRTRBRUVDOTkyMjQ5NzEw - REUwIiB4bXA6Q3JlYXRvclRvb2w9IkFkb2JlIFBob3Rvc2hvcCBDUzYgKFdpbmRvd3MpIj4gPHhtcE1N - OkRlcml2ZWRGcm9tIHN0UmVmOmluc3RhbmNlSUQ9InhtcC5paWQ6MTY0MkI1RjlEQTQ5RTQxMUE0QzNB - MjdEOTJBQzc3QkMiIHN0UmVmOmRvY3VtZW50SUQ9InhtcC5kaWQ6NjNBMzk0RjgyODQ5RTQxMTk0MERB - Nzg4NkRDOTk3Q0YiLz4gPC9yZGY6RGVzY3JpcHRpb24+IDwvcmRmOlJERj4gPC94OnhtcG1ldGE+IDw/ - eHBhY2tldCBlbmQ9InIiPz6B5sF9AAACe0lEQVRIS7WVb2jMcRzHL7UHanF/Mts5prE/1li3kAfu5Ak7 - 5IHNobBkSC2UIuGJkrrSWRvTmHQWK8U1T8jqUtYwkZpaGjV/Js6to5YwfXze39+fu/v23f36hXe9us+f - 7/v9rd/dr3MQ0X/F4Zm3+K9QhWajNNlBFZqN0mQHS6lMdrCUyqSgimllUsy4XmOmp+QRDllQWbygjjq6 - uimZStOX8a+ixox3pXrM1JLCDAqYJmY7c669M0bff07mcLbtEl9QE8k6V6BH5ooXMsHZZX7ae+AY7W45 - SrPm19LbsSR9m/iRA2bYGefggVePzUgKBzeu9sQpmZ4QcG/WMtk7eLjv0WMz0kOz+TX6MUXvP6cFeNbD - bz6YvQFm2Bk9PPByZO6jksLB5KvRTzTyLikIrG2ktsvXzd4g2hGjYP1ms4eHvb850qkl65LCQW/ntVs0 - 9HpMcPx0K1X4V1Ff/3NzhnphbVDsjBk8Lm/VE44s0ZJ1KS4Ie8uXUvPBE7Tn0ElCzTMqrV5BO/cfEaDG - TD5X6PFFONLygsTF7jj1vxihyPkYNTS1iFrFxm37KHIhJmp43L7qZxzp0pJ1SeHhQGgLJQaH6fb9R1QX - 2EB3Ek9FryLe95j8K9eLT/TB0FZcskOP1iRdkIh23aR7Ay9pzaZddKY9Jup8nIpeoXXhZlHD655b85Bj - p2npLOmCML+dD/iTZhaX3+UvbRB1PpzeygFnSUUvatecRUMzisoOc+x0LZ3FixxYhQyK1cxyZhkTYhqY - RgnM6hmcwVl4ljDI0KS4AC+Kmyli8Jv2MF7GNwXY4QzOwgNv5mWTL7CLpVQmO1hKZbKDpVR/1P8OcvwB - lh7gOXXZq9sAAAAASUVORK5CYII= - - - + iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 YQUAAAAZdEVYdFNvZnR3YXJlAEFkb2JlIEltYWdlUmVhZHlxyWU8AAADZmlUWHRYTUw6Y29tLmFkb2Jl @@ -750,26 +750,244 @@ bS94YXAvMS4wL21tLyIgeG1sbnM6c3RSZWY9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlw ZS9SZXNvdXJjZVJlZiMiIHhtbG5zOnhtcD0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wLyIgeG1w TU06T3JpZ2luYWxEb2N1bWVudElEPSJ4bXAuZGlkOjJGQzkyMzc0Rjk0OUU0MTE5NjNCQjRENDMzQjlC - MUM4IiB4bXBNTTpEb2N1bWVudElEPSJ4bXAuZGlkOjJERjY3MEZENEQyMzExRTRCNDlGQUMwMzk0OTAw - Qzc4IiB4bXBNTTpJbnN0YW5jZUlEPSJ4bXAuaWlkOjJERjY3MEZDNEQyMzExRTRCNDlGQUMwMzk0OTAw - Qzc4IiB4bXA6Q3JlYXRvclRvb2w9IkFkb2JlIFBob3Rvc2hvcCBDUzYgKFdpbmRvd3MpIj4gPHhtcE1N - OkRlcml2ZWRGcm9tIHN0UmVmOmluc3RhbmNlSUQ9InhtcC5paWQ6NjhGOUEyRDEyMTRERTQxMUIzNkJE + MUM4IiB4bXBNTTpEb2N1bWVudElEPSJ4bXAuZGlkOjlDMzFEOUI4NEFBRjExRTQ4OTA5OUYwQ0QzM0Q2 + NEI4IiB4bXBNTTpJbnN0YW5jZUlEPSJ4bXAuaWlkOjlDMzFEOUI3NEFBRjExRTQ4OTA5OUYwQ0QzM0Q2 + NEI4IiB4bXA6Q3JlYXRvclRvb2w9IkFkb2JlIFBob3Rvc2hvcCBDUzYgKFdpbmRvd3MpIj4gPHhtcE1N + OkRlcml2ZWRGcm9tIHN0UmVmOmluc3RhbmNlSUQ9InhtcC5paWQ6MDk5Mzk2NTZBRjRBRTQxMTk3NEFD + QUFFQjRCMzVENkUiIHN0UmVmOmRvY3VtZW50SUQ9InhtcC5kaWQ6MkZDOTIzNzRGOTQ5RTQxMTk2M0JC + NEQ0MzNCOUIxQzgiLz4gPC9yZGY6RGVzY3JpcHRpb24+IDwvcmRmOlJERj4gPC94OnhtcG1ldGE+IDw/ + eHBhY2tldCBlbmQ9InIiPz73sIMwAAADIElEQVRIS7WVa0iTYRTH56Uiysvm3TkvpLl5DRIvQYWVWl+6 + iNEVg0yhQqloQZHkLT+Y0YdAs75IpEUhzERZoZhsRpZlS7soblotsRwoxhqWeTrnYZtv+u7NsB74cZ5z + zv89/z17HzYRAPxXeIv/EpFXcOyi4BvKhfehv4FvKBfeh+ayqIUDlIgBgT8whpRYoT2fhgvNVJKBQT9s + hB8/QZDPpnEIjEhg0J5Pw4Vm0mwygG9T06BSqQQhTUhUMoRGpyxYT7OZwfhXC6jVakFIYzNYqN5uMGKa + BI1GIwhpghXJaJJi13d0dEB2bj74hsWzSDlXbzfQG02g0+kEIU2wIomdovzKdVifngnFFytBeb4cLN+n + WaSc6hfKKqB/eHTWoHfwExgMBkFII5MnQUD4WlAWloO26wVs35MDmifPmQFFyqlO/aKKqlmDp31DYDKZ + BCGNTJ4IPqHx8LJvACbNUw7p6e2HuJQMNIhhBuaHj3vBYrEI0tb1BoIiE9kJ9h7Oh7EJM+g/jEJuwVlY + s24ri5RTnfo5BedAIoueIYPumvomuHzjzm9cq2uCq7UNUH2rEarr7kNd0yP26Y+eKoSWtk4wfpmAg7kn + ITY5DUorq1g8cOQEqze3aplOEhRtJoMcL1mMTixV9IgD5a/tSBVDYql8AKOBQLEJtTP08gY/jjFiktKg + 5FIV21Ok3NazvmR2AvrFkCAJyGYk1comZAuHDM/AyLvHThfBveZ26NOPwI59eey7LsbhFCmnOvVJ5+Ef + rrYZLEU8EZ85+HLwW7ZCLMVTFWdkHoLut+/hgbYHaE9XN31XNsupTrWV3jKVs+uS3cyAD0cLe331jW3Q + qRt0CPUlQVHDKI+fN9iGo4W90uNnyuA2vvRtWTlQgxeg/dk7FimnOvU9/CNqUe47b7ANRwt7AfjpKvAK + Gt18Qur35ymhRfsKKLr5hN7EyzDq7humWrrcfSfKxbz/QlwcLDck1snZJdUzYHUDmk57+K1qdXJyzsL6 + RmQD9ZmObygXB8sVIRO6fXQB4hC6eRQppzr1XXmHclnAckFomLc1Um5dItEvhZ97MQXP9N0AAAAASUVO + RK5CYII= + + + + + iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 + YQUAAAAZdEVYdFNvZnR3YXJlAEFkb2JlIEltYWdlUmVhZHlxyWU8AAADZmlUWHRYTUw6Y29tLmFkb2Jl + LnhtcAAAAAAAPD94cGFja2V0IGJlZ2luPSLvu78iIGlkPSJXNU0wTXBDZWhpSHpyZVN6TlRjemtjOWQi + Pz4gPHg6eG1wbWV0YSB4bWxuczp4PSJhZG9iZTpuczptZXRhLyIgeDp4bXB0az0iQWRvYmUgWE1QIENv + cmUgNS4zLWMwMTEgNjYuMTQ1NjYxLCAyMDEyLzAyLzA2LTE0OjU2OjI3ICAgICAgICAiPiA8cmRmOlJE + RiB4bWxuczpyZGY9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkvMDIvMjItcmRmLXN5bnRheC1ucyMiPiA8 + cmRmOkRlc2NyaXB0aW9uIHJkZjphYm91dD0iIiB4bWxuczp4bXBNTT0iaHR0cDovL25zLmFkb2JlLmNv + bS94YXAvMS4wL21tLyIgeG1sbnM6c3RSZWY9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlw + ZS9SZXNvdXJjZVJlZiMiIHhtbG5zOnhtcD0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wLyIgeG1w + TU06T3JpZ2luYWxEb2N1bWVudElEPSJ4bXAuZGlkOjJGQzkyMzc0Rjk0OUU0MTE5NjNCQjRENDMzQjlC + MUM4IiB4bXBNTTpEb2N1bWVudElEPSJ4bXAuZGlkOjhDMTdBQjRENEFBRTExRTQ4QjQyODY0MDNBNTJE + NzNCIiB4bXBNTTpJbnN0YW5jZUlEPSJ4bXAuaWlkOjhDMTdBQjRDNEFBRTExRTQ4QjQyODY0MDNBNTJE + NzNCIiB4bXA6Q3JlYXRvclRvb2w9IkFkb2JlIFBob3Rvc2hvcCBDUzYgKFdpbmRvd3MpIj4gPHhtcE1N + OkRlcml2ZWRGcm9tIHN0UmVmOmluc3RhbmNlSUQ9InhtcC5paWQ6NUQyMjc4QTlBQjRBRTQxMTk3NEFD + QUFFQjRCMzVENkUiIHN0UmVmOmRvY3VtZW50SUQ9InhtcC5kaWQ6MkZDOTIzNzRGOTQ5RTQxMTk2M0JC + NEQ0MzNCOUIxQzgiLz4gPC9yZGY6RGVzY3JpcHRpb24+IDwvcmRmOlJERj4gPC94OnhtcG1ldGE+IDw/ + eHBhY2tldCBlbmQ9InIiPz4eHsDfAAAB00lEQVRIS7XVWytEURQH8HniTTNHLs0NCXNcXjTN5dH9g/gM + 3jx590QhFDJS0gyTGmpqaqJIMW4hzlAoOaWISS7LWifntI3ddnTGrl92e/57/We/DBsA/CvuYSHZSr0t + lvCGsriX/oI3lMW9lM/SwgF9SEHwizs08IX2vAyLZvZRgXJ+cQWv7yB0q96Ds86voT0vw6KZNJsK4Pnl + DWKxmBBlqhpDUN0UNp2n2VrB/WMOEomEEGX0ArN5o+BGfYB0Oi1EGa8cwpKw6bxRcH6lQiaTEaKMVw5q + rzCbNwr2z65BURQhynh8Qe0VZvNGwdZBFlRVFaKMxxfQXmE2rxc8rW3sQy6XE0puHoG7IaC9YnV9j5th + pbZPqOCDCrbH5uIwOD7/zWgkDkNTizAyuwQjkWWIxFNQWduqmVxI/MiPz6/A8HTUuDMTTYLkbrqhgt5S + T3PG4ZJ3HE7focElZx0u3yn+VQiG1ZLymmm7s74f88f42S6bl9zyJZ6d6Xckd+Mt5ieogH4xJORHHajt + SzvqZPSgECpHZSiA2DztuxBlad+NgnpBEbIjusiiYboKRF+kGFHegUR5ImkFv7G0eAPzWVq8gfksLd5/ + oULiHhYS97BwwPYJlSCUgVubViQAAAAASUVORK5CYII= + + + + + iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 + YQUAAAAZdEVYdFNvZnR3YXJlAEFkb2JlIEltYWdlUmVhZHlxyWU8AAADZmlUWHRYTUw6Y29tLmFkb2Jl + LnhtcAAAAAAAPD94cGFja2V0IGJlZ2luPSLvu78iIGlkPSJXNU0wTXBDZWhpSHpyZVN6TlRjemtjOWQi + Pz4gPHg6eG1wbWV0YSB4bWxuczp4PSJhZG9iZTpuczptZXRhLyIgeDp4bXB0az0iQWRvYmUgWE1QIENv + cmUgNS4zLWMwMTEgNjYuMTQ1NjYxLCAyMDEyLzAyLzA2LTE0OjU2OjI3ICAgICAgICAiPiA8cmRmOlJE + RiB4bWxuczpyZGY9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkvMDIvMjItcmRmLXN5bnRheC1ucyMiPiA8 + cmRmOkRlc2NyaXB0aW9uIHJkZjphYm91dD0iIiB4bWxuczp4bXBNTT0iaHR0cDovL25zLmFkb2JlLmNv + bS94YXAvMS4wL21tLyIgeG1sbnM6c3RSZWY9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlw + ZS9SZXNvdXJjZVJlZiMiIHhtbG5zOnhtcD0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wLyIgeG1w + TU06T3JpZ2luYWxEb2N1bWVudElEPSJ4bXAuZGlkOjJGQzkyMzc0Rjk0OUU0MTE5NjNCQjRENDMzQjlC + MUM4IiB4bXBNTTpEb2N1bWVudElEPSJ4bXAuZGlkOjJEMDQyOEZBNEFEMjExRTRBN0MxRDBCNzJGRUND + MDEzIiB4bXBNTTpJbnN0YW5jZUlEPSJ4bXAuaWlkOjJEMDQyOEY5NEFEMjExRTRBN0MxRDBCNzJGRUND + MDEzIiB4bXA6Q3JlYXRvclRvb2w9IkFkb2JlIFBob3Rvc2hvcCBDUzYgKFdpbmRvd3MpIj4gPHhtcE1N + OkRlcml2ZWRGcm9tIHN0UmVmOmluc3RhbmNlSUQ9InhtcC5paWQ6QkRDRkI1RDVEMTRBRTQxMTk3NEFD + QUFFQjRCMzVENkUiIHN0UmVmOmRvY3VtZW50SUQ9InhtcC5kaWQ6MkZDOTIzNzRGOTQ5RTQxMTk2M0JC + NEQ0MzNCOUIxQzgiLz4gPC9yZGY6RGVzY3JpcHRpb24+IDwvcmRmOlJERj4gPC94OnhtcG1ldGE+IDw/ + eHBhY2tldCBlbmQ9InIiPz59jfe3AAAEbUlEQVRIS8WTeUybZRzHF48/pnFOuQRajkFLgQFb5iRLNJr4 + l/EPgsniUI4xZDAY1zyxwApsMJyIME61rByl3DfoYGBrgbWUY06FcZSCha4rQ8jYxkqPr2/fvkv8o2Sg + S/wkT970eb6/T5/39z7Prv8dt/Oql4mR4HZJ3ccoXFxhVCzB9DT9JueJdSq6c1wzVZFupepVzxu34XVj + CaEDi1jX6hF8ZQoeokl4iBVwzV9YdU1XRlIl28eVo8phCdXwGltEeOUsro6psaHVwcSDh5volc4iOO8X + 7KuVwb1hEi7J8myq9PEQO//I85oafr0KtEpUpNSETm+AwWDAvfv3YTQaybnm/t/AyO6Ga+UonJOnIijF + 1hA9tWI2qle9RxcI+RIpmZpTIfBULhIyyqHVahHPKcN70TmYnFFCp9OhqXcc9KwW0DOHVl3YU1aUyjJu + F1SpfhO3EM6bMMsVt+D8Zhz2HIpC4oU6bG5uIu4cD3tfTwAjIBNypQYbGxsISquBU34PaDHiVEplGXee + SuIjVaBv3Lz7gJg8vHg4FlZvc+ATVoLipiHsD8qCXWAO7IPK8MG5FjLXKboOeoYADkldUkplGWb7vOb4 + 4BzxIXXQE/1m59WDXdgBvxPfwz6UC4eQUth/WIBDZ2qQXj+K7IYRImeE5s5fOFrcDPvPapcJzVNmmwVY + VxWG9U09uau1tTVymPpc0iYFLew7OEUJ4BwtALfvJpl5xMrKCu6s3cUrn5YbCM1us80CrJZZVWjXr7j3 + 4CE0y8v4IrcaH+cK4Bv+DRyPl8ApphYuia3wZ3eCUzOA1PIfcVuzjHnlIgK/vgy7mHzTG+w12yzA5E53 + edYPo1c2i/X1dQTEfwvbwDQ4hhXg8OcN4P48Df+UTrgkNIAeW4Hg3Hbo9Xq0iGSgs4ls5CUhoXnObLOA + S8pkhG/bdZzgDZJnffT3GXieLAA9XgB2/RjZjuQqMWhxfBw824H55XWyhcfy+HDNqoB1SH4Codn6G7iw + p3d78EaVPlXX0CaZgkqlgly1gpCiK0htHCH/IL6oFcEF3ZjT3CUvXqv0DzDSS0FPq1a/8EbYS5Rqa+if + SAJ8KoeNR7gitEsnoVQqSbGOkJmYX1ggxaY70SabwIGMUrjn8I3WIXnBRPnWu/8nDnE9Sd7cAaP/ZSES + 6/rRKJRArpiHXC7HzekZNIukiCyrhW9mGZgXa4w2kUVnibJnzdXbxP5URzyDO4QjxGl5i9uNpMZeKP5U + IrywAq9yCnGAOGGMonbYxpVnEPGdyR9BO/MTj8kfgXeNFPt5IngVtoF1kQ9WcTs8qgfgmNreQMS21xZL + 0E6Ln6ef75tg8sfgXT8O77oReAkkYNXJ4PRV/4ztyfo9VPTf4xjdf9CpQKzdxxuGe6UMbhXEmc8V6mze + r3qNivx3HGN7UmglQ6CVDMIxXwybo5UcaunJQD8te9rhyx4JrWwItlGNUut3y5+hlp4cDhFCpl14k9jq + nR+Y1NTjIe7NlmMnWKoHsOtvjWYcKpheqFQAAAAASUVORK5CYII= + + + + + iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 + YQUAAAAZdEVYdFNvZnR3YXJlAEFkb2JlIEltYWdlUmVhZHlxyWU8AAADZmlUWHRYTUw6Y29tLmFkb2Jl + LnhtcAAAAAAAPD94cGFja2V0IGJlZ2luPSLvu78iIGlkPSJXNU0wTXBDZWhpSHpyZVN6TlRjemtjOWQi + Pz4gPHg6eG1wbWV0YSB4bWxuczp4PSJhZG9iZTpuczptZXRhLyIgeDp4bXB0az0iQWRvYmUgWE1QIENv + cmUgNS4zLWMwMTEgNjYuMTQ1NjYxLCAyMDEyLzAyLzA2LTE0OjU2OjI3ICAgICAgICAiPiA8cmRmOlJE + RiB4bWxuczpyZGY9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkvMDIvMjItcmRmLXN5bnRheC1ucyMiPiA8 + cmRmOkRlc2NyaXB0aW9uIHJkZjphYm91dD0iIiB4bWxuczp4bXBNTT0iaHR0cDovL25zLmFkb2JlLmNv + bS94YXAvMS4wL21tLyIgeG1sbnM6c3RSZWY9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlw + ZS9SZXNvdXJjZVJlZiMiIHhtbG5zOnhtcD0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wLyIgeG1w + TU06T3JpZ2luYWxEb2N1bWVudElEPSJ4bXAuZGlkOjJGQzkyMzc0Rjk0OUU0MTE5NjNCQjRENDMzQjlC + MUM4IiB4bXBNTTpEb2N1bWVudElEPSJ4bXAuZGlkOjJERTg4QTFENEQyMjExRTRBODEyODk0M0RBMTc5 + Qjg3IiB4bXBNTTpJbnN0YW5jZUlEPSJ4bXAuaWlkOjJERTg4QTFDNEQyMjExRTRBODEyODk0M0RBMTc5 + Qjg3IiB4bXA6Q3JlYXRvclRvb2w9IkFkb2JlIFBob3Rvc2hvcCBDUzYgKFdpbmRvd3MpIj4gPHhtcE1N + OkRlcml2ZWRGcm9tIHN0UmVmOmluc3RhbmNlSUQ9InhtcC5paWQ6NjJGOUEyRDEyMTRERTQxMUIzNkJE NUVDQjU5MzE1NjIiIHN0UmVmOmRvY3VtZW50SUQ9InhtcC5kaWQ6MkZDOTIzNzRGOTQ5RTQxMTk2M0JC NEQ0MzNCOUIxQzgiLz4gPC9yZGY6RGVzY3JpcHRpb24+IDwvcmRmOlJERj4gPC94OnhtcG1ldGE+IDw/ - eHBhY2tldCBlbmQ9InIiPz6GKmpFAAAC+UlEQVRIS63T20vTYRzH8Yforj/Ei24UiSgKIygKi8oyxZQo - cvNYeXaesmzqPGu2POd0ulSsnIdaurTSTJ3O6UxTPGya5vCQx5AuPn39RbHop7nZxQt+z3ie93e/Z4w1 - p7nsCoBt8R6yBF/UHPv+Wb0rfFFzm99CRIwEW1gnqXzxTXxRc0ydctm4OlID2sxrw6iCtiwItC+A2P/D - frLnjwGNSZdMq6N1WOvLwFpP4l/WdRlY6Jaio9Ab7QXba8sVoDHZGdT8PYS9THDqMGnLsKpNw0qXGCua - BO55VZdNQ6U/DRRibVCGb+N1pH5bukoRqHmDHOIG1N8/X2F4I8WyNhtf2+9hqSsZxqZ4upbb6HsSZLHO - Im90ym6hNVcIaktYTexZyUelGEvaHMy/jcFiZxo0xX5Y7ivGcn8JkVmA9uvlWBmqwpJeAWovs+poR99O - eRgWtQWYVUdgrj0FH+i+F3XF3NoappZYGJrEoLaOVYpOOTY/FGJB+xjTqnDMtMTTAC/Ma/Ix/TLUKl9e - x0JfFQpql7PykBP7lWIXzPeUYLIhHCPKCLr/AMy2ZsKoDLTKdNNdvM8TgNpRTBZwfJ885CTmaIChPhwa - mS+GnkdhqjEWY9X+VplqvIMXEhdQ24mZeuSs0N/BNNWWj4k6EdSZHhhXxWH0aSCGFd4c4Tk7zk7XBlUM - FKLToK4Nm+0qYnneRzqGGiSYaIiiyZdhVCdgqFSIwRJPjucZW85O1pvnRmvDkO9zFNTdy2Y6HjGp4HCF - 5kk4xhoiURd/EROv4tBfeM0qAyUC9Mp9QM0+7o829T6LZV0/mNycS6+nFKFWfAGj9ZHozfGwil7miZYH - 7qCmghsw+S6VpV894KuUuKFbfhNNqa749CwY3dm0toK+VABl3HlQM5obYHybwFLc7W1y/Y5BlX6FfgNn - DNcEY0DhZZX+MiGKbh0DNR24AYYWMSfJzc6GZBApwS5skIzNODcg0dV2V36FtsJ7yBJ8UXO8hyzBFzXH - ++H/A/YDv9/V87iOlrYAAAAASUVORK5CYII= + eHBhY2tldCBlbmQ9InIiPz6wJF34AAACl0lEQVRIS62Vy08TURSH73/QhQtXVnBhxEcMiUkhbEg0hB1R + Q1i68C8wIW5cEqMLN7ho2Ji4YiEhWq0prYUhfULbadN3obTaChobtZEUsFY9nnPS6WM6HYowyZf87j33 + nG/amaai9geOBYA+4pTxihmBE8DcTQB4J8em/9IwSQyagmrtL+z9rMFmvnhkKvtV7tcVHPz6DVsftulA + AckdhUg8zf19eoLKAd597iMLMItewfOxUDTN/bqCH3tVSG8VWIBZ9AoJApEk9+sKvu/uQ2IjzwJkGtH8 + OrTwy3Hu77vIAnV9mgWlcgWiqRwLjAMmkOMbPbNTKnN/JJntqJGEBZ++7oKcyLLgLN4JrU8Cms2C4pcy + BKKZumCI18temQ/8DzSLZlBmQX7nG/jCKdpgAa0driCtY5iFHuqHSjNoFtaags1iCdzBBG+QgNY2aZ0F + mIUe6osENAtrTUEq/7kDq9PHAszU5yYoq9f1i9cUSCD5ozxDEeTsrhAoONwyxLLb8MrhYQFmZYCHsnpd + v3hNgQROb5hnKIK29944MAThTBEWbS4WYBZ6qC/sKSy5ZJ6BGUQg8b4Bbhjod4AZXlhXWdBa10LrIVul + AM9ggS+aa6AIMMO8ZYUO0KeyIOMtZyaQpXpNi4LFucYzMINwhbMNcMNw5oIJMMNKIA0LNg88mZuH/ssj + dPgBMnN+cBRmny1wrRtSMMMzWCCFMg0UAeY2Fh0+GL5xG8Zu3oHXUrCj3g0WONdTbeBm21/o1N17gPtg + 98Xh3VoS3qzKMDI22agfglnY/Uld8NDc/ZlZwAwvl4Ngun6LGh8rdfVDViNs3rguOOzq6XOD8PDpc7g2 + OkHDH7XWtYa2It66Y4eCQ8cRfpvUNa2hTUD8A6JMaBvCyTdJAAAAAElFTkSuQmCC + + + + + iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 + YQUAAAAZdEVYdFNvZnR3YXJlAEFkb2JlIEltYWdlUmVhZHlxyWU8AAADZmlUWHRYTUw6Y29tLmFkb2Jl + LnhtcAAAAAAAPD94cGFja2V0IGJlZ2luPSLvu78iIGlkPSJXNU0wTXBDZWhpSHpyZVN6TlRjemtjOWQi + Pz4gPHg6eG1wbWV0YSB4bWxuczp4PSJhZG9iZTpuczptZXRhLyIgeDp4bXB0az0iQWRvYmUgWE1QIENv + cmUgNS4zLWMwMTEgNjYuMTQ1NjYxLCAyMDEyLzAyLzA2LTE0OjU2OjI3ICAgICAgICAiPiA8cmRmOlJE + RiB4bWxuczpyZGY9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkvMDIvMjItcmRmLXN5bnRheC1ucyMiPiA8 + cmRmOkRlc2NyaXB0aW9uIHJkZjphYm91dD0iIiB4bWxuczp4bXBNTT0iaHR0cDovL25zLmFkb2JlLmNv + bS94YXAvMS4wL21tLyIgeG1sbnM6c3RSZWY9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlw + ZS9SZXNvdXJjZVJlZiMiIHhtbG5zOnhtcD0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wLyIgeG1w + TU06T3JpZ2luYWxEb2N1bWVudElEPSJ4bXAuZGlkOjJGQzkyMzc0Rjk0OUU0MTE5NjNCQjRENDMzQjlC + MUM4IiB4bXBNTTpEb2N1bWVudElEPSJ4bXAuZGlkOkUzNzJDMjE3NEFENjExRTRCNjE0OEVEQzI4MEM0 + RTZDIiB4bXBNTTpJbnN0YW5jZUlEPSJ4bXAuaWlkOkUzNzJDMjE2NEFENjExRTRCNjE0OEVEQzI4MEM0 + RTZDIiB4bXA6Q3JlYXRvclRvb2w9IkFkb2JlIFBob3Rvc2hvcCBDUzYgKFdpbmRvd3MpIj4gPHhtcE1N + OkRlcml2ZWRGcm9tIHN0UmVmOmluc3RhbmNlSUQ9InhtcC5paWQ6RkI3NUQ0QkNENDRBRTQxMTk3NEFD + QUFFQjRCMzVENkUiIHN0UmVmOmRvY3VtZW50SUQ9InhtcC5kaWQ6MkZDOTIzNzRGOTQ5RTQxMTk2M0JC + NEQ0MzNCOUIxQzgiLz4gPC9yZGY6RGVzY3JpcHRpb24+IDwvcmRmOlJERj4gPC94OnhtcG1ldGE+IDw/ + eHBhY2tldCBlbmQ9InIiPz6PyaLfAAADMElEQVRIS6VUXUiTYRT+vi3Tzd+ps23+3KRigtiPkolEQReG + UYTkhWatpWlWGkRdddfdSPImqUAJjSIT00oxLJIk0cR+tFSyzDJtgaMkDEPkdM7ZPvm2vS6jBx6es3Pe + 8zzvtm+TohLS/ov+AACStLgEQuJyLRJWYK1yzh/+FgCoQrpnfM4fOGBhcUlIMkEVkma4H4i1y2kFcMD8 + wqKQZILKZqTqmlTAWrfvMjhgbv63Dwm0hLWQohn1eNEbzrlfPiTQAtZCKjP1GXdAIC+r4XD+9CGBFrDm + RVJ1re6pZ0GyHHMvIawauYVNCFPfvvuQQAtYC6meKXU0amNsaGN/ZR60xIf9aIgN3cpGE9OzZCZ85nEm + pGiWlLABmuJCnUOXrNB7chdct4TUo32ANDbp4NuielDpqWfePdaPX6GrohSK4uLhlCEo96YlZLbOFHzH + oJXjMSBcGn4/zQGovEDqXXtzeTb+BTrKj0J3+Q54djYP7EZdTU2MPjFSK8eieQR9QtLg6GcOQPWgqKeQ + ZyOfoK30CDw+lg2Ot3Z4VLoNqo269mCNHIa2WjYn9A1PcAAqU6m9VV3TF9psOwwPS3JgZugCdNoyocwU + jU+RlImWBpezGz0vxzkA1YOiHvPFO7Ca1kGHLQtmXp2HdutmqN+/F6JiU+h3kOpyVeHJwBgHoLIpqajm + 189HoaG4CNqsGTA1UAWth9Lg6r490PygGyLjUikgzuWqQlffCAegelDdUwLqigqhpXgjTPYeh+bCFCg2 + RkEk3vxuVz/P0c43oLP3DQegLhspNalSFxiNcLswHT48LYNbBUlQk7ebzenmyhm08w1o7xmiAP6hRZiT + 70eYkzpctUuJWdHmwWs74+F1Uz7cyE+E4ohQB5mHm9a3GywpTXzektyKduIAIsKI3ISkL4rIdYle05C9 + VrZVBmvtl7eboUyv7V4jSQdwRn8FdI72iErtCUxnIuifkJ5hUqUOq9Jr7OeCNU6bTpNVqtMcDJSldOwn + KnOk+jypJ5QANRWc0cs5SEelXr54QidfwVYAMoiHq4W/gNM6OaNCJ+diaUIqN/43+Atwg27t+9ZXBUn6 + A2MdqQeVc5pWAAAAAElFTkSuQmCC + + + + + iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAIAAABvFaqvAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 + YQUAAAAZdEVYdFNvZnR3YXJlAEFkb2JlIEltYWdlUmVhZHlxyWU8AAADZmlUWHRYTUw6Y29tLmFkb2Jl + LnhtcAAAAAAAPD94cGFja2V0IGJlZ2luPSLvu78iIGlkPSJXNU0wTXBDZWhpSHpyZVN6TlRjemtjOWQi + Pz4gPHg6eG1wbWV0YSB4bWxuczp4PSJhZG9iZTpuczptZXRhLyIgeDp4bXB0az0iQWRvYmUgWE1QIENv + cmUgNS4zLWMwMTEgNjYuMTQ1NjYxLCAyMDEyLzAyLzA2LTE0OjU2OjI3ICAgICAgICAiPiA8cmRmOlJE + RiB4bWxuczpyZGY9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkvMDIvMjItcmRmLXN5bnRheC1ucyMiPiA8 + cmRmOkRlc2NyaXB0aW9uIHJkZjphYm91dD0iIiB4bWxuczp4bXBNTT0iaHR0cDovL25zLmFkb2JlLmNv + bS94YXAvMS4wL21tLyIgeG1sbnM6c3RSZWY9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlw + ZS9SZXNvdXJjZVJlZiMiIHhtbG5zOnhtcD0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wLyIgeG1w + TU06T3JpZ2luYWxEb2N1bWVudElEPSJ4bXAuZGlkOjJGQzkyMzc0Rjk0OUU0MTE5NjNCQjRENDMzQjlC + MUM4IiB4bXBNTTpEb2N1bWVudElEPSJ4bXAuZGlkOjUzQzNGNDI5NEQyQzExRTQ4QkE1QUNCMEVDRDZF + MDVEIiB4bXBNTTpJbnN0YW5jZUlEPSJ4bXAuaWlkOjUzQzNGNDI4NEQyQzExRTQ4QkE1QUNCMEVDRDZF + MDVEIiB4bXA6Q3JlYXRvclRvb2w9IkFkb2JlIFBob3Rvc2hvcCBDUzYgKFdpbmRvd3MpIj4gPHhtcE1N + OkRlcml2ZWRGcm9tIHN0UmVmOmluc3RhbmNlSUQ9InhtcC5paWQ6RkI1NUY4OTYyQTRERTQxMUIzNkJE + NUVDQjU5MzE1NjIiIHN0UmVmOmRvY3VtZW50SUQ9InhtcC5kaWQ6MkZDOTIzNzRGOTQ5RTQxMTk2M0JC + NEQ0MzNCOUIxQzgiLz4gPC9yZGY6RGVzY3JpcHRpb24+IDwvcmRmOlJERj4gPC94OnhtcG1ldGE+IDw/ + eHBhY2tldCBlbmQ9InIiPz6IsaOmAAADF0lEQVQ4T62U/UuTURTH+0nICqRI1ERMMyNQe8N0ChqBwQhN + yvwhEgJjVCqJ/qCibZo6tzQ339h6Nre5prapUzc1XzItX1ilzuWMLLVAen+xf6DTuTxjdxsFVj58ebjc + c+7nnud7z3228DbpIaDFH/CfoqCn72DIDvNfPDM2KAqyr8PcJxqY+QBTb8kkjocXQTsKigGwfqYJHqIg + 1OxHGHvlWPx4hXB1YyA3g4CBhqst+piEnrDA3rA95vBAY1x8d7lq/DVZwm5PQZNvoKYdypSgHgbVEIh1 + cLOZzOCbSSsyRQRba6uWtcpVLbPcwlglInNUCJNWWKqABqMLCGvGlfpJELaQ/V1Vd1lujAhe0chtUrH5 + ZExnmJ85MdomEa+qZMbIEF2BHGunILSjdZwYgTt4gJqjjj0Rltml1Zq9AeL0Mn71Wn2mtDU80MIvsFTw + O+KPIoWC8BNYRIUaqrRQroJKjQOk9N+xLBF2pXJFKfnsDGYa8gS6xOO2whyMuoHaHpGzZ/pBM0IMrtXD + nT4HqNHXe0lYoogMFeQP4jbSDkCPTUyXmnNoPutSo+9WN5DEQDyeWCWnhqm4p7Oimt3b54rzmmKPVHKz + 0Xg0AU1pz87VJp+yXOfd9t3mBmLXsGrsJhSsDtF4iOWxKdpzyQNnuRW7vEUp13obFG05OVUBPtO5V1Sn + k5q4SX8ENfWA6C7xHsP981Bb2sf38ZKd4JhSuXUJHPHhg/WJnAeZFw0Xzt/w8erRtLmBnB/CSmaC599I + 2PYVRl+CXigu3R9SfCC0Pf1MZ1oqvqvjogX7gtRFJfb1n24g7GblfQcFP2fkBYm5anxqQcbLKgzyK/Df + WRTkV5+RMTg84ZrgAOHo4ZIDVNdJw67CpsVLZ5gifj97Typlq2ZFQXj8LKh5EHpnaIar8N+Al5l9Y9Vs + T7OiIAzjqaMsa6QJnBkeWvgOHdPkAuIV67PSeQpCYYZplsZ+KyyWLRyFF8D553EDbURY770J0rrYJbda + SYE4iWb9NcgpRKDrOMAWwYP6d5BTaC52zyaAWDlAm/DweL8AX9zXukfxHsIAAAAASUVORK5CYII= + + + + + iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 + YQUAAAAZdEVYdFNvZnR3YXJlAEFkb2JlIEltYWdlUmVhZHlxyWU8AAADZmlUWHRYTUw6Y29tLmFkb2Jl + LnhtcAAAAAAAPD94cGFja2V0IGJlZ2luPSLvu78iIGlkPSJXNU0wTXBDZWhpSHpyZVN6TlRjemtjOWQi + Pz4gPHg6eG1wbWV0YSB4bWxuczp4PSJhZG9iZTpuczptZXRhLyIgeDp4bXB0az0iQWRvYmUgWE1QIENv + cmUgNS4zLWMwMTEgNjYuMTQ1NjYxLCAyMDEyLzAyLzA2LTE0OjU2OjI3ICAgICAgICAiPiA8cmRmOlJE + RiB4bWxuczpyZGY9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkvMDIvMjItcmRmLXN5bnRheC1ucyMiPiA8 + cmRmOkRlc2NyaXB0aW9uIHJkZjphYm91dD0iIiB4bWxuczp4bXBNTT0iaHR0cDovL25zLmFkb2JlLmNv + bS94YXAvMS4wL21tLyIgeG1sbnM6c3RSZWY9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlw + ZS9SZXNvdXJjZVJlZiMiIHhtbG5zOnhtcD0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wLyIgeG1w + TU06T3JpZ2luYWxEb2N1bWVudElEPSJ4bXAuZGlkOjJGQzkyMzc0Rjk0OUU0MTE5NjNCQjRENDMzQjlC + MUM4IiB4bXBNTTpEb2N1bWVudElEPSJ4bXAuZGlkOkVENUYwQThBNEQyOTExRTQ5QzUzQzdFMkFGQkQy + NTA1IiB4bXBNTTpJbnN0YW5jZUlEPSJ4bXAuaWlkOkVENUYwQTg5NEQyOTExRTQ5QzUzQzdFMkFGQkQy + NTA1IiB4bXA6Q3JlYXRvclRvb2w9IkFkb2JlIFBob3Rvc2hvcCBDUzYgKFdpbmRvd3MpIj4gPHhtcE1N + OkRlcml2ZWRGcm9tIHN0UmVmOmluc3RhbmNlSUQ9InhtcC5paWQ6MkRGNkEzOUYyOTRERTQxMUIzNkJE + NUVDQjU5MzE1NjIiIHN0UmVmOmRvY3VtZW50SUQ9InhtcC5kaWQ6MkZDOTIzNzRGOTQ5RTQxMTk2M0JC + NEQ0MzNCOUIxQzgiLz4gPC9yZGY6RGVzY3JpcHRpb24+IDwvcmRmOlJERj4gPC94OnhtcG1ldGE+IDw/ + eHBhY2tldCBlbmQ9InIiPz6npMy1AAAGEUlEQVRIS7WVeVDUZRjHf7Ase8ECu+wl4LIXcqyyHC783AWW + 5QaRFTHkMi9SQvE+UhLzwk0BUcQSgQBBgcYDzStMSzOPcpqcmo5pmqk/+rOapqb+iG/PbzfFcSz/6pn5 + zPN739/7fp/nvZn/3TSLjj+XJy2/RaItPCT5vaBd8m1+q2Qku1lcrcvki+iXr7fFU6ZZeOx5KDU1b7jU + 1Z2bVPMPWNMbRXrXkWAc+ywVLbcS8fKwFjlu8VdpW0XzSc6f8PEIPzJ19dFnU3WEJdHL9P3X9O1nkdB8 + CQrX7i3mKn9zfqsUq29ZsPfjRBx5aMO2cTMy94gm7FuF7XyJTwDJTo5GVdHxNALVgsPd5Ceye+9g8b0f + UXbjB8RtH4Msd+MeXS7f6twjxbILZiy7pEHDtTBsvG7BqivTUXpsClLWCbtJNpDwBlGVH3ySIFV520eW + nedRcf0HVJGwbeRrOHs/h2n1CGRZDe7wND/W1hiI8sEYlJ4KRcVpJcrfVqByNBILhqLh3KeA+UXBOpL2 + jkRZduARPGXZ/vH4pnMou/gd7INfIPn4QyQc/RSOzk9hrBtEiKPerUn1Y5PXBaDojWlwdgUjr0+G/H4Z + cnpCUNJrQNZ+LeLrBD/LYnixFEDAKFz7vJQ0r49dO4zikS8x8/ADxLd9jIT2B5ix/z7SX78Pw+K3EJy2 + wq1M4rEz6sRwthgw82Ag2KNS2I5JPZ4rZx00ImGNHIZSfisFkDGhxbs5AkKLd/3kaLkDlgTjXrsNc/Md + mPfeQeyOD2HbcRu6yi4E2Wrd8ngeG71IBPtePWa4JUhsD0DykQAkHQqApUWCFLcGyZvDoZ/P/5oCTGXk + hU2MvGB7rbGmG47dd2Fa+x6iX/kAMa/eQvS2m4jaeAPspvcROb8TQexid3CcL2usFCJjnwE5nQYU9RhR + PGDC7D4TCrqMyDqkR9oePbRz/SZEKh8rI8vdyshyXhmzLD8DS/1VGOquwtgw7glkXH0Nhvp3kbL2GrSl + hyC11ril03xZfbkQKZuVsDeq4NihRtYuDbJ2auBoUsO2TQXrJiWMlWIExflWMiHOjRzfJy0bg776HCKX + vANd7WXol1/xeN3Si7A2XIXW1YbAxAq3UO0zPTSd1yG38bplLK//vxBrffKY4PQ1HH9aKk8jonQUUyvO + Qlt9HtqaCx4/tXIMyXWXMXXOAQTEv+D2zCvDhBBTCN1zCGOCZq3k+DXO1YcpRYOY4hpF2LzTCCs74/VE + 3IvnEVd1EhGFblBbWot6BKXWQZq64tlYa2+TuJwQM9KU5cRL35hyOxCe2w913hA0hcPQFI16KRzxEFtO + a1Q9htSVN5C+5S5x7x/uIm3DR7CvuomUReOImt1FU7nwEolHECImMGkJE5i46EJkejNM+X1QOPqhzBqC + KvskVDmnJuHKT/K4bgjKzBMItXcjJv84NOwWiKPndJK40TOCgPgaRmIur1dZ1yM6txvyWT0ITR+AImOQ + gg39N1ybDBJP60PorC5My3oTwQm18FdNryBxbq0EJL6AEUTYZBTkF0NGKyKdvZDb3qJOAxSIOqcP/jtp + JyC3D1BSvYgp6EN4aiNlP/cTEk4gFASPEUeXkWd8RaY5jcrEBkTn9UCT4Q3gzfBfRvJE9rrsfpicHSRe + NsFXmJeSXhTBXXY+jMjk8uArVkpExuKb6pkbYJ7L7Ria37xTUBeMeCkcncRTN0z/TyLKNYy4khNQJq2G + IMLBXdUWQkXwCYYR6md7IPP1k8WEC3UFDzSpG2BZeAZJtXQWFpyls3HOC50JzkdQnbFqDInLLiC2rBcq + 6xoSzzzP+NDVwDBaQkx4XzahNv8xZH48sVotCHeOUnnCWNJG18Q4UjddB7vlfbBbPwC7+YannLTyIrS5 + OyHU5v3hr07poL7JBHe4Jh8bzgQROY8h46IKCAVfbi73D3PcpfoJlX0VtEVN0JXsQlj2ZoRaaynj7N/8 + NfZLPLFmHrXnpiWSCCL8iMl32T/M6YGMq+R+covD7QADwfoIgqt4QVGtfvIZJ4lRv5CY4zypbjfjy+eE + M4l4gtuSwYSQ4DS4EZAew/wNiCYQJlvQU3cAAAAASUVORK5CYII= @@ -1054,142 +1272,6 @@ R2K5fxKLWbbp/7Dc0CBY8Q+pPmOq0VkzzQAAAABJRU5ErkJggg== - - - iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAZdEVYdFNvZnR3YXJlAEFkb2JlIEltYWdlUmVhZHlxyWU8AAADZmlUWHRYTUw6Y29tLmFkb2Jl - LnhtcAAAAAAAPD94cGFja2V0IGJlZ2luPSLvu78iIGlkPSJXNU0wTXBDZWhpSHpyZVN6TlRjemtjOWQi - Pz4gPHg6eG1wbWV0YSB4bWxuczp4PSJhZG9iZTpuczptZXRhLyIgeDp4bXB0az0iQWRvYmUgWE1QIENv - cmUgNS4zLWMwMTEgNjYuMTQ1NjYxLCAyMDEyLzAyLzA2LTE0OjU2OjI3ICAgICAgICAiPiA8cmRmOlJE - RiB4bWxuczpyZGY9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkvMDIvMjItcmRmLXN5bnRheC1ucyMiPiA8 - cmRmOkRlc2NyaXB0aW9uIHJkZjphYm91dD0iIiB4bWxuczp4bXBNTT0iaHR0cDovL25zLmFkb2JlLmNv - bS94YXAvMS4wL21tLyIgeG1sbnM6c3RSZWY9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlw - ZS9SZXNvdXJjZVJlZiMiIHhtbG5zOnhtcD0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wLyIgeG1w - TU06T3JpZ2luYWxEb2N1bWVudElEPSJ4bXAuZGlkOjJGQzkyMzc0Rjk0OUU0MTE5NjNCQjRENDMzQjlC - MUM4IiB4bXBNTTpEb2N1bWVudElEPSJ4bXAuZGlkOjlDMzFEOUI4NEFBRjExRTQ4OTA5OUYwQ0QzM0Q2 - NEI4IiB4bXBNTTpJbnN0YW5jZUlEPSJ4bXAuaWlkOjlDMzFEOUI3NEFBRjExRTQ4OTA5OUYwQ0QzM0Q2 - NEI4IiB4bXA6Q3JlYXRvclRvb2w9IkFkb2JlIFBob3Rvc2hvcCBDUzYgKFdpbmRvd3MpIj4gPHhtcE1N - OkRlcml2ZWRGcm9tIHN0UmVmOmluc3RhbmNlSUQ9InhtcC5paWQ6MDk5Mzk2NTZBRjRBRTQxMTk3NEFD - QUFFQjRCMzVENkUiIHN0UmVmOmRvY3VtZW50SUQ9InhtcC5kaWQ6MkZDOTIzNzRGOTQ5RTQxMTk2M0JC - NEQ0MzNCOUIxQzgiLz4gPC9yZGY6RGVzY3JpcHRpb24+IDwvcmRmOlJERj4gPC94OnhtcG1ldGE+IDw/ - eHBhY2tldCBlbmQ9InIiPz73sIMwAAADIElEQVRIS7WVa0iTYRTH56Uiysvm3TkvpLl5DRIvQYWVWl+6 - iNEVg0yhQqloQZHkLT+Y0YdAs75IpEUhzERZoZhsRpZlS7soblotsRwoxhqWeTrnYZtv+u7NsB74cZ5z - zv89/z17HzYRAPxXeIv/EpFXcOyi4BvKhfehv4FvKBfeh+ayqIUDlIgBgT8whpRYoT2fhgvNVJKBQT9s - hB8/QZDPpnEIjEhg0J5Pw4Vm0mwygG9T06BSqQQhTUhUMoRGpyxYT7OZwfhXC6jVakFIYzNYqN5uMGKa - BI1GIwhpghXJaJJi13d0dEB2bj74hsWzSDlXbzfQG02g0+kEIU2wIomdovzKdVifngnFFytBeb4cLN+n - WaSc6hfKKqB/eHTWoHfwExgMBkFII5MnQUD4WlAWloO26wVs35MDmifPmQFFyqlO/aKKqlmDp31DYDKZ - BCGNTJ4IPqHx8LJvACbNUw7p6e2HuJQMNIhhBuaHj3vBYrEI0tb1BoIiE9kJ9h7Oh7EJM+g/jEJuwVlY - s24ri5RTnfo5BedAIoueIYPumvomuHzjzm9cq2uCq7UNUH2rEarr7kNd0yP26Y+eKoSWtk4wfpmAg7kn - ITY5DUorq1g8cOQEqze3aplOEhRtJoMcL1mMTixV9IgD5a/tSBVDYql8AKOBQLEJtTP08gY/jjFiktKg - 5FIV21Ok3NazvmR2AvrFkCAJyGYk1comZAuHDM/AyLvHThfBveZ26NOPwI59eey7LsbhFCmnOvVJ5+Ef - rrYZLEU8EZ85+HLwW7ZCLMVTFWdkHoLut+/hgbYHaE9XN31XNsupTrWV3jKVs+uS3cyAD0cLe331jW3Q - qRt0CPUlQVHDKI+fN9iGo4W90uNnyuA2vvRtWTlQgxeg/dk7FimnOvU9/CNqUe47b7ANRwt7AfjpKvAK - Gt18Qur35ymhRfsKKLr5hN7EyzDq7humWrrcfSfKxbz/QlwcLDck1snZJdUzYHUDmk57+K1qdXJyzsL6 - RmQD9ZmObygXB8sVIRO6fXQB4hC6eRQppzr1XXmHclnAckFomLc1Um5dItEvhZ97MQXP9N0AAAAASUVO - RK5CYII= - - - - - iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAZdEVYdFNvZnR3YXJlAEFkb2JlIEltYWdlUmVhZHlxyWU8AAADZmlUWHRYTUw6Y29tLmFkb2Jl - LnhtcAAAAAAAPD94cGFja2V0IGJlZ2luPSLvu78iIGlkPSJXNU0wTXBDZWhpSHpyZVN6TlRjemtjOWQi - Pz4gPHg6eG1wbWV0YSB4bWxuczp4PSJhZG9iZTpuczptZXRhLyIgeDp4bXB0az0iQWRvYmUgWE1QIENv - cmUgNS4zLWMwMTEgNjYuMTQ1NjYxLCAyMDEyLzAyLzA2LTE0OjU2OjI3ICAgICAgICAiPiA8cmRmOlJE - RiB4bWxuczpyZGY9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkvMDIvMjItcmRmLXN5bnRheC1ucyMiPiA8 - cmRmOkRlc2NyaXB0aW9uIHJkZjphYm91dD0iIiB4bWxuczp4bXBNTT0iaHR0cDovL25zLmFkb2JlLmNv - bS94YXAvMS4wL21tLyIgeG1sbnM6c3RSZWY9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlw - ZS9SZXNvdXJjZVJlZiMiIHhtbG5zOnhtcD0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wLyIgeG1w - TU06T3JpZ2luYWxEb2N1bWVudElEPSJ4bXAuZGlkOjJGQzkyMzc0Rjk0OUU0MTE5NjNCQjRENDMzQjlC - MUM4IiB4bXBNTTpEb2N1bWVudElEPSJ4bXAuZGlkOjhDMTdBQjRENEFBRTExRTQ4QjQyODY0MDNBNTJE - NzNCIiB4bXBNTTpJbnN0YW5jZUlEPSJ4bXAuaWlkOjhDMTdBQjRDNEFBRTExRTQ4QjQyODY0MDNBNTJE - NzNCIiB4bXA6Q3JlYXRvclRvb2w9IkFkb2JlIFBob3Rvc2hvcCBDUzYgKFdpbmRvd3MpIj4gPHhtcE1N - OkRlcml2ZWRGcm9tIHN0UmVmOmluc3RhbmNlSUQ9InhtcC5paWQ6NUQyMjc4QTlBQjRBRTQxMTk3NEFD - QUFFQjRCMzVENkUiIHN0UmVmOmRvY3VtZW50SUQ9InhtcC5kaWQ6MkZDOTIzNzRGOTQ5RTQxMTk2M0JC - NEQ0MzNCOUIxQzgiLz4gPC9yZGY6RGVzY3JpcHRpb24+IDwvcmRmOlJERj4gPC94OnhtcG1ldGE+IDw/ - eHBhY2tldCBlbmQ9InIiPz4eHsDfAAAB00lEQVRIS7XVWytEURQH8HniTTNHLs0NCXNcXjTN5dH9g/gM - 3jx590QhFDJS0gyTGmpqaqJIMW4hzlAoOaWISS7LWifntI3ddnTGrl92e/57/We/DBsA/CvuYSHZSr0t - lvCGsriX/oI3lMW9lM/SwgF9SEHwizs08IX2vAyLZvZRgXJ+cQWv7yB0q96Ds86voT0vw6KZNJsK4Pnl - DWKxmBBlqhpDUN0UNp2n2VrB/WMOEomEEGX0ArN5o+BGfYB0Oi1EGa8cwpKw6bxRcH6lQiaTEaKMVw5q - rzCbNwr2z65BURQhynh8Qe0VZvNGwdZBFlRVFaKMxxfQXmE2rxc8rW3sQy6XE0puHoG7IaC9YnV9j5th - pbZPqOCDCrbH5uIwOD7/zWgkDkNTizAyuwQjkWWIxFNQWduqmVxI/MiPz6/A8HTUuDMTTYLkbrqhgt5S - T3PG4ZJ3HE7focElZx0u3yn+VQiG1ZLymmm7s74f88f42S6bl9zyJZ6d6Xckd+Mt5ieogH4xJORHHajt - SzvqZPSgECpHZSiA2DztuxBlad+NgnpBEbIjusiiYboKRF+kGFHegUR5ImkFv7G0eAPzWVq8gfksLd5/ - oULiHhYS97BwwPYJlSCUgVubViQAAAAASUVORK5CYII= - - - - - iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAZdEVYdFNvZnR3YXJlAEFkb2JlIEltYWdlUmVhZHlxyWU8AAADZmlUWHRYTUw6Y29tLmFkb2Jl - LnhtcAAAAAAAPD94cGFja2V0IGJlZ2luPSLvu78iIGlkPSJXNU0wTXBDZWhpSHpyZVN6TlRjemtjOWQi - Pz4gPHg6eG1wbWV0YSB4bWxuczp4PSJhZG9iZTpuczptZXRhLyIgeDp4bXB0az0iQWRvYmUgWE1QIENv - cmUgNS4zLWMwMTEgNjYuMTQ1NjYxLCAyMDEyLzAyLzA2LTE0OjU2OjI3ICAgICAgICAiPiA8cmRmOlJE - RiB4bWxuczpyZGY9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkvMDIvMjItcmRmLXN5bnRheC1ucyMiPiA8 - cmRmOkRlc2NyaXB0aW9uIHJkZjphYm91dD0iIiB4bWxuczp4bXBNTT0iaHR0cDovL25zLmFkb2JlLmNv - bS94YXAvMS4wL21tLyIgeG1sbnM6c3RSZWY9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlw - ZS9SZXNvdXJjZVJlZiMiIHhtbG5zOnhtcD0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wLyIgeG1w - TU06T3JpZ2luYWxEb2N1bWVudElEPSJ4bXAuZGlkOjJGQzkyMzc0Rjk0OUU0MTE5NjNCQjRENDMzQjlC - MUM4IiB4bXBNTTpEb2N1bWVudElEPSJ4bXAuZGlkOjJEMDQyOEZBNEFEMjExRTRBN0MxRDBCNzJGRUND - MDEzIiB4bXBNTTpJbnN0YW5jZUlEPSJ4bXAuaWlkOjJEMDQyOEY5NEFEMjExRTRBN0MxRDBCNzJGRUND - MDEzIiB4bXA6Q3JlYXRvclRvb2w9IkFkb2JlIFBob3Rvc2hvcCBDUzYgKFdpbmRvd3MpIj4gPHhtcE1N - OkRlcml2ZWRGcm9tIHN0UmVmOmluc3RhbmNlSUQ9InhtcC5paWQ6QkRDRkI1RDVEMTRBRTQxMTk3NEFD - QUFFQjRCMzVENkUiIHN0UmVmOmRvY3VtZW50SUQ9InhtcC5kaWQ6MkZDOTIzNzRGOTQ5RTQxMTk2M0JC - NEQ0MzNCOUIxQzgiLz4gPC9yZGY6RGVzY3JpcHRpb24+IDwvcmRmOlJERj4gPC94OnhtcG1ldGE+IDw/ - eHBhY2tldCBlbmQ9InIiPz59jfe3AAAEbUlEQVRIS8WTeUybZRzHF48/pnFOuQRajkFLgQFb5iRLNJr4 - l/EPgsniUI4xZDAY1zyxwApsMJyIME61rByl3DfoYGBrgbWUY06FcZSCha4rQ8jYxkqPr2/fvkv8o2Sg - S/wkT970eb6/T5/39z7Prv8dt/Oql4mR4HZJ3ccoXFxhVCzB9DT9JueJdSq6c1wzVZFupepVzxu34XVj - CaEDi1jX6hF8ZQoeokl4iBVwzV9YdU1XRlIl28eVo8phCdXwGltEeOUsro6psaHVwcSDh5volc4iOO8X - 7KuVwb1hEi7J8myq9PEQO//I85oafr0KtEpUpNSETm+AwWDAvfv3YTQaybnm/t/AyO6Ga+UonJOnIijF - 1hA9tWI2qle9RxcI+RIpmZpTIfBULhIyyqHVahHPKcN70TmYnFFCp9OhqXcc9KwW0DOHVl3YU1aUyjJu - F1SpfhO3EM6bMMsVt+D8Zhz2HIpC4oU6bG5uIu4cD3tfTwAjIBNypQYbGxsISquBU34PaDHiVEplGXee - SuIjVaBv3Lz7gJg8vHg4FlZvc+ATVoLipiHsD8qCXWAO7IPK8MG5FjLXKboOeoYADkldUkplGWb7vOb4 - 4BzxIXXQE/1m59WDXdgBvxPfwz6UC4eQUth/WIBDZ2qQXj+K7IYRImeE5s5fOFrcDPvPapcJzVNmmwVY - VxWG9U09uau1tTVymPpc0iYFLew7OEUJ4BwtALfvJpl5xMrKCu6s3cUrn5YbCM1us80CrJZZVWjXr7j3 - 4CE0y8v4IrcaH+cK4Bv+DRyPl8ApphYuia3wZ3eCUzOA1PIfcVuzjHnlIgK/vgy7mHzTG+w12yzA5E53 - edYPo1c2i/X1dQTEfwvbwDQ4hhXg8OcN4P48Df+UTrgkNIAeW4Hg3Hbo9Xq0iGSgs4ls5CUhoXnObLOA - S8pkhG/bdZzgDZJnffT3GXieLAA9XgB2/RjZjuQqMWhxfBw824H55XWyhcfy+HDNqoB1SH4Codn6G7iw - p3d78EaVPlXX0CaZgkqlgly1gpCiK0htHCH/IL6oFcEF3ZjT3CUvXqv0DzDSS0FPq1a/8EbYS5Rqa+if - SAJ8KoeNR7gitEsnoVQqSbGOkJmYX1ggxaY70SabwIGMUrjn8I3WIXnBRPnWu/8nDnE9Sd7cAaP/ZSES - 6/rRKJRArpiHXC7HzekZNIukiCyrhW9mGZgXa4w2kUVnibJnzdXbxP5URzyDO4QjxGl5i9uNpMZeKP5U - IrywAq9yCnGAOGGMonbYxpVnEPGdyR9BO/MTj8kfgXeNFPt5IngVtoF1kQ9WcTs8qgfgmNreQMS21xZL - 0E6Ln6ef75tg8sfgXT8O77oReAkkYNXJ4PRV/4ztyfo9VPTf4xjdf9CpQKzdxxuGe6UMbhXEmc8V6mze - r3qNivx3HGN7UmglQ6CVDMIxXwybo5UcaunJQD8te9rhyx4JrWwItlGNUut3y5+hlp4cDhFCpl14k9jq - nR+Y1NTjIe7NlmMnWKoHsOtvjWYcKpheqFQAAAAASUVORK5CYII= - - - - - iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAZdEVYdFNvZnR3YXJlAEFkb2JlIEltYWdlUmVhZHlxyWU8AAADZmlUWHRYTUw6Y29tLmFkb2Jl - LnhtcAAAAAAAPD94cGFja2V0IGJlZ2luPSLvu78iIGlkPSJXNU0wTXBDZWhpSHpyZVN6TlRjemtjOWQi - Pz4gPHg6eG1wbWV0YSB4bWxuczp4PSJhZG9iZTpuczptZXRhLyIgeDp4bXB0az0iQWRvYmUgWE1QIENv - cmUgNS4zLWMwMTEgNjYuMTQ1NjYxLCAyMDEyLzAyLzA2LTE0OjU2OjI3ICAgICAgICAiPiA8cmRmOlJE - RiB4bWxuczpyZGY9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkvMDIvMjItcmRmLXN5bnRheC1ucyMiPiA8 - cmRmOkRlc2NyaXB0aW9uIHJkZjphYm91dD0iIiB4bWxuczp4bXBNTT0iaHR0cDovL25zLmFkb2JlLmNv - bS94YXAvMS4wL21tLyIgeG1sbnM6c3RSZWY9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlw - ZS9SZXNvdXJjZVJlZiMiIHhtbG5zOnhtcD0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wLyIgeG1w - TU06T3JpZ2luYWxEb2N1bWVudElEPSJ4bXAuZGlkOjJGQzkyMzc0Rjk0OUU0MTE5NjNCQjRENDMzQjlC - MUM4IiB4bXBNTTpEb2N1bWVudElEPSJ4bXAuZGlkOjJERTg4QTFENEQyMjExRTRBODEyODk0M0RBMTc5 - Qjg3IiB4bXBNTTpJbnN0YW5jZUlEPSJ4bXAuaWlkOjJERTg4QTFDNEQyMjExRTRBODEyODk0M0RBMTc5 - Qjg3IiB4bXA6Q3JlYXRvclRvb2w9IkFkb2JlIFBob3Rvc2hvcCBDUzYgKFdpbmRvd3MpIj4gPHhtcE1N - OkRlcml2ZWRGcm9tIHN0UmVmOmluc3RhbmNlSUQ9InhtcC5paWQ6NjJGOUEyRDEyMTRERTQxMUIzNkJE - NUVDQjU5MzE1NjIiIHN0UmVmOmRvY3VtZW50SUQ9InhtcC5kaWQ6MkZDOTIzNzRGOTQ5RTQxMTk2M0JC - NEQ0MzNCOUIxQzgiLz4gPC9yZGY6RGVzY3JpcHRpb24+IDwvcmRmOlJERj4gPC94OnhtcG1ldGE+IDw/ - eHBhY2tldCBlbmQ9InIiPz6wJF34AAACl0lEQVRIS62Vy08TURSH73/QhQtXVnBhxEcMiUkhbEg0hB1R - Q1i68C8wIW5cEqMLN7ho2Ji4YiEhWq0prYUhfULbadN3obTaChobtZEUsFY9nnPS6WM6HYowyZf87j33 - nG/amaai9geOBYA+4pTxihmBE8DcTQB4J8em/9IwSQyagmrtL+z9rMFmvnhkKvtV7tcVHPz6DVsftulA - AckdhUg8zf19eoLKAd597iMLMItewfOxUDTN/bqCH3tVSG8VWIBZ9AoJApEk9+sKvu/uQ2IjzwJkGtH8 - OrTwy3Hu77vIAnV9mgWlcgWiqRwLjAMmkOMbPbNTKnN/JJntqJGEBZ++7oKcyLLgLN4JrU8Cms2C4pcy - BKKZumCI18temQ/8DzSLZlBmQX7nG/jCKdpgAa0driCtY5iFHuqHSjNoFtaags1iCdzBBG+QgNY2aZ0F - mIUe6osENAtrTUEq/7kDq9PHAszU5yYoq9f1i9cUSCD5ozxDEeTsrhAoONwyxLLb8MrhYQFmZYCHsnpd - v3hNgQROb5hnKIK29944MAThTBEWbS4WYBZ6qC/sKSy5ZJ6BGUQg8b4Bbhjod4AZXlhXWdBa10LrIVul - AM9ggS+aa6AIMMO8ZYUO0KeyIOMtZyaQpXpNi4LFucYzMINwhbMNcMNw5oIJMMNKIA0LNg88mZuH/ssj - dPgBMnN+cBRmny1wrRtSMMMzWCCFMg0UAeY2Fh0+GL5xG8Zu3oHXUrCj3g0WONdTbeBm21/o1N17gPtg - 98Xh3VoS3qzKMDI22agfglnY/Uld8NDc/ZlZwAwvl4Ngun6LGh8rdfVDViNs3rguOOzq6XOD8PDpc7g2 - OkHDH7XWtYa2It66Y4eCQ8cRfpvUNa2hTUD8A6JMaBvCyTdJAAAAAElFTkSuQmCC - - iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 @@ -1403,7 +1485,7 @@ AAAASUVORK5CYII= - + iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 YQUAAAAZdEVYdFNvZnR3YXJlAEFkb2JlIEltYWdlUmVhZHlxyWU8AAADZmlUWHRYTUw6Y29tLmFkb2Jl @@ -1415,108 +1497,26 @@ bS94YXAvMS4wL21tLyIgeG1sbnM6c3RSZWY9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlw ZS9SZXNvdXJjZVJlZiMiIHhtbG5zOnhtcD0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wLyIgeG1w TU06T3JpZ2luYWxEb2N1bWVudElEPSJ4bXAuZGlkOjJGQzkyMzc0Rjk0OUU0MTE5NjNCQjRENDMzQjlC - MUM4IiB4bXBNTTpEb2N1bWVudElEPSJ4bXAuZGlkOkUzNzJDMjE3NEFENjExRTRCNjE0OEVEQzI4MEM0 - RTZDIiB4bXBNTTpJbnN0YW5jZUlEPSJ4bXAuaWlkOkUzNzJDMjE2NEFENjExRTRCNjE0OEVEQzI4MEM0 - RTZDIiB4bXA6Q3JlYXRvclRvb2w9IkFkb2JlIFBob3Rvc2hvcCBDUzYgKFdpbmRvd3MpIj4gPHhtcE1N - OkRlcml2ZWRGcm9tIHN0UmVmOmluc3RhbmNlSUQ9InhtcC5paWQ6RkI3NUQ0QkNENDRBRTQxMTk3NEFD - QUFFQjRCMzVENkUiIHN0UmVmOmRvY3VtZW50SUQ9InhtcC5kaWQ6MkZDOTIzNzRGOTQ5RTQxMTk2M0JC - NEQ0MzNCOUIxQzgiLz4gPC9yZGY6RGVzY3JpcHRpb24+IDwvcmRmOlJERj4gPC94OnhtcG1ldGE+IDw/ - eHBhY2tldCBlbmQ9InIiPz6PyaLfAAADMElEQVRIS6VUXUiTYRT+vi3Tzd+ps23+3KRigtiPkolEQReG - UYTkhWatpWlWGkRdddfdSPImqUAJjSIT00oxLJIk0cR+tFSyzDJtgaMkDEPkdM7ZPvm2vS6jBx6es3Pe - 8zzvtm+TohLS/ov+AACStLgEQuJyLRJWYK1yzh/+FgCoQrpnfM4fOGBhcUlIMkEVkma4H4i1y2kFcMD8 - wqKQZILKZqTqmlTAWrfvMjhgbv63Dwm0hLWQohn1eNEbzrlfPiTQAtZCKjP1GXdAIC+r4XD+9CGBFrDm - RVJ1re6pZ0GyHHMvIawauYVNCFPfvvuQQAtYC6meKXU0amNsaGN/ZR60xIf9aIgN3cpGE9OzZCZ85nEm - pGiWlLABmuJCnUOXrNB7chdct4TUo32ANDbp4NuielDpqWfePdaPX6GrohSK4uLhlCEo96YlZLbOFHzH - oJXjMSBcGn4/zQGovEDqXXtzeTb+BTrKj0J3+Q54djYP7EZdTU2MPjFSK8eieQR9QtLg6GcOQPWgqKeQ - ZyOfoK30CDw+lg2Ot3Z4VLoNqo269mCNHIa2WjYn9A1PcAAqU6m9VV3TF9psOwwPS3JgZugCdNoyocwU - jU+RlImWBpezGz0vxzkA1YOiHvPFO7Ca1kGHLQtmXp2HdutmqN+/F6JiU+h3kOpyVeHJwBgHoLIpqajm - 189HoaG4CNqsGTA1UAWth9Lg6r490PygGyLjUikgzuWqQlffCAegelDdUwLqigqhpXgjTPYeh+bCFCg2 - RkEk3vxuVz/P0c43oLP3DQegLhspNalSFxiNcLswHT48LYNbBUlQk7ebzenmyhm08w1o7xmiAP6hRZiT - 70eYkzpctUuJWdHmwWs74+F1Uz7cyE+E4ohQB5mHm9a3GywpTXzektyKduIAIsKI3ISkL4rIdYle05C9 - VrZVBmvtl7eboUyv7V4jSQdwRn8FdI72iErtCUxnIuifkJ5hUqUOq9Jr7OeCNU6bTpNVqtMcDJSldOwn - KnOk+jypJ5QANRWc0cs5SEelXr54QidfwVYAMoiHq4W/gNM6OaNCJ+diaUIqN/43+Atwg27t+9ZXBUn6 - A2MdqQeVc5pWAAAAAElFTkSuQmCC - - - - - iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAIAAABvFaqvAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAZdEVYdFNvZnR3YXJlAEFkb2JlIEltYWdlUmVhZHlxyWU8AAADZmlUWHRYTUw6Y29tLmFkb2Jl - LnhtcAAAAAAAPD94cGFja2V0IGJlZ2luPSLvu78iIGlkPSJXNU0wTXBDZWhpSHpyZVN6TlRjemtjOWQi - Pz4gPHg6eG1wbWV0YSB4bWxuczp4PSJhZG9iZTpuczptZXRhLyIgeDp4bXB0az0iQWRvYmUgWE1QIENv - cmUgNS4zLWMwMTEgNjYuMTQ1NjYxLCAyMDEyLzAyLzA2LTE0OjU2OjI3ICAgICAgICAiPiA8cmRmOlJE - RiB4bWxuczpyZGY9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkvMDIvMjItcmRmLXN5bnRheC1ucyMiPiA8 - cmRmOkRlc2NyaXB0aW9uIHJkZjphYm91dD0iIiB4bWxuczp4bXBNTT0iaHR0cDovL25zLmFkb2JlLmNv - bS94YXAvMS4wL21tLyIgeG1sbnM6c3RSZWY9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlw - ZS9SZXNvdXJjZVJlZiMiIHhtbG5zOnhtcD0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wLyIgeG1w - TU06T3JpZ2luYWxEb2N1bWVudElEPSJ4bXAuZGlkOjJGQzkyMzc0Rjk0OUU0MTE5NjNCQjRENDMzQjlC - MUM4IiB4bXBNTTpEb2N1bWVudElEPSJ4bXAuZGlkOjUzQzNGNDI5NEQyQzExRTQ4QkE1QUNCMEVDRDZF - MDVEIiB4bXBNTTpJbnN0YW5jZUlEPSJ4bXAuaWlkOjUzQzNGNDI4NEQyQzExRTQ4QkE1QUNCMEVDRDZF - MDVEIiB4bXA6Q3JlYXRvclRvb2w9IkFkb2JlIFBob3Rvc2hvcCBDUzYgKFdpbmRvd3MpIj4gPHhtcE1N - OkRlcml2ZWRGcm9tIHN0UmVmOmluc3RhbmNlSUQ9InhtcC5paWQ6RkI1NUY4OTYyQTRERTQxMUIzNkJE + MUM4IiB4bXBNTTpEb2N1bWVudElEPSJ4bXAuZGlkOjJERjY3MEZENEQyMzExRTRCNDlGQUMwMzk0OTAw + Qzc4IiB4bXBNTTpJbnN0YW5jZUlEPSJ4bXAuaWlkOjJERjY3MEZDNEQyMzExRTRCNDlGQUMwMzk0OTAw + Qzc4IiB4bXA6Q3JlYXRvclRvb2w9IkFkb2JlIFBob3Rvc2hvcCBDUzYgKFdpbmRvd3MpIj4gPHhtcE1N + OkRlcml2ZWRGcm9tIHN0UmVmOmluc3RhbmNlSUQ9InhtcC5paWQ6NjhGOUEyRDEyMTRERTQxMUIzNkJE NUVDQjU5MzE1NjIiIHN0UmVmOmRvY3VtZW50SUQ9InhtcC5kaWQ6MkZDOTIzNzRGOTQ5RTQxMTk2M0JC NEQ0MzNCOUIxQzgiLz4gPC9yZGY6RGVzY3JpcHRpb24+IDwvcmRmOlJERj4gPC94OnhtcG1ldGE+IDw/ - eHBhY2tldCBlbmQ9InIiPz6IsaOmAAADF0lEQVQ4T62U/UuTURTH+0nICqRI1ERMMyNQe8N0ChqBwQhN - yvwhEgJjVCqJ/qCibZo6tzQ339h6Nre5prapUzc1XzItX1ilzuWMLLVAen+xf6DTuTxjdxsFVj58ebjc - c+7nnud7z3228DbpIaDFH/CfoqCn72DIDvNfPDM2KAqyr8PcJxqY+QBTb8kkjocXQTsKigGwfqYJHqIg - 1OxHGHvlWPx4hXB1YyA3g4CBhqst+piEnrDA3rA95vBAY1x8d7lq/DVZwm5PQZNvoKYdypSgHgbVEIh1 - cLOZzOCbSSsyRQRba6uWtcpVLbPcwlglInNUCJNWWKqABqMLCGvGlfpJELaQ/V1Vd1lujAhe0chtUrH5 - ZExnmJ85MdomEa+qZMbIEF2BHGunILSjdZwYgTt4gJqjjj0Rltml1Zq9AeL0Mn71Wn2mtDU80MIvsFTw - O+KPIoWC8BNYRIUaqrRQroJKjQOk9N+xLBF2pXJFKfnsDGYa8gS6xOO2whyMuoHaHpGzZ/pBM0IMrtXD - nT4HqNHXe0lYoogMFeQP4jbSDkCPTUyXmnNoPutSo+9WN5DEQDyeWCWnhqm4p7Oimt3b54rzmmKPVHKz - 0Xg0AU1pz87VJp+yXOfd9t3mBmLXsGrsJhSsDtF4iOWxKdpzyQNnuRW7vEUp13obFG05OVUBPtO5V1Sn - k5q4SX8ENfWA6C7xHsP981Bb2sf38ZKd4JhSuXUJHPHhg/WJnAeZFw0Xzt/w8erRtLmBnB/CSmaC599I - 2PYVRl+CXigu3R9SfCC0Pf1MZ1oqvqvjogX7gtRFJfb1n24g7GblfQcFP2fkBYm5anxqQcbLKgzyK/Df - WRTkV5+RMTg84ZrgAOHo4ZIDVNdJw67CpsVLZ5gifj97Typlq2ZFQXj8LKh5EHpnaIar8N+Al5l9Y9Vs - T7OiIAzjqaMsa6QJnBkeWvgOHdPkAuIV67PSeQpCYYZplsZ+KyyWLRyFF8D553EDbURY770J0rrYJbda - SYE4iWb9NcgpRKDrOMAWwYP6d5BTaC52zyaAWDlAm/DweL8AX9zXukfxHsIAAAAASUVORK5CYII= - - - - - iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAZdEVYdFNvZnR3YXJlAEFkb2JlIEltYWdlUmVhZHlxyWU8AAADZmlUWHRYTUw6Y29tLmFkb2Jl - LnhtcAAAAAAAPD94cGFja2V0IGJlZ2luPSLvu78iIGlkPSJXNU0wTXBDZWhpSHpyZVN6TlRjemtjOWQi - Pz4gPHg6eG1wbWV0YSB4bWxuczp4PSJhZG9iZTpuczptZXRhLyIgeDp4bXB0az0iQWRvYmUgWE1QIENv - cmUgNS4zLWMwMTEgNjYuMTQ1NjYxLCAyMDEyLzAyLzA2LTE0OjU2OjI3ICAgICAgICAiPiA8cmRmOlJE - RiB4bWxuczpyZGY9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkvMDIvMjItcmRmLXN5bnRheC1ucyMiPiA8 - cmRmOkRlc2NyaXB0aW9uIHJkZjphYm91dD0iIiB4bWxuczp4bXBNTT0iaHR0cDovL25zLmFkb2JlLmNv - bS94YXAvMS4wL21tLyIgeG1sbnM6c3RSZWY9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlw - ZS9SZXNvdXJjZVJlZiMiIHhtbG5zOnhtcD0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wLyIgeG1w - TU06T3JpZ2luYWxEb2N1bWVudElEPSJ4bXAuZGlkOjJGQzkyMzc0Rjk0OUU0MTE5NjNCQjRENDMzQjlC - MUM4IiB4bXBNTTpEb2N1bWVudElEPSJ4bXAuZGlkOkVENUYwQThBNEQyOTExRTQ5QzUzQzdFMkFGQkQy - NTA1IiB4bXBNTTpJbnN0YW5jZUlEPSJ4bXAuaWlkOkVENUYwQTg5NEQyOTExRTQ5QzUzQzdFMkFGQkQy - NTA1IiB4bXA6Q3JlYXRvclRvb2w9IkFkb2JlIFBob3Rvc2hvcCBDUzYgKFdpbmRvd3MpIj4gPHhtcE1N - OkRlcml2ZWRGcm9tIHN0UmVmOmluc3RhbmNlSUQ9InhtcC5paWQ6MkRGNkEzOUYyOTRERTQxMUIzNkJE - NUVDQjU5MzE1NjIiIHN0UmVmOmRvY3VtZW50SUQ9InhtcC5kaWQ6MkZDOTIzNzRGOTQ5RTQxMTk2M0JC - NEQ0MzNCOUIxQzgiLz4gPC9yZGY6RGVzY3JpcHRpb24+IDwvcmRmOlJERj4gPC94OnhtcG1ldGE+IDw/ - eHBhY2tldCBlbmQ9InIiPz6npMy1AAAGEUlEQVRIS7WVeVDUZRjHf7Ase8ECu+wl4LIXcqyyHC783AWW - 5QaRFTHkMi9SQvE+UhLzwk0BUcQSgQBBgcYDzStMSzOPcpqcmo5pmqk/+rOapqb+iG/PbzfFcSz/6pn5 - zPN739/7fp/nvZn/3TSLjj+XJy2/RaItPCT5vaBd8m1+q2Qku1lcrcvki+iXr7fFU6ZZeOx5KDU1b7jU - 1Z2bVPMPWNMbRXrXkWAc+ywVLbcS8fKwFjlu8VdpW0XzSc6f8PEIPzJ19dFnU3WEJdHL9P3X9O1nkdB8 - CQrX7i3mKn9zfqsUq29ZsPfjRBx5aMO2cTMy94gm7FuF7XyJTwDJTo5GVdHxNALVgsPd5Ceye+9g8b0f - UXbjB8RtH4Msd+MeXS7f6twjxbILZiy7pEHDtTBsvG7BqivTUXpsClLWCbtJNpDwBlGVH3ySIFV520eW - nedRcf0HVJGwbeRrOHs/h2n1CGRZDe7wND/W1hiI8sEYlJ4KRcVpJcrfVqByNBILhqLh3KeA+UXBOpL2 - jkRZduARPGXZ/vH4pnMou/gd7INfIPn4QyQc/RSOzk9hrBtEiKPerUn1Y5PXBaDojWlwdgUjr0+G/H4Z - cnpCUNJrQNZ+LeLrBD/LYnixFEDAKFz7vJQ0r49dO4zikS8x8/ADxLd9jIT2B5ix/z7SX78Pw+K3EJy2 - wq1M4rEz6sRwthgw82Ag2KNS2I5JPZ4rZx00ImGNHIZSfisFkDGhxbs5AkKLd/3kaLkDlgTjXrsNc/Md - mPfeQeyOD2HbcRu6yi4E2Wrd8ngeG71IBPtePWa4JUhsD0DykQAkHQqApUWCFLcGyZvDoZ/P/5oCTGXk - hU2MvGB7rbGmG47dd2Fa+x6iX/kAMa/eQvS2m4jaeAPspvcROb8TQexid3CcL2usFCJjnwE5nQYU9RhR - PGDC7D4TCrqMyDqkR9oePbRz/SZEKh8rI8vdyshyXhmzLD8DS/1VGOquwtgw7glkXH0Nhvp3kbL2GrSl - hyC11ril03xZfbkQKZuVsDeq4NihRtYuDbJ2auBoUsO2TQXrJiWMlWIExflWMiHOjRzfJy0bg776HCKX - vANd7WXol1/xeN3Si7A2XIXW1YbAxAq3UO0zPTSd1yG38bplLK//vxBrffKY4PQ1HH9aKk8jonQUUyvO - Qlt9HtqaCx4/tXIMyXWXMXXOAQTEv+D2zCvDhBBTCN1zCGOCZq3k+DXO1YcpRYOY4hpF2LzTCCs74/VE - 3IvnEVd1EhGFblBbWot6BKXWQZq64tlYa2+TuJwQM9KU5cRL35hyOxCe2w913hA0hcPQFI16KRzxEFtO - a1Q9htSVN5C+5S5x7x/uIm3DR7CvuomUReOImt1FU7nwEolHECImMGkJE5i46EJkejNM+X1QOPqhzBqC - KvskVDmnJuHKT/K4bgjKzBMItXcjJv84NOwWiKPndJK40TOCgPgaRmIur1dZ1yM6txvyWT0ITR+AImOQ - gg39N1ybDBJP60PorC5My3oTwQm18FdNryBxbq0EJL6AEUTYZBTkF0NGKyKdvZDb3qJOAxSIOqcP/jtp - JyC3D1BSvYgp6EN4aiNlP/cTEk4gFASPEUeXkWd8RaY5jcrEBkTn9UCT4Q3gzfBfRvJE9rrsfpicHSRe - NsFXmJeSXhTBXXY+jMjk8uArVkpExuKb6pkbYJ7L7Ria37xTUBeMeCkcncRTN0z/TyLKNYy4khNQJq2G - IMLBXdUWQkXwCYYR6md7IPP1k8WEC3UFDzSpG2BZeAZJtXQWFpyls3HOC50JzkdQnbFqDInLLiC2rBcq - 6xoSzzzP+NDVwDBaQkx4XzahNv8xZH48sVotCHeOUnnCWNJG18Q4UjddB7vlfbBbPwC7+YannLTyIrS5 - OyHU5v3hr07poL7JBHe4Jh8bzgQROY8h46IKCAVfbi73D3PcpfoJlX0VtEVN0JXsQlj2ZoRaaynj7N/8 - NfZLPLFmHrXnpiWSCCL8iMl32T/M6YGMq+R+covD7QADwfoIgqt4QVGtfvIZJ4lRv5CY4zypbjfjy+eE - M4l4gtuSwYSQ4DS4EZAew/wNiCYQJlvQU3cAAAAASUVORK5CYII= + eHBhY2tldCBlbmQ9InIiPz6GKmpFAAAC+UlEQVRIS63T20vTYRzH8Yforj/Ei24UiSgKIygKi8oyxZQo + cvNYeXaesmzqPGu2POd0ulSsnIdaurTSTJ3O6UxTPGya5vCQx5AuPn39RbHop7nZxQt+z3ie93e/Z4w1 + p7nsCoBt8R6yBF/UHPv+Wb0rfFFzm99CRIwEW1gnqXzxTXxRc0ydctm4OlID2sxrw6iCtiwItC+A2P/D + frLnjwGNSZdMq6N1WOvLwFpP4l/WdRlY6Jaio9Ab7QXba8sVoDHZGdT8PYS9THDqMGnLsKpNw0qXGCua + BO55VZdNQ6U/DRRibVCGb+N1pH5bukoRqHmDHOIG1N8/X2F4I8WyNhtf2+9hqSsZxqZ4upbb6HsSZLHO + Im90ym6hNVcIaktYTexZyUelGEvaHMy/jcFiZxo0xX5Y7ivGcn8JkVmA9uvlWBmqwpJeAWovs+poR99O + eRgWtQWYVUdgrj0FH+i+F3XF3NoappZYGJrEoLaOVYpOOTY/FGJB+xjTqnDMtMTTAC/Ma/Ix/TLUKl9e + x0JfFQpql7PykBP7lWIXzPeUYLIhHCPKCLr/AMy2ZsKoDLTKdNNdvM8TgNpRTBZwfJ885CTmaIChPhwa + mS+GnkdhqjEWY9X+VplqvIMXEhdQ24mZeuSs0N/BNNWWj4k6EdSZHhhXxWH0aSCGFd4c4Tk7zk7XBlUM + FKLToK4Nm+0qYnneRzqGGiSYaIiiyZdhVCdgqFSIwRJPjucZW85O1pvnRmvDkO9zFNTdy2Y6HjGp4HCF + 5kk4xhoiURd/EROv4tBfeM0qAyUC9Mp9QM0+7o829T6LZV0/mNycS6+nFKFWfAGj9ZHozfGwil7miZYH + 7qCmghsw+S6VpV894KuUuKFbfhNNqa749CwY3dm0toK+VABl3HlQM5obYHybwFLc7W1y/Y5BlX6FfgNn + DNcEY0DhZZX+MiGKbh0DNR24AYYWMSfJzc6GZBApwS5skIzNODcg0dV2V36FtsJ7yBJ8UXO8hyzBFzXH + ++H/A/YDv9/V87iOlrYAAAAASUVORK5CYII= @@ -3164,9 +3164,6 @@ 864, 17 - - 864, 17 - iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 diff --git a/Program.cs b/Program.cs index e38f7b8..a76d0d4 100644 --- a/Program.cs +++ b/Program.cs @@ -16,14 +16,14 @@ [STAThread] static void Main() { - ValidateInfo validateInfo = ValidateConfig.LoadConfig(); + ValidateConfig.LoadConfig(); string localConfigPath = Application.StartupPath + "/Config.xml"; //获取程序及版本信息 string currentVersionCode = Assembly.GetExecutingAssembly().GetName().Version.ToString(); //获取文件版本信息 FileVersionInfo.GetVersionInfo(Application.ExecutablePath); - + Utility.SysInfoConfig(); string configUrl = getProgramUrl(localConfigPath, "configurl"); if (configUrl != "") { diff --git a/TreeUtils.cs b/TreeUtils.cs index 1f055b5..ad39643 100644 --- a/TreeUtils.cs +++ b/TreeUtils.cs @@ -19,7 +19,7 @@ public static void InitLayerTree(GSOGlobeControl gsoGlobeControl, TreeView treeView, string viewDatasrc) { // treeView.Nodes.Clear(); - LayerConfig layerConfig = Utility.layerConfig;//layertree所在的配置文件 + LayerConfig layerConfig = Utility.LayerConfig;//layertree所在的配置文件 List datasrcs = layerConfig.datasrcs; foreach (DataSrc datasrc in datasrcs) { diff --git a/Utility.cs b/Utility.cs index c03e405..ab947a3 100644 --- a/Utility.cs +++ b/Utility.cs @@ -20,7 +20,7 @@ public static string dbdatabase; public static string userID; - public static Hashtable Pipe_QueryFields; +// public static Hashtable Pipe_QueryFields; public static string DBPassword; public static string DBServer; public static string DBBackUp; @@ -38,7 +38,7 @@ public static List listPipelineType; public static string PicRootURL; public static string PicDefaultURL; - public static double dFlyAboveLine = 2; +// public static double dFlyAboveLine = 2; public static string userName; public static string projectStr; public static string userRole; @@ -85,12 +85,17 @@ public static List pipefittingLayerNames = new List();//管件图层名称 public static List sgPipeLayersNames = new List();//施工管线图层名称 -// public static Dictionary dictionaryNetLayerNameAndCaption = new Dictionary(); - public static HashSet layerNameSet = new HashSet(); + public static HashSet layerNameSet = new HashSet();//记录有哪些图层要显示 public static string roadLayerName = ""; #endregion wxl - public static LayerConfig layerConfig; + public static LayerConfig LayerConfig; + + public static string RoleServer; + public static string TitleImagePath; + public static string SysnameVersion; + public static string Copyright; + public static void SetBallons(GSOBalloon featureTooltip, GSOBalloonEx balloonEx) { featureTooltip.CacheFilePath = Application.StartupPath + "/GeoScene/Globe/Temp"; @@ -188,25 +193,6 @@ } return s.ToString(); } - public static GSOFeatures Table2Features(DataTable table, string currentQueryLayer, GSOGlobeControl globeControl1) - { - GSOFeatures features = new GSOFeatures(); - for (int i = 0; i < table.Rows.Count; i++) - { - DataRow row = table.Rows[i]; - - string featureName = row["编号"].ToString(); - featureName = featureName.Trim(); - GSOLayer layer = globeControl1.Globe.Layers.GetLayerByCaption(currentQueryLayer); - GSOFeatures tempfeatures = layer.GetFeatureByName(featureName, false); - if (tempfeatures.Length > 0) - { - features.Add(tempfeatures[0]); - } - } - return features; - } - //程序启动的时候读取配置文件 public static void SetParams() @@ -358,8 +344,8 @@ #region wxl 从layerconfig.xml中读取 - layerConfig = XmlTools.DeserializeFromXml(layerConfigFile); - List dataSrcs = layerConfig.datasrcs; + LayerConfig = XmlTools.DeserializeFromXml(layerConfigFile); + List dataSrcs = LayerConfig.datasrcs; foreach (var dataSrc in dataSrcs) { @@ -598,76 +584,49 @@ #endregion } - /* - //判断网络是否连接 - public static bool isNetworkConnectionSuccess(string ipAdress) + /// + /// 获取Config.xml配置文件中的roleurl配置，并返回 + /// + /// 请求综合信息平台的服务地址 + public static void SysInfoConfig() { - //return true; - if (ipAdress == null) - { - return false; - } - if (ipAdress.Contains("\\")) - { - ipAdress = ipAdress.Substring(0, ipAdress.LastIndexOf('\\')); - } - if (ipAdress.Trim() == "localhost" || ipAdress.Trim() == "127.0.0.1" || ipAdress.Trim() == Dns.GetHostName()) - { - return true; - } - Ping ping = new Ping(); + if (!File.Exists(filename)) return; + + XmlTextReader xmlReader = new XmlTextReader(filename); try { - PingReply pr = ping.Send(ipAdress.Trim(), 3000); - if (pr.Status == IPStatus.Success) + while (xmlReader.Read()) { - return true; + if (xmlReader.Name.Equals("roleurl")) + { + RoleServer = xmlReader.ReadElementString(); + } + else if (xmlReader.Name.Equals("titleimgpath")) + { + TitleImagePath = xmlReader.ReadElementString(); + } + else if (xmlReader.Name.Equals("sysname")) + { + SysnameVersion = xmlReader.ReadElementString(); + } + else if (xmlReader.Name.Equals("copyright")) + { + Copyright = xmlReader.ReadElementString(); + } } - else - { - return false; - } + } catch (Exception ex) { - LogError.PublishError(ex); - return false; + + LogHelper.Error("在config.xml配置文件中读取roleurl时出错"); } - } - */ - - - //TODO LIST:下面两个方法移到featueTools.cs中 - //根据附属物图层名字得到里面含有的附属物 - public static string[] getAccStrsByLayer(string layername) - { - string[] accStrs = null; - string sql = "select 附属物名称 from " + layername + " group by 附属物名称"; - DataSet dataset = OledbHelper.getDataSet(sql, layername); - if (dataset == null) return null; - accStrs = new string[dataset.Tables[0].Rows.Count]; - for (int i = 0; i < dataset.Tables[0].Rows.Count; i++) + finally { - accStrs[i] = dataset.Tables[0].Rows[i][0].ToString(); + xmlReader.Close(); } - return accStrs; } - //删除内存图层中指定名称的feature - public static void RemoveFeatureFromName(GSOGlobeControl globeControl1, string featureName) - { - GSOFeatures features = globeControl1.Globe.MemoryLayer.GetFeatureByName(featureName, true); - if (features != null) - { - for (int i = features.Length - 1; i >= 0; i--) - { - GSOFeature feature = features[i]; - if (feature != null) - { - globeControl1.Globe.MemoryLayer.RemoveFeatureByID(feature.ID); - } - } - } - globeControl1.Refresh(); - } + + } } diff --git a/ValidateInfo.cs b/ValidateInfo.cs index de75391..01546da 100644 --- a/ValidateInfo.cs +++ b/ValidateInfo.cs @@ -192,7 +192,7 @@ } if (!isSuccess) { - LogHelper.WriteLog(typeof(FieldUniqueValidate), logStr); + LogHelper.Error(logStr); } return isSuccess; } @@ -247,7 +247,7 @@ err += "未找到字段或其类型匹配:" + unFoundField.label + ":" + unFoundField.type + "\r\n"; } - LogHelper.WriteLog(typeof(FieldCountValidate), err); + LogHelper.Error(err); return false; } return true; @@ -316,7 +316,7 @@ { err += "字段:" + field.label + "出错\r\n"; } - LogHelper.WriteLog(typeof(FieldOrderValidate), err); + LogHelper.Error(err); return false; } return true; @@ -388,8 +388,7 @@ } if (isSuccess == false) { - LogHelper.WriteLog(typeof(FieldEmptyValidate), - "字段为空检查失败:\r\n" + err); + LogHelper.Error("字段为空检查失败:\r\n" + err); } return isSuccess; } diff --git a/bin/x86/Debug/Config.xml b/bin/x86/Debug/Config.xml index 6995f64..6a453a3 100644 --- a/bin/x86/Debug/Config.xml +++ b/bin/x86/Debug/Config.xml @@ -25,6 +25,11 @@ http://127.0.0.1/Cyberpipe.msi http://127.0.0.1/Config.xml + http://192.168.0.102:8080/ctrl + /Resource/title.jpg + 智慧太湖新城管网规划分析系统6.0 + @2014-2015 苏州航天系统工程有限公司 版权所有 + 编号,管线编码,管径_毫米,材质,埋设方式,起始地面高程,起始埋深,终止地面高程,终止埋深,建设年代,使用年限,权属单位,设计单位,设计负责人,施工单位,施工负责人,监理单位,监理负责人,业务负责人,备注 编号,管线编码,管径_毫米,材质,埋设方式,起始地面高程,起始埋深,终止地面高程,终止埋深,建设年代,使用年限,权属单位,设计单位,设计负责人,施工单位,施工负责人,监理单位,监理负责人,业务负责人,备注 diff --git a/bin/x86/Debug/config/log4net.config b/bin/x86/Debug/config/log4net.config index 80f9b25..6fbcfa7 100644 --- a/bin/x86/Debug/config/log4net.config +++ b/bin/x86/Debug/config/log4net.config @@ -3,29 +3,118 @@
- - - - - - - - - - - - - - - + + + -property: [%property{NDC}] - %n错误描述：%message%newline %n"/> - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/bin/x86/Debug/glVersion.txt b/bin/x86/Debug/glVersion.txt index cd82eca..755455e 100644 --- a/bin/x86/Debug/glVersion.txt +++ b/bin/x86/Debug/glVersion.txt Binary files differ diff --git a/bin/x86/Debug/log.txt b/bin/x86/Debug/log.txt index a4966d3..2112642 100644 --- a/bin/x86/Debug/log.txt +++ b/bin/x86/Debug/log.txt @@ -430,3 +430,43 @@ exception over ------------------------------------------------------------ + + exception begin -----------------2016/11/29 18:54:54--------------------- + + + + e.Message:第 29 行，位置 4 上的开始标记“titleimagpath”与结束标记“titleimagepath”不匹配。 第 29 行，位置 39。 + + e.Source:System.Xml + + e.TargetSite:Void Throw(System.String, System.String[]) + + e.StackTrace: 在 System.Xml.XmlTextReaderImpl.Throw(String res, String[] args) + 在 System.Xml.XmlTextReaderImpl.ThrowTagMismatch(NodeData startTag) + 在 System.Xml.XmlTextReaderImpl.ParseEndElement() + 在 System.Xml.XmlTextReaderImpl.ParseElementContent() + 在 Cyberpipe.Utility.SetParams() 位置 E:\wxl\work\GHFX_REFACTOR\Utility.cs:行号 208 + + + + exception over ------------------------------------------------------------ + + exception begin -----------------2016/11/29 18:57:17--------------------- + + + + e.Message:第 29 行，位置 4 上的开始标记“titleimagpath”与结束标记“titleimagepath”不匹配。 第 29 行，位置 39。 + + e.Source:System.Xml + + e.TargetSite:Void Throw(System.String, System.String[]) + + e.StackTrace: 在 System.Xml.XmlTextReaderImpl.Throw(String res, String[] args) + 在 System.Xml.XmlTextReaderImpl.ThrowTagMismatch(NodeData startTag) + 在 System.Xml.XmlTextReaderImpl.ParseEndElement() + 在 System.Xml.XmlTextReaderImpl.ParseElementContent() + 在 Cyberpipe.Utility.SetParams() 位置 E:\wxl\work\GHFX_REFACTOR\Utility.cs:行号 208 + + + + exception over ------------------------------------------------------------ diff --git a/bin/x86/Debug/log/2016/201611/20161107.txt b/bin/x86/Debug/log/2016/201611/20161107.txt deleted file mode 100644 index cd32fa6..0000000 --- a/bin/x86/Debug/log/2016/201611/20161107.txt +++ /dev/null @@ -1,152 +0,0 @@ - - -��¼ʱ�䣺2016-11-07 10:30:22,327 -�߳�ID:[9] -��־���� ERROR -�����ࣺCyberpipe.FrmBSQStatis property: [(null)] - -����������1 - - - -��¼ʱ�䣺2016-11-07 10:30:40,660 -�߳�ID:[9] -��־���� ERROR -�����ࣺCyberpipe.FrmBSQStatis property: [(null)] - -����������0 - - - -��¼ʱ�䣺2016-11-07 14:00:27,070 -�߳�ID:[8] -��־���� ERROR -�����ࣺCyberpipe.Forms.FrmPipelineModelDB property: [(null)] - -����������δ�������������õ������ʵ���� - - - -��¼ʱ�䣺2016-11-07 14:00:36,154 -�߳�ID:[8] -��־���� ERROR -�����ࣺCyberpipe.Forms.FrmPipelineModelDB property: [(null)] - -����������δ�������������õ������ʵ���� - - - -��¼ʱ�䣺2016-11-07 14:00:40,186 -�߳�ID:[8] -��־���� ERROR -�����ࣺCyberpipe.Forms.FrmPipelineModelDB property: [(null)] - -����������δ�������������õ������ʵ���� - - - -��¼ʱ�䣺2016-11-07 14:05:46,422 -�߳�ID:[9] -��־���� ERROR -�����ࣺCyberpipe.Forms.FrmPipelineModelDB property: [(null)] - -����������δ�������������õ������ʵ���� - - - -��¼ʱ�䣺2016-11-07 14:06:34,633 -�߳�ID:[10] -��־���� ERROR -�����ࣺCyberpipe.Forms.FrmPipelineModelDB property: [(null)] - -����������δ�������������õ������ʵ���� - - - -��¼ʱ�䣺2016-11-07 14:06:36,301 -�߳�ID:[10] -��־���� ERROR -�����ࣺCyberpipe.Forms.FrmPipelineModelDB property: [(null)] - -����������δ�������������õ������ʵ���� - - - -��¼ʱ�䣺2016-11-07 14:06:44,800 -�߳�ID:[10] -��־���� ERROR -�����ࣺCyberpipe.Forms.FrmPipelineModelDB property: [(null)] - -����������δ�������������õ������ʵ���� - - - -��¼ʱ�䣺2016-11-07 14:07:03,449 -�߳�ID:[10] -��־���� ERROR -�����ࣺCyberpipe.Forms.FrmPipelineModelDB property: [(null)] - -����������δ�������������õ������ʵ���� - - - -��¼ʱ�䣺2016-11-07 14:07:05,165 -�߳�ID:[10] -��־���� ERROR -�����ࣺCyberpipe.Forms.FrmPipelineModelDB property: [(null)] - -����������δ�������������õ������ʵ���� - - - -��¼ʱ�䣺2016-11-07 17:58:24,384 -�߳�ID:[10] -��־���� ERROR -�����ࣺCyberpipe.Forms.FrmPipelineModelDB property: [(null)] - -����������δ�������������õ������ʵ���� - - - -��¼ʱ�䣺2016-11-07 18:11:22,114 -�߳�ID:[8] -��־���� ERROR -�����ࣺCyberpipe.Forms.FrmPipelineModelDB property: [(null)] - -����������δ�������������õ������ʵ���� - - - -��¼ʱ�䣺2016-11-07 18:12:13,619 -�߳�ID:[8] -��־���� ERROR -�����ࣺCyberpipe.Forms.FrmPipelineModelDB property: [(null)] - -����������δ�������������õ������ʵ���� - - - -��¼ʱ�䣺2016-11-07 18:12:33,268 -�߳�ID:[8] -��־���� ERROR -�����ࣺCyberpipe.Forms.FrmPipelineModelDB property: [(null)] - -����������δ�������������õ������ʵ���� - - - -��¼ʱ�䣺2016-11-07 18:12:43,628 -�߳�ID:[8] -��־���� ERROR -�����ࣺCyberpipe.Forms.FrmPipelineModelDB property: [(null)] - -����������δ�������������õ������ʵ���� - - - -��¼ʱ�䣺2016-11-07 18:12:53,488 -�߳�ID:[8] -��־���� ERROR -�����ࣺCyberpipe.Forms.FrmPipelineModelDB property: [(null)] - -����������δ�������������õ������ʵ���� - - - -��¼ʱ�䣺2016-11-07 18:13:31,996 -�߳�ID:[8] -��־���� ERROR -�����ࣺCyberpipe.Forms.FrmPipelineModelDB property: [(null)] - -����������δ�������������õ������ʵ���� - - - -��¼ʱ�䣺2016-11-07 18:16:05,234 -�߳�ID:[9] -��־���� ERROR -�����ࣺCyberpipe.Forms.FrmPipelineModelDB property: [(null)] - -����������δ�������������õ������ʵ���� - diff --git a/bin/x86/Debug/log/2016/201611/20161108.txt b/bin/x86/Debug/log/2016/201611/20161108.txt deleted file mode 100644 index b5c96c9..0000000 --- a/bin/x86/Debug/log/2016/201611/20161108.txt +++ /dev/null @@ -1,40 +0,0 @@ - - -��¼ʱ�䣺2016-11-08 09:53:20,836 -�߳�ID:[10] -��־���� ERROR -�����ࣺCyberpipe.Forms.FrmPipelineModelDB property: [(null)] - -����������δ�������������õ������ʵ���� - - - -��¼ʱ�䣺2016-11-08 09:53:49,986 -�߳�ID:[10] -��־���� ERROR -�����ࣺCyberpipe.Forms.FrmPipelineModelDB property: [(null)] - -����������δ�������������õ������ʵ���� - - - -��¼ʱ�䣺2016-11-08 09:54:25,364 -�߳�ID:[10] -��־���� ERROR -�����ࣺCyberpipe.Forms.FrmPipelineModelDB property: [(null)] - -����������δ�������������õ������ʵ���� - - - -��¼ʱ�䣺2016-11-08 10:33:09,418 -�߳�ID:[11] -��־���� ERROR -�����ࣺCyberpipe.Forms.FrmPipelineModelDB property: [(null)] - -����������δ�������������õ������ʵ���� - - - -��¼ʱ�䣺2016-11-08 10:38:53,638 -�߳�ID:[10] -��־���� ERROR -�����ࣺCyberpipe.Forms.FrmPipelineModelDB property: [(null)] - -����������δ�������������õ������ʵ���� - diff --git a/bin/x86/Debug/log/2016/201611/20161116.txt b/bin/x86/Debug/log/2016/201611/20161116.txt deleted file mode 100644 index d23f760..0000000 --- a/bin/x86/Debug/log/2016/201611/20161116.txt +++ /dev/null @@ -1,8 +0,0 @@ - - -��¼ʱ�䣺2016-11-16 15:06:52,549 -�߳�ID:[9] -��־���� ERROR -�����ࣺCyberpipe.Utility property: [(null)] - -����������������־ - diff --git a/bin/x86/Debug/log/2016/201611/20161118.txt b/bin/x86/Debug/log/2016/201611/20161118.txt deleted file mode 100644 index d03145b..0000000 --- a/bin/x86/Debug/log/2016/201611/20161118.txt +++ /dev/null @@ -1,84 +0,0 @@ - - -��¼ʱ�䣺2016-11-18 15:22:27,833 -�߳�ID:[9] -��־���� ERROR -�����ࣺCyberpipe.Forms.FrmPipelineModelDB property: [(null)] - -���������������ͳ��ȱ������ø��ַ����ڵ�λ�á� -������: length - - - -��¼ʱ�䣺2016-11-18 15:23:05,224 -�߳�ID:[9] -��־���� ERROR -�����ࣺCyberpipe.Forms.FrmPipelineModelDB property: [(null)] - -���������������ͳ��ȱ������ø��ַ����ڵ�λ�á� -������: length - - - -��¼ʱ�䣺2016-11-18 15:24:36,900 -�߳�ID:[9] -��־���� ERROR -�����ࣺCyberpipe.Forms.FrmPipelineModelDB property: [(null)] - -���������������ͳ��ȱ������ø��ַ����ڵ�λ�á� -������: length - - - -��¼ʱ�䣺2016-11-18 15:26:25,752 -�߳�ID:[9] -��־���� ERROR -�����ࣺCyberpipe.Forms.FrmPipelineModelDB property: [(null)] - -���������������ͳ��ȱ������ø��ַ����ڵ�λ�á� -������: length - - - -��¼ʱ�䣺2016-11-18 15:27:04,799 -�߳�ID:[9] -��־���� ERROR -�����ࣺCyberpipe.FieldOrderValidate property: [(null)] - -�����������ֶ�˳����ʧ�� -�ֶ�:��ʼ�ܶ��߳��� -�ֶ�:��ֹ����߳��� -�ֶ�:��ֹ������� -�ֶ�:��ֹ�ܶ��߳��� -�ֶ�:������·���� -�ֶ�:Ȩ����λ���� -�ֶ�:��ע���� - - - - -��¼ʱ�䣺2016-11-18 15:27:11,752 -�߳�ID:[9] -��־���� ERROR -�����ࣺCyberpipe.FieldOrderValidate property: [(null)] - -�����������ֶ�˳����ʧ�� -�ֶ�:��ʼ�ܶ��߳��� -�ֶ�:��ֹ����߳��� -�ֶ�:��ֹ������� -�ֶ�:��ֹ�ܶ��߳��� -�ֶ�:������·���� -�ֶ�:Ȩ����λ���� -�ֶ�:��ע���� - - - - -��¼ʱ�䣺2016-11-18 15:27:27,018 -�߳�ID:[9] -��־���� ERROR -�����ࣺCyberpipe.FieldOrderValidate property: [(null)] - -�����������ֶ�˳����ʧ�� -�ֶ�:��ʼ�ܶ��߳��� -�ֶ�:��ֹ����߳��� -�ֶ�:��ֹ������� -�ֶ�:��ֹ�ܶ��߳��� -�ֶ�:������·���� -�ֶ�:Ȩ����λ���� -�ֶ�:��ע���� - - diff --git a/bin/x86/Debug/log/2016/201611/20161121.txt b/bin/x86/Debug/log/2016/201611/20161121.txt deleted file mode 100644 index e4d7262..0000000 --- a/bin/x86/Debug/log/2016/201611/20161121.txt +++ /dev/null @@ -1,213 +0,0 @@ - - -��¼ʱ�䣺2016-11-21 09:26:43,193 -�߳�ID:[9] -��־���� ERROR -�����ࣺCyberpipe.FieldOrderValidate property: [(null)] - -�����������ֶ�˳����ʧ�� -�ֶ�:��ʼ�ܶ��߳��� -�ֶ�:��ֹ����߳��� -�ֶ�:��ֹ������� -�ֶ�:��ֹ�ܶ��߳��� -�ֶ�:������·���� -�ֶ�:Ȩ����λ���� -�ֶ�:��ע���� - - - - -��¼ʱ�䣺2016-11-21 09:37:42,959 -�߳�ID:[8] -��־���� ERROR -�����ࣺCyberpipe.FieldUniqueValidate property: [(null)] - -�����������ֶ�Ψһ�Լ��ʧ�� -�ֶ���ʼ������ظ� 463.455����:3�ֶ���ʼ������ظ� 463.465����:3�ֶ���ʼ������ظ� 465.377����:3�ֶ���ֹ�ܵ׸��ظ� 462.044����:3 - - - -��¼ʱ�䣺2016-11-21 09:38:27,526 -�߳�ID:[8] -��־���� ERROR -�����ࣺCyberpipe.FieldUniqueValidate property: [(null)] - -�����������ֶ�Ψһ�Լ��ʧ�� -�ֶ���ʼ������ظ� 56.89����:3�ֶ���ʼ������ظ� 58.05����:3�ֶ���ʼ������ظ� 58.74����:3�ֶ���ʼ������ظ� 59.23����:3�ֶ���ʼ������ظ� 58.47����:3�ֶ���ʼ������ظ� 57.8����:3�ֶ���ʼ������ظ� 57.53����:3�ֶ���ʼ������ظ� 57.38����:3�ֶ���ʼ������ظ� 58.4����:3�ֶ���ʼ������ظ� 58.8����:7�ֶ���ֹ�ܵ׸��ظ� 54.94����:3�ֶ���ֹ�ܵ׸��ظ� 58.3����:3�ֶ���ֹ�ܵ׸��ظ� 58.73����:3�ֶ���ֹ�ܵ׸��ظ� 57.83����:3�ֶ���ֹ�ܵ׸��ظ� 58.31����:3 - - - -��¼ʱ�䣺2016-11-21 09:39:05,199 -�߳�ID:[8] -��־���� ERROR -�����ࣺCyberpipe.FieldCountValidate property: [(null)] - -�����������ֶ������Լ��ʧ�� -δ�ҵ��ֶλ�������ƥ��:��ʼ�ܵ׸�:double -δ�ҵ��ֶλ�������ƥ��:��ֹ�ܵ׸�:double - - - - -��¼ʱ�䣺2016-11-21 09:39:16,208 -�߳�ID:[8] -��־���� ERROR -�����ࣺCyberpipe.FieldOrderValidate property: [(null)] - -�����������ֶ�˳����ʧ�� -�ֶ�:��ʼ�ܶ��߳��� -�ֶ�:��ֹ����߳��� -�ֶ�:��ֹ������� -�ֶ�:��ֹ�ܶ��߳��� -�ֶ�:������·���� -�ֶ�:Ȩ����λ���� -�ֶ�:��ע���� - - - - -��¼ʱ�䣺2016-11-21 09:39:37,798 -�߳�ID:[8] -��־���� ERROR -�����ࣺCyberpipe.FieldOrderValidate property: [(null)] - -�����������ֶ�˳����ʧ�� -�ֶ�:��ʼ�ܶ��߳��� -�ֶ�:��ֹ����߳��� -�ֶ�:��ֹ������� -�ֶ�:��ֹ�ܶ��߳��� -�ֶ�:������·���� -�ֶ�:Ȩ����λ���� -�ֶ�:��ע���� - - - - -��¼ʱ�䣺2016-11-21 09:39:56,031 -�߳�ID:[8] -��־���� ERROR -�����ࣺCyberpipe.FieldOrderValidate property: [(null)] - -�����������ֶ�˳����ʧ�� -�ֶ�:��ʼ�ܶ��߳��� -�ֶ�:��ֹ����߳��� -�ֶ�:��ֹ������� -�ֶ�:��ֹ�ܶ��߳��� -�ֶ�:������·���� -�ֶ�:Ȩ����λ���� -�ֶ�:��ע���� - - - - -��¼ʱ�䣺2016-11-21 09:41:01,165 -�߳�ID:[8] -��־���� ERROR -�����ࣺCyberpipe.FieldOrderValidate property: [(null)] - -�����������ֶ�˳����ʧ�� -�ֶ�:��ʼ�ܶ��߳��� -�ֶ�:��ֹ����߳��� -�ֶ�:��ֹ������� -�ֶ�:��ֹ�ܶ��߳��� -�ֶ�:������·���� -�ֶ�:Ȩ����λ���� -�ֶ�:��ע���� - - - - -��¼ʱ�䣺2016-11-21 09:43:35,081 -�߳�ID:[10] -��־���� ERROR -�����ࣺCyberpipe.FieldOrderValidate property: [(null)] - -�����������ֶ�˳����ʧ�� -�ֶ�:��ʼ�ܶ��߳��� -�ֶ�:��ֹ����߳��� -�ֶ�:��ֹ������� -�ֶ�:��ֹ�ܶ��߳��� -�ֶ�:������·���� -�ֶ�:Ȩ����λ���� -�ֶ�:��ע���� - - - - -��¼ʱ�䣺2016-11-21 09:43:46,706 -�߳�ID:[10] -��־���� ERROR -�����ࣺCyberpipe.FieldOrderValidate property: [(null)] - -�����������ֶ�˳����ʧ�� -�ֶ�:��ʼ�ܶ��߳��� -�ֶ�:��ֹ����߳��� -�ֶ�:��ֹ������� -�ֶ�:��ֹ�ܶ��߳��� -�ֶ�:������·���� -�ֶ�:Ȩ����λ���� -�ֶ�:��ע���� - - - - -��¼ʱ�䣺2016-11-21 09:45:33,615 -�߳�ID:[10] -��־���� ERROR -�����ࣺCyberpipe.FieldOrderValidate property: [(null)] - -�����������ֶ�˳����ʧ�� -�ֶ�:��ʼ�ܶ��߳��� -�ֶ�:��ֹ����߳��� -�ֶ�:��ֹ������� -�ֶ�:��ֹ�ܶ��߳��� -�ֶ�:������·���� -�ֶ�:Ȩ����λ���� -�ֶ�:��ע���� - - - - -��¼ʱ�䣺2016-11-21 09:53:43,807 -�߳�ID:[10] -��־���� ERROR -�����ࣺCyberpipe.FieldCountValidate property: [(null)] - -�����������ֶ������Լ��ʧ�� -δ�ҵ��ֶλ�������ƥ��:ͼ����:string - - - - -��¼ʱ�䣺2016-11-21 13:34:03,037 -�߳�ID:[10] -��־���� ERROR -�����ࣺCyberpipe.FieldCountValidate property: [(null)] - -����������BSQ�ֶ������Լ��ʧ�� -δ�ҵ��ֶλ�������ƥ��:ͼ����:string - - - - -��¼ʱ�䣺2016-11-21 13:40:32,041 -�߳�ID:[9] -��־���� ERROR -�����ࣺCyberpipe.FieldCountValidate property: [(null)] - -����������BSQ�ֶ������Լ��ʧ�� -δ�ҵ��ֶλ�������ƥ��:ͼ����:string - - - - -��¼ʱ�䣺2016-11-21 13:43:57,923 -�߳�ID:[9] -��־���� ERROR -�����ࣺCyberpipe.FieldCountValidate property: [(null)] - -����������BSQ�ֶ������Լ��ʧ�� -δ�ҵ��ֶλ�������ƥ��:ͼ����:string - - - - -��¼ʱ�䣺2016-11-21 13:44:42,643 -�߳�ID:[9] -��־���� ERROR -�����ࣺCyberpipe.FieldOrderValidate property: [(null)] - -������������ѹ����-�̲߳����ֶ�˳����ʧ�� -�ֶ�:��ʼ�ܶ��߳��� -�ֶ�:��ֹ����߳��� -�ֶ�:��ֹ������� -�ֶ�:��ֹ�ܶ��߳��� -�ֶ�:������·���� -�ֶ�:Ȩ����λ���� -�ֶ�:��ע���� - - diff --git a/bin/x86/Debug/log/2016/201611/20161122.txt b/bin/x86/Debug/log/2016/201611/20161122.txt deleted file mode 100644 index e4c5e13..0000000 --- a/bin/x86/Debug/log/2016/201611/20161122.txt +++ /dev/null @@ -1,113 +0,0 @@ - - -��¼ʱ�䣺2016-11-22 14:24:28,896 -�߳�ID:[10] -��־���� ERROR -�����ࣺCyberpipe.MainFrm property: [(null)] - -����������Error - -System.InvalidOperationException: ������û���е� DataGridView �ؼ�����С�������������С� - �� System.Windows.Forms.DataGridViewRowCollection.AddInternal(Boolean newRow, Object[] values) - �� Cyberpipe.MainFrm.addRedLineDataToDataGridView(List`1 dt, DataGridView dataGridView) λ�� D:\GHFX\GHFX_REFACTOR\MainFrm.cs:�к� 7491 - �� Cyberpipe.MainFrm.buttonItemHX2_Click(Object sender, EventArgs e) λ�� D:\GHFX\GHFX_REFACTOR\MainFrm.cs:�к� 7473 - - -��¼ʱ�䣺2016-11-22 14:24:37,178 -�߳�ID:[10] -��־���� ERROR -�����ࣺCyberpipe.MainFrm property: [(null)] - -����������Error - -System.InvalidOperationException: ������û���е� DataGridView �ؼ�����С�������������С� - �� System.Windows.Forms.DataGridViewRowCollection.AddInternal(Boolean newRow, Object[] values) - �� Cyberpipe.MainFrm.addRedLineDataToDataGridView(List`1 dt, DataGridView dataGridView) λ�� D:\GHFX\GHFX_REFACTOR\MainFrm.cs:�к� 7491 - �� Cyberpipe.MainFrm.buttonItemHX2_Click(Object sender, EventArgs e) λ�� D:\GHFX\GHFX_REFACTOR\MainFrm.cs:�к� 7473 - - -��¼ʱ�䣺2016-11-22 14:24:43,641 -�߳�ID:[10] -��־���� ERROR -�����ࣺCyberpipe.MainFrm property: [(null)] - -����������Error - -System.InvalidOperationException: ������û���е� DataGridView �ؼ�����С�������������С� - �� System.Windows.Forms.DataGridViewRowCollection.AddInternal(Boolean newRow, Object[] values) - �� Cyberpipe.MainFrm.addRedLineDataToDataGridView(List`1 dt, DataGridView dataGridView) λ�� D:\GHFX\GHFX_REFACTOR\MainFrm.cs:�к� 7491 - �� Cyberpipe.MainFrm.buttonItemHX2_Click(Object sender, EventArgs e) λ�� D:\GHFX\GHFX_REFACTOR\MainFrm.cs:�к� 7473 - - -��¼ʱ�䣺2016-11-22 14:36:26,698 -�߳�ID:[9] -��־���� ERROR -�����ࣺCyberpipe.MainFrm property: [(null)] - -����������Error - -System.NullReferenceException: δ�������������õ������ʵ���� - �� Cyberpipe.MainFrm.addRedLineDataToDataGridView(List`1 dt, DataGridView dataGridView) λ�� D:\GHFX\GHFX_REFACTOR\MainFrm.cs:�к� 7504 - �� Cyberpipe.MainFrm.buttonItemHX2_Click(Object sender, EventArgs e) λ�� D:\GHFX\GHFX_REFACTOR\MainFrm.cs:�к� 7473 - - -��¼ʱ�䣺2016-11-22 14:46:24,990 -�߳�ID:[8] -��־���� ERROR -�����ࣺCyberpipe.MainFrm property: [(null)] - -����������Error - -System.NullReferenceException: δ�������������õ������ʵ���� - �� Cyberpipe.MainFrm.addRedLineDataToDataGridView(List`1 dt, DataGridView dataGridView) λ�� D:\GHFX\GHFX_REFACTOR\MainFrm.cs:�к� 7504 - �� Cyberpipe.MainFrm.buttonItemHX2_Click(Object sender, EventArgs e) λ�� D:\GHFX\GHFX_REFACTOR\MainFrm.cs:�к� 7473 - - -��¼ʱ�䣺2016-11-22 14:46:28,876 -�߳�ID:[8] -��־���� ERROR -�����ࣺCyberpipe.MainFrm property: [(null)] - -����������Error - -System.NullReferenceException: δ�������������õ������ʵ���� - �� Cyberpipe.MainFrm.addRedLineDataToDataGridView(List`1 dt, DataGridView dataGridView) λ�� D:\GHFX\GHFX_REFACTOR\MainFrm.cs:�к� 7504 - �� Cyberpipe.MainFrm.buttonItemHX2_Click(Object sender, EventArgs e) λ�� D:\GHFX\GHFX_REFACTOR\MainFrm.cs:�к� 7473 - - -��¼ʱ�䣺2016-11-22 14:49:25,642 -�߳�ID:[8] -��־���� ERROR -�����ࣺCyberpipe.MainFrm property: [(null)] - -����������Error - -System.NullReferenceException: δ�������������õ������ʵ���� - �� Cyberpipe.MainFrm.addRedLineDataToDataGridView(List`1 dt, DataGridView dataGridView) λ�� D:\GHFX\GHFX_REFACTOR\MainFrm.cs:�к� 7504 - �� Cyberpipe.MainFrm.buttonItemHX2_Click(Object sender, EventArgs e) λ�� D:\GHFX\GHFX_REFACTOR\MainFrm.cs:�к� 7473 - - -��¼ʱ�䣺2016-11-22 14:49:33,328 -�߳�ID:[8] -��־���� ERROR -�����ࣺCyberpipe.MainFrm property: [(null)] - -����������Error - -System.NullReferenceException: δ�������������õ������ʵ���� - �� Cyberpipe.MainFrm.addRedLineDataToDataGridView(List`1 dt, DataGridView dataGridView) λ�� D:\GHFX\GHFX_REFACTOR\MainFrm.cs:�к� 7504 - �� Cyberpipe.MainFrm.buttonItemHX2_Click(Object sender, EventArgs e) λ�� D:\GHFX\GHFX_REFACTOR\MainFrm.cs:�к� 7473 - - -��¼ʱ�䣺2016-11-22 15:18:04,198 -�߳�ID:[9] -��־���� ERROR -�����ࣺCyberpipe.MainFrm property: [(null)] - -����������Error - -System.NullReferenceException: δ�������������õ������ʵ���� - �� Cyberpipe.RedLineAnalysisTool.Anaylysis(GSOFeatures redLineFeatures, List`1 layerNames, GSOGlobeControl globe) λ�� D:\GHFX\GHFX_REFACTOR\RedLineAnalysisTool.cs:�к� 114 - �� Cyberpipe.MainFrm.buttonItemHX2_Click(Object sender, EventArgs e) λ�� D:\GHFX\GHFX_REFACTOR\MainFrm.cs:�к� 7469 - - -��¼ʱ�䣺2016-11-22 15:18:07,984 -�߳�ID:[9] -��־���� ERROR -�����ࣺCyberpipe.MainFrm property: [(null)] - -����������Error - -System.NullReferenceException: δ�������������õ������ʵ���� - �� Cyberpipe.RedLineAnalysisTool.Anaylysis(GSOFeatures redLineFeatures, List`1 layerNames, GSOGlobeControl globe) λ�� D:\GHFX\GHFX_REFACTOR\RedLineAnalysisTool.cs:�к� 114 - �� Cyberpipe.MainFrm.buttonItemHX2_Click(Object sender, EventArgs e) λ�� D:\GHFX\GHFX_REFACTOR\MainFrm.cs:�к� 7469 diff --git a/bin/x86/Debug/log/2016/201611/20161129.txt b/bin/x86/Debug/log/2016/201611/20161129.txt deleted file mode 100644 index 42eb54e..0000000 --- a/bin/x86/Debug/log/2016/201611/20161129.txt +++ /dev/null @@ -1,22 +0,0 @@ - - -��¼ʱ�䣺2016-11-29 10:07:53,467 -�߳�ID:[9] -��־���� ERROR -�����ࣺCyberpipe.FieldOrderValidate property: [(null)] - -������������ʶ�����ֶ�˳����ʧ�� -�ֶ�:�Ƿ�ؼ������ -�ֶ�:ͼ���ų��� -�ֶ�:��ע���� - - - - -��¼ʱ�䣺2016-11-29 10:09:38,422 -�߳�ID:[9] -��־���� ERROR -�����ࣺCyberpipe.FieldCountValidate property: [(null)] - -����������BSQ���ֶ������Լ��ʧ�� -δ�ҵ��ֶλ�������ƥ��:ͼ����:string - - diff --git a/config/log4net.config b/config/log4net.config index 80f9b25..6fbcfa7 100644 --- a/config/log4net.config +++ b/config/log4net.config @@ -3,29 +3,118 @@
- - - - - - - - - - - - - - - + + + -property: [%property{NDC}] - %n错误描述：%message%newline %n"/> - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +