From d24a29b5ca1046e35441167399bbe0da9b6044a6 Mon Sep 17 00:00:00 2001 From: risen Date: Sat, 1 Mar 2025 18:24:42 +0300 Subject: [PATCH] fff --- .gitignore | 3 +- Calc3D.py | 17 --- LICENSE | 9 -- README.md | 87 ------------ calc3d | Bin 16384 -> 16432 bytes calc3dui.py | 371 ------------------------------------------------- calculating.c | 50 +++++++ calculating.h | 12 ++ calculating.py | 49 ------- connection.py | 46 ------ del-preset.py | 63 --------- edit-preset.py | 58 -------- formula.py | 93 ------------- main.c | 75 ++++++++++ settings.py | 43 ------ setts.json | 15 -- texts.py | 76 ---------- update.py | 21 --- updates.py | 83 ----------- 19 files changed, 139 insertions(+), 1032 deletions(-) delete mode 100644 Calc3D.py delete mode 100644 LICENSE delete mode 100644 README.md mode change 100644 => 100755 calc3d delete mode 100644 calc3dui.py create mode 100644 calculating.c create mode 100644 calculating.h delete mode 100644 calculating.py delete mode 100644 connection.py delete mode 100644 del-preset.py delete mode 100644 edit-preset.py delete mode 100644 formula.py create mode 100644 main.c delete mode 100644 settings.py delete mode 100644 setts.json delete mode 100644 texts.py delete mode 100644 update.py delete mode 100644 updates.py diff --git a/.gitignore b/.gitignore index 9658d7a..f3eccb1 100644 --- a/.gitignore +++ b/.gitignore @@ -4,4 +4,5 @@ /dist Calc3D.spec /releases -*.ui \ No newline at end of file +*.ui +__pycache__ \ No newline at end of file diff --git a/Calc3D.py b/Calc3D.py deleted file mode 100644 index 64cc273..0000000 --- a/Calc3D.py +++ /dev/null @@ -1,17 +0,0 @@ -import sys -from PySide6.QtWidgets import QApplication, QMainWindow -from calc3dui import Ui_Calc3DbyRisen - - -class App(QMainWindow): - def __init__(self): - super(App, self).__init__() - self.ui = Ui_Calc3DbyRisen() - self.ui.setupUi(self) - - -if __name__ == '__main__': - app = QApplication(sys.argv) - window = App() - window.show() - sys.exit(app.exec()) diff --git a/LICENSE b/LICENSE deleted file mode 100644 index 229ca4a..0000000 --- a/LICENSE +++ /dev/null @@ -1,9 +0,0 @@ -MIT License - -Copyright (c) 2024 risen - -Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions: - -The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. \ No newline at end of file diff --git a/README.md b/README.md deleted file mode 100644 index 91e41ca..0000000 --- a/README.md +++ /dev/null @@ -1,87 +0,0 @@ -# Calc3D by Risen -Калькулятор Calc3D by Risen предназначен для быстрой оценки стоимости печати на 3D принтере, -исходя из стоимости пластика, веса, тарифа электроэнергии и прочего... - -## Содержание -- [Формула расчета](#формула-расчета) -- [Как скачать](#как-скачать) -- [FAQ](#faq) -- [Зачем это всё](#почему-я-решил-реализовать-этот-проект?) -- [Команда проекта](#команда-проекта) -- [Лицензия](#лицензия) -- -## Формула расчета - -``` -S = ((p/1000*t/60*h)+(md*d*st/mk)+(a+post))*x+mod -``` -где -``` - S - стоимость печати, руб. - p - мощность принтера, Вт - t - время печати, мин. - h - тариф на электроэнергию, кВт/ч - md - вес детали, гр. - d - множитель отбраковки. - st - стоимость катушки пластика, руб. - mk - вес пластика в катушке, гр. - a - амортизация принтера, руб. - post - стоимость постобработки, руб. - х - количество печатаемых дубликатов, шт. - mod - стоимость моделирования, руб -``` - - -## Как скачать -Переходим в раздел "Релизы" по это ссылке: [релизы](https://git.risenhome.xyz/risen/Calc3D_by_Risen/releases) - -Качаем последнюю версию, настраиваем свои параметры и пользуемся. - - -## FAQ -Раздел в процессе написания - -## Почему я решил реализовать этот проект? -Не нашел в интернете таких калькуляторов офлайн. Решил сделать для себя, заодно потренироваться в программировании. - - -## Команда проекта -Вы можете написать мне в личку в телеграм, если у Вас есть каие-то вопросы по работе калькулятора. - -- [Risen (Colin Robinson)](tg://resolve?domain=RisenYT) — разработчик-любитель - -## Лицензия -MIT -``` -Copyright (c) <2024> - -Данная лицензия разрешает лицам, получившим копию данного программного обеспечения и сопутствующей документации -(далее — Программное обеспечение), безвозмездно использовать Программное обеспечение без ограничений, включая -неограниченное право на использование, копирование, изменение, слияние, публикацию, распространение, сублицензирование -и/или продажу копий Программного обеспечения, а также лицам, которым предоставляется данное Программное обеспечение, -при соблюдении следующих условий: - -Указанное выше уведомление об авторском праве и данные условия должны быть включены во все копии или значимые части -данного Программного обеспечения. - -ДАННОЕ ПРОГРАММНОЕ ОБЕСПЕЧЕНИЕ ПРЕДОСТАВЛЯЕТСЯ «КАК ЕСТЬ», БЕЗ КАКИХ-ЛИБО ГАРАНТИЙ, ЯВНО ВЫРАЖЕННЫХ ИЛИ ПОДРАЗУМЕВАЕМЫХ, -ВКЛЮЧАЯ ГАРАНТИИ ТОВАРНОЙ ПРИГОДНОСТИ, СООТВЕТСТВИЯ ПО ЕГО КОНКРЕТНОМУ НАЗНАЧЕНИЮ И ОТСУТСТВИЯ НАРУШЕНИЙ, -НО НЕ ОГРАНИЧИВАЯСЬ ИМИ. НИ В КАКОМ СЛУЧАЕ АВТОРЫ ИЛИ ПРАВООБЛАДАТЕЛИ НЕ НЕСУТ ОТВЕТСТВЕННОСТИ ПО КАКИМ-ЛИБО ИСКАМ, -ЗА УЩЕРБ ИЛИ ПО ИНЫМ ТРЕБОВАНИЯМ, В ТОМ ЧИСЛЕ, ПРИ ДЕЙСТВИИ КОНТРАКТА, ДЕЛИКТЕ ИЛИ ИНОЙ СИТУАЦИИ, -ВОЗНИКШИМ ИЗ-ЗА ИСПОЛЬЗОВАНИЯ ПРОГРАММНОГО ОБЕСПЕЧЕНИЯ ИЛИ ИНЫХ ДЕЙСТВИЙ С ПРОГРАММНЫМ ОБЕСПЕЧЕНИЕМ. -``` -``` -Copyright (c) <2024> - -Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated -documentation files (the "Software"), to deal in the Software without restriction, including without limitation -the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, -and to permit persons to whom the Software is furnished to do so, subject to the following conditions: - -The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED -TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. -IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, -WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE -OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.``` \ No newline at end of file diff --git a/calc3d b/calc3d old mode 100644 new mode 100755 index efd055667422da56d36a41ffde085bc5c0b3f90d..4e1736d8f4e39fda77d5681adbeea874ba9ec5a6 GIT binary patch literal 16432 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 S+g;86_FI(3;tGQbR{RbIws9-~ literal 16384 zcmeI%O-sWt7zglV9aEIK-F6y0$CVXd*vXr978G`va|oVFtx?L>bZfKC9rfl%@)P)# zJeq8+;85^9{(&SUO`asb_7Zw?-HVi<$0UsdMIBaWoU=0`#u(SRtaFimYZuS{syREH zzg26W%sO~ywf)+Mu8<%A0SG_<0uX=z1Rwwb2tWV={} +#include + +// Объявления функций +double cost_prise(double p, double t, double h, double md, double d, double st, double mk, double am, double post, int x); +double calculating(double cost, double mod, double marg); +double amortization(double a, double t, double spi, int year); + +#endif // CALCULATING_H \ No newline at end of file diff --git a/calculating.py b/calculating.py deleted file mode 100644 index 877fd0f..0000000 --- a/calculating.py +++ /dev/null @@ -1,49 +0,0 @@ -def cost_prise(p, t, h, md, d, st, mk, am, post, x): - p = int(p) # номинальная мощность принтера - t = int(t) # время печати, в минутах!!! - h = float(h) # тариф электроэнергии - md = float(md) # вес детали - if float(d) < 1: - d = 1 - else: - d = float(d) # коэффициент выбраковки - st = float(st) # стоимость катушки - mk = float(mk) # вес катушки - am = float(am) # амортизация - try: - post = float(post) # постобработка - except ValueError: - post = 0 - try: - x = int(x) # количество экземпляров - except ValueError: - x = 1 - result = ((abs(p) / 1000) * (abs(t) / 60) * abs(h) * abs(x)) + (abs(md) * abs(d) * (abs(st) / abs(mk) * abs(x)) + abs(am) + abs(post) * abs(x)) - return round(result, 2) - - -def calculating(cost, mod, marg): - try: - mod = float(mod) # моделирование - except ValueError: - mod = 0 - try: - margin = float(marg) # процент наценки - except ValueError: - margin = 0 - result = (cost / 100 * margin + cost) + mod - return round(result, 2) - - -def amortization(a, t, spi, year): - if (year % 400 == 0) or (year % 100 != 0) and (year % 4 == 0): - minutes_in_year = 527040 / 2 - else: - minutes_in_year = 525600 / 2 - try: - year_norm = 100 / float(spi) - except ZeroDivisionError: - year_norm = 100 / 1 - year_am = float(a) / 100 * round(year_norm, 1) - am_per_minute = year_am / minutes_in_year * t - return round(am_per_minute, 2) diff --git a/connection.py b/connection.py deleted file mode 100644 index 6c9297f..0000000 --- a/connection.py +++ /dev/null @@ -1,46 +0,0 @@ -from PySide6 import QtWidgets, QtSql - - -class Data: - def __init__(self): - super(Data, self).__init__() - - def create_connection(self): - db = QtSql.QSqlDatabase.addDatabase('QSQLITE') - db.setDatabaseName('calc3d') - - if not db.open(): - QtWidgets.QMessageBox.critical(None, 'Error', 'Не найдена база данных калькулятора', - 'Cancel', - QtWidgets.QMessageBox.Cancel) - return False - - query = QtSql.QSqlQuery() - query.exec("CREATE TABLE IF NOT EXISTS printers (ID integer primary key autoincrement," - "Printer_name VARCHAR(30) unique, Price_printer integer, Printer_power integer, kilowatt_price)") - return True - - def execute_query_with_params(self, sql_query, query_values=None): - query = QtSql.QSqlQuery() - query.prepare(sql_query) - - if query_values is not None: - for value in query_values: - query.addBindValue(query_values) - query.exec() - - - def add_settings(self, kilowatt_price, ): - pass - - def add_printer(self, printer_name, printer_power, price_printer): - sql_query = "INSERT INTO printers (Printer_name, Printer_power, Price_printer) VALUES (?, ?, ?)" - self.execute_query_with_params(sql_query, [printer_name, printer_power, price_printer]) - - def edit_printer(self, id, printer_name, printer_power, price_printer): - sql_query = "UPDATE printers SET Printer_name=?, Printer_power=?, Price_printer=? WHERE ID=?" - self.execute_query_with_params(sql_query, [id, printer_name, printer_power, price_printer]) - - def delete_printer(self, id): - sql_query = "DELETE FROM printers WHERE ID=?" - self.execute_query_with_params(sql_query, [id]) diff --git a/del-preset.py b/del-preset.py deleted file mode 100644 index 726acc1..0000000 --- a/del-preset.py +++ /dev/null @@ -1,63 +0,0 @@ -# -*- coding: utf-8 -*- - -################################################################################ -## Form generated from reading UI file 'Del_preset.ui' -## -## Created by: Qt User Interface Compiler version 6.8.1 -## -## WARNING! All changes made in this file will be lost when recompiling UI file! -################################################################################ - -from PySide6.QtCore import (QCoreApplication, QDate, QDateTime, QLocale, - QMetaObject, QObject, QPoint, QRect, - QSize, QTime, QUrl, Qt) -from PySide6.QtGui import (QBrush, QColor, QConicalGradient, QCursor, - QFont, QFontDatabase, QGradient, QIcon, - QImage, QKeySequence, QLinearGradient, QPainter, - QPalette, QPixmap, QRadialGradient, QTransform) -from PySide6.QtWidgets import (QApplication, QDialog, QHBoxLayout, QHeaderView, - QPushButton, QSizePolicy, QTableWidget, QTableWidgetItem, - QWidget) - -class Ui_Dialog(object): - def setupUi(self, Dialog): - if not Dialog.objectName(): - Dialog.setObjectName(u"Dialog") - Dialog.resize(369, 347) - icon = QIcon() - icon.addFile(u"img/logo-1.png", QSize(), QIcon.Mode.Normal, QIcon.State.Off) - Dialog.setWindowIcon(icon) - self.tableWidget = QTableWidget(Dialog) - self.tableWidget.setObjectName(u"tableWidget") - self.tableWidget.setGeometry(QRect(20, 20, 321, 271)) - self.tableWidget.setStyleSheet(u"background-color: rgb(36, 36, 36);") - self.widget = QWidget(Dialog) - self.widget.setObjectName(u"widget") - self.widget.setGeometry(QRect(12, 310, 331, 27)) - self.horizontalLayout = QHBoxLayout(self.widget) - self.horizontalLayout.setObjectName(u"horizontalLayout") - self.horizontalLayout.setContentsMargins(0, 0, 0, 0) - self.pushButton = QPushButton(self.widget) - self.pushButton.setObjectName(u"pushButton") - self.pushButton.setStyleSheet(u"background-color: rgb(0, 80, 0);") - - self.horizontalLayout.addWidget(self.pushButton) - - self.pushButton_2 = QPushButton(self.widget) - self.pushButton_2.setObjectName(u"pushButton_2") - self.pushButton_2.setStyleSheet(u"background-color: rgb(0, 80, 0);") - - self.horizontalLayout.addWidget(self.pushButton_2) - - - self.retranslateUi(Dialog) - - QMetaObject.connectSlotsByName(Dialog) - # setupUi - - def retranslateUi(self, Dialog): - Dialog.setWindowTitle(QCoreApplication.translate("Dialog", u"\u0423\u0434\u0430\u043b\u0438\u0442\u044c \u043f\u0440\u0435\u0441\u0435\u0442", None)) - self.pushButton.setText(QCoreApplication.translate("Dialog", u"\u0423\u0434\u0430\u043b\u0438\u0442\u044c", None)) - self.pushButton_2.setText(QCoreApplication.translate("Dialog", u"\u0417\u0430\u043a\u0440\u044b\u0442\u044c", None)) - # retranslateUi - diff --git a/edit-preset.py b/edit-preset.py deleted file mode 100644 index 6c3c907..0000000 --- a/edit-preset.py +++ /dev/null @@ -1,58 +0,0 @@ -# -*- coding: utf-8 -*- - -################################################################################ -## Form generated from reading UI file 'Edit_presset.ui' -## -## Created by: Qt User Interface Compiler version 6.8.1 -## -## WARNING! All changes made in this file will be lost when recompiling UI file! -################################################################################ - -from PySide6.QtCore import (QCoreApplication, QDate, QDateTime, QLocale, - QMetaObject, QObject, QPoint, QRect, - QSize, QTime, QUrl, Qt) -from PySide6.QtGui import (QBrush, QColor, QConicalGradient, QCursor, - QFont, QFontDatabase, QGradient, QIcon, - QImage, QKeySequence, QLinearGradient, QPainter, - QPalette, QPixmap, QRadialGradient, QTransform) -from PySide6.QtWidgets import (QApplication, QDialog, QHBoxLayout, QPushButton, - QSizePolicy, QWidget) - -class Ui_Dialog(object): - def setupUi(self, Dialog): - if not Dialog.objectName(): - Dialog.setObjectName(u"Dialog") - Dialog.resize(369, 169) - icon = QIcon() - icon.addFile(u"img/logo-1.png", QSize(), QIcon.Mode.Normal, QIcon.State.Off) - Dialog.setWindowIcon(icon) - self.widget = QWidget(Dialog) - self.widget.setObjectName(u"widget") - self.widget.setGeometry(QRect(22, 130, 321, 27)) - self.horizontalLayout = QHBoxLayout(self.widget) - self.horizontalLayout.setObjectName(u"horizontalLayout") - self.horizontalLayout.setContentsMargins(0, 0, 0, 0) - self.pushButton = QPushButton(self.widget) - self.pushButton.setObjectName(u"pushButton") - self.pushButton.setStyleSheet(u"background-color: rgb(0, 80, 0);") - - self.horizontalLayout.addWidget(self.pushButton) - - self.pushButton_2 = QPushButton(self.widget) - self.pushButton_2.setObjectName(u"pushButton_2") - self.pushButton_2.setStyleSheet(u"background-color: rgb(0, 80, 0);") - - self.horizontalLayout.addWidget(self.pushButton_2) - - - self.retranslateUi(Dialog) - - QMetaObject.connectSlotsByName(Dialog) - # setupUi - - def retranslateUi(self, Dialog): - Dialog.setWindowTitle(QCoreApplication.translate("Dialog", u"\u0418\u0437\u043c\u0435\u043d\u0438\u0442\u044c \u043f\u0440\u0435\u0441\u0435\u0442", None)) - self.pushButton.setText(QCoreApplication.translate("Dialog", u"\u0421\u043e\u0445\u0440\u0430\u043d\u0438\u0442\u044c", None)) - self.pushButton_2.setText(QCoreApplication.translate("Dialog", u"\u0417\u0430\u043a\u0440\u044b\u0442\u044c", None)) - # retranslateUi - diff --git a/formula.py b/formula.py deleted file mode 100644 index 7ef5716..0000000 --- a/formula.py +++ /dev/null @@ -1,93 +0,0 @@ -# -*- coding: utf-8 -*- - -################################################################################ -## Form generated from reading UI file 'formula.ui' -## -## Created by: Qt User Interface Compiler version 6.8.1 -## -## WARNING! All changes made in this file will be lost when recompiling UI file! -################################################################################ - -from PySide6.QtCore import (QCoreApplication, QDate, QDateTime, QLocale, - QMetaObject, QObject, QPoint, QRect, - QSize, QTime, QUrl, Qt) -from PySide6.QtGui import (QBrush, QColor, QConicalGradient, QCursor, - QFont, QFontDatabase, QGradient, QIcon, - QImage, QKeySequence, QLinearGradient, QPainter, - QPalette, QPixmap, QRadialGradient, QTransform) -from PySide6.QtWidgets import (QApplication, QDialog, QLabel, QPushButton, - QSizePolicy, QWidget) - -class Ui_Dialog(object): - def setupUi(self, Dialog): - if not Dialog.objectName(): - Dialog.setObjectName(u"Dialog") - Dialog.resize(367, 377) - icon = QIcon() - icon.addFile(u"img/logo-1.png", QSize(), QIcon.Mode.Normal, QIcon.State.Off) - Dialog.setWindowIcon(icon) - self.label = QLabel(Dialog) - self.label.setObjectName(u"label") - self.label.setGeometry(QRect(100, 10, 171, 41)) - font = QFont() - font.setPointSize(9) - self.label.setFont(font) - self.label.setTextFormat(Qt.MarkdownText) - self.label.setAlignment(Qt.AlignLeading|Qt.AlignLeft|Qt.AlignTop) - self.label_2 = QLabel(Dialog) - self.label_2.setObjectName(u"label_2") - self.label_2.setGeometry(QRect(30, 50, 341, 21)) - font1 = QFont() - font1.setFamilies([u"Sans Serif"]) - font1.setPointSize(10) - font1.setBold(True) - font1.setKerning(False) - self.label_2.setFont(font1) - self.label_2.setAutoFillBackground(False) - self.label_2.setTextFormat(Qt.MarkdownText) - self.label_2.setScaledContents(True) - self.label_2.setAlignment(Qt.AlignLeading|Qt.AlignLeft|Qt.AlignTop) - self.label_2.setWordWrap(False) - self.label_3 = QLabel(Dialog) - self.label_3.setObjectName(u"label_3") - self.label_3.setGeometry(QRect(10, 80, 341, 281)) - font2 = QFont() - font2.setPointSize(10) - self.label_3.setFont(font2) - self.label_3.setTextFormat(Qt.MarkdownText) - self.label_3.setScaledContents(False) - self.label_3.setAlignment(Qt.AlignLeading|Qt.AlignLeft|Qt.AlignTop) - self.label_3.setWordWrap(True) - self.pushButton = QPushButton(Dialog) - self.pushButton.setObjectName(u"pushButton") - self.pushButton.setGeometry(QRect(100, 340, 161, 25)) - self.pushButton.setStyleSheet(u"background-color: rgb(0, 80, 0);") - - self.retranslateUi(Dialog) - - QMetaObject.connectSlotsByName(Dialog) - # setupUi - - def retranslateUi(self, Dialog): - Dialog.setWindowTitle(QCoreApplication.translate("Dialog", u"\u0424\u043e\u0440\u043c\u0443\u043b\u0430 \u0440\u0430\u0441\u0447\u0435\u0442\u0430", None)) - self.label.setText(QCoreApplication.translate("Dialog", u"## \u0424\u043e\u0440\u043c\u0443\u043b\u0430 \u0440\u0430\u0441\u0447\u0435\u0442\u0430", None)) - self.label_2.setText(QCoreApplication.translate("Dialog", u"S = ((p/1000*t/60*h)+(md*d*st/mk)+(a+post))*x+mod", None)) - self.label_3.setText(QCoreApplication.translate("Dialog", u"\u0433\u0434\u0435\n" -"```\n" -"S - \u0441\u0442\u043e\u0438\u043c\u043e\u0441\u0442\u044c \u043f\u0435\u0447\u0430\u0442\u0438, \u0440\u0443\u0431.\n" -"p - \u043c\u043e\u0449\u043d\u043e\u0441\u0442\u044c \u043f\u0440\u0438\u043d\u0442\u0435\u0440\u0430, \u0412\u0442\n" -"t - \u0432\u0440\u0435\u043c\u044f \u043f\u0435\u0447\u0430\u0442\u0438, \u043c\u0438\u043d.\n" -"h - \u0442\u0430\u0440\u0438\u0444 \u043d\u0430 \u044d\u043b\u0435\u043a\u0442\u0440\u043e\u044d\u043d\u0435\u0440\u0433\u0438\u044e, \u043a\u0412\u0442/\u0447\n" -"md - \u0432\u0435\u0441 \u0434\u0435\u0442\u0430\u043b\u0438, \u0433\u0440.\n" -"d - \u043c\u043d\u043e\u0436\u0438\u0442\u0435\u043b\u044c \u043e\u0442\u0431\u0440\u0430\u043a\u043e\u0432\u043a\u0438.\n" -"st - \u0441\u0442\u043e\u0438\u043c\u043e\u0441\u0442\u044c \u043a\u0430\u0442\u0443\u0448\u043a\u0438 \u043f\u043b\u0430\u0441\u0442\u0438\u043a\u0430, \u0440\u0443\u0431.\n" -"mk - \u0432\u0435\u0441 \u043f\u043b\u0430\u0441\u0442\u0438\u043a\u0430 \u0432 \u043a\u0430\u0442\u0443\u0448" - "\u043a\u0435, \u0433\u0440.\n" -"a - \u0430\u043c\u043e\u0440\u0442\u0438\u0437\u0430\u0446\u0438\u044f \u043f\u0440\u0438\u043d\u0442\u0435\u0440\u0430, \u0440\u0443\u0431.\n" -"post - \u0441\u0442\u043e\u0438\u043c\u043e\u0441\u0442\u044c \u043f\u043e\u0441\u0442\u043e\u0431\u0440\u0430\u0431\u043e\u0442\u043a\u0438, \u0440\u0443\u0431.\n" -"\u0445 - \u043a\u043e\u043b\u0438\u0447\u0435\u0441\u0442\u0432\u043e \u043f\u0435\u0447\u0430\u0442\u0430\u0435\u043c\u044b\u0445 \u0434\u0443\u0431\u043b\u0438\u043a\u0430\u0442\u043e\u0432, \u0448\u0442.\n" -"mod - \u0441\u0442\u043e\u0438\u043c\u043e\u0441\u0442\u044c \u043c\u043e\u0434\u0435\u043b\u0438\u0440\u043e\u0432\u0430\u043d\u0438\u044f, \u0440\u0443\u0431\n" -"```", None)) - self.pushButton.setText(QCoreApplication.translate("Dialog", u"\u0417\u0430\u043a\u0440\u044b\u0442\u044c", None)) - # retranslateUi - diff --git a/main.c b/main.c new file mode 100644 index 0000000..0be61d2 --- /dev/null +++ b/main.c @@ -0,0 +1,75 @@ +#include +#include +#include +#include +#include "calculating.h" // Подключаем заголовочный файл + +// Загрузка настроек (заглушка, нужно заменить на чтение из БД) +void load_settings(double *p, double *h, double *d, double *st, double *mk, double *a, double *spi, double *marge) { + *p = 270; // номинальная мощность принтера + *h = 3; // тариф электроэнергии + *d = 1.5; // коэффициент выбраковки + *st = 1500; // стоимость катушки + *mk = 1000; // вес катушки + *a = 15000; // амортизация + *spi = 3; // срок полезного использования + *marge = 150; // наценка +} + +int main() { + // Загрузка настроек + double p, h, d, st, mk, a, spi, marge; + load_settings(&p, &h, &d, &st, &mk, &a, &spi, &marge); + + // Ввод данных от пользователя + printf("Введите параметры для расчета:\n"); + + double hours, minutes; + printf("Время печати (часы): "); + scanf("%lf", &hours); + printf("Время печати (минуты): "); + scanf("%lf", &minutes); + + if (minutes > 60) { + hours += (int)(minutes / 60); + minutes = fmod(minutes, 60); // Используем fmod для остатка от деления + } + double t = hours * 60 + minutes; // Общее время в минутах + + double md; + printf("Масса детали (г): "); + scanf("%lf", &md); + + int x; + printf("Количество экземпляров (шт): "); + scanf("%d", &x); + + double mod; + printf("Моделирование (руб): "); + scanf("%lf", &mod); + + double post; + printf("Постобработка (руб): "); + scanf("%lf", &post); + + // Получение текущего года + time_t now = time(NULL); + struct tm *local = localtime(&now); + int year = local->tm_year + 1900; + + // Расчет амортизации + double am = amortization(a, t, spi, year); + + // Расчет себестоимости + double cost = cost_prise(p, t, h, md, d, st, mk, am, post, x); + + // Расчет итоговой стоимости + double result = calculating(cost, mod, marge); + + // Вывод результатов + printf("\nРезультаты расчета:\n"); + printf("Себестоимость: %.2f руб.\n", cost); + printf("Итоговая стоимость: %.2f руб.\n", result); + + return 0; +} \ No newline at end of file diff --git a/settings.py b/settings.py deleted file mode 100644 index adadaa0..0000000 --- a/settings.py +++ /dev/null @@ -1,43 +0,0 @@ -# -*- coding: utf-8 -*- - -################################################################################ -## Form generated from reading UI file 'Settings.ui' -## -## Created by: Qt User Interface Compiler version 6.8.1 -## -## WARNING! All changes made in this file will be lost when recompiling UI file! -################################################################################ - -from PySide6.QtCore import (QCoreApplication, QDate, QDateTime, QLocale, - QMetaObject, QObject, QPoint, QRect, - QSize, QTime, QUrl, Qt) -from PySide6.QtGui import (QBrush, QColor, QConicalGradient, QCursor, - QFont, QFontDatabase, QGradient, QIcon, - QImage, QKeySequence, QLinearGradient, QPainter, - QPalette, QPixmap, QRadialGradient, QTransform) -from PySide6.QtWidgets import (QApplication, QDialog, QPushButton, QSizePolicy, - QWidget) - -class Ui_Dialog(object): - def setupUi(self, Dialog): - if not Dialog.objectName(): - Dialog.setObjectName(u"Dialog") - Dialog.resize(369, 375) - icon = QIcon() - icon.addFile(u"img/logo-1.png", QSize(), QIcon.Mode.Normal, QIcon.State.Off) - Dialog.setWindowIcon(icon) - self.pushButton = QPushButton(Dialog) - self.pushButton.setObjectName(u"pushButton") - self.pushButton.setGeometry(QRect(100, 340, 161, 25)) - self.pushButton.setStyleSheet(u"background-color: rgb(0, 80, 0);") - - self.retranslateUi(Dialog) - - QMetaObject.connectSlotsByName(Dialog) - # setupUi - - def retranslateUi(self, Dialog): - Dialog.setWindowTitle(QCoreApplication.translate("Dialog", u"\u041d\u0430\u0441\u0442\u0440\u043e\u0439\u043a\u0438", None)) - self.pushButton.setText(QCoreApplication.translate("Dialog", u"\u0417\u0430\u043a\u0440\u044b\u0442\u044c", None)) - # retranslateUi - diff --git a/setts.json b/setts.json deleted file mode 100644 index 4c2ccf0..0000000 --- a/setts.json +++ /dev/null @@ -1,15 +0,0 @@ -{ - "settings": { - "theme": "Dark", - "p": "270", - "h": "3", - "d": "0", - "st": "1500", - "mk": "1000", - "a": "0", - "spi": "0", - "marge": "0", - "locale": "Ru", - "currency": "\u0440\u0443\u0431." - } -} \ No newline at end of file diff --git a/texts.py b/texts.py deleted file mode 100644 index 4cb6843..0000000 --- a/texts.py +++ /dev/null @@ -1,76 +0,0 @@ -import gettext -import json -import os - -if not os.path.isfile('setts.json'): - with open('setts.json', 'w') as file: - data = {"settings": {"theme": "Dark", - "p": "270", - "h": "3", - "d": "1.5", - "st": "1500", - "mk": "1000", - "a": "0", - "spi": "3", - "marg": "0", - "locale": "Ru", - "currency": "руб."}} - json.dump(data, file, indent=2) - -with open('setts.json') as file: - old_data = json.load(file) - if old_data['settings']["locale"] == 'English': - locale = 'en_US' - else: - locale = 'ru_RU' - -lang = gettext.translation('locale', localedir='locale', languages=[locale]) -lang.install() -_ = lang.gettext - -calc = (_("Формула расчета стоимости печати выглядит так:\n\n" - "S = ((p/1000*t/60*h)+(md*d*st/mk)+am+post))*x+mod\n\n" - "где:\n" - "S - стоимость печати, руб.\n" - "p - мощность принтера, Вт\n" - "t - время печати, мин.\n" - "h - тариф на электроэнергию, кВт/ч\n" - "md - вес детали, гр.\n" - "st - стоимость катушки пластика, руб.\n" - "mk - вес пластика в катушке, гр.\n" - "d - коэффициент выбраковки\n" - "am - амортизация, руб.\n" - "post - стоимость постобработки, руб.\n" - "х - количество печатаемых дубликатов, шт.\n" - "mod - стоимость моделирования, руб.\n\n" - "При этом в расчете вес детали, умножается на 1.5,\n" - "это сделано для выбраковки и тестовой печати," - "т.е. при калькуляции вес одной детали для печати\n" - "считается как 1,5 детали " - "Можете изменить этот пункт в настройках.\n\n")) - -about = (_("По вопросам и предложениям писать в телеграм на @RisenYT\n\n")) - -amortization_calc = (_('Как считается амортизация:\n\n' - 'Отчисления записываются \n' - 'частями в зависимости от времени \n' - 'печати конкретного изделия\n' - 'Рекомендую задавать СПИ (это время\n' - 'окупаемости принтера) 3 года.\n' - 'Калькулятор считает амортизацию в\n' - 'минуту и умножает на количество минут,\n' - 'которые принтер будет печатать.')) - -not_connect = (_('Невозможно проверить обновление.\n\n' - 'Отсутствует подключение к интернету\n' - 'или программа заблокирована фаерволом.\n\n' - 'Для продолжения работы нажмите "Ok"')) - -new_sets = (_('Задайте стоимость принтера, \n' - 'срок полезного использования\n' - 'в настройках амортизации\n')) - -new_marge = (_('Задайте процент желаемой наценки\n' - 'в настройках (можно просто проставить ноль)')) - -ver = '0.6.4' diff --git a/update.py b/update.py deleted file mode 100644 index 76f42eb..0000000 --- a/update.py +++ /dev/null @@ -1,21 +0,0 @@ -import requests -import webbrowser -import json -import gettext -from texts import ver - - -lang = gettext.translation('locale', localedir='locale', languages=[language()]) -lang.install() -_ = lang.gettext - - -def upd_check(): - with open('setts.json') as json_file: - data = json.load(json_file) - set_theme = data["settings"]["theme"] - - version_new = requests.get('https://risenhome.xyz/feed/Risen.json').json()["version"]["ver"] - version_old = ver - - diff --git a/updates.py b/updates.py deleted file mode 100644 index 1990915..0000000 --- a/updates.py +++ /dev/null @@ -1,83 +0,0 @@ -# -*- coding: utf-8 -*- - -################################################################################ -## Form generated from reading UI file 'Updates.ui' -## -## Created by: Qt User Interface Compiler version 6.8.1 -## -## WARNING! All changes made in this file will be lost when recompiling UI file! -################################################################################ - -from PySide6.QtCore import (QCoreApplication, QDate, QDateTime, QLocale, - QMetaObject, QObject, QPoint, QRect, - QSize, QTime, QUrl, Qt) -from PySide6.QtGui import (QBrush, QColor, QConicalGradient, QCursor, - QFont, QFontDatabase, QGradient, QIcon, - QImage, QKeySequence, QLinearGradient, QPainter, - QPalette, QPixmap, QRadialGradient, QTransform) -from PySide6.QtWidgets import (QApplication, QDialog, QHBoxLayout, QLabel, - QPushButton, QSizePolicy, QWidget) - -class Ui_Dialog(object): - def setupUi(self, Dialog): - if not Dialog.objectName(): - Dialog.setObjectName(u"Dialog") - Dialog.resize(368, 99) - icon = QIcon() - icon.addFile(u"img/logo-1.png", QSize(), QIcon.Mode.Normal, QIcon.State.Off) - Dialog.setWindowIcon(icon) - self.label = QLabel(Dialog) - self.label.setObjectName(u"label") - self.label.setGeometry(QRect(73, 0, 191, 31)) - font = QFont() - font.setPointSize(10) - self.label.setFont(font) - self.label_2 = QLabel(Dialog) - self.label_2.setObjectName(u"label_2") - self.label_2.setGeometry(QRect(70, 20, 191, 31)) - self.label_2.setFont(font) - self.label_3 = QLabel(Dialog) - self.label_3.setObjectName(u"label_3") - self.label_3.setGeometry(QRect(250, 10, 54, 17)) - font1 = QFont() - font1.setPointSize(10) - font1.setBold(True) - self.label_3.setFont(font1) - self.label_4 = QLabel(Dialog) - self.label_4.setObjectName(u"label_4") - self.label_4.setGeometry(QRect(250, 30, 54, 17)) - self.label_4.setFont(font1) - self.layoutWidget = QWidget(Dialog) - self.layoutWidget.setObjectName(u"layoutWidget") - self.layoutWidget.setGeometry(QRect(20, 60, 331, 27)) - self.horizontalLayout = QHBoxLayout(self.layoutWidget) - self.horizontalLayout.setObjectName(u"horizontalLayout") - self.horizontalLayout.setContentsMargins(0, 0, 0, 0) - self.pushButton = QPushButton(self.layoutWidget) - self.pushButton.setObjectName(u"pushButton") - self.pushButton.setStyleSheet(u"background-color: rgb(0, 80, 0);") - - self.horizontalLayout.addWidget(self.pushButton) - - self.pushButton_2 = QPushButton(self.layoutWidget) - self.pushButton_2.setObjectName(u"pushButton_2") - self.pushButton_2.setStyleSheet(u"background-color: rgb(0, 80, 0);") - - self.horizontalLayout.addWidget(self.pushButton_2) - - - self.retranslateUi(Dialog) - - QMetaObject.connectSlotsByName(Dialog) - # setupUi - - def retranslateUi(self, Dialog): - Dialog.setWindowTitle(QCoreApplication.translate("Dialog", u"Updates", None)) - self.label.setText(QCoreApplication.translate("Dialog", u"\u0412\u0430\u0448\u0430 \u0432\u0435\u0440\u0441\u0438\u044f:", None)) - self.label_2.setText(QCoreApplication.translate("Dialog", u"\u0412\u0435\u0440\u0441\u0438\u044f \u043d\u0430 \u0441\u0430\u0439\u0442\u0435:", None)) - self.label_3.setText(QCoreApplication.translate("Dialog", u"1.0.0", None)) - self.label_4.setText(QCoreApplication.translate("Dialog", u"1.0.0", None)) - self.pushButton.setText(QCoreApplication.translate("Dialog", u"\u041f\u0435\u0440\u0435\u0439\u0442\u0438 \u043d\u0430 \u0441\u0430\u0439\u0442", None)) - self.pushButton_2.setText(QCoreApplication.translate("Dialog", u"\u0417\u0430\u043a\u0440\u044b\u0442\u044c", None)) - # retranslateUi -