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/packageselectionpage.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/packageselectionpage.py')
-rwxr-xr-x | bitbake/lib/bb/ui/crumbs/packageselectionpage.py | 21 |
1 files changed, 5 insertions, 16 deletions
diff --git a/bitbake/lib/bb/ui/crumbs/packageselectionpage.py b/bitbake/lib/bb/ui/crumbs/packageselectionpage.py index 9a847c0f83..7926636e07 100755 --- a/bitbake/lib/bb/ui/crumbs/packageselectionpage.py +++ b/bitbake/lib/bb/ui/crumbs/packageselectionpage.py | |||
@@ -162,31 +162,20 @@ class PackageSelectionPage (HobPage): | |||
162 | self.builder.configuration.selected_packages = self.package_model.get_selected_packages() | 162 | self.builder.configuration.selected_packages = self.package_model.get_selected_packages() |
163 | self.builder.configuration.user_selected_packages = self.package_model.get_user_selected_packages() | 163 | self.builder.configuration.user_selected_packages = self.package_model.get_user_selected_packages() |
164 | selected_packages_num = len(self.builder.configuration.selected_packages) | 164 | selected_packages_num = len(self.builder.configuration.selected_packages) |
165 | selected_packages_size = float(self.package_model.get_packages_size()) | 165 | selected_packages_size = self.package_model.get_packages_size() |
166 | selected_packages_size_str = self._size_to_string(selected_packages_size) | 166 | selected_packages_size_str = HobPage._size_to_string(selected_packages_size) |
167 | 167 | ||
168 | image_overhead_factor = self.builder.configuration.image_overhead_factor | 168 | image_overhead_factor = self.builder.configuration.image_overhead_factor |
169 | image_rootfs_size = self.builder.configuration.image_rootfs_size | 169 | image_rootfs_size = self.builder.configuration.image_rootfs_size * 1024 # image_rootfs_size is KB |
170 | image_extra_size = self.builder.configuration.image_extra_size | 170 | image_extra_size = self.builder.configuration.image_extra_size * 1024 # image_extra_size is KB |
171 | base_size = image_overhead_factor * selected_packages_size | 171 | base_size = image_overhead_factor * selected_packages_size |
172 | image_total_size = max(base_size, image_rootfs_size) + image_extra_size | 172 | image_total_size = max(base_size, image_rootfs_size) + image_extra_size |
173 | image_total_size_str = self._size_to_string(image_total_size) | 173 | image_total_size_str = HobPage._size_to_string(image_total_size) |
174 | 174 | ||
175 | self.label.set_text("Packages included: %s\nSelected packages size: %s\nTotal image size: %s" % | 175 | self.label.set_text("Packages included: %s\nSelected packages size: %s\nTotal image size: %s" % |
176 | (selected_packages_num, selected_packages_size_str, image_total_size_str)) | 176 | (selected_packages_num, selected_packages_size_str, image_total_size_str)) |
177 | self.ins.show_indicator_icon("Included", selected_packages_num) | 177 | self.ins.show_indicator_icon("Included", selected_packages_num) |
178 | 178 | ||
179 | """ | ||
180 | Helper function to convert the package size to string format. | ||
181 | The unit of size is KB | ||
182 | """ | ||
183 | def _size_to_string(self, size): | ||
184 | if len(str(int(size))) > 3: | ||
185 | size_str = '%.1f' % (size*1.0/1024) + ' MB' | ||
186 | else: | ||
187 | size_str = str(size) + ' KB' | ||
188 | return size_str | ||
189 | |||
190 | def toggle_item_idle_cb(self, path): | 179 | def toggle_item_idle_cb(self, path): |
191 | if not self.package_model.path_included(path): | 180 | if not self.package_model.path_included(path): |
192 | self.package_model.include_item(item_path=path, binb="User Selected") | 181 | self.package_model.include_item(item_path=path, binb="User Selected") |