Skip to content

Commit

Permalink
2021-04-27
Browse files Browse the repository at this point in the history
  • Loading branch information
@ProgramTraveler
ProgramTraveler committed Apr 27, 2021
1 parent ba12dc0 commit 957dac4
Show file tree
Hide file tree
Showing 22 changed files with 59 additions and 24 deletions.
9 changes: 9 additions & 0 deletions README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -901,3 +901,12 @@
* **另一个解决办法：** 直接在后面加制表符 **\t**就行了，直接解决这个问题

---

### 2021-04-27

#### 误触发的记录和模式切换错误的修改

* 对于误触发的记录存在记录问题 **->** **问题根源：** 当用户进入到误触发界面的时候，只要你不抬笔，每次滑动一次就会记录一次，这是我之前没有考虑到的地方，把这部分注释掉就行了
* 模式切换错误不保存为累加，而是针对每个实验单独记录

---
6 changes: 6 additions & 0 deletions information.csv
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,3 +11,9 @@ id,
10,,1,4,��ͳ����ģʽ,��ɫ,4.0,18:51:44:632,18:51:49:626,-80019,-2052,-82071,2143,827,554,367,1,1,1,6,0,0,0,0,0,0,0,0,0,8.000
11,,1,1,P-ʵ��ֵ,��ɫ,4.0,18:55:04:740,18:55:07:958,-1619520908849,-1619520909777,-3239041818626,1787,487,203,437,1,1,1,2,0,0,348,0,0,0,0,0,0,9.875
12,,1,1,��ͳ����ģʽ,��ɫ,2.0,18:56:09:546,18:56:13:410,-1619520970193,-1021,-1619520971214,4734,882,656,665,1,1,1,2,0,0,0,0,0,0,0,0,0,24.000
13,,1,1,P-ʵ��ֵ,,,19:11:31:102,19:11:32:899,1619521907538,0,1619521907538,13363,1055,1695,4400,34,1,0,1,0,0,645,0,0,0,0,0,0,24.000
14,,1,2,P-ʵ��ֵ,,,19:11:31:102,19:11:32:899,1619521907538,1619521936759,3239043844297,35005,1161,26210,1523,34,1,1,3,0,0,634,0,0,0,0,0,0,12.000
15,,1,1,P-ʵ��ֵ,��ɫ,3.0,19:26:02:94,19:26:03:656,-1619522762683,-1619522763478,-3239045526161,1569,365,178,368,0,1,1,2,0,0,0,0,0,0,0,0,0,21.000
16,,1,2,P-ʵ��ֵ,��ɫ,3.0,19:26:02:94,19:26:03:656,-1619522765910,-1619522766768,-3239045532678,1626,382,110,440,0,1,1,2,0,0,0,0,0,0,0,0,0,15.125
17,,1,1,P-ʵ��ֵ,,,19:31:42:897,19:31:45:689,1619523108381,0,1619523108381,7915,2802,2583,403,62,1,0,1,0,0,506,0,0,0,0,0,0,?
18,,1,1,P-ʵ��ֵ,��ɫ,2.0,19:43:46:568,19:43:47:232,-482,-11482,-11964,1745,2,190,541,2,0,0,0,0,0,606,0,0,0,0,0,0,9.818
Binary file modified out/production/PenProject/ActualAzimuth.class
View file
Binary file not shown.
Binary file modified out/production/PenProject/ActualPress.class
View file
Binary file not shown.
Binary file modified out/production/PenProject/ActualTilt.class
View file
Binary file not shown.
Binary file modified out/production/PenProject/IncrementAzimuth.class
View file
Binary file not shown.
Binary file modified out/production/PenProject/IncrementPress.class
View file
Binary file not shown.
Binary file modified out/production/PenProject/IncrementTilt.class
View file
Binary file not shown.
Binary file modified out/production/PenProject/PenData.class
View file
Binary file not shown.
Binary file modified out/production/PenProject/ScatteredAzimuth.class
View file
Binary file not shown.
Binary file modified out/production/PenProject/TraditionalFrame.class
View file
Binary file not shown.
9 changes: 5 additions & 4 deletions src/ActualAzimuth.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -364,6 +364,7 @@ public void keyPressed(KeyEvent e) {
penData.SetPixelModeE(0); //初始化像素切换错误数

penData.SetTouchE(0);
penData.SetModeE(0); //初始化模式切换错误
}
}

Expand Down Expand Up @@ -487,10 +488,10 @@ public void mouseDragged(MouseEvent e) {
aaExperimentPanel.SetSelectColorItem(this.CheckColorItem(e.getX(), e.getY()));

//如果颜色提示还没有出现就调用，颜色误触发加一
if (ColorChange == false && aaExperimentPanel.GetSelectColorItem() != -1) {
/*if (ColorChange == false && aaExperimentPanel.GetSelectColorItem() != -1) {
penData.AddColorTouchE(); //颜色误触发加一
penData.AddTouchE(); //误触发总数加一
}
}*/
int tempC = aaExperimentPanel.GetSelectColorItem();
if (tempC == 0) {
penData.SetResultC("蓝色");
Expand All @@ -515,10 +516,10 @@ public void mouseDragged(MouseEvent e) {
//传入具体的哪个像素被选择
aaExperimentPanel.SetSelectPixelItem(this.CheckPixelItem(e.getX(), e.getY()));
//如果像素提示还未出现就切换，像素误触发加一
if (PixelChange == false && aaExperimentPanel.GetSelectPixelItem() != -1) {
/*if (PixelChange == false && aaExperimentPanel.GetSelectPixelItem() != -1) {
penData.AddPixelTouchE(); //像素误触发加一
penData.AddTouchE(); //误触发总数加一
}
}*/
int tempP = aaExperimentPanel.GetSelectPixelItem();
if (tempP == 0) {
penData.SetResultP("2.0");
Expand Down
10 changes: 6 additions & 4 deletions src/ActualPress.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -276,6 +276,7 @@ public int CheckPixelItem(int x, int y) {
return PixelItem;

}

@Override
public void actionPerformed(ActionEvent e) {
CurrentPress = penValue.Pressure();
Expand Down Expand Up @@ -364,6 +365,7 @@ public void keyPressed(KeyEvent e) {
penData.SetColorTouchE(0); //初始化颜色误触发数
penData.SetPixelTouchE(0); //初始化像素误触发数

penData.SetModeE(0); //初始化模式切换错误
penData.SetColorModeE(0); //初始化颜色切换错误数
penData.SetPixelModeE(0); //初始化像素切换错误数

Expand Down Expand Up @@ -488,10 +490,10 @@ public void mouseDragged(MouseEvent e) {
//传入具体是哪个颜色被选择
paExperimentPanel.SetSelectColorItem(this.CheckColorItem(e.getX(), e.getY()));
//如果颜色提示还没有出现就调用，颜色误触发加一
if (ColorChange == false && paExperimentPanel.GetSelectColorItem() != -1) {
/*if (ColorChange == false && paExperimentPanel.GetSelectColorItem() != -1) {
penData.AddColorTouchE(); //颜色误触发加一
penData.AddTouchE(); //误触发总数加一
}
}*/
int tempC = paExperimentPanel.GetSelectColorItem();
if (tempC == 0) {
penData.SetResultC("蓝色");
Expand All @@ -516,10 +518,10 @@ public void mouseDragged(MouseEvent e) {
//传入具体的哪个像素被选择
paExperimentPanel.SetSelectPixelItem(this.CheckPixelItem(e.getX(), e.getY()));
//如果像素提示还未出现就切换，像素误触发加一
if (PixelChange == false && paExperimentPanel.GetSelectPixelItem() != -1) {
/*if (PixelChange == false && paExperimentPanel.GetSelectPixelItem() != -1) {
penData.AddPixelTouchE(); //像素误触发加一
penData.AddTouchE(); //误触发总数加一
}
}*/
int tempP = paExperimentPanel.GetSelectPixelItem();
if (tempP == 0) {
penData.SetResultP("2.0");
Expand Down
9 changes: 5 additions & 4 deletions src/ActualTilt.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -369,6 +369,7 @@ public void keyPressed(KeyEvent e) {
penData.SetPixelModeE(0); //初始化像素切换错误数

penData.SetTouchE(0);
penData.SetModeE(0); //初始化模式切换错误
}
}

Expand Down Expand Up @@ -490,10 +491,10 @@ public void mouseDragged(MouseEvent e) {
//传入具体是哪个颜色被选择
taExperimentPanel.SetSelectColorItem(this.CheckColorItem(e.getX(), e.getY()));
//如果颜色提示还没有出现就调用，颜色误触发加一
if (ColorChange == false && taExperimentPanel.GetSelectColorItem() != -1) {
/*if (ColorChange == false && taExperimentPanel.GetSelectColorItem() != -1) {
penData.AddColorTouchE(); //颜色误触发加一
penData.AddTouchE(); //误触发总数加一
}
}*/
int tempC = taExperimentPanel.GetSelectColorItem();
if (tempC == 0) {
penData.SetResultC("蓝色");
Expand All @@ -518,10 +519,10 @@ public void mouseDragged(MouseEvent e) {
//传入具体的哪个像素被选择
taExperimentPanel.SetSelectPixelItem(this.CheckPixelItem(e.getX(), e.getY()));
//如果像素提示还未出现就切换，像素误触发加一
if (PixelChange == false && taExperimentPanel.GetSelectPixelItem() != -1) {
/*if (PixelChange == false && taExperimentPanel.GetSelectPixelItem() != -1) {
penData.AddPixelTouchE(); //像素误触发加一
penData.AddTouchE(); //误触发总数加一
}
}*/
int tempP = taExperimentPanel.GetSelectPixelItem();
if (tempP == 0) {
penData.SetResultP("2.0");
Expand Down
10 changes: 6 additions & 4 deletions src/IncrementAzimuth.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -416,6 +416,8 @@ public void keyPressed(KeyEvent e) {
penData.SetColorModeE(0); //初始化颜色切换错误数
penData.SetPixelModeE(0); //初始化像素切换错误数
penData.SetTouchE(0); //初始化误触发总数

penData.SetModeE(0); //初始化模式切换错误
}
}

Expand Down Expand Up @@ -536,10 +538,10 @@ public void mouseDragged(MouseEvent e) {
//传入具体是哪个颜色被选择
aiExperimentPanel.SetSelectColorItem(this.CheckColorItem(e.getX(), e.getY()));
//如果颜色提示还没有出现就调用，颜色误触发加一
if (ColorChange == false && aiExperimentPanel.GetSelectColorItem() != -1) {
/*if (ColorChange == false && aiExperimentPanel.GetSelectColorItem() != -1) {
penData.AddColorTouchE(); //颜色误触发加一
penData.AddTouchE(); //误触发总数加一
}
}*/
int tempC = aiExperimentPanel.GetSelectColorItem();
if (tempC == 0) {
penData.SetResultC("蓝色");
Expand All @@ -564,10 +566,10 @@ public void mouseDragged(MouseEvent e) {
//传入具体的哪个像素被选择
aiExperimentPanel.SetSelectPixelItem(this.CheckPixelItem(e.getX(), e.getY()));
//如果像素提示还未出现就切换，像素误触发加一
if (PixelChange == false && aiExperimentPanel.GetSelectPixelItem() != -1) {
/*if (PixelChange == false && aiExperimentPanel.GetSelectPixelItem() != -1) {
penData.AddPixelTouchE(); //像素误触发加一
penData.AddTouchE(); //误触发总数加一
}
}*/
int tempP = aiExperimentPanel.GetSelectPixelItem();
if (tempP == 0) {
penData.SetResultP("2.0");
Expand Down
10 changes: 6 additions & 4 deletions src/IncrementPress.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -419,6 +419,8 @@ public void keyPressed(KeyEvent e) {
penData.SetColorModeE(0); //初始化颜色切换错误数
penData.SetPixelModeE(0); //初始化像素切换错误数
penData.SetTouchE(0); //初始化误触发总数

penData.SetModeE(0); //初始化模式切换错误
}
}

Expand Down Expand Up @@ -537,10 +539,10 @@ public void mouseDragged(MouseEvent e) {
//传入具体是哪个颜色被选择
piExperimentPanel.SetSelectColorItem(this.CheckColorItem(e.getX(), e.getY()));
//如果颜色提示还没有出现就调用，颜色误触发加一
if (ColorChange == false && piExperimentPanel.GetSelectColorItem() != -1) {
/*if (ColorChange == false && piExperimentPanel.GetSelectColorItem() != -1) {
penData.AddColorTouchE(); //颜色误触发加一
penData.AddTouchE(); //误触发总数加一
}
}*/
int tempC = piExperimentPanel.GetSelectColorItem();
if (tempC == 0) {
penData.SetResultC("蓝色");
Expand All @@ -565,10 +567,10 @@ public void mouseDragged(MouseEvent e) {
//传入具体的哪个像素被选择
piExperimentPanel.SetSelectPixelItem(this.CheckPixelItem(e.getX(), e.getY()));
//如果像素提示还未出现就切换，像素误触发加一
if (PixelChange == false && piExperimentPanel.GetSelectPixelItem() != -1) {
/*if (PixelChange == false && piExperimentPanel.GetSelectPixelItem() != -1) {
penData.AddPixelTouchE(); //像素误触发加一
penData.AddTouchE(); //误触发总数加一
}
}*/
int tempP = piExperimentPanel.GetSelectPixelItem();
if (tempP == 0) {
penData.SetResultP("2.0");
Expand Down
10 changes: 6 additions & 4 deletions src/IncrementTilt.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -413,6 +413,8 @@ public void keyPressed(KeyEvent e) {
penData.SetPixelModeE(0); //初始化像素切换错误数

penData.SetTouchE(0); //初始化误触发总数

penData.SetModeE(0); //初始化模式切换错误
}
}

Expand Down Expand Up @@ -532,10 +534,10 @@ public void mouseDragged(MouseEvent e) {
//传入具体是哪个颜色被选择
tiExperimentPanel.SetSelectColorItem(this.CheckColorItem(e.getX(), e.getY()));
//如果颜色提示还没有出现就调用，颜色误触发加一
if (ColorChange == false && tiExperimentPanel.GetSelectColorItem() != -1) {
/*if (ColorChange == false && tiExperimentPanel.GetSelectColorItem() != -1) {
penData.AddColorTouchE(); //颜色误触发加一
penData.AddTouchE(); //误触发总数加一
}
}*/
int tempC = tiExperimentPanel.GetSelectColorItem();
if (tempC == 0) {
penData.SetResultC("蓝色");
Expand All @@ -560,10 +562,10 @@ public void mouseDragged(MouseEvent e) {
//传入具体的哪个像素被选择
tiExperimentPanel.SetSelectPixelItem(this.CheckPixelItem(e.getX(), e.getY()));
//如果像素提示还未出现就切换，像素误触发加一
if (PixelChange == false && tiExperimentPanel.GetSelectPixelItem() != -1) {
/*if (PixelChange == false && tiExperimentPanel.GetSelectPixelItem() != -1) {
penData.AddPixelTouchE(); //像素误触发加一
penData.AddTouchE(); //误触发总数加一
}
}*/
int tempP = tiExperimentPanel.GetSelectPixelItem();
if (tempP == 0) {
penData.SetResultP("2.0");
Expand Down
1 change: 1 addition & 0 deletions src/PenData.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -191,6 +191,7 @@ public String GetTargetLine() {
public void SetTouchE(int i) { TouchError = i; }
public void AddTouchE() {
TouchError ++;
System.out.println(TouchError);
}
public int GetTouchE() {
return TouchError;
Expand Down
3 changes: 3 additions & 0 deletions src/ScatteredAzimuth.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -346,6 +346,9 @@ public void keyPressed(KeyEvent e) {
penData.SetColorModeE(0); //初始化颜色切换错误数
penData.SetPixelModeE(0); //初始化像素切换错误数
penData.SetTouchE(0); //初始化误触发总数

penData.SetModeE(0); //初始化模式切换错误

}
}

Expand Down
2 changes: 2 additions & 0 deletions src/ScatteredPress.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -359,6 +359,8 @@ public void keyPressed(KeyEvent e) {
penData.SetColorModeE(0); //初始化颜色切换错误数
penData.SetPixelModeE(0); //初始化像素切换错误数
penData.SetTouchE(0); //初始化误触发总数

penData.SetModeE(0); //初始化模式切换错误
}
}

Expand Down
2 changes: 2 additions & 0 deletions src/ScatteredTilt.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -351,6 +351,8 @@ public void keyPressed(KeyEvent e) {
penData.SetColorModeE(0); //初始化颜色切换错误数
penData.SetPixelModeE(0); //初始化像素切换错误数
penData.SetTouchE(0); //初始化误触发总数

penData.SetModeE(0); //初始化模式切换错误
}
}

Expand Down
2 changes: 2 additions & 0 deletions src/TraditionalFrame.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -451,6 +451,8 @@ public void keyPressed(KeyEvent e) {
pData.SetPixelModeE(0); //初始化像素切换错误数

pData.SetTouchE(0); //初始化误触发总数

pData.SetModeE(0); //初始化模式切换错误
}
}

Expand Down

0 comments on commit 957dac4

Please sign in to comment.