Skip to content

孙克 / URSolderingRobot

转到一个项目
切换导航栏
切换导航栏固定状态
Commit 29623d2e 由 几米阳光
选项

先去掉aoi代码

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