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

RNO xoffset

Browse Source 
RNO xoffset & “Improved Box with Paragraph” printing
“Improved Box with Paragraph” box location
fix possible null reference for determining auto indent of meta-sections
Calvert: using format flag IdentWidth in defining tab width if it is set in format file
This commit is contained in:
Kathy Ruffing 2014-11-11 15:45:11 +00:00
parent 80315d2657
commit 5cc512234e
7 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
PROMS/Formats/fmtall/BGEOI_00all.xml
View File

Binary file not shown.

BIN
PROMS/Formats/fmtall/BGEOIall.xml
View File

Binary file not shown.

BIN
PROMS/Formats/fmtall/BGESTPall.xml
View File

Binary file not shown.

BIN
PROMS/Formats/genmacall/bgeoi.svg
View File

Binary file not shown.

BIN
PROMS/Formats/genmacall/bgestp.svg
View File

Binary file not shown.

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

@ -2245,9 +2245,9 @@ namespace Volian.Print.Library
offset += (float)formatInfo.PlantFormat.FormatData.SectData.SectionNumber.Pos; offset += (float)formatInfo.PlantFormat.FormatData.SectData.SectionNumber.Pos;
else else
{ {
float autoIndent = 0;
SectionConfig sc = itemInfo.MyParent.MyConfig as SectionConfig; SectionConfig sc = itemInfo.MyParent.MyConfig as SectionConfig;
offset = (sc != null && sc.SubSection_AutoIndent == "Y") ? MyParent.XOffset : MyParent.MyTab.XOffset; offset = (sc != null && sc.SubSection_AutoIndent == "Y") ? MyParent.XOffset
: (MyParent.MyTab != null)?MyParent.MyTab.XOffset:XOffset;
} }
} }
else else

2
PROMS/Volian.Print.Library/vlnTab.cs
View File

@ -183,6 +183,8 @@ namespace Volian.Print.Library
float? tPtPerChar1 = myparent.MyItemInfo.ActiveFormat.PlantFormat.FormatData.SectData.StepSectionData.StepSectionLayoutData.TabPtsPerChar; float? tPtPerChar1 = myparent.MyItemInfo.ActiveFormat.PlantFormat.FormatData.SectData.StepSectionData.StepSectionLayoutData.TabPtsPerChar;
if (tPtPerChar1 != null) if (tPtPerChar1 != null)
Width = (float)tPtPerChar1 * origTab.Length; Width = (float)tPtPerChar1 * origTab.Length;
else if ((myparent.MyItemInfo.FormatStepData != null) && (myparent.MyItemInfo.FormatStepData.TabData.IdentWidth ?? 0) > 0)
Width = (float)myparent.MyItemInfo.FormatStepData.TabData.IdentWidth;
else else
{ {
origTab = origTab + " "; origTab = origTab + " ";