diff --git a/AccordionBus/AccordionBus/AccordionBus.csproj b/AccordionBus/AccordionBus/AccordionBus.csproj index af03d74..676957c 100644 --- a/AccordionBus/AccordionBus/AccordionBus.csproj +++ b/AccordionBus/AccordionBus/AccordionBus.csproj @@ -2,7 +2,7 @@ WinExe - net8.0-windows + net6.0-windows7.0 enable true enable diff --git a/AccordionBus/AccordionBus/DrawningAccordionBus.cs b/AccordionBus/AccordionBus/DrawningAccordionBus.cs index 5640a90..05ad09b 100644 --- a/AccordionBus/AccordionBus/DrawningAccordionBus.cs +++ b/AccordionBus/AccordionBus/DrawningAccordionBus.cs @@ -64,7 +64,7 @@ public class DrawningAccordionBus /// true - границы заданы, false - проверка не пройдена, нельзя public bool SetPictureSize(int width, int height) { - if (_drawningAccordionBusWidth < width || _drawningAccordionBusHeight < height) + if (_drawningAccordionBusWidth < width && _drawningAccordionBusHeight < height) { _pictureWidth = width; _pictureHeight = height; @@ -90,8 +90,8 @@ public class DrawningAccordionBus else { Random rnd = new Random(); - _startPosX = rnd.Next(0, 256); - _startPosY = rnd.Next(0, 256); + _startPosX = rnd.Next(0, _pictureWidth.Value - _drawningAccordionBusWidth); + _startPosY = rnd.Next(0, _pictureHeight.Value - _drawningAccordionBusHeight); } } public bool MoveTransport(DirectionType direction) @@ -112,12 +112,12 @@ public class DrawningAccordionBus return true; // вправо case DirectionType.Right: - if(_startPosX.Value + _drawningAccordionBusWidth < _pictureWidth) + if(_startPosX.Value + _drawningAccordionBusWidth + EntityAccordionBus.Step < _pictureWidth) _startPosX += (int)EntityAccordionBus.Step; return true; //вниз case DirectionType.Down: - if (_startPosY.Value + _drawningAccordionBusHeight < _pictureHeight) + if (_startPosY.Value + _drawningAccordionBusHeight+EntityAccordionBus.Step < _pictureHeight) _startPosY += (int)EntityAccordionBus.Step; return true; default: diff --git a/AccordionBus/AccordionBus/FormAccordionBus.resx b/AccordionBus/AccordionBus/FormAccordionBus.resx index 9abc7f6..1354db3 100644 --- a/AccordionBus/AccordionBus/FormAccordionBus.resx +++ b/AccordionBus/AccordionBus/FormAccordionBus.resx @@ -121,7 +121,7 @@ iVBORw0KGgoAAAANSUhEUgAAA5gAAAOYBAMAAABC5kGOAAAABGdBTUEAALGPC/xhBQAAABJQTFRF5ubm - AQEB////AAAAl5eXUFBQNT5ZuQAAAAlwSFlzAAAOwwAADsMBx2+oZAAAGoFJREFUeNrt3V168riyhmHH + AQEB////AAAAl5eXUFBQNT5ZuQAAAAlwSFlzAAAOwgAADsIBFShKgAAAGoFJREFUeNrt3V168riyhmHH 7AFE+NrnJss+j7ZWBgCMAJj/XDb6MfnikICDsVXlx0f9+qAb6b5UoSlZLtJVvsWLKDgWzISeWDATemLB TOiJBTOhJxbpTp1uESVHZkJRZCYURWZCUWQmFEVmQlFkJhRFZkJRZCYURWZCUWQmFEVmQlHUP9b/0T7A z6h6cCEa7QP8jKoH56/G7nQPsBcLze2+lXvXPcDPWGgeXLhO7qMuwFQRm8q6XQGmiripnHuvwVQRD9ZV @@ -241,7 +241,7 @@ iVBORw0KGgoAAAANSUhEUgAAA5gAAAOYBAMAAABC5kGOAAAABGdBTUEAALGPC/xhBQAAABJQTFRF5ubm - AQEB////AAAAl5eXUFBQNT5ZuQAAAAlwSFlzAAAOwwAADsMBx2+oZAAAF5dJREFUeNrtnW1urEjSRinU + AQEB////AAAAl5eXUFBQNT5ZuQAAAAlwSFlzAAAOwgAADsIBFShKgAAAF5dJREFUeNrtnW1urEjSRinU LACxAYSoBSDUCyh53gWUav97eZ2ZQJXd/qgPSCIeH/+YmdM98k2eo7hlRyaRRde1Rfrq0hfoFpGJTNAi IhOZoEV8/yqnfwQKIEkIIUkIIUkIIUkIIUkIIUkIIUkIIUkIIUkIIUkIIUkIIUkIIUkIIUnIIJuBOohM ZIIWEZnIBC0iMpEJWkRkIhO0iMhEJmgRkYlM0CIiE5mgRSzYDJRCkhBCkhBCkhBCkhBCkhBCkhBCkhBC @@ -348,7 +348,7 @@ iVBORw0KGgoAAAANSUhEUgAAA5gAAAOYBAMAAABC5kGOAAAABGdBTUEAALGPC/xhBQAAABJQTFRF5ubm - AQEB////AAAAl5eXUFBQNT5ZuQAAAAlwSFlzAAAOwwAADsMBx2+oZAAAGFFJREFUeNrt3c126jq2hmFj + AQEB////AAAAl5eXUFBQNT5ZuQAAAAlwSFlzAAAOwgAADsIBFShKgAAAGFFJREFUeNrt3c126jq2hmFj bgCjpK/4QB+VQr+GuYJi3f+9HCzZJFkrIRj8ozn10qn97UaNSM/QhG1NyUVRlHX8FPGTXtx5710VPz5+ FopV1SQ+V2DeGyswwQQzPUwHJphgggkmmGCCCSaYYIIJJphggskTIO2YDkwwZ4t1bbt/1f2b9OLuMomm m9xubpeKrkl5rsAcFD2YYIKZHqYBE0wwwQQTTDDBBBNMMMEEE0wwwQRTOSaP8zRhmrQx2c+8P1ZsToMJ @@ -458,7 +458,7 @@ iVBORw0KGgoAAAANSUhEUgAAA5gAAAOYBAMAAABC5kGOAAAABGdBTUEAALGPC/xhBQAAABJQTFRF5ubm - AQEB////AAAAl5eXUFBQNT5ZuQAAAAlwSFlzAAAOwwAADsMBx2+oZAAAF29JREFUeNrtnV1uG8myBhO9 + AQEB////AAAAl5eXUFBQNT5ZuQAAAAlwSFlzAAAOwgAADsIBFShKgAAAF29JREFUeNrtnV1uG8myBhO9 AjXKfCe4g0Kb7wPhLECQ7/7Xcln9Q8mWZyhKlLozGHw5EwJm3PkF0tSpqq6Mw/TZx/QRM6NJgNAkQGgS IDQJEJoECE0ChCYBQpMAoUmA0CRAaBIgNAkQmgQITQKGp083/0hMjGESHAyT4GCYBAfDJDgYJsHBMAkO hklwMEyCg2ESHAyT4GCYBAfDJDgYJsHBMAkOuhlIQpMAoUmA0CRAaBIgNAkQmgQITQKEJgFCkwChSYDQ