Update and code cleanup

teranum · Dec 7, 2023 · e8bc517 · e8bc517
1 parent a9577ba
commit e8bc517
Show file tree

Hide file tree

Showing 37 changed files with 1,084 additions and 304 deletions.
diff --git a/README.md b/README.md
@@ -28,5 +28,9 @@
 * 조건검색식 호출
 ![](./img/run-004.png)
 
+* 차트요청
 ![](./img/run-005.png)
 
+* 주문요청
+![](./img/run-006.png)
+
diff --git a/img/run-005.png b/img/run-005.png
diff --git a/img/run-006.png b/img/run-006.png
diff --git a/src/KOAStudio.Core/Controls/OrderControl.xaml.cs b/src/KOAStudio.Core/Controls/OrderControl.xaml.cs
@@ -1,17 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using System.Windows;
-using System.Windows.Controls;
-using System.Windows.Data;
-using System.Windows.Documents;
-using System.Windows.Input;
-using System.Windows.Media;
-using System.Windows.Media.Imaging;
-using System.Windows.Navigation;
-using System.Windows.Shapes;
+using System.Windows.Controls;
 
 namespace KOAStudio.Core.Controls
 {

diff --git a/src/KOAStudio.Core/Converters/BooleanToNamedBrushConverter.cs b/src/KOAStudio.Core/Converters/BooleanToNamedBrushConverter.cs
@@ -9,14 +9,16 @@ public class BooleanToNamedBrushConverter : IValueConverter
     {
         public object? Convert(object value, Type targetType, object parameter, CultureInfo culture)
         {
-            string? retVals = parameter as string;
-            if (retVals != null)
+            if (value is bool bValue)
             {
-                var true_false = retVals.Split(',');
-                if (true_false.Length == 2)
+                if (parameter is string retVals)
                 {
-                    var brushConverter = new BrushConverter();
-                    return (bool)value ? brushConverter.ConvertFromString(true_false[1]) : brushConverter.ConvertFromString(true_false[0]);
+                    var true_false = retVals.Split(',');
+                    if (true_false.Length == 2)
+                    {
+                        var brushConverter = new BrushConverter();
+                        return bValue ? brushConverter.ConvertFromString(true_false[1]) : brushConverter.ConvertFromString(true_false[0]);
+                    }
                 }
             }
             return new SolidColorBrush(Color.FromRgb(0, 0, 0));

diff --git a/src/KOAStudio.Core/Converters/BooleanToStringConverter.cs b/src/KOAStudio.Core/Converters/BooleanToStringConverter.cs
@@ -8,13 +8,15 @@ public class BooleanToStringConverter : IValueConverter
     {
         public object Convert(object value, Type targetType, object parameter, CultureInfo culture)
         {
-            string? retVals = parameter as string;
-            if (retVals != null)
+            if (value is bool bValue)
             {
-                var true_false = retVals.Split(',');
-                if (true_false.Length == 2)
+                if (parameter is string retVals)
                 {
-                    return (bool)value ? true_false[1] : true_false[0];
+                    var true_false = retVals.Split(',');
+                    if (true_false.Length == 2)
+                    {
+                        return bValue ? true_false[1] : true_false[0];
+                    }
                 }
             }
             return "Invalid";

diff --git a/....Core/Converters/HasChartRoundInterval.cs → ...verters/HasChartRoundIntervalConverter.cs b/....Core/Converters/HasChartRoundInterval.cs → ...verters/HasChartRoundIntervalConverter.cs
@@ -4,7 +4,7 @@
 
 namespace KOAStudio.Core.Converters
 {
-    internal class HasChartRoundInterval : IValueConverter
+    internal class HasChartRoundIntervalConverter : IValueConverter
     {
         public object Convert(object value, Type targetType, object parameter, CultureInfo culture)
         {

diff --git a/src/KOAStudio.Core/Converters/InverseBooleanConverter.cs b/src/KOAStudio.Core/Converters/InverseBooleanConverter.cs
@@ -5,8 +5,6 @@ namespace KOAStudio.Core.Converters
     [ValueConversion(typeof(bool), typeof(bool))]
     internal class InverseBooleanConverter : IValueConverter
     {
-        #region IValueConverter Members
-
         public object Convert(object value, Type targetType, object parameter,
             System.Globalization.CultureInfo culture)
         {
@@ -21,7 +19,5 @@ public object ConvertBack(object value, Type targetType, object parameter,
         {
             throw new NotSupportedException();
         }
-
-        #endregion
     }
 }
diff --git a/src/KOAStudio.Core/Converters/InvertBooleanToVisibilityConverter.cs b/src/KOAStudio.Core/Converters/InvertBooleanToVisibilityConverter.cs
@@ -17,9 +17,9 @@ public sealed class InvertBooleanToVisibilityConverter : IValueConverter
         public object Convert(object value, Type targetType, object parameter, CultureInfo culture)
         {
             bool flag = false;
-            if (value is bool)
+            if (value is bool v)
             {
-                flag = (bool)value;
+                flag = v;
             }
             else if (value is bool?)
             {
@@ -32,9 +32,9 @@ public object Convert(object value, Type targetType, object parameter, CultureIn
 
         public object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture)
         {
-            if (value is Visibility)
+            if (value is Visibility visibility)
             {
-                return (Visibility)value != Visibility.Visible;
+                return visibility != Visibility.Visible;
             }
 
             return false;

diff --git a/src/KOAStudio.Core/Converters/RadioBooleanToNamedBrushConverter.cs b/src/KOAStudio.Core/Converters/RadioBooleanToNamedBrushConverter.cs
@@ -8,8 +8,7 @@ public class RadioBooleanToNamedBrushConverter : IMultiValueConverter
     {
         public object? Convert(object[] values, Type targetType, object parameter, CultureInfo culture)
         {
-            string? retVals = parameter as string;
-            if (retVals != null)
+            if (parameter is string retVals)
             {
                 var true_false = retVals.Split(',');
                 if (true_false.Length == values.Length)

diff --git a/src/KOAStudio.Core/Converters/StokItemInfoPriceConverter.cs b/src/KOAStudio.Core/Converters/StokItemInfoPriceConverter.cs
diff --git a/src/KOAStudio.Core/Converters/ValueCompareToBrushConverter.cs b/src/KOAStudio.Core/Converters/ValueCompareToBrushConverter.cs
@@ -0,0 +1,29 @@
+using System.Globalization;
+using System.Windows.Data;
+using System.Windows.Media;
+
+namespace KOAStudio.Core.Converters
+{
+    public class ValueCompareToBrushConverter : IValueConverter
+    {
+        public object? Convert(object value, Type targetType, object parameter, CultureInfo culture)
+        {
+
+            if (value is double compValue)
+            {
+                if (compValue > 0)
+                    return Brushes.Red;
+
+                if (compValue < 0)
+                    return Brushes.Blue;
+            }
+            return Brushes.Black;
+        }
+
+        public object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture)
+        {
+            throw new NotSupportedException();
+        }
+    }
+}
+
diff --git a/src/KOAStudio.Core/Helpers/OcxPathHelper.cs b/src/KOAStudio.Core/Helpers/OcxPathHelper.cs
@@ -2,7 +2,7 @@
 
 namespace KOAStudio.Core.Helpers
 {
-    public class OcxPathHelper
+    public static class OcxPathHelper
     {
         public static string GetOcxPathFromClassID(string classID)
         {

diff --git a/src/KOAStudio.Core/KOAStudio.Core.csproj b/src/KOAStudio.Core/KOAStudio.Core.csproj
@@ -8,7 +8,7 @@
 		<UseWPF>true</UseWPF>
 		<ImplicitUsings>enable</ImplicitUsings>
 		<Platforms>x86;x64</Platforms>
-		<NoWarn>$(NoWarn);MA0048;MA0069</NoWarn>
+		<NoWarn>$(NoWarn);MA0048;MA0053;MA0069</NoWarn>
 	</PropertyGroup>
 
 	<ItemGroup>

diff --git a/src/KOAStudio.Core/Models/JangoItem.cs b/src/KOAStudio.Core/Models/JangoItem.cs
@@ -0,0 +1,18 @@
+namespace KOAStudio.Core.Models
+{
+    public class JangoItem(string 종목코드, string 종목명, bool 매도수구분, int 보유수량, double 평균단가, double 현재가, double 평가손익, string 통화코드)
+    {
+        public string 종목코드 { get; } = 종목코드;
+        public string 종목명 { get; } = 종목명;
+
+        /// <summary>
+        /// true: 매도, false: 매수
+        /// </summary>
+        public bool 매도수구분 { get; set; } = 매도수구분;
+        public int 보유수량 { get; set; } = 보유수량;
+        public double 평균단가 { get; set; } = 평균단가;
+        public double 현재가 { get; set; } = 현재가;
+        public double 평가손익 { get; protected set; } = 평가손익;
+        public string 통화코드 { get; } = 통화코드;
+    }
+}
diff --git a/src/KOAStudio.Core/Models/MicheItem.cs b/src/KOAStudio.Core/Models/MicheItem.cs
@@ -0,0 +1,20 @@
+namespace KOAStudio.Core.Models
+{
+    public class MicheItem(string 종목코드, string 종목명, string 주문번호, string 원주문번호, bool 매도수구분, int 주문수량, int 미체결수량, double 주문가격, string 통화코드, string 주문시각)
+    {
+        public string 종목코드 { get; } = 종목코드;
+        public string 종목명 { get; } = 종목명;
+        public string 주문번호 { get; } = 주문번호;
+        public string 원주문번호 { get; set; } = 원주문번호;
+        /// <summary>
+        /// true: 매도, false: 매수
+        /// </summary>
+        public bool 매도수구분 { get; } = 매도수구분;
+
+        public int 주문수량 { get; set; } = 주문수량;
+        public int 미체결수량 { get; set; } = 미체결수량;
+        public double 주문가격 { get; set; } = 주문가격;
+        public string 통화코드 { get; } = 통화코드;
+        public string 주문시각 { get; set; } = 주문시각;
+    }
+}
diff --git a/src/KOAStudio.Core/Models/OrderKind.cs b/src/KOAStudio.Core/Models/OrderKind.cs
@@ -1,10 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace KOAStudio.Core.Models
+namespace KOAStudio.Core.Models
 {
     public enum OrderKind
     {

diff --git a/src/KOAStudio.Core/Models/OrderModel.cs b/src/KOAStudio.Core/Models/OrderModel.cs
@@ -1,10 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace KOAStudio.Core.Models
+namespace KOAStudio.Core.Models
 {
     internal class OrderModel
     {

diff --git a/src/KOAStudio.Core/Models/OrderType.cs b/src/KOAStudio.Core/Models/OrderType.cs
@@ -1,10 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace KOAStudio.Core.Models
+namespace KOAStudio.Core.Models
 {
     public enum OrderType
     {

diff --git a/src/KOAStudio.Core/Models/StockItemInfo.cs b/src/KOAStudio.Core/Models/StockItemInfo.cs
diff --git a/src/KOAStudio.Core/Services/BaseAppLogic.cs b/src/KOAStudio.Core/Services/BaseAppLogic.cs
@@ -41,7 +41,7 @@ public void OutputLog(int tabIndex, object? content = null, int maxLines = -1, b
             WeakReferenceMessenger.Default.Send(new LogOutputMessageType(tabIndex, content, maxLines, focus));
         }
 
-        public void OutputLogResetAllChangeState()
+        public static void OutputLogResetAllChangeState()
         {
             WeakReferenceMessenger.Default.Send(new LogOutputResetAllChangeStateMessageType());
         }

diff --git a/src/KOAStudio.Core/ViewModels/LogsViewModel.cs b/src/KOAStudio.Core/ViewModels/LogsViewModel.cs
@@ -138,6 +138,18 @@ private void Popup_Clear()
             TabDatas?[TabSelectedIndex].Items.Clear();
         }
 
+        // 전체 탭 지우기
+        [RelayCommand]
+        private void Popup_AllClear()
+        {
+            if (TabDatas == null) return;
+            foreach (var list in TabDatas)
+            {
+                list.Items.Clear();
+                list.BallImage = 0;
+            }
+        }
+
         // 실시간 중지
         [RelayCommand]
         private void Popup_Stop_RT()