|
@@ -25,7 +25,7 @@ using TeamAAS_VP.Services;
|
|
|
|
|
|
|
|
namespace TeamAAS_VP.ViewModels.Calibration
|
|
namespace TeamAAS_VP.ViewModels.Calibration
|
|
|
{
|
|
{
|
|
|
- public class FixedUpCameraFindP0ViewModel : BindableBase
|
|
|
|
|
|
|
+ public class FixedUpCameraFindP0ViewModel : BindableBase, IConfirmNavigationRequest
|
|
|
{
|
|
{
|
|
|
IRegionManager _regionManager;
|
|
IRegionManager _regionManager;
|
|
|
IRegionNavigationService _regionNavigationService;
|
|
IRegionNavigationService _regionNavigationService;
|
|
@@ -384,7 +384,7 @@ namespace TeamAAS_VP.ViewModels.Calibration
|
|
|
{
|
|
{
|
|
|
SelectCalibration.FixedUpCameraFindP0Info = new FixedUpCameraFindP0Info();
|
|
SelectCalibration.FixedUpCameraFindP0Info = new FixedUpCameraFindP0Info();
|
|
|
}
|
|
}
|
|
|
- if (ToolBlockEdit != null)
|
|
|
|
|
|
|
+ if (ToolBlockEdit.Subject==null)
|
|
|
{
|
|
{
|
|
|
string prcPath = FilePath.CalibrationPath + "//" + SelectCalibration.Name + "//" + "FixedUpCameraTool.vpp";
|
|
string prcPath = FilePath.CalibrationPath + "//" + SelectCalibration.Name + "//" + "FixedUpCameraTool.vpp";
|
|
|
if (File.Exists(prcPath))
|
|
if (File.Exists(prcPath))
|