From a1de6ca8cd6928d3e57c3b687ca8f84ee3d9b827 Mon Sep 17 00:00:00 2001 From: asamoukin Date: Wed, 3 Jun 2009 14:06:05 +0000 Subject: [PATCH] =?UTF-8?q?=D0=98=D0=B7=D0=BC=D0=B5=D0=BD=D0=B5=D0=BD?= =?UTF-8?q?=D1=8B=20=D0=BC=D0=B5=D1=82=D0=BE=D0=B4=D1=8B=20=D0=BF=D0=B5?= =?UTF-8?q?=D1=87=D0=B0=D1=82=D0=B8=20=D1=86=D0=B2=D0=B5=D1=82=D0=BD=D1=8B?= =?UTF-8?q?=D1=85=20=D1=81=D0=B8=D0=BC=D0=B2=D0=BE=D0=BB=D0=BE=D0=B2=20?= =?UTF-8?q?=D0=B2=20=D0=BA=D0=BE=D0=BD=D1=81=D0=BE=D0=BB=D0=B5,=20=D0=B4?= =?UTF-8?q?=D0=BE=D0=B1=D0=B0=D0=B2=D0=BB=D0=B5=D0=BD=D0=B0=20=D0=B2=D0=BE?= =?UTF-8?q?=D0=B7=D0=BC=D0=BE=D0=B6=D0=BD=D0=BE=D1=81=D1=82=D1=8C=20=D1=83?= =?UTF-8?q?=D0=BA=D0=B0=D0=B7=D1=8B=D0=B2=D0=B0=D1=82=D1=8C=20=D1=81=D0=BC?= =?UTF-8?q?=D0=B5=D1=89=D0=B5=D0=BD=D0=B8=D0=B5=20=D0=BE=D1=82=20=D0=BB?= =?UTF-8?q?=D0=B5=D0=B2=D0=BE=D0=B3=D0=BE=20=D0=BA=D1=80=D0=B0=D1=8F=20?= =?UTF-8?q?=D0=BA=D0=BE=D0=BD=D1=81=D0=BE=D0=BB=D0=B8,=20=D0=B0=20=D1=82?= =?UTF-8?q?=D0=B0=D0=BA=D0=B6=D0=B5=20=D0=B2=D0=BE=D0=B7=D0=BC=D0=BE=D0=B6?= =?UTF-8?q?=D0=BD=D0=BE=D1=81=D1=82=D1=8C=20=D0=BD=D0=B5=20=D0=BF=D0=B5?= =?UTF-8?q?=D1=87=D0=B0=D1=82=D0=B0=D1=82=D1=8C=20=D0=BF=D0=B5=D1=80=D0=B5?= =?UTF-8?q?=D0=B2=D0=BE=D0=B4=20=D1=81=D1=82=D1=80=D0=BE=D0=BA=D0=B8=20?= =?UTF-8?q?=D0=B2=20=D0=BA=D0=BE=D0=BD=D1=86=D0=B5=20=D1=81=D1=82=D1=80?= =?UTF-8?q?=D0=BE=D0=BA=D0=B8=20=D0=B2=D1=8B=D0=B2=D0=BE=D0=B4=D0=B0.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit git-svn-id: http://svn.calculate.ru/calculate2/calculate-lib/trunk@1621 c91db197-33c1-4113-bf15-f8a5c547ca64 --- pym/cl_utils2.py | 66 ++++++++++++++++++++++++++++++------------------ 1 file changed, 41 insertions(+), 25 deletions(-) diff --git a/pym/cl_utils2.py b/pym/cl_utils2.py index de5bafa..6e7bc3c 100644 --- a/pym/cl_utils2.py +++ b/pym/cl_utils2.py @@ -463,7 +463,7 @@ class cl_smartcon(object): sys.stdout.write(string) sys.stdout.flush() - def printLine(self, argL, argR): + def printLine(self, argL, argR, offsetL=0, printBR=True): """Печатает справа и слева консоли цветные сообщения""" #Допустимые цвета colorDict = {\ @@ -479,7 +479,7 @@ class cl_smartcon(object): 'yellowBr':self.yellowBrightPrint, } # cмещение от левого края консоли - offsetL = 0 + #offsetL = 0 for color,leftString in argL: offsetL += self.lenString(leftString) if colorDict.has_key(color): @@ -492,16 +492,18 @@ class cl_smartcon(object): for color,rightString in argR: offsetR += self.lenString(rightString) # Добавляем пробелы - self.printRight(offsetL, offsetR) - for color,rightString in argR: - if colorDict.has_key(color): - # печатаем и считаем смещение - colorDict[color](rightString) - else: - colorDict[''](rightString) - print "" + if offsetR: + self.printRight(offsetL, offsetR) + for color,rightString in argR: + if colorDict.has_key(color): + # печатаем и считаем смещение + colorDict[color](rightString) + else: + colorDict[''](rightString) + if printBR: + print "" - def printNotOK(self, string): + def printNotOK(self, string, offsetL=0, printBR=True): """Вывод на печать в случае сбоя""" self.printLine((('greenBr',' * '), ('',string), @@ -509,10 +511,17 @@ class cl_smartcon(object): (('blueBr','['), ('redBr',' !! '), ('blueBr',']'), - ) - ) + ), offsetL, printBR) + + def printOnlyNotOK(self, string, offsetL=0, printBR=True): + """Вывод на печать в случае сбоя""" + self.printLine((('', string),), + (('blueBr','['), + ('redBr',' !! '), + ('blueBr',']'), + ), offsetL, printBR) - def printOK(self, string): + def printOK(self, string, offsetL=0, printBR=True): """Вывод на печать в случае успеха""" self.printLine((('greenBr',' * '), ('',string), @@ -520,29 +529,36 @@ class cl_smartcon(object): (('blueBr','['), ('greenBr',' ok '), ('blueBr',']'), - ) - ) - def printWARNING(self, string): + ), offsetL, printBR) + + def printOnlyOK(self, string, offsetL=0, printBR=True): + """Вывод на печать в случае успеха""" + self.printLine((('',string),), + (('blueBr','['), + ('greenBr',' ok '), + ('blueBr',']'), + ), offsetL, printBR) + + def printWARNING(self, string, offsetL=0, printBR=True): """Вывод на печать предупреждения""" self.printLine((('yellowBr',' * '), ('',string), ), (('',''), - ) - ) - def printERROR(self, string): + ), offsetL, printBR) + + def printERROR(self, string, offsetL=0, printBR=True): """Вывод на печать предупреждения""" self.printLine((('redBr',' * '), ('',string), ), (('',''), - ) - ) - def printSUCCESS(self, string): + ), offsetL, printBR) + + def printSUCCESS(self, string, offsetL=0, printBR=True): """Вывод на печать в случае успеха без [ok] справа""" self.printLine((('greenBr',' * '), ('',string), ), (('',''), - ) - ) + ), offsetL, printBR)