|
@@ -236,15 +236,7 @@ namespace OTSMeasureApp
|
|
|
{
|
|
|
log.Error(" OTSIncAMeasureAppForm_Load:" + ex.ToString());
|
|
|
}
|
|
|
- try
|
|
|
- {
|
|
|
- th.Abort();
|
|
|
- }
|
|
|
- catch
|
|
|
- {
|
|
|
-
|
|
|
- }
|
|
|
-
|
|
|
+ th.Abort();
|
|
|
this.Activate();
|
|
|
}
|
|
|
public void ArrangWorkspaceWindow()
|
|
@@ -274,21 +266,28 @@ namespace OTSMeasureApp
|
|
|
}
|
|
|
static private void DoSplash()
|
|
|
{
|
|
|
- string path = @".\Config\SysData\OTSProgMgrParam.pmf";
|
|
|
- XmlDocument xmlDocument = new XmlDocument();
|
|
|
- xmlDocument.Load(path);
|
|
|
- XmlNode node = xmlDocument.SelectSingleNode("XMLData");
|
|
|
- XmlElement xe = (XmlElement)node;
|
|
|
- string str = xe.GetAttribute("SysType");
|
|
|
- if (str == "IncA")
|
|
|
+ try
|
|
|
{
|
|
|
- OTSSplashScreen_IncA sp = new OTSSplashScreen_IncA();
|
|
|
- sp.ShowDialog();
|
|
|
+ string path = @".\Config\SysData\OTSProgMgrParam.pmf";
|
|
|
+ XmlDocument xmlDocument = new XmlDocument();
|
|
|
+ xmlDocument.Load(path);
|
|
|
+ XmlNode node = xmlDocument.SelectSingleNode("XMLData");
|
|
|
+ XmlElement xe = (XmlElement)node;
|
|
|
+ string str = xe.GetAttribute("SysType");
|
|
|
+ if (str == "IncA")
|
|
|
+ {
|
|
|
+ OTSSplashScreen_IncA sp = new OTSSplashScreen_IncA();
|
|
|
+ sp.ShowDialog();
|
|
|
+ }
|
|
|
+ else if (str == "CleannessA")
|
|
|
+ {
|
|
|
+ OTSSplashScreen_Cleanness sp = new OTSSplashScreen_Cleanness();
|
|
|
+ sp.ShowDialog();
|
|
|
+ }
|
|
|
}
|
|
|
- else if (str == "CleannessA")
|
|
|
+ catch
|
|
|
{
|
|
|
- OTSSplashScreen_Cleanness sp = new OTSSplashScreen_Cleanness();
|
|
|
- sp.ShowDialog();
|
|
|
+
|
|
|
}
|
|
|
}
|
|
|
|