Changeset 52 for branches/DelphiToC/Forms

Timestamp:

Aug 10, 2010, 7:57:46 AM (15 years ago)

Author:

george

Message:

Visual TreeView reprezentation moved into target code producer set.

Location:

branches/DelphiToC/Forms

Files:

• UMainForm.lfm (modified) (6 diffs)
• UMainForm.pas (modified) (6 diffs)

branches/DelphiToC/Forms/UMainForm.lfm

@@ -1 +1 @@
 object MainForm: TMainForm
-  Left = 273
+  Left = 176
   Height = 498
-  Top = 105
+  Top = 77
   Width = 881
   Caption = 'Pascal Compiler AVR'
@@ -25 +25 @@
     TabOrder = 0
   end
-  object Memo2: TMemo
-    Left = 672
-    Height = 363
-    Top = 32
-    Width = 203
-    Anchors = [akTop, akLeft, akRight, akBottom]
-    Font.Height = -13
-    Font.Name = 'Lucida Console'
-    ParentFont = False
-    ScrollBars = ssBoth
-    TabOrder = 1
-  end
-  object TreeView1: TTreeView
-    Left = 368
-    Height = 387
-    Top = 8
-    Width = 296
-    Anchors = [akTop, akLeft, akBottom]
-    DefaultItemHeight = 15
-    Indent = 19
-    TabOrder = 2
-  end
   inline SynEdit1: TSynEdit
     Left = 8
     Height = 388
     Top = 8
-    Width = 352
+    Width = 488
     Anchors = [akTop, akLeft, akBottom]
     Font.Height = -13
@@ -59 +37 @@
     ParentColor = False
     ParentFont = False
-    TabOrder = 3
+    TabOrder = 1
     Gutter.Width = 57
     Gutter.MouseActions = <    
@@ -742 +720 @@
   end
   object ComboBox1: TComboBox
-    Left = 672
+    Left = 504
     Height = 21
     Top = 8
-    Width = 205
+    Width = 373
     Anchors = [akTop, akLeft, akRight]
     ItemHeight = 13
@@ -753 +731 @@
       'C'
       'i8051'
+      'TreeView'
     )
     OnChange = ComboBox1Change
     Style = csDropDownList
-    TabOrder = 4
+    TabOrder = 2
     Text = 'Pascal'
   end
@@ -767 +746 @@
     ItemHeight = 0
     OnClick = ListBox1Click
-    TabOrder = 5
+    TabOrder = 3
+  end
+  object Panel1: TPanel
+    Left = 504
+    Height = 354
+    Top = 40
+    Width = 372
+    Anchors = [akTop, akLeft, akRight, akBottom]
+    BevelOuter = bvNone
+    TabOrder = 4
   end
   object SynPasSyn1: TSynPasSyn

branches/DelphiToC/Forms/UMainForm.pas

@@ -7 +7 @@
 uses
   SysUtils, Variants, Classes, Graphics, Controls, Forms,
-  Dialogs, StdCtrls, USourceCode, UCompiler, UAssemblerSource,
-  UProducerC, ComCtrls, SynEdit, SynHighlighterPas, USourceTree,
+  Dialogs, StdCtrls, USourceCode, UCompiler, UProducerAsm8051,
+  UProducerC, ComCtrls, ExtCtrls, SynEdit, SynHighlighterPas, UProducerTreeView,
   UProducerPascal, Contnrs;
 
@@ -21 +21 @@
     ComboBox1: TComboBox;
     ListBox1: TListBox;
-    Memo2: TMemo;
+    Panel1: TPanel;
     SynEdit1: TSynEdit;
     SynPasSyn1: TSynPasSyn;
-    TreeView1: TTreeView;
     procedure ComboBox1Change(Sender: TObject);
     procedure FormShow(Sender: TObject);
@@ -35 +34 @@
   private
   public
+    ProducerControl: TControl;
     Compiler: TCompiler;
-    SourceTree: TSourceTree;
+    SourceTree: TProducerTreeView;
   end;
 
@@ -55 +55 @@
   Compiler.SourceCode.Assign(SynEdit1.Lines);
 
-  Memo2.Clear;
+  ProducerControl.Free;
   if ComboBox1.ItemIndex = 0 then begin
     Compiler.Producer.Free;
@@ -61 +61 @@
     Compiler.Producer.ProgramCode := Compiler.ProgramCode;
     Compiler.Compile;
+    ProducerControl := TMemo.Create(Self);
+    ProducerControl.Parent := Panel1;
+    ProducerControl.Align := alClient;
     with TProducerPascal(Compiler.Producer) do
-      Memo2.Lines.Assign(TextSource);
+      TMemo(ProducerControl).Lines.Assign(TextSource);
   end else
   if ComboBox1.ItemIndex = 1 then begin
     Compiler.Producer.Free;
-    Compiler.Producer := TCProducer.Create;
+    Compiler.Producer := TProducerC.Create;
     Compiler.Producer.ProgramCode := Compiler.ProgramCode;
     Compiler.Compile;
-    with TCProducer(Compiler.Producer) do
-      Memo2.Lines.Assign(TextSource);
+    ProducerControl := TMemo.Create(Self);
+    ProducerControl.Parent := Panel1;
+    ProducerControl.Align := alClient;
+    with TProducerC(Compiler.Producer) do
+      TMemo(ProducerControl).Lines.Assign(TextSource);
   end else
   if ComboBox1.ItemIndex = 2 then begin
     Compiler.Producer.Free;
-    Compiler.Producer := TAssemblerProducer.Create;
+    Compiler.Producer := TProducerAsm8051.Create;
     Compiler.Producer.ProgramCode := Compiler.ProgramCode;
     Compiler.Compile;
-    with TAssemblerProducer(Compiler.Producer) do
+    ProducerControl := TMemo.Create(Self);
+    ProducerControl.Parent := Panel1;
+    ProducerControl.Align := alClient;
+    with TProducerAsm8051(Compiler.Producer) do
     for I := 0 to AssemblyCode.Count - 1 do
-      Memo2.Lines.Add(TAssemblerLine(AssemblyCode[I]).AsString);
+      TMemo(ProducerControl).Lines.Add(TAssemblerLine(AssemblyCode[I]).AsString);
+  end;
+  if ComboBox1.ItemIndex = 3 then begin
+    Compiler.Producer.Free;
+    Compiler.Producer := TProducerTreeView.Create;
+    Compiler.Producer.ProgramCode := Compiler.ProgramCode;
+    ProducerControl := TTreeView.Create(Self);
+    ProducerControl.Parent := Panel1;
+    ProducerControl.Align := alClient;
+    TProducerTreeView(Compiler.Producer).TreeView := TTreeView(ProducerControl);
+    Compiler.Compile;
   end;
   LoadErrorMessages;
-
-  SourceTree.TreeView := TreeView1;
-  SourceTree.Code := Compiler.ProgramCode;
-  SourceTree.Fill;
 end;
 
@@ -115 +130 @@
 begin
   Compiler := TCompiler.Create;
-  SourceTree := TSourceTree.Create;
+  SourceTree := TProducerTreeView.Create;
 end;