diff --git a/information.csv b/information.csv index e69de29..825bb86 100644 --- a/information.csv +++ b/information.csv @@ -0,0 +1,77 @@ +id,姓名,实验组数,实验组编号,模式切换技术,目标颜色,目标粗细,开始时间,结束时间,颜色切换时间,像素切换时间,模式切换总时间,绘制完整时间,第一段绘制时间,第二段绘制时间,第三段绘制时间,误触发总数,颜色切换错误数,像素切换错误数,模式切换总错误数,压力1,压力2,压力平均值,方位角1,方位角2,方位角平均值,倾斜角1,倾斜角2,倾斜角平均值,轨道偏出量 +1,,1,1,P-实际值,黄色,3.0,20:50:44:487,20:50:48:786,-1618318245724,-1618318248581,-3236636494305,4535,1857,205,1254,0,1,1,2,0,0,0,0,0,0,0,0,0,6, +2,,1,1,P-实际值,黄色,3.0,20:50:44:487,20:50:48:786,-1618318245724,-1618318248581,-3236636494305,4535,1857,205,1254,0,1,1,2,0,0,0,0,0,0,0,0,0,10, +3,,1,1,P-实际值,黄色,3.0,20:50:44:487,20:50:48:786,-1618318245724,-1618318248581,-3236636494305,4535,1857,205,1254,0,1,1,2,0,0,0,0,0,0,0,0,0,10, +4,,1,1,P-实际值,黄色,3.0,20:50:44:487,20:50:48:786,-1618318245724,-1618318248581,-3236636494305,4535,1857,205,1254,0,1,1,2,0,0,0,0,0,0,0,0,0,5, +5,,1,1,P-实际值,黄色,3.0,20:50:44:487,20:50:48:786,-1618318245724,-1618318248581,-3236636494305,4535,1857,205,1254,0,1,1,2,0,0,0,0,0,0,0,0,0,4, +6,,1,1,P-实际值,黄色,3.0,20:50:44:487,20:50:48:786,-1618318245724,-1618318248581,-3236636494305,4535,1857,205,1254,0,1,1,2,0,0,0,0,0,0,0,0,0,10, +7,,1,1,P-实际值,黄色,3.0,20:50:44:487,20:50:48:786,-1618318245724,-1618318248581,-3236636494305,4535,1857,205,1254,0,1,1,2,0,0,0,0,0,0,0,0,0,10, +8,,1,1,P-实际值,黄色,3.0,20:50:44:487,20:50:48:786,-1618318245724,-1618318248581,-3236636494305,4535,1857,205,1254,0,1,1,2,0,0,0,0,0,0,0,0,0,12, +9,,1,1,P-实际值,黄色,3.0,20:50:44:487,20:50:48:786,-1618318245724,-1618318248581,-3236636494305,4535,1857,205,1254,0,1,1,2,0,0,0,0,0,0,0,0,0,13, +10,,1,1,P-实际值,黄色,3.0,20:50:44:487,20:50:48:786,-1618318245724,-1618318248581,-3236636494305,4535,1857,205,1254,0,1,1,2,0,0,0,0,0,0,0,0,0,13, +11,,1,1,P-实际值,黄色,3.0,20:50:44:487,20:50:48:786,-1618318245724,-1618318248581,-3236636494305,4535,1857,205,1254,0,1,1,2,0,0,0,0,0,0,0,0,0,13, +12,,1,1,P-实际值,黄色,3.0,20:50:44:487,20:50:48:786,-1618318245724,-1618318248581,-3236636494305,4535,1857,205,1254,0,1,1,2,0,0,0,0,0,0,0,0,0,13, +13,,1,2,P-实际值,黄色,2.0,20:50:44:487,20:50:48:786,-1618318253592,-1618318256301,-3236636509893,4843,832,219,1618,0,1,1,4,0,0,0,0,0,0,0,0,0,5, +14,,1,2,P-实际值,黄色,2.0,20:50:44:487,20:50:48:786,-1618318253592,-1618318256301,-3236636509893,4843,832,219,1618,0,1,1,4,0,0,0,0,0,0,0,0,0,2, +15,,1,2,P-实际值,黄色,2.0,20:50:44:487,20:50:48:786,-1618318253592,-1618318256301,-3236636509893,4843,832,219,1618,0,1,1,4,0,0,0,0,0,0,0,0,0,2, +16,,1,2,P-实际值,黄色,2.0,20:50:44:487,20:50:48:786,-1618318253592,-1618318256301,-3236636509893,4843,832,219,1618,0,1,1,4,0,0,0,0,0,0,0,0,0,2, +17,,1,2,P-实际值,黄色,2.0,20:50:44:487,20:50:48:786,-1618318253592,-1618318256301,-3236636509893,4843,832,219,1618,0,1,1,4,0,0,0,0,0,0,0,0,0,3, +18,,1,2,P-实际值,黄色,2.0,20:50:44:487,20:50:48:786,-1618318253592,-1618318256301,-3236636509893,4843,832,219,1618,0,1,1,4,0,0,0,0,0,0,0,0,0,4, +19,,1,2,P-实际值,黄色,2.0,20:50:44:487,20:50:48:786,-1618318253592,-1618318256301,-3236636509893,4843,832,219,1618,0,1,1,4,0,0,0,0,0,0,0,0,0,10, +20,,1,2,P-实际值,黄色,2.0,20:50:44:487,20:50:48:786,-1618318253592,-1618318256301,-3236636509893,4843,832,219,1618,0,1,1,4,0,0,0,0,0,0,0,0,0,2, +21,,1,2,P-实际值,黄色,2.0,20:50:44:487,20:50:48:786,-1618318253592,-1618318256301,-3236636509893,4843,832,219,1618,0,1,1,4,0,0,0,0,0,0,0,0,0,5, +22,,1,2,P-实际值,黄色,2.0,20:50:44:487,20:50:48:786,-1618318253592,-1618318256301,-3236636509893,4843,832,219,1618,0,1,1,4,0,0,0,0,0,0,0,0,0,15, +23,,1,2,P-实际值,黄色,2.0,20:50:44:487,20:50:48:786,-1618318253592,-1618318256301,-3236636509893,4843,832,219,1618,0,1,1,4,0,0,0,0,0,0,0,0,0,15, +24,,1,2,P-实际值,黄色,2.0,20:50:44:487,20:50:48:786,-1618318253592,-1618318256301,-3236636509893,4843,832,219,1618,0,1,1,4,0,0,0,0,0,0,0,0,0,13, +25,,1,2,P-实际值,黄色,2.0,20:50:44:487,20:50:48:786,-1618318253592,-1618318256301,-3236636509893,4843,832,219,1618,0,1,1,4,0,0,0,0,0,0,0,0,0,13, +26,,1,2,P-实际值,黄色,2.0,20:50:44:487,20:50:48:786,-1618318253592,-1618318256301,-3236636509893,4843,832,219,1618,0,1,1,4,0,0,0,0,0,0,0,0,0,13, +27,,1,2,P-实际值,黄色,2.0,20:50:44:487,20:50:48:786,-1618318253592,-1618318256301,-3236636509893,4843,832,219,1618,0,1,1,4,0,0,0,0,0,0,0,0,0,20, +28,,1,2,P-实际值,黄色,2.0,20:50:44:487,20:50:48:786,-1618318253592,-1618318256301,-3236636509893,4843,832,219,1618,0,1,1,4,0,0,0,0,0,0,0,0,0,23, +29,,1,2,P-实际值,黄色,2.0,20:50:44:487,20:50:48:786,-1618318253592,-1618318256301,-3236636509893,4843,832,219,1618,0,1,1,4,0,0,0,0,0,0,0,0,0,25, +30,,1,2,P-实际值,黄色,2.0,20:50:44:487,20:50:48:786,-1618318253592,-1618318256301,-3236636509893,4843,832,219,1618,0,1,1,4,0,0,0,0,0,0,0,0,0,25, +31,,1,2,P-实际值,黄色,2.0,20:50:44:487,20:50:48:786,-1618318253592,-1618318256301,-3236636509893,4843,832,219,1618,0,1,1,4,0,0,0,0,0,0,0,0,0,7, +32,,1,2,P-实际值,黄色,2.0,20:50:44:487,20:50:48:786,-1618318253592,-1618318256301,-3236636509893,4843,832,219,1618,0,1,1,4,0,0,0,0,0,0,0,0,0,7, +33,,1,2,P-实际值,黄色,2.0,20:50:44:487,20:50:48:786,-1618318253592,-1618318256301,-3236636509893,4843,832,219,1618,0,1,1,4,0,0,0,0,0,0,0,0,0,7, +34,,1,2,P-实际值,黄色,2.0,20:50:44:487,20:50:48:786,-1618318253592,-1618318256301,-3236636509893,4843,832,219,1618,0,1,1,4,0,0,0,0,0,0,0,0,0,7, +35,,1,1,P-增量化,黄色,2.0,20:51:28:986,20:51:32:136,-1618318290270,-1618318291933,-3236636582203,3228,500,203,1126,0,1,1,2,0,0,0,0,0,0,0,0,0,24, +36,,1,1,P-增量化,黄色,2.0,20:51:28:986,20:51:32:136,-1618318290270,-1618318291933,-3236636582203,3228,500,203,1126,0,1,1,2,0,0,0,0,0,0,0,0,0,24, +37,,1,1,P-增量化,黄色,2.0,20:51:28:986,20:51:32:136,-1618318290270,-1618318291933,-3236636582203,3228,500,203,1126,0,1,1,2,0,0,0,0,0,0,0,0,0,24, +38,,1,1,P-增量化,黄色,2.0,20:51:28:986,20:51:32:136,-1618318290270,-1618318291933,-3236636582203,3228,500,203,1126,0,1,1,2,0,0,0,0,0,0,0,0,0,24, +39,,1,1,P-增量化,黄色,2.0,20:51:28:986,20:51:32:136,-1618318290270,-1618318291933,-3236636582203,3228,500,203,1126,0,1,1,2,0,0,0,0,0,0,0,0,0,17, +40,,1,1,P-增量化,黄色,2.0,20:51:28:986,20:51:32:136,-1618318290270,-1618318291933,-3236636582203,3228,500,203,1126,0,1,1,2,0,0,0,0,0,0,0,0,0,17, +41,,1,1,P-增量化,黄色,2.0,20:51:28:986,20:51:32:136,-1618318290270,-1618318291933,-3236636582203,3228,500,203,1126,0,1,1,2,0,0,0,0,0,0,0,0,0,17, +42,,1,1,P-增量化,黄色,2.0,20:51:28:986,20:51:32:136,-1618318290270,-1618318291933,-3236636582203,3228,500,203,1126,0,1,1,2,0,0,0,0,0,0,0,0,0,20, +43,,1,1,P-增量化,黄色,2.0,20:51:28:986,20:51:32:136,-1618318290270,-1618318291933,-3236636582203,3228,500,203,1126,0,1,1,2,0,0,0,0,0,0,0,0,0,16, +44,,1,1,P-增量化,黄色,2.0,20:51:28:986,20:51:32:136,-1618318290270,-1618318291933,-3236636582203,3228,500,203,1126,0,1,1,2,0,0,0,0,0,0,0,0,0,16, +45,,1,1,P-增量化,黄色,2.0,20:51:28:986,20:51:32:136,-1618318290270,-1618318291933,-3236636582203,3228,500,203,1126,0,1,1,2,0,0,0,0,0,0,0,0,0,16, +46,,1,1,P-增量化,黄色,2.0,20:51:28:986,20:51:32:136,-1618318290270,-1618318291933,-3236636582203,3228,500,203,1126,0,1,1,2,0,0,0,0,0,0,0,0,0,22, +47,,1,1,P-增量化,黄色,2.0,20:51:28:986,20:51:32:136,-1618318290270,-1618318291933,-3236636582203,3228,500,203,1126,0,1,1,2,0,0,0,0,0,0,0,0,0,22, +48,,1,1,P-增量化,黄色,2.0,20:51:28:986,20:51:32:136,-1618318290270,-1618318291933,-3236636582203,3228,500,203,1126,0,1,1,2,0,0,0,0,0,0,0,0,0,22, +49,,1,2,P-增量化,蓝色,3.0,20:51:28:986,20:51:32:136,-1618318298088,-1618318300388,-3236636598476,4291,547,236,1503,0,1,1,4,0,0,0,0,0,0,0,0,0,9, +50,,1,2,P-增量化,蓝色,3.0,20:51:28:986,20:51:32:136,-1618318298088,-1618318300388,-3236636598476,4291,547,236,1503,0,1,1,4,0,0,0,0,0,0,0,0,0,9, +51,,1,2,P-增量化,蓝色,3.0,20:51:28:986,20:51:32:136,-1618318298088,-1618318300388,-3236636598476,4291,547,236,1503,0,1,1,4,0,0,0,0,0,0,0,0,0,9, +52,,1,2,P-增量化,蓝色,3.0,20:51:28:986,20:51:32:136,-1618318298088,-1618318300388,-3236636598476,4291,547,236,1503,0,1,1,4,0,0,0,0,0,0,0,0,0,9, +53,,1,2,P-增量化,蓝色,3.0,20:51:28:986,20:51:32:136,-1618318298088,-1618318300388,-3236636598476,4291,547,236,1503,0,1,1,4,0,0,0,0,0,0,0,0,0,7, +54,,1,2,P-增量化,蓝色,3.0,20:51:28:986,20:51:32:136,-1618318298088,-1618318300388,-3236636598476,4291,547,236,1503,0,1,1,4,0,0,0,0,0,0,0,0,0,6, +55,,1,2,P-增量化,蓝色,3.0,20:51:28:986,20:51:32:136,-1618318298088,-1618318300388,-3236636598476,4291,547,236,1503,0,1,1,4,0,0,0,0,0,0,0,0,0,4, +56,,1,2,P-增量化,蓝色,3.0,20:51:28:986,20:51:32:136,-1618318298088,-1618318300388,-3236636598476,4291,547,236,1503,0,1,1,4,0,0,0,0,0,0,0,0,0,3, +57,,1,2,P-增量化,蓝色,3.0,20:51:28:986,20:51:32:136,-1618318298088,-1618318300388,-3236636598476,4291,547,236,1503,0,1,1,4,0,0,0,0,0,0,0,0,0,19, +58,,1,2,P-增量化,蓝色,3.0,20:51:28:986,20:51:32:136,-1618318298088,-1618318300388,-3236636598476,4291,547,236,1503,0,1,1,4,0,0,0,0,0,0,0,0,0,19, +59,,1,2,P-增量化,蓝色,3.0,20:51:28:986,20:51:32:136,-1618318298088,-1618318300388,-3236636598476,4291,547,236,1503,0,1,1,4,0,0,0,0,0,0,0,0,0,19, +60,,1,2,P-增量化,蓝色,3.0,20:51:28:986,20:51:32:136,-1618318298088,-1618318300388,-3236636598476,4291,547,236,1503,0,1,1,4,0,0,0,0,0,0,0,0,0,19, +61,,1,2,P-增量化,蓝色,3.0,20:51:28:986,20:51:32:136,-1618318298088,-1618318300388,-3236636598476,4291,547,236,1503,0,1,1,4,0,0,0,0,0,0,0,0,0,22, +62,,1,2,P-增量化,蓝色,3.0,20:51:28:986,20:51:32:136,-1618318298088,-1618318300388,-3236636598476,4291,547,236,1503,0,1,1,4,0,0,0,0,0,0,0,0,0,22, +63,,1,2,P-增量化,蓝色,3.0,20:51:28:986,20:51:32:136,-1618318298088,-1618318300388,-3236636598476,4291,547,236,1503,0,1,1,4,0,0,0,0,0,0,0,0,0,22, +64,,1,2,P-增量化,蓝色,3.0,20:51:28:986,20:51:32:136,-1618318298088,-1618318300388,-3236636598476,4291,547,236,1503,0,1,1,4,0,0,0,0,0,0,0,0,0,0, +65,,1,2,P-增量化,蓝色,3.0,20:51:28:986,20:51:32:136,-1618318298088,-1618318300388,-3236636598476,4291,547,236,1503,0,1,1,4,0,0,0,0,0,0,0,0,0,17, +66,,1,2,P-增量化,蓝色,3.0,20:51:28:986,20:51:32:136,-1618318298088,-1618318300388,-3236636598476,4291,547,236,1503,0,1,1,4,0,0,0,0,0,0,0,0,0,20, +67,,1,2,P-增量化,蓝色,3.0,20:51:28:986,20:51:32:136,-1618318298088,-1618318300388,-3236636598476,4291,547,236,1503,0,1,1,4,0,0,0,0,0,0,0,0,0,27, +68,,1,2,P-增量化,蓝色,3.0,20:51:28:986,20:51:32:136,-1618318298088,-1618318300388,-3236636598476,4291,547,236,1503,0,1,1,4,0,0,0,0,0,0,0,0,0,2, +69,,1,2,P-增量化,蓝色,3.0,20:51:28:986,20:51:32:136,-1618318298088,-1618318300388,-3236636598476,4291,547,236,1503,0,1,1,4,0,0,0,0,0,0,0,0,0,5, +70,,1,2,P-增量化,蓝色,3.0,20:51:28:986,20:51:32:136,-1618318298088,-1618318300388,-3236636598476,4291,547,236,1503,0,1,1,4,0,0,0,0,0,0,0,0,0,5, +71,,1,2,P-增量化,蓝色,3.0,20:51:28:986,20:51:32:136,-1618318298088,-1618318300388,-3236636598476,4291,547,236,1503,0,1,1,4,0,0,0,0,0,0,0,0,0,4, +72,,1,2,P-增量化,蓝色,3.0,20:51:28:986,20:51:32:136,-1618318298088,-1618318300388,-3236636598476,4291,547,236,1503,0,1,1,4,0,0,0,0,0,0,0,0,0,9, +73,,1,2,P-增量化,蓝色,3.0,20:51:28:986,20:51:32:136,-1618318298088,-1618318300388,-3236636598476,4291,547,236,1503,0,1,1,4,0,0,0,0,0,0,0,0,0,4, +74,,1,2,P-增量化,蓝色,3.0,20:51:28:986,20:51:32:136,-1618318298088,-1618318300388,-3236636598476,4291,547,236,1503,0,1,1,4,0,0,0,0,0,0,0,0,0,3, +75,,1,2,P-增量化,蓝色,3.0,20:51:28:986,20:51:32:136,-1618318298088,-1618318300388,-3236636598476,4291,547,236,1503,0,1,1,4,0,0,0,0,0,0,0,0,0,1, +76,,1,2,P-增量化,蓝色,3.0,20:51:28:986,20:51:32:136,-1618318298088,-1618318300388,-3236636598476,4291,547,236,1503,0,1,1,4,0,0,0,0,0,0,0,0,0,3, diff --git a/out/production/PenProject/ActualAzimuth.class b/out/production/PenProject/ActualAzimuth.class index 5e9b440..d0c5cda 100644 Binary files a/out/production/PenProject/ActualAzimuth.class and b/out/production/PenProject/ActualAzimuth.class differ diff --git a/out/production/PenProject/ActualPress.class b/out/production/PenProject/ActualPress.class index df15989..4c7a838 100644 Binary files a/out/production/PenProject/ActualPress.class and b/out/production/PenProject/ActualPress.class differ diff --git a/out/production/PenProject/ActualTilt.class b/out/production/PenProject/ActualTilt.class index c769b10..c988f6f 100644 Binary files a/out/production/PenProject/ActualTilt.class and b/out/production/PenProject/ActualTilt.class differ diff --git a/out/production/PenProject/IncrementAzimuth.class b/out/production/PenProject/IncrementAzimuth.class index 4357171..e7c5438 100644 Binary files a/out/production/PenProject/IncrementAzimuth.class and b/out/production/PenProject/IncrementAzimuth.class differ diff --git a/out/production/PenProject/IncrementPress.class b/out/production/PenProject/IncrementPress.class index 7386be8..b4c1bea 100644 Binary files a/out/production/PenProject/IncrementPress.class and b/out/production/PenProject/IncrementPress.class differ diff --git a/out/production/PenProject/IncrementTilt.class b/out/production/PenProject/IncrementTilt.class index 76ed819..835e297 100644 Binary files a/out/production/PenProject/IncrementTilt.class and b/out/production/PenProject/IncrementTilt.class differ diff --git a/out/production/PenProject/ScatteredAzimuth.class b/out/production/PenProject/ScatteredAzimuth.class index 5eb6e79..5dbe5f0 100644 Binary files a/out/production/PenProject/ScatteredAzimuth.class and b/out/production/PenProject/ScatteredAzimuth.class differ diff --git a/out/production/PenProject/ScatteredPress.class b/out/production/PenProject/ScatteredPress.class index dde962b..563f032 100644 Binary files a/out/production/PenProject/ScatteredPress.class and b/out/production/PenProject/ScatteredPress.class differ diff --git a/out/production/PenProject/ScatteredTilt.class b/out/production/PenProject/ScatteredTilt.class index 707f883..803ae43 100644 Binary files a/out/production/PenProject/ScatteredTilt.class and b/out/production/PenProject/ScatteredTilt.class differ diff --git a/out/production/PenProject/TraditionalFrame.class b/out/production/PenProject/TraditionalFrame.class index d2a5372..9fe3d82 100644 Binary files a/out/production/PenProject/TraditionalFrame.class and b/out/production/PenProject/TraditionalFrame.class differ diff --git a/src/ActualAzimuth.java b/src/ActualAzimuth.java index 2ea4cd8..9d13ce1 100644 --- a/src/ActualAzimuth.java +++ b/src/ActualAzimuth.java @@ -17,6 +17,8 @@ public class ActualAzimuth extends JFrame implements ActionListener, MouseInputListener, KeyListener { private int time = 50; private Timer timer = new Timer(time,this); + private int TimeShift = 0; //鑾峰彇鐐圭殑鏃堕棿闂撮殧锛屽湪杩欓噷鍒ゆ柇鏄600ms + private boolean ShiftIndex = false; //鑾峰彇鐐圭殑鏃堕棿淇″彿 private AAExperimentPanel aaExperimentPanel = new AAExperimentPanel(); private int CurrentAzimuth = -1; //褰撳墠鐨勬柟浣嶈淇℃伅 @@ -290,6 +292,14 @@ public void actionPerformed(ActionEvent e) { aaExperimentPanel.SetCurrentAzimuth(CurrentAzimuth); aaExperimentPanel.repaint(); } + //瀵硅幏鍙栫偣鐨勬椂闂撮棿闅旇繘琛屽垽鏂 + if (TimeShift == 600) { + ShiftIndex = true; + TimeShift = 0; + }else { + TimeShift += 50; + ShiftIndex = false; + } } @Override @@ -625,8 +635,10 @@ else if (StringRandomP == "璇峰垏鎹㈠儚绱犱负4.0") { }else { //PixelFlag = true; } - //灏嗙偣鐨勫亸绉婚噺瀛樺叆瀹瑰櫒涓 - penData.SetShift(Math.abs((int)(y0 - 52))); + if (ShiftIndex) { + //灏嗙偣鐨勫亸绉婚噺瀛樺叆瀹瑰櫒涓 + penData.SetShift(Math.abs((int) (y0 - 52))); + } //灏嗙偣鐨勪俊鎭褰曞湪瀹瑰櫒涓 aaExperimentPanel.arrayListSpot.add(dot); aaExperimentPanel.repaint(); diff --git a/src/ActualPress.java b/src/ActualPress.java index 0c0a03f..82a2bed 100644 --- a/src/ActualPress.java +++ b/src/ActualPress.java @@ -17,6 +17,9 @@ public class ActualPress extends JFrame implements ActionListener, MouseInputListener, KeyListener { private int time = 50; //鏇存柊鏃堕棿涓50姣 private Timer timer = new Timer(time,this); //浠ユ瘡50姣瑙﹀彂涓娆ctionPerformed瑙﹀彂鍣 + private int TimeShift = 0; //鑾峰彇鐐圭殑鏃堕棿闂撮殧锛屽湪杩欓噷鍒ゆ柇鏄600ms + private boolean ShiftIndex = false; //鑾峰彇鐐圭殑鏃堕棿淇″彿 + private PAExperimentPanel paExperimentPanel = new PAExperimentPanel(); //鍒涘缓PAExperimentPanel绫 private boolean ChooseFlag = false; //鏄惁鏄剧ず鍘嬪姏鍔ㄦ佸浘鍍 private int CurrentPress = -1; //鑾峰彇褰撳墠鐨勫帇鍔涘 @@ -293,6 +296,14 @@ public void actionPerformed(ActionEvent e) { paExperimentPanel.SetCurrentPress(CurrentPress); paExperimentPanel.repaint(); } + //瀵硅幏鍙栫偣鐨勬椂闂撮棿闅旇繘琛屽垽鏂 + if (TimeShift == 600) { + ShiftIndex = true; + TimeShift = 0; + }else { + TimeShift += 50; + ShiftIndex = false; + } } @Override public void keyTyped(KeyEvent e) { @@ -628,8 +639,10 @@ else if (StringRandomP == "璇峰垏鎹㈠儚绱犱负4.0") { }else { //PixelFlag = true; } - //灏嗙偣鐨勫亸绉婚噺瀛樺叆瀹瑰櫒涓 - penData.SetShift(Math.abs((int)(y0 - 52))); + if (ShiftIndex) { + //灏嗙偣鐨勫亸绉婚噺瀛樺叆瀹瑰櫒涓 + penData.SetShift(Math.abs((int) (y0 - 52))); + } //灏嗙偣鐨勪俊鎭褰曞湪瀹瑰櫒涓 paExperimentPanel.arrayListSpot.add(dot); paExperimentPanel.repaint(); diff --git a/src/ActualTilt.java b/src/ActualTilt.java index e6c09c9..cca425b 100644 --- a/src/ActualTilt.java +++ b/src/ActualTilt.java @@ -17,6 +17,9 @@ public class ActualTilt extends JFrame implements ActionListener, MouseInputListener, KeyListener { private int time = 50; private Timer timer = new Timer(time,this); + private int TimeShift = 0; //鑾峰彇鐐圭殑鏃堕棿闂撮殧锛屽湪杩欓噷鍒ゆ柇鏄600ms + private boolean ShiftIndex = false; //鑾峰彇鐐圭殑鏃堕棿淇″彿 + private TAExperimentPanel taExperimentPanel = new TAExperimentPanel(); private int CurrentTilt = -1; //璁板綍褰撳墠鐨勫炬枩瑙掔殑瑙掑害鍊硷紝鍜岄璁剧殑鎵囧舰鍖哄煙鍋氭瘮杈 @@ -291,6 +294,14 @@ public void actionPerformed(ActionEvent e) { taExperimentPanel.repaint(); } + //瀵硅幏鍙栫偣鐨勬椂闂撮棿闅旇繘琛屽垽鏂 + if (TimeShift == 600) { + ShiftIndex = true; + TimeShift = 0; + }else { + TimeShift += 50; + ShiftIndex = false; + } } @Override @@ -630,8 +641,10 @@ else if (StringRandomP == "璇峰垏鎹㈠儚绱犱负4.0") { }else { } - //灏嗙偣鐨勫亸绉婚噺瀛樺叆瀹瑰櫒涓 - penData.SetShift(Math.abs((int)(y0 - 52))); + if (ShiftIndex) { + //灏嗙偣鐨勫亸绉婚噺瀛樺叆瀹瑰櫒涓 + penData.SetShift(Math.abs((int) (y0 - 52))); + } //灏嗙偣鐨勪俊鎭褰曞湪瀹瑰櫒涓 taExperimentPanel.arrayListSpot.add(dot); taExperimentPanel.repaint(); diff --git a/src/IncrementAzimuth.java b/src/IncrementAzimuth.java index e92f89c..beed807 100644 --- a/src/IncrementAzimuth.java +++ b/src/IncrementAzimuth.java @@ -18,6 +18,10 @@ public class IncrementAzimuth extends JFrame implements ActionListener, MouseInputListener, KeyListener { private int time = 50; private Timer timer = new Timer(time,this); + + private int TimeShift = 0; //鑾峰彇鐐圭殑鏃堕棿闂撮殧锛屽湪杩欓噷鍒ゆ柇鏄600ms + private boolean ShiftIndex = false; //鑾峰彇鐐圭殑鏃堕棿淇″彿 + private AIExperimentPanel aiExperimentPanel = new AIExperimentPanel(); private int CurrentAzimuth = -1; //褰撳墠鐨勬柟浣嶈淇℃伅 @@ -338,6 +342,15 @@ public void actionPerformed(ActionEvent e) { } this.RepaintAIInter(); + //瀵硅幏鍙栫偣鐨勬椂闂撮棿闅旇繘琛屽垽鏂 + if (TimeShift == 600) { + ShiftIndex = true; + TimeShift = 0; + }else { + TimeShift += 50; + ShiftIndex = false; + } + } @Override @@ -673,8 +686,10 @@ else if (StringRandomP == "璇峰垏鎹㈠儚绱犱负4.0") { }else { //PixelFlag = true; } - //灏嗙偣鐨勫亸绉婚噺瀛樺叆瀹瑰櫒涓 - penData.SetShift(Math.abs((int)(y0 - 52))); + if (ShiftIndex) { + //灏嗙偣鐨勫亸绉婚噺瀛樺叆瀹瑰櫒涓 + penData.SetShift(Math.abs((int) (y0 - 52))); + } //灏嗙偣鐨勪俊鎭褰曞湪瀹瑰櫒涓 aiExperimentPanel.arrayListSpot.add(dot); aiExperimentPanel.repaint(); diff --git a/src/IncrementPress.java b/src/IncrementPress.java index 599adf3..eeb6a4c 100644 --- a/src/IncrementPress.java +++ b/src/IncrementPress.java @@ -19,6 +19,10 @@ public class IncrementPress extends JFrame implements ActionListener, MouseInputListener, KeyListener { private int time = 50; //鏇存柊鏃堕棿涓50姣 private Timer timer = new Timer(time,this); //浠ユ瘡50姣瑙﹀彂涓娆ctionPerformed瑙﹀彂鍣 + private int TimeShift = 0; //鑾峰彇鐐圭殑鏃堕棿闂撮殧锛屽湪杩欓噷鍒ゆ柇鏄600ms + private boolean ShiftIndex = false; //鑾峰彇鐐圭殑鏃堕棿淇″彿 + + private PIExperimentPanel piExperimentPanel = new PIExperimentPanel(); //鍒涘缓PIExperimentPanel绫 private boolean ChooseFlag = false; //鏄惁鏄剧ず鍘嬪姏鍔ㄦ佸浘鍍 private int CurrentPress = -1; //鑾峰彇褰撳墠鐨勫帇鍔涘 @@ -343,6 +347,15 @@ public void actionPerformed(ActionEvent e) { PIInter.removeAll(); } this.RepaintPIInter(); + + //瀵硅幏鍙栫偣鐨勬椂闂撮棿闅旇繘琛屽垽鏂 + if (TimeShift == 600) { + ShiftIndex = true; + TimeShift = 0; + }else { + TimeShift += 50; + ShiftIndex = false; + } } @Override public void keyTyped(KeyEvent e) { @@ -677,8 +690,10 @@ else if (StringRandomP == "璇峰垏鎹㈠儚绱犱负4.0") { }else { //PixelFlag = true; } - //灏嗙偣鐨勫亸绉婚噺瀛樺叆瀹瑰櫒涓 - penData.SetShift(Math.abs((int)(y0 - 52))); + if (ShiftIndex) { + //灏嗙偣鐨勫亸绉婚噺瀛樺叆瀹瑰櫒涓 + penData.SetShift(Math.abs((int) (y0 - 52))); + } //灏嗙偣鐨勪俊鎭褰曞湪瀹瑰櫒涓 piExperimentPanel.arrayListSpot.add(dot); piExperimentPanel.repaint(); diff --git a/src/IncrementTilt.java b/src/IncrementTilt.java index cbc4acf..2502150 100644 --- a/src/IncrementTilt.java +++ b/src/IncrementTilt.java @@ -19,6 +19,10 @@ public class IncrementTilt extends JFrame implements ActionListener, MouseInputListener, KeyListener { private int time = 50; private Timer timer = new Timer(time,this); + private int TimeShift = 0; //鑾峰彇鐐圭殑鏃堕棿闂撮殧锛屽湪杩欓噷鍒ゆ柇鏄600ms + private boolean ShiftIndex = false; //鑾峰彇鐐圭殑鏃堕棿淇″彿 + + private TIExperimentJPanel tiExperimentPanel = new TIExperimentJPanel(); private int CurrentTilt = -1; //璁板綍褰撳墠鐨勫炬枩瑙掔殑瑙掑害鍊硷紝鍜岄璁剧殑鎵囧舰鍖哄煙鍋氭瘮杈 @@ -337,6 +341,15 @@ public void actionPerformed(ActionEvent e) { ITInter.removeAll(); } this.RepaintITInter(); + + //瀵硅幏鍙栫偣鐨勬椂闂撮棿闅旇繘琛屽垽鏂 + if (TimeShift == 600) { + ShiftIndex = true; + TimeShift = 0; + }else { + TimeShift += 50; + ShiftIndex = false; + } } @Override @@ -672,8 +685,10 @@ else if (StringRandomP == "璇峰垏鎹㈠儚绱犱负4.0") { }else { } - //灏嗙偣鐨勫亸绉婚噺瀛樺叆瀹瑰櫒涓 - penData.SetShift(Math.abs((int)(y0 - 52))); + if (ShiftIndex) { + //灏嗙偣鐨勫亸绉婚噺瀛樺叆瀹瑰櫒涓 + penData.SetShift(Math.abs((int) (y0 - 52))); + } //灏嗙偣鐨勪俊鎭褰曞湪瀹瑰櫒涓 tiExperimentPanel.arrayListSpot.add(dot); tiExperimentPanel.repaint(); diff --git a/src/ScatteredAzimuth.java b/src/ScatteredAzimuth.java index d43d504..f160d54 100644 --- a/src/ScatteredAzimuth.java +++ b/src/ScatteredAzimuth.java @@ -17,6 +17,9 @@ public class ScatteredAzimuth extends JFrame implements MouseInputListener, KeyListener, ActionListener { private int time = 50; //鏇存柊鏃堕棿涓50姣涓娆 private Timer timer = new Timer(time, this); //浠ユ瘡50姣涓娆¤Е鍙慳ctionPerformed瑙﹀彂鍣 + private int TimeShift = 0; //鑾峰彇鐐圭殑鏃堕棿闂撮殧锛屽湪杩欓噷鍒ゆ柇鏄600ms + private boolean ShiftIndex = false; //鑾峰彇鐐圭殑鏃堕棿淇″彿 + private ASExperimentJPanel asExperimentJPanel = new ASExperimentJPanel(); private int CurrentAzimuth = -1; //鑾峰彇褰撳墠鏂逛綅瑙 @@ -205,6 +208,16 @@ public void actionPerformed(ActionEvent e) { asExperimentJPanel.SetCurrentAzimuth(CurrentAzimuth); asExperimentJPanel.repaint(); asExperimentJPanel.RemoveAllJLabel(); + + //瀵硅幏鍙栫偣鐨勬椂闂撮棿闅旇繘琛屽垽鏂 + if (TimeShift == 600) { + ShiftIndex = true; + TimeShift = 0; + }else { + TimeShift += 50; + ShiftIndex = false; + } + } @Override @@ -506,8 +519,10 @@ public void mouseDragged(MouseEvent e) { } else { } - //灏嗙偣鐨勫亸绉婚噺瀛樺叆瀹瑰櫒涓 - penData.SetShift(Math.abs((int)(y0 - 52))); + if (ShiftIndex) { + //灏嗙偣鐨勫亸绉婚噺瀛樺叆瀹瑰櫒涓 + penData.SetShift(Math.abs((int) (y0 - 52))); + } //灏嗙偣鐨勪俊鎭褰曞湪瀹瑰櫒涓 asExperimentJPanel.arrayListSpot.add(dot); asExperimentJPanel.repaint(); diff --git a/src/ScatteredPress.java b/src/ScatteredPress.java index edab209..c42b71a 100644 --- a/src/ScatteredPress.java +++ b/src/ScatteredPress.java @@ -17,6 +17,10 @@ public class ScatteredPress extends JFrame implements MouseInputListener, KeyListener, ActionListener { private int time = 50; //鏇存柊鏃堕棿涓50姣涓娆 private Timer timer = new Timer(time, this); //浠ユ瘡50姣涓娆¤Е鍙慳ctionPerformed瑙﹀彂鍣 + private int TimeShift = 0; //鑾峰彇鐐圭殑鏃堕棿闂撮殧锛屽湪杩欓噷鍒ゆ柇鏄600ms + private boolean ShiftIndex = false; //鑾峰彇鐐圭殑鏃堕棿淇″彿 + + private PSExperimentPanel psExperimentPanel = new PSExperimentPanel(); private boolean ChooseFlag = false; //鏄惁鏄剧ず鍘嬪姏鍔ㄦ佸浘鍍 private int CurrentPress = -1; //鑾峰彇褰撳墠鍘嬪姏鍊 @@ -218,6 +222,15 @@ public void actionPerformed(ActionEvent e) { psExperimentPanel.repaint(); //瀵瑰儚绱犳爣绛捐繘琛岀Щ闄 psExperimentPanel.RemoveItemJLabel(); + + //瀵硅幏鍙栫偣鐨勬椂闂撮棿闅旇繘琛屽垽鏂 + if (TimeShift == 600) { + ShiftIndex = true; + TimeShift = 0; + }else { + TimeShift += 50; + ShiftIndex = false; + } } @Override @@ -518,8 +531,10 @@ public void mouseDragged(MouseEvent e) { } else { } - //灏嗙偣鐨勫亸绉婚噺瀛樺叆瀹瑰櫒涓 - penData.SetShift(Math.abs((int)(y0 - 52))); + if (ShiftIndex) { + //灏嗙偣鐨勫亸绉婚噺瀛樺叆瀹瑰櫒涓 + penData.SetShift(Math.abs((int) (y0 - 52))); + } //灏嗙偣鐨勪俊鎭褰曞湪瀹瑰櫒涓 psExperimentPanel.arrayListSpot.add(dot); psExperimentPanel.repaint(); diff --git a/src/ScatteredTilt.java b/src/ScatteredTilt.java index 6a5ade7..0d5a81e 100644 --- a/src/ScatteredTilt.java +++ b/src/ScatteredTilt.java @@ -18,6 +18,10 @@ public class ScatteredTilt extends JFrame implements MouseInputListener, KeyListener, ActionListener { private int time = 50; //鏇存柊鏃堕棿涓50姣 private Timer timer = new Timer(time,this); //姣50姣瑙﹀彂涓娆ctionPerformed + private int TimeShift = 0; //鑾峰彇鐐圭殑鏃堕棿闂撮殧锛屽湪杩欓噷鍒ゆ柇鏄600ms + private boolean ShiftIndex = false; //鑾峰彇鐐圭殑鏃堕棿淇″彿 + + private TSExperimentPanel tsExperimentPanel = new TSExperimentPanel(); private int CurrentTilt = -1; //鑾峰彇褰撳墠鍊炬枩瑙 @@ -209,6 +213,15 @@ public void actionPerformed(ActionEvent e) { tsExperimentPanel.repaint(); //瀵瑰儚绱犳爣绛捐繘琛岀Щ闄 tsExperimentPanel.RemoveAllJLabel(); + + //瀵硅幏鍙栫偣鐨勬椂闂撮棿闅旇繘琛屽垽鏂 + if (TimeShift == 600) { + ShiftIndex = true; + TimeShift = 0; + }else { + TimeShift += 50; + ShiftIndex = false; + } } @Override @@ -505,8 +518,10 @@ public void mouseDragged(MouseEvent e) { } else { } - //灏嗙偣鐨勫亸绉婚噺瀛樺叆瀹瑰櫒涓 - penData.SetShift(Math.abs((int)(y0 - 52))); + if (ShiftIndex) { + //灏嗙偣鐨勫亸绉婚噺瀛樺叆瀹瑰櫒涓 + penData.SetShift(Math.abs((int) (y0 - 52))); + } //灏嗙偣鐨勪俊鎭褰曞湪瀹瑰櫒涓 tsExperimentPanel.arrayListSpot.add(dot); tsExperimentPanel.repaint(); diff --git a/src/TraditionalFrame.java b/src/TraditionalFrame.java index 996f1cc..7d14dfa 100644 --- a/src/TraditionalFrame.java +++ b/src/TraditionalFrame.java @@ -17,8 +17,8 @@ public class TraditionalFrame implements ActionListener, MouseInputListener, KeyListener{ private int time = 50; private Timer timer = new Timer(time, this); - private int TimeShift = 0; - private boolean ShiftIndex = false; + private int TimeShift = 0; //鑾峰彇鐐圭殑鏃堕棿闂撮殧锛屽湪杩欓噷鍒ゆ柇鏄600ms + private boolean ShiftIndex = false; //鑾峰彇鐐圭殑鏃堕棿淇″彿 //浼犵粺鍐欏瓧鐣岄潰鐨勫畾涔 @@ -362,6 +362,7 @@ public void RemoveRandom() { } @Override public void actionPerformed(ActionEvent e) { + //瀵硅幏鍙栫偣鐨勬椂闂撮棿闅旇繘琛屽垽鏂 if (TimeShift == 600) { ShiftIndex = true; TimeShift = 0;