github-starred/ultimatepp
2
0
Fork 0
mirror of https://github.com/ultimatepp/ultimatepp.git synced 2026-05-21 14:55:57 -06:00
Code Issues 33 Projects Packages Wiki Activity Actions

Ide/Debuggers/Gdb_MI2 : separated types from values in tabs

Browse source 
git-svn-id: svn://ultimatepp.org/upp/trunk@4877 f0d560ea-af0d-0410-9eb7-867de7ffcac7
This commit is contained in:
micio 2012-04-29 10:33:13 +00:00
parent 5a656f3a5f
commit e043bfae09
1 changed files with 23 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

34
uppsrc/ide/Debuggers/Gdb_MI2.cpp
View file

@ -186,8 +186,17 @@ Gdb_MI2::Gdb_MI2()
regs.AddFrame(TopSeparatorFrame());
regs.AddFrame(RightSeparatorFrame());
autos.NoHeader();
autos.AddColumn("", 1);
autos.AddColumn("", 2);
autos.AddColumn("", 6);
autos.WhenLeftDouble = THISBACK1(onExploreExpr, &autos);
autos.EvenRowColor();
autos.OddRowColor();
locals.NoHeader();
locals.AddColumn("", 1);
locals.AddColumn("", 2);
locals.AddColumn("", 6);
locals.WhenLeftDouble = THISBACK1(onExploreExpr, &locals);
locals.EvenRowColor();
@ -195,6 +204,7 @@ Gdb_MI2::Gdb_MI2()
watches.NoHeader();
watches.AddColumn("", 1).Edit(watchedit);
watches.AddColumn("", 2);
watches.AddColumn("", 6);
watches.Inserting().Removing();
watches.WhenLeftDouble = THISBACK1(onExploreExpr, &watches);
@ -220,13 +230,6 @@ Gdb_MI2::Gdb_MI2()
explorerForwardBtn.Disable();
explorerHistoryPos = -1;
autos.NoHeader();
autos.AddColumn("", 1);
autos.AddColumn("", 6);
autos.WhenLeftDouble = THISBACK1(onExploreExpr, &autos);
autos.EvenRowColor();
autos.OddRowColor();
Add(tab.SizePos());
tab.Add(autos.SizePos(), "Autos");
tab.Add(locals.SizePos(), t_("Locals"));
@ -1090,7 +1093,7 @@ void Gdb_MI2::SyncLocals()
VectorMap<String, String> prev = DataMap(locals);
locals.Clear();
for(int i = 0; i < localVarNames.GetCount(); i++)
locals.Add(localVarExpressions[i], "(" + localVarTypes[i] + ")" + localVarValues[i]);
locals.Add(localVarExpressions[i], localVarTypes[i], localVarValues[i]);
MarkChanged(prev, locals);
}
@ -1107,9 +1110,15 @@ void Gdb_MI2::SyncWatches()
String expr = watches.Get(i, 0);
int idx = watchesExpressions.Find(expr);
if(idx >= 0)
watches.Set(i, 1, "(" + watchesTypes[idx] + ")" + watchesValues[idx]);
{
watches.Set(i, 1, watchesTypes[idx]);
watches.Set(i, 2, watchesValues[idx]);
}
else
watches.Set(i, 1, t_("<can't evaluate expression>"));
{
watches.Set(i, 1, "");
watches.Set(i, 2, t_("<can't evaluate expression>"));
}
}
MarkChanged(prev, watches);
}
@ -1153,7 +1162,10 @@ void Gdb_MI2::SyncAutos()
String expr = autos.Get(i, 0);
int idx = autosExpressions.Find(expr);
if(idx >= 0)
autos.Set(i, 1, "(" + autosTypes[idx] + ")" + autosValues[idx]);
{
autos.Set(i, 1, autosTypes[idx]);
autos.Set(i, 2, autosValues[idx]);
}
else
autos.Remove(i);
}