From f1160339c218710eff05ac94c49059b08833de1a Mon Sep 17 00:00:00 2001
From: 225038 <zhurbovaa@mail.ru>
Date: Sun, 11 Feb 2018 14:09:10 +0300
Subject: [PATCH] main-page changes

---
 src/app/main-page/main-page.component.html | 19 +++++++------------
 1 file changed, 7 insertions(+), 12 deletions(-)

diff --git a/src/app/main-page/main-page.component.html b/src/app/main-page/main-page.component.html
index 789bbb5..b584f8c 100644
--- a/src/app/main-page/main-page.component.html
+++ b/src/app/main-page/main-page.component.html
@@ -1,5 +1,3 @@
-
-
 <table>
   <tr>
     <td>
@@ -10,8 +8,6 @@
         </canvas>
       </div>
     </td>
-  </tr>
-  <tr>
     <td >
       <table style="margin-left: 10%; margin-top: 10%">
         <tr >Выберите X:</tr>
@@ -26,7 +22,9 @@
         <tr>Введите значение Y:</tr>
         <tr>
           <td>
-            <input pInputText id="inputY" style="margin-top: 2%; margin-bottom: 15%" type="number" value="0" [min]="-3" [max]="3" [(ngModel)]="point.yValue"/>
+            <input id="inputY" style="margin-top: 2%; margin-bottom: 15%"
+                   type="number" value="0" [min]="-3" [max]="3" [(ngModel)]="point.yValue"
+                    step="any" />
           </td>
           <td>
             <i id="inputError" style="visibility: hidden"> Неверно введено значение. Y задается от -3 до 3</i>
@@ -34,12 +32,9 @@
         </tr>
         <tr>Выберите R:</tr>
         <tr>
-          <td>
-            <mat-slider style="width: 100%; margin-top: 2%; margin-bottom: 15%" min="-3" max="5" step="0.5" value="2" [(ngModel)]="point.rValue"></mat-slider>
-          </td>
-          <td>
-            <i> R = {{point.rValue}}</i>
-          </td>
+
+          <mat-slider style="width: 100%; margin-top: 2%; margin-bottom: 15%" min="-3" max="5" step="1" [(ngModel)]="point.rValue" (change)="draw_graph()"></mat-slider>
+          <td>R = {{point.rValue}}</td>
         </tr>
         <tr>
           <button pButton label="Проверить"></button>
@@ -51,8 +46,8 @@
 </table>
 
 <div>
-
 </div>
+
 <table id="resultTable" style="border-collapse: collapse; visibility: hidden;
     width: 400px; text-align: center; margin-top: 5%; margin-left: 5%">
   <tr>