diff --git a/DoublePanelAnalysis.cs b/DoublePanelAnalysis.cs index c242b82..955bf70 100644 --- a/DoublePanelAnalysis.cs +++ b/DoublePanelAnalysis.cs @@ -336,7 +336,7 @@ GSOPoint3d pntIntersect1, pntIntersect2, pntProIntersect1, pntProIntersect2; double dDist = globeControl.Globe.Analysis3D.ComputeHorizonDistance(line1, line2, out pntIntersect1, out pntIntersect2, out pntProIntersect1, out pntProIntersect2, false); - GSOPipeLineStyle3D pipeStyle2 = line2.Style as GSOPipeLineStyle3D; + GSOPipeLineStyle3D pipeStyle2 = line2.Style as GSOPipeLineStyle3D; if (pipeStyle2 == null) continue; result.Add(feat2,dDist); } @@ -379,6 +379,8 @@ GSOPoint3d pntIntersect1, pntIntersect2; double dDist = globeControl.Globe.Analysis3D.ComputeTwoGeoPolylineDistance(line1, line2, out pntIntersect1, out pntIntersect2,out horLen,out verLen,true,true,dNoIntersetStartRatio); +// dDist = Math.Abs(pntIntersect1.Z - pntIntersect2.Z) - pipeStyle1.Radius - pipeStyle2.Radius; + dDist = dDist - pipeStyle1.Radius - pipeStyle2.Radius; if (dDist <= 0) { FeatureAnalysisInfo featureAnalysisInfo = new FeatureAnalysisInfo(); diff --git a/DoublePanelAnalysis.cs b/DoublePanelAnalysis.cs index c242b82..955bf70 100644 --- a/DoublePanelAnalysis.cs +++ b/DoublePanelAnalysis.cs @@ -336,7 +336,7 @@ GSOPoint3d pntIntersect1, pntIntersect2, pntProIntersect1, pntProIntersect2; double dDist = globeControl.Globe.Analysis3D.ComputeHorizonDistance(line1, line2, out pntIntersect1, out pntIntersect2, out pntProIntersect1, out pntProIntersect2, false); - GSOPipeLineStyle3D pipeStyle2 = line2.Style as GSOPipeLineStyle3D; + GSOPipeLineStyle3D pipeStyle2 = line2.Style as GSOPipeLineStyle3D; if (pipeStyle2 == null) continue; result.Add(feat2,dDist); } @@ -379,6 +379,8 @@ GSOPoint3d pntIntersect1, pntIntersect2; double dDist = globeControl.Globe.Analysis3D.ComputeTwoGeoPolylineDistance(line1, line2, out pntIntersect1, out pntIntersect2,out horLen,out verLen,true,true,dNoIntersetStartRatio); +// dDist = Math.Abs(pntIntersect1.Z - pntIntersect2.Z) - pipeStyle1.Radius - pipeStyle2.Radius; + dDist = dDist - pipeStyle1.Radius - pipeStyle2.Radius; if (dDist <= 0) { FeatureAnalysisInfo featureAnalysisInfo = new FeatureAnalysisInfo(); diff --git a/EnumEventMode.cs b/EnumEventMode.cs index 0fc543d..4491efd 100644 --- a/EnumEventMode.cs +++ b/EnumEventMode.cs @@ -14,7 +14,6 @@ //add bu yanxiaowei YXKW_Analysis=4,//沿线开挖 JLBZ_Analysis=5// - } //模拟规划设计模式 diff --git a/DoublePanelAnalysis.cs b/DoublePanelAnalysis.cs index c242b82..955bf70 100644 --- a/DoublePanelAnalysis.cs +++ b/DoublePanelAnalysis.cs @@ -336,7 +336,7 @@ GSOPoint3d pntIntersect1, pntIntersect2, pntProIntersect1, pntProIntersect2; double dDist = globeControl.Globe.Analysis3D.ComputeHorizonDistance(line1, line2, out pntIntersect1, out pntIntersect2, out pntProIntersect1, out pntProIntersect2, false); - GSOPipeLineStyle3D pipeStyle2 = line2.Style as GSOPipeLineStyle3D; + GSOPipeLineStyle3D pipeStyle2 = line2.Style as GSOPipeLineStyle3D; if (pipeStyle2 == null) continue; result.Add(feat2,dDist); } @@ -379,6 +379,8 @@ GSOPoint3d pntIntersect1, pntIntersect2; double dDist = globeControl.Globe.Analysis3D.ComputeTwoGeoPolylineDistance(line1, line2, out pntIntersect1, out pntIntersect2,out horLen,out verLen,true,true,dNoIntersetStartRatio); +// dDist = Math.Abs(pntIntersect1.Z - pntIntersect2.Z) - pipeStyle1.Radius - pipeStyle2.Radius; + dDist = dDist - pipeStyle1.Radius - pipeStyle2.Radius; if (dDist <= 0) { FeatureAnalysisInfo featureAnalysisInfo = new FeatureAnalysisInfo(); diff --git a/EnumEventMode.cs b/EnumEventMode.cs index 0fc543d..4491efd 100644 --- a/EnumEventMode.cs +++ b/EnumEventMode.cs @@ -14,7 +14,6 @@ //add bu yanxiaowei YXKW_Analysis=4,//沿线开挖 JLBZ_Analysis=5// - } //模拟规划设计模式 diff --git a/FrmPatrolerManager.cs b/FrmPatrolerManager.cs index 670d0f7..b802788 100644 --- a/FrmPatrolerManager.cs +++ b/FrmPatrolerManager.cs @@ -177,15 +177,15 @@ private void initForm() { - if (!Utility.userRole.Equals("巡检员新增")) + if (!Utility.userRole.Contains("巡检员新增")) { btn_add_person.Visible = false; } - if (!Utility.userRole.Equals("巡检员编辑")) + if (!Utility.userRole.Contains("巡检员编辑")) { 编辑ToolStripMenuItem.Visible = false; } - if (!Utility.userRole.Equals("巡检员注销")) + if (!Utility.userRole.Contains("巡检员注销")) { 注销ToolStripMenuItem.Visible = false; } diff --git a/DoublePanelAnalysis.cs b/DoublePanelAnalysis.cs index c242b82..955bf70 100644 --- a/DoublePanelAnalysis.cs +++ b/DoublePanelAnalysis.cs @@ -336,7 +336,7 @@ GSOPoint3d pntIntersect1, pntIntersect2, pntProIntersect1, pntProIntersect2; double dDist = globeControl.Globe.Analysis3D.ComputeHorizonDistance(line1, line2, out pntIntersect1, out pntIntersect2, out pntProIntersect1, out pntProIntersect2, false); - GSOPipeLineStyle3D pipeStyle2 = line2.Style as GSOPipeLineStyle3D; + GSOPipeLineStyle3D pipeStyle2 = line2.Style as GSOPipeLineStyle3D; if (pipeStyle2 == null) continue; result.Add(feat2,dDist); } @@ -379,6 +379,8 @@ GSOPoint3d pntIntersect1, pntIntersect2; double dDist = globeControl.Globe.Analysis3D.ComputeTwoGeoPolylineDistance(line1, line2, out pntIntersect1, out pntIntersect2,out horLen,out verLen,true,true,dNoIntersetStartRatio); +// dDist = Math.Abs(pntIntersect1.Z - pntIntersect2.Z) - pipeStyle1.Radius - pipeStyle2.Radius; + dDist = dDist - pipeStyle1.Radius - pipeStyle2.Radius; if (dDist <= 0) { FeatureAnalysisInfo featureAnalysisInfo = new FeatureAnalysisInfo(); diff --git a/EnumEventMode.cs b/EnumEventMode.cs index 0fc543d..4491efd 100644 --- a/EnumEventMode.cs +++ b/EnumEventMode.cs @@ -14,7 +14,6 @@ //add bu yanxiaowei YXKW_Analysis=4,//沿线开挖 JLBZ_Analysis=5// - } //模拟规划设计模式 diff --git a/FrmPatrolerManager.cs b/FrmPatrolerManager.cs index 670d0f7..b802788 100644 --- a/FrmPatrolerManager.cs +++ b/FrmPatrolerManager.cs @@ -177,15 +177,15 @@ private void initForm() { - if (!Utility.userRole.Equals("巡检员新增")) + if (!Utility.userRole.Contains("巡检员新增")) { btn_add_person.Visible = false; } - if (!Utility.userRole.Equals("巡检员编辑")) + if (!Utility.userRole.Contains("巡检员编辑")) { 编辑ToolStripMenuItem.Visible = false; } - if (!Utility.userRole.Equals("巡检员注销")) + if (!Utility.userRole.Contains("巡检员注销")) { 注销ToolStripMenuItem.Visible = false; } diff --git a/bin/x86/Debug/Config.xml b/bin/x86/Debug/Config.xml index 3626f19..5279e02 100644 --- a/bin/x86/Debug/Config.xml +++ b/bin/x86/Debug/Config.xml @@ -1,10 +1,10 @@  LocaSpace三维地下管线信息系统 - eyscdb - eydb2 + release + szhtdb2 192.168.0.203 - eyscdb + release 192.168.0.203 1500 http://192.168.0.203/images/ @@ -13,24 +13,24 @@ http://192.168.0.203:3536/GSOBackOracle.asmx 192.168.0.203 - eydb2 - eysgdb - eysgdb + SZGHDB2 + scott + SZGHDB2 雨水,污水,给水,天然气,通讯,共通,电通,供电,有线电视,监控,交通信号,路灯 192.168.0.203 - eydb2 - eysgdb - eysgdb + SZSGDB2 + scott + SZSGDB2 http://127.0.0.1/Cyberpipe.msi http://127.0.0.1/Config.xml /Resource/登录页.png http://192.168.0.102:8080/ctrl 21 - /Resource/title.png + /Resource/title.jpg /Resource/图例P.jpg - 入库定位系统 - @2014-2015 中国航天科工二院智慧管网工程研究与发展中心 版权所有 + 智慧太湖新城管网规划分析系统6.0 + @2014-2015 苏州航天系统工程有限公司 版权所有 编号,管线编码,管径_毫米,材质,埋设方式,起始地面高程,起始埋深,终止地面高程,终止埋深,建设年代,使用年限,权属单位,设计单位,设计负责人,施工单位,施工负责人,监理单位,监理负责人,业务负责人,备注 @@ -63,7 +63,7 @@ 编号,地面高程,X坐标,Y坐标,管线点编码,井深,图片编码,类型,建设年代,使用年限,权属单位,设计单位,设计负责人,施工单位,施工负责人,监理单位,监理负责人,业务负责人,备注 - 116.262791, 39.912386,1500 + 120.610963, 31.190621,3000 6000,6100 4000,4100,4200 @@ -71,5 +71,5 @@ 5000,5100,5200,5300 1000,1001,1002,1003 2000,2100,2200,2300 - +proj=tmerc +lat_0=0 +lon_0=117 +k=1 +x_0=555484.8092 +y_0=-4114948.631 +ellps=krass +units=m +no_defs + +proj=tmerc +lat_0=0 +lon_0=120 +k=1 +x_0=-4869.018 +y_0=-3421238.225 +a=6378140 +b=6356755.288157528 +units=m +no_defs \ No newline at end of file diff --git a/DoublePanelAnalysis.cs b/DoublePanelAnalysis.cs index c242b82..955bf70 100644 --- a/DoublePanelAnalysis.cs +++ b/DoublePanelAnalysis.cs @@ -336,7 +336,7 @@ GSOPoint3d pntIntersect1, pntIntersect2, pntProIntersect1, pntProIntersect2; double dDist = globeControl.Globe.Analysis3D.ComputeHorizonDistance(line1, line2, out pntIntersect1, out pntIntersect2, out pntProIntersect1, out pntProIntersect2, false); - GSOPipeLineStyle3D pipeStyle2 = line2.Style as GSOPipeLineStyle3D; + GSOPipeLineStyle3D pipeStyle2 = line2.Style as GSOPipeLineStyle3D; if (pipeStyle2 == null) continue; result.Add(feat2,dDist); } @@ -379,6 +379,8 @@ GSOPoint3d pntIntersect1, pntIntersect2; double dDist = globeControl.Globe.Analysis3D.ComputeTwoGeoPolylineDistance(line1, line2, out pntIntersect1, out pntIntersect2,out horLen,out verLen,true,true,dNoIntersetStartRatio); +// dDist = Math.Abs(pntIntersect1.Z - pntIntersect2.Z) - pipeStyle1.Radius - pipeStyle2.Radius; + dDist = dDist - pipeStyle1.Radius - pipeStyle2.Radius; if (dDist <= 0) { FeatureAnalysisInfo featureAnalysisInfo = new FeatureAnalysisInfo(); diff --git a/EnumEventMode.cs b/EnumEventMode.cs index 0fc543d..4491efd 100644 --- a/EnumEventMode.cs +++ b/EnumEventMode.cs @@ -14,7 +14,6 @@ //add bu yanxiaowei YXKW_Analysis=4,//沿线开挖 JLBZ_Analysis=5// - } //模拟规划设计模式 diff --git a/FrmPatrolerManager.cs b/FrmPatrolerManager.cs index 670d0f7..b802788 100644 --- a/FrmPatrolerManager.cs +++ b/FrmPatrolerManager.cs @@ -177,15 +177,15 @@ private void initForm() { - if (!Utility.userRole.Equals("巡检员新增")) + if (!Utility.userRole.Contains("巡检员新增")) { btn_add_person.Visible = false; } - if (!Utility.userRole.Equals("巡检员编辑")) + if (!Utility.userRole.Contains("巡检员编辑")) { 编辑ToolStripMenuItem.Visible = false; } - if (!Utility.userRole.Equals("巡检员注销")) + if (!Utility.userRole.Contains("巡检员注销")) { 注销ToolStripMenuItem.Visible = false; } diff --git a/bin/x86/Debug/Config.xml b/bin/x86/Debug/Config.xml index 3626f19..5279e02 100644 --- a/bin/x86/Debug/Config.xml +++ b/bin/x86/Debug/Config.xml @@ -1,10 +1,10 @@  LocaSpace三维地下管线信息系统 - eyscdb - eydb2 + release + szhtdb2 192.168.0.203 - eyscdb + release 192.168.0.203 1500 http://192.168.0.203/images/ @@ -13,24 +13,24 @@ http://192.168.0.203:3536/GSOBackOracle.asmx 192.168.0.203 - eydb2 - eysgdb - eysgdb + SZGHDB2 + scott + SZGHDB2 雨水,污水,给水,天然气,通讯,共通,电通,供电,有线电视,监控,交通信号,路灯 192.168.0.203 - eydb2 - eysgdb - eysgdb + SZSGDB2 + scott + SZSGDB2 http://127.0.0.1/Cyberpipe.msi http://127.0.0.1/Config.xml /Resource/登录页.png http://192.168.0.102:8080/ctrl 21 - /Resource/title.png + /Resource/title.jpg /Resource/图例P.jpg - 入库定位系统 - @2014-2015 中国航天科工二院智慧管网工程研究与发展中心 版权所有 + 智慧太湖新城管网规划分析系统6.0 + @2014-2015 苏州航天系统工程有限公司 版权所有 编号,管线编码,管径_毫米,材质,埋设方式,起始地面高程,起始埋深,终止地面高程,终止埋深,建设年代,使用年限,权属单位,设计单位,设计负责人,施工单位,施工负责人,监理单位,监理负责人,业务负责人,备注 @@ -63,7 +63,7 @@ 编号,地面高程,X坐标,Y坐标,管线点编码,井深,图片编码,类型,建设年代,使用年限,权属单位,设计单位,设计负责人,施工单位,施工负责人,监理单位,监理负责人,业务负责人,备注 - 116.262791, 39.912386,1500 + 120.610963, 31.190621,3000 6000,6100 4000,4100,4200 @@ -71,5 +71,5 @@ 5000,5100,5200,5300 1000,1001,1002,1003 2000,2100,2200,2300 - +proj=tmerc +lat_0=0 +lon_0=117 +k=1 +x_0=555484.8092 +y_0=-4114948.631 +ellps=krass +units=m +no_defs + +proj=tmerc +lat_0=0 +lon_0=120 +k=1 +x_0=-4869.018 +y_0=-3421238.225 +a=6378140 +b=6356755.288157528 +units=m +no_defs \ No newline at end of file diff --git a/bin/x86/Debug/Location.xml b/bin/x86/Debug/Location.xml index 7b9424d..a96ad2e 100644 --- a/bin/x86/Debug/Location.xml +++ b/bin/x86/Debug/Location.xml @@ -1,4 +1,34 @@  - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/DoublePanelAnalysis.cs b/DoublePanelAnalysis.cs index c242b82..955bf70 100644 --- a/DoublePanelAnalysis.cs +++ b/DoublePanelAnalysis.cs @@ -336,7 +336,7 @@ GSOPoint3d pntIntersect1, pntIntersect2, pntProIntersect1, pntProIntersect2; double dDist = globeControl.Globe.Analysis3D.ComputeHorizonDistance(line1, line2, out pntIntersect1, out pntIntersect2, out pntProIntersect1, out pntProIntersect2, false); - GSOPipeLineStyle3D pipeStyle2 = line2.Style as GSOPipeLineStyle3D; + GSOPipeLineStyle3D pipeStyle2 = line2.Style as GSOPipeLineStyle3D; if (pipeStyle2 == null) continue; result.Add(feat2,dDist); } @@ -379,6 +379,8 @@ GSOPoint3d pntIntersect1, pntIntersect2; double dDist = globeControl.Globe.Analysis3D.ComputeTwoGeoPolylineDistance(line1, line2, out pntIntersect1, out pntIntersect2,out horLen,out verLen,true,true,dNoIntersetStartRatio); +// dDist = Math.Abs(pntIntersect1.Z - pntIntersect2.Z) - pipeStyle1.Radius - pipeStyle2.Radius; + dDist = dDist - pipeStyle1.Radius - pipeStyle2.Radius; if (dDist <= 0) { FeatureAnalysisInfo featureAnalysisInfo = new FeatureAnalysisInfo(); diff --git a/EnumEventMode.cs b/EnumEventMode.cs index 0fc543d..4491efd 100644 --- a/EnumEventMode.cs +++ b/EnumEventMode.cs @@ -14,7 +14,6 @@ //add bu yanxiaowei YXKW_Analysis=4,//沿线开挖 JLBZ_Analysis=5// - } //模拟规划设计模式 diff --git a/FrmPatrolerManager.cs b/FrmPatrolerManager.cs index 670d0f7..b802788 100644 --- a/FrmPatrolerManager.cs +++ b/FrmPatrolerManager.cs @@ -177,15 +177,15 @@ private void initForm() { - if (!Utility.userRole.Equals("巡检员新增")) + if (!Utility.userRole.Contains("巡检员新增")) { btn_add_person.Visible = false; } - if (!Utility.userRole.Equals("巡检员编辑")) + if (!Utility.userRole.Contains("巡检员编辑")) { 编辑ToolStripMenuItem.Visible = false; } - if (!Utility.userRole.Equals("巡检员注销")) + if (!Utility.userRole.Contains("巡检员注销")) { 注销ToolStripMenuItem.Visible = false; } diff --git a/bin/x86/Debug/Config.xml b/bin/x86/Debug/Config.xml index 3626f19..5279e02 100644 --- a/bin/x86/Debug/Config.xml +++ b/bin/x86/Debug/Config.xml @@ -1,10 +1,10 @@  LocaSpace三维地下管线信息系统 - eyscdb - eydb2 + release + szhtdb2 192.168.0.203 - eyscdb + release 192.168.0.203 1500 http://192.168.0.203/images/ @@ -13,24 +13,24 @@ http://192.168.0.203:3536/GSOBackOracle.asmx 192.168.0.203 - eydb2 - eysgdb - eysgdb + SZGHDB2 + scott + SZGHDB2 雨水,污水,给水,天然气,通讯,共通,电通,供电,有线电视,监控,交通信号,路灯 192.168.0.203 - eydb2 - eysgdb - eysgdb + SZSGDB2 + scott + SZSGDB2 http://127.0.0.1/Cyberpipe.msi http://127.0.0.1/Config.xml /Resource/登录页.png http://192.168.0.102:8080/ctrl 21 - /Resource/title.png + /Resource/title.jpg /Resource/图例P.jpg - 入库定位系统 - @2014-2015 中国航天科工二院智慧管网工程研究与发展中心 版权所有 + 智慧太湖新城管网规划分析系统6.0 + @2014-2015 苏州航天系统工程有限公司 版权所有 编号,管线编码,管径_毫米,材质,埋设方式,起始地面高程,起始埋深,终止地面高程,终止埋深,建设年代,使用年限,权属单位,设计单位,设计负责人,施工单位,施工负责人,监理单位,监理负责人,业务负责人,备注 @@ -63,7 +63,7 @@ 编号,地面高程,X坐标,Y坐标,管线点编码,井深,图片编码,类型,建设年代,使用年限,权属单位,设计单位,设计负责人,施工单位,施工负责人,监理单位,监理负责人,业务负责人,备注 - 116.262791, 39.912386,1500 + 120.610963, 31.190621,3000 6000,6100 4000,4100,4200 @@ -71,5 +71,5 @@ 5000,5100,5200,5300 1000,1001,1002,1003 2000,2100,2200,2300 - +proj=tmerc +lat_0=0 +lon_0=117 +k=1 +x_0=555484.8092 +y_0=-4114948.631 +ellps=krass +units=m +no_defs + +proj=tmerc +lat_0=0 +lon_0=120 +k=1 +x_0=-4869.018 +y_0=-3421238.225 +a=6378140 +b=6356755.288157528 +units=m +no_defs \ No newline at end of file diff --git a/bin/x86/Debug/Location.xml b/bin/x86/Debug/Location.xml index 7b9424d..a96ad2e 100644 --- a/bin/x86/Debug/Location.xml +++ b/bin/x86/Debug/Location.xml @@ -1,4 +1,34 @@  - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git "a/bin/x86/Debug/Resource/\345\233\276\344\276\213P.jpg" "b/bin/x86/Debug/Resource/\345\233\276\344\276\213P.jpg" index d417f25..f9a3b06 100644 --- "a/bin/x86/Debug/Resource/\345\233\276\344\276\213P.jpg" +++ "b/bin/x86/Debug/Resource/\345\233\276\344\276\213P.jpg" Binary files differ diff --git a/DoublePanelAnalysis.cs b/DoublePanelAnalysis.cs index c242b82..955bf70 100644 --- a/DoublePanelAnalysis.cs +++ b/DoublePanelAnalysis.cs @@ -336,7 +336,7 @@ GSOPoint3d pntIntersect1, pntIntersect2, pntProIntersect1, pntProIntersect2; double dDist = globeControl.Globe.Analysis3D.ComputeHorizonDistance(line1, line2, out pntIntersect1, out pntIntersect2, out pntProIntersect1, out pntProIntersect2, false); - GSOPipeLineStyle3D pipeStyle2 = line2.Style as GSOPipeLineStyle3D; + GSOPipeLineStyle3D pipeStyle2 = line2.Style as GSOPipeLineStyle3D; if (pipeStyle2 == null) continue; result.Add(feat2,dDist); } @@ -379,6 +379,8 @@ GSOPoint3d pntIntersect1, pntIntersect2; double dDist = globeControl.Globe.Analysis3D.ComputeTwoGeoPolylineDistance(line1, line2, out pntIntersect1, out pntIntersect2,out horLen,out verLen,true,true,dNoIntersetStartRatio); +// dDist = Math.Abs(pntIntersect1.Z - pntIntersect2.Z) - pipeStyle1.Radius - pipeStyle2.Radius; + dDist = dDist - pipeStyle1.Radius - pipeStyle2.Radius; if (dDist <= 0) { FeatureAnalysisInfo featureAnalysisInfo = new FeatureAnalysisInfo(); diff --git a/EnumEventMode.cs b/EnumEventMode.cs index 0fc543d..4491efd 100644 --- a/EnumEventMode.cs +++ b/EnumEventMode.cs @@ -14,7 +14,6 @@ //add bu yanxiaowei YXKW_Analysis=4,//沿线开挖 JLBZ_Analysis=5// - } //模拟规划设计模式 diff --git a/FrmPatrolerManager.cs b/FrmPatrolerManager.cs index 670d0f7..b802788 100644 --- a/FrmPatrolerManager.cs +++ b/FrmPatrolerManager.cs @@ -177,15 +177,15 @@ private void initForm() { - if (!Utility.userRole.Equals("巡检员新增")) + if (!Utility.userRole.Contains("巡检员新增")) { btn_add_person.Visible = false; } - if (!Utility.userRole.Equals("巡检员编辑")) + if (!Utility.userRole.Contains("巡检员编辑")) { 编辑ToolStripMenuItem.Visible = false; } - if (!Utility.userRole.Equals("巡检员注销")) + if (!Utility.userRole.Contains("巡检员注销")) { 注销ToolStripMenuItem.Visible = false; } diff --git a/bin/x86/Debug/Config.xml b/bin/x86/Debug/Config.xml index 3626f19..5279e02 100644 --- a/bin/x86/Debug/Config.xml +++ b/bin/x86/Debug/Config.xml @@ -1,10 +1,10 @@  LocaSpace三维地下管线信息系统 - eyscdb - eydb2 + release + szhtdb2 192.168.0.203 - eyscdb + release 192.168.0.203 1500 http://192.168.0.203/images/ @@ -13,24 +13,24 @@ http://192.168.0.203:3536/GSOBackOracle.asmx 192.168.0.203 - eydb2 - eysgdb - eysgdb + SZGHDB2 + scott + SZGHDB2 雨水,污水,给水,天然气,通讯,共通,电通,供电,有线电视,监控,交通信号,路灯 192.168.0.203 - eydb2 - eysgdb - eysgdb + SZSGDB2 + scott + SZSGDB2 http://127.0.0.1/Cyberpipe.msi http://127.0.0.1/Config.xml /Resource/登录页.png http://192.168.0.102:8080/ctrl 21 - /Resource/title.png + /Resource/title.jpg /Resource/图例P.jpg - 入库定位系统 - @2014-2015 中国航天科工二院智慧管网工程研究与发展中心 版权所有 + 智慧太湖新城管网规划分析系统6.0 + @2014-2015 苏州航天系统工程有限公司 版权所有 编号,管线编码,管径_毫米,材质,埋设方式,起始地面高程,起始埋深,终止地面高程,终止埋深,建设年代,使用年限,权属单位,设计单位,设计负责人,施工单位,施工负责人,监理单位,监理负责人,业务负责人,备注 @@ -63,7 +63,7 @@ 编号,地面高程,X坐标,Y坐标,管线点编码,井深,图片编码,类型,建设年代,使用年限,权属单位,设计单位,设计负责人,施工单位,施工负责人,监理单位,监理负责人,业务负责人,备注 - 116.262791, 39.912386,1500 + 120.610963, 31.190621,3000 6000,6100 4000,4100,4200 @@ -71,5 +71,5 @@ 5000,5100,5200,5300 1000,1001,1002,1003 2000,2100,2200,2300 - +proj=tmerc +lat_0=0 +lon_0=117 +k=1 +x_0=555484.8092 +y_0=-4114948.631 +ellps=krass +units=m +no_defs + +proj=tmerc +lat_0=0 +lon_0=120 +k=1 +x_0=-4869.018 +y_0=-3421238.225 +a=6378140 +b=6356755.288157528 +units=m +no_defs \ No newline at end of file diff --git a/bin/x86/Debug/Location.xml b/bin/x86/Debug/Location.xml index 7b9424d..a96ad2e 100644 --- a/bin/x86/Debug/Location.xml +++ b/bin/x86/Debug/Location.xml @@ -1,4 +1,34 @@  - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git "a/bin/x86/Debug/Resource/\345\233\276\344\276\213P.jpg" "b/bin/x86/Debug/Resource/\345\233\276\344\276\213P.jpg" index d417f25..f9a3b06 100644 --- "a/bin/x86/Debug/Resource/\345\233\276\344\276\213P.jpg" +++ "b/bin/x86/Debug/Resource/\345\233\276\344\276\213P.jpg" Binary files differ diff --git "a/bin/x86/Debug/Resource/\347\231\273\345\275\225\351\241\265.png" "b/bin/x86/Debug/Resource/\347\231\273\345\275\225\351\241\265.png" index c4b89bc..7ab6da2 100644 --- "a/bin/x86/Debug/Resource/\347\231\273\345\275\225\351\241\265.png" +++ "b/bin/x86/Debug/Resource/\347\231\273\345\275\225\351\241\265.png" Binary files differ diff --git a/DoublePanelAnalysis.cs b/DoublePanelAnalysis.cs index c242b82..955bf70 100644 --- a/DoublePanelAnalysis.cs +++ b/DoublePanelAnalysis.cs @@ -336,7 +336,7 @@ GSOPoint3d pntIntersect1, pntIntersect2, pntProIntersect1, pntProIntersect2; double dDist = globeControl.Globe.Analysis3D.ComputeHorizonDistance(line1, line2, out pntIntersect1, out pntIntersect2, out pntProIntersect1, out pntProIntersect2, false); - GSOPipeLineStyle3D pipeStyle2 = line2.Style as GSOPipeLineStyle3D; + GSOPipeLineStyle3D pipeStyle2 = line2.Style as GSOPipeLineStyle3D; if (pipeStyle2 == null) continue; result.Add(feat2,dDist); } @@ -379,6 +379,8 @@ GSOPoint3d pntIntersect1, pntIntersect2; double dDist = globeControl.Globe.Analysis3D.ComputeTwoGeoPolylineDistance(line1, line2, out pntIntersect1, out pntIntersect2,out horLen,out verLen,true,true,dNoIntersetStartRatio); +// dDist = Math.Abs(pntIntersect1.Z - pntIntersect2.Z) - pipeStyle1.Radius - pipeStyle2.Radius; + dDist = dDist - pipeStyle1.Radius - pipeStyle2.Radius; if (dDist <= 0) { FeatureAnalysisInfo featureAnalysisInfo = new FeatureAnalysisInfo(); diff --git a/EnumEventMode.cs b/EnumEventMode.cs index 0fc543d..4491efd 100644 --- a/EnumEventMode.cs +++ b/EnumEventMode.cs @@ -14,7 +14,6 @@ //add bu yanxiaowei YXKW_Analysis=4,//沿线开挖 JLBZ_Analysis=5// - } //模拟规划设计模式 diff --git a/FrmPatrolerManager.cs b/FrmPatrolerManager.cs index 670d0f7..b802788 100644 --- a/FrmPatrolerManager.cs +++ b/FrmPatrolerManager.cs @@ -177,15 +177,15 @@ private void initForm() { - if (!Utility.userRole.Equals("巡检员新增")) + if (!Utility.userRole.Contains("巡检员新增")) { btn_add_person.Visible = false; } - if (!Utility.userRole.Equals("巡检员编辑")) + if (!Utility.userRole.Contains("巡检员编辑")) { 编辑ToolStripMenuItem.Visible = false; } - if (!Utility.userRole.Equals("巡检员注销")) + if (!Utility.userRole.Contains("巡检员注销")) { 注销ToolStripMenuItem.Visible = false; } diff --git a/bin/x86/Debug/Config.xml b/bin/x86/Debug/Config.xml index 3626f19..5279e02 100644 --- a/bin/x86/Debug/Config.xml +++ b/bin/x86/Debug/Config.xml @@ -1,10 +1,10 @@  LocaSpace三维地下管线信息系统 - eyscdb - eydb2 + release + szhtdb2 192.168.0.203 - eyscdb + release 192.168.0.203 1500 http://192.168.0.203/images/ @@ -13,24 +13,24 @@ http://192.168.0.203:3536/GSOBackOracle.asmx 192.168.0.203 - eydb2 - eysgdb - eysgdb + SZGHDB2 + scott + SZGHDB2 雨水,污水,给水,天然气,通讯,共通,电通,供电,有线电视,监控,交通信号,路灯 192.168.0.203 - eydb2 - eysgdb - eysgdb + SZSGDB2 + scott + SZSGDB2 http://127.0.0.1/Cyberpipe.msi http://127.0.0.1/Config.xml /Resource/登录页.png http://192.168.0.102:8080/ctrl 21 - /Resource/title.png + /Resource/title.jpg /Resource/图例P.jpg - 入库定位系统 - @2014-2015 中国航天科工二院智慧管网工程研究与发展中心 版权所有 + 智慧太湖新城管网规划分析系统6.0 + @2014-2015 苏州航天系统工程有限公司 版权所有 编号,管线编码,管径_毫米,材质,埋设方式,起始地面高程,起始埋深,终止地面高程,终止埋深,建设年代,使用年限,权属单位,设计单位,设计负责人,施工单位,施工负责人,监理单位,监理负责人,业务负责人,备注 @@ -63,7 +63,7 @@ 编号,地面高程,X坐标,Y坐标,管线点编码,井深,图片编码,类型,建设年代,使用年限,权属单位,设计单位,设计负责人,施工单位,施工负责人,监理单位,监理负责人,业务负责人,备注 - 116.262791, 39.912386,1500 + 120.610963, 31.190621,3000 6000,6100 4000,4100,4200 @@ -71,5 +71,5 @@ 5000,5100,5200,5300 1000,1001,1002,1003 2000,2100,2200,2300 - +proj=tmerc +lat_0=0 +lon_0=117 +k=1 +x_0=555484.8092 +y_0=-4114948.631 +ellps=krass +units=m +no_defs + +proj=tmerc +lat_0=0 +lon_0=120 +k=1 +x_0=-4869.018 +y_0=-3421238.225 +a=6378140 +b=6356755.288157528 +units=m +no_defs \ No newline at end of file diff --git a/bin/x86/Debug/Location.xml b/bin/x86/Debug/Location.xml index 7b9424d..a96ad2e 100644 --- a/bin/x86/Debug/Location.xml +++ b/bin/x86/Debug/Location.xml @@ -1,4 +1,34 @@  - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git "a/bin/x86/Debug/Resource/\345\233\276\344\276\213P.jpg" "b/bin/x86/Debug/Resource/\345\233\276\344\276\213P.jpg" index d417f25..f9a3b06 100644 --- "a/bin/x86/Debug/Resource/\345\233\276\344\276\213P.jpg" +++ "b/bin/x86/Debug/Resource/\345\233\276\344\276\213P.jpg" Binary files differ diff --git "a/bin/x86/Debug/Resource/\347\231\273\345\275\225\351\241\265.png" "b/bin/x86/Debug/Resource/\347\231\273\345\275\225\351\241\265.png" index c4b89bc..7ab6da2 100644 --- "a/bin/x86/Debug/Resource/\347\231\273\345\275\225\351\241\265.png" +++ "b/bin/x86/Debug/Resource/\347\231\273\345\275\225\351\241\265.png" Binary files differ diff --git a/bin/x86/Debug/layerConfig.xml b/bin/x86/Debug/layerConfig.xml index ae32b83..9266e1f 100644 --- a/bin/x86/Debug/layerConfig.xml +++ b/bin/x86/Debug/layerConfig.xml @@ -14,25 +14,17 @@ - + - - - - - - - + + - + - - - - - - + + + @@ -40,9 +32,6 @@ - - - @@ -50,63 +39,99 @@ - - - - + - - + + + + - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -118,10 +143,84 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - + + + + + + + + + + + + + + + + diff --git a/DoublePanelAnalysis.cs b/DoublePanelAnalysis.cs index c242b82..955bf70 100644 --- a/DoublePanelAnalysis.cs +++ b/DoublePanelAnalysis.cs @@ -336,7 +336,7 @@ GSOPoint3d pntIntersect1, pntIntersect2, pntProIntersect1, pntProIntersect2; double dDist = globeControl.Globe.Analysis3D.ComputeHorizonDistance(line1, line2, out pntIntersect1, out pntIntersect2, out pntProIntersect1, out pntProIntersect2, false); - GSOPipeLineStyle3D pipeStyle2 = line2.Style as GSOPipeLineStyle3D; + GSOPipeLineStyle3D pipeStyle2 = line2.Style as GSOPipeLineStyle3D; if (pipeStyle2 == null) continue; result.Add(feat2,dDist); } @@ -379,6 +379,8 @@ GSOPoint3d pntIntersect1, pntIntersect2; double dDist = globeControl.Globe.Analysis3D.ComputeTwoGeoPolylineDistance(line1, line2, out pntIntersect1, out pntIntersect2,out horLen,out verLen,true,true,dNoIntersetStartRatio); +// dDist = Math.Abs(pntIntersect1.Z - pntIntersect2.Z) - pipeStyle1.Radius - pipeStyle2.Radius; + dDist = dDist - pipeStyle1.Radius - pipeStyle2.Radius; if (dDist <= 0) { FeatureAnalysisInfo featureAnalysisInfo = new FeatureAnalysisInfo(); diff --git a/EnumEventMode.cs b/EnumEventMode.cs index 0fc543d..4491efd 100644 --- a/EnumEventMode.cs +++ b/EnumEventMode.cs @@ -14,7 +14,6 @@ //add bu yanxiaowei YXKW_Analysis=4,//沿线开挖 JLBZ_Analysis=5// - } //模拟规划设计模式 diff --git a/FrmPatrolerManager.cs b/FrmPatrolerManager.cs index 670d0f7..b802788 100644 --- a/FrmPatrolerManager.cs +++ b/FrmPatrolerManager.cs @@ -177,15 +177,15 @@ private void initForm() { - if (!Utility.userRole.Equals("巡检员新增")) + if (!Utility.userRole.Contains("巡检员新增")) { btn_add_person.Visible = false; } - if (!Utility.userRole.Equals("巡检员编辑")) + if (!Utility.userRole.Contains("巡检员编辑")) { 编辑ToolStripMenuItem.Visible = false; } - if (!Utility.userRole.Equals("巡检员注销")) + if (!Utility.userRole.Contains("巡检员注销")) { 注销ToolStripMenuItem.Visible = false; } diff --git a/bin/x86/Debug/Config.xml b/bin/x86/Debug/Config.xml index 3626f19..5279e02 100644 --- a/bin/x86/Debug/Config.xml +++ b/bin/x86/Debug/Config.xml @@ -1,10 +1,10 @@  LocaSpace三维地下管线信息系统 - eyscdb - eydb2 + release + szhtdb2 192.168.0.203 - eyscdb + release 192.168.0.203 1500 http://192.168.0.203/images/ @@ -13,24 +13,24 @@ http://192.168.0.203:3536/GSOBackOracle.asmx 192.168.0.203 - eydb2 - eysgdb - eysgdb + SZGHDB2 + scott + SZGHDB2 雨水,污水,给水,天然气,通讯,共通,电通,供电,有线电视,监控,交通信号,路灯 192.168.0.203 - eydb2 - eysgdb - eysgdb + SZSGDB2 + scott + SZSGDB2 http://127.0.0.1/Cyberpipe.msi http://127.0.0.1/Config.xml /Resource/登录页.png http://192.168.0.102:8080/ctrl 21 - /Resource/title.png + /Resource/title.jpg /Resource/图例P.jpg - 入库定位系统 - @2014-2015 中国航天科工二院智慧管网工程研究与发展中心 版权所有 + 智慧太湖新城管网规划分析系统6.0 + @2014-2015 苏州航天系统工程有限公司 版权所有 编号,管线编码,管径_毫米,材质,埋设方式,起始地面高程,起始埋深,终止地面高程,终止埋深,建设年代,使用年限,权属单位,设计单位,设计负责人,施工单位,施工负责人,监理单位,监理负责人,业务负责人,备注 @@ -63,7 +63,7 @@ 编号,地面高程,X坐标,Y坐标,管线点编码,井深,图片编码,类型,建设年代,使用年限,权属单位,设计单位,设计负责人,施工单位,施工负责人,监理单位,监理负责人,业务负责人,备注 - 116.262791, 39.912386,1500 + 120.610963, 31.190621,3000 6000,6100 4000,4100,4200 @@ -71,5 +71,5 @@ 5000,5100,5200,5300 1000,1001,1002,1003 2000,2100,2200,2300 - +proj=tmerc +lat_0=0 +lon_0=117 +k=1 +x_0=555484.8092 +y_0=-4114948.631 +ellps=krass +units=m +no_defs + +proj=tmerc +lat_0=0 +lon_0=120 +k=1 +x_0=-4869.018 +y_0=-3421238.225 +a=6378140 +b=6356755.288157528 +units=m +no_defs \ No newline at end of file diff --git a/bin/x86/Debug/Location.xml b/bin/x86/Debug/Location.xml index 7b9424d..a96ad2e 100644 --- a/bin/x86/Debug/Location.xml +++ b/bin/x86/Debug/Location.xml @@ -1,4 +1,34 @@  - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git "a/bin/x86/Debug/Resource/\345\233\276\344\276\213P.jpg" "b/bin/x86/Debug/Resource/\345\233\276\344\276\213P.jpg" index d417f25..f9a3b06 100644 --- "a/bin/x86/Debug/Resource/\345\233\276\344\276\213P.jpg" +++ "b/bin/x86/Debug/Resource/\345\233\276\344\276\213P.jpg" Binary files differ diff --git "a/bin/x86/Debug/Resource/\347\231\273\345\275\225\351\241\265.png" "b/bin/x86/Debug/Resource/\347\231\273\345\275\225\351\241\265.png" index c4b89bc..7ab6da2 100644 --- "a/bin/x86/Debug/Resource/\347\231\273\345\275\225\351\241\265.png" +++ "b/bin/x86/Debug/Resource/\347\231\273\345\275\225\351\241\265.png" Binary files differ diff --git a/bin/x86/Debug/layerConfig.xml b/bin/x86/Debug/layerConfig.xml index ae32b83..9266e1f 100644 --- a/bin/x86/Debug/layerConfig.xml +++ b/bin/x86/Debug/layerConfig.xml @@ -14,25 +14,17 @@ - + - - - - - - - + + - + - - - - - - + + + @@ -40,9 +32,6 @@ - - - @@ -50,63 +39,99 @@ - - - - + - - + + + + - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -118,10 +143,84 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - + + + + + + + + + + + + + + + + diff --git a/bin/x86/Debug/login.xml b/bin/x86/Debug/login.xml index 6e1dc64..27656b9 100644 --- a/bin/x86/Debug/login.xml +++ b/bin/x86/Debug/login.xml @@ -1,6 +1,6 @@  - ghfx - 111111 + szht + szht@1234 true \ No newline at end of file