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

Handle Unit RO <UNIT-Number> in MS Word Documents

Browse Source 
Comment-out a change that was made to raise the location of the "END" message.
Fixed logic to account for borders on figures.
This commit is contained in:
Rich 2013-11-12 19:53:15 +00:00
parent 3c52a7fd1c
commit d9a10aca59
2 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -808,7 +808,8 @@ namespace VEPROMS.CSLA.Library
// If multiple return values includes X-Y Plot, check to see if it is an X-Y Plot // If multiple return values includes X-Y Plot, check to see if it is an X-Y Plot
if (val == null) if (val == null)
{ {
if(sel.Text == "<U-Text>") val =lookup.DocVersionInfo.DocVersionConfig.Unit_Text; if(sel.Text.ToUpper() == "<U-TEXT>") val =lookup.DocVersionInfo.DocVersionConfig.Unit_Text;
else if (sel.Text.ToUpper() == "<U-NUMBER>") val = lookup.DocVersionInfo.DocVersionConfig.Unit_Number;
//val = "<U-ID>",MyDocVersion.DocVersionConfig.Unit_ID); //val = "<U-ID>",MyDocVersion.DocVersionConfig.Unit_ID);
//text = text.Replace(@"<S\u8209?ID>", _MyItemInfo.MyDocVersion.DocVersionConfig.Unit_ProcedureSetID); //text = text.Replace(@"<S\u8209?ID>", _MyItemInfo.MyDocVersion.DocVersionConfig.Unit_ProcedureSetID);
//text = text.Replace("<U>", _MyItemInfo.MyDocVersion.DocVersionConfig.Unit_Number); //text = text.Replace("<U>", _MyItemInfo.MyDocVersion.DocVersionConfig.Unit_Number);

8
PROMS/Volian.Print.Library/vlnParagraph.cs
View File

@ -990,8 +990,8 @@ namespace Volian.Print.Library
{ {
// If the flag is 0 or 1, just put the end message out right below this vlnParagraph: // If the flag is 0 or 1, just put the end message out right below this vlnParagraph:
float msg_yLocation = CalculateYLocation(yPageStart - YBottomMost, yTopMargin); float msg_yLocation = CalculateYLocation(yPageStart - YBottomMost, yTopMargin);
if (MyPageHelper.YMultiplier < 1) //if (MyPageHelper.YMultiplier < 1)
msg_yLocation += 4;// Robinson - if the page is compressed, we need this adjustment. // msg_yLocation += 4;// Robinson - if the page is compressed, we need this adjustment.
// the following is for IP3 - it was commented out so that an update could be put on // the following is for IP3 - it was commented out so that an update could be put on
// before this was tested. // before this was tested.
@ -1506,8 +1506,8 @@ namespace Volian.Print.Library
yForCheckoff += Height - SixLinesPerInch; // place checkoff on last row of text yForCheckoff += Height - SixLinesPerInch; // place checkoff on last row of text
yoff += (Height + yoffForBorder); //(2 * SixLinesPerInch)); yoff += (Height + yoffForBorder); //(2 * SixLinesPerInch));
CalculateXOffsetGridOrFigure(itemInfo, maxRNO, formatInfo); CalculateXOffsetGridOrFigure(itemInfo, maxRNO, formatInfo);
yoff = (float)Math.Ceiling(yoff); // RHM 20120925 - Make sure that yOff is an integer value after a grid bool noborder = MyItemInfo.FormatStepData.Type.ToUpper().Contains("BORDERLESS");
} yoff += (Height + ((noborder?1:2)*SixLinesPerInch)); // RHM 20120925 - Eliminate extra space after Figure }
else if (itemInfo.IsFigure) // if a figure we've got to determine the size: else if (itemInfo.IsFigure) // if a figure we've got to determine the size:
{ {
string erMsg = null; string erMsg = null;