|
|
@@ -1851,27 +1851,54 @@ namespace TeamAAS_VP.Services
|
|
|
}
|
|
|
if(is3dmodel==true)
|
|
|
{
|
|
|
- _eventAggregator.GetEvent<RenderUpdateNotification>().Publish(new ShowRender()
|
|
|
+ if(_configService.GetSystemConfiguration().PickPointNum == 0)
|
|
|
{
|
|
|
- Id = procedure.DisplayId,
|
|
|
- DisplayName = procedure.DisplayName,
|
|
|
- //Image = (ICogImage)procedure.ToolBlock.Outputs["OriImage"].Value,
|
|
|
- Image = (ICogImage)procedure.ToolBlock.Inputs["InputImage"].Value,
|
|
|
- Graphic = outputCollection["Graphic"].Value as CogGraphicCollection,
|
|
|
- Record = record,
|
|
|
- Result = Found,
|
|
|
- IsShow = true,
|
|
|
- IsSaveImage = procedure.IsSaveImage,
|
|
|
- SaveImageModel = procedure.SaveImageModel,
|
|
|
- SaveImagePathModel = procedure.SaveImagePathModel,
|
|
|
- SavePath = procedure.SavePath,
|
|
|
- IsCompress = procedure.IsCompress,
|
|
|
- ProceductName = procedure.Name,
|
|
|
- ImageFileName = imgName,
|
|
|
- Is3DModel = is3dmodel,
|
|
|
- RangeImage = (CogImage16Range)procedure.ToolBlock.Outputs["RangeImage"].Value,
|
|
|
- GreyImage = (CogImage16Grey)procedure.ToolBlock.Outputs["GreyImage"].Value
|
|
|
- });
|
|
|
+ _eventAggregator.GetEvent<RenderUpdateNotification>().Publish(new ShowRender()
|
|
|
+ {
|
|
|
+ Id = procedure.DisplayId,
|
|
|
+ DisplayName = procedure.DisplayName,
|
|
|
+ //Image = (ICogImage)procedure.ToolBlock.Outputs["OriImage"].Value,
|
|
|
+ Image = (ICogImage)procedure.ToolBlock.Inputs["InputImage"].Value,
|
|
|
+ Graphic = outputCollection["Graphic"].Value as CogGraphicCollection,
|
|
|
+ Record = record,
|
|
|
+ Result = Found,
|
|
|
+ IsShow = true,
|
|
|
+ IsSaveImage = procedure.IsSaveImage,
|
|
|
+ SaveImageModel = procedure.SaveImageModel,
|
|
|
+ SaveImagePathModel = procedure.SaveImagePathModel,
|
|
|
+ SavePath = procedure.SavePath,
|
|
|
+ IsCompress = procedure.IsCompress,
|
|
|
+ ProceductName = procedure.Name,
|
|
|
+ ImageFileName = imgName,
|
|
|
+ Is3DModel = is3dmodel,
|
|
|
+ //RangeImage = (CogImage16Range)procedure.ToolBlock.Outputs["RangeImage"].Value,
|
|
|
+ //GreyImage = (CogImage16Grey)procedure.ToolBlock.Outputs["GreyImage"].Value
|
|
|
+ });
|
|
|
+ }
|
|
|
+ else
|
|
|
+ {
|
|
|
+ _eventAggregator.GetEvent<RenderUpdateNotification>().Publish(new ShowRender()
|
|
|
+ {
|
|
|
+ Id = procedure.DisplayId,
|
|
|
+ DisplayName = procedure.DisplayName,
|
|
|
+ //Image = (ICogImage)procedure.ToolBlock.Outputs["OriImage"].Value,
|
|
|
+ Image = (ICogImage)procedure.ToolBlock.Inputs["InputImage"].Value,
|
|
|
+ Graphic = outputCollection["Graphic"].Value as CogGraphicCollection,
|
|
|
+ Record = record,
|
|
|
+ Result = Found,
|
|
|
+ IsShow = true,
|
|
|
+ IsSaveImage = procedure.IsSaveImage,
|
|
|
+ SaveImageModel = procedure.SaveImageModel,
|
|
|
+ SaveImagePathModel = procedure.SaveImagePathModel,
|
|
|
+ SavePath = procedure.SavePath,
|
|
|
+ IsCompress = procedure.IsCompress,
|
|
|
+ ProceductName = procedure.Name,
|
|
|
+ ImageFileName = imgName,
|
|
|
+ Is3DModel = is3dmodel,
|
|
|
+ RangeImage = (CogImage16Range)procedure.ToolBlock.Outputs["RangeImage"].Value,
|
|
|
+ GreyImage = (CogImage16Grey)procedure.ToolBlock.Outputs["GreyImage"].Value
|
|
|
+ });
|
|
|
+ }
|
|
|
}
|
|
|
else
|
|
|
{
|