Commit 29623d2e 几米阳光

先去掉aoi代码

1 个父辈 f5c3f959
......@@ -70,17 +70,12 @@ namespace URSoldering.Client
{
string boardName = cmbBoardList.Text;
BoardInfo board = BoardManager.getBoardByName(boardName);
//if (boardMap.Count < 4)
//{
// MessageBox.Show("程序【" + partNum + "】对应的编码程序配置不完整!");
// return;
//}
//SProgramManager.CurrProgram = SProgramManager.getByPartNum(partNum);
BoardManager.UpdateCurrBoard(board.boardId);
//判断程序是否配置完成
FrmWork fw = new FrmWork();
this.Hide();
fw.ShowDialog();
//FrmWork fw = new FrmWork();
//this.Hide();
//fw.ShowDialog();
}
this.Close();
}
......
......@@ -61,14 +61,10 @@ namespace URSoldering.Client
private void btnCodeTest_Click(object sender, EventArgs e)
{
//FrmCamera frm = new FrmCamera();
////FrmCodeLearn frm = new FrmCodeLearn();
//FrmAOISetting frm = new FrmAOISetting(this);
//this.Visible = false;
//frm.ShowDialog();
//this.Visible = true;
FrmAOISetting frm = new FrmAOISetting(this);
this.Visible = false;
frm.Show();
//frm.Show();
}
private void btnCamera_Click(object sender, EventArgs e)
......
......@@ -30,23 +30,23 @@ namespace URSoldering.Client
private void btnWelding_Click(object sender, EventArgs e)
{
if (BoardManager.CurrBoard == null)
{
if (BoardManager.boardList.Count > 0)
{
BoardManager.UpdateCurrBoard(BoardManager.boardList[0].boardId);
}
else
{
MessageBox.Show("请先配置程序");
return;
}
}
isClick = true;
FrmWork fw = new FrmWork();
this.Visible = false; ;
fw.ShowDialog();
this.Visible = true;
//if (BoardManager.CurrBoard == null)
//{
// if (BoardManager.boardList.Count > 0)
// {
// BoardManager.UpdateCurrBoard(BoardManager.boardList[0].boardId);
// }
// else
// {
// MessageBox.Show("请先配置程序");
// return;
// }
//}
//isClick = true;
//FrmWork fw = new FrmWork();
//this.Visible = false; ;
//fw.ShowDialog();
//this.Visible = true;
}
private void btnProduct_Click(object sender, EventArgs e)
......
......@@ -73,12 +73,6 @@
<Reference Include="System.Xml" />
</ItemGroup>
<ItemGroup>
<Compile Include="FrmAOISetting.cs">
<SubType>Form</SubType>
</Compile>
<Compile Include="FrmAOISetting.designer.cs">
<DependentUpon>FrmAOISetting.cs</DependentUpon>
</Compile>
<Compile Include="FrmBase.cs">
<SubType>Form</SubType>
</Compile>
......@@ -175,12 +169,6 @@
<Compile Include="FrmSoldDebug.Designer.cs">
<DependentUpon>FrmSoldDebug.cs</DependentUpon>
</Compile>
<Compile Include="FrmWork.cs">
<SubType>Form</SubType>
</Compile>
<Compile Include="FrmWork.Designer.cs">
<DependentUpon>FrmWork.cs</DependentUpon>
</Compile>
<Compile Include="FrmWeldPointInfo.cs">
<SubType>Form</SubType>
</Compile>
......@@ -195,9 +183,6 @@
</Compile>
<Compile Include="Program.cs" />
<Compile Include="Properties\AssemblyInfo.cs" />
<EmbeddedResource Include="FrmAOISetting.resx">
<DependentUpon>FrmAOISetting.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="FrmBase.resx">
<DependentUpon>FrmBase.cs</DependentUpon>
</EmbeddedResource>
......@@ -246,9 +231,6 @@
<EmbeddedResource Include="FrmSoldDebug.resx">
<DependentUpon>FrmSoldDebug.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="FrmWork.resx">
<DependentUpon>FrmWork.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="FrmWeldPointInfo.resx">
<DependentUpon>FrmWeldPointInfo.cs</DependentUpon>
</EmbeddedResource>
......
支持 Markdown 格式
你添加了 0 到此讨论。请谨慎行事。
Finish editing this message first!