Calculimetr

This commit is contained in:
BarsTiger
2022-01-24 10:58:03 +02:00
parent 826a862fc4
commit 4d9dd84099
4 changed files with 14 additions and 3 deletions

2
.idea/lolCracks.iml generated
View File

@@ -2,7 +2,7 @@
<module type="PYTHON_MODULE" version="4"> <module type="PYTHON_MODULE" version="4">
<component name="NewModuleRootManager"> <component name="NewModuleRootManager">
<content url="file://$MODULE_DIR$" /> <content url="file://$MODULE_DIR$" />
<orderEntry type="jdk" jdkName="Python 3.9" jdkType="Python SDK" /> <orderEntry type="jdk" jdkName="Python 3.10" jdkType="Python SDK" />
<orderEntry type="sourceFolder" forTests="false" /> <orderEntry type="sourceFolder" forTests="false" />
</component> </component>
</module> </module>

2
.idea/misc.xml generated
View File

@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<project version="4"> <project version="4">
<component name="ProjectRootManager" version="2" project-jdk-name="Python 3.9" project-jdk-type="Python SDK" /> <component name="ProjectRootManager" version="2" project-jdk-name="Python 3.10" project-jdk-type="Python SDK" />
</project> </project>

View File

@@ -9,7 +9,10 @@ try:
except: except:
os.system('pip install -r requirements.txt') os.system('pip install -r requirements.txt')
try:
shutil.rmtree('dist') shutil.rmtree('dist')
except:
pass
os.system('pyinstaller --noconfirm --onedir --windowed "source/Calculimetr.py"') os.system('pyinstaller --noconfirm --onedir --windowed "source/Calculimetr.py"')
os.rename('dist/Calculimetr', 'dist/Calculimetr_build') os.rename('dist/Calculimetr', 'dist/Calculimetr_build')

View File

@@ -1,4 +1,5 @@
import sys import sys
import time
from typing import Union, Optional from typing import Union, Optional
from operator import add, sub, mul, truediv from operator import add, sub, mul, truediv
@@ -593,6 +594,13 @@ class Calculator(QMainWindow):
self.entry.setText(result) self.entry.setText(result)
self.adjust_entry_font_size() self.adjust_entry_font_size()
return result return result
elif self.get_math_sign() == '' and self.get_temp_num() == 1000 and self.get_entry_num() == 7:
result = 'ZXC GHOUL'
self.temp.setText(temp + self.remove_trailing_zeros(entry) + ' =')
self.adjust_temp_font_size()
self.entry.setText(result)
self.adjust_entry_font_size()
return result
else: else:
result = self.remove_trailing_zeros( result = self.remove_trailing_zeros(
str(operations[self.get_math_sign()](self.get_temp_num(), self.get_entry_num())) str(operations[self.get_math_sign()](self.get_temp_num(), self.get_entry_num()))