Fixed wrong color names being drawn when printing the BOM for a model.

This commit is contained in:
leo 2013-01-23 22:41:40 +00:00
parent 4f77abc542
commit 3b5e5eabab
3 changed files with 1 additions and 66 deletions

View file

@ -1587,42 +1587,6 @@ BEGIN
ID_FILE_SAVEPICTURE "Save a picture"
END
STRINGTABLE
BEGIN
IDS_COLOR01 "Red"
IDS_COLOR02 "Orange"
IDS_COLOR03 "Green"
IDS_COLOR04 "Light Green"
IDS_COLOR05 "Blue"
IDS_COLOR06 "Light Blue"
IDS_COLOR07 "Yellow"
IDS_COLOR08 "White"
IDS_COLOR09 "Dark Gray"
IDS_COLOR10 "Black"
IDS_COLOR11 "Brown"
IDS_COLOR12 "Pink"
IDS_COLOR13 "Purple"
IDS_COLOR14 "Gold"
IDS_COLOR15 "Clear Red"
IDS_COLOR16 "Clear Orange"
END
STRINGTABLE
BEGIN
IDS_COLOR17 "Clear Green"
IDS_COLOR18 "Clear Light Green"
IDS_COLOR19 "Clear Blue"
IDS_COLOR20 "Clear Light Blue"
IDS_COLOR21 "Clear Yellow"
IDS_COLOR22 "Clear White"
IDS_COLOR23 "Light Gray"
IDS_COLOR24 "Tan"
IDS_COLOR25 "Light Brown"
IDS_COLOR26 "Light Pink"
IDS_COLOR27 "Turquoise"
IDS_COLOR28 "Silver"
END
STRINGTABLE
BEGIN
ID_RENDER_BOX "Render pieces as boxes\nFast Rendering"

View file

@ -659,8 +659,7 @@ static void PrintPiecesThread(void* pv)
for (i = 0; i < NumColors; i++)
if (ColorsUsed[i])
{
str.LoadString(IDS_COLOR01 + i);
DrawText(PD->m_pd.hDC, (LPCTSTR)str, str.GetLength(), rc, DT_CENTER|DT_VCENTER|DT_SINGLELINE);
DrawText(PD->m_pd.hDC, gColorList[i].Name, strlen(gColorList[i].Name), rc, DT_CENTER|DT_VCENTER|DT_SINGLELINE);
rc.OffsetRect (w, 0);
}
str = "Total";

View file

@ -62,41 +62,13 @@
#define IDD_PROGRESS 161
#define IDR_PARTFRAME 162
#define IDD_GROUP 170
#define IDS_COLOR01 176
#define IDS_COLOR02 177
#define IDB_PARTICONS 177
#define IDD_OPENDLG_TEMPLATE 177
#define IDS_COLOR03 178
#define IDS_COLOR04 179
#define IDS_COLOR05 180
#define IDS_COLOR06 181
#define IDS_COLOR07 182
#define IDS_COLOR08 183
#define IDS_COLOR09 184
#define IDS_COLOR10 185
#define IDS_COLOR11 186
#define IDS_COLOR12 187
#define IDS_COLOR13 188
#define IDS_COLOR14 189
#define IDS_COLOR15 190
#define IDS_COLOR16 191
#define IDS_COLOR17 192
#define IDS_COLOR18 193
#define IDD_MINIFIG 193
#define IDR_FULLSCREEN 193
#define IDS_COLOR19 194
#define IDD_SAVEDLG_TEMPLATE 194
#define IDS_COLOR20 195
#define IDS_COLOR21 196
#define IDS_COLOR22 197
#define IDS_COLOR23 198
#define IDD_EXPORTPOV 198
#define IDS_COLOR24 199
#define IDD_SAVEPICTUREDLG_TEMPLATE 199
#define IDS_COLOR25 200
#define IDS_COLOR26 201
#define IDS_COLOR27 202
#define IDS_COLOR28 203
#define IDR_PIECEEDITOR 205
#define IDD_PIECEEDITOR 208
#define IDD_LIBRARY 211