Changeset 702

Timestamp:

08/10/07 17:25:04 (16 months ago)

Author:

leo

Message:

Fixed used pieces dialog.

Location:

trunk

Files:

• common/lc_flexpiece.cpp (modified) (2 diffs)
• common/lc_flexpiece.h (modified) (1 diff)
• common/lc_model.cpp (modified) (1 diff)
• common/lc_model.h (modified) (2 diffs)
• common/lc_modelref.cpp (modified) (1 diff)
• common/lc_modelref.h (modified) (1 diff)
• common/lc_piece.cpp (modified) (2 diffs)
• common/lc_piece.h (modified) (1 diff)
• common/lc_pieceobj.h (modified) (1 diff)
• common/lc_pivot.cpp (modified) (1 diff)
• common/lc_pivot.h (modified) (1 diff)
• common/project.cpp (modified) (4 diffs)
• common/typedefs.h (modified) (3 diffs)
• win/Propspgs.cpp (modified) (6 diffs)
• win/Propspgs.h (modified) (5 diffs)
• win/System.cpp (modified) (2 diffs)

trunk/common/lc_flexpiece.cpp

@@ -7 +7 @@
 #include "lc_colors.h"
 #include "pieceinf.h"
+#include "typedefs.h"
 
 lcFlexiblePiece::lcFlexiblePiece(PieceInfo* Info)
@@ -78 +79 @@
     if (m_PieceInfo)
         m_PieceInfo->DeRef();
+}
+
+void lcFlexiblePiece::GetPieceList(ObjArray<struct LC_PIECELIST_ENTRY>& Pieces, int Color) const
+{
+    LC_PIECELIST_ENTRY Entry;
+
+    Entry.Info = m_PieceInfo;
+    Entry.Color = (m_Color == LC_COLOR_DEFAULT) ? Color : m_Color;
+
+    Pieces.Add(Entry);
 }
 

trunk/common/lc_flexpiece.h

@@ -14 +14 @@
 
     // Base class implementation.
+    virtual void GetPieceList(ObjArray<struct LC_PIECELIST_ENTRY>& Pieces, int Color) const;
     virtual void ClosestRayIntersect(LC_CLICK_RAY* Ray) const;
     virtual bool IntersectsVolume(const Vector4* Planes, int NumPlanes) const;

trunk/common/lc_model.cpp

@@ -60 +60 @@
 
     return false;
+}
+
+void lcModel::GetPieceList(ObjArray<struct LC_PIECELIST_ENTRY>& Pieces, int Color) const
+{
+    for (lcPieceObject* Piece = m_Pieces; Piece; Piece = (lcPieceObject*)Piece->m_Next)
+        Piece->GetPieceList(Pieces, Color);
 }
 

trunk/common/lc_model.h

@@ -5 +5 @@
 #include "config.h"
 #include "algebra.h"
+#include "array.h"
 
 class lcObject;
@@ -21 +22 @@
     // Check if a given model is referenced by this model.
     bool IsSubModel(const lcModel* Model) const;
+
+    // Get a list of all actual pieces used by this model.
+    void GetPieceList(ObjArray<struct LC_PIECELIST_ENTRY>& Pieces, int Color) const;
 
     // Tell this model it's now the active model or no longer active.

trunk/common/lc_modelref.cpp

@@ -25 +25 @@
 lcModelRef::~lcModelRef()
 {
+}
+
+void lcModelRef::GetPieceList(ObjArray<struct LC_PIECELIST_ENTRY>& Pieces, int Color) const
+{
+    m_Model->GetPieceList(Pieces, Color);
 }
 

trunk/common/lc_modelref.h

@@ -14 +14 @@
 
     // Base class implementation.
+    virtual void GetPieceList(ObjArray<struct LC_PIECELIST_ENTRY>& Pieces, int Color) const;
     virtual void ClosestRayIntersect(LC_CLICK_RAY* Ray) const;
     virtual bool IntersectsVolume(const Vector4* Planes, int NumPlanes) const;

trunk/common/lc_piece.cpp

@@ -8 +8 @@
 #include "texture.h"
 #include "lc_colors.h"
+#include "typedefs.h"
 
 lcPiece::lcPiece(PieceInfo* Info)
@@ -45 +46 @@
         BuildMesh();
     }
+}
+
+void lcPiece::GetPieceList(ObjArray<struct LC_PIECELIST_ENTRY>& Pieces, int Color) const
+{
+    LC_PIECELIST_ENTRY Entry;
+
+    Entry.Info = m_PieceInfo;
+    Entry.Color = (m_Color == LC_COLOR_DEFAULT) ? Color : m_Color;
+
+    Pieces.Add(Entry);
 }
 

trunk/common/lc_piece.h

@@ -19 +19 @@
 
     // Base class implementation.
+    virtual void GetPieceList(ObjArray<struct LC_PIECELIST_ENTRY>& Pieces, int Color) const;
     virtual void ClosestRayIntersect(LC_CLICK_RAY* Ray) const;
     virtual bool IntersectsVolume(const Vector4* Planes, int NumPlanes) const;

trunk/common/lc_pieceobj.h

@@ -26 +26 @@
     // Merges this object's bounding box with another box.
     void MergeBoundingBox(BoundingBox* Box);
+
+    // Get a list of all actual pieces used by this piece.
+    virtual void GetPieceList(ObjArray<struct LC_PIECELIST_ENTRY>& Pieces, int Color) const = 0;
 
     // Export this object to an LDraw file.

trunk/common/lc_pivot.cpp

@@ -15 +15 @@
 
 lcPivot::~lcPivot()
+{
+    // fixme: lcPivot
+}
+
+void lcPivot::GetPieceList(ObjArray<struct LC_PIECELIST_ENTRY>& Pieces, int Color) const
 {
     // fixme: lcPivot

trunk/common/lc_pivot.h

@@ -11 +11 @@
 
     // Base class implementation.
+    virtual void GetPieceList(ObjArray<struct LC_PIECELIST_ENTRY>& Pieces, int Color) const;
     virtual void ClosestRayIntersect(LC_CLICK_RAY* Ray) const;
     virtual bool IntersectsVolume(const Vector4* Planes, int NumPlanes) const;

trunk/common/project.cpp

@@ -4259 +4259 @@
             opts.Name = Name;
             opts.Author = Sys_ProfileLoadString("Default", "User", "");
-            opts.lines = 0;
-            opts.count = NULL;
-            opts.names = NULL;
+            opts.PiecesUsed = NULL;
 
             if (SystemDoDialog(LC_DLG_PROPERTIES, &opts))
@@ -4337 +4335 @@
         case LC_MODEL_PROPERTIES:
         {
-/* FIXME: model properties
             LC_PROPERTIESDLG_OPTS opts;
 
@@ -4346 +4343 @@
             opts.Comments = m_ActiveModel->m_Comments;
 
-            // Piece list.
-            opts.lines = lcGetPiecesLibrary()->GetPieceCount();
-            opts.count = (unsigned short*)malloc(lcGetPiecesLibrary()->GetPieceCount()*LC_MAXCOLORS*sizeof(unsigned short));
-            memset (opts.count, 0, lcGetPiecesLibrary()->GetPieceCount()*LC_MAXCOLORS*sizeof(unsigned short));
-            opts.names = (char**)malloc(lcGetPiecesLibrary()->GetPieceCount()*sizeof(char*));
-            for (int i = 0; i < lcGetPiecesLibrary()->GetPieceCount(); i++)
-                opts.names[i] = lcGetPiecesLibrary()->GetPieceInfo (i)->m_strDescription;
-
-            for (Piece* pPiece = m_ActiveModel->m_Pieces; pPiece; pPiece = (Piece*)pPiece->m_Next)
-            {
-                int idx = lcGetPiecesLibrary()->GetPieceIndex (pPiece->GetPieceInfo ());
-                opts.count[idx*LC_MAXCOLORS+pPiece->GetColor()]++;
+            // Pieces list.
+            PiecesLibrary* Lib = lcGetPiecesLibrary();
+            int NumPieces = Lib->GetPieceCount() * lcNumUserColors;
+            opts.PiecesUsed = new int[NumPieces];
+            memset(opts.PiecesUsed, 0, NumPieces * sizeof(int));
+
+            ObjArray<LC_PIECELIST_ENTRY> Pieces;
+            m_ActiveModel->GetPieceList(Pieces, LC_COLOR_DEFAULT);
+
+            for (int i = 0; i < Pieces.GetSize(); i++)
+            {
+                int Index = Lib->GetPieceIndex(Pieces[i].Info) * lcNumUserColors + Pieces[i].Color;
+                opts.PiecesUsed[Index]++;
             }
 
@@ -4374 +4372 @@
             }
 
-            free(opts.count);
-            free(opts.names);
-*/
+            delete[] opts.PiecesUsed;
         } break;
 

trunk/common/typedefs.h

@@ -202 +202 @@
 } LC_CURSOR_TYPE;
 
-// Piece connections (complicated and wastes memory but fast).
-
+struct LC_PIECELIST_ENTRY
+{
+    PieceInfo* Info;
+    int Color;
+};
+
+// Piece connections.
 struct CONNECTION
 {
@@ -227 +232 @@
 
 // Select by Name dialog data
-
 typedef enum
 {
@@ -418 +422 @@
     String Description;
     String Comments;
-    char** names;
-    unsigned short* count;
-    int lines;
+    int* PiecesUsed;
 };
 

trunk/win/Propspgs.cpp

@@ -6 +6 @@
 #include "PropsPgs.h"
 #include "defines.h"
+#include "lc_colors.h"
+#include "library.h"
+#include "lc_application.h"
+#include "pieceinf.h"
 
 #ifdef _DEBUG
@@ -64 +68 @@
         // NOTE: the ClassWizard will add member initialization here
     //}}AFX_DATA_INIT
+
+    m_ColorColumn = new int[lcNumUserColors];
 }
 
 CPropertiesPieces::~CPropertiesPieces()
 {
+    delete[] m_ColorColumn;
 }
 
@@ -77 +84 @@
     //}}AFX_DATA_MAP
 }
-
 
 BEGIN_MESSAGE_MAP(CPropertiesPieces, CPropertyPage)
@@ -85 +91 @@
 END_MESSAGE_MAP()
 
-
-BOOL CPropertiesPieces::OnInitDialog() 
-{
-    CPropertyPage::OnInitDialog();
-/* FIXME: model pieces
-    char tmp[64];
-    int i, j;
-    memset (&totalcount, 0, sizeof (totalcount));
-    for (i = 0; i < lines; i++)
-        for (j = 0; j < LC_MAXCOLORS; j++)
-            totalcount[j] += count[i*LC_MAXCOLORS+j];
-
-    int ID = 0;
-    m_List.InsertColumn(0, "Piece", LVCFMT_LEFT, 130, 0);
-    for (i = 0; i < LC_MAXCOLORS; i++)
-        if (totalcount[i])
+static int CALLBACK ListViewCompareProc(LPARAM lP1, LPARAM lP2, LPARAM lParamData)
+{
+    CPropertiesPieces* Dlg = (CPropertiesPieces*)lParamData;
+    int* Line1 = (int*)lP1;
+    int* Line2 = (int*)lP2;
+
+    // Keep the total row at the bottom of the list.
+    if (lP1 == -1)
+        return 1;
+    else if (lP2 == -1)
+        return -1;
+
+    if (Dlg->m_SortColumn != 0)
+    {
+        int Num1, Num2;
+
+        if (Dlg->m_SortColumn == Dlg->m_List.GetHeaderCtrl()->GetItemCount() - 1)
         {
-            col[i] = ID;
-            ID++;
-
-            CString str;
-            str.LoadString(IDS_COLOR01 + i);
-            m_List.InsertColumn(ID, (LPCSTR)str, LVCFMT_LEFT, 80, 0);
+            Num1 = 0;
+            Num2 = 0;
+
+            for (int i = 0; i < lcNumUserColors; i++)
+            {
+                Num1 += Line1[i];
+                Num2 += Line2[i];
+            }
         }
         else
-            col[i] = -1;
-    ID++;
-    m_List.InsertColumn(ID, "Total", LVCFMT_LEFT, 60, 0);
-
-    for (i = 0; i < lines; i++)
-    {
-        int total = 0;
-
-        for (j = 0; j < LC_MAXCOLORS; j++)
-            total += count[i*LC_MAXCOLORS+j];
-
-        if (total == 0)
+        {
+            int i;
+
+            for (i = 0; i < lcNumUserColors; i++)
+                if (Dlg->m_ColorColumn[i] == Dlg->m_SortColumn)
+                    break;
+
+            Num1 = Line1[i];
+            Num2 = Line2[i];
+        }
+
+        if (Num1 < Num2)
+            return Dlg->m_SortAscending ? 1 : -1;
+        else if (Num1 > Num2)
+            return Dlg->m_SortAscending ? -1 : 1;
+        else
+            return 0;
+    }
+
+    int Index1 = (Line1 - Dlg->m_PiecesUsed) / lcNumUserColors;
+    int Index2 = (Line2 - Dlg->m_PiecesUsed) / lcNumUserColors;
+
+    PiecesLibrary* Lib = lcGetPiecesLibrary();
+    PieceInfo* Info1 = Lib->GetPieceInfo(Index1);
+    PieceInfo* Info2 = Lib->GetPieceInfo(Index2);
+
+    if (Dlg->m_SortAscending)
+        return _strcmpi(Info1->m_strDescription, Info2->m_strDescription);
+    else
+        return - _strcmpi(Info1->m_strDescription, Info2->m_strDescription);
+}
+
+BOOL CPropertiesPieces::OnInitDialog() 
+{
+    CPropertyPage::OnInitDialog();
+
+    int* ColorTotal = new int[lcNumUserColors];
+    memset(ColorTotal, 0, lcNumUserColors * sizeof(int));
+    memset(m_ColorColumn, 0, lcNumUserColors * sizeof(int));
+    int i, j;
+
+    PiecesLibrary* Lib = lcGetPiecesLibrary();
+
+    // Count the number of pieces used for each color.
+    for (i = 0; i < Lib->GetPieceCount(); i++)
+        for (j = 0; j < lcNumUserColors; j++)
+            ColorTotal[j] += m_PiecesUsed[j + i * lcNumUserColors];
+
+    // Add columns to the list header.
+    m_List.InsertColumn(0, "Piece", LVCFMT_LEFT, 130, 0);
+
+    int Column = 1;
+
+    for (i = 0; i < lcNumUserColors; i++)
+    {
+        if (!ColorTotal[i])
             continue;
 
-        char name[65];
+        m_ColorColumn[i] = Column;
+        m_List.InsertColumn(Column, lcColorList[i].Name, LVCFMT_LEFT, 80, 0);
+        Column++;
+    }
+
+    m_List.InsertColumn(Column, "Total", LVCFMT_LEFT, 60, 0);
+
+    m_List.SetRedraw(FALSE);
+
+    // Add pieces to the list.
+    for (i = 0; i < Lib->GetPieceCount(); i++)
+    {
+        int* Line = m_PiecesUsed + i * lcNumUserColors;
+        int LineTotal = 0;
+
+        for (j = 0; j < lcNumUserColors; j++)
+            LineTotal += Line[j];
+
+        if (!LineTotal)
+            continue;
+
+        char name[256], tmp[256];
         LV_ITEM lvi;
         lvi.mask = LVIF_TEXT|LVIF_PARAM;
@@ -130 +204 @@
         lvi.iSubItem = 0;
         lvi.pszText = name;
-        lvi.lParam = i;
-        strcpy (name, names[i]);
+        lvi.lParam = (LPARAM)Line;
+        strcpy(name, Lib->GetPieceInfo(i)->m_strDescription);
+
         int idx = m_List.InsertItem(&lvi);
 
-        for (j = 0; j < LC_MAXCOLORS; j++)
-//          if (totalcount[j])
-            if (count[i*LC_MAXCOLORS+j])
-            {
-                sprintf (tmp, "%d", count[i*LC_MAXCOLORS+j]);
-                lvi.iItem = idx;
-                lvi.pszText = tmp;
-                m_List.SetItemText(idx, col[j] + 1, tmp);
-            }
-
-        sprintf (tmp, "%d", total);
-        lvi.iItem = idx;
-        lvi.pszText = tmp;
-        m_List.SetItemText(idx, ID, tmp);
-    }
-
-    m_List.ModifyStyle(LVS_SORTASCENDING | LVS_SORTDESCENDING, 0L);
-
-    char name[65];
+        for (j = 0; j < lcNumUserColors; j++)
+        {
+            if (!Line[j])
+                continue;
+
+            sprintf(tmp, "%d", Line[j]);
+            m_List.SetItemText(idx, m_ColorColumn[j], tmp);
+        }
+
+        sprintf (tmp, "%d", LineTotal);
+        m_List.SetItemText(idx, Column, tmp);
+    }
+
+    // Add totals.
+    char name[256], tmp[256];
     strcpy (name, "Total");
     LV_ITEM lvi;
@@ -160 +231 @@
     lvi.pszText = name;
     lvi.lParam = -1;
+
     int idx = m_List.InsertItem(&lvi), total = 0;
-
-    for (i = 0; i < LC_MAXCOLORS; i++)
-        if (totalcount[i])
-        {
-            sprintf (tmp, "%d", totalcount[i]);
-            lvi.iItem = idx;
-            lvi.pszText = tmp;
-            m_List.SetItemText(idx, col[i] + 1, tmp);
-            total += totalcount[i];
-        }
-
-    sprintf (tmp, "%d", total);
-    lvi.iItem = idx;
-    lvi.pszText = tmp;
-    m_List.SetItemText(idx, ID, tmp);
-*/
+    int Total = 0;
+
+    for (i = 0; i < lcNumUserColors; i++)
+    {
+        if (!ColorTotal[i])
+            continue;
+
+        Total += ColorTotal[i];
+
+        sprintf (tmp, "%d", ColorTotal[i]);
+        m_List.SetItemText(idx, m_ColorColumn[i], tmp);
+    }
+
+    sprintf (tmp, "%d", Total);
+    m_List.SetItemText(idx, Column, tmp);
+
+    delete[] ColorTotal;
+
+    m_SortColumn = 0;
+    m_SortAscending = true;
+
+    m_List.SortItems((PFNLVCOMPARE)ListViewCompareProc, (LPARAM)this);
+
+    m_List.SetRedraw(TRUE);
+    m_List.Invalidate();
+
     return TRUE;
 }
 
-struct COMPARE_DATA
-{
-    CPropertiesPieces* page;
-    int color;
-};
-
-static int CALLBACK ListViewCompareProc(LPARAM lP1, LPARAM lP2, LPARAM lParamData)
-{
-    /* FIXME: model pieces
-    int i, a, b;
-    COMPARE_DATA* data = (COMPARE_DATA*)lParamData;
-
-    if (data->color == -1)
-    {
-        // check if we're comparing the "total" row
-        if (lP1 == -1)
-            return 1;
-        else if (lP2 == -1)
-            return -1;
-
-        return _strcmpi(data->page->names[lP1], data->page->names[lP2]);
-    }
-
-    // last column
-    if (data->color == LC_MAXCOLORS)
-    {
-        a = b = 0;
-        for (i = 0; i < LC_MAXCOLORS; i++)
-        {
-            a += data->page->count[lP1*LC_MAXCOLORS+i];
-            b += data->page->count[lP2*LC_MAXCOLORS+i];
-        }
-    }
+void CPropertiesPieces::OnColumnclickPropPiecesList(NMHDR* pNMHDR, LRESULT* pResult) 
+{
+    NM_LISTVIEW* pNMListView = (NM_LISTVIEW*)pNMHDR;
+
+    if (m_SortColumn == pNMListView->iSubItem)
+        m_SortAscending = !m_SortAscending;
     else
-    {
-        if (lP1 == -1)
-            a = data->page->totalcount[data->color];
-        else
-            a = data->page->count[lP1*LC_MAXCOLORS+data->color];
-        
-        if (lP2 == -1)
-            b = data->page->totalcount[data->color];
-        else
-            b = data->page->count[lP2*LC_MAXCOLORS+data->color];
-    }
-
-    if (a == b)
-        return 0;
-
-    if (a < b)
-        return -1;
-    else
-        return 1;
-*/
-}
-
-void CPropertiesPieces::OnColumnclickPropPiecesList(NMHDR* pNMHDR, LRESULT* pResult) 
-{
-    /* FIXME: model pieces
-    int i;
-    NM_LISTVIEW* pNMListView = (NM_LISTVIEW*)pNMHDR;
-    COMPARE_DATA data;
-
-    data.page = this;
-
-    if (pNMListView->iSubItem == 0)
-        data.color = -1;
-    else
-    {
-        for (i = 0; i < LC_MAXCOLORS; i++)
-            if (col[i] == pNMListView->iSubItem-1)
-                break;
-
-        data.color = i;
-    }
-
-    m_List.SortItems((PFNLVCOMPARE)ListViewCompareProc, (LPARAM)&data);
+        m_SortColumn = pNMListView->iSubItem;
+
+    m_List.SetRedraw(FALSE);
+
+    m_List.SortItems((PFNLVCOMPARE)ListViewCompareProc, (LPARAM)this);
+
+    m_List.SetRedraw(TRUE);
+    m_List.Invalidate();
 
     *pResult = 0;
-    */
-}
+}

trunk/win/Propspgs.h

@@ -1 @@
-// PropsPgs.h : header file
-//
-
-#ifndef __PROPSPGS_H__
-#define __PROPSPGS_H__
+#ifndef _PROPSPGS_H_
+#define _PROPSPGS_H_
 
 #include "defines.h"
@@ -45 +42 @@
 };
 
-
 /////////////////////////////////////////////////////////////////////////////
 // CPropertiesPieces dialog
@@ -57 +53 @@
     CPropertiesPieces();
     ~CPropertiesPieces();
-    char** names;
-    unsigned short* count;
-    int lines;
-//  int col[LC_MAXCOLORS];
-//  int totalcount[LC_MAXCOLORS];
 
 // Dialog Data
@@ -69 +60 @@
     //}}AFX_DATA
 
+    int* m_PiecesUsed;
+    int* m_ColorColumn;
+    int m_SortColumn;
+    bool m_SortAscending;
 
 // Overrides
@@ -85 +80 @@
     //}}AFX_MSG
     DECLARE_MESSAGE_MAP()
-
 };
 
-
-
-#endif // __PROPSPGS_H__
+#endif // _PROPSPGS_H_

trunk/win/System.cpp

@@ -1602 +1602 @@
         {
             LC_PROPERTIESDLG_OPTS* opts = (LC_PROPERTIESDLG_OPTS*)param;
-            CPropertiesSheet ps(opts->names && opts->count);
+            CPropertiesSheet ps(opts->PiecesUsed != NULL);
 
             ps.SetTitle("Model Properties", 0);