Aren/haiku
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Use Variant instead of void* for values in the table model.

Browse Source 
git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@30322 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Ingo Weinhold 2009-04-22 11:56:44 +00:00
parent 4e632511e4
commit fc0965bb05
3 changed files with 45 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
src/apps/debuganalyzer/Table.cpp
View File

@ -77,20 +77,20 @@ TableColumn::GetColumnName(BString* into) const
void
TableColumn::DrawValue(void* value, BRect rect, BView* targetView)
TableColumn::DrawValue(const Variant& value, BRect rect, BView* targetView)
{
}
int
TableColumn::CompareValues(void* a, void* b)
TableColumn::CompareValues(const Variant& a, const Variant& b)
{
return 0;
}
float
TableColumn::GetPreferredValueWidth(void* value, BView* parent) const
TableColumn::GetPreferredValueWidth(const Variant& value, BView* parent) const
{
return Width();
}
@ -103,7 +103,9 @@ TableColumn::DrawField(BField* _field, BRect rect, BView* targetView)
if (field == NULL)
return;
void* value = fModel->ValueAt(field->RowIndex(), fModelIndex);
Variant value;
if (!fModel->GetValueAt(field->RowIndex(), fModelIndex, value))
return;
DrawValue(value, rect, targetView);
}
@ -122,8 +124,17 @@ TableColumn::CompareFields(BField* _field1, BField* _field2)
if (field2 == NULL)
return 1;
return CompareValues(fModel->ValueAt(field1->RowIndex(), fModelIndex),
fModel->ValueAt(field2->RowIndex(), fModelIndex));
Variant value1;
bool valid1 = fModel->GetValueAt(field1->RowIndex(), fModelIndex, value1);
Variant value2;
bool valid2 = fModel->GetValueAt(field2->RowIndex(), fModelIndex, value2);
if (!valid1)
return valid2 ? -1 : 0;
if (!valid2)
return 1;
return CompareValues(value1, value2);
}
@ -134,7 +145,9 @@ TableColumn::GetPreferredWidth(BField* _field, BView* parent) const
if (field == NULL)
return Width();
void* value = fModel->ValueAt(field->RowIndex(), fModelIndex);
Variant value;
if (!fModel->GetValueAt(field->RowIndex(), fModelIndex, value))
return Width();
return GetPreferredValueWidth(value, parent);
}
@ -159,25 +172,27 @@ StringTableColumn::~StringTableColumn()
void
StringTableColumn::DrawValue(void* value, BRect rect, BView* targetView)
StringTableColumn::DrawValue(const Variant& value, BRect rect,
BView* targetView)
{
fField.SetString((const char*)value);
fField.SetString(value.ToString());
fField.SetWidth(Width());
fColumn.DrawField(&fField, rect, targetView);
}
int
StringTableColumn::CompareValues(void* a, void* b)
StringTableColumn::CompareValues(const Variant& a, const Variant& b)
{
return strcmp((const char*)a, (const char*)b);
return strcmp(a.ToString(), b.ToString());
}
float
StringTableColumn::GetPreferredValueWidth(void* value, BView* parent) const
StringTableColumn::GetPreferredValueWidth(const Variant& value,
BView* parent) const
{
fField.SetString((const char*)value);
fField.SetString(value.ToString());
fField.SetWidth(Width());
return fColumn.GetPreferredWidth(&fField, parent);
}

19
src/apps/debuganalyzer/Table.h
View File

@ -9,6 +9,8 @@
#include <ColumnTypes.h>
#include <ObjectList.h>
#include "Variant.h"
class Table;
@ -23,7 +25,8 @@ public:
virtual void GetColumnName(int columnIndex,
BString& name) const = 0;
virtual void* ValueAt(int32 rowIndex, int32 columnIndex) = 0;
virtual bool GetValueAt(int32 rowIndex, int32 columnIndex,
Variant& value) = 0;
};
@ -43,10 +46,11 @@ protected:
virtual void DrawTitle(BRect rect, BView* targetView);
virtual void GetColumnName(BString* into) const;
virtual void DrawValue(void* value, BRect rect,
virtual void DrawValue(const Variant& value, BRect rect,
BView* targetView);
virtual int CompareValues(void* a, void* b);
virtual float GetPreferredValueWidth(void* value,
virtual int CompareValues(const Variant& a,
const Variant& b);
virtual float GetPreferredValueWidth(const Variant& value,
BView* parent) const;
private:
@ -80,10 +84,11 @@ public:
virtual ~StringTableColumn();
protected:
virtual void DrawValue(void* value, BRect rect,
virtual void DrawValue(const Variant& value, BRect rect,
BView* targetView);
virtual int CompareValues(void* a, void* b);
virtual float GetPreferredValueWidth(void* value,
virtual int CompareValues(const Variant& a,
const Variant& b);
virtual float GetPreferredValueWidth(const Variant& value,
BView* parent) const;
private:

9
src/apps/debuganalyzer/ThreadsPage.cpp
View File

@ -61,17 +61,18 @@ public:
}
}
virtual void* ValueAt(int32 rowIndex, int32 columnIndex)
virtual bool GetValueAt(int32 rowIndex, int32 columnIndex, Variant& value)
{
Model::Thread* thread = fModel->ThreadAt(rowIndex);
if (thread == NULL)
return NULL;
return false;
switch (columnIndex) {
case 1:
return (void*)thread->Name();
value.SetTo(thread->Name(), VARIANT_DONT_COPY_DATA);
return true;
default:
return NULL;
return false;
}
}