From 8ab512dfab2e42bfc55aeb86aabe905e315366f4 Mon Sep 17 00:00:00 2001 From: gavin <2861484755@qq.com> Date: Thu, 30 Mar 2017 18:18:54 +0800 Subject: [PATCH 1/8] test --- calc.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/calc.py b/calc.py index aa11120..271c05e 100644 --- a/calc.py +++ b/calc.py @@ -60,6 +60,8 @@ class Calc(QMainWindow): print '我被点击了dot===' def calc_clear(self): print '我被点击了clear===' + + if __name__ == '__main__': app = QApplication(sys.argv) calc = Calc() -- Gitee From 1dd76406ebfb3b3d406b1597e54c303fbd92edd2 Mon Sep 17 00:00:00 2001 From: gavin <2861484755@qq.com> Date: Thu, 30 Mar 2017 19:34:48 +0800 Subject: [PATCH 2/8] ssss --- aa.txt | 0 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 aa.txt diff --git a/aa.txt b/aa.txt new file mode 100644 index 0000000..e69de29 -- Gitee From 1e04b56c4a99dbbcb7208a8a5e04723ece95e40e Mon Sep 17 00:00:00 2001 From: gavin <2861484755@qq.com> Date: Thu, 30 Mar 2017 19:37:18 +0800 Subject: [PATCH 3/8] del aa --- aa.txt | 0 1 file changed, 0 insertions(+), 0 deletions(-) delete mode 100644 aa.txt diff --git a/aa.txt b/aa.txt deleted file mode 100644 index e69de29..0000000 -- Gitee From bd197fc6054ccfbac2c6bc56c770140c8c2136bf Mon Sep 17 00:00:00 2001 From: gavin <2861484755@qq.com> Date: Thu, 30 Mar 2017 21:10:39 +0800 Subject: [PATCH 4/8] =?UTF-8?q?=E6=BC=94=E7=A4=BAsender()=E6=96=B9?= =?UTF-8?q?=E6=B3=95=E7=9A=84=E4=BD=BF=E7=94=A8=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- calc.py | 69 ++++++++++++++++----------------------------------------- 1 file changed, 19 insertions(+), 50 deletions(-) diff --git a/calc.py b/calc.py index 271c05e..1894ad0 100644 --- a/calc.py +++ b/calc.py @@ -1,4 +1,5 @@ #coding:utf-8 + import sys from PyQt5 import uic from PyQt5.QtWidgets import QApplication @@ -8,59 +9,27 @@ class Calc(QMainWindow): def __init__(self): QMainWindow.__init__(self) uic.loadUi('calc.ui',self) - self.pushButton0.clicked.connect(self.a) - self.pushButton1.clicked.connect(self.b) - self.pushButton2.clicked.connect(self.c) - self.pushButton3.clicked.connect(self.d) - self.pushButton4.clicked.connect(self.e) + self.pushButton0.clicked.connect(self.f) + self.pushButton1.clicked.connect(self.f) + self.pushButton2.clicked.connect(self.f) + self.pushButton3.clicked.connect(self.f) + self.pushButton4.clicked.connect(self.f) self.pushButton5.clicked.connect(self.f) - self.pushButton6.clicked.connect(self.g) - self.pushButton7.clicked.connect(self.h) - self.pushButton8.clicked.connect(self.k) - self.pushButton9.clicked.connect(self.m) - self.pushButton_clear.clicked.connect(self.calc_clear) - self.pushButton_add.clicked.connect(self.calc_add) - self.pushButton_sub.clicked.connect(self.calc_sub) - self.pushButton_div.clicked.connect(self.calc_div) - self.pushButton_mul.clicked.connect(self.calc_mul) - self.pushButton_dot.clicked.connect(self.calc_dot) - self.pushButton_equal.clicked.connect(self.calc_equal) + self.pushButton6.clicked.connect(self.f) + self.pushButton7.clicked.connect(self.f) + self.pushButton8.clicked.connect(self.f) + self.pushButton9.clicked.connect(self.f) + self.pushButton_clear.clicked.connect(self.f) + self.pushButton_add.clicked.connect(self.f) + self.pushButton_sub.clicked.connect(self.f) + self.pushButton_div.clicked.connect(self.f) + self.pushButton_mul.clicked.connect(self.f) + self.pushButton_dot.clicked.connect(self.f) + self.pushButton_equal.clicked.connect(self.f) - def a(self): - print '我被点击了0' - def b(self): - print '我被点击了1' - def c(self): - print '我被点击了2' - def d(self): - print '我被点击了3' - def e(self): - print '我被点击了4' def f(self): - print '我被点击了5' - def g(self): - print '我被点击了6' - def h(self): - print '我被点击了7' - def k(self): - print '我被点击了8' - def m(self): - print '我被点击了9' - def calc_add(self): - print '我被点击了add====' - def calc_sub(self): - print '我被点击了sub====' - def calc_div(self): - print '我被点击了div===' - def calc_mul(self): - print '我被点击了mul===' - def calc_equal(self): - print '我被点击了equal===' - def calc_dot(self): - print '我被点击了dot===' - def calc_clear(self): - print '我被点击了clear===' - + print self.sender().text() + if __name__ == '__main__': app = QApplication(sys.argv) -- Gitee From 911fbf6d940b9b6dd0521e997dffdab580a5ac6c Mon Sep 17 00:00:00 2001 From: gavin <2861484755@qq.com> Date: Fri, 31 Mar 2017 09:11:32 +0800 Subject: [PATCH 5/8] =?UTF-8?q?=E4=BD=BF=E7=94=A8map=E7=AE=80=E5=8C=96?= =?UTF-8?q?=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- calc.py | 39 ++++++++++++++++++++++----------------- 1 file changed, 22 insertions(+), 17 deletions(-) diff --git a/calc.py b/calc.py index 1894ad0..3ce83eb 100644 --- a/calc.py +++ b/calc.py @@ -9,23 +9,28 @@ class Calc(QMainWindow): def __init__(self): QMainWindow.__init__(self) uic.loadUi('calc.ui',self) - self.pushButton0.clicked.connect(self.f) - self.pushButton1.clicked.connect(self.f) - self.pushButton2.clicked.connect(self.f) - self.pushButton3.clicked.connect(self.f) - self.pushButton4.clicked.connect(self.f) - self.pushButton5.clicked.connect(self.f) - self.pushButton6.clicked.connect(self.f) - self.pushButton7.clicked.connect(self.f) - self.pushButton8.clicked.connect(self.f) - self.pushButton9.clicked.connect(self.f) - self.pushButton_clear.clicked.connect(self.f) - self.pushButton_add.clicked.connect(self.f) - self.pushButton_sub.clicked.connect(self.f) - self.pushButton_div.clicked.connect(self.f) - self.pushButton_mul.clicked.connect(self.f) - self.pushButton_dot.clicked.connect(self.f) - self.pushButton_equal.clicked.connect(self.f) + btns = [ + self.pushButton0, + self.pushButton1, + self.pushButton2, + self.pushButton3, + self.pushButton4, + self.pushButton5, + self.pushButton6, + self.pushButton7, + self.pushButton8, + self.pushButton9, + self.pushButton_clear, + self.pushButton_add, + self.pushButton_sub, + self.pushButton_div, + self.pushButton_mul, + self.pushButton_dot, + self.pushButton_equal + ] + map(lambda btn:btn.clicked.connect(self.f),btns) + + def f(self): print self.sender().text() -- Gitee From 05a3e8775a52313489f9cdb06b8e49738ff267c5 Mon Sep 17 00:00:00 2001 From: gavin <2861484755@qq.com> Date: Fri, 31 Mar 2017 11:15:08 +0800 Subject: [PATCH 6/8] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E8=AE=A1=E7=AE=97?= =?UTF-8?q?=E5=8A=9F=E8=83=BDcalculate=EF=BC=8C=E5=B9=B6=E5=AE=9E=E7=8E=B0?= =?UTF-8?q?calculate=EF=BC=9B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- calc.py | 43 +++++++++++++++++++++++++++++-------------- calc.ui | 2 +- 2 files changed, 30 insertions(+), 15 deletions(-) diff --git a/calc.py b/calc.py index 3ce83eb..09870bd 100644 --- a/calc.py +++ b/calc.py @@ -1,14 +1,23 @@ -#coding:utf-8 +# coding:utf-8 import sys from PyQt5 import uic -from PyQt5.QtWidgets import QApplication +from PyQt5.QtWidgets import QApplication from PyQt5.QtWidgets import QMainWindow + class Calc(QMainWindow): def __init__(self): QMainWindow.__init__(self) - uic.loadUi('calc.ui',self) + + self.x = None + self.y = None + self.result = None + self.operator = None + self.equal = None + self.clear = None + + uic.loadUi('calc.ui', self) btns = [ self.pushButton0, self.pushButton1, @@ -28,20 +37,26 @@ class Calc(QMainWindow): self.pushButton_dot, self.pushButton_equal ] - map(lambda btn:btn.clicked.connect(self.f),btns) + map(lambda btn: btn.clicked.connect(self.click_on_button), btns) - - - def f(self): + def calculate(self): + """ + 如果x、y、operater不为空，计算结果。 + """ + if self.x and self.y and self.operator: + self.result = str(eval("%s%s%s"%(self.x,self.operator,self.y))) + self.text_result.setText(self.result) + + def click_on_button(self): print self.sender().text() - - -if __name__ == '__main__': + + +if __name__ == '__main__': app = QApplication(sys.argv) calc = Calc() calc.show() + calc.x = '25' + calc.y = '2' + calc.operator = '*' + calc.calculate() app.exec_() - - - - diff --git a/calc.ui b/calc.ui index 69d1b64..12e7f52 100644 --- a/calc.ui +++ b/calc.ui @@ -372,7 +372,7 @@ 0 - + false -- Gitee From 3220913cc493b454a669ef91ce71ab0879d6600a Mon Sep 17 00:00:00 2001 From: gavin <2861484755@qq.com> Date: Fri, 31 Mar 2017 14:30:54 +0800 Subject: [PATCH 7/8] temp --- calc.py | 25 +++++++++++++++++++++++-- 1 file changed, 23 insertions(+), 2 deletions(-) diff --git a/calc.py b/calc.py index 09870bd..fb87771 100644 --- a/calc.py +++ b/calc.py @@ -44,11 +44,32 @@ class Calc(QMainWindow): 如果x、y、operater不为空，计算结果。 """ if self.x and self.y and self.operator: - self.result = str(eval("%s%s%s"%(self.x,self.operator,self.y))) + s = "%s%s%s"%(self.x,self.operator,self.y) + print s + self.result = str(eval(s)) self.text_result.setText(self.result) def click_on_button(self): - print self.sender().text() + value = self.sender().text() + # 如果点击的是数字，print该数字 + if value in "0123456789.": + print "您点击的数字是：",value + #如果点击的是运算符，print该运算符 + + # 如果点击的是=，print = + + # 若果点击的是clear，执行clear()方法 + + + + def clear(self): + pass + + + + + + if __name__ == '__main__': -- Gitee From 19370a61067830d1054d8007925d41aa955757fc Mon Sep 17 00:00:00 2001 From: gavin <2861484755@qq.com> Date: Fri, 31 Mar 2017 16:08:10 +0800 Subject: [PATCH 8/8] =?UTF-8?q?v0.1:=E5=AE=9E=E7=8E=B0=E6=9C=80=E7=AE=80?= =?UTF-8?q?=E5=8D=95=E7=9A=84=E5=9F=BA=E6=9C=AC=E8=BF=90=E7=AE=97=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- calc.py | 59 +++++++++++++++++++++++++++++++++++++++++---------------- calc.ui | 23 ++++++++++++---------- 2 files changed, 56 insertions(+), 26 deletions(-) diff --git a/calc.py b/calc.py index fb87771..e15ad9f 100644 --- a/calc.py +++ b/calc.py @@ -15,7 +15,7 @@ class Calc(QMainWindow): self.result = None self.operator = None self.equal = None - self.clear = None + uic.loadUi('calc.ui', self) btns = [ @@ -50,34 +50,61 @@ class Calc(QMainWindow): self.text_result.setText(self.result) def click_on_button(self): + + print "点击按钮前：" ,self.x,self.operator,self.y value = self.sender().text() + # 如果点击的是数字，print该数字 if value in "0123456789.": - print "您点击的数字是：",value + print "您点击的数字是:",value + try: + if self.operator is None: + # 如果点击的是数字的话，保存到x或追加到x + if self.x is None: + self.x = value + else: + self.x +=value + self.text_result.setText(self.x) + else: + if self.y is None: + self.y = value + else: + self.y +=value + self.text_result.setText(self.y) + except Exception, e: + print e + + + #如果点击的是运算符，print该运算符 + elif value in "+-*/": + print "print该运算符是：",value + self.operator = value + self.text_result.setText("") # 如果点击的是=，print = - # 若果点击的是clear，执行clear()方法 - + elif value == '=': + print "您点击的是=。" + self.calculate() + self.text_result.setText(self.result) + + # 若果点击的是clear，执行clear()方法 + else: + print "您点击的是C" + self.clear() + print "点击按钮后：" ,self.x,self.operator,self.y def clear(self): - pass - - - - - - - + self.x = None + self.y = None + self.result = None + self.operator = None + self.text_result.setText("") if __name__ == '__main__': app = QApplication(sys.argv) calc = Calc() calc.show() - calc.x = '25' - calc.y = '2' - calc.operator = '*' - calc.calculate() app.exec_() diff --git a/calc.ui b/calc.ui index 12e7f52..7c1fcb8 100644 --- a/calc.ui +++ b/calc.ui @@ -372,10 +372,7 @@ 0 - - - false - + 0 @@ -384,12 +381,18 @@ 41 - - - 15 - 75 - true - + + border:2px solid #676767; +font-size:28px; + + + 0 + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + Qt::LinksAccessibleByMouse|Qt::TextEditable|Qt::TextEditorInteraction|Qt::TextSelectableByKeyboard|Qt::TextSelectableByMouse -- Gitee