diff --git a/SmartAquaViewer/MainWindow.xaml b/SmartAquaViewer/MainWindow.xaml
index 615c8a6..5358c03 100644
--- a/SmartAquaViewer/MainWindow.xaml
+++ b/SmartAquaViewer/MainWindow.xaml
@@ -61,7 +61,7 @@
-
+
+ Grid.Row="2" Grid.Column="1" Margin="24 16 24 12"/>
diff --git a/SmartAquaViewer/Resources/Generic.xaml b/SmartAquaViewer/Resources/Generic.xaml
index 53b4b38..d324955 100644
--- a/SmartAquaViewer/Resources/Generic.xaml
+++ b/SmartAquaViewer/Resources/Generic.xaml
@@ -281,7 +281,9 @@
+ Background="{TemplateBinding Background}"
+ BorderThickness="0 1 0 0"
+ BorderBrush="#264A60">
+
+
+
+
\ No newline at end of file
diff --git a/SmartAquaViewer/View/MonitoringView.xaml b/SmartAquaViewer/View/MonitoringView.xaml
index af83e39..6904c7e 100644
--- a/SmartAquaViewer/View/MonitoringView.xaml
+++ b/SmartAquaViewer/View/MonitoringView.xaml
@@ -563,13 +563,13 @@
-
+
-
-
+
-
+
-
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+
+
+
+
+
+
+
+ FontSize="16" FontFamily="{StaticResource SCDream4}" Foreground="#264A60"
+ Margin="0 0 4 0" VerticalContentAlignment="Center">
+
+
+
+
+
-
-
-
+
-
+
diff --git a/SmartAquaViewer/ViewModel/GraphControlViewModel.cs b/SmartAquaViewer/ViewModel/GraphControlViewModel.cs
index 3e16899..ef0c08e 100644
--- a/SmartAquaViewer/ViewModel/GraphControlViewModel.cs
+++ b/SmartAquaViewer/ViewModel/GraphControlViewModel.cs
@@ -21,7 +21,21 @@ namespace SmartAquaViewer.ViewModel
private void InitializeGraph()
{
- Model.TextColor = OxyColors.LightGray;
+ Model.TextColor = OxyColors.White;
+ Model.PlotAreaBorderColor = OxyColors.White;
+ Model.PlotAreaBorderThickness = new OxyThickness(1);
+ Model.Padding = new OxyThickness(0);
+ }
+
+ private void ApplyCommonAxisSettings(Axis axis, string title, AxisPosition position)
+ {
+ axis.Position = position;
+ axis.Title = title;
+ axis.TitleFontSize = 14;
+ axis.FontSize = 12;
+ axis.MajorGridlineStyle = LineStyle.Solid;
+ axis.MajorGridlineColor = OxyColor.Parse("#767676");
+ axis.TickStyle = TickStyle.None;
}
public void SetTankLineGraph(
@@ -35,30 +49,26 @@ namespace SmartAquaViewer.ViewModel
bool xIsTime = string.Equals(xField!.Name, "RecordedTime", StringComparison.OrdinalIgnoreCase);
- Axis xAxis = xIsTime
- ? new DateTimeAxis
+ Axis xAxis;
+
+ if (xIsTime)
+ {
+ xAxis = new DateTimeAxis
{
- Position = AxisPosition.Bottom,
- Title = xField.Display,
StringFormat = "HH:mm:ss",
- IntervalType = DateTimeIntervalType.Minutes,
- MajorGridlineStyle = LineStyle.Solid,
- MinorGridlineStyle = LineStyle.Dot,
- }
- : new LinearAxis
- {
- Position = AxisPosition.Bottom,
- Title = xField.Display,
- MajorGridlineStyle = LineStyle.Solid,
- MinorGridlineStyle = LineStyle.Dot
+ IntervalType = DateTimeIntervalType.Minutes
};
- var yAxis = new LinearAxis
+ }
+ else
{
- Position = AxisPosition.Left,
- Title = yField!.Display,
- MajorGridlineStyle = LineStyle.Solid,
- MinorGridlineStyle = LineStyle.Dot
- };
+ xAxis = new LinearAxis();
+ }
+
+ ApplyCommonAxisSettings(xAxis, xField.Display, AxisPosition.Bottom);
+
+ var yAxis = new LinearAxis();
+ ApplyCommonAxisSettings(yAxis, yField!.Display, AxisPosition.Left);
+ yAxis.AxisTitleDistance = 10;
Model.Axes.Add(xAxis);
Model.Axes.Add(yAxis);
diff --git a/SmartAquaViewer/ViewModel/MonitoringViewModel.cs b/SmartAquaViewer/ViewModel/MonitoringViewModel.cs
index 53fdbdf..50bab53 100644
--- a/SmartAquaViewer/ViewModel/MonitoringViewModel.cs
+++ b/SmartAquaViewer/ViewModel/MonitoringViewModel.cs
@@ -19,6 +19,8 @@ namespace SmartAquaViewer.ViewModel
public string? Display { get; init; } // UI 표시명 (예: "DO (mg/L)")
public Type? DataType { get; init; } // typeof(double), typeof(DateTime) 등
public StepFieldKind Kind { get; init; }
+
+ public override string? ToString() => Display;
}
///