..
This commit is contained in:
@@ -67,7 +67,7 @@ namespace Project
|
||||
if (ts.TotalSeconds > 1)
|
||||
{
|
||||
//파일을 찾아서 소거한다.
|
||||
var delpath = System.IO.Path.Combine(AR.SETTING.Data.Path_Data, "Images");
|
||||
var delpath = System.IO.Path.Combine(AR.SETTING.Data.GetDataPath(), "Images");
|
||||
if (delpath != "") DeleteFile(delpath);
|
||||
|
||||
lastDeleteTime = DateTime.Now;
|
||||
|
||||
@@ -94,8 +94,8 @@ namespace Project
|
||||
PUB.sm.RaiseStateProgress(++progress, "이전모델 확인", ProgressMax, fColor); System.Threading.Thread.Sleep(5);
|
||||
|
||||
//
|
||||
if (PUB.uSetting.LastModelV != "") PUB.SelectModelV(PUB.uSetting.LastModelV, false);
|
||||
var motionmodel = PUB.uSetting.LastModelM;
|
||||
if (SETTING.User.LastModelV != "") PUB.SelectModelV(SETTING.User.LastModelV, false);
|
||||
var motionmodel = SETTING.User.LastModelM;
|
||||
if (motionmodel.isEmpty()) motionmodel = PUB.Result.vModel.Motion;
|
||||
if (motionmodel.ToUpper().StartsWith("CONV")) PUB.flag.set(eVarBool.Use_Conveyor, true, "load");
|
||||
else PUB.flag.set(eVarBool.Use_Conveyor, false, "load");
|
||||
@@ -161,7 +161,7 @@ namespace Project
|
||||
}
|
||||
else
|
||||
{
|
||||
for (short i = 0; i < PUB.system.MotaxisCount; i++)
|
||||
for (short i = 0; i < SETTING.System.MotaxisCount; i++)
|
||||
{
|
||||
//설정파일이 있다면 불러온다
|
||||
var file = System.IO.Path.Combine(UTIL.CurrentPath, "Model", "axis" + i.ToString() + ".motaxt");
|
||||
|
||||
@@ -45,11 +45,11 @@ namespace Project
|
||||
//loader1.arVar_Port.ToList().ForEach(t => t.AlignReset());
|
||||
|
||||
//daycount 초기화
|
||||
if (PUB.counter.DateStr != DateTime.Now.ToString("yyyy-MM-dd"))
|
||||
if (SETTING.Counter.DateStr != DateTime.Now.ToString("yyyy-MM-dd"))
|
||||
{
|
||||
PUB.counter.ClearDay();
|
||||
PUB.counter.DateStr = DateTime.Now.ToString("yyyy-MM-dd");
|
||||
PUB.counter.Save();
|
||||
SETTING.Counter.ClearDay();
|
||||
SETTING.Counter.DateStr = DateTime.Now.ToString("yyyy-MM-dd");
|
||||
SETTING.Counter.Save();
|
||||
}
|
||||
|
||||
|
||||
@@ -117,7 +117,7 @@ namespace Project
|
||||
//PUB.Result.JobStartTime = DateTime.Now; //200728
|
||||
|
||||
//신규실행이므로 작업차수별 수량을 초기화해준다
|
||||
PUB.counter.ClearP(); //200711
|
||||
SETTING.Counter.ClearP(); //200711
|
||||
|
||||
PUB.flag.set(eVarBool.FG_JOB_END, false, "SM_RUN");
|
||||
|
||||
|
||||
Reference in New Issue
Block a user