Use code that finds the ROImage file based upon filename.
This commit is contained in:
parent
068dbfc005
commit
52c6e61b6a
@ -836,6 +836,8 @@ namespace VEPROMS.CSLA.Library
|
|||||||
bool imageROTokenReplaced = false;
|
bool imageROTokenReplaced = false;
|
||||||
string[] vals = val.Split("\n".ToCharArray());
|
string[] vals = val.Split("\n".ToCharArray());
|
||||||
ROImageInfo roImage = ROImageInfo.GetByROFstID_FileName(rofst.ROFstID, vals[0]);
|
ROImageInfo roImage = ROImageInfo.GetByROFstID_FileName(rofst.ROFstID, vals[0]);
|
||||||
|
if (roImage == null)
|
||||||
|
roImage = rofst.GetROImageByFilename(vals[0],sect);// need code to go and get an ROImaage if it exists
|
||||||
if (roImage != null)
|
if (roImage != null)
|
||||||
{
|
{
|
||||||
ROImageFile roImageFile = new ROImageFile(roImage);
|
ROImageFile roImageFile = new ROImageFile(roImage);
|
||||||
|
@ -729,6 +729,7 @@ namespace Volian.Controls.Library
|
|||||||
fname += string.Format(".{0}", MyROFST.MyRODb.RODbConfig.GetDefaultGraphicExtension());
|
fname += string.Format(".{0}", MyROFST.MyRODb.RODbConfig.GetDefaultGraphicExtension());
|
||||||
}
|
}
|
||||||
if (tmp == null) tmp = ROImageInfo.GetByROFstID_FileName(MyROFST.ROFstID, fname);
|
if (tmp == null) tmp = ROImageInfo.GetByROFstID_FileName(MyROFST.ROFstID, fname);
|
||||||
|
if (tmp == null) tmp = MyROFST.GetROImageByFilename(fname, null);
|
||||||
if (tmp !=null)
|
if (tmp !=null)
|
||||||
{
|
{
|
||||||
ROImageConfig rc = new ROImageConfig(tmp);
|
ROImageConfig rc = new ROImageConfig(tmp);
|
||||||
|
@ -219,6 +219,7 @@ namespace Volian.Print.Library
|
|||||||
public void AddImage(string filename)
|
public void AddImage(string filename)
|
||||||
{
|
{
|
||||||
ROImageInfo roImage = ROImageInfo.GetByROFstID_FileName(_ROFstID, filename);
|
ROImageInfo roImage = ROImageInfo.GetByROFstID_FileName(_ROFstID, filename);
|
||||||
|
if (roImage == null) roImage = ROFstInfo.Get(_ROFstID).GetROImageByFilename(filename, null);
|
||||||
PdfPCell spaceCell = new PdfPCell();
|
PdfPCell spaceCell = new PdfPCell();
|
||||||
spaceCell.BorderColor = Color.WHITE;
|
spaceCell.BorderColor = Color.WHITE;
|
||||||
datatable.AddCell(spaceCell);
|
datatable.AddCell(spaceCell);
|
||||||
|
Loading…
x
Reference in New Issue
Block a user