From dd34aea664456d6cd7e464f7aad91ccb4244b4b6 Mon Sep 17 00:00:00 2001 From: Georgy Khatuncev Date: Tue, 18 May 2021 09:14:14 +0500 Subject: [PATCH] test --- .../netcoreapp3.1/Diagram-API.assets.cache | Bin 12414 -> 48 bytes .../Diagram-API.csprojAssemblyReference.cache | Bin 424 -> 203114 bytes .../GenerateVDPCycle.csproj.nuget.dgspec.json | 19 +- .../obj/GenerateVDPCycle.csproj.nuget.g.props | 5 +- .../GenerateVDPCycle.assets.cache | Bin 12390 -> 12524 bytes ...rateVDPCycle.csprojAssemblyReference.cache | Bin 424 -> 21780 bytes .../GenerateVDPCycle/obj/project.assets.json | 20 +- .../GenerateVDPCycle/obj/project.nuget.cache | 54 ++--- .../config/applicationhost.config | 2 +- Diagram-Canvas/.vs/DiagramCanvas/v16/.suo | Bin 25088 -> 26624 bytes Diagram-Canvas/DiagramStoveDll/Diagram.min.js | 2 +- .../DiagramStoveDll/NumberColumn.js | 2 +- .../DiagramStoveDll/ProcessColumn.js | 6 +- Diagram-Canvas/Test.js | 2 +- Diagram-Canvas/index.html | 2 +- Diagram-Canvas/index.js | 211 +++++++++++------- 16 files changed, 186 insertions(+), 139 deletions(-) diff --git a/Diagram-API/Diagram-API/obj/Release/netcoreapp3.1/Diagram-API.assets.cache b/Diagram-API/Diagram-API/obj/Release/netcoreapp3.1/Diagram-API.assets.cache index 46766ea1932e4916891f5a54db41e0b81c8d296b..139fbfd09859f1e35ef94179a3dc57b4b9c8aa83 100644 GIT binary patch literal 48 zcmZQzU})fCU|@(l=bp9hMC`)m+HY1H??38qm?&FycmMDHSu%ntz3(?NGB7YSfG_~m CJQFkk literal 12414 zcmdU#OOw=86vq$9fQa%Ge1SBN;U$Fb=>cX?fu?y4%)rR-l1i0kk~=-YbkZhip?#EP zv9YZ3xuVLY8#nI!0G3<7gH?V4H}17g`rh1|^htNRdw{W5LvtR#bCTS9^FKX%Uw8Y{{o@bc|NX1ozdkDc^3R`t{k!;R55Nil_B$! zYuawe`~|~gfnGvB-DeBB%fcWuT+8sSF|DM~oi!b;f^Ji>8!`!oRh(%A09FIQ8UR@A zi)qma7ERA$Nf>OT(P(tCTrz^is%J43;@K3$S^#*E8-lom;=(!he6lk|r8CrZQ#yk; zoVZ%pnRNj0!;m-Dd=UDE8QPv3-&=hnR+Jzr@AE0%7XaX!;dp)K7zk@P12^<~971JX zpJLqr0N?h(`XFR(fL+u~!(6o8n%1SY{8lU{9*grbM3slgYV5`o>?QzsI23H1)jhwJ z>S{b03t?gT)%mwU}$RZ1*0ER;xZ)&&3g@L0Q1T)NJgia_voVjRL^kURqYJOq*f}5(?-lu)Mr|AA39ZGsHWY= z)9&X-!vg@I_ekrq`=RGXC+mBG=jx@BR@BBsTJ`z6DlIPuUSfSX$P*vpiQfQ#&w3Zz)Rr9PWJfre1_1BnBg1xh^SGYsV;UZdiGv?U z!G2teOx4^+dF~?5UCQyi1g#)sb-tb)JhIP+kj%K*77eM+iUtJi|{%wUP&tpymN}P{Ch5PRsknC;3Nk;$zKZ95ANYR zqFk{03x3;%1Q{IBZVqTx62OC=(4)1$>9=|)&2R&+Gq-@{zI3#09U?zZxE z0gVqT#&W-;&g*Esr>k}Q*o=0&X*>0ZhGs{5n{{*|16U2sk8YSj?S(9lID??^F%pL` z?tt1(dh+cVL(|mM{*BgjIKG{t!A>%t+}hA)eRA8uuQsH11pKbhYjH-SO&!Z7e!D$h zF67!5uVQGhD>lelPta-)w~~)?p#0r_tkDkjl$|}+KD4`7J*m(7Ud=b^g$uUBg2L$7 z#Dj_Bqhpg&nkd||gQnpW=EA0BdpbV3%+jwmFS2l!OIR4IoF|rk$EX{=?Y7+`2K+3Q z_SCV9<oCbh108klLlj4y4)YDy)5^!lv>TCvF^=WEV z0+!OMs7{_+rW%&0gVM05I?gXcZA;WZXZ5@)I<@KrbZQUW%+4s zq6A87qe__mUukfnI!c41s+-C2u1u~{Lu+$_l+xxX(yPl-vlCTNnjKZewL$wmw3a7G zDJ_p8oqft0pWvl5K8p99$E*Db97_A6aIQaYO;7+)nji%<_tdpQK}>0d6!DEGpdkt- zN<*ZWZsvG?VjiOHyiswl5o0k`6jc{?wd z&lZj*e*vSYcSI1pY8kTWVIE701*uR%U&R;-Dj}4PJNA4MtEj{x957@b+H0ln_~}`k zsz4IIVv=g?>Aq7*U#yCj7%3%JWQs>rYX23Pl=8()c~sy@UQON{@+TKLwBw1q!4vN< zmgA`RhI~&>nyDA?{6LA+2wkpB0?F6wE$FZ{pEtnwBpe0ICI+?;RX=Rb3 z+mr^AbneLN?vim(SX&7K7T#zz*c!j-hIXB;t$K~tv}YR5s?cw;&F5GU+HN$zo@>tI z(PWpLfn`KJ%&W+C&UiH$PCbGsnW!z?avV)MQx@v#f#!$1nEl} zEqB>{bkxMYVmVGZhgrJ14B$j)`QtjZ7ZRA-0W8OvBylL?G*p4~6f3mlWKau(eBqQe znLZ;WSJ=&+3+EPMIoz9PQQO)vp~a#K@w$+)=7^J&+>%S;L9cdQOGe|!-Bz6a+^W~2 F@gM$;lTrWx diff --git a/Diagram-API/Diagram-API/obj/Release/netcoreapp3.1/Diagram-API.csprojAssemblyReference.cache b/Diagram-API/Diagram-API/obj/Release/netcoreapp3.1/Diagram-API.csprojAssemblyReference.cache index 89b3a4d28bbf1432a93f756829ce7897421ab1a3..72a3d45e2143d5843c6e93ed765544a9a762afea 100644 GIT binary patch literal 203114 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�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 delta 30 jcmaF0iDw1#27g8-F^fq@$UbwUKu diff --git a/Diagram-API/GenerateVDPCycle/obj/GenerateVDPCycle.csproj.nuget.dgspec.json b/Diagram-API/GenerateVDPCycle/obj/GenerateVDPCycle.csproj.nuget.dgspec.json index 37d1209..f512744 100644 --- a/Diagram-API/GenerateVDPCycle/obj/GenerateVDPCycle.csproj.nuget.dgspec.json +++ b/Diagram-API/GenerateVDPCycle/obj/GenerateVDPCycle.csproj.nuget.dgspec.json @@ -1,24 +1,25 @@ { "format": 1, "restore": { - "G:\\Diagram-API\\GenerateVDPCycle\\GenerateVDPCycle.csproj": {} + "D:\\GIT\\diplom_vova\\Diagram-API\\GenerateVDPCycle\\GenerateVDPCycle.csproj": {} }, "projects": { - "G:\\Diagram-API\\GenerateVDPCycle\\GenerateVDPCycle.csproj": { + "D:\\GIT\\diplom_vova\\Diagram-API\\GenerateVDPCycle\\GenerateVDPCycle.csproj": { "version": "1.0.0", "restore": { - "projectUniqueName": "G:\\Diagram-API\\GenerateVDPCycle\\GenerateVDPCycle.csproj", + "projectUniqueName": "D:\\GIT\\diplom_vova\\Diagram-API\\GenerateVDPCycle\\GenerateVDPCycle.csproj", "projectName": "GenerateVDPCycle", - "projectPath": "G:\\Diagram-API\\GenerateVDPCycle\\GenerateVDPCycle.csproj", - "packagesPath": "C:\\Users\\Admin\\.nuget\\packages\\", - "outputPath": "G:\\Diagram-API\\GenerateVDPCycle\\obj\\", + "projectPath": "D:\\GIT\\diplom_vova\\Diagram-API\\GenerateVDPCycle\\GenerateVDPCycle.csproj", + "packagesPath": "C:\\Users\\google\\.nuget\\packages\\", + "outputPath": "D:\\GIT\\diplom_vova\\Diagram-API\\GenerateVDPCycle\\obj\\", "projectStyle": "PackageReference", "fallbackFolders": [ "C:\\Program Files (x86)\\Microsoft Visual Studio\\Shared\\NuGetPackages", - "C:\\Program Files (x86)\\Microsoft\\Xamarin\\NuGet\\" + "C:\\Program Files (x86)\\Microsoft\\Xamarin\\NuGet\\", + "C:\\Program Files\\dotnet\\sdk\\NuGetFallbackFolder" ], "configFilePaths": [ - "C:\\Users\\Admin\\AppData\\Roaming\\NuGet\\NuGet.Config", + "C:\\Users\\google\\AppData\\Roaming\\NuGet\\NuGet.Config", "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.FallbackLocation.config", "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.Offline.config", "C:\\Program Files (x86)\\NuGet\\Config\\Xamarin.Offline.config" @@ -70,7 +71,7 @@ "privateAssets": "all" } }, - "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\5.0.200\\RuntimeIdentifierGraph.json" + "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\5.0.201\\RuntimeIdentifierGraph.json" } } } diff --git a/Diagram-API/GenerateVDPCycle/obj/GenerateVDPCycle.csproj.nuget.g.props b/Diagram-API/GenerateVDPCycle/obj/GenerateVDPCycle.csproj.nuget.g.props index 8aed690..471ec1a 100644 --- a/Diagram-API/GenerateVDPCycle/obj/GenerateVDPCycle.csproj.nuget.g.props +++ b/Diagram-API/GenerateVDPCycle/obj/GenerateVDPCycle.csproj.nuget.g.props @@ -5,14 +5,15 @@ NuGet $(MSBuildThisFileDirectory)project.assets.json $(UserProfile)\.nuget\packages\ - C:\Users\Admin\.nuget\packages\;C:\Program Files (x86)\Microsoft Visual Studio\Shared\NuGetPackages;C:\Program Files (x86)\Microsoft\Xamarin\NuGet\ + C:\Users\google\.nuget\packages\;C:\Program Files (x86)\Microsoft Visual Studio\Shared\NuGetPackages;C:\Program Files (x86)\Microsoft\Xamarin\NuGet\;C:\Program Files\dotnet\sdk\NuGetFallbackFolder PackageReference 5.9.0 - + + $(MSBuildAllProjects);$(MSBuildThisFileFullPath) diff --git a/Diagram-API/GenerateVDPCycle/obj/Release/netcoreapp3.1/GenerateVDPCycle.assets.cache b/Diagram-API/GenerateVDPCycle/obj/Release/netcoreapp3.1/GenerateVDPCycle.assets.cache index 63d514d97cc55275c574ce24351ab7ddaf6b740e..46323bf24c09c34352bcdbfe3e7c7d724f1576f4 100644 GIT binary patch delta 1503 zcmaEs@FvkQz}wxCi-CdRWLCjj&WFnj_S{&)(yZ^dc3+o3%&Mgq7NxD4cPK4F)`C%m zfq{{MfuWbt*(xTqIJKxaCOtntJtuYYM`oGH24cb!^RopiFy*8tvoK}}WMY$$6A_-g zn$ZKBE|7^rlMR@{1t;OMZ*q-j$m9c@9FuQ|iU{`MP?bFSD6@=UKNi_Jg3VY&^(LQY zNfK9)S;WGsE|Loh(|^s0aHR^@@oal$?te%1j^7Q1(l>G8}nugHeh&M zP|0%g6W$QP7A!Inn-lm91k(1yPR4@!~o-)4khdehCx2Y2SYGQ3(^A>3=3xd(|gN z_2NzQu9KyuO>n0BVvw^Z$>?BD$Co)ACNGpR!I=ecN^y6K8hr0M*dK9OfrC6n#1MpY{_ zFfcMOF!V4wTg8MHrxq2*IHu%g=1p{*#b1stBt4mpF^fL~Q@Bn@kvLvgF zKm(=%I%>?iMFl@XYQDQPlUlC1=reGQZ4*kuIJgJ!a$l-lI?(!!JNrCleVWS0?G zj%g%FLGk2%4jKLu)XF@&{PkGG*C{DZ=HUwwXh!q!=0ZLn7GY)v1_pUF zT^EIBiZd`UFn|cGX;5nNYvBy+>980}8k~zG{k7vrdjXTbiJ4$a51{lHIr)zy$K=D} zI{4CI6|OW`j4S;`O#UN@)y^&W(qAR6w6`2by0e_jBWr>!?QO--07-WxIMQ4dmh{#@ rL|QAtlFsrc3o4pmNo%b*(wYC{KqV6#X{{F{olP#}E8TohS(_ICsG`7R diff --git a/Diagram-API/GenerateVDPCycle/obj/Release/netcoreapp3.1/GenerateVDPCycle.csprojAssemblyReference.cache b/Diagram-API/GenerateVDPCycle/obj/Release/netcoreapp3.1/GenerateVDPCycle.csprojAssemblyReference.cache index 684aedd88a5161df7f0a370f0d4661386643ee6d..5a2f63977c4e86b02a1e97ec9852eed81ae4ef52 100644 GIT binary patch literal 21780 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 delta 30 jcmbQTig5+=27g8-GmgoDjGlZ93=9kcY#@?>fq@$UYqA80 diff --git a/Diagram-API/GenerateVDPCycle/obj/project.assets.json b/Diagram-API/GenerateVDPCycle/obj/project.assets.json index c5abf45..1fc9ea2 100644 --- a/Diagram-API/GenerateVDPCycle/obj/project.assets.json +++ b/Diagram-API/GenerateVDPCycle/obj/project.assets.json @@ -869,25 +869,27 @@ ] }, "packageFolders": { - "C:\\Users\\Admin\\.nuget\\packages\\": {}, + "C:\\Users\\google\\.nuget\\packages\\": {}, "C:\\Program Files (x86)\\Microsoft Visual Studio\\Shared\\NuGetPackages": {}, - "C:\\Program Files (x86)\\Microsoft\\Xamarin\\NuGet\\": {} + "C:\\Program Files (x86)\\Microsoft\\Xamarin\\NuGet\\": {}, + "C:\\Program Files\\dotnet\\sdk\\NuGetFallbackFolder": {} }, "project": { "version": "1.0.0", "restore": { - "projectUniqueName": "G:\\Diagram-API\\GenerateVDPCycle\\GenerateVDPCycle.csproj", + "projectUniqueName": "D:\\GIT\\diplom_vova\\Diagram-API\\GenerateVDPCycle\\GenerateVDPCycle.csproj", "projectName": "GenerateVDPCycle", - "projectPath": "G:\\Diagram-API\\GenerateVDPCycle\\GenerateVDPCycle.csproj", - "packagesPath": "C:\\Users\\Admin\\.nuget\\packages\\", - "outputPath": "G:\\Diagram-API\\GenerateVDPCycle\\obj\\", + "projectPath": "D:\\GIT\\diplom_vova\\Diagram-API\\GenerateVDPCycle\\GenerateVDPCycle.csproj", + "packagesPath": "C:\\Users\\google\\.nuget\\packages\\", + "outputPath": "D:\\GIT\\diplom_vova\\Diagram-API\\GenerateVDPCycle\\obj\\", "projectStyle": "PackageReference", "fallbackFolders": [ "C:\\Program Files (x86)\\Microsoft Visual Studio\\Shared\\NuGetPackages", - "C:\\Program Files (x86)\\Microsoft\\Xamarin\\NuGet\\" + "C:\\Program Files (x86)\\Microsoft\\Xamarin\\NuGet\\", + "C:\\Program Files\\dotnet\\sdk\\NuGetFallbackFolder" ], "configFilePaths": [ - "C:\\Users\\Admin\\AppData\\Roaming\\NuGet\\NuGet.Config", + "C:\\Users\\google\\AppData\\Roaming\\NuGet\\NuGet.Config", "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.FallbackLocation.config", "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.Offline.config", "C:\\Program Files (x86)\\NuGet\\Config\\Xamarin.Offline.config" @@ -939,7 +941,7 @@ "privateAssets": "all" } }, - "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\5.0.200\\RuntimeIdentifierGraph.json" + "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\5.0.201\\RuntimeIdentifierGraph.json" } } } diff --git a/Diagram-API/GenerateVDPCycle/obj/project.nuget.cache b/Diagram-API/GenerateVDPCycle/obj/project.nuget.cache index e3f3547..9ce695b 100644 --- a/Diagram-API/GenerateVDPCycle/obj/project.nuget.cache +++ b/Diagram-API/GenerateVDPCycle/obj/project.nuget.cache @@ -1,34 +1,34 @@ { "version": 2, - "dgSpecHash": "dJ5Zqs54MpkjiW1NERaYHKfRgGQP65O4keUR9GNguaynUdNiO69AuZXAqASCwpzj1hMK/KJxIfErvoq3wS3lUw==", + "dgSpecHash": "Dd4oBL4kr/THFI4/m4VlSCVmKH5MsMtnD9Qkqx9QLuVOE2Ahss9C78Lj/BGnHydjB0CcIZ376mAH9wC4PMI6ww==", "success": true, - "projectFilePath": "G:\\Diagram-API\\GenerateVDPCycle\\GenerateVDPCycle.csproj", + "projectFilePath": "D:\\GIT\\diplom_vova\\Diagram-API\\GenerateVDPCycle\\GenerateVDPCycle.csproj", "expectedPackageFiles": [ - "C:\\Users\\Admin\\.nuget\\packages\\microsoft.bcl.asyncinterfaces\\1.1.1\\microsoft.bcl.asyncinterfaces.1.1.1.nupkg.sha512", - "C:\\Users\\Admin\\.nuget\\packages\\microsoft.bcl.hashcode\\1.1.0\\microsoft.bcl.hashcode.1.1.0.nupkg.sha512", - "C:\\Users\\Admin\\.nuget\\packages\\microsoft.csharp\\4.5.0\\microsoft.csharp.4.5.0.nupkg.sha512", - "C:\\Users\\Admin\\.nuget\\packages\\microsoft.entityframeworkcore\\3.1.8\\microsoft.entityframeworkcore.3.1.8.nupkg.sha512", - "C:\\Users\\Admin\\.nuget\\packages\\microsoft.entityframeworkcore.abstractions\\3.1.8\\microsoft.entityframeworkcore.abstractions.3.1.8.nupkg.sha512", - "C:\\Users\\Admin\\.nuget\\packages\\microsoft.entityframeworkcore.analyzers\\3.1.8\\microsoft.entityframeworkcore.analyzers.3.1.8.nupkg.sha512", - "C:\\Users\\Admin\\.nuget\\packages\\microsoft.entityframeworkcore.relational\\3.1.8\\microsoft.entityframeworkcore.relational.3.1.8.nupkg.sha512", - "C:\\Users\\Admin\\.nuget\\packages\\microsoft.extensions.caching.abstractions\\3.1.8\\microsoft.extensions.caching.abstractions.3.1.8.nupkg.sha512", - "C:\\Users\\Admin\\.nuget\\packages\\microsoft.extensions.caching.memory\\3.1.8\\microsoft.extensions.caching.memory.3.1.8.nupkg.sha512", - "C:\\Users\\Admin\\.nuget\\packages\\microsoft.extensions.configuration\\3.1.8\\microsoft.extensions.configuration.3.1.8.nupkg.sha512", - "C:\\Users\\Admin\\.nuget\\packages\\microsoft.extensions.configuration.abstractions\\3.1.8\\microsoft.extensions.configuration.abstractions.3.1.8.nupkg.sha512", - "C:\\Users\\Admin\\.nuget\\packages\\microsoft.extensions.configuration.binder\\3.1.8\\microsoft.extensions.configuration.binder.3.1.8.nupkg.sha512", - "C:\\Users\\Admin\\.nuget\\packages\\microsoft.extensions.dependencyinjection\\3.1.8\\microsoft.extensions.dependencyinjection.3.1.8.nupkg.sha512", - "C:\\Users\\Admin\\.nuget\\packages\\microsoft.extensions.dependencyinjection.abstractions\\3.1.8\\microsoft.extensions.dependencyinjection.abstractions.3.1.8.nupkg.sha512", - "C:\\Users\\Admin\\.nuget\\packages\\microsoft.extensions.logging\\3.1.8\\microsoft.extensions.logging.3.1.8.nupkg.sha512", - "C:\\Users\\Admin\\.nuget\\packages\\microsoft.extensions.logging.abstractions\\3.1.8\\microsoft.extensions.logging.abstractions.3.1.8.nupkg.sha512", - "C:\\Users\\Admin\\.nuget\\packages\\microsoft.extensions.options\\3.1.8\\microsoft.extensions.options.3.1.8.nupkg.sha512", - "C:\\Users\\Admin\\.nuget\\packages\\microsoft.extensions.primitives\\3.1.8\\microsoft.extensions.primitives.3.1.8.nupkg.sha512", - "C:\\Users\\Admin\\.nuget\\packages\\mysqlconnector\\0.69.10\\mysqlconnector.0.69.10.nupkg.sha512", - "C:\\Users\\Admin\\.nuget\\packages\\newtonsoft.json\\11.0.2\\newtonsoft.json.11.0.2.nupkg.sha512", - "C:\\Users\\Admin\\.nuget\\packages\\pomelo.entityframeworkcore.mysql\\3.2.4\\pomelo.entityframeworkcore.mysql.3.2.4.nupkg.sha512", - "C:\\Users\\Admin\\.nuget\\packages\\pomelo.jsonobject\\2.2.1\\pomelo.jsonobject.2.2.1.nupkg.sha512", - "C:\\Users\\Admin\\.nuget\\packages\\system.collections.immutable\\1.7.1\\system.collections.immutable.1.7.1.nupkg.sha512", - "C:\\Users\\Admin\\.nuget\\packages\\system.componentmodel.annotations\\4.7.0\\system.componentmodel.annotations.4.7.0.nupkg.sha512", - "C:\\Users\\Admin\\.nuget\\packages\\system.diagnostics.diagnosticsource\\4.7.1\\system.diagnostics.diagnosticsource.4.7.1.nupkg.sha512" + "C:\\Users\\google\\.nuget\\packages\\microsoft.bcl.asyncinterfaces\\1.1.1\\microsoft.bcl.asyncinterfaces.1.1.1.nupkg.sha512", + "C:\\Users\\google\\.nuget\\packages\\microsoft.bcl.hashcode\\1.1.0\\microsoft.bcl.hashcode.1.1.0.nupkg.sha512", + "C:\\Program Files\\dotnet\\sdk\\NuGetFallbackFolder\\microsoft.csharp\\4.5.0\\microsoft.csharp.4.5.0.nupkg.sha512", + "C:\\Users\\google\\.nuget\\packages\\microsoft.entityframeworkcore\\3.1.8\\microsoft.entityframeworkcore.3.1.8.nupkg.sha512", + "C:\\Users\\google\\.nuget\\packages\\microsoft.entityframeworkcore.abstractions\\3.1.8\\microsoft.entityframeworkcore.abstractions.3.1.8.nupkg.sha512", + "C:\\Users\\google\\.nuget\\packages\\microsoft.entityframeworkcore.analyzers\\3.1.8\\microsoft.entityframeworkcore.analyzers.3.1.8.nupkg.sha512", + "C:\\Users\\google\\.nuget\\packages\\microsoft.entityframeworkcore.relational\\3.1.8\\microsoft.entityframeworkcore.relational.3.1.8.nupkg.sha512", + "C:\\Users\\google\\.nuget\\packages\\microsoft.extensions.caching.abstractions\\3.1.8\\microsoft.extensions.caching.abstractions.3.1.8.nupkg.sha512", + "C:\\Users\\google\\.nuget\\packages\\microsoft.extensions.caching.memory\\3.1.8\\microsoft.extensions.caching.memory.3.1.8.nupkg.sha512", + "C:\\Users\\google\\.nuget\\packages\\microsoft.extensions.configuration\\3.1.8\\microsoft.extensions.configuration.3.1.8.nupkg.sha512", + "C:\\Users\\google\\.nuget\\packages\\microsoft.extensions.configuration.abstractions\\3.1.8\\microsoft.extensions.configuration.abstractions.3.1.8.nupkg.sha512", + "C:\\Users\\google\\.nuget\\packages\\microsoft.extensions.configuration.binder\\3.1.8\\microsoft.extensions.configuration.binder.3.1.8.nupkg.sha512", + "C:\\Users\\google\\.nuget\\packages\\microsoft.extensions.dependencyinjection\\3.1.8\\microsoft.extensions.dependencyinjection.3.1.8.nupkg.sha512", + "C:\\Users\\google\\.nuget\\packages\\microsoft.extensions.dependencyinjection.abstractions\\3.1.8\\microsoft.extensions.dependencyinjection.abstractions.3.1.8.nupkg.sha512", + "C:\\Users\\google\\.nuget\\packages\\microsoft.extensions.logging\\3.1.8\\microsoft.extensions.logging.3.1.8.nupkg.sha512", + "C:\\Users\\google\\.nuget\\packages\\microsoft.extensions.logging.abstractions\\3.1.8\\microsoft.extensions.logging.abstractions.3.1.8.nupkg.sha512", + "C:\\Users\\google\\.nuget\\packages\\microsoft.extensions.options\\3.1.8\\microsoft.extensions.options.3.1.8.nupkg.sha512", + "C:\\Users\\google\\.nuget\\packages\\microsoft.extensions.primitives\\3.1.8\\microsoft.extensions.primitives.3.1.8.nupkg.sha512", + "C:\\Users\\google\\.nuget\\packages\\mysqlconnector\\0.69.10\\mysqlconnector.0.69.10.nupkg.sha512", + "C:\\Program Files\\dotnet\\sdk\\NuGetFallbackFolder\\newtonsoft.json\\11.0.2\\newtonsoft.json.11.0.2.nupkg.sha512", + "C:\\Users\\google\\.nuget\\packages\\pomelo.entityframeworkcore.mysql\\3.2.4\\pomelo.entityframeworkcore.mysql.3.2.4.nupkg.sha512", + "C:\\Users\\google\\.nuget\\packages\\pomelo.jsonobject\\2.2.1\\pomelo.jsonobject.2.2.1.nupkg.sha512", + "C:\\Users\\google\\.nuget\\packages\\system.collections.immutable\\1.7.1\\system.collections.immutable.1.7.1.nupkg.sha512", + "C:\\Users\\google\\.nuget\\packages\\system.componentmodel.annotations\\4.7.0\\system.componentmodel.annotations.4.7.0.nupkg.sha512", + "C:\\Users\\google\\.nuget\\packages\\system.diagnostics.diagnosticsource\\4.7.1\\system.diagnostics.diagnosticsource.4.7.1.nupkg.sha512" ], "logs": [] } \ No newline at end of file diff --git a/Diagram-Canvas/.vs/DiagramCanvas/config/applicationhost.config b/Diagram-Canvas/.vs/DiagramCanvas/config/applicationhost.config index 23b734a..39bd1f3 100644 --- a/Diagram-Canvas/.vs/DiagramCanvas/config/applicationhost.config +++ b/Diagram-Canvas/.vs/DiagramCanvas/config/applicationhost.config @@ -162,7 +162,7 @@ - + diff --git a/Diagram-Canvas/.vs/DiagramCanvas/v16/.suo b/Diagram-Canvas/.vs/DiagramCanvas/v16/.suo index 597c29235f4a9e9910109e882d252dda398714d4..6a21cfbfcdee6c8ebf4e8ecb7dbe53fa485c771f 100644 GIT binary patch delta 1757 zcmds#ZA@EL7{`C-76xL0DuNYi9WQ$+3YJk5m_mTwI3~ovwq!HeT#Dkxq+n>bII;+u zB|0;3^vq-*6efOE5o$W-Ohkrr!_95#ocmz1D8|>A7+nNEaLu`Gvl2+=%Qw%LbMABQ zdHyfYzjsRXUJ!@ef`PKUBms;zj|gc9f5ua-_Lp96xGZi3COooR>lUAeuW75q3d1mr zdBZS@flS~gzy_##DUboA%G%U*N%sQsV5)t!`n>?S2XM!Jy#+`E*2KPDCb~z2G=KVM z8}`SsiDI7*Ut6|Hn2pp*#7+SelB$=)cB!X6erI|Dq9PVYECc38o9`E6X;w?w6!4*{ z7>4l?a5{FL20o6R&jFvr&hrD!C&x0ZqUxVMyZ~Ih-sD)wQY0#5zLqCzEJ;?yzC6yp z*;15z5{SsXStYV%W3DKcwa)V7Q}LQ`%Y5w)TQQpHr&6REm=DhYZ^}9CZc!QSp5;kC z3yiCpEXa09RXGp5D=)elSu1=JMC;yYbUODZ2#-UZy zVfw()uO{#7I}^-lM5TLTbB^to{4Yn#B0YVFU9;1(uGh!qA?G{R<%@mmmzu54yvRxL zO$KdEQg^z;zuT;0cuP{q;Y}Aynj0!|gdLC0SV9j@SbBvn*H?ObZX~jfcG~FRNz(uy zL3R^}32c61@WlJR@gv=HJ^o8?4F2?d+HZy7)88N0XLcTMeYRqS5~!w|xT0ZDt5@i( zl?|1(H{`I8V<~=kPwT8jHdfYbS%|TC*bDEY*sJ%=J{0Px$SnDJQ)xx{ww+%a2lBG7KJue6R5I27 z-AJ{I1#7Kk`FO)26qalYOtP re|613<2Nf$j1O(UlKn>v+P*kj11sHif&Xlq%Fh4QGs}K+L{)zQ*y~0f delta 564 zcmbu4y)Q#y6vm%(??qd;EhW-$BbT%qQF?0@(fFz$zLIJy1dBx^5(5^UFjT@l|3OV+ z5Z=Wo(aD6xL=1LIt*+eWk`CRx(|MnB&hvXt?vZjuIyFc-i?=B+pK(zQSR0{mgR@x)v~6vm?PddGoKVL3*rf+;B?_R|iCM|H@u)H<{kLbU z12;aEoYG8sHjvvp-A>K*Ns(M9aTNI^~N@nXW9g4lyBPukz%=Qs3N`}~J&lBe~ zUFc))RM4fr+Fa3u7W(Kg*Y6s7Vkd8}&rg>J+vkOe`iHMFr<9$l+Nco#T>KQ6=l.length;)l.push(1);l[i]=isNaN(n)||n<=0?1:n}}function c(){for(var t=0,n=0;n=a.length?a.length-1:t},this.RectParam=function(t,n,i,e){s.RectParam(t,n,i,e)},this.Rect=function(t){if(void 0===t)return s;s.Rect(t)},this.Rotate=function(t){if(void 0===t)return f;f="boolean"==typeof t&&t;for(var n=0;na.length?(a.push(new PercentColumn),t=a.length-1):a.splice(t,0,new PercentColumn),a[t].Color(i),u(t,n)},this.ChangeRStat=function(t,n,i){t=parseInt(t);!isNaN(t)&&0<=t&&t=o.length?o.length-1:t},this.StatCount=function(){return o.length},this.RectParam=function(t,n,i,e){r.RectParam(t,n,i,e)},this.Rect=function(t){if(void 0===t)return r;r.Rect(t)},this.Rotate=function(t){if(void 0===t)return a;a="boolean"==typeof t&&t},this.AddStatus=function(t,n){void 0===n&&(n="#000");n=null===(n=n.match(/^#([0-9a-f]{3}|[0-9a-f]{6})$/i))?"#000000":n[0],t=parseInt(t);isNaN(t)||t<0||t>o.length-1?o.push(n):o.splice(t,0,n)},this.ChangeStatus=function(t,n){void 0===n&&(n="#000");n=null===(n=n.match(/^#([0-9a-f]{3}|[0-9a-f]{6})$/i))?"#000000":n[0],t=parseInt(t);!isNaN(t)&&0<=t&&t=P.length?-1:r,t=new Date;-1==r?(P.push(n),W.push(i),N.push(e),s.push(t),a.push(t)):(P.splice(r,0,n),W.splice(r,0,i),N.splice(r,0,e),s.splice(r,0,t),a.splice(r,0,t))},this.ChangeProc=function(t,n,i,e){var r=parseInt(t),r=isNaN(r)||r<0||r>=P.length?-1:r,t=new Date;-1!=r&&(P.splice(r,1,n),W.splice(r,1,i),N.splice(r,1,e),s.splice(r,1,t),a.splice(r,1,t))},this.DelStove=function(t){0!=P.length&&(t=parseInt(t),-1==(t=isNaN(t)||t<0||t>=P.length?-1:t)?(P.pop(),W.pop(),N.pop(),s.pop(),a.pop()):(P.splice(t,1),W.splice(t,1),N.splice(t,1),s.splice(t,1),a.splice(t,1)))},this.StartDate=function(t,n){t=parseInt(t);-1!=(t=isNaN(t)||t<0||t>=s.length?-1:t)&&(s[t]=n)},this.EndDate=function(t,n){t=parseInt(t);-1!=(t=isNaN(t)||t<0||t>=s.length?-1:t)&&(a[t]=n)},this.ChangeStatProc=function(t,n,i){t=parseInt(t);!isNaN(t)&&0<=t&&ta[n]&&(t=s[n],s[n]=a[n],a[n]=t)}} \ No newline at end of file +function Rectangle(n, i, e, r) { function o(t) { t = parseFloat(t); return isNaN(t) || t < 0 ? 0 : t } this.X = function (t) { if (void 0 === t) return n; n = o(t) }, this.Y = function (t) { if (void 0 === t) return i; i = o(t) }, this.W = function (t) { if (void 0 === t) return e; e = o(t) }, this.H = function (t) { if (void 0 === t) return r; r = o(t) }, this.RectParam = function (t, n, i, e) { this.X(t), this.Y(n), this.W(i), this.H(e) }, this.Rect = function (t) { if (void 0 === t) return this; this.RectParam(t.X(), t.Y(), t.W(), t.H()) }, void 0 === n ? n = 0 : this.X(n), void 0 === i ? i = 0 : this.Y(i), void 0 === e ? e = 0 : this.W(e), void 0 === r ? r = 0 : this.H(r) } function PercentColumn(t, n, i, e) { var r = new Rectangle(t, n, i, e), o = new Rectangle, s = !1, a = 0, l = "#000"; this.X = function (t) { if (void 0 === t) return r.X(); r.X(t) }, this.Y = function (t) { if (void 0 === t) return r.Y(); r.Y(t) }, this.W = function (t) { if (void 0 === t) return r.W(); r.W(t) }, this.H = function (t) { if (void 0 === t) return r.H(); r.H(t) }, this.Percent = function (t) { if (void 0 === t) return a; t = parseFloat(t), t = isNaN(t) || t < 0 ? 0 : 100 < t ? 100 : t; a = t }, this.Color = function (t) { if (void 0 === t) return l; t = t.match(/^#([0-9a-f]{3}|[0-9a-f]{6})$/i); l = null === t ? "#000000" : t[0] }, this.RectParam = function (t, n, i, e) { r.RectParam(t, n, i, e) }, this.Rect = function (t) { if (void 0 === t) return r; r.Rect(t) }, this.Rotate = function (t) { if (void 0 === t) return s; s = "boolean" == typeof t && t }, this.Print = function (t) { var n; n = (s ? r.W() : r.H()) * a / 100, o.RectParam(r.X(), s ? r.Y() : r.Y() + r.H() - n, s ? n : r.W(), s ? r.H() : n), t.fillStyle = l, t.strokeStyle = l, t.fillRect(o.X(), o.Y(), o.W(), o.H()), t.strokeRect(r.X(), r.Y(), r.W(), r.H()) }, this.PrintText = function (t) { t.save(), t.translate(r.X() + r.W() / 2, r.Y() + r.H() / 2), s || t.rotate(3 * Math.PI / 2), t.fillStyle = "#888", t.textAlign = "center", t.textBaseline = "middle", t.font = s ? (r.H() - 10 < 0 ? 0 : r.H() - 10) + "px Arial" : (r.W() - 10 < 0 ? 0 : r.W() - 10) + "px Arial", t.fillText(Math.floor(100 * a) / 100 + "%", 0, 0), t.restore() } } function ProcessColumn(t, n, i, e) { var s = new Rectangle(t, n, i, e), a = [], l = [], r = 0, o = -1, f = !1; function u(t, n) { var i = parseInt(t), n = parseFloat(n); if (!isNaN(i)) { for (; i >= l.length;)l.push(1); l[i] = isNaN(n) || n <= 0 ? 1 : n } } function c() { for (var t = 0, n = 0; n < l.length; n++)t += l[n]; return t } function h() { var t = (t = (f ? s.W() : s.H()) - (1 + a.length)) < 0 ? 0 : t; return c() <= 0 ? 0 : t / c() } function d() { for (var t = 0; t < a.length; t++)a[t].Percent(t < o ? 100 : t == o ? r : 0) } function p() { for (var t = s.X() + 1, n = s.Y() + 1, i = 0; i < a.length; i++) { var e = f ? i : a.length - (i + 1), r = f ? l[e] * h() : s.W() - 2, o = f ? s.H() - 2 : l[e] * h(); a[e].RectParam(t, n, r, o), t = f ? t + 1 + r : t, n = f ? n : n + 1 + o } } this.X = function (t) { if (void 0 === t) return s().X(); s().X(t) }, this.Y = function (t) { if (void 0 === t) return s().Y(); s().Y(t) }, this.W = function (t) { if (void 0 === t) return s().W(); s().W(t) }, this.H = function (t) { if (void 0 === t) return s().H(); s().H(t) }, this.Percent = function (t) { if (void 0 === t) return r; t = parseFloat(t); r = isNaN(t) || t < 0 ? 0 : 100 < t ? 100 : t }, this.Status = function (t) { if (void 0 === t) return o; t = parseInt(t); o = isNaN(t) || t < -1 || 0 === a.length ? -1 : t >= a.length ? a.length - 1 : t }, this.RectParam = function (t, n, i, e) { s.RectParam(t, n, i, e) }, this.Rect = function (t) { if (void 0 === t) return s; s.Rect(t) }, this.Rotate = function (t) { if (void 0 === t) return f; f = "boolean" == typeof t && t; for (var n = 0; n < a.length; n++)a[n].Rotate(f) }, this.StatCount = function () { return a.length }, this.AddRStat = function (t, n, i) { t = parseInt(t); isNaN(t) || t < 0 || t - 1 > a.length ? (a.push(new PercentColumn), t = a.length - 1) : a.splice(t, 0, new PercentColumn), a[t].Color(i), u(t, n) }, this.ChangeRStat = function (t, n, i) { t = parseInt(t); !isNaN(t) && 0 <= t && t < a.length && (a[t].Color(i), u(t, n)) }, this.DelRStat = function (t) { t = parseInt(t); !isNaN(t) && 0 <= t && t < a.length ? (a.splice(t, 1), l.splice(t, 1)) : 0 < a.length && (a.pop(), l.pop()) }, this.BuildDefault = function () { for (var t = [57, 49, 49, 71, 28, 49, 21, 171, 114, 103], n = ["#0ff", "#00f", "#f00", "#0f0", "#0ff", "#00f", "#8500b6", "#f00", "#f0f", "#0f0"]; 0 < a.length;)this.DelRStat(); for (var i = 0; i < t.length; i++)this.AddRStat(i, t[i], n[i]) }, this.Print = function (t) { this.Rotate(f), d(), p(), t.clearRect(s.X(), s.Y(), s.W(), s.H()), t.fillStyle = "#ddd", t.fillRect(s.X(), s.Y(), s.W(), s.H()); for (var n = 0; n < a.length; n++)n <= o && a[n].Print(t); t.strokeStyle = "#000", t.strokeRect(s.X(), s.Y(), s.W(), s.H()) }, this.PrintText = function (t) { this.Rotate(f), d(), p(), t.save(), t.translate(s.X() + s.W() / 2, s.Y() + s.H() / 2), f || t.rotate(3 * Math.PI / 2), t.fillStyle = "#888", t.textAlign = "center", t.textBaseline = "middle", t.font = f ? (s.H() - 10 < 0 ? 0 : s.H() - 10) + "px Arial" : (s.W() - 10 < 0 ? 0 : s.W() - 10) + "px Arial", t.fillText(Math.floor(100 * r) / 100 + "% " + (o + 1) + "/" + a.length, 0, 0), t.restore() } } function BlinkStatus(t, n, i, e) { var r = new Rectangle(t, n, i, e), o = [], s = 0, a = !1; this.X = function (t) { if (void 0 === t) return r().X(); r().X(t) }, this.Y = function (t) { if (void 0 === t) return r().Y(); r().Y(t) }, this.W = function (t) { if (void 0 === t) return r().W(); r().W(t) }, this.H = function (t) { if (void 0 === t) return r().H(); r().H(t) }, this.Status = function (t) { if (void 0 === t) return s; t = parseInt(t); s = isNaN(t) || t < -1 ? -1 : t >= o.length ? o.length - 1 : t }, this.StatCount = function () { return o.length }, this.RectParam = function (t, n, i, e) { r.RectParam(t, n, i, e) }, this.Rect = function (t) { if (void 0 === t) return r; r.Rect(t) }, this.Rotate = function (t) { if (void 0 === t) return a; a = "boolean" == typeof t && t }, this.AddStatus = function (t, n) { void 0 === n && (n = "#000"); n = null === (n = n.match(/^#([0-9a-f]{3}|[0-9a-f]{6})$/i)) ? "#000000" : n[0], t = parseInt(t); isNaN(t) || t < 0 || t > o.length - 1 ? o.push(n) : o.splice(t, 0, n) }, this.ChangeStatus = function (t, n) { void 0 === n && (n = "#000"); n = null === (n = n.match(/^#([0-9a-f]{3}|[0-9a-f]{6})$/i)) ? "#000000" : n[0], t = parseInt(t); !isNaN(t) && 0 <= t && t < o.length && o.splice(t, 1, n) }, this.DelStatus = function (t) { t = parseInt(t); !isNaN(t) && 0 <= t && t < o.length ? o.splice(t, 1) : 0 < o.length && o.pop() }, this.BuildDefault = function () { for (var t = ["#00f", "#f00", "#0f0"], n = 0; n < t.length; n++)this.AddStatus(0, t[n]) }, this.Print = function (t) { t.fillStyle = 0 <= s && s < o.length ? o[s] : "#ddd", t.fillRect(r.X(), r.Y(), r.W(), r.H()), t.strokeStyle = "#000", t.strokeRect(r.X(), r.Y(), r.W(), r.H()) }, this.PrintText = function (t) { t.save(), t.translate(r.X() + r.W() / 2, r.Y() + r.H() / 2), a && t.rotate(3 * Math.PI / 2), t.fillStyle = "#888", t.textAlign = "center", t.textBaseline = "middle", t.font = a ? (r.W() - 2 < 0 ? 0 : r.W() - 2) + "px Arial" : (r.H() - 2 < 0 ? 0 : r.H() - 2) + "px Arial", t.fillText(s + 1 + "/" + o.length, 0, 0), t.restore() } } function NumberColumn(t, n, i, e, r) { var o = new Rectangle(t, n, i, e), s = !0, a = !1; this.X = function (t) { if (void 0 === t) return o().X(); o().X(t) }, this.Y = function (t) { if (void 0 === t) return o().Y(); o().Y(t) }, this.W = function (t) { if (void 0 === t) return o().W(); o().W(t) }, this.H = function (t) { if (void 0 === t) return o().H(); o().H(t) }, this.RectParam = function (t, n, i, e) { o.RectParam(t, n, i, e) }, this.Rect = function (t) { if (void 0 === t) return o; o.Rect(t) }, this.Number = function (t) { if (void 0 === t) return r; t = parseInt(t); r = isNaN(t) || t < 0 ? 0 : t }, this.Number(r), this.Prostoy = function (t) { if (void 0 === t) return s; s = "boolean" == typeof t && t }, this.Rotate = function (t) { if (void 0 === t) return a; a = "boolean" == typeof t && t }, this.Print = function (t) { t.fillStyle = s ? "#ff8000" : "#ff0", t.fillRect(o.X(), o.Y(), o.W(), o.H()), t.strokeStyle = "#000", t.strokeRect(o.X(), o.Y(), o.W(), o.H()), t.save(), t.translate(o.X() + o.W() / 2, o.Y() + o.H() / 2), a && t.rotate(3 * Math.PI / 2), t.fillStyle = "#000", t.textAlign = "center", t.textBaseline = "middle"; var n = (n = o.H() < o.W() ? o.H() - 3 : o.W() - 3) < 0 ? 0 : n; t.font = n + "px Arial", t.fillText(r, 0, 0), t.restore() } } function Diagram(t, n, i, e) { var o = 1e3, H = new Rectangle(t, n, i, e), P = [], W = [], N = [], s = [], a = [], l = !1, f = -1, m = !1; function u(t) { for (var n, i = null == t ? new Date : t, e = !1, r = 0; r < P.length; r++)s[r] != a[r] && (n = a[r] - s[r], s[r], n = 100 * (i - s[r]) / n, P[r].Percent(n), N[r].Prostoy(100 <= n), e = e || n < 100); l = l && e, i.setMilliseconds(i.getMilliseconds() + o), l && (f = null == t ? setTimeout(u, o) : setTimeout(u, o, i)) } this.minBoardW = function () { return (stW + 1) * (P.length + 1) + 5 * P.length }, this.minBoardH = function () { return 4 * (stH + 1) + szHP + szHB + szHN }, this.X = function (t) { if (void 0 === t) return H().X(); H().X(t) }, this.Y = function (t) { if (void 0 === t) return H().Y(); H().Y(t) }, this.W = function (t) { if (void 0 === t) return H().W(); H().W(t) }, this.H = function (t) { if (void 0 === t) return H().H(); H().H(t) }, this.RectParam = function (t, n, i, e) { H.RectParam(t, n, i, e) }, this.Rect = function (t) { if (void 0 === t) return H; H.Rect(t) }, this.ProcCount = function () { return P.length }, this.AddProc = function (t, n, i, e) { var r = parseInt(t), r = isNaN(r) || r < 0 || r >= P.length ? -1 : r, t = new Date; -1 == r ? (P.push(n), W.push(i), N.push(e), s.push(t), a.push(t)) : (P.splice(r, 0, n), W.splice(r, 0, i), N.splice(r, 0, e), s.splice(r, 0, t), a.splice(r, 0, t)) }, this.ChangeProc = function (t, n, i, e) { var r = parseInt(t), r = isNaN(r) || r < 0 || r >= P.length ? -1 : r, t = new Date; -1 != r && (P.splice(r, 1, n), W.splice(r, 1, i), N.splice(r, 1, e), s.splice(r, 1, t), a.splice(r, 1, t)) }, this.DelStove = function (t) { 0 != P.length && (t = parseInt(t), -1 == (t = isNaN(t) || t < 0 || t >= P.length ? -1 : t) ? (P.pop(), W.pop(), N.pop(), s.pop(), a.pop()) : (P.splice(t, 1), W.splice(t, 1), N.splice(t, 1), s.splice(t, 1), a.splice(t, 1))) }, this.StartDate = function (t, n) { t = parseInt(t); -1 != (t = isNaN(t) || t < 0 || t >= s.length ? -1 : t) && (s[t] = n) }, this.EndDate = function (t, n) { t = parseInt(t); -1 != (t = isNaN(t) || t < 0 || t >= s.length ? -1 : t) && (a[t] = n) }, this.ChangeStatProc = function (t, n, i) { t = parseInt(t); !isNaN(t) && 0 <= t && t < P.length && (P[t].Status(n), P[t].Percent(i)) }, this.ChangeStatBlink = function (t, n) { t = parseInt(t); !isNaN(t) && -1 <= t && t < W.length && W[t].Status(n) }, this.ChangeStatNumb = function (t, n) { t = parseInt(t); !isNaN(t) && 0 <= t && t < N.length && N[t].Prostoy(n) }, this.Rotate = function (t) { if (void 0 === t) return m; m = "boolean" == typeof t && t; for (var n = 0; n < P.length; n++)P[n].Rotate(m), N[n].Rotate(m), W[n].Rotate(m) }, this.BuildDefault = function () { for (; P.length < 48;) { P.push(new ProcessColumn(0, 0, 0, 0)), P[P.length - 1].BuildDefault(), W.push(new BlinkStatus(0, 0, 0, 0)), W[P.length - 1].BuildDefault(), N.push(new NumberColumn(0, 0, 0, 0, P.length)); var t = new Date; s.push(t), a.push(t) } }, this.Rebuild = function () { for (var t = H.X() + 2 + 1, n = H.Y() + 2 + 1, i = H.W() - 3 * (P.length + 1), e = H.H() - 3 * (P.length + 1), r = 0; r < P.length; r++) { var o, s = 0, a = 0, l = 0, f = 0, u = 0, c = 0, h = 0, d = 0, p = 0, v = 0, g = 0, R = 0; m ? (c = u = f = n, e -= o = (o = Math.ceil(e / (P.length - r))) < 4 ? 4 : o, R = g = v = o, d = 10, p = 17, l = (a = (s = t) + (h = (h = H.W() - 12 - 10 - 17) < 40 ? 40 : h) + 3) + 10 + 3, s = (a = (l = t) + p + 3) + 10 + 3) : (l = a = s = t, i -= o = (o = Math.ceil(i / (P.length - r))) < 4 ? 4 : o, p = d = h = o, g = 10, R = 17, c = (u = (f = n) + (v = (v = H.H() - 12 - 10 - 17) < 40 ? 40 : v) + 3) + 10 + 3), P[r].RectParam(s, f, h, v), W[r].RectParam(a, u, d, g), N[r].RectParam(l, c, p, R), m ? n += v + 2 + 1 : t += h + 2 + 1 } }, this.Print = function (t) { u(), this.Rotate(m), this.Rebuild(), t.clearRect(H.X(), H.Y(), H.W(), H.H()), t.fillStyle = "#ddd", t.fillRect(H.X(), H.Y(), H.W(), H.H()); for (var n = 0; n < P.length; n++)P[n].Print(t), W[n].Print(t), N[n].Print(t); t.strokeStyle = "#333", t.strokeRect(H.X(), H.Y(), H.W(), H.H()) }, this.PrintText = function (t) { for (var n = 0; n < P.length; n++)P[n].PrintText(t), W[n].PrintText(t) }, this.Cycle = function (t, n) { if (null == t || "boolean" != typeof t) return l; t && (this.CheckDate(), clearTimeout(f), l = !0, u(n)) }, this.CheckDate = function () { for (var t, n = 0; n < P.length; n++)s[n] > a[n] && (t = s[n], s[n] = a[n], a[n] = t) } } \ No newline at end of file diff --git a/Diagram-Canvas/DiagramStoveDll/NumberColumn.js b/Diagram-Canvas/DiagramStoveDll/NumberColumn.js index 0c848d3..8f71564 100644 --- a/Diagram-Canvas/DiagramStoveDll/NumberColumn.js +++ b/Diagram-Canvas/DiagramStoveDll/NumberColumn.js @@ -2,7 +2,7 @@ //Основной прямоугольник var rAll = new Rectangle(x, y, w, h); //Текущий статус по простою - var prostoy = false; + var prostoy = true; /*Проценты поднимаются снизу вверх (false) *или слева направо (true)*/ var rotate = false; diff --git a/Diagram-Canvas/DiagramStoveDll/ProcessColumn.js b/Diagram-Canvas/DiagramStoveDll/ProcessColumn.js index e30a118..601492e 100644 --- a/Diagram-Canvas/DiagramStoveDll/ProcessColumn.js +++ b/Diagram-Canvas/DiagramStoveDll/ProcessColumn.js @@ -8,7 +8,7 @@ //Проценты статуса var percent = 0; //Номер статуса - var status = 0; + var status = -1; /*Проценты поднимаются снизу вверх (false) *или слева направо (true)*/ var rotate = false; @@ -41,7 +41,7 @@ this.Status = function (val) { if (val === undefined) return status; var v = parseInt(val); - status = (isNaN(v) || v < 0 || rStat.length === 0) ? 0 : + status = (isNaN(v) || v < -1 || rStat.length === 0) ? -1 : (v >= rStat.length) ? (rStat.length - 1) : v; }; //Функция изменения начальной координаты и размеров прямоугольника @@ -110,7 +110,7 @@ this.BuildDefault = function () { var defaultPoint = [57, 49, 49, 71, 28, 49, 21, 171, 114, 103]; var defaultColor = ["#0ff", "#00f", "#f00", "#0f0", "#0ff", "#00f", "#8500b6", "#f00", "#f0f", "#0f0"]; - while(rStat.length > 0) + while (rStat.length > 0) this.DelRStat(); for (var i = 0; i < defaultPoint.length; i++) this.AddRStat(i, defaultPoint[i], defaultColor[i]); diff --git a/Diagram-Canvas/Test.js b/Diagram-Canvas/Test.js index 5c89f5c..6277942 100644 --- a/Diagram-Canvas/Test.js +++ b/Diagram-Canvas/Test.js @@ -81,7 +81,7 @@ but2.onclick = function () { else for (var k = 0; k < count; k++) t.AddRStat(k, arrPoint[k], arrColor[k]); - t.Status(Math.floor(Math.random() * t.StatCount())); + t.Status(Math.floor(Math.random() * (t.StatCount() + 1) - 1)); t.Percent(Math.random() * 101); t.Print(ctx); if (chkText.checked) diff --git a/Diagram-Canvas/index.html b/Diagram-Canvas/index.html index c265233..6c20b41 100644 --- a/Diagram-Canvas/index.html +++ b/Diagram-Canvas/index.html @@ -19,7 +19,7 @@ Время клиента: 2018.02.27 08:41:24
- Время сервер: + Время сервера:
Время синхр.: diff --git a/Diagram-Canvas/index.js b/Diagram-Canvas/index.js index 3a03b77..541ee90 100644 --- a/Diagram-Canvas/index.js +++ b/Diagram-Canvas/index.js @@ -3,123 +3,166 @@ var htmlDateClient = document.getElementById("DateClient"); var htmlDateServer = document.getElementById("DateServer"); var htmlDateSynch = document.getElementById("DateSynch"); +var htmlErrMSG = document.getElementById("Error_Message"); + var canvas = document.getElementsByTagName("canvas")[0]; var ctx = canvas.getContext("2d"); var diagram = new Diagram(0, 0, canvas.width, canvas.height); +diagram.BuildDefault(); +diagram.Cycle(true); var update_button = document.getElementById("Update_Button"); //Global Params -//Start Show Date Now +//Show Date Now \/ \/ \/ function FNL(a, b) { for (var d = "" + a; d.length < b;)d = "0" + d; return d } function DateToString(date) { return date.getFullYear() + "." + FNL(date.getMonth() + 1, 2) + "." + FNL(date.getDate(), 2) + " " + FNL(date.getHours(), 2) + ":" + FNL(date.getMinutes(), 2) + ":" + FNL(date.getSeconds(), 2); } - var dateClient = null; var dateServer = null; +var dateSynch = null; function PrintDateNow() { - var tmp = new Date(); - htmlDateClient.innerHTML = DateToString(tmp); - if (dateServer !== null) - if (dateClient !== null) - tmp = - - htmlDateServer.innerHTML = timeNow; - htmlDateSynch.innerHTML = timeNow; + var dn = new Date(); + if (dateServer !== null && dateClient !== null) + dateServer.setMilliseconds(dateServer.getMilliseconds() + (dn - dateClient)); + dateClient = dn; + htmlDateClient.innerHTML = DateToString(dateClient); + if (dateServer != null) + htmlDateServer.innerHTML = DateToString(dateServer); + if (dateSynch !== null) + htmlDateSynch.innerHTML = DateToString(dateSynch); setTimeout(PrintDateNow, 1000); } - +function updateDateServer(date) { + if (typeof date.getMonth === 'function') { + dateClient = null; + dateServer = date; + } else + dateServer = null; +} +function updateDateSynch(date) { + if (typeof date.getMonth === 'function') { + dateSynch = date; + } else + dateSynch = null; +} PrintDateNow(); -/* -//End Show Date Now +//Show Date Now /\ /\ /\ -//Start Resize Canvas +//Resize Canvas \/ \/ \/ function Resize() { - if (window.innerWidth > window.innerHeight) { - canvas.height = window.innerHeight - 20 - - document.getElementById("First_Head").offsetHeight - - document.getElementById("Second_Head").offsetHeight - - document.getElementById("Third_Head").offsetHeight; - canvas.width = document.getElementById("Canvas_Body").offsetWidth; - diagramStove.Rotate = 0; - diagramStove.RectParam(0, 0, canvas.width, canvas.height); - } - else { - canvas.height = diagramStove.ProcessCount() * 25; - canvas.width = document.getElementById("Canvas_Body").offsetWidth; - diagramStove.Rotate = 1; - diagramStove.RectParam(0, 0, canvas.height, canvas.width); - } - ctx = canvas.getContext("2d"); - diagramStove.Print(ctx); + if (window.innerWidth > window.innerHeight) { + canvas.height = + window.innerHeight - 20 + - document.getElementById("First_Head").offsetHeight + - document.getElementById("Second_Head").offsetHeight + - document.getElementById("Third_Head").offsetHeight; + canvas.width = document.getElementById("Canvas_Body").offsetWidth; + diagram.Rotate(false); + diagram.RectParam(0.5, 0.5, canvas.width - 1, canvas.height - 1); + } + else { + canvas.height = diagram.ProcCount() * 25; + canvas.width = document.getElementById("Canvas_Body").offsetWidth; + diagram.Rotate(true); + diagram.RectParam(0.5, 0.5, canvas.width - 1, canvas.height - 1); + } + ctx = canvas.getContext("2d"); + diagram.Print(ctx); } window.addEventListener("load", Resize, false); window.addEventListener("resize", Resize, false); -//End Resize Canvas +//Resize Canvas /\ /\ /\ -//Start Update Status -diagramStove.BuildDefault(); +//Autoprint diagram \/ \/ \/ +function PrintCycle() { + diagram.Print(ctx); + setTimeout(PrintCycle, 1000); +} +PrintCycle(); +//Autoprint diagram /\ /\ /\ + +//Update Status \/ \/ \/ function UpdateStatus() { - var xhr = new XMLHttpRequest(); - xhr.open('POST', 'getinfo', true); - xhr.send(); - xhr.onreadystatechange = function () { - if (xhr.readyState != 4) return; - if (xhr.status != 200) { - document.getElementById("Error_Message").innerHTML = "Не удается установить соединение"; - $("#Error_Border").show(); - $("#Update_Button").show(); - return; - } - else - $("#Error_Border").hide(); - var Pech = JSON.parse(xhr.responseText); - ctx.clearRect(0, 0, canvas.width, canvas.height); - for (var i = 1; i <= diagramStove.ProcessCount(); i++) { - diagramStove.ChangeStatBlink(i, Pech[i].Bstatus); - diagramStove.ChangeStatProc(i, Pech[i].Pstatus); - diagramStove.ChangeStartDate(i, ConvDate(Pech[i].Start)); - diagramStove.ChangeEndDate(i, ConvDate(Pech[i].EndTeor)); - } - var b = ConvDate(Pech[0].DateNow); - dateUpdateHTML.innerHTML = - b.getFullYear() + "." + - FNL(b.getMonth() + 1, 2) + "." + - FNL(b.getDate(), 2) + " " + - FNL(b.getHours(), 2) + ":" + - FNL(b.getMinutes(), 2) + ":" + - FNL(b.getSeconds(), 2); - if (Math.abs(b - new Date()) > 60000) { - document.getElementById("Error_Message").innerHTML = "Разница между системным и серверным временем " + Math.floor(Math.abs(b - new Date()) / 1000) + " сек"; - $("#Error_Border").show(); - $("#Update_Button").hide(); - } - else - $("#Error_Border").hide(); - setTimeout(UpdateStatus, 60000); - diagramStove.Print(ctx); + var xhr = new XMLHttpRequest(); + xhr.open('POST', 'https://test1.mbucb.ru/api/currcycles', true); + xhr.send(); + xhr.onreadystatechange = function () { + if (xhr.readyState != 4) return; + if (xhr.status != 200) { + htmlErrMSG.innerHTML = "Не удается установить соединение"; + $("#Error_Border").show(); + $("#Update_Button").show(); + return; } + else + $("#Error_Border").hide(); + var data = JSON.parse(xhr.responseText); + if (data.currTime === undefined) { + htmlErrMSG.innerHTML = "Ошибка в полученных данных"; + $("#Error_Border").show(); + $("#Update_Button").show(); + return; + } + updateDateSynch(new Date()); + updateDateServer(new Date(data.currTime)); + + + /* + ctx.clearRect(0, 0, canvas.width, canvas.height); + for (var i = 1; i <= diagramStove.ProcessCount(); i++) { + diagramStove.ChangeStatBlink(i, Pech[i].Bstatus); + diagramStove.ChangeStatProc(i, Pech[i].Pstatus); + diagramStove.ChangeStartDate(i, ConvDate(Pech[i].Start)); + diagramStove.ChangeEndDate(i, ConvDate(Pech[i].EndTeor)); + } + var b = ConvDate(Pech[0].DateNow); + dateUpdateHTML.innerHTML = + b.getFullYear() + "." + + FNL(b.getMonth() + 1, 2) + "." + + FNL(b.getDate(), 2) + " " + + FNL(b.getHours(), 2) + ":" + + FNL(b.getMinutes(), 2) + ":" + + FNL(b.getSeconds(), 2); + if (Math.abs(b - new Date()) > 60000) { + document.getElementById("Error_Message").innerHTML = "Разница между системным и серверным временем " + Math.floor(Math.abs(b - new Date()) / 1000) + " сек"; + $("#Error_Border").show(); + $("#Update_Button").hide(); + } + else + $("#Error_Border").hide(); + */ + diagram.Print(); + setTimeout(UpdateStatus, 60 * 1000); + } } UpdateStatus(); -function PrintCycle() { - diagramStove.Print(ctx); - setTimeout(PrintCycle, 1000); -} -PrintCycle(); - function ConvDate(a) { - a = a.split(".")[0].split("T"); - var d = a[0].split("-"); - var h = a[1].split(":"); - var date = new Date(d[0], parseInt(d[1]) - 1, d[2], h[0], h[1], h[2]); - return date; + a = a.split(".")[0].split("T"); + var d = a[0].split("-"); + var h = a[1].split(":"); + var date = new Date(d[0], parseInt(d[1]) - 1, d[2], h[0], h[1], h[2]); + return date; } update_button.onclick = function () { - UpdateStatus(); + UpdateStatus(); } +//Update Status /\ /\ /\ + + //End Update Status + + + + +/* +//End Show Date Now + + + + */ \ No newline at end of file