diff --git a/experiment_data/analysis_state/abs-new 2.txt b/experiment_data/analysis_state/abs-new 2.txt new file mode 100644 index 0000000..648bf1f --- /dev/null +++ b/experiment_data/analysis_state/abs-new 2.txt @@ -0,0 +1,1870 @@ +35.44 0.904 +35.44 0.905 +35.433 0.905 +35.433 0.906 +35.433 0.906 +35.433 0.907 +35.433 0.907 +35.433 0.908 +35.433 0.908 +35.427 0.909 +35.427 0.909 +35.431 0.91 +35.431 0.91 +35.431 0.91 +35.434 0.91 +35.434 0.911 +35.422 0.911 +35.422 0.912 +35.422 0.912 +35.427 0.913 +35.427 0.913 +35.43 0.914 +35.43 0.914 +35.425 0.915 +35.425 0.915 +35.425 0.916 +35.414 0.916 +35.414 0.917 +35.419 0.917 +35.419 0.918 +35.419 0.918 +35.424 0.919 +35.424 0.919 +35.428 0.92 +35.428 0.92 +35.428 0.921 +35.426 0.921 +35.426 0.921 +35.42 0.921 +35.42 0.922 +35.415 0.923 +35.415 0.923 +35.415 0.924 +35.412 0.924 +35.412 0.925 +35.407 0.925 +35.407 0.926 +35.407 0.926 +35.405 0.927 +35.405 0.927 +35.403 0.928 +35.403 0.928 +35.403 0.929 +35.411 0.929 +35.411 0.93 +35.408 0.93 +35.408 0.931 +35.408 0.931 +35.414 0.933 +35.414 0.933 +35.411 0.935 +35.411 0.935 +35.418 0.936 +35.418 0.936 +35.418 0.938 +35.415 0.938 +35.415 0.94 +35.412 0.94 +35.412 0.941 +35.412 0.941 +35.411 0.943 +35.411 0.943 +35.41 0.945 +35.41 0.945 +35.41 0.947 +35.409 0.947 +35.409 0.949 +35.41 0.949 +35.41 0.95 +35.41 0.95 +35.411 0.952 +35.411 0.952 +35.412 0.954 +35.412 0.954 +35.414 0.956 +35.414 0.956 +35.414 0.958 +35.417 0.96 +35.417 0.96 +35.419 0.962 +35.419 0.962 +35.419 0.963 +35.421 0.963 +35.421 0.965 +35.424 0.965 +35.424 0.967 +35.424 0.967 +35.432 0.968 +35.432 0.968 +35.435 0.97 +35.435 0.97 +35.435 0.971 +35.449 0.971 +35.449 0.973 +35.452 0.973 +35.452 0.974 +35.463 0.974 +35.463 0.975 +35.463 0.975 +35.477 0.977 +35.477 0.977 +35.492 0.978 +35.492 0.978 +35.492 0.979 +35.497 0.979 +35.497 0.979 +35.507 0.979 +35.507 0.98 +35.507 0.98 +35.512 0.981 +35.512 0.981 +35.519 0.982 +35.519 0.982 +35.526 0.982 +35.526 0.982 +35.526 0.982 +35.543 0.982 +35.543 0.982 +35.554 0.982 +35.554 0.982 +35.554 0.982 +35.565 0.982 +35.565 0.981 +35.577 0.981 +35.577 0.98 +35.577 0.98 +35.601 0.98 +35.601 0.98 +35.613 0.979 +35.613 0.979 +35.613 0.978 +35.625 0.978 +35.625 0.976 +35.637 0.976 +35.637 0.974 +35.665 0.974 +35.665 0.973 +35.665 0.973 +35.682 0.97 +35.682 0.97 +35.7 0.968 +35.7 0.968 +35.7 0.964 +35.718 0.964 +35.718 0.962 +35.757 0.962 +35.757 0.958 +35.757 0.958 +35.775 0.955 +35.775 0.955 +35.793 0.951 +35.793 0.951 +35.813 0.948 +35.813 0.948 +35.813 0.944 +35.852 0.944 +35.852 0.939 +35.874 0.939 +35.874 0.935 +35.874 0.935 +35.898 0.929 +35.898 0.929 +35.923 0.923 +35.923 0.923 +35.923 0.917 +35.975 0.917 +35.975 0.911 +36.001 0.911 +36.001 0.904 +36.001 0.898 +36.025 0.898 +36.025 0.892 +36.05 0.892 +36.05 0.885 +36.104 0.885 +36.104 0.878 +36.104 0.878 +36.132 0.871 +36.132 0.871 +36.161 0.863 +36.161 0.863 +36.161 0.853 +36.194 0.853 +36.194 0.844 +36.228 0.844 +36.228 0.835 +36.228 0.835 +36.299 0.825 +36.299 0.825 +36.335 0.814 +36.335 0.814 +36.335 0.805 +36.367 0.805 +36.367 0.795 +36.401 0.795 +36.401 0.785 +36.401 0.785 +36.47 0.774 +36.47 0.774 +36.506 0.763 +36.506 0.763 +36.506 0.752 +36.544 0.752 +36.544 0.739 +36.587 0.739 +36.587 0.727 +36.675 0.727 +36.675 0.713 +36.675 0.713 +36.719 0.699 +36.719 0.699 +36.764 0.685 +36.764 0.685 +36.764 0.672 +36.805 0.672 +36.805 0.659 +36.888 0.659 +36.888 0.646 +36.888 0.646 +36.932 0.632 +36.932 0.632 +36.977 0.618 +36.977 0.618 +36.977 0.603 +37.021 0.603 +37.021 0.586 +37.127 0.586 +37.127 0.569 +37.18 0.569 +37.18 0.552 +37.18 0.552 +37.233 0.534 +37.233 0.534 +37.288 0.516 +37.288 0.516 +37.288 0.499 +37.387 0.499 +37.387 0.482 +37.439 0.482 +37.439 0.465 +37.439 0.447 +37.492 0.447 +37.492 0.43 +37.546 0.43 +37.546 0.411 +37.546 0.411 +37.663 0.391 +37.663 0.391 +37.725 0.37 +37.725 0.37 +37.787 0.349 +37.787 0.349 +37.787 0.328 +37.852 0.328 +37.852 0.307 +37.974 0.307 +37.974 0.288 +37.974 0.288 +38.033 0.269 +38.033 0.269 +38.092 0.249 +38.092 0.249 +38.092 0.229 +38.153 0.229 +38.153 0.209 +38.278 0.209 +38.278 0.188 +38.278 0.188 +38.349 0.165 +38.349 0.165 +38.421 0.142 +38.421 0.142 +38.421 0.119 +38.493 0.119 +38.493 0.095 +38.638 0.095 +38.638 0.072 +38.704 0.072 +38.704 0.052 +38.704 0.052 +38.771 0.031 +38.771 0.031 +38.839 0.009 +38.839 0.009 +38.839 -0.012 +38.979 -0.034 +38.979 -0.034 +39.051 -0.056 +39.051 -0.056 +39.131 -0.081 +39.131 -0.081 +39.131 -0.106 +39.212 -0.106 +39.212 -0.13 +39.375 -0.13 +39.375 -0.155 +39.375 -0.155 +39.456 -0.18 +39.456 -0.18 +39.529 -0.202 +39.529 -0.202 +39.529 -0.225 +39.605 -0.225 +39.605 -0.248 +39.759 -0.248 +39.759 -0.271 +39.759 -0.271 +39.839 -0.295 +39.839 -0.295 +39.918 -0.319 +39.918 -0.319 +40.007 -0.346 +40.007 -0.346 +40.007 -0.373 +40.187 -0.373 +40.187 -0.4 +40.278 -0.4 +40.278 -0.427 +40.369 -0.454 +40.369 -0.454 +40.369 -0.479 +40.452 -0.479 +40.452 -0.503 +40.619 -0.503 +40.619 -0.528 +40.619 -0.528 +40.705 -0.554 +40.705 -0.554 +40.793 -0.579 +40.793 -0.579 +40.793 -0.605 +40.881 -0.605 +40.881 -0.633 +41.076 -0.633 +41.076 -0.662 +41.076 -0.662 +41.174 -0.69 +41.174 -0.69 +41.273 -0.718 +41.273 -0.718 +41.273 -0.746 +41.371 -0.746 +41.371 -0.772 +41.55 -0.772 +41.55 -0.798 +41.642 -0.798 +41.642 -0.824 +41.642 -0.824 +41.735 -0.85 +41.735 -0.85 +41.827 -0.876 +41.827 -0.876 +41.827 -0.902 +42.027 -0.902 +42.027 -0.932 +42.133 -0.932 +42.133 -0.961 +42.133 -0.961 +42.239 -0.99 +42.239 -0.99 +42.345 -1.018 +42.345 -1.047 +42.547 -1.047 +42.547 -1.072 +42.547 -1.072 +42.644 -1.098 +42.644 -1.098 +42.743 -1.125 +42.743 -1.125 +42.743 -1.151 +42.841 -1.151 +42.841 -1.177 +43.043 -1.177 +43.043 -1.204 +43.043 -1.204 +43.156 -1.233 +43.156 -1.233 +43.268 -1.263 +43.268 -1.263 +43.268 -1.292 +43.38 -1.292 +43.38 -1.321 +43.606 -1.321 +43.606 -1.349 +43.709 -1.349 +43.709 -1.375 +43.709 -1.375 +43.813 -1.401 +43.813 -1.401 +43.917 -1.428 +43.917 -1.428 +43.917 -1.454 +44.022 -1.454 +44.022 -1.481 +44.234 -1.508 +44.234 -1.508 +44.353 -1.538 +44.353 -1.538 +44.353 -1.567 +44.472 -1.567 +44.472 -1.596 +44.591 -1.596 +44.591 -1.626 +44.591 -1.626 +44.83 -1.655 +44.83 -1.655 +44.937 -1.681 +44.937 -1.681 +44.937 -1.708 +45.047 -1.708 +45.047 -1.734 +45.156 -1.734 +45.156 -1.76 +45.156 -1.76 +45.378 -1.787 +45.378 -1.787 +45.49 -1.813 +45.49 -1.813 +45.617 -1.842 +45.617 -1.842 +45.617 -1.871 +45.742 -1.871 +45.742 -1.9 +45.991 -1.9 +45.991 -1.928 +45.991 -1.928 +46.115 -1.956 +46.115 -1.956 +46.227 -1.981 +46.227 -1.981 +46.341 -2.007 +46.341 -2.007 +46.341 -2.032 +46.57 -2.032 +46.57 -2.058 +46.687 -2.083 +46.687 -2.083 +46.687 -2.109 +46.805 -2.109 +46.805 -2.136 +46.935 -2.136 +46.935 -2.164 +46.935 -2.164 +47.195 -2.191 +47.195 -2.191 +47.323 -2.217 +47.323 -2.217 +47.323 -2.244 +47.452 -2.244 +47.452 -2.268 +47.568 -2.268 +47.568 -2.292 +47.805 -2.292 +47.805 -2.316 +47.805 -2.316 +47.924 -2.34 +47.924 -2.34 +48.045 -2.364 +48.045 -2.364 +48.167 -2.388 +48.167 -2.388 +48.167 -2.414 +48.434 -2.414 +48.434 -2.439 +48.567 -2.439 +48.567 -2.465 +48.567 -2.465 +48.701 -2.49 +48.701 -2.49 +48.834 -2.515 +48.834 -2.515 +48.834 -2.538 +49.075 -2.538 +49.075 -2.561 +49.196 -2.561 +49.196 -2.584 +49.196 -2.584 +49.32 -2.606 +49.32 -2.629 +49.443 -2.629 +49.443 -2.652 +49.443 -2.652 +49.705 -2.676 +49.705 -2.676 +49.842 -2.7 +49.842 -2.7 +49.977 -2.724 +49.977 -2.724 +49.977 -2.748 +50.113 -2.748 +50.113 -2.771 +50.374 -2.771 +50.374 -2.792 +50.374 -2.792 +50.498 -2.813 +50.498 -2.813 +50.622 -2.835 +50.622 -2.835 +50.622 -2.855 +50.748 -2.855 +50.748 -2.876 +51.001 -2.876 +51.001 -2.897 +51.001 -2.897 +51.142 -2.92 +51.142 -2.92 +51.272 -2.942 +51.272 -2.942 +51.272 -2.964 +51.404 -2.964 +51.404 -2.985 +51.667 -2.985 +51.667 -3.007 +51.787 -3.007 +51.787 -3.026 +51.787 -3.026 +51.906 -3.045 +51.906 -3.045 +52.037 -3.064 +52.037 -3.064 +52.037 -3.083 +52.303 -3.083 +52.303 -3.103 +52.426 -3.103 +52.426 -3.122 +52.426 -3.122 +52.573 -3.143 +52.573 -3.143 +52.709 -3.164 +52.709 -3.164 +52.846 -3.185 +52.846 -3.205 +52.846 -3.205 +53.138 -3.225 +53.138 -3.225 +53.271 -3.243 +53.271 -3.243 +53.271 -3.261 +53.402 -3.261 +53.402 -3.28 +53.525 -3.28 +53.525 -3.298 +53.525 -3.298 +53.785 -3.316 +53.785 -3.316 +53.92 -3.335 +53.92 -3.335 +53.92 -3.355 +54.059 -3.355 +54.059 -3.374 +54.199 -3.374 +54.199 -3.393 +54.199 -3.393 +54.487 -3.412 +54.487 -3.412 +54.625 -3.431 +54.625 -3.431 +54.749 -3.448 +54.749 -3.448 +54.749 -3.464 +54.876 -3.464 +54.876 -3.481 +55.13 -3.481 +55.13 -3.497 +55.13 -3.497 +55.259 -3.514 +55.259 -3.514 +55.389 -3.531 +55.389 -3.531 +55.389 -3.549 +55.533 -3.549 +55.533 -3.566 +55.821 -3.566 +55.821 -3.584 +55.965 -3.584 +55.965 -3.601 +55.965 -3.601 +56.108 -3.618 +56.108 -3.633 +56.238 -3.633 +56.238 -3.649 +56.238 -3.649 +56.5 -3.663 +56.5 -3.663 +56.631 -3.678 +56.631 -3.678 +56.631 -3.693 +56.763 -3.693 +56.763 -3.708 +56.896 -3.708 +56.896 -3.724 +57.189 -3.724 +57.189 -3.739 +57.189 -3.739 +57.335 -3.755 +57.335 -3.755 +57.48 -3.77 +57.48 -3.77 +57.48 -3.786 +57.624 -3.786 +57.624 -3.799 +57.886 -3.799 +57.886 -3.813 +58.017 -3.813 +58.017 -3.826 +58.017 -3.826 +58.15 -3.839 +58.15 -3.839 +58.283 -3.851 +58.283 -3.851 +58.283 -3.864 +58.564 -3.864 +58.564 -3.878 +58.711 -3.892 +58.711 -3.892 +58.711 -3.905 +58.858 -3.905 +58.858 -3.919 +59.004 -3.919 +59.004 -3.932 +59.004 -3.932 +59.28 -3.943 +59.28 -3.943 +59.413 -3.955 +59.413 -3.955 +59.546 -3.967 +59.546 -3.967 +59.546 -3.978 +59.68 -3.978 +59.68 -3.989 +59.949 -3.989 +59.949 -4 +59.949 -4 +60.097 -4.012 +60.097 -4.012 +60.245 -4.024 +60.245 -4.024 +60.245 -4.036 +60.392 -4.036 +60.392 -4.047 +60.685 -4.047 +60.685 -4.058 +60.817 -4.058 +60.817 -4.069 +60.817 -4.069 +60.949 -4.079 +60.949 -4.079 +61.083 -4.089 +61.083 -4.089 +61.083 -4.098 +61.351 -4.098 +61.351 -4.108 +61.486 -4.108 +61.486 -4.118 +61.486 -4.129 +61.635 -4.129 +61.635 -4.139 +61.783 -4.139 +61.783 -4.149 +62.077 -4.149 +62.077 -4.158 +62.077 -4.158 +62.223 -4.168 +62.223 -4.168 +62.354 -4.177 +62.354 -4.177 +62.354 -4.185 +62.487 -4.185 +62.487 -4.194 +62.62 -4.194 +62.62 -4.203 +62.62 -4.203 +62.889 -4.212 +62.889 -4.212 +63.024 -4.22 +63.024 -4.22 +63.024 -4.229 +63.172 -4.229 +63.172 -4.238 +63.32 -4.238 +63.32 -4.247 +63.32 -4.247 +63.613 -4.255 +63.613 -4.255 +63.759 -4.264 +63.759 -4.264 +63.891 -4.272 +63.891 -4.272 +63.891 -4.28 +64.023 -4.28 +64.023 -4.287 +64.29 -4.287 +64.29 -4.295 +64.29 -4.295 +64.424 -4.303 +64.424 -4.303 +64.559 -4.31 +64.559 -4.31 +64.559 -4.318 +64.707 -4.318 +64.707 -4.326 +65.001 -4.326 +65.001 -4.334 +65.147 -4.334 +65.147 -4.342 +65.147 -4.342 +65.292 -4.349 +65.292 -4.355 +65.424 -4.355 +65.424 -4.362 +65.424 -4.362 +65.69 -4.369 +65.69 -4.369 +65.824 -4.375 +65.824 -4.375 +65.824 -4.382 +65.957 -4.382 +65.957 -4.388 +66.092 -4.388 +66.092 -4.395 +66.092 -4.395 +66.387 -4.402 +66.387 -4.402 +66.533 -4.408 +66.533 -4.408 +66.533 -4.414 +66.679 -4.414 +66.679 -4.421 +66.824 -4.421 +66.824 -4.427 +67.087 -4.427 +67.087 -4.432 +67.087 -4.432 +67.219 -4.438 +67.219 -4.438 +67.352 -4.444 +67.352 -4.444 +67.352 -4.449 +67.486 -4.449 +67.486 -4.455 +67.771 -4.455 +67.771 -4.461 +67.771 -4.461 +67.919 -4.467 +67.919 -4.467 +68.066 -4.473 +68.066 -4.473 +68.066 -4.478 +68.212 -4.478 +68.212 -4.484 +68.49 -4.484 +68.49 -4.489 +68.622 -4.489 +68.622 -4.494 +68.622 -4.494 +68.755 -4.499 +68.755 -4.499 +68.888 -4.504 +68.888 -4.504 +68.888 -4.509 +69.154 -4.509 +69.154 -4.514 +69.301 -4.514 +69.301 -4.519 +69.301 -4.519 +69.446 -4.525 +69.446 -4.53 +69.592 -4.53 +69.592 -4.535 +69.881 -4.535 +69.881 -4.54 +69.881 -4.54 +70.011 -4.545 +70.011 -4.545 +70.144 -4.55 +70.144 -4.55 +70.144 -4.554 +70.277 -4.554 +70.277 -4.559 +70.544 -4.559 +70.544 -4.563 +70.544 -4.563 +70.678 -4.568 +70.678 -4.568 +70.826 -4.573 +70.826 -4.573 +70.826 -4.577 +70.973 -4.577 +70.973 -4.582 +71.264 -4.582 +71.264 -4.587 +71.264 -4.587 +71.408 -4.591 +71.408 -4.591 +71.539 -4.595 +71.539 -4.595 +71.539 -4.599 +71.671 -4.599 +71.671 -4.603 +71.935 -4.603 +71.935 -4.607 +72.068 -4.607 +72.068 -4.611 +72.068 -4.611 +72.202 -4.616 +72.202 -4.616 +72.349 -4.62 +72.349 -4.62 +72.349 -4.624 +72.495 -4.624 +72.495 -4.629 +72.785 -4.629 +72.785 -4.633 +72.785 -4.633 +72.929 -4.637 +72.929 -4.637 +73.059 -4.641 +73.059 -4.641 +73.059 -4.645 +73.19 -4.645 +73.19 -4.649 +73.454 -4.653 +73.454 -4.653 +73.587 -4.657 +73.587 -4.657 +73.587 -4.66 +73.72 -4.66 +73.72 -4.665 +73.867 -4.665 +73.867 -4.669 +73.867 -4.669 +74.157 -4.673 +74.157 -4.673 +74.302 -4.677 +74.302 -4.677 +74.302 -4.681 +74.445 -4.681 +74.445 -4.685 +74.575 -4.685 +74.575 -4.689 +74.837 -4.689 +74.837 -4.692 +74.837 -4.692 +74.969 -4.696 +74.969 -4.696 +75.101 -4.699 +75.101 -4.699 +75.101 -4.703 +75.234 -4.703 +75.234 -4.707 +75.526 -4.707 +75.526 -4.711 +75.526 -4.711 +75.67 -4.715 +75.67 -4.715 +75.814 -4.718 +75.814 -4.718 +75.814 -4.722 +75.958 -4.722 +75.958 -4.725 +76.218 -4.725 +76.218 -4.729 +76.349 -4.729 +76.349 -4.732 +76.349 -4.732 +76.48 -4.736 +76.48 -4.736 +76.612 -4.739 +76.612 -4.742 +76.612 -4.742 +76.891 -4.746 +76.891 -4.746 +77.036 -4.75 +77.036 -4.75 +77.036 -4.754 +77.18 -4.754 +77.18 -4.757 +77.324 -4.757 +77.324 -4.761 +77.324 -4.761 +77.596 -4.764 +77.596 -4.764 +77.727 -4.768 +77.727 -4.768 +77.857 -4.771 +77.857 -4.771 +77.857 -4.774 +77.989 -4.774 +77.989 -4.778 +78.253 -4.778 +78.253 -4.781 +78.253 -4.781 +78.39 -4.785 +78.39 -4.785 +78.535 -4.789 +78.535 -4.789 +78.68 -4.793 +78.68 -4.793 +78.68 -4.797 +78.968 -4.797 +78.968 -4.8 +79.097 -4.8 +79.097 -4.804 +79.097 -4.804 +79.228 -4.807 +79.228 -4.807 +79.359 -4.811 +79.359 -4.815 +79.359 -4.815 +79.622 -4.818 +79.622 -4.818 +79.754 -4.822 +79.754 -4.822 +79.9 -4.826 +79.9 -4.826 +79.9 -4.831 +80.036 -4.831 +80.036 -4.835 +80.317 -4.835 +80.317 -4.839 +80.317 -4.839 +80.461 -4.843 +80.461 -4.843 +80.583 -4.847 +80.583 -4.847 +80.583 -4.851 +80.714 -4.851 +80.714 -4.855 +80.962 -4.855 +80.962 -4.859 +80.962 -4.859 +81.097 -4.863 +81.097 -4.863 +81.232 -4.867 +81.232 -4.867 +81.232 -4.871 +81.372 -4.871 +81.372 -4.876 +81.652 -4.876 +81.652 -4.882 +81.791 -4.882 +81.791 -4.887 +81.791 -4.887 +81.93 -4.893 +81.93 -4.893 +82.056 -4.898 +82.056 -4.898 +82.056 -4.902 +82.31 -4.902 +82.31 -4.907 +82.439 -4.907 +82.439 -4.911 +82.439 -4.911 +82.568 -4.916 +82.568 -4.916 +82.697 -4.921 +82.697 -4.926 +82.841 -4.926 +82.841 -4.931 +82.841 -4.931 +83.127 -4.936 +83.127 -4.936 +83.278 -4.942 +83.278 -4.942 +83.278 -4.947 +83.419 -4.947 +83.419 -4.952 +83.547 -4.952 +83.547 -4.957 +83.547 -4.957 +83.805 -4.962 +83.805 -4.962 +83.933 -4.967 +83.933 -4.967 +83.933 -4.972 +84.062 -4.972 +84.062 -4.978 +84.194 -4.978 +84.194 -4.983 +84.49 -4.983 +84.49 -4.989 +84.49 -4.989 +84.634 -4.996 +84.634 -4.996 +84.777 -5.002 +84.777 -5.002 +84.777 -5.008 +84.917 -5.008 +84.917 -5.013 +85.173 -5.013 +85.173 -5.019 +85.301 -5.019 +85.301 -5.025 +85.301 -5.031 +85.431 -5.031 +85.431 -5.037 +85.561 -5.037 +85.561 -5.043 +85.561 -5.043 +85.838 -5.05 +85.838 -5.05 +85.982 -5.057 +85.982 -5.057 +85.982 -5.064 +86.125 -5.064 +86.125 -5.071 +86.268 -5.071 +86.268 -5.079 +86.538 -5.079 +86.538 -5.085 +86.538 -5.085 +86.667 -5.092 +86.667 -5.092 +86.798 -5.099 +86.798 -5.099 +86.798 -5.106 +86.93 -5.106 +86.93 -5.113 +87.194 -5.113 +87.194 -5.12 +87.194 -5.12 +87.339 -5.127 +87.339 -5.127 +87.483 -5.135 +87.483 -5.135 +87.627 -5.143 +87.627 -5.151 +87.627 -5.151 +87.914 -5.158 +87.914 -5.158 +88.044 -5.165 +88.044 -5.165 +88.044 -5.172 +88.174 -5.172 +88.174 -5.179 +88.304 -5.179 +88.304 -5.186 +88.567 -5.186 +88.567 -5.193 +88.567 -5.193 +88.7 -5.2 +88.7 -5.2 +88.846 -5.208 +88.846 -5.208 +88.846 -5.216 +88.993 -5.216 +88.993 -5.224 +89.28 -5.224 +89.28 -5.232 +89.28 -5.232 +89.423 -5.239 +89.423 -5.239 +89.553 -5.246 +89.553 -5.246 +89.553 -5.253 +89.684 -5.253 +89.684 -5.26 +89.946 -5.26 +89.946 -5.267 +90.079 -5.267 +90.079 -5.274 +90.079 -5.274 +90.212 -5.281 +90.212 -5.281 +90.358 -5.288 +90.358 -5.288 +90.358 -5.296 +90.65 -5.303 +90.65 -5.303 +90.795 -5.311 +90.795 -5.311 +90.938 -5.318 +90.938 -5.318 +90.938 -5.325 +91.068 -5.325 +91.068 -5.331 +91.331 -5.331 +91.331 -5.338 +91.331 -5.338 +91.463 -5.345 +91.463 -5.345 +91.596 -5.351 +91.596 -5.351 +91.596 -5.358 +91.728 -5.358 +91.728 -5.365 +92.021 -5.365 +92.021 -5.372 +92.021 -5.372 +92.166 -5.38 +92.166 -5.38 +92.309 -5.387 +92.309 -5.387 +92.309 -5.394 +92.454 -5.394 +92.454 -5.4 +92.715 -5.4 +92.715 -5.406 +92.846 -5.406 +92.846 -5.413 +92.846 -5.413 +92.978 -5.419 +92.978 -5.419 +93.111 -5.425 +93.111 -5.425 +93.111 -5.432 +93.39 -5.432 +93.39 -5.438 +93.536 -5.438 +93.536 -5.446 +93.536 -5.446 +93.683 -5.453 +93.683 -5.453 +93.828 -5.46 +93.828 -5.467 +94.103 -5.467 +94.103 -5.473 +94.103 -5.473 +94.234 -5.479 +94.234 -5.479 +94.367 -5.485 +94.367 -5.485 +94.367 -5.491 +94.5 -5.491 +94.5 -5.496 +94.633 -5.496 +94.633 -5.502 +94.633 -5.502 +94.913 -5.509 +94.913 -5.509 +95.06 -5.515 +95.06 -5.515 +95.206 -5.521 +95.206 -5.521 +95.206 -5.528 +95.351 -5.528 +95.351 -5.533 +95.625 -5.533 +95.625 -5.539 +95.625 -5.539 +95.757 -5.543 +95.757 -5.543 +95.891 -5.548 +95.891 -5.548 +95.891 -5.553 +96.024 -5.553 +96.024 -5.558 +96.293 -5.558 +96.293 -5.563 +96.293 -5.563 +96.441 -5.567 +96.441 -5.567 +96.588 -5.572 +96.588 -5.572 +96.735 -5.576 +96.735 -5.581 +96.735 -5.581 +97.026 -5.585 +97.026 -5.585 +97.158 -5.589 +97.158 -5.589 +97.158 -5.593 +97.291 -5.593 +97.291 -5.597 +97.424 -5.597 +97.424 -5.6 +97.424 -5.6 +97.692 -5.604 +97.692 -5.604 +97.826 -5.608 +97.826 -5.608 +97.975 -5.611 +97.975 -5.611 +97.975 -5.615 +98.122 -5.615 +98.122 -5.618 +98.416 -5.618 +98.416 -5.622 +98.416 -5.622 +98.562 -5.626 +98.562 -5.626 +98.694 -5.629 +98.694 -5.629 +98.694 -5.633 +98.828 -5.633 +98.828 -5.636 +99.095 -5.636 +99.095 -5.639 +99.23 -5.639 +99.23 -5.643 +99.23 -5.643 +99.365 -5.646 +99.365 -5.646 +99.513 -5.65 +99.513 -5.65 +99.513 -5.654 +99.81 -5.654 +99.81 -5.658 +99.957 -5.662 +99.957 -5.662 +99.957 -5.666 +100.103 -5.666 +100.103 -5.67 +100.234 -5.67 +100.234 -5.675 +100.234 -5.675 +100.488 -5.679 +100.488 -5.679 +100.621 -5.684 +100.621 -5.684 +100.621 -5.688 +100.754 -5.688 +100.754 -5.694 +100.88 -5.694 +100.88 -5.7 +101.169 -5.7 +101.169 -5.706 +101.169 -5.706 +101.308 -5.713 +101.308 -5.713 +101.456 -5.72 +101.456 -5.72 +101.456 -5.727 +101.594 -5.727 +101.594 -5.733 +101.853 -5.733 +101.853 -5.74 +101.853 -5.74 +101.981 -5.747 +101.981 -5.747 +102.109 -5.754 +102.109 -5.754 +102.238 -5.761 +102.238 -5.761 +102.238 -5.768 +102.512 -5.768 +102.512 -5.778 +102.655 -5.778 +102.655 -5.787 +102.655 -5.787 +102.799 -5.796 +102.799 -5.796 +102.943 -5.805 +102.943 -5.805 +102.943 -5.815 +103.215 -5.815 +103.215 -5.823 +103.346 -5.823 +103.346 -5.833 +103.346 -5.833 +103.478 -5.842 +103.478 -5.842 +103.61 -5.851 +103.61 -5.861 +103.878 -5.861 +103.878 -5.861 +103.878 -5.871 +104.024 -5.883 +104.024 -5.883 +104.171 -5.894 +104.171 -5.894 +104.171 -5.905 +104.317 -5.905 +104.317 -5.917 +104.608 -5.917 +104.608 -5.928 +104.608 -5.928 +104.738 -5.939 +104.738 -5.939 +104.87 -5.949 +104.87 -5.949 +104.87 -5.96 +105.003 -5.96 +105.003 -5.971 +105.272 -5.971 +105.272 -5.982 +105.272 -5.982 +105.407 -5.993 +105.407 -5.993 +105.555 -6.005 +105.555 -6.005 +105.555 -6.017 +105.703 -6.017 +105.703 -6.029 +105.998 -6.029 +105.998 -6.041 +106.143 -6.041 +106.143 -6.053 +106.143 -6.053 +106.275 -6.063 +106.275 -6.063 +106.408 -6.074 +106.408 -6.074 +106.408 -6.085 +106.678 -6.085 +106.678 -6.096 +106.812 -6.096 +106.812 -6.107 +106.948 -6.117 +106.948 -6.117 +106.948 -6.129 +107.098 -6.129 +107.098 -6.14 +107.395 -6.14 +107.395 -6.152 +107.395 -6.152 +107.543 -6.163 +107.543 -6.163 +107.69 -6.174 +107.69 -6.174 +107.69 -6.184 +107.823 -6.184 +107.823 -6.194 +107.957 -6.194 +107.957 -6.204 +107.957 -6.204 +108.227 -6.214 +108.227 -6.214 +108.363 -6.224 +108.363 -6.224 +108.499 -6.234 +108.499 -6.234 +108.499 -6.245 +108.65 -6.245 +108.65 -6.256 +108.947 -6.256 +108.947 -6.266 +108.947 -6.266 +109.095 -6.277 +109.095 -6.277 +109.243 -6.287 +109.243 -6.287 +109.243 -6.296 +109.376 -6.305 +109.376 -6.305 +109.646 -6.315 +109.646 -6.315 +109.782 -6.324 +109.782 -6.324 +109.782 -6.334 +109.918 -6.334 +109.918 -6.343 +110.054 -6.343 +110.054 -6.353 +110.054 -6.353 +110.355 -6.363 +110.355 -6.363 +110.505 -6.373 +110.505 -6.373 +110.505 -6.383 +110.653 -6.383 +110.653 -6.393 +110.801 -6.393 +110.801 -6.402 +111.07 -6.402 +111.07 -6.41 +111.07 -6.41 +111.205 -6.418 +111.205 -6.418 +111.341 -6.426 +111.341 -6.426 +111.341 -6.433 +111.477 -6.433 +111.477 -6.441 +111.766 -6.441 +111.766 -6.448 +111.766 -6.448 +111.917 -6.456 +111.917 -6.456 +112.067 -6.462 +112.067 -6.462 +112.067 -6.469 +112.216 -6.469 +112.216 -6.475 +112.5 -6.475 +112.5 -6.48 +112.5 -6.48 +112.635 -6.486 +112.635 -6.486 +112.772 -6.491 +112.772 -6.491 +112.772 -6.495 +112.907 -6.495 +112.907 -6.499 +113.182 -6.499 +113.182 -6.503 +113.335 -6.503 +113.335 -6.506 +113.335 -6.506 +113.485 -6.509 +113.485 -6.509 +113.635 -6.512 +113.635 -6.512 +113.635 -6.514 +113.934 -6.514 +113.934 -6.516 +114.069 -6.516 +114.069 -6.518 +114.069 -6.518 +114.204 -6.519 +114.204 -6.519 +114.34 -6.52 +114.34 -6.52 +114.34 -6.521 +114.615 -6.521 +114.615 -6.521 +114.752 -6.521 +114.752 -6.521 +114.752 -6.521 +114.905 -6.521 +114.905 -6.52 +115.056 -6.52 +115.056 -6.52 +115.357 -6.52 +115.357 -6.519 +115.357 -6.519 +115.507 -6.518 +115.507 -6.518 +115.643 -6.517 +115.643 -6.517 +115.643 -6.516 +115.779 -6.516 +115.779 -6.515 +116.054 -6.515 +116.054 -6.514 +116.054 -6.514 +116.192 -6.513 +116.192 -6.513 +116.331 -6.512 +116.331 -6.511 +116.483 -6.511 +116.483 -6.51 +116.787 -6.51 +116.787 -6.509 +116.787 -6.509 +116.937 -6.508 +116.937 -6.508 +117.088 -6.507 +117.088 -6.507 +117.088 -6.507 +117.224 -6.507 +117.224 -6.506 +117.498 -6.506 +117.498 -6.505 +117.498 -6.505 +117.636 -6.505 +117.636 -6.505 +117.775 -6.505 +117.775 -6.505 +117.775 -6.504 +117.914 -6.504 +117.914 -6.504 +118.068 -6.504 +118.068 -6.505 +118.068 -6.505 +118.373 -6.505 +118.373 -6.505 +118.524 -6.506 +118.524 -6.506 +118.674 -6.507 +118.674 -6.507 +118.674 -6.508 +118.81 -6.508 +118.81 -6.509 +119.087 -6.509 +119.087 -6.51 +119.087 -6.51 +119.225 -6.512 +119.225 -6.512 +119.365 -6.514 +119.365 -6.514 +119.365 -6.516 +119.504 -6.516 +119.504 -6.519 +119.811 -6.519 +119.811 -6.523 +119.811 -6.523 +119.964 -6.526 +119.964 -6.526 +120.116 -6.53 +120.116 -6.53 +120.116 -6.534 +120.268 -6.534 +120.268 -6.537 +120.544 -6.537 +120.544 -6.541 +120.544 -6.541 +120.682 -6.545 +120.682 -6.545 +120.821 -6.549 +120.821 -6.549 +120.96 -6.554 +120.96 -6.554 +120.96 -6.558 +121.256 -6.558 +121.256 -6.564 +121.411 -6.57 +121.411 -6.57 +121.411 -6.576 +121.564 -6.576 +121.564 -6.582 +121.716 -6.582 +121.716 -6.589 +121.716 -6.589 +122.004 -6.595 +122.004 -6.595 +122.143 -6.602 +122.143 -6.602 +122.143 -6.608 +122.282 -6.608 +122.282 -6.615 +122.421 -6.615 +122.421 -6.622 +122.421 -6.622 +122.703 -6.629 +122.703 -6.629 +122.858 -6.638 +122.858 -6.638 +122.858 -6.646 +123.011 -6.646 +123.011 -6.655 +123.165 -6.655 +123.165 -6.664 +123.469 -6.664 +123.469 -6.674 +123.469 -6.674 +123.606 -6.682 +123.606 -6.682 +123.743 -6.691 +123.743 -6.691 +123.743 -6.699 +123.883 -6.699 +123.883 -6.708 +124.163 -6.708 +124.163 -6.717 +124.163 -6.717 +124.304 -6.727 +124.304 -6.727 +124.459 -6.737 +124.459 -6.737 +124.459 -6.748 +124.612 -6.748 +124.612 -6.759 +124.919 -6.759 +124.919 -6.77 +124.919 -6.77 +125.07 -6.781 +125.07 -6.781 +125.207 -6.791 +125.207 -6.791 +125.207 -6.801 +125.346 -6.801 +125.346 -6.811 +125.626 -6.811 +125.626 -6.821 +125.767 -6.821 +125.767 -6.832 +125.767 -6.832 +125.907 -6.843 +125.907 -6.843 +126.063 -6.854 +126.063 -6.854 +126.063 -6.866 +126.373 -6.866 +126.373 -6.878 +126.526 -6.878 +126.526 -6.889 +126.526 -6.889 +126.679 -6.901 +126.679 -6.901 +126.818 -6.912 +126.818 -6.912 +126.818 -6.923 +127.096 -6.923 +127.096 -6.934 +127.236 -6.945 +127.236 -6.945 +127.236 -6.956 +127.375 -6.956 +127.375 -6.967 +127.516 -6.967 +127.516 -6.979 +127.516 -6.979 +127.827 -6.991 +127.827 -6.991 +127.98 -7.003 +127.98 -7.003 +128.133 -7.015 +128.133 -7.015 +128.133 -7.027 +128.285 -7.027 +128.285 -7.037 +128.563 -7.037 +128.563 -7.048 +128.563 -7.048 +128.702 -7.059 +128.702 -7.059 +128.842 -7.07 +128.842 -7.07 +128.842 -7.081 +128.983 -7.081 +128.983 -7.092 +129.124 -7.092 +129.124 -7.104 +129.124 -7.104 +129.436 -7.116 +129.436 -7.116 +129.59 -7.128 +129.59 -7.128 +129.743 -7.14 +129.743 -7.14 +129.743 -7.151 +129.897 -7.151 +129.897 -7.162 +130.174 -7.162 +130.174 -7.172 +130.174 -7.172 +130.315 -7.183 +130.315 -7.183 +130.455 -7.194 +130.455 -7.194 +130.455 -7.204 +130.596 -7.204 +130.596 -7.215 +130.894 -7.215 +130.894 -7.226 +130.894 -7.226 +131.049 -7.238 +131.049 -7.238 +131.203 -7.249 +131.203 -7.249 +131.203 -7.26 +131.356 -7.26 +131.356 -7.272 +131.647 -7.272 +131.647 -7.282 +131.647 -7.282 +131.785 -7.292 +131.785 -7.292 +131.925 -7.302 +131.925 -7.302 +132.065 -7.312 +132.065 -7.312 +132.065 -7.322 +132.346 -7.322 +132.346 -7.332 +132.502 -7.332 +132.502 -7.343 +132.502 -7.343 +132.656 -7.354 +132.656 -7.354 +132.809 -7.365 +132.809 -7.375 +132.809 -7.375 +133.113 -7.385 +133.113 -7.385 +133.251 -7.395 +133.251 -7.395 +133.251 -7.404 +133.389 -7.404 +133.389 -7.414 +133.529 -7.414 +133.529 -7.423 +133.529 -7.423 +133.808 -7.433 +133.808 -7.433 +133.949 -7.442 +133.949 -7.442 +134.105 -7.452 +134.105 -7.452 +134.105 -7.462 +134.259 -7.462 +134.259 -7.472 +134.566 -7.472 +134.566 -7.481 +134.566 -7.481 +134.718 -7.49 +134.718 -7.49 +134.855 -7.499 +134.855 -7.499 +134.855 -7.507 +134.994 -7.507 +134.994 -7.516 +135.273 -7.516 +135.273 -7.524 +135.414 -7.524 +135.414 -7.533 +135.414 -7.533 +135.554 -7.541 +135.554 -7.541 +135.709 -7.55 +135.709 -7.55 +135.709 -7.558 +136.017 -7.558 +136.017 -7.567 +136.171 -7.567 +136.171 -7.575 +136.171 -7.583 +136.323 -7.583 +136.323 -7.59 +136.461 -7.59 +136.461 -7.597 +136.738 -7.597 +136.738 -7.604 +136.738 -7.604 +136.878 -7.61 +136.878 -7.61 +137.019 -7.617 +137.019 -7.617 +137.019 -7.623 +137.159 -7.623 +137.159 -7.629 +137.469 -7.629 +137.469 -7.635 +137.469 -7.635 +137.622 -7.641 +137.622 -7.641 +137.775 -7.646 +137.775 -7.646 +137.775 -7.65 +137.928 -7.65 +137.928 -7.654 +138.204 -7.654 +138.204 -7.658 +138.204 -7.658 +138.342 -7.661 +138.342 -7.661 +138.482 -7.664 +138.482 -7.664 +138.622 -7.667 +138.622 -7.667 +138.622 -7.669 +138.916 -7.669 +138.916 -7.67 +139.07 -7.67 +139.07 -7.671 +139.07 -7.671 +139.223 -7.671 +139.223 -7.671 +139.376 -7.671 +139.376 -7.671 +139.376 -7.67 +139.665 -7.67 +139.665 -7.669 +139.803 -7.668 +139.803 -7.668 +139.942 -7.666 +139.942 -7.666 +139.942 -7.664 +140.081 -7.664 +140.081 -7.661 +140.22 -7.661 +140.22 -7.657 +140.22 -7.657 +140.515 -7.653 +140.515 -7.653 +140.669 -7.648 +140.669 -7.648 +140.669 -7.643 +140.821 -7.643 +140.821 -7.637 +140.973 -7.637 +140.973 -7.631 +141.261 -7.631 +141.261 -7.626 +141.261 -7.626 +141.399 -7.62 +141.399 -7.62 +141.537 -7.613 +141.537 -7.613 +141.537 -7.607 +141.677 -7.607 +141.677 -7.6 +141.956 -7.6 +141.956 -7.591 +141.956 -7.591 +142.11 -7.582 +142.11 -7.582 +142.264 -7.573 +142.264 -7.573 +142.417 -7.564 +142.417 -7.564 +142.417 -7.555 +142.704 -7.555 +142.704 -7.546 +142.843 -7.546 +142.843 -7.537 +142.843 -7.528 +142.981 -7.528 +142.981 -7.52 +143.121 -7.52 +143.121 -7.51 +143.121 -7.51 +143.402 -7.501 +143.402 -7.501 +143.543 -7.491 +143.543 -7.491 +143.543 -7.48 +143.699 -7.48 +143.699 -7.47 +143.854 -7.47 +143.854 -7.46 +144.153 -7.46 +144.153 -7.449 +144.153 -7.449 +144.306 -7.439 +144.306 -7.439 +144.444 -7.429 +144.444 -7.429 +144.444 -7.42 +144.584 -7.42 +144.584 -7.411 +144.849 -7.411 +144.849 -7.401 +144.849 -7.401 +144.991 -7.392 +144.991 -7.392 +145.134 -7.382 +145.134 -7.382 +145.282 -7.372 +145.282 -7.372 +145.282 -7.362 +145.592 -7.362 +145.592 -7.352 +145.747 -7.342 +145.747 -7.342 +145.747 -7.333 +145.9 -7.333 +145.9 -7.324 +146.03 -7.324 +146.03 -7.316 +146.03 -7.316 +146.311 -7.308 +146.311 -7.308 +146.451 -7.3 +146.451 -7.3 +146.584 -7.291 +146.584 -7.291 +146.584 -7.283 +146.726 -7.283 +146.726 -7.274 +147.038 -7.274 +147.038 -7.265 +147.038 -7.265 +147.184 -7.257 +147.184 -7.257 +147.329 -7.248 +147.329 -7.248 +147.483 -7.241 +147.483 -7.241 +147.483 -7.234 +147.754 -7.234 +147.754 -7.226 +147.888 -7.226 +147.888 -7.219 +147.888 -7.219 +148.029 -7.212 +148.029 -7.212 +148.164 -7.205 +148.164 -7.205 diff --git a/src/AnalysTool.pro b/src/AnalysTool.pro index 93848b7..6303914 100644 --- a/src/AnalysTool.pro +++ b/src/AnalysTool.pro @@ -29,8 +29,11 @@ SOURCES += \ serialport/dataparser.cpp \ serialport/serialport.cpp \ thirdparty/qcustomplot/qcustomplot.cpp \ + ui/degreeofcrystallinityform.cpp \ + ui/degreeofcureform.cpp \ ui/draglinehandler.cpp \ ui/experimentsettingform.cpp \ + ui/instrumentcoefficientform.cpp \ ui/leftwidget.cpp \ ui/realtimedataform.cpp \ ui/specificheatcomparisonmethodform.cpp @@ -50,15 +53,21 @@ HEADERS += \ serialport/protocol.h \ serialport/serialport.h \ thirdparty/qcustomplot/qcustomplot.h \ + ui/degreeofcrystallinityform.h \ + ui/degreeofcureform.h \ ui/draglinehandler.h \ ui/experimentsettingform.h \ + ui/instrumentcoefficientform.h \ ui/leftwidget.h \ ui/realtimedataform.h \ ui/specificheatcomparisonmethodform.h FORMS += \ mainwindow.ui \ + ui/degreeofcrystallinityform.ui \ + ui/degreeofcureform.ui \ ui/experimentsettingform.ui \ + ui/instrumentcoefficientform.ui \ ui/realtimedataform.ui \ ui/specificheatcomparisonmethodform.ui diff --git a/src/data/pointcalculate.cpp b/src/data/pointcalculate.cpp index d13af3b..05fa674 100644 --- a/src/data/pointcalculate.cpp +++ b/src/data/pointcalculate.cpp @@ -365,7 +365,7 @@ QPair PointCalculate::getCurveInflectionPointTangent(const float x1 QPointF PointCalculate::getIntersectionBySlope(const LineStruct& line1, const LineStruct& line2) { float x = (line2.intercept - line1.intercept) / (line1.slope - line2.slope); float y = line1.slope * x + line1.intercept; -// return {x, y}; + // return {x, y}; return QPointF(x,y); } QPointF PointCalculate::getClosestPointByX(const float targetX) @@ -449,13 +449,28 @@ QString PointCalculate::textFormatEndPoint(const QPointF point) QPointF PointCalculate::getClosestPointByY(const float left,const float right,const float valueY) { - float minValue = 100.0; - for(FileManager::ExperimentData& ed:_dataVtr){ - if(left < ed.sampleTemp && ed.sampleTemp < right){ - if(std::abs(ed.dsc - valueY) < minValue){ - return QPointF(ed.sampleTemp,ed.dsc); - } - } - } - return QPointF(); + float minValue = std::numeric_limits::infinity(); // 初始化为正无穷 + QPointF closestPoint; + + for (const FileManager::ExperimentData& ed : _dataVtr) { + if (left < ed.sampleTemp && ed.sampleTemp < right) { + float diff = std::abs(ed.dsc - valueY); + if (diff < minValue) { + minValue = diff; + closestPoint = QPointF(ed.sampleTemp, ed.dsc); + } + } + } + + return closestPoint; +} + +QString PointCalculate::textFormatGlassTranstion(const float t1,const float tg,const float t2) +{ + return QString("T1：%1℃\n" + "Tg：%2℃\n" + "T2：%3℃\n" + ).arg(QString::number(t1, 'f', 3)) + .arg(QString::number(tg, 'f', 3)) + .arg(QString::number(t2, 'f', 3)); } diff --git a/src/data/pointcalculate.h b/src/data/pointcalculate.h index b409991..9deb811 100644 --- a/src/data/pointcalculate.h +++ b/src/data/pointcalculate.h @@ -26,6 +26,7 @@ QString textFormatPeakPoint(const float enthalpyValue, QString textFormatNumbericalLabel(const QPointF); QString textFormatStartPoint(const QPointF); QString textFormatEndPoint(const QPointF); +QString textFormatGlassTranstion(const float t1,const float tg,const float t2); // glass transition QPair getCurveInflectionPointTangent(const float,const float); diff --git a/src/mainwindow.cpp b/src/mainwindow.cpp index f91bbff..0133f57 100644 --- a/src/mainwindow.cpp +++ b/src/mainwindow.cpp @@ -44,7 +44,6 @@ MainWindow::MainWindow(QWidget *parent) // _realTimeDataForm->show(); setActionEnable(true); - } MainWindow::~MainWindow() diff --git a/src/ui/centralwidget.cpp b/src/ui/centralwidget.cpp index 8859fbd..2e4b834 100644 --- a/src/ui/centralwidget.cpp +++ b/src/ui/centralwidget.cpp @@ -321,6 +321,7 @@ void CentralWidget::glassTransitionHandle() logde<<"point1:"<point1->setCoords(point1.x() - 5,point1.y()); line1->point2->setCoords(point1.x() + 5,point1.y()); @@ -336,6 +337,7 @@ void CentralWidget::glassTransitionHandle() line2->setVisible(true); _customPlot->replot(); +#endif // PointCalculate::LineStruct lineStrc1,lineStrc2,tangetLineStrc; @@ -357,9 +359,11 @@ void CentralWidget::glassTransitionHandle() // float averageY = (point1.y() + point2.y()) /2; + logde<<"average Y:"<addItem(circle); + // _customPlot->addItem(circle); // 设置圆形的位置和大小 circle->topLeft->setCoords(-5, 5); @@ -381,14 +390,16 @@ void CentralWidget::glassTransitionHandle() circle->setPen(QPen(Qt::blue)); #endif +#if 1 QCPItemStraightLine *line3 = new QCPItemStraightLine(_customPlot); - line3->point1->setCoords(averagePoint.x() + 2,averagePoint.y() + 2); - line3->point2->setCoords(averagePoint.x() - 2,averagePoint.y() - 2); + line3->point1->setCoords(averagePoint.x() + 1,averagePoint.y() + 1); + line3->point2->setCoords(averagePoint.x() - 1,averagePoint.y() - 1); line3->setPen(QPen(Qt::black)); line3->setSelectable(false); line3->setVisible(true); _customPlot->replot(); +#endif } void CentralWidget::setEventHandlerEnable(const bool flag) diff --git a/src/ui/degreeofcrystallinityform.cpp b/src/ui/degreeofcrystallinityform.cpp new file mode 100644 index 0000000..ec8a962 --- /dev/null +++ b/src/ui/degreeofcrystallinityform.cpp @@ -0,0 +1,14 @@ +#include "degreeofcrystallinityform.h" +#include "ui_degreeofcrystallinityform.h" + +DegreeOfCrystallinityForm::DegreeOfCrystallinityForm(QWidget *parent) : + QWidget(parent), + ui(new Ui::DegreeOfCrystallinityForm) +{ + ui->setupUi(this); +} + +DegreeOfCrystallinityForm::~DegreeOfCrystallinityForm() +{ + delete ui; +} diff --git a/src/ui/degreeofcrystallinityform.h b/src/ui/degreeofcrystallinityform.h new file mode 100644 index 0000000..9fc0d08 --- /dev/null +++ b/src/ui/degreeofcrystallinityform.h @@ -0,0 +1,22 @@ +#ifndef DEGREEOFCRYSTALLINITYFORM_H +#define DEGREEOFCRYSTALLINITYFORM_H + +#include + +namespace Ui { +class DegreeOfCrystallinityForm; +} + +class DegreeOfCrystallinityForm : public QWidget +{ + Q_OBJECT + +public: + explicit DegreeOfCrystallinityForm(QWidget *parent = nullptr); + ~DegreeOfCrystallinityForm(); + +private: + Ui::DegreeOfCrystallinityForm *ui; +}; + +#endif // DEGREEOFCRYSTALLINITYFORM_H diff --git a/src/ui/degreeofcrystallinityform.ui b/src/ui/degreeofcrystallinityform.ui new file mode 100644 index 0000000..058b662 --- /dev/null +++ b/src/ui/degreeofcrystallinityform.ui @@ -0,0 +1,135 @@ + + + DegreeOfCrystallinityForm + + + + 0 + 0 + 368 + 399 + + + + Form + + + + + 30 + 20 + 281 + 81 + + + + 计算公式： + + + + + 23 + 32 + 231 + 31 + + + + Xc = (结晶焓 - 冷结晶焓) / 理论热焓 + + + + + + + 30 + 120 + 281 + 121 + + + + 参数： + + + + + 20 + 30 + 231 + 81 + + + + + + + 结晶焓(J/g): + + + + + + + + + + 冷结晶焓(J/g): + + + + + + + + + + 理论热焓(J/g) + + + + + + + + + + + + + 30 + 250 + 281 + 71 + + + + 计算结果： + + + + + 20 + 30 + 231 + 31 + + + + + + + + + + 结晶度Xc(%) + + + + + + + + + + diff --git a/src/ui/degreeofcureform.cpp b/src/ui/degreeofcureform.cpp new file mode 100644 index 0000000..56330a6 --- /dev/null +++ b/src/ui/degreeofcureform.cpp @@ -0,0 +1,14 @@ +#include "degreeofcureform.h" +#include "ui_degreeofcureform.h" + +DegreeOfCureForm::DegreeOfCureForm(QWidget *parent) : + QWidget(parent), + ui(new Ui::DegreeOfCureForm) +{ + ui->setupUi(this); +} + +DegreeOfCureForm::~DegreeOfCureForm() +{ + delete ui; +} diff --git a/src/ui/degreeofcureform.h b/src/ui/degreeofcureform.h new file mode 100644 index 0000000..fb2443d --- /dev/null +++ b/src/ui/degreeofcureform.h @@ -0,0 +1,22 @@ +#ifndef DEGREEOFCUREFORM_H +#define DEGREEOFCUREFORM_H + +#include + +namespace Ui { +class DegreeOfCureForm; +} + +class DegreeOfCureForm : public QWidget +{ + Q_OBJECT + +public: + explicit DegreeOfCureForm(QWidget *parent = nullptr); + ~DegreeOfCureForm(); + +private: + Ui::DegreeOfCureForm *ui; +}; + +#endif // DEGREEOFCUREFORM_H diff --git a/src/ui/degreeofcureform.ui b/src/ui/degreeofcureform.ui new file mode 100644 index 0000000..dfe626f --- /dev/null +++ b/src/ui/degreeofcureform.ui @@ -0,0 +1,209 @@ + + + DegreeOfCureForm + + + + 0 + 0 + 331 + 364 + + + + Form + + + + + 10 + 10 + 301 + 91 + + + + 计算公式： + + + + + 20 + 50 + 41 + 16 + + + + 固化度= + + + + + + 70 + 60 + 161 + 1 + + + + + 16777215 + 1 + + + + PushButton + + + + + + 80 + 40 + 151 + 16 + + + + 固化前热焓 - 固化后热焓 + + + + + + 110 + 60 + 71 + 16 + + + + 固化前热焓 + + + + + + 240 + 50 + 51 + 16 + + + + X 100% + + + + + + + 10 + 110 + 301 + 91 + + + + 参数： + + + + + 10 + 30 + 271 + 52 + + + + + + + 固化前热焓(J/g) + + + + + + + + + + 固化后热焓(J/g) + + + + + + + + + + + + + 10 + 210 + 301 + 71 + + + + 计算结果： + + + + + 10 + 30 + 261 + 41 + + + + + + + 固化度(%): + + + + + + + + + + + + + 100 + 310 + 80 + 20 + + + + 计算 + + + + + + 210 + 310 + 80 + 20 + + + + 退出 + + + + + + diff --git a/src/ui/instrumentcoefficientform.cpp b/src/ui/instrumentcoefficientform.cpp new file mode 100644 index 0000000..08f6bc1 --- /dev/null +++ b/src/ui/instrumentcoefficientform.cpp @@ -0,0 +1,24 @@ +#include "instrumentcoefficientform.h" +#include "ui_instrumentcoefficientform.h" + +InstrumentCoefficientForm::InstrumentCoefficientForm(QWidget *parent) : + QWidget(parent), + ui(new Ui::InstrumentCoefficientForm) +{ + ui->setupUi(this); +} + +InstrumentCoefficientForm::~InstrumentCoefficientForm() +{ + delete ui; +} + +void InstrumentCoefficientForm::on_pushButtonCalculate_clicked() +{ + +} + +void InstrumentCoefficientForm::on_pushButtonExit_clicked() +{ + +} diff --git a/src/ui/instrumentcoefficientform.h b/src/ui/instrumentcoefficientform.h new file mode 100644 index 0000000..f7819d8 --- /dev/null +++ b/src/ui/instrumentcoefficientform.h @@ -0,0 +1,27 @@ +#ifndef INSTRUMENTCOEFFICIENTFORM_H +#define INSTRUMENTCOEFFICIENTFORM_H + +#include + +namespace Ui { +class InstrumentCoefficientForm; +} + +class InstrumentCoefficientForm : public QWidget +{ + Q_OBJECT + +public: + explicit InstrumentCoefficientForm(QWidget *parent = nullptr); + ~InstrumentCoefficientForm(); + +private slots: + void on_pushButtonCalculate_clicked(); + + void on_pushButtonExit_clicked(); + +private: + Ui::InstrumentCoefficientForm *ui; +}; + +#endif // INSTRUMENTCOEFFICIENTFORM_H diff --git a/src/ui/instrumentcoefficientform.ui b/src/ui/instrumentcoefficientform.ui new file mode 100644 index 0000000..183edb3 --- /dev/null +++ b/src/ui/instrumentcoefficientform.ui @@ -0,0 +1,19 @@ + + + InstrumentCoefficientForm + + + + 0 + 0 + 244 + 356 + + + + Form + + + + +