diff --git a/LSysInt Tester/FormMain.Designer.vb b/LSysInt Tester/FormMain.Designer.vb index 7637aef..2172370 100644 --- a/LSysInt Tester/FormMain.Designer.vb +++ b/LSysInt Tester/FormMain.Designer.vb @@ -23,8 +23,8 @@ Partial Class FormMain _ Private Sub InitializeComponent() Me.SplitContainerMain = New System.Windows.Forms.SplitContainer() - Me.TextBoxCode = New System.Windows.Forms.TextBox() Me.ComboBoxLSysCodeDefs = New System.Windows.Forms.ComboBox() + Me.TextBoxCode = New System.Windows.Forms.TextBox() Me.LSysRendererCtrl = New LSysInt.LSysRenderer() CType(Me.SplitContainerMain, System.ComponentModel.ISupportInitialize).BeginInit() Me.SplitContainerMain.Panel1.SuspendLayout() @@ -50,6 +50,21 @@ Partial Class FormMain Me.SplitContainerMain.SplitterDistance = 303 Me.SplitContainerMain.TabIndex = 1 ' + 'ComboBoxLSysCodeDefs + ' + Me.ComboBoxLSysCodeDefs.Anchor = CType(((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Left) _ + Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) + Me.ComboBoxLSysCodeDefs.BackColor = System.Drawing.Color.FromArgb(CType(CType(33, Byte), Integer), CType(CType(33, Byte), Integer), CType(CType(33, Byte), Integer)) + Me.ComboBoxLSysCodeDefs.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList + Me.ComboBoxLSysCodeDefs.FlatStyle = System.Windows.Forms.FlatStyle.Flat + Me.ComboBoxLSysCodeDefs.ForeColor = System.Drawing.Color.WhiteSmoke + Me.ComboBoxLSysCodeDefs.FormattingEnabled = True + Me.ComboBoxLSysCodeDefs.Location = New System.Drawing.Point(1, 0) + Me.ComboBoxLSysCodeDefs.Margin = New System.Windows.Forms.Padding(0) + Me.ComboBoxLSysCodeDefs.Name = "ComboBoxLSysCodeDefs" + Me.ComboBoxLSysCodeDefs.Size = New System.Drawing.Size(302, 22) + Me.ComboBoxLSysCodeDefs.TabIndex = 1 + ' 'TextBoxCode ' Me.TextBoxCode.Anchor = CType((((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Bottom) _ @@ -67,22 +82,6 @@ Partial Class FormMain Me.TextBoxCode.Size = New System.Drawing.Size(303, 544) Me.TextBoxCode.TabIndex = 0 ' - 'ComboBoxLSysCodeDefs - ' - Me.ComboBoxLSysCodeDefs.Anchor = CType(((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Left) _ - Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) - Me.ComboBoxLSysCodeDefs.BackColor = System.Drawing.Color.FromArgb(CType(CType(33, Byte), Integer), CType(CType(33, Byte), Integer), CType(CType(33, Byte), Integer)) - Me.ComboBoxLSysCodeDefs.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList - Me.ComboBoxLSysCodeDefs.FlatStyle = System.Windows.Forms.FlatStyle.Flat - Me.ComboBoxLSysCodeDefs.Font = New System.Drawing.Font("Consolas", 9.75!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.ComboBoxLSysCodeDefs.ForeColor = System.Drawing.Color.WhiteSmoke - Me.ComboBoxLSysCodeDefs.FormattingEnabled = True - Me.ComboBoxLSysCodeDefs.Location = New System.Drawing.Point(1, 0) - Me.ComboBoxLSysCodeDefs.Margin = New System.Windows.Forms.Padding(0) - Me.ComboBoxLSysCodeDefs.Name = "ComboBoxLSysCodeDefs" - Me.ComboBoxLSysCodeDefs.Size = New System.Drawing.Size(302, 23) - Me.ComboBoxLSysCodeDefs.TabIndex = 1 - ' 'LSysRendererCtrl ' Me.LSysRendererCtrl.Dock = System.Windows.Forms.DockStyle.Fill diff --git a/LSysInt Tester/FormMain.vb b/LSysInt Tester/FormMain.vb index ec55750..c55cc16 100644 --- a/LSysInt Tester/FormMain.vb +++ b/LSysInt Tester/FormMain.vb @@ -19,7 +19,7 @@ Public Class FormMain End Class Private Sub FormMain_Load(sender As Object, e As EventArgs) Handles MyBase.Load - ComboBoxLSysCodeDefs.Items.Add(New LSysCodeDef("VonKochSimple", + ComboBoxLSysCodeDefs.Items.Add(New LSysCodeDef("Von Koch Simple", "VonKochSimple { level: 5 axiom: -(90) f(0.5) +(90) F(1) @@ -36,7 +36,7 @@ Public Class FormMain +(25) F(x/2) [ +(25) F(x/2) X(x/2) ] -(25) X(x/2) }")) - ComboBoxLSysCodeDefs.Items.Add(New LSysCodeDef("SpinIt", + ComboBoxLSysCodeDefs.Items.Add(New LSysCodeDef("Spin It", "SpinIt { level: 60 axiom: -(90) f(0.5) +(90) f(0.5) X(0.01) @@ -48,7 +48,7 @@ Public Class FormMain -(90) F(n) ] }")) - ComboBoxLSysCodeDefs.Items.Add(New LSysCodeDef("Dragon", + ComboBoxLSysCodeDefs.Items.Add(New LSysCodeDef("Dragon Curve", "Dragon { level: 11 axiom: -(45) f(0.47) * F(0.6) X(0.6) @@ -58,7 +58,7 @@ Public Class FormMain rule: * = * -(45) }")) - ComboBoxLSysCodeDefs.Items.Add(New LSysCodeDef("VonKochColor", + ComboBoxLSysCodeDefs.Items.Add(New LSysCodeDef("Von Koch Color (not working ATM)", "VonKochColor { level: 5 axiom: -(90) f(0.28) +(90) f(0.05) F(0.9,0,0.9) @@ -71,6 +71,18 @@ Public Class FormMain rule: C(d) = %(0,d,0.1,1) }")) + ComboBoxLSysCodeDefs.Items.Add(New LSysCodeDef("Sierpinski Triangle", +"SierpinskiTriangle { + level: 5 + angle: 60 + offsetY: -800 + constant: A = F + constant: B = F + axiom: %(0,0.8,1,1) A(0.03) + rule: A(x) = + B(x) - A(x) - B(x) + + rule: B(x) = - A(x) + B(x) + A(x) - +}")) + updateCodeTimer = New Timer(New TimerCallback(Sub() lsys = New LSysInt.LSysInt(TextBoxCode.Text) If lsys.LDefs.Any() Then diff --git a/LSysInt Tester/My Project/AssemblyInfo.vb b/LSysInt Tester/My Project/AssemblyInfo.vb index 63412f1..94a65dc 100644 --- a/LSysInt Tester/My Project/AssemblyInfo.vb +++ b/LSysInt Tester/My Project/AssemblyInfo.vb @@ -31,5 +31,5 @@ Imports System.Runtime.InteropServices ' by using the '*' as shown below: ' - - + + diff --git a/LSysInt/My Project/AssemblyInfo.vb b/LSysInt/My Project/AssemblyInfo.vb index 839ba4b..ffb4a98 100644 --- a/LSysInt/My Project/AssemblyInfo.vb +++ b/LSysInt/My Project/AssemblyInfo.vb @@ -31,5 +31,5 @@ Imports System.Runtime.InteropServices ' by using the '*' as shown below: ' - - + +