Ajustes, criação do filtro

EvoUMLPlugin/src/ituExplorerV2.dfm

@@ -11754,7 +11754,7 @@ object ExplorerV2: TExplorerV2
           OnDragDrop = memOQLQuery2DragDrop
           OnDragOver = memOQLQuery2DragOver
           BorderStyle = bsNone
-          Gutter.Width = 29
+          Gutter.Width = 42
           Gutter.MouseActions = <>
           RightGutter.Width = 0
           RightGutter.MouseActions = <>
@@ -12941,8 +12941,8 @@ object ExplorerV2: TExplorerV2
     TabOrder = 1
     object tvModelExplorer: TTreeView
       Left = 0
-      Height = 719
-      Top = 152
+      Height = 751
+      Top = 120
       Width = 450
       Align = alClient
       BorderStyle = bsNone
@@ -12968,51 +12968,43 @@ object ExplorerV2: TExplorerV2
     end
     object pnFiltroClasse: TPanel
       Left = 0
-      Height = 152
+      Height = 120
       Top = 0
       Width = 450
       Align = alTop
-      ClientHeight = 152
+      ClientHeight = 120
       ClientWidth = 450
       TabOrder = 1
       object edtClasse: TEdit
         Left = 11
         Height = 28
-        Top = 101
+        Top = 83
         Width = 419
         OnChange = edtClasseChange
         TabOrder = 0
       end
-      object Label1: TLabel
+      object gbAgrupamento: TGroupBox
         Left = 11
-        Height = 20
-        Top = 80
-        Width = 31
-        Caption = 'Class'
+        Height = 56
+        Top = 3
+        Width = 419
+        Caption = 'Group'
+        ClientHeight = 31
+        ClientWidth = 415
         Font.CharSet = ANSI_CHARSET
         Font.Color = clBlack
         Font.Height = -15
-        Font.Name = 'Segoe UI Light'
+        Font.Name = 'Segoe UI'
         Font.Pitch = fpVariable
         Font.Quality = fqDraft
-        ParentColor = False
         ParentFont = False
-      end
-      object gbAgrupamento: TGroupBox
-        Left = 11
-        Height = 64
-        Top = 16
-        Width = 419
-        Caption = 'Agrupamento'
-        ClientHeight = 39
-        ClientWidth = 415
         TabOrder = 1
         object rbHieraquia: TRadioButton
           Left = 200
           Height = 24
           Top = 0
-          Width = 89
-          Caption = 'Hieraquia'
+          Width = 87
+          Caption = 'Hierarchy'
           OnClick = edtClasseChange
           TabOrder = 0
         end
@@ -13020,14 +13012,29 @@ object ExplorerV2: TExplorerV2
           Left = 16
           Height = 24
           Top = 0
-          Width = 96
-          Caption = 'Sequencial'
+          Width = 48
+          Caption = 'Flat'
           Checked = True
           OnClick = edtClasseChange
           TabOrder = 1
           TabStop = True
         end
       end
+      object Label2: TLabel
+        Left = 15
+        Height = 20
+        Top = 61
+        Width = 33
+        Caption = 'Class'
+        Font.CharSet = ANSI_CHARSET
+        Font.Color = clBlack
+        Font.Height = -15
+        Font.Name = 'Segoe UI'
+        Font.Pitch = fpVariable
+        Font.Quality = fqDraft
+        ParentColor = False
+        ParentFont = False
+      end
     end
   end
   object il1: TImageList

EvoUMLPlugin/src/ituExplorerV2.pas

@@ -29,7 +29,7 @@ type
     edtClasse: TEdit;
     gbAgrupamento: TGroupBox;
     ilModel: TImageList;
-    Label1: TLabel;
+    Label2: TLabel;
     lvXMLListResult: TListView;
     memXMLTextResult: TMemo;
     OQLObjects: TObjectExplorer;
@@ -118,7 +118,7 @@ type
     function GetStringEntreParenteses(piString : string) : string;
     function GetNumeroDeStringOID (piString : string) : string;
     procedure CopiaTextoObjeto (piObjeto : TTreeNode);
-    function BuscaParcialClasse(piCLasse: string; piItemPai: TTreeNode; piFiltrar: boolean): boolean;
+    function BuscaParcialClasse(piCLasse: string; piFiltrar: boolean): boolean;
    protected
     procedure CreateParams(var Params : TCreateParams); override;
     function Connect : acPersistenceSession;
@@ -520,8 +520,7 @@ begin
     Clipbrd.Clipboard.AsText := lString;
 end;
 
-function TExplorerV2.BuscaParcialClasse(piCLasse: string;
-  piItemPai: TTreeNode; piFiltrar: boolean): boolean;
+function TExplorerV2.BuscaParcialClasse(piCLasse: string;  piFiltrar: boolean): boolean;
 var lClasseTree,
     lClasseP : string;
 begin
@@ -590,7 +589,7 @@ begin
         while not lEnumerator.EOL do
         begin
           lClassTicket := acClassTicket(lEnumerator.Current);
-          if BuscaParcialClasse(lClassTicket.PersistentObjectClassName,Node,lFiltro) then
+          if BuscaParcialClasse(lClassTicket.PersistentObjectClassName,lFiltro) then
           begin
             targetNode := Node.Owner.AddChildObject(Node, lClassTicket.PersistentObjectClassName, lClassTicket);
             targetNode.ImageIndex := 6;
@@ -685,33 +684,71 @@ var lClassTicket: acClassTicket;
     lCardinality: string;
     lEnumerator: acEnumerator;
     li: integer;
+    lNodeParent,
     targetNode :  TTreeNode;
     lFiltro : boolean;
 begin
   lFiltro  := trim(edtClasse.Text) <> '';
-  if Node.HasChildren and (Node.Count = 0)then
+  if Node.HasChildren {and (Node.Count = 0)}then
   begin
     Node.Owner.BeginUpdate;
     try
       if (TObject(Node.Data) is acMetaModel) then
       begin
+        //Carregas o pai
         lEnumerator := acMetaModel(Node.Data).ClassTickets.GetEnumerator;
-        while not lEnumerator.EOL do
-        begin
-          lClassTicket := acClassTicket(lEnumerator.Current);
-          if BuscaParcialClasse(lClassTicket.PersistentObjectClassName,Node,lFiltro) then
+        try
+          while not lEnumerator.EOL do
           begin
-            targetNode := Node.Owner.AddChildObject(Node, lClassTicket.PersistentObjectClassName, lClassTicket);
-            targetNode.ImageIndex := 6;
-            targetNode.HasChildren := True;
+            lClassTicket := acClassTicket(lEnumerator.Current);
+            if not Assigned(lClassTicket.ParentClassTicket) then
+            begin
+              if  BuscaParcialClasse(lClassTicket.PersistentObjectClassName,lFiltro) then
+              begin
+                targetNode := Node.Owner.AddChildObject(Node, lClassTicket.PersistentObjectClassName, lClassTicket);
+                targetNode.ImageIndex := 6;
+                targetNode.HasChildren := True;
+              end;
+            end;
+            lEnumerator.MoveNext;
           end;
-          lEnumerator.MoveNext;
+        finally
+          lEnumerator.Free;
+        end;
+        //Carrega os filhos
+
+        lEnumerator := acMetaModel(Node.Data).ClassTickets.GetEnumerator;
+        try
+          while not lEnumerator.EOL do
+          begin
+            lClassTicket := acClassTicket(lEnumerator.Current);
+            if Assigned(lClassTicket.ParentClassTicket) then
+            begin
+              if  BuscaParcialClasse(lClassTicket.PersistentObjectClassName,lFiltro) then
+              begin
+                lNodeParent :=  Node.Owner.FindNodeWithData(lClassTicket.ParentClassTicket);
+                if Assigned(lNodeParent) then
+                begin
+                  targetNode := Node.Owner.AddChildObject(lNodeParent, lClassTicket.PersistentObjectClassName, lClassTicket);
+                end
+                else
+                begin
+                  targetNode := Node.Owner.AddChildObject(Node, lClassTicket.PersistentObjectClassName, lClassTicket);
+                end;
+                targetNode.ImageIndex := 6;
+                targetNode.HasChildren := True;
+              end;
+            end;
+            lEnumerator.MoveNext;
+          end;
+        finally
+          lEnumerator.Free;
         end;
       end
       else if (TObject(Node.Data) is acClassTicket) then
       begin
         lClassTicket := acClassTicket(Node.Data);
-        repeat
+        //repeat
           for li := 0 to pred(lClassTicket.Attributes.Count) do
           begin
             lAttributeTicket := acAttributeTicket(lClassTicket.Attributes.Objects[li]);
@@ -777,15 +814,14 @@ begin
               end;
             end;
           end;
-          lClassTicket := lClassTicket.ParentClassTicket;
-        until lClassTicket = nil;
+         //lClassTicket := lClassTicket.ParentClassTicket;
+         //until lClassTicket = nil;
       end;
     finally
       Node.Owner.EndUpdate;
     end;
   end;
 
-
 end;
 
 procedure TExplorerV2.FormShow(Sender: TObject);