diff options
author | Shane Wang <shane.wang@intel.com> | 2012-04-02 16:29:17 +0800 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2012-04-05 18:48:07 +0100 |
commit | 5cad18b188cf51e31b9ae1ab5a1fd35eacf22d43 (patch) | |
tree | 11a8eb051bc869d455fc78bd11c51726f65d2f54 /bitbake/lib/bb/ui/crumbs/hoblistmodel.py | |
parent | b9accbb42a40e1ace0f9790a20712b821bb2b3f6 (diff) | |
download | poky-5cad18b188cf51e31b9ae1ab5a1fd35eacf22d43.tar.gz |
Hob: unify _size_to_string() and _string_to_size()
We call intsize_to_string (and string_to_intsize) in 3 different places.
We unify the implementations into one place.
(Bitbake rev: 578ce86a9ac2110f5b128aae582c6e0b3e739cec)
Signed-off-by: Shane Wang <shane.wang@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'bitbake/lib/bb/ui/crumbs/hoblistmodel.py')
-rw-r--r-- | bitbake/lib/bb/ui/crumbs/hoblistmodel.py | 18 |
1 files changed, 6 insertions, 12 deletions
diff --git a/bitbake/lib/bb/ui/crumbs/hoblistmodel.py b/bitbake/lib/bb/ui/crumbs/hoblistmodel.py index 5dddffa327..4934ba8ed8 100644 --- a/bitbake/lib/bb/ui/crumbs/hoblistmodel.py +++ b/bitbake/lib/bb/ui/crumbs/hoblistmodel.py | |||
@@ -22,6 +22,7 @@ | |||
22 | 22 | ||
23 | import gtk | 23 | import gtk |
24 | import gobject | 24 | import gobject |
25 | from bb.ui.crumbs.hobpages import HobPage | ||
25 | 26 | ||
26 | # | 27 | # |
27 | # PackageListModel | 28 | # PackageListModel |
@@ -175,10 +176,8 @@ class PackageListModel(gtk.TreeStore): | |||
175 | if pkgsize == "0" and not allow_empty: | 176 | if pkgsize == "0" and not allow_empty: |
176 | continue | 177 | continue |
177 | 178 | ||
178 | if len(pkgsize) > 3: | 179 | # pkgsize is in KB |
179 | size = '%.1f' % (int(pkgsize)*1.0/1024) + ' MB' | 180 | size = HobPage._size_to_string(HobPage._string_to_size(pkgsize + ' KB')) |
180 | else: | ||
181 | size = pkgsize + ' KB' | ||
182 | 181 | ||
183 | it = self.append(pniter) | 182 | it = self.append(pniter) |
184 | self.pkg_path[pkg] = self.get_path(it) | 183 | self.pkg_path[pkg] = self.get_path(it) |
@@ -391,7 +390,7 @@ class PackageListModel(gtk.TreeStore): | |||
391 | 390 | ||
392 | return packagelist | 391 | return packagelist |
393 | """ | 392 | """ |
394 | Return the selected package size, unit is KB. | 393 | Return the selected package size, unit is B. |
395 | """ | 394 | """ |
396 | def get_packages_size(self): | 395 | def get_packages_size(self): |
397 | packages_size = 0 | 396 | packages_size = 0 |
@@ -404,16 +403,11 @@ class PackageListModel(gtk.TreeStore): | |||
404 | if not str_size: | 403 | if not str_size: |
405 | continue | 404 | continue |
406 | 405 | ||
407 | unit = str_size.split() | 406 | packages_size += HobPage._string_to_size(str_size) |
408 | if unit[1] == 'MB': | ||
409 | size = float(unit[0])*1024 | ||
410 | else: | ||
411 | size = float(unit[0]) | ||
412 | packages_size += size | ||
413 | 407 | ||
414 | child_it = self.iter_next(child_it) | 408 | child_it = self.iter_next(child_it) |
415 | it = self.iter_next(it) | 409 | it = self.iter_next(it) |
416 | return "%f" % packages_size | 410 | return packages_size |
417 | 411 | ||
418 | """ | 412 | """ |
419 | Empty self.contents by setting the include of each entry to None | 413 | Empty self.contents by setting the include of each entry to None |