gdaltools_about.diff
| python/plugins/GdalTools/tools/GdalTools_utils.py (working copy) | ||
|---|---|---|
| 603 | 603 |
# class which allows to create version objects and compare them |
| 604 | 604 |
class Version: |
| 605 | 605 |
def __init__(self, ver): |
| 606 |
self.vers = (0, 0, 0)
|
|
| 606 |
self.vers = ('0', '0', '0')
|
|
| 607 | 607 | |
| 608 | 608 |
if isinstance(ver, Version): |
| 609 | 609 |
self.vers = ver.vers |
| 610 | 610 |
elif isinstance(ver, tuple) or isinstance(ver, list): |
| 611 |
self.vers = tuple(ver)
|
|
| 611 |
self.vers = map(str, ver)
|
|
| 612 | 612 |
elif isinstance(ver, str) or isinstance(ver, QString): |
| 613 | 613 |
self.vers = self.string2vers(ver) |
| 614 | 614 | |
| 615 | 615 |
@staticmethod |
| 616 | 616 |
def string2vers(string): |
| 617 |
vers = [0, 0, 0]
|
|
| 617 |
vers = ['0', '0', '0']
|
|
| 618 | 618 | |
| 619 | 619 |
nums = str(string).split(".")
|
| 620 | 620 |
|
| 621 | 621 |
if len(nums) > 0: |
| 622 |
n = QString(nums[0]).remove( QRegExp( "[^0-9].*$" ) ) |
|
| 623 |
if not n.isEmpty(): |
|
| 624 |
vers[0] = int(n) |
|
| 622 |
vers[0] = nums[0] |
|
| 625 | 623 |
if len(nums) > 1: |
| 626 |
n = QString(nums[1]).remove( QRegExp( "[^0-9].*$" ) ) |
|
| 627 |
if not n.isEmpty(): |
|
| 628 |
vers[1] = int(n) |
|
| 624 |
vers[1] = nums[1] |
|
| 629 | 625 |
if len(nums) > 2: |
| 630 |
n = QString(nums[2]).remove( QRegExp( "[^0-9].*$" ) ) |
|
| 631 |
if not n.isEmpty(): |
|
| 632 |
vers[2] = int(n) |
|
| 626 |
vers[2] = nums[2] |
|
| 633 | 627 | |
| 634 | 628 |
return (vers[0], vers[1], vers[2]) |
| 635 | 629 | |
| python/plugins/GdalTools/tools/doAbout.py (working copy) | ||
|---|---|---|
| 7 | 7 | |
| 8 | 8 |
from ui_dialogAbout import Ui_GdalToolsAboutDialog as Ui_Dialog |
| 9 | 9 |
from GdalTools import version |
| 10 |
from GdalTools_utils import GdalConfig |
|
| 10 | 11 | |
| 11 | 12 |
class GdalToolsAboutDialog(QDialog, Ui_Dialog): |
| 12 | 13 | |
| ... | ... | |
| 17 | 18 | |
| 18 | 19 |
QObject.connect(self.btnWeb, SIGNAL("clicked()"), self.openWebsite)
|
| 19 | 20 | |
| 20 |
self.lblVersion.setText( version() ) |
|
| 21 |
self.lblVersion.setText( version() + "\n" + self.tr( "(using GDAL v. %1)" ).arg( str( GdalConfig.version() ) ) )
|
|
| 21 | 22 |
self.textEdit.setText(self.getText()) |
| 22 | 23 | |
| 23 | 24 |
def getText(self): |