lddp-cvs-commits Mailing List for LDraw Design Pad (Page 2)

SourceForge Headquarters 225 Broadway Suite 1600 San Diego, CA 92101 +1 (858) 454-5900

Revision: 363
          http://lddp.svn.sourceforge.net/lddp/?rev=363&view=rev
Author:   billthefish
Date:     2009-01-03 18:57:45 +0000 (Sat, 03 Jan 2009)

Log Message:
-----------
Removed mpd explorer (for now)

Modified Paths:
--------------
    trunk/Current Build/LDDesignPad.exe
    trunk/Custom Controls/ScintillaLDDP/SciScintillaLDDP.pas
    trunk/DAT Tools/DATBase.pas
    trunk/DAT Tools/DATUtils.pas
    trunk/lddp/LDDesignPad.dpr
    trunk/lddp/main.dfm
    trunk/lddp/main.pas
    trunk/lddp/mpdexplorer.dfm
    trunk/lddp/mpdexplorer.pas
    trunk/lddp/options.dfm

Modified: trunk/Current Build/LDDesignPad.exe
===================================================================
(Binary files differ)

Modified: trunk/Custom Controls/ScintillaLDDP/SciScintillaLDDP.pas
===================================================================

--- trunk/Custom Controls/ScintillaLDDP/SciScintillaLDDP.pas	2008-09-22 22:45:39 UTC (rev 362)
+++ trunk/Custom Controls/ScintillaLDDP/SciScintillaLDDP.pas	2009-01-03 18:57:45 UTC (rev 363)
@@ -111,7 +111,7 @@
       begin
         case DModel[i].LineType of
           1,3: rows := 3;
-            2: rows := 2;
+          2: rows := 2;
           4,5: rows := 4;
         else
           rows := 0;
@@ -120,6 +120,12 @@
         if rows > 0 then
           for j := 1 to rows do
             (DModel[i] as TDATElement).MatrixVals[j, Ord(axis)] := -(DModel[i] as TDATElement).MatrixVals[j, Ord(axis)];
+        if DModel[i].LineType = 1 then
+          case axis of
+            axisX: (DModel[i] as TDATSubPart).X := -(DModel[i] as TDATSubPart).X;
+            axisY: (DModel[i] as TDATSubPart).Y := -(DModel[i] as TDATSubPart).Y;
+            axisZ: (DModel[i] as TDATSubPart).Z := -(DModel[i] as TDATSubPart).Z;
+          end;
       end;
     SelText := DModel.ModelText;
     SelectLines(startline, endline);

Modified: trunk/DAT Tools/DATBase.pas
===================================================================
--- trunk/DAT Tools/DATBase.pas	2008-09-22 22:45:39 UTC (rev 362)
+++ trunk/DAT Tools/DATBase.pas	2009-01-03 18:57:45 UTC (rev 363)
@@ -109,36 +109,6 @@
       function GetDATString:string; override;
   end;
 
-  TDATFinish = (finNone, finChrome, finPearlescent, finRubber, finMatteMettalic, finMetal);
-
-  (* Represents the !COLOUR Meta Command *)
-  TDATColour=record
-      Name: string;
-      Code: Integer;
-      MainColor, EdgeColor: TColor;
-      Alpha: Byte;
-      Luminance: Byte;
-      Finish: TDATFinish;
-      MaterialParams: string;
-  end;
-
-  TDATColourList = class(TObject)
-    private
-      FColorCollection: array of TDATColour;
-      procedure SetColour(Idx: Integer; Value: TDATColour);
-      function GetColour(Idx: Integer): TDATColour;
-      function GetCount: Integer;
-
-    public
-      function IndexOfColourCode(Code: Integer): Integer;
-      function IndexOfColourName(Name: string): Integer;
-      procedure Add(Colour: TDATColour); overload;
-      procedure Clear;
-
-      property Colour[idx: Integer]: TDATColour read GetColour write SetColour; default;
-      property Count:Integer read GetCount;
-  end;
-
   TDATElement=class(TDATType)
     private
       intColor: Integer;
@@ -330,6 +300,36 @@
       property z4: Extended index 12 read GetCoordinate write SetCoordinate;
   end;
 
+  TDATFinish = (finNone, finChrome, finPearlescent, finRubber, finMatteMettalic, finMetal);
+
+  (* Represents the !COLOUR Meta Command *)
+  TDATColour=record
+      Name: string;
+      Code: Integer;
+      MainColor, EdgeColor: TColor;
+      Alpha: Byte;
+      Luminance: Byte;
+      Finish: TDATFinish;
+      MaterialParams: string;
+  end;
+
+  TDATColourList = class(TObject)
+    private
+      FColorCollection: array of TDATColour;
+      procedure SetColour(Idx: Integer; Value: TDATColour);
+      function GetColour(Idx: Integer): TDATColour;
+      function GetCount: Integer;
+
+    public
+      function IndexOfColourCode(Code: Integer): Integer;
+      function IndexOfColourName(Name: string): Integer;
+      procedure Add(Colour: TDATColour); overload;
+      procedure Clear;
+
+      property Colour[idx: Integer]: TDATColour read GetColour write SetColour; default;
+      property Count:Integer read GetCount;
+  end;
+
 var
   LDrawBasePath: string = 'C:\Lego\LDRAW\';
 

Modified: trunk/DAT Tools/DATUtils.pas
===================================================================
--- trunk/DAT Tools/DATUtils.pas	2008-09-22 22:45:39 UTC (rev 362)
+++ trunk/DAT Tools/DATUtils.pas	2009-01-03 18:57:45 UTC (rev 363)
@@ -44,6 +44,7 @@
 function CheckIdentPoints(const points1, points2: array of TDATPoint): Boolean;
 function BGRtoRGB(clr: TColor): TColor;
 function MakeStandardDATColourList: TDATColourList;
+function CombineGeometrics(const line1, line2: TDATGeometric): TDATQuad;
 
 implementation
 
@@ -321,4 +322,55 @@
     Result := false;
 end;
 
+function CombineGeometrics(const line1, line2: TDATGeometric): TDATQuad;
+
+var
+  QuadPoints: array of TDATPoint;
+  j, k: Integer;
+  flag: Boolean;
+
+begin
+  for j := 1 to 3 do
+  begin
+    if Length(QuadPoints) > 0 then
+    begin
+      flag := false;
+      for k := 0 to Length(QuadPoints) - 1 do
+        if CheckSamePoint(line1.Point[j],QuadPoints[k]) then
+          flag := true;
+      if not flag then
+      begin
+        SetLength(QuadPoints, Length(QuadPoints) + 1);
+        QuadPoints[Length(QuadPoints) - 1] := line1.Point[j];
+      end;
+    end
+    else
+    begin
+      SetLength(QuadPoints,1);
+      QuadPoints[0] := line1.Point[j];
+    end;
+    flag := false;
+    for k := 0 to Length(QuadPoints) - 1 do
+      if CheckSamePoint(line2.Point[j],QuadPoints[k]) then
+        flag := true;
+    if not flag then
+    begin
+      SetLength(QuadPoints, Length(QuadPoints) + 1);
+      QuadPoints[Length(QuadPoints) - 1] := line2.Point[j];
+    end;
+  end;
+
+  if Length(QuadPoints) = 4 then
+  begin
+    Result := TDATQuad.Create;
+    Result.Point[1] := QuadPoints[0];
+    Result.Point[2] := QuadPoints[1];
+    Result.Point[3] := QuadPoints[2];
+    Result.Point[4] := QuadPoints[3];
+    Result.Color := line1.Color;
+  end
+  else
+    Result := nil;
+end;
+
 end.

Modified: trunk/lddp/LDDesignPad.dpr
===================================================================
--- trunk/lddp/LDDesignPad.dpr	2008-09-22 22:45:39 UTC (rev 362)
+++ trunk/lddp/LDDesignPad.dpr	2009-01-03 18:57:45 UTC (rev 363)
@@ -28,7 +28,6 @@
   splash in 'splash.pas' {frSplash},
   colordialog in 'colordialog.pas' {frColorDialog},
   BMP2LDraw in 'BMP2LDraw.pas' {frBMP2LDrawMain},
-  mpdexplorer in 'mpdexplorer.pas' {frModelTreeView},
   windowsspecific in 'windowsspecific.pas',
   BezWindow in 'BezWindow.pas' {frmDATCurve},
   dlgSubpart in 'dlgSubpart.pas' {frSubFile},
@@ -55,7 +54,6 @@
   Application.CreateForm(TfrOptions, frOptions);
   Application.CreateForm(TfrColorDialog, frColorDialog);
   Application.CreateForm(TfrBMP2LDrawMain, frBMP2LDrawMain);
-  Application.CreateForm(TfrModelTreeView, frModelTreeView);
   Application.CreateForm(TfrmDATCurve, frmDATCurve);
   Application.CreateForm(TfrSubFile, frSubFile);
   Application.CreateForm(TfmSort, fmSort);

Modified: trunk/lddp/main.dfm
===================================================================
(Binary files differ)

Modified: trunk/lddp/main.pas
===================================================================
--- trunk/lddp/main.pas	2008-09-22 22:45:39 UTC (rev 362)
+++ trunk/lddp/main.pas	2009-01-03 18:57:45 UTC (rev 363)
@@ -171,8 +171,6 @@
     acCheckforUpdate: TAction;
     acBMP2LDraw: TAction;
     ConvertBitmaptoLDraw1: TMenuItem;
-    acMPDExplorer: TAction;
-    mnuModelTree: TMenuItem;
     N7: TMenuItem;
     View1: TMenuItem;
     MarkAll1: TMenuItem;
@@ -435,7 +433,6 @@
     procedure acFileCloseAllExecute(Sender: TObject);
     procedure acReverseWindingExecute(Sender: TObject);
     procedure acCheckforUpdateExecute(Sender: TObject);
-    procedure acMPDExplorerExecute(Sender: TObject);
     procedure FormClose(Sender: TObject; var Action: TCloseAction);
     procedure acBMP2LDrawExecute(Sender: TObject);
     procedure acFindNextUpdate(Sender: TObject);
@@ -536,7 +533,7 @@
 
 uses
   about, options, colordialog, BezWindow, sorting, splash, 
-  BMP2LDraw, mpdexplorer, dlgSubpart, windowsspecific,
+  BMP2LDraw, dlgSubpart, windowsspecific,
   DATModel, DATUtils, DATCheck, DATErrorFix, SciStreamDefault,
   StrUtils, Registry, IniFiles, SciResLang, Contnrs;
 
@@ -1568,18 +1565,6 @@
   end;
 end;
 
-procedure TfrMain.acMPDExplorerExecute(Sender: TObject);
-// Shows the model tree dialog
-begin
-  if (Sender as TAction).Checked then
-    frMPDExplorer.Show
-  else
-    frMPDExplorer.Close;
-
-  if frMPDExplorer.Visible then
-    frMPDExplorer.RestorePosition;
-end;
-
 // Other procedures
 
 procedure TfrMain.FileIsDropped(var Msg: TMessage);
@@ -1715,7 +1700,7 @@
     end;
   end;
 
-  // Check plugin type an enable as appropriate
+  // Check plugin type and enable as appropriate
   for i := 0 to PluginActionList.ActionCount - 1 do
   begin
     case (PluginActionList.Actions[i] as TAction).Tag of
@@ -1729,10 +1714,6 @@
   AutoComplete.Disabled := (editor.GetStyleAt(editor.GetCurrentPos) <> 16) and
                            (editor.GetStyleAt(editor.GetCurrentPos) <> 17);
 
-  // Update the model tree view
-  if frMPDExplorer.Visible then
-    frMPDExplorer.FormActivate(nil);
-
   // Check external changes
   if (not DocumentTabs.ActiveDocument.IsUntitled) and
      FileExists(DocumentTabs.ActiveDocument.FileName) then
@@ -1769,8 +1750,6 @@
 // Inits the app and shows model tree if needed
 begin
   AppInitialize;
-  frMPDExplorer.RestorePosition;
-  acMPDExplorer.Checked := frMPDExplorer.Visible;
 end;
 
 Procedure TfrMain.AppInitialize;

Modified: trunk/lddp/mpdexplorer.dfm
===================================================================
--- trunk/lddp/mpdexplorer.dfm	2008-09-22 22:45:39 UTC (rev 362)
+++ trunk/lddp/mpdexplorer.dfm	2009-01-03 18:57:45 UTC (rev 363)
@@ -1,4 +1,4 @@
-object frModelTreeView: TfrModelTreeView
+object frMPDExplorer: TfrMPDExplorer
   Left = 688
   Top = 149
   BorderStyle = bsSizeToolWin

Modified: trunk/lddp/mpdexplorer.pas
===================================================================
--- trunk/lddp/mpdexplorer.pas	2008-09-22 22:45:39 UTC (rev 362)
+++ trunk/lddp/mpdexplorer.pas	2009-01-03 18:57:45 UTC (rev 363)
@@ -103,7 +103,7 @@
 procedure TfrMPDExplorer.FormClose(Sender: TObject; var Action: TCloseAction);
 begin
   SaveFormValues;
-  frMain.acMPDExplorer.Checked := False;
+//  frMain.acMPDExplorer.Checked := False;
 end;
 
 procedure TfrMPDExplorer.FormCreate(Sender: TObject);

Modified: trunk/lddp/options.dfm
===================================================================
(Binary files differ)


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.




2003	Jan	Feb	Mar	Apr	May	Jun (83)	Jul (118)	Aug (18)	Sep	Oct (10)	Nov (16)	Dec (11)
2004	Jan (8)	Feb (8)	Mar (41)	Apr (2)	May	Jun	Jul (28)	Aug (5)	Sep	Oct	Nov (14)	Dec (3)
2005	Jan (2)	Feb (4)	Mar (3)	Apr (1)	May	Jun	Jul	Aug (6)	Sep (1)	Oct	Nov	Dec (7)
2006	Jan	Feb	Mar	Apr	May	Jun	Jul	Aug	Sep	Oct	Nov	Dec (1)
2008	Jan	Feb	Mar (2)	Apr	May	Jun	Jul	Aug (35)	Sep (11)	Oct	Nov	Dec
2009	Jan (1)	Feb	Mar	Apr	May (5)	Jun (4)	Jul	Aug	Sep (2)	Oct (6)	Nov	Dec
2010	Jan (3)	Feb	Mar	Apr	May	Jun	Jul (3)	Aug	Sep	Oct	Nov	Dec
2011	Jan	Feb	Mar	Apr	May	Jun	Jul	Aug	Sep	Oct	Nov (2)	Dec

lddp-cvs-commits Mailing List for LDraw Design Pad (Page 2)

lddp-cvs-commits — Commits to the CVS repository