Revert to previous

This commit is contained in:
Rich 2014-02-19 21:31:39 +00:00
parent 2bd5ad58f1
commit ddd973c83f

View File

@ -1687,9 +1687,9 @@ namespace Volian.Print.Library
bool dropCheckoff = itemInfo.ActiveFormat.PlantFormat.FormatData.ProcData.CheckOffData.DropCheckOff; bool dropCheckoff = itemInfo.ActiveFormat.PlantFormat.FormatData.ProcData.CheckOffData.DropCheckOff;
if (itemInfo.MyContent.MyGrid != null) if (itemInfo.MyContent.MyGrid != null)
{ {
VlnFlexGrid myFlexGrid = new VlnFlexGrid(1, 1); //Use Static MyFlexGrid - BWD INST2 - FlexGrid Errors
myFlexGrid.LoadGrid(itemInfo); MyFlexGrid.LoadGrid(itemInfo);
MyGrid = new vlnTable(myFlexGrid, cb); MyGrid = new vlnTable(MyFlexGrid, cb);
Height = MyGrid.Height; Height = MyGrid.Height;
Width = MyGrid.Width; Width = MyGrid.Width;
@ -1708,7 +1708,7 @@ namespace Volian.Print.Library
// if the table does not have a border, only move down one line: // if the table does not have a border, only move down one line:
float yoffForBorder = 2 * SixLinesPerInch; float yoffForBorder = 2 * SixLinesPerInch;
if (myFlexGrid.BorderStyle == C1.Win.C1FlexGrid.Util.BaseControls.BorderStyleEnum.None && !myFlexGrid.TopRowHasBorder()) if (MyFlexGrid.BorderStyle == C1.Win.C1FlexGrid.Util.BaseControls.BorderStyleEnum.None && !MyFlexGrid.TopRowHasBorder())
yoffForBorder -= SixLinesPerInch; yoffForBorder -= SixLinesPerInch;
//yForCheckoff = yoff + Height - SixLinesPerInch; //yForCheckoff = yoff + Height - SixLinesPerInch;
@ -1917,7 +1917,7 @@ namespace Volian.Print.Library
if (MyTab != null) MyTab.YOffset = ChildrenRight[0].YOffset; if (MyTab != null) MyTab.YOffset = ChildrenRight[0].YOffset;
if (PartsRight.Count > 0) PartsRight[0].YOffset = ChildrenRight[0].YOffset; if (PartsRight.Count > 0) PartsRight[0].YOffset = ChildrenRight[0].YOffset;
if (ChildrenAbove.Count == 0) if (ChildrenAbove.Count == 0)
YTopMost = ChildrenRight[0].ChildrenAbove[0].YOffset; YTopMost = ChildrenRight[0].ChildrenAbove[0].YOffset;
else else
YTopMost = ChildrenAbove[0].YOffset; YTopMost = ChildrenAbove[0].YOffset;
} }