Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly
Sign up
Appearance settings

Commit 194e2b3

Browse files
resolvidoBugCalculadora
1 parent 1513ddc commit 194e2b3

File tree

11 files changed

+40
-44
lines changed

11 files changed

+40
-44
lines changed

‎.idea/workspace.xml

Lines changed: 15 additions & 15 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎__pycache__/calculadora.cpython-310.pyc

168 Bytes
Binary file not shown.

‎__pycache__/login.cpython-310.pyc

55 Bytes
Binary file not shown.

‎__pycache__/main.cpython-310.pyc

-130 Bytes
Binary file not shown.

‎__pycache__/noticias.cpython-310.pyc

4.17 KB
Binary file not shown.

‎calculadora.py

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
from PyQt5 import uic, QtWidgets, QtGui
2+
from PyQt5.QtWidgets import QMessageBox
23

34
valores = ''
45

@@ -149,8 +150,13 @@ def botao_ponto():
149150

150151
def botao_igual():
151152
global valores
152-
valores = str(eval(valores))
153-
tela_calculadora.label_display.setText(valores)
153+
154+
try:
155+
valores = str(eval(valores))
156+
except:
157+
QMessageBox.about(tela_calculadora, 'Erro!', 'Revise os valores.')
158+
finally:
159+
tela_calculadora.label_display.setText(valores)
154160

155161

156162
def botao_voltar():

‎login.py

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,8 @@ def cadastrar():
2727

2828
if usuario == '' or senha == '':
2929
QMessageBox.about(tela_login, 'Alerta', 'Insira usuário e senha.')
30+
if usuario in usuarios:
31+
QMessageBox.about(tela_login, 'Alerta', 'Usuário já Cadastrado.')
3032
else:
3133
tela_login.lineEdit_usuario.setText('')
3234
tela_login.lineEdit_senha.setText('')

‎main.py

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -36,8 +36,10 @@ def chamar_tela_login():
3636
tela_main.close()
3737

3838

39-
def chamar_tela_noticia():
40-
login.app.exec()
39+
def chamar_tela_noticias():
40+
import noticias
41+
noticias.tela_noticias.show()
42+
noticias.app.exec()
4143
tela_main.close()
4244

4345

@@ -51,7 +53,7 @@ def chamar_tela_noticia():
5153
tela_main.btn_gerarSenha.clicked.connect(chamar_gerar_senha)
5254
tela_main.btn_lista.clicked.connect(chamar_lista)
5355
tela_main.btn_telaLogin.clicked.connect(chamar_tela_login)
54-
tela_main.btn_noticias.clicked.connect(chamar_tela_noticia)
56+
tela_main.btn_noticias.clicked.connect(chamar_tela_noticias)
5557

5658
tela_main.show()
5759
app.exec()

‎noticias.py

Lines changed: 4 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -41,63 +41,53 @@ def buscar_noticias():
4141
def montar_listas_capitais():
4242
global capitais
4343
global estados
44+
4445
with open('arquivos/previsoes_capitais_brasil.txt', 'r', encoding="utf8") as arquivo_previsoes:
4546
capitais = arquivo_previsoes.read()
4647
capitais = json.loads(capitais)
47-
print(capitais)
48+
4849
with open('arquivos/capitais_estados.txt', 'r', encoding="utf8") as arquivo_capitais:
4950
estados = arquivo_capitais.read()
5051
estados = json.loads(estados)
51-
print(estados)
5252

5353

5454
def buscar_cotacao():
5555
global cotacao
56+
5657
cotacoes = requests.get('https://economia.awesomeapi.com.br/last/USD-BRL,EUR-BRL,BTC-BRL')
5758
cotacoes = cotacoes.json()
5859

5960
dolar = str(cotacoes['USDBRL']['bid'])
6061
dolar = dolar.replace('.', ',')
61-
print('Dolar Americano')
62-
print(f'R$ {dolar}')
6362

6463
euro = str(cotacoes['EURBRL']['bid'])
6564
euro = euro.replace('.', ',')
66-
print('Euro')
67-
print(f'R$ {euro}')
6865

6966
btc = str(cotacoes['BTCBRL']['bid'])
70-
print('Bitcoin')
71-
print(f'{btc} mil reais')
7267

7368
cotacao = f'Dólar Americano: R$ {dolar} - Euro: R$ {euro} - Bitcoin {btc} mil reais'
74-
print(cotacao)
7569

7670

7771
def montar_proverbios():
7872
global proverbios
73+
7974
with open('arquivos/proverbios.txt', 'r', encoding="utf8") as arquivo:
8075
proverbios = arquivo.readlines()
81-
print(random.choice(proverbios))
8276

8377

8478
def previsao_capital():
8579
consulta = tela_noticias.comboBox.currentText()
86-
print(consulta)
8780

8881
if consulta == 'CAPITAIS':
8982
tela_noticias.label_previsao.setText('Selecione uma Capital')
9083
tela_noticias.label_capital_estado.setText('Capital/Estado')
9184
else:
92-
print(consulta)
9385
for i, j in estados.items():
9486
if consulta in i:
9587
estado = j
9688
tela_noticias.label_capital_estado.setText(f'{consulta}/{estado}')
97-
print(f'{consulta}/{estado}')
9889

9990
consulta = capitais[consulta]
100-
print(consulta)
10191

10292
previsao = requests.get(consulta)
10393
previsao = previsao.json()
@@ -107,37 +97,29 @@ def previsao_capital():
10797
data = data[0]
10898
data = datetime.strptime(data, '%Y-%m-%d').date()
10999
data = datetime.strftime(data, '%d/%m/%Y')
110-
print(f'Data: {data}')
111100

112101
temp_min = previsao['daily']
113102
temp_min = temp_min['temperature_2m_min']
114103
temp_min = temp_min[0]
115-
print(f'Temperatura Mínima: {temp_min}')
116104

117105
temp_max = previsao['daily']
118106
temp_max = temp_max['temperature_2m_max']
119107
temp_max = temp_max[0]
120-
print(f'Temperatura Máxima: {temp_max}')
121108

122109
precipitacao = previsao['daily']
123110
precipitacao = precipitacao['precipitation_sum']
124111
precipitacao = precipitacao[0]
125-
print(f'Precipitação de chuva última hora: {precipitacao} mm')
126112

127113
tela_noticias.label_previsao.setText(f'Temperatura Mínima: {temp_min}\n'
128114
f'Temperatura Máxima: {temp_max}\n'
129115
f'Precipitação de chuva última hora: {precipitacao} mm')
130116

131117
data_hora = datetime.now()
132-
print(f'{data_hora.day}/{data_hora.month}/{data_hora.year}\n'
133-
f'{data_hora.hour}:{data_hora.minute}')
134118
tela_noticias.label_data_hora.setText((f'{data_hora.day}/{data_hora.month}/{data_hora.year}\n'
135119
f'{data_hora.hour}:{data_hora.minute}'))
136120

137121

138122
def chamar_atualizar():
139-
print(textos[random.choice(range(len(textos)))])
140-
print(cotacao)
141123
tela_noticias.label_noticias.setText(textos[random.choice(range(len(textos)))])
142124
tela_noticias.label_cotacao.setText(cotacao)
143125
tela_noticias.label_proverbio.setText(proverbios[random.choice(range(len(proverbios)))])

‎tela_main.ui

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -482,7 +482,10 @@ color: rgb(255, 255, 255);
482482
border-radius: 5px;</string>
483483
</property>
484484
<property name="text">
485-
<string> By Lorem Lorem </string>
485+
<string>eliezersilva.dev@gmail.com</string>
486+
</property>
487+
<property name="alignment">
488+
<set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
486489
</property>
487490
</widget>
488491
</item>

0 commit comments

Comments
(0)

AltStyle によって変換されたページ (->オリジナル) /