Skip to content

Commit 1cf3dd2

Browse files
memorydreammemorydream
committed
CP / refactor : rename Manually -> CustomFTL
1 parent 1c96b6d commit 1cf3dd2

File tree

8 files changed

+27
-25
lines changed

8 files changed

+27
-25
lines changed

‎PearlCalculatorCP/Assets/i18n/zh_cn.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"GeneralFTLHeader": "通用FTL",
3-
"ManuallyHeader": "自定义FTL",
3+
"CustomFTLHeader": "自定义FTL",
44

55
"GeneralFTLGeneralHeader": "一般选项",
66
"GeneralFTLAdvancedHeader": "进阶选项",

‎PearlCalculatorCP/Assets/i18n/zh_tw.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"GeneralFTLHeader": "通用FTL",
3-
"ManuallyHeader": "自訂義FTL",
3+
"CustomFTLHeader": "自訂義FTL",
44

55
"GeneralFTLGeneralHeader": "一般設定",
66
"GeneralFTLAdvancedHeader": "進階設定",

‎PearlCalculatorCP/EventArgs.cs‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,13 @@
1-
using PearlCalculatorLib.Result;
1+
using System;
2+
using PearlCalculatorLib.Result;
23
using System.Collections.Generic;
34
using PearlCalculatorCP.Models;
45
using PearlCalculatorCP.ViewModels;
56
using PearlCalculatorLib.Settings;
67

78
namespace PearlCalculatorCP
89
{
9-
public abstract class PCEventArgs
10+
public abstract class PCEventArgs : EventArgs
1011
{
1112
public readonly string PublishKey;
1213

PearlCalculatorCP/ViewModels/ManuallyViewModel.cs renamed to PearlCalculatorCP/ViewModels/CustomFTLViewModel.cs

Lines changed: 12 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,10 @@
99

1010
namespace PearlCalculatorCP.ViewModels
1111
{
12-
public class ManuallyViewModel : ViewModelBase
13-
{
12+
public class CustomFTLViewModel : ViewModelBase
13+
{
14+
public const string PublishKey = "CustomFTL";
15+
1416
private double _pearlX;
1517
public double PearlX
1618
{
@@ -146,15 +148,15 @@ public void CalculateAmount()
146148
var data = CreateManuallyData();
147149
if (Calculation.CalculateTNTAmount(data, MainWindowViewModel.MaxTicks, MainWindowViewModel.MaxDistance, out var result))
148150
{
149-
EventManager.PublishEvent(this, "calculate", new CalculateTNTAmountArgs("Manually", result));
151+
EventManager.PublishEvent(this, "calculate", new CalculateTNTAmountArgs(PublishKey, result));
150152
var angle = data.Pearl.Position.WorldAngle(data.Destination.ToSpace3D());
151153
var direction = DirectionUtils.GetDirection(angle).ToString();
152-
EventManager.PublishEvent(this, "showDirectionResult", new ShowDirectionResultArgs("Manually", direction, angle.ToString()));
154+
EventManager.PublishEvent(this, "showDirectionResult", new ShowDirectionResultArgs(PublishKey, direction, angle.ToString()));
153155
}
154156
else
155157
{
156-
EventManager.PublishEvent(this, "calculate", new CalculateTNTAmountArgs("Manually", null));
157-
EventManager.PublishEvent(this, "showDirectionResult", new ShowDirectionResultArgs("Manually", string.Empty, string.Empty));
158+
EventManager.PublishEvent(this, "calculate", new CalculateTNTAmountArgs(PublishKey, null));
159+
EventManager.PublishEvent(this, "showDirectionResult", new ShowDirectionResultArgs(PublishKey, string.Empty, string.Empty));
158160
}
159161
}
160162

@@ -176,8 +178,8 @@ public void CalculateTrace()
176178
}));
177179
chunkModels.AddRange(chunks.Select((c, i) => new PearlTraceChunkModel{Tick = i, XCoor = c.X, ZCoor = c.Z}));
178180

179-
EventManager.PublishEvent(this, "pearlTrace", new PearlSimulateArgs("Manually", traces, chunkModels));
180-
EventManager.PublishEvent(this, "showDirectionResult", new ShowDirectionResultArgs("Manually", string.Empty, string.Empty));
181+
EventManager.PublishEvent(this, "pearlTrace", new PearlSimulateArgs(PublishKey, traces, chunkModels));
182+
EventManager.PublishEvent(this, "showDirectionResult", new ShowDirectionResultArgs(PublishKey, string.Empty, string.Empty));
181183
}
182184

183185
public void CalculateMomentum()
@@ -192,8 +194,8 @@ public void CalculateMomentum()
192194
YCoor = t.Motion.Y,
193195
ZCoor = t.Motion.Z
194196
}));
195-
EventManager.PublishEvent(this, "pearlMotion", new PearlSimulateArgs("Manually", traces, null));
196-
EventManager.PublishEvent(this, "showDirectionResult", new ShowDirectionResultArgs("Manually", string.Empty, string.Empty));
197+
EventManager.PublishEvent(this, "pearlMotion", new PearlSimulateArgs(PublishKey, traces, null));
198+
EventManager.PublishEvent(this, "showDirectionResult", new ShowDirectionResultArgs(PublishKey, string.Empty, string.Empty));
197199
}
198200
}
199201
}

‎PearlCalculatorCP/ViewModels/ResultPanelViewModel.cs‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -136,8 +136,8 @@ public ResultPanelViewModel()
136136
var isNaN = args.IsNaN;
137137
ShowMode = isNaN ? ResultShowMode.AmountNaN : ResultShowMode.Amount;
138138

139-
_amountDataSource = args.PublishKey == "Manually"
140-
? ResultAmountDataSource.Manually
139+
_amountDataSource = args.PublishKey == CustomFTLViewModel.PublishKey
140+
? ResultAmountDataSource.Custom
141141
: ResultAmountDataSource.General;
142142

143143
_amountList = args.Results;
@@ -262,6 +262,6 @@ public enum ResultShowMode
262262

263263
public enum ResultAmountDataSource
264264
{
265-
General, Manually
265+
General, Custom
266266
}
267267
}

PearlCalculatorCP/Views/Manually.axaml renamed to PearlCalculatorCP/Views/CustomFTL.axaml

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,9 @@
33
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
44
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
55
xmlns:i18n="clr-namespace:PearlCalculatorCP.Localizer"
6-
xmlns:converters="using:PearlCalculatorCP.Converters"
76
xmlns:vm="using:PearlCalculatorCP.ViewModels"
87
mc:Ignorable="d" d:DesignWidth="1000" d:DesignHeight="800"
9-
x:Class="PearlCalculatorCP.Views.Manually">
8+
x:Class="PearlCalculatorCP.Views.CustomFTL">
109

1110
<UserControl.Styles>
1211

@@ -29,7 +28,7 @@
2928
</UserControl.Styles>
3029

3130
<UserControl.DataContext>
32-
<vm:ManuallyViewModel />
31+
<vm:CustomFTLViewModel />
3332
</UserControl.DataContext>
3433

3534
<Grid RowDefinitions="5, *, 5">

PearlCalculatorCP/Views/Manually.axaml.cs renamed to PearlCalculatorCP/Views/CustomFTL.axaml.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,10 @@
88

99
namespace PearlCalculatorCP.Views
1010
{
11-
public class Manually : UserControl
11+
public class CustomFTL : UserControl
1212
{
1313

14-
public Manually()
14+
public CustomFTL()
1515
{
1616
InitializeComponent();
1717
}

‎PearlCalculatorCP/Views/MainWindow.axaml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -163,9 +163,9 @@
163163

164164
</TabItem>
165165

166-
<!--Manually-->
167-
<TabItem Header="{i18n:Translate ManuallyHeader, Fallback='Manually'}">
168-
<views:Manually />
166+
<!--Custom FTL-->
167+
<TabItem Header="{i18n:Translate CustomFTLHeader, Fallback='Custom FTL'}">
168+
<views:CustomFTL />
169169
</TabItem>
170170

171171
</TabControl>

0 commit comments

Comments
 (0)