DarkCat09/MultRedactor
1
0
Fork 0
Code Issues Pull requests Projects Releases 1 Packages Wiki Activity

Merge pull request #33 from IngenerkaTeamCenter/Arsenee-patch-1

Browse source 
Исправлял синус
This commit is contained in:
Mikhail Abramov 2018-04-07 06:27:25 +03:00 committed by GitHub
commit faca167be2
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 19 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
WindowsFormsApplication1/WindowsFormsApplication1/Files.cs
View file

@ -38,7 +38,7 @@ namespace WindowsFormsApplication1
public static void OpenWhile(string filename)
{
File.AppendAllText(filename, Environment.NewLine);
File.AppendAllText(filename, " while (!GetAsyncKeyState(VK_ESCAPE));" + Environment.NewLine);
File.AppendAllText(filename, " while (!GetAsyncKeyState(VK_ESCAPE))" + Environment.NewLine);
File.AppendAllText(filename, " {" + Environment.NewLine);
File.AppendAllText(filename, " txSetColor(TX_RED);" + Environment.NewLine);
File.AppendAllText(filename, " txSetFillColor(TX_RED);" + Environment.NewLine);

2
WindowsFormsApplication1/WindowsFormsApplication1/MainForm.Designer.cs generated
View file

@ -422,4 +422,4 @@ namespace WindowsFormsApplication1
private System.Windows.Forms.Label label13;
private System.Windows.Forms.PictureBox openSpace;
}
}
}

30
WindowsFormsApplication1/WindowsFormsApplication1/MainForm.cs
View file

@ -156,8 +156,8 @@ namespace WindowsFormsApplication1
private void old_place(string filename, string name)
{
File.AppendAllText(filename, " " + name + ".x =TextBox ++ 10; " + Environment.NewLine);
File.AppendAllText(filename, " " + name + ".yTextBox ++ 10; " + Environment.NewLine);
File.AppendAllText(filename, " " + name + ".x = " + TextBoxWall1.Text + "; " + Environment.NewLine);
File.AppendAllText(filename, " " + name + ".y = " + TextBoxWall1.Text + "; " + Environment.NewLine);
File.AppendAllText(filename, " " + name + ".nomer_kadra = 0; " + Environment.NewLine);
File.AppendAllText(filename, " " + name + ".gr_dvigx = 1000; " + Environment.NewLine);
}
@ -210,15 +210,13 @@ namespace WindowsFormsApplication1
{
if (openFileDialog1.ShowDialog() == DialogResult.Cancel)
return;
string filename = openFileDialog1.FileName;
string fileText =File.ReadAllText(filename);
nazvanieTextBox.Text = fileText;
PictureBoxBackground.Image = Image.FromFile(Path.Combine(Application.StartupPath, "kartinka.jpg"));
PictureBoxBackground.Image = Image.FromFile(openFileDialog1.FileName);
}
private void SaveMultButton_Click(object sender, EventArgs e)
{
if (saveFileDialog1.ShowDialog() == DialogResult.OK)
if (saveFileDialog1.ShowDialog() == DialogResult.OK &&
PictureBoxBackground.Image != null)
{
string filename = saveFileDialog1.FileName;
@ -240,7 +238,7 @@ namespace WindowsFormsApplication1
Files.OpenWhile(filename);
Sinus.MovePerson(filename, "per");
close_while(filename);
delete_pics2(filename, 5);
delete_pics(filename);
}
else if (ComboBoxMove.Text == "Кругами")
{
@ -250,6 +248,15 @@ namespace WindowsFormsApplication1
close_while(filename);
delete_pics(filename);
}
else if (ComboBoxMove.Text == "Диагонально")
{
Sinus.CreatePerson(filename, "per", TextBoxWall1.Text);
old_place(filename, "per");
Files.OpenWhile(filename);
go_pryamo(filename, "per");
close_while(filename);
delete_pics(filename);
}
Files.Ending(filename);
@ -284,10 +291,5 @@ namespace WindowsFormsApplication1
}
}
}
private void OpenSpace_Click(object sender, EventArgs e)
{
}
}
}
}

2
WindowsFormsApplication1/WindowsFormsApplication1/Sinus.cs
View file

@ -12,7 +12,7 @@ namespace WindowsFormsApplication1
{
File.AppendAllText(filename, " Person " + name + ";" + Environment.NewLine);
File.AppendAllText(filename, Environment.NewLine);
File.AppendAllText(filename, " " + name + ".texture = txLoadImage(\"Pictures\\Personaj.bmp\");" + Environment.NewLine);
File.AppendAllText(filename, " " + name + ".texture = txLoadImage(\"Pictures\\\\Personaj.bmp\");" + Environment.NewLine);
File.AppendAllText(filename, " " + name + ".x = " + xBeg + ";" + Environment.NewLine);
File.AppendAllText(filename, " " + name + ".y = " + xBeg + ";" + Environment.NewLine);
File.AppendAllText(filename, " " + name + ".nomer_kadra = 0;" + Environment.NewLine);