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

Logic to keep looking (inheritance) if a blank value is found

Browse Source 
Dtermine font style from format xml
Fixed a bug - AnnotationTypes in Annotation Search
Add defaults for user configuration data
This commit is contained in:
Rich 2009-02-06 15:57:23 +00:00
parent 26f8e03a8c
commit 9df3bccd71
5 changed files with 29 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
PROMS/DataLoader/Properties/Settings.Designer.cs generated
View File

@ -49,6 +49,7 @@ namespace DataLoader.Properties {
[global::System.Configuration.UserScopedSettingAttribute()] [global::System.Configuration.UserScopedSettingAttribute()]
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.Configuration.DefaultSettingValueAttribute("Checked")]
public global::System.Windows.Forms.CheckState LoadWordDoc { public global::System.Windows.Forms.CheckState LoadWordDoc {
get { get {
return ((global::System.Windows.Forms.CheckState)(this["LoadWordDoc"])); return ((global::System.Windows.Forms.CheckState)(this["LoadWordDoc"]));
@ -60,6 +61,7 @@ namespace DataLoader.Properties {
[global::System.Configuration.UserScopedSettingAttribute()] [global::System.Configuration.UserScopedSettingAttribute()]
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.Configuration.DefaultSettingValueAttribute("Unchecked")]
public global::System.Windows.Forms.CheckState LoadRTFDoc { public global::System.Windows.Forms.CheckState LoadRTFDoc {
get { get {
return ((global::System.Windows.Forms.CheckState)(this["LoadRTFDoc"])); return ((global::System.Windows.Forms.CheckState)(this["LoadRTFDoc"]));
@ -71,6 +73,7 @@ namespace DataLoader.Properties {
[global::System.Configuration.UserScopedSettingAttribute()] [global::System.Configuration.UserScopedSettingAttribute()]
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.Configuration.DefaultSettingValueAttribute("Checked")]
public global::System.Windows.Forms.CheckState PurgeData { public global::System.Windows.Forms.CheckState PurgeData {
get { get {
return ((global::System.Windows.Forms.CheckState)(this["PurgeData"])); return ((global::System.Windows.Forms.CheckState)(this["PurgeData"]));

6
PROMS/DataLoader/Properties/Settings.settings
View File

@ -9,13 +9,13 @@
<Value Profile="(Default)" /> <Value Profile="(Default)" />
</Setting> </Setting>
<Setting Name="LoadWordDoc" Type="System.Windows.Forms.CheckState" Scope="User"> <Setting Name="LoadWordDoc" Type="System.Windows.Forms.CheckState" Scope="User">
<Value Profile="(Default)" /> <Value Profile="(Default)">Checked</Value>
</Setting> </Setting>
<Setting Name="LoadRTFDoc" Type="System.Windows.Forms.CheckState" Scope="User"> <Setting Name="LoadRTFDoc" Type="System.Windows.Forms.CheckState" Scope="User">
<Value Profile="(Default)" /> <Value Profile="(Default)">Unchecked</Value>
</Setting> </Setting>
<Setting Name="PurgeData" Type="System.Windows.Forms.CheckState" Scope="User"> <Setting Name="PurgeData" Type="System.Windows.Forms.CheckState" Scope="User">
<Value Profile="(Default)" /> <Value Profile="(Default)">Checked</Value>
</Setting> </Setting>
<Setting Name="VePromsFilename" Type="System.String" Scope="User"> <Setting Name="VePromsFilename" Type="System.String" Scope="User">
<Value Profile="(Default)" /> <Value Profile="(Default)" />

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

@ -885,7 +885,7 @@ namespace VEPROMS.CSLA.Library
{ {
get { return ConvertToDisplayText(MyContent.Text); } get { return ConvertToDisplayText(MyContent.Text); }
} }
private string ConvertToDisplayText(string txt) public static string ConvertToDisplayText(string txt)
{ {
string retval = txt; string retval = txt;
retval = StripRtfFormatting(retval); retval = StripRtfFormatting(retval);
@ -1681,7 +1681,7 @@ namespace VEPROMS.CSLA.Library
cm.CommandText = "vesp_SearchAnnotationItemAndChildren"; cm.CommandText = "vesp_SearchAnnotationItemAndChildren";
cm.Parameters.AddWithValue("@DocVersionList", criteria.DocVersionList); cm.Parameters.AddWithValue("@DocVersionList", criteria.DocVersionList);
cm.Parameters.AddWithValue("@StepTypeList", criteria.StepTypeList); cm.Parameters.AddWithValue("@StepTypeList", criteria.StepTypeList);
cm.Parameters.AddWithValue("@AnnotationTypeList", criteria.StepTypeList); cm.Parameters.AddWithValue("@AnnotationTypeList", criteria.AnnotationTypeList);
cm.Parameters.AddWithValue("@SearchString", criteria.SearchString); cm.Parameters.AddWithValue("@SearchString", criteria.SearchString);
cm.Parameters.AddWithValue("@CaseSensitive", criteria.CaseSensitive ? 1 : 0); cm.Parameters.AddWithValue("@CaseSensitive", criteria.CaseSensitive ? 1 : 0);
using (SafeDataReader dr = new SafeDataReader(cm.ExecuteReader())) using (SafeDataReader dr = new SafeDataReader(cm.ExecuteReader()))

15
PROMS/VEPROMS.CSLA.Library/Format/PlantFormat.cs
View File

@ -72,7 +72,20 @@ namespace VEPROMS.CSLA.Library
get get
{ {
// TODO: eventually want styles // TODO: eventually want styles
if (_WindowsFont == _WindowsFont) _WindowsFont = new Font(Family, (float)Size); if (_WindowsFont == null)
{
FontStyle style = FontStyle.Regular;
if (Style != E_Style.None)
{
if ((Style & E_Style.Bold) != 0)
style |= FontStyle.Bold;
if ((Style & E_Style.Italics) != 0)
style |= FontStyle.Italic;
if ((Style & E_Style.Underline) != 0)
style |= FontStyle.Underline;
}
_WindowsFont = new Font(Family, (float)Size, style);
}
return _WindowsFont; return _WindowsFont;
} }
} }

11
PROMS/VEPROMS.CSLA.Library/Format/vlnFormat.cs
View File

@ -37,9 +37,11 @@ namespace VEPROMS.CSLA.Library
{ {
XmlNode xn = null; XmlNode xn = null;
if (xmlNode != null) if (xmlNode != null)
{ {
xn = xmlNode.SelectSingleNode(path); xn = xmlNode.SelectSingleNode(path);
if (xn != null) return xn; // RHM 2008-12-15 - Added logic to keep looking if a blank attribute is found
if (xn != null && xn is XmlAttribute && (xn as XmlAttribute).Value != "") return xn;
//if (xn != null) return xn;
} }
else else
{ {
@ -63,7 +65,8 @@ namespace VEPROMS.CSLA.Library
if (xmlNode == null) return null; if (xmlNode == null) return null;
XmlNode tmpNode = xmlNode; XmlNode tmpNode = xmlNode;
XmlNode xn = xmlNode.SelectSingleNode(path); XmlNode xn = xmlNode.SelectSingleNode(path);
while (xn == null)//Walk-up the format tree to find a font node // RHM 2008-12-15 - Added logic to keep looking if a blank attribute is found
while (xn == null || (xn is XmlAttribute && (xn as XmlAttribute).Value == ""))//Walk-up the format tree to find a font node
{ {
if (xmlNode.NodeType == XmlNodeType.Document) if (xmlNode.NodeType == XmlNodeType.Document)
{ {
@ -282,7 +285,7 @@ namespace VEPROMS.CSLA.Library
if (ll == null) if (ll == null)
{ {
XmlNode xn = SelectSingleNode(xPath); XmlNode xn = SelectSingleNode(xPath);
ll = new LazyLoad<int?>(xn != null ? (int?)int.Parse(xn.InnerText) : null); ll = new LazyLoad<int?>(xn != null ? (int?)int.Parse("0" + xn.InnerText) : null);
} }
return ll.Value; return ll.Value;
} }