commit 638916a160bb7757264871f5edc746f93d24448d Author: erius Date: Sat Mar 4 16:51:17 2023 +0300 first commmit diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..b63da45 --- /dev/null +++ b/.gitignore @@ -0,0 +1,42 @@ +.gradle +build/ +!gradle/wrapper/gradle-wrapper.jar +!**/src/main/**/build/ +!**/src/test/**/build/ + +### IntelliJ IDEA ### +.idea/modules.xml +.idea/jarRepositories.xml +.idea/compiler.xml +.idea/libraries/ +*.iws +*.iml +*.ipr +out/ +!**/src/main/**/out/ +!**/src/test/**/out/ + +### Eclipse ### +.apt_generated +.classpath +.factorypath +.project +.settings +.springBeans +.sts4-cache +bin/ +!**/src/main/**/bin/ +!**/src/test/**/bin/ + +### NetBeans ### +/nbproject/private/ +/nbbuild/ +/dist/ +/nbdist/ +/.nb-gradle/ + +### VS Code ### +.vscode/ + +### Mac OS ### +.DS_Store \ No newline at end of file diff --git a/.idea/.gitignore b/.idea/.gitignore new file mode 100644 index 0000000..13566b8 --- /dev/null +++ b/.idea/.gitignore @@ -0,0 +1,8 @@ +# Default ignored files +/shelf/ +/workspace.xml +# Editor-based HTTP Client requests +/httpRequests/ +# Datasource local storage ignored files +/dataSources/ +/dataSources.local.xml diff --git a/.idea/artifacts/web_lab3_war_exploded.xml b/.idea/artifacts/web_lab3_war_exploded.xml new file mode 100644 index 0000000..3563dde --- /dev/null +++ b/.idea/artifacts/web_lab3_war_exploded.xml @@ -0,0 +1,13 @@ + + + $PROJECT_DIR$/out/artifacts/web_lab3_war_exploded + + + + + + + + + + \ No newline at end of file diff --git a/.idea/gradle.xml b/.idea/gradle.xml new file mode 100644 index 0000000..611e7c8 --- /dev/null +++ b/.idea/gradle.xml @@ -0,0 +1,17 @@ + + + + + + + \ No newline at end of file diff --git a/.idea/jsLibraryMappings.xml b/.idea/jsLibraryMappings.xml new file mode 100644 index 0000000..2a2cbd0 --- /dev/null +++ b/.idea/jsLibraryMappings.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/.idea/misc.xml b/.idea/misc.xml new file mode 100644 index 0000000..3baff1b --- /dev/null +++ b/.idea/misc.xml @@ -0,0 +1,10 @@ + + + + + + + + + + \ No newline at end of file diff --git a/.idea/uiDesigner.xml b/.idea/uiDesigner.xml new file mode 100644 index 0000000..2b63946 --- /dev/null +++ b/.idea/uiDesigner.xml @@ -0,0 +1,124 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/vcs.xml b/.idea/vcs.xml new file mode 100644 index 0000000..94a25f7 --- /dev/null +++ b/.idea/vcs.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/build.gradle b/build.gradle new file mode 100644 index 0000000..e90c9c8 --- /dev/null +++ b/build.gradle @@ -0,0 +1,36 @@ +plugins { + id 'java' + id 'war' +} + +group 'ru.erius' +version '1.0' + +repositories { + mavenCentral() +} + +ext { + junitVersion = '5.8.2' +} + +sourceCompatibility = '1.8' +targetCompatibility = '1.8' + +tasks.withType(JavaCompile) { + options.encoding = 'UTF-8' +} + +dependencies { + compileOnly('javax.persistence:javax.persistence-api:2.2') + compileOnly('javax.faces:javax.faces-api:2.3') + compileOnly('javax.enterprise:cdi-api:2.0.SP1') + compileOnly('org.primefaces:primefaces:11.0.0') + + testImplementation("org.junit.jupiter:junit-jupiter-api:${junitVersion}") + testRuntimeOnly("org.junit.jupiter:junit-jupiter-engine:${junitVersion}") +} + +test { + useJUnitPlatform() +} \ No newline at end of file diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar new file mode 100644 index 0000000..7454180 Binary files /dev/null and b/gradle/wrapper/gradle-wrapper.jar differ diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties new file mode 100644 index 0000000..aa991fc --- /dev/null +++ b/gradle/wrapper/gradle-wrapper.properties @@ -0,0 +1,5 @@ +distributionBase=GRADLE_USER_HOME +distributionPath=wrapper/dists +distributionUrl=https\://services.gradle.org/distributions/gradle-7.4.2-bin.zip +zipStoreBase=GRADLE_USER_HOME +zipStorePath=wrapper/dists diff --git a/gradlew b/gradlew new file mode 100644 index 0000000..1b6c787 --- /dev/null +++ b/gradlew @@ -0,0 +1,234 @@ +#!/bin/sh + +# +# Copyright © 2015-2021 the original authors. +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# https://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# + +############################################################################## +# +# Gradle start up script for POSIX generated by Gradle. +# +# Important for running: +# +# (1) You need a POSIX-compliant shell to run this script. If your /bin/sh is +# noncompliant, but you have some other compliant shell such as ksh or +# bash, then to run this script, type that shell name before the whole +# command line, like: +# +# ksh Gradle +# +# Busybox and similar reduced shells will NOT work, because this script +# requires all of these POSIX shell features: +# * functions; +# * expansions «$var», «${var}», «${var:-default}», «${var+SET}», +# «${var#prefix}», «${var%suffix}», and «$( cmd )»; +# * compound commands having a testable exit status, especially «case»; +# * various built-in commands including «command», «set», and «ulimit». +# +# Important for patching: +# +# (2) This script targets any POSIX shell, so it avoids extensions provided +# by Bash, Ksh, etc; in particular arrays are avoided. +# +# The "traditional" practice of packing multiple parameters into a +# space-separated string is a well documented source of bugs and security +# problems, so this is (mostly) avoided, by progressively accumulating +# options in "$@", and eventually passing that to Java. +# +# Where the inherited environment variables (DEFAULT_JVM_OPTS, JAVA_OPTS, +# and GRADLE_OPTS) rely on word-splitting, this is performed explicitly; +# see the in-line comments for details. +# +# There are tweaks for specific operating systems such as AIX, CygWin, +# Darwin, MinGW, and NonStop. +# +# (3) This script is generated from the Groovy template +# https://github.com/gradle/gradle/blob/master/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt +# within the Gradle project. +# +# You can find Gradle at https://github.com/gradle/gradle/. +# +############################################################################## + +# Attempt to set APP_HOME + +# Resolve links: $0 may be a link +app_path=$0 + +# Need this for daisy-chained symlinks. +while + APP_HOME=${app_path%"${app_path##*/}"} # leaves a trailing /; empty if no leading path + [ -h "$app_path" ] +do + ls=$( ls -ld "$app_path" ) + link=${ls#*' -> '} + case $link in #( + /*) app_path=$link ;; #( + *) app_path=$APP_HOME$link ;; + esac +done + +APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit + +APP_NAME="Gradle" +APP_BASE_NAME=${0##*/} + +# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' + +# Use the maximum available, or set MAX_FD != -1 to use that value. +MAX_FD=maximum + +warn () { + echo "$*" +} >&2 + +die () { + echo + echo "$*" + echo + exit 1 +} >&2 + +# OS specific support (must be 'true' or 'false'). +cygwin=false +msys=false +darwin=false +nonstop=false +case "$( uname )" in #( + CYGWIN* ) cygwin=true ;; #( + Darwin* ) darwin=true ;; #( + MSYS* | MINGW* ) msys=true ;; #( + NONSTOP* ) nonstop=true ;; +esac + +CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar + + +# Determine the Java command to use to start the JVM. +if [ -n "$JAVA_HOME" ] ; then + if [ -x "$JAVA_HOME/jre/sh/java" ] ; then + # IBM's JDK on AIX uses strange locations for the executables + JAVACMD=$JAVA_HOME/jre/sh/java + else + JAVACMD=$JAVA_HOME/bin/java + fi + if [ ! -x "$JAVACMD" ] ; then + die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." + fi +else + JAVACMD=java + which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." +fi + +# Increase the maximum file descriptors if we can. +if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then + case $MAX_FD in #( + max*) + MAX_FD=$( ulimit -H -n ) || + warn "Could not query maximum file descriptor limit" + esac + case $MAX_FD in #( + '' | soft) :;; #( + *) + ulimit -n "$MAX_FD" || + warn "Could not set maximum file descriptor limit to $MAX_FD" + esac +fi + +# Collect all arguments for the java command, stacking in reverse order: +# * args from the command line +# * the main class name +# * -classpath +# * -D...appname settings +# * --module-path (only if needed) +# * DEFAULT_JVM_OPTS, JAVA_OPTS, and GRADLE_OPTS environment variables. + +# For Cygwin or MSYS, switch paths to Windows format before running java +if "$cygwin" || "$msys" ; then + APP_HOME=$( cygpath --path --mixed "$APP_HOME" ) + CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" ) + + JAVACMD=$( cygpath --unix "$JAVACMD" ) + + # Now convert the arguments - kludge to limit ourselves to /bin/sh + for arg do + if + case $arg in #( + -*) false ;; # don't mess with options #( + /?*) t=${arg#/} t=/${t%%/*} # looks like a POSIX filepath + [ -e "$t" ] ;; #( + *) false ;; + esac + then + arg=$( cygpath --path --ignore --mixed "$arg" ) + fi + # Roll the args list around exactly as many times as the number of + # args, so each arg winds up back in the position where it started, but + # possibly modified. + # + # NB: a `for` loop captures its iteration list before it begins, so + # changing the positional parameters here affects neither the number of + # iterations, nor the values presented in `arg`. + shift # remove old arg + set -- "$@" "$arg" # push replacement arg + done +fi + +# Collect all arguments for the java command; +# * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of +# shell script including quotes and variable substitutions, so put them in +# double quotes to make sure that they get re-expanded; and +# * put everything else in single quotes, so that it's not re-expanded. + +set -- \ + "-Dorg.gradle.appname=$APP_BASE_NAME" \ + -classpath "$CLASSPATH" \ + org.gradle.wrapper.GradleWrapperMain \ + "$@" + +# Use "xargs" to parse quoted args. +# +# With -n1 it outputs one arg per line, with the quotes and backslashes removed. +# +# In Bash we could simply go: +# +# readarray ARGS < <( xargs -n1 <<<"$var" ) && +# set -- "${ARGS[@]}" "$@" +# +# but POSIX shell has neither arrays nor command substitution, so instead we +# post-process each arg (as a line of input to sed) to backslash-escape any +# character that might be a shell metacharacter, then use eval to reverse +# that process (while maintaining the separation between arguments), and wrap +# the whole thing up as a single "set" statement. +# +# This will of course break if any of these variables contains a newline or +# an unmatched quote. +# + +eval "set -- $( + printf '%s\n' "$DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS" | + xargs -n1 | + sed ' s~[^-[:alnum:]+,./:=@_]~\\&~g; ' | + tr '\n' ' ' + )" '"$@"' + +exec "$JAVACMD" "$@" diff --git a/gradlew.bat b/gradlew.bat new file mode 100644 index 0000000..107acd3 --- /dev/null +++ b/gradlew.bat @@ -0,0 +1,89 @@ +@rem +@rem Copyright 2015 the original author or authors. +@rem +@rem Licensed under the Apache License, Version 2.0 (the "License"); +@rem you may not use this file except in compliance with the License. +@rem You may obtain a copy of the License at +@rem +@rem https://www.apache.org/licenses/LICENSE-2.0 +@rem +@rem Unless required by applicable law or agreed to in writing, software +@rem distributed under the License is distributed on an "AS IS" BASIS, +@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +@rem See the License for the specific language governing permissions and +@rem limitations under the License. +@rem + +@if "%DEBUG%" == "" @echo off +@rem ########################################################################## +@rem +@rem Gradle startup script for Windows +@rem +@rem ########################################################################## + +@rem Set local scope for the variables with windows NT shell +if "%OS%"=="Windows_NT" setlocal + +set DIRNAME=%~dp0 +if "%DIRNAME%" == "" set DIRNAME=. +set APP_BASE_NAME=%~n0 +set APP_HOME=%DIRNAME% + +@rem Resolve any "." and ".." in APP_HOME to make it shorter. +for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi + +@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m" + +@rem Find java.exe +if defined JAVA_HOME goto findJavaFromJavaHome + +set JAVA_EXE=java.exe +%JAVA_EXE% -version >NUL 2>&1 +if "%ERRORLEVEL%" == "0" goto execute + +echo. +echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. +echo. +echo Please set the JAVA_HOME variable in your environment to match the +echo location of your Java installation. + +goto fail + +:findJavaFromJavaHome +set JAVA_HOME=%JAVA_HOME:"=% +set JAVA_EXE=%JAVA_HOME%/bin/java.exe + +if exist "%JAVA_EXE%" goto execute + +echo. +echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% +echo. +echo Please set the JAVA_HOME variable in your environment to match the +echo location of your Java installation. + +goto fail + +:execute +@rem Setup the command line + +set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar + + +@rem Execute Gradle +"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %* + +:end +@rem End local scope for the variables with windows NT shell +if "%ERRORLEVEL%"=="0" goto mainEnd + +:fail +rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of +rem the _cmd.exe /c_ return code! +if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1 +exit /b 1 + +:mainEnd +if "%OS%"=="Windows_NT" endlocal + +:omega diff --git a/settings.gradle b/settings.gradle new file mode 100644 index 0000000..756e1ea --- /dev/null +++ b/settings.gradle @@ -0,0 +1 @@ +rootProject.name = "web-lab3" \ No newline at end of file diff --git a/src/main/java/ru/erius/weblab3/data/HitInfo.java b/src/main/java/ru/erius/weblab3/data/HitInfo.java new file mode 100644 index 0000000..55f9119 --- /dev/null +++ b/src/main/java/ru/erius/weblab3/data/HitInfo.java @@ -0,0 +1,60 @@ +package ru.erius.weblab3.data; + +import java.io.Serializable; + +public class HitInfo implements Serializable { + + private float x; + private float y; + private float r = 1; + private boolean hit; + + public HitInfo() { + + } + + public HitInfo(float x, float y, float r, boolean hit) { + this.x = x; + this.y = y; + this.r = r; + this.hit = hit; + } + + public void hitCheck() { + setHit(x >= 0 && y >= 0 && x <= r && y <= r / 2 || + x <= 0 && y <= 0 && x * x + y * y <= r || + x >= 0 && y <= 0 && 2 * x - y <= r); + } + + public float getX() { + return x; + } + + public void setX(float x) { + this.x = x; + } + + public float getY() { + return y; + } + + public void setY(float y) { + this.y = y; + } + + public float getR() { + return r; + } + + public void setR(float r) { + this.r = r; + } + + public boolean isHit() { + return hit; + } + + public void setHit(boolean hit) { + this.hit = hit; + } +} diff --git a/src/main/java/ru/erius/weblab3/data/HitInfoBean.java b/src/main/java/ru/erius/weblab3/data/HitInfoBean.java new file mode 100644 index 0000000..aa286b1 --- /dev/null +++ b/src/main/java/ru/erius/weblab3/data/HitInfoBean.java @@ -0,0 +1,56 @@ +package ru.erius.weblab3.data; + +import javax.enterprise.context.ApplicationScoped; +import javax.enterprise.inject.Model; +import java.io.Serializable; +import java.util.ArrayList; +import java.util.List; + +@Model +@ApplicationScoped +public class HitInfoBean implements Serializable { + private List hitInfos = new ArrayList<>(); + private HitInfo latest = new HitInfo(); + private HitInfo plotLatest = new HitInfo(); + + public void plotAdd() { + plotLatest.hitCheck(); + HitInfo toAdd = new HitInfo(plotLatest.getX(), plotLatest.getY(), plotLatest.getR(), plotLatest.isHit()); + hitInfos.add(toAdd); + } + + public void add() { + latest.hitCheck(); + HitInfo toAdd = new HitInfo(latest.getX(), latest.getY(), latest.getR(), latest.isHit()); + hitInfos.add(toAdd); + } + + public void clear() { + hitInfos.clear(); + latest = new HitInfo(); + } + + public List getHitInfos() { + return hitInfos; + } + + public void setHitInfos(List hitInfos) { + this.hitInfos = hitInfos; + } + + public HitInfo getLatest() { + return latest; + } + + public void setLatest(HitInfo latest) { + this.latest = latest; + } + + public HitInfo getPlotLatest() { + return plotLatest; + } + + public void setPlotLatest(HitInfo plotLatest) { + this.plotLatest = plotLatest; + } +} diff --git a/src/main/resources/META-INF/beans.xml b/src/main/resources/META-INF/beans.xml new file mode 100644 index 0000000..575535b --- /dev/null +++ b/src/main/resources/META-INF/beans.xml @@ -0,0 +1,7 @@ + + + \ No newline at end of file diff --git a/src/main/resources/META-INF/persistence.xml b/src/main/resources/META-INF/persistence.xml new file mode 100644 index 0000000..625444a --- /dev/null +++ b/src/main/resources/META-INF/persistence.xml @@ -0,0 +1,9 @@ + + + + + + diff --git a/src/main/webapp/WEB-INF/beans.xml b/src/main/webapp/WEB-INF/beans.xml new file mode 100644 index 0000000..f5c6bb6 --- /dev/null +++ b/src/main/webapp/WEB-INF/beans.xml @@ -0,0 +1,7 @@ + + + diff --git a/src/main/webapp/WEB-INF/faces-config.xml b/src/main/webapp/WEB-INF/faces-config.xml new file mode 100644 index 0000000..299e28c --- /dev/null +++ b/src/main/webapp/WEB-INF/faces-config.xml @@ -0,0 +1,7 @@ + + + + \ No newline at end of file diff --git a/src/main/webapp/WEB-INF/jboss-web.xml b/src/main/webapp/WEB-INF/jboss-web.xml new file mode 100644 index 0000000..1fb5fbb --- /dev/null +++ b/src/main/webapp/WEB-INF/jboss-web.xml @@ -0,0 +1,4 @@ + + + /lab3 + diff --git a/src/main/webapp/WEB-INF/templates/footer.xhtml b/src/main/webapp/WEB-INF/templates/footer.xhtml new file mode 100644 index 0000000..df17802 --- /dev/null +++ b/src/main/webapp/WEB-INF/templates/footer.xhtml @@ -0,0 +1,8 @@ + + Исходники лабы +
+ 01/01/1900 00:00:00 +
+ + diff --git a/src/main/webapp/WEB-INF/templates/header.xhtml b/src/main/webapp/WEB-INF/templates/header.xhtml new file mode 100644 index 0000000..a5ad609 --- /dev/null +++ b/src/main/webapp/WEB-INF/templates/header.xhtml @@ -0,0 +1,5 @@ + + Капралов Егор Михайлович
+ P32101
+ Вариант - 3210179 + diff --git a/src/main/webapp/WEB-INF/templates/master.xhtml b/src/main/webapp/WEB-INF/templates/master.xhtml new file mode 100644 index 0000000..b0c3ac1 --- /dev/null +++ b/src/main/webapp/WEB-INF/templates/master.xhtml @@ -0,0 +1,34 @@ + + + + + + + + <ui:insert name="title">Лаба 3</ui:insert> + + + +
+ + + +
+
+
+ + + +
+
+ +
+
+
+ + + +
+ + \ No newline at end of file diff --git a/src/main/webapp/WEB-INF/templates/nav.xhtml b/src/main/webapp/WEB-INF/templates/nav.xhtml new file mode 100644 index 0000000..254d067 --- /dev/null +++ b/src/main/webapp/WEB-INF/templates/nav.xhtml @@ -0,0 +1,7 @@ + +
    +
    • +
    • +
+ diff --git a/src/main/webapp/WEB-INF/web.xml b/src/main/webapp/WEB-INF/web.xml new file mode 100644 index 0000000..63946c2 --- /dev/null +++ b/src/main/webapp/WEB-INF/web.xml @@ -0,0 +1,18 @@ + + + + Faces Servlet + javax.faces.webapp.FacesServlet + 1 + + + Faces Servlet + *.xhtml + + + index.xhtml + + \ No newline at end of file diff --git a/src/main/webapp/check_hit.xhtml b/src/main/webapp/check_hit.xhtml new file mode 100644 index 0000000..6d529fe --- /dev/null +++ b/src/main/webapp/check_hit.xhtml @@ -0,0 +1,60 @@ + + + + + Лаба 3 - График + +

График

+
+
+ + + + + + + + +
+
+ + Выберите X:
+ + + + + + + + +
+ Введите Y:
+ + +
+ Выберите R: + + + + + + +
+ + + + + + + +
+
+ +
+
+ + + diff --git a/src/main/webapp/index.xhtml b/src/main/webapp/index.xhtml new file mode 100644 index 0000000..1b32a7a --- /dev/null +++ b/src/main/webapp/index.xhtml @@ -0,0 +1,7 @@ + + Лаба 3 - Главная + +

Добро пожаловать!

+ + diff --git a/src/main/webapp/resources/css/master.css b/src/main/webapp/resources/css/master.css new file mode 100644 index 0000000..a367632 --- /dev/null +++ b/src/main/webapp/resources/css/master.css @@ -0,0 +1,107 @@ +html, body { + height: 100%; + width: 100%; + left: 0; + right: 0; + margin: 0; +} + +div { + border: 1px solid black; + border-right: none; + border-left: none; + font-size: 20px; +} + +canvas { + border: 1px solid black; + margin-top: 50%; +} + +.inputForm { + margin-top: 35%; +} + +.inputForm label { + margin-right: 5px; +} + +.container { + display: flex; + width: 100%; + min-height: 75%; +} + +.container div { + float: left; +} + +.header { + background-color: #ccc; + font-size: 32px; + font-family: cursive; + text-align: center; + width: 100%; +} + +.content { + display: flex; + background-color: #eee; + width: 100%; + border-left: 1px solid black; + border-right: 1px solid black; +} + +.content div { + border: none; +} + +.content table { + width: 100%; +} + +.content table, th, td { + border: 1px solid black; + border-collapse: collapse; + padding: 5px; + text-align: center; +} + +.nav { + border-top: none; + background-color: #ddd; + text-align: center; + font-weight: bold; + font-size: 32px; + border-right: 1px solid black; +} + +.nav ul { + list-style-type: none; + margin: 0; + padding: 0; + width: 200px; + background-color: #f1f1f1; +} + +.nav li a { + display: block; + color: #000; + padding: 8px 16px; + text-decoration: none; +} + +.nav li a:hover { + background-color: #555; + color: white; +} + +.clock { + border: none; +} + +.footer { + background-color: #ccc; + width: 100%; + min-height: 5%; +} diff --git a/src/main/webapp/resources/css/plot.css b/src/main/webapp/resources/css/plot.css new file mode 100644 index 0000000..ef73e7a --- /dev/null +++ b/src/main/webapp/resources/css/plot.css @@ -0,0 +1,19 @@ +.controls { + float: none; + top: 50%; +} + +.plot { + float: left; +} + +.results { + float: right; + overflow-y: scroll; +} + +.content-container { + width: 100%; + top: 10%; + display: flex; +} diff --git a/src/main/webapp/resources/js/clock.js b/src/main/webapp/resources/js/clock.js new file mode 100644 index 0000000..101dbb9 --- /dev/null +++ b/src/main/webapp/resources/js/clock.js @@ -0,0 +1,10 @@ +const clock = document.getElementById("clock"); + +showTime() +window.setInterval(showTime, 9000); + +function showTime() { + const options = { year: 'numeric', month: 'numeric', day: 'numeric' }; + const date = new Date(); + clock.innerText = date.toLocaleTimeString("ru-RU", options); +} diff --git a/src/main/webapp/resources/js/plot.js b/src/main/webapp/resources/js/plot.js new file mode 100644 index 0000000..489e279 --- /dev/null +++ b/src/main/webapp/resources/js/plot.js @@ -0,0 +1,118 @@ +const plot = document.getElementById('plot') +const plotCtx = plot.getContext('2d') + +const xPlotInput = document.getElementById('plotForm:xPlotValue') +const yPlotInput = document.getElementById('plotForm:yPlotValue') +const plotHit = document.getElementById('plotForm:plotHit') + +let [xPlot, yPlot] = [0, 0] +drawPlot() + +plot.addEventListener('mousedown', e => { + [xPlot, yPlot] = getMousePlotCoords(plot, e) + const r = getRValue() + const [x, y] = convertToServerCoordinates(xPlot, yPlot, r) + xPlotInput.value = x + yPlotInput.value = y +}) + +function drawLastHit() { + const hit = plotHit.value === 'true' + drawPoint(xPlot, yPlot, hit) +} + +function getMousePlotCoords(plot, event) { + const rect = plot.getBoundingClientRect() + const x = event.clientX - rect.left + const y = event.clientY - rect.top + return [x, y] +} + +function convertToServerCoordinates(xPlot, yPlot, r) { + const widthRatio = 2 * r / plot.width, heightRatio = 2 * r / plot.height + const x = xPlot * widthRatio - r, y = -(yPlot * heightRatio - r) + return [Math.round(x * 1000) / 1000, Math.round(y * 1000) / 1000] +} + +function drawPoint(xPlot, yPlot, hit) { + const color = hit ? 'green' : 'red' + plotCtx.strokeStyle = color + plotCtx.fillStyle = color + plotCtx.beginPath() + plotCtx.arc(xPlot, yPlot, 5, 0, 2 * Math.PI) + plotCtx.fill() + plotCtx.closePath() +} + +function drawPlot() { + const halfWidth = plot.width / 2, halfHeight = plot.height / 2 + const quarterWidth = halfWidth / 2, quarterHeight = halfHeight / 2 + plotCtx.clearRect(0, 0, plot.width, plot.height) + + plotCtx.strokeStyle = 'pink' + plotCtx.fillStyle = 'pink' + plotCtx.lineWidth = 1 + // 1st quadrant - rectangle + plotCtx.fillRect(halfWidth, quarterHeight, halfWidth, quarterHeight) + + // 3rd quadrant - circle quarter + plotCtx.beginPath() + plotCtx.arc(halfWidth, halfHeight, halfWidth, Math.PI / 2, Math.PI) + plotCtx.moveTo(0, halfHeight) + plotCtx.lineTo(halfWidth, halfHeight) + plotCtx.lineTo(halfWidth, plot.height) + plotCtx.fill() + plotCtx.closePath() + + // 4th quadrant - right triangle + plotCtx.beginPath() + plotCtx.moveTo(halfWidth, plot.height) + plotCtx.lineTo(halfWidth, halfHeight) + plotCtx.lineTo(3 * quarterWidth, halfHeight) + plotCtx.fill() + plotCtx.closePath() + + plotCtx.strokeStyle = 'gray' + plotCtx.beginPath() + for (let i = 0; i < 16; i++) { + const lineX = plot.width * i / 16, lineY = plot.height * i / 16 + plotCtx.moveTo(lineX, 0) + plotCtx.lineTo(lineX, plot.height) + plotCtx.moveTo(0, lineY) + plotCtx.lineTo(plot.width, lineY) + } + plotCtx.stroke() + plotCtx.closePath() + + plotCtx.strokeStyle = 'black' + plotCtx.fillStyle = 'black' + plotCtx.lineWidth = 3 + // x and y axis + plotCtx.beginPath() + plotCtx.moveTo(halfWidth, 0) + plotCtx.lineTo(halfWidth, plot.height) + plotCtx.moveTo(0, halfHeight) + plotCtx.lineTo(plot.width, halfHeight) + + // markings and labels + const labels = ['-R', '-R/2', '0', 'R/2', 'R'] + for (let i = 0; i <= 4; i++) { + if (i === 2) continue + const markingX = plot.width * i / 4, markingY = plot.height * (4 - i) / 4 + plotCtx.moveTo(markingX, halfHeight - 5) + plotCtx.lineTo(markingX, halfHeight + 5) + plotCtx.fillText(labels[i], markingX - 8 * (i - 2), halfHeight - 10, 20) + plotCtx.moveTo(halfWidth - 5, markingY) + plotCtx.lineTo(halfWidth + 5, markingY) + plotCtx.fillText(labels[i], halfWidth + 10, markingY + 8 * (i - 2), 20) + } + plotCtx.stroke() + plotCtx.closePath() +} + +function getRValue() { + for (let i = 0; i < 5; i++) { + const radio = document.getElementById(`inputForm:rValue:${i}`) + if (radio.checked) return radio.value + } +} diff --git a/src/main/webapp/results.xhtml b/src/main/webapp/results.xhtml new file mode 100644 index 0000000..9c3595a --- /dev/null +++ b/src/main/webapp/results.xhtml @@ -0,0 +1,22 @@ + + + + X + + + + Y + + + + R + + + + Попадание + + + +