Volian/SourceCode
8
0
Fork 0
Code Issues Pull Requests 1 Projects Releases Wiki Activity

Fixed problem with a negative value in a scientific notation RO value

Browse Source 
Added logic to support an Indented Paragraph (Comanche Peak)
This commit is contained in:
John Jenko 2013-10-10 20:02:22 +00:00
parent 16cf8c0366
commit ff6e3626c4
2 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
PROMS/VEPROMS.CSLA.Library/Extension/DocumentExt.cs
View File

@ -1246,6 +1246,8 @@ namespace VEPROMS.CSLA.Library
tmp = tmp.Replace(@"\u160?", "\xA0"); tmp = tmp.Replace(@"\u160?", "\xA0");
tmp = tmp.Replace(@"\U160?", "\xA0"); tmp = tmp.Replace(@"\U160?", "\xA0");
tmp = tmp.Replace(@"[xB3]", "\xB3"); tmp = tmp.Replace(@"[xB3]", "\xB3");
tmp = tmp.Replace(@"\U8209?", "-"); // fixes negative value in scienctific notation
tmp = tmp.Replace(@"\u8209?", "-");
// Look for superscript or subscript and insert the appropriate commands // Look for superscript or subscript and insert the appropriate commands
Match roMatch = Regex.Match(tmp, @"(.*?)\\(up2|dn2) (.*?)\\(up0|dn0) "); Match roMatch = Regex.Match(tmp, @"(.*?)\\(up2|dn2) (.*?)\\(up0|dn0) ");
if (roMatch.Groups.Count == 5)// Superscript or subscript found if (roMatch.Groups.Count == 5)// Superscript or subscript found

15
PROMS/VEPROMS.CSLA.Library/Extension/ItemExt.cs
View File

@ -2451,15 +2451,18 @@ namespace VEPROMS.CSLA.Library
protected void SetTabText() protected void SetTabText()
{ {
string cltext = null; string cltext = null;
if (IsParagraph && !IsSequential)
{
_MyTab.Text = "";
_MyTab.CleanText = "";
return;
}
int stepType = (int)(MyContent.Type % 10000); int stepType = (int)(MyContent.Type % 10000);
string tbformat = IsInRNO ? FormatStepData.TabData.RNOIdentPrint : FormatStepData.TabData.IdentPrint; string tbformat = IsInRNO ? FormatStepData.TabData.RNOIdentPrint : FormatStepData.TabData.IdentPrint;
string tbformate = null; // need this for background documents, to generate tab for editing. string tbformate = null; // need this for background documents, to generate tab for editing.
if (IsParagraph && !IsSequential)
{
string tstr = "";
if (tbformat.Contains("{!.+?}"))
tstr = tbformat.Replace("{!.+?}", " "); // Comanche Peak Indented Paragraph
_MyTab.Text = tstr;
_MyTab.CleanText = tstr;
return;
}
if (((ActiveFormat.PlantFormat.FormatData.PurchaseOptions.Value & E_PurchaseOptions.EnhancedBackgrounds) == E_PurchaseOptions.EnhancedBackgrounds) && if (((ActiveFormat.PlantFormat.FormatData.PurchaseOptions.Value & E_PurchaseOptions.EnhancedBackgrounds) == E_PurchaseOptions.EnhancedBackgrounds) &&
((IsHigh && FormatStepData.PageBreakOnStep) || (IsRNOPart && MyHLS.FormatStepData.PageBreakOnStep))) ((IsHigh && FormatStepData.PageBreakOnStep) || (IsRNOPart && MyHLS.FormatStepData.PageBreakOnStep)))