From 857bbc6af0a7ca107f1cf564ccd62c78be5353c1 Mon Sep 17 00:00:00 2001 From: Rich Date: Fri, 15 Nov 2013 19:12:37 +0000 Subject: [PATCH] Don't add Unit ROs unless Type is Text or ALL and myDVI has been set. Added logic to determine AccPageID for Unit ROs. --- PROMS/Volian.Controls.Library/DisplayRO.cs | 29 +++++++++++++++------- 1 file changed, 20 insertions(+), 9 deletions(-) diff --git a/PROMS/Volian.Controls.Library/DisplayRO.cs b/PROMS/Volian.Controls.Library/DisplayRO.cs index 1eddd662..eb2b87c1 100644 --- a/PROMS/Volian.Controls.Library/DisplayRO.cs +++ b/PROMS/Volian.Controls.Library/DisplayRO.cs @@ -418,7 +418,7 @@ namespace Volian.Controls.Library tvROFST.Nodes.Add(tn); AddDummyGroup(_MyROFST.ROFSTLookup.myHdr.myDbs[i], tn); } - if (this.Mydvi.MultiUnitCount > 1) + if ((ROTypeFilter == E_ROValueType.Text || ROTypeFilter == E_ROValueType.All) && this.Mydvi != null && this.Mydvi.MultiUnitCount > 1) { TreeNode tnn = tvROFST.Nodes.Add("Unit Information"); /* @@ -575,17 +575,28 @@ namespace Volian.Controls.Library break; } } + string AccPageID; if (!dbFound) { - MessageBox.Show("Error occurred finding RO. Contact Volian"); - return; + if (roch.roid.StartsWith("FFFF")) + { + AccPageID = "<" + roch.appid + ">"; + } + else + { + MessageBox.Show("Error occurred finding RO. Contact Volian"); + return; + } + } + else + { + string accPrefix = db.dbiAP.Replace(_Mydvi.DocVersionConfig.RODefaults_graphicsprefix, "IG"); + accPrefix = accPrefix.Replace(_Mydvi.DocVersionConfig.RODefaults_setpointprefix, "SP"); + // string accPrefix = (roch.type == 8) ? _Mydvi.DocVersionConfig.RODefaults_graphicsprefix : _Mydvi.DocVersionConfig.RODefaults_setpointprefix; + string suffix = (roch.roid.Length == 12 || roch.roid.Substring(12, 4) == "0041") ? "" : "." + ((char)Convert.ToInt32(roch.roid.Substring(12, 4), 16)).ToString(); + AccPageID = string.Format("<{0}-{1}{2}>", accPrefix, roch.appid, suffix);// makes for example + Console.WriteLine(AccPageID); } - string accPrefix = db.dbiAP.Replace(_Mydvi.DocVersionConfig.RODefaults_graphicsprefix, "IG"); - accPrefix = accPrefix.Replace(_Mydvi.DocVersionConfig.RODefaults_setpointprefix, "SP"); - // string accPrefix = (roch.type == 8) ? _Mydvi.DocVersionConfig.RODefaults_graphicsprefix : _Mydvi.DocVersionConfig.RODefaults_setpointprefix; - string suffix = (roch.roid.Length==12 || roch.roid.Substring(12, 4) == "0041") ? "" : "." + ((char)Convert.ToInt32(roch.roid.Substring(12, 4), 16)).ToString(); - string AccPageID = string.Format("<{0}-{1}{2}>", accPrefix, roch.appid, suffix);// makes for example - Console.WriteLine(AccPageID); //string AccPageID = string.Format("{0} <{1}-{2}>", ConvertSymbolsAndStuff(selectedChld.value), accPrefix, roch.appid); // value and accesory ID //string AccPageID = string.Format("{0} {1}", ConvertSymbolsAndStuff(selectedChld.value), string.Format(@"#Link:ReferencedObject: {0} {1}", roch.roid, _MyROFST.MyRODb.RODbID)); // value and link reference //if (MessageBox.Show(AccPageID,"Place on Windows Clipboard?",MessageBoxButtons.YesNo) == DialogResult.Yes)