Skip to content

Commit

Permalink
Merge branch 'dev'
Browse files Browse the repository at this point in the history
  • Loading branch information
geugenm committed Dec 24, 2023
2 parents 4b99ec5 + 6ed5fc3 commit 602a8d9
Show file tree
Hide file tree
Showing 9 changed files with 69 additions and 147 deletions.
10 changes: 5 additions & 5 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,22 +1,22 @@
## Modernized computer applets for semiconductors course.

<div align="center">
<a href="https://github.com/rfapplets/modern-lab-comp-applets">
<a href="https://github.com/geugenm/modern-lab-applets">
<img src=".github/img/logo.png" alt="Logo" width="80" height="80">
</a>
<h3 align="center">Applets REMASTERED</h3>

<p align="center">
This repository has been established with the primary objective of enhancing the functionality of applets in 2023, ensuring seamless execution for all users, thereby facilitating a smooth and trouble-free experience.
<br />
<a href="/rfapplets/modern-lab-comp-applets/tree/master/docs"><strong>Explore the docs »</strong></a>
<a href="/geugenm/modern-lab-applets/tree/master/docs"><strong>Explore the docs »</strong></a>
<br />
<br />
<a href="https://rfapplets.github.io/src">Browse applets online</a>
<a href="https://www.acsu.buffalo.edu/~wie/applet/diffusion/diffusion.html">Test CheerpJ</a>
·
<a href="/rfapplets/modern-lab-comp-applets/issues">Report Bug</a>
<a href="/geugenm/modern-lab-applets/issues">Report Bug</a>
·
<a href="/rfapplets/modern-lab-comp-applets/issues">Request Feature</a>
<a href="/geugenm/modern-lab-applets/issues">Request Feature</a>
</p>
</div>

Expand Down
Binary file added res/app_icon.ico
Binary file not shown.
Binary file added res/setup_icon.ico
Binary file not shown.
48 changes: 0 additions & 48 deletions scripts/compile_to_exe.py

This file was deleted.

81 changes: 0 additions & 81 deletions scripts/create_release.py

This file was deleted.

52 changes: 52 additions & 0 deletions scripts/setup_script.iss
Original file line number Diff line number Diff line change
@@ -0,0 +1,52 @@
; Script generated by the Inno Setup Script Wizard.
; SEE THE DOCUMENTATION FOR DETAILS ON CREATING INNO SETUP SCRIPT FILES!

#define MyAppName "Àïïëåòû ïî êóðñó ÔÏèÏÏ"
#define MyAppVersion "1.4.0"
#define MyAppPublisher "ÐÔèÊÒ ÁÃÓ, êàôåäðà Ôèçè÷åñêîé Ýëåêòðîíèêè, "
#define MyAppURL "https://rfe.bsu.by/"
#define MyAppExeName "start_server.exe"

[Setup]
; NOTE: The value of AppId uniquely identifies this application. Do not use the same AppId value in installers for other applications.
; (To generate a new GUID, click Tools | Generate GUID inside the IDE.)
AppId={{626B5EAF-10C8-454B-9FAA-32350E3DA410}
AppName={#MyAppName}
AppVersion={#MyAppVersion}
;AppVerName={#MyAppName} {#MyAppVersion}
AppPublisher={#MyAppPublisher}
AppPublisherURL={#MyAppURL}
AppSupportURL={#MyAppURL}
AppUpdatesURL={#MyAppURL}
DefaultDirName={autopf}\{#MyAppName}
DisableProgramGroupPage=yes
LicenseFile=C:\Users\Evgeniy\Downloads\LICENSE
InfoBeforeFile=C:\Users\Evgeniy\Downloads\README [MConverter.eu].rtf
InfoAfterFile=C:\Users\Evgeniy\Downloads\README [MConverter.eu].rtf
; Remove the following line to run in administrative install mode (install for all users.)
PrivilegesRequired=lowest
OutputDir=C:\Users\Evgeniy\Downloads\123
OutputBaseFilename=release_win_amd64
SetupIconFile=C:\Users\Evgeniy\source\repos\modern-lab-comp-applets\res\setup_icon.ico
Compression=lzma
SolidCompression=yes
WizardStyle=modern

[Languages]
Name: "russian"; MessagesFile: "compiler:Languages\Russian.isl"

[Tasks]
Name: "desktopicon"; Description: "{cm:CreateDesktopIcon}"; GroupDescription: "{cm:AdditionalIcons}"; Flags: unchecked

[Files]
Source: "C:\Users\Evgeniy\source\repos\modern-lab-comp-applets\.build\{#MyAppExeName}"; DestDir: "{app}"; Flags: ignoreversion
Source: "C:\Users\Evgeniy\source\repos\modern-lab-comp-applets\.build\*"; DestDir: "{app}"; Flags: ignoreversion recursesubdirs createallsubdirs
; NOTE: Don't use "Flags: ignoreversion" on any shared system files

[Icons]
Name: "{autoprograms}\{#MyAppName}"; Filename: "{app}\{#MyAppExeName}"
Name: "{autodesktop}\{#MyAppName}"; Filename: "{app}\{#MyAppExeName}"; Tasks: desktopicon

[Run]
Filename: "{app}\{#MyAppExeName}"; Description: "{cm:LaunchProgram,{#StringChange(MyAppName, '&', '&&')}}"; Flags: nowait postinstall skipifsilent

14 changes: 7 additions & 7 deletions scripts/start_server_ui.py
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
from tkinter import ttk

# Constants
DEFAULT_PORT: int = 8080
DEFAULT_PORT: int = 25355
DEFAULT_DIRECTORY: str = "."
LOG_DIRECTORY: str = "logs/"
HTTP_PREFIX: str = "http://"
Expand Down Expand Up @@ -40,10 +40,10 @@ def stop_server(self):

# View
class ServerView:
WINDOW_TITLE: str = "Webassembly translation server"
START_BUTTON_TEXT: str = "Start"
STOP_BUTTON_TEXT: str = "Stop"
OPEN_URL_BUTTON_TEXT: str = "Open URL"
WINDOW_TITLE: str = "Сервер для лабораторных работ по ФПП"
START_BUTTON_TEXT: str = "Старт"
STOP_BUTTON_TEXT: str = "Стоп"
OPEN_URL_BUTTON_TEXT: str = "Открыть в браузере"
BUTTON_WIDTH: int = 12
BUTTON_FONT_SIZE: int = 15
WINDOW_HEIGHT: int = 100
Expand All @@ -69,8 +69,8 @@ def __init__(self, root: tk.Tk):

# Controller
class ServerController:
STATUS_ON: str = "STATUS: ON"
STATUS_OFF: str = "STATUS: OFF"
STATUS_ON: str = "СТАТУС: ВКЛ"
STATUS_OFF: str = "СТАТУС: ВЫКЛ"
GREEN: str = "green"
RED: str = "red"

Expand Down
7 changes: 3 additions & 4 deletions src/lab-5/ebers_moll_circuit.html
Original file line number Diff line number Diff line change
Expand Up @@ -77,13 +77,13 @@

section {
margin: 20px auto;
max-width: 500px;
max-width: 700px;
text-align: center;
}

object {
align-content: center;
width: 450px;
width: 700px;
height: 420px;
display: block;
margin: 20px auto;
Expand All @@ -103,13 +103,12 @@

<section>
<object ALIGN="middle"
HEIGHT="390" NAME="Applet" WIDTH="380" border=1
HEIGHT="390" NAME="Applet" WIDTH="580"
classid="clsid:8AD9C840-044E-11D1-B3E9-00805F499D93"
codebase="http://java.sun.com/products/plugin/1.2/jinstall-12-win32.cab#Version=1,2,0,0">
<PARAM NAME=CODE VALUE="BJTEquivalent.class">
<PARAM NAME=CODEBASE VALUE=".">
<PARAM NAME=ARCHIVE VALUE="bjtequi.jar">
<PARAM NAME=NAME VALUE="was translated by Androoha of RPh&E labs and now successfully">
<param name="type" value="application/x-java-applet;version=1.2">
<p class="error-message">
Для просмотра этой страницы необходима поддержка апплетов в вашем браузере.
Expand Down
4 changes: 2 additions & 2 deletions src/lab-5/pi_hybrid_model.html
Original file line number Diff line number Diff line change
Expand Up @@ -77,13 +77,13 @@

section {
margin: 20px auto;
max-width: 500px;
max-width: 700px;
text-align: center;
}

object {
align-content: center;
width: 450px;
width: 700px;
height: 420px;
display: block;
margin: 20px auto;
Expand Down

0 comments on commit 602a8d9

Please sign in to comment.