Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
69 changes: 27 additions & 42 deletions LadderApp/Forms/ChangeTimerCounterParametersForm.Designer.cs

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions LadderApp/Forms/ChangeTimerCounterParametersForm.resx
Original file line number Diff line number Diff line change
Expand Up @@ -112,9 +112,9 @@
<value>2.0</value>
</resheader>
<resheader name="reader">
<value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
<value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
<resheader name="writer">
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
</root>
10 changes: 5 additions & 5 deletions LadderApp/Forms/LadderForm.cs
Original file line number Diff line number Diff line change
Expand Up @@ -293,19 +293,19 @@ public void VisualInstruction_KeyDown(object sender, KeyEventArgs e)
}
}

public List<Instruction> VariosSelecionados(VisualInstructionUserControl visualInstruction, VisualLine visualLine)
public List<Instruction> VariosSelecionados(VisualInstructionUserControl visualInstruction)
{
OperationCode opCode = visualInstruction.OpCode;
List<Instruction> instructions = new List<Instruction>();
List<VisualInstructionUserControl> visualInstructions = null;
List<VisualInstructionUserControl> visualInstructions;

switch (opCode)
{
case OperationCode.ParallelBranchBegin:
case OperationCode.ParallelBranchNext:
case OperationCode.ParallelBranchEnd:
int initialPositionIndex = 0;
int finalPositionIndex = 0;
int initialPositionIndex;
int finalPositionIndex;

if (SelectedVisualLine.visualInstructions.Contains(visualInstruction))
visualInstructions = SelectedVisualLine.visualInstructions;
Expand Down Expand Up @@ -356,7 +356,7 @@ private void mnuToggleBit_Click(object sender, EventArgs e)
this.Invalidate(true);
}

public void ControleSelecionado_SolicitaMudarEndereco(VisualInstructionUserControl sender, Rectangle rect, Type tipo, int valorMax, int valorMin, params object[] faixa)
public void VisualInstruction_AskToChangeAddress(VisualInstructionUserControl sender)
{
if (!sender.IsAllOperandsOk())
{
Expand Down
Loading