[yast-commit] r58125 - in /trunk/storage: package/yast2-storage.changes storage/src/include/ep-hd.ycp storage/src/include/ep-lib.ycp storage/src/include/ep-lvm.ycp

Author: aschnell Date: Wed Jul 22 12:22:14 2009 New Revision: 58125 URL: http://svn.opensuse.org/viewcvs/yast?rev=58125&view=rev Log: - moved generation of bargraph for partitions to separate function - added graphical representation of logical volumes of volume group Modified: trunk/storage/package/yast2-storage.changes trunk/storage/storage/src/include/ep-hd.ycp trunk/storage/storage/src/include/ep-lib.ycp trunk/storage/storage/src/include/ep-lvm.ycp Modified: trunk/storage/package/yast2-storage.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/package/yast2-storage.changes?rev=58125&r1=58124&r2=58125&view=diff ============================================================================== --- trunk/storage/package/yast2-storage.changes (original) +++ trunk/storage/package/yast2-storage.changes Wed Jul 22 12:22:14 2009 @@ -1,4 +1,9 @@ ------------------------------------------------------------------- +Wed Jul 22 11:46:56 CEST 2009 - aschnell@suse.de + +- added graphical representation of logical volumes of volume group + +------------------------------------------------------------------- Thu Jul 16 11:06:24 CEST 2009 - aschnell@suse.de - use new getPartitionName() from libstorage Modified: trunk/storage/storage/src/include/ep-hd.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/storage/src/include/ep-hd.ycp?rev=58125&r1=58124&r2=58125&view=diff ============================================================================== --- trunk/storage/storage/src/include/ep-hd.ycp (original) +++ trunk/storage/storage/src/include/ep-hd.ycp Wed Jul 22 12:22:14 2009 @@ -271,92 +271,9 @@ ); } - term partitions_bargraph = `Empty(); - - if (UI::HasSpecialWidget(`BarGraph)) - { - map ddata = Storage::GetDisk(target_map, device); - - if (ddata["used_by_type"]:`UB_NONE == `UB_NONE) - { - list <integer> bits = []; - list <string> labels = []; - string emptyspace = _("Unpartitioned Space"); - - // Filter out extended partitions - list <map> partitions = (list <map>) filter ( map one_part, ddata["partitions"]:[], { - return ( (one_part["type"]:`none == `primary) || (one_part["type"]:`none == `logical) ); - }); - // and sort the remaining ones by start cyl - partitions = (list <map> ) sort (map m, map n, partitions, { - return Region::Start( m["region"]:[] ) < Region::Start( n["region"]:[] ); - }); - - // Clean disk (or 1 big extended partition) - if (isempty(partitions)) - { - bits = [100]; - labels = [ emptyspace + "\n" + Storage::KByteToHumanString(ddata["size_k"]:0)]; - } - else - { - integer i = 0; - integer part_count = size(partitions); - integer ccyl = 0; - integer endcyl = ddata["cyl_count"]:1; - - while(ccyl < endcyl) - { - map part = partitions[ i ]:$[]; - list <integer> region = partitions[ i, "region" ]:[]; - ccyl = Region::Start( region ); - integer next_cyl = 0; - - // this is the last partition in a row, look at the last cylinder of the disk - if ( (i+1) == part_count) - { - next_cyl = endcyl; - } - // somewhere in the middle, look where the next partition starts - else - { - next_cyl = Region::Start( partitions[ i+1, "region" ]:[] ); - } - - integer tmp = 100*Region::Length( region )/ddata["cyl_count"]:1; //in % - string descr = part["device"]:"" + "\n" + Storage::KByteToHumanString(part["size_k"]:0); - y2debug("this cyl: %1 text: %2 end cyl: %3 next cyl: %4", ccyl, descr, Region::End( region), next_cyl); - - // Guarantee some minimal share (1%) of total graph width to a segment - // It prevents small partitions e.g. swaps from disappearing completely - bits = add( bits, (tmp < 1) ? 1 : tmp ); - labels = add( labels, descr); - - // Now there is some xtra space between the end of this partition and the start of the next one - // or the end of the disk if - // 1. end +1th cyl is not the next one - // 2. end cyl is not the same as the next one (yeah, partitions may share a cylinder) - if ( ( Region::End( region ) != next_cyl ) && - ( (Region::End( region) + 1) != next_cyl ) - ) - { - integer tmp2 = 100*( next_cyl - Region::End(region))/ddata["cyl_count"]:1; - bits = add( bits, (tmp2 < 1) ? 1 : tmp2); - labels = add( labels, emptyspace + "\n" + Storage::ByteToHumanString( (next_cyl - Region::End(region)) * ddata["cyl_size"]:1)); - } - - ccyl = next_cyl; - i = i+1; - } - } - - partitions_bargraph = `BarGraph(`id(`bgraph), bits, labels); - } - } - UI::ReplaceWidget(`tab_panel, `VBox( - partitions_bargraph, + DiskBarGraph(device), `Table(`id(`table), `opt(`keepSorting, `notify, `notifyContextMenu), table_header, table_contents), `HBox( Modified: trunk/storage/storage/src/include/ep-lib.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/storage/src/include/ep-lib.ycp?rev=58125&r1=58124&r2=58125&view=diff ============================================================================== --- trunk/storage/storage/src/include/ep-lib.ycp (original) +++ trunk/storage/storage/src/include/ep-lib.ycp Wed Jul 22 12:22:14 2009 @@ -295,4 +295,119 @@ Storage::SetTargetMap(ti[0]:$[]); } } + + + term DiskBarGraph(string device) + { + if (!UI::HasSpecialWidget(`BarGraph)) + return `Empty(); + + map target_map = Storage::GetTargetMap(); + map disk = Storage::GetDisk(target_map, device); + + if (disk["used_by_type"]:`UB_NONE != `UB_NONE) + return `Empty(); + + list <integer> bits = []; + list <string> labels = []; + + void AddSegment(integer bit, string label, integer size_k) + { + // Guarantee some minimal share (1%) of total graph width to the segment. + // Prevents small partitions e.g. swaps from disappearing completely. + bits = add(bits, bit < 1 ? 1 : bit); + labels = add(labels, label + "\n" + Storage::KByteToHumanString(size_k)); + } + + switch (disk["type"]:`UNKNOWN) + { + case `CT_DISK: + case `CT_DMRAID: + case `CT_DMMULTIPATH: + { + string emptyspace = _("Unpartitioned Space"); + + // Filter out extended partitions + list <map> partitions = (list <map>) filter ( map one_part, disk["partitions"]:[], { + return ( (one_part["type"]:`none == `primary) || (one_part["type"]:`none == `logical) ); + }); + // and sort the remaining ones by start cyl + partitions = (list <map> ) sort (map m, map n, partitions, { + return Region::Start( m["region"]:[] ) < Region::Start( n["region"]:[] ); + }); + + // Clean disk (or 1 big extended partition) + if (isempty(partitions)) + { + bits = [100]; + labels = [ emptyspace + "\n" + Storage::KByteToHumanString(disk["size_k"]:0)]; + } + else + { + integer i = 0; + integer part_count = size(partitions); + integer ccyl = 0; + integer endcyl = disk["cyl_count"]:1; + + while (ccyl < endcyl) + { + map part = partitions[ i ]:$[]; + list <integer> region = partitions[ i, "region" ]:[]; + ccyl = Region::Start( region ); + integer next_cyl = 0; + + // this is the last partition in a row, look at the last cylinder of the disk + if ( (i+1) == part_count) + { + next_cyl = endcyl; + } + // somewhere in the middle, look where the next partition starts + else + { + next_cyl = Region::Start( partitions[ i+1, "region" ]:[] ); + } + + integer tmp = 100 * Region::Length(region) / disk["cyl_count"]:1; + y2debug("i:%1 this cyl:%2 end cyl:%3 next cyl:%4", i, ccyl, Region::End(region), next_cyl); + AddSegment(tmp, part["device"]:"", part["size_k"]:0); + + // Now there is some xtra space between the end of this partition and the start of the next one + // or the end of the disk if + // 1. end +1th cyl is not the next one + // 2. end cyl is not the same as the next one (yeah, partitions may share a cylinder) + if ( ( Region::End( region ) != next_cyl ) && + ( (Region::End( region) + 1) != next_cyl ) ) + { + integer tmp2 = 100*( next_cyl - Region::End(region))/disk["cyl_count"]:1; + AddSegment(tmp2, emptyspace, ((next_cyl - Region::End(region)) * disk["cyl_size"]:1) / 1024); + } + + ccyl = next_cyl; + i = i+1; + } + } + } + break; + + case `CT_LVM: + { + list <map> partitions = disk["partitions"]:[]; + + integer disk_size_k = disk["size_k"]:1; + integer disk_free_k = disk_size_k; + + foreach(map partition, partitions, { + integer size_k = partition["size_k"]:0; + disk_free_k = disk_free_k - size_k; + AddSegment(100 * size_k / disk_size_k, partition["device"]:"", size_k); + }); + + if (disk_free_k > 0) + AddSegment(100 * disk_free_k / disk_size_k, _("Unallocated Space"), disk_free_k); + } + break; + } + + return `BarGraph(bits, labels); + } } Modified: trunk/storage/storage/src/include/ep-lvm.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/storage/src/include/ep-lvm.ycp?rev=58125&r1=58124&r2=58125&view=diff ============================================================================== --- trunk/storage/storage/src/include/ep-lvm.ycp (original) +++ trunk/storage/storage/src/include/ep-lvm.ycp Wed Jul 22 12:22:14 2009 @@ -243,6 +243,7 @@ UI::ReplaceWidget(`tab_panel, `VBox( + DiskBarGraph(device), `Table(`id(`table), `opt(`keepSorting, `notify, `notifyContextMenu), table_header, table_contents), `HBox( -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org