Browse Source

DataHistory&&ProcessDataHistory update

Intern01 1 year ago
parent
commit
9c618d6866

+ 2 - 1
Venus/Venus_MainPages/Unity/ChartParameter.cs

@@ -1,5 +1,6 @@
 using System.Collections.ObjectModel;
 using Caliburn.Micro.Core;
+using Prism.Mvvm;
 
 namespace Venus_MainPages.Unity
 {
@@ -20,7 +21,7 @@ namespace Venus_MainPages.Unity
     }
 
     public class ParameterNode : PropertyChangedBase
-    {    
+    {
         private bool _Selected = false;
         public bool Selected
         {

+ 59 - 4
Venus/Venus_MainPages/ViewModels/DataHistoryViewModel.cs

@@ -6,6 +6,7 @@ using LiveCharts.Wpf;
 using MECF.Framework.Common.CommonData;
 using MECF.Framework.Common.ControlDataContext;
 using MECF.Framework.Common.DataCenter;
+using Newtonsoft.Json;
 using OpenSEMI.ClientBase;
 using Prism.Commands;
 using Prism.Mvvm;
@@ -22,6 +23,7 @@ using System.Windows.Forms;
 using System.Windows.Input;
 using System.Windows.Media;
 using System.Windows.Threading;
+using System.Xml;
 using Venus_MainPages.Unity;
 using Venus_MainPages.Views;
 using WPF.Themes.UserControls;
@@ -45,6 +47,7 @@ namespace Venus_MainPages.ViewModels
         #endregion
 
         #region 属性
+        public ObservableCollection<KeyData> OldKeyDataCollection { get; set; }
         public ObservableCollection<ParameterNode> ParameterNodes
         {
             get { return _ParameterNodes; }
@@ -91,6 +94,7 @@ namespace Venus_MainPages.ViewModels
         #region 构造函数
         public DataHistoryViewModel() 
         {
+            OldKeyDataCollection = new ObservableCollection<KeyData>();
             ParameterNodes = _provider.GetParameters();
             timer.Interval = TimeSpan.FromSeconds(0.5);
             timer.Tick += Timer_Tick;
@@ -137,6 +141,8 @@ namespace Venus_MainPages.ViewModels
             {
                 CalKeys(ParameterNodes[i]);
             }
+            OldKeyDataCollection.Clear();
+            OldKeyDataCollection = DeepCopyJson(KeyDataObservableCollection);
             KeyDataObservableCollection.Clear();
             for (int i = 0; i < Keys.Count; i++)
             {
@@ -144,11 +150,41 @@ namespace Venus_MainPages.ViewModels
                 {
                     break;
                 }
-                KeyDataObservableCollection.Add(new KeyData() { Key = Keys[i], Color = solidColorBrushes[i] });
+                KeyDataObservableCollection.Add(new KeyData() { Key = Keys[i], Color = solidColorBrushes[i],UniqueId=i });
             }
-
+            Compare(OldKeyDataCollection, KeyDataObservableCollection);
+            KeyDataObservableCollection = DeepCopyJson(OldKeyDataCollection);
         }
+        public void Compare(ObservableCollection<KeyData> olddata, ObservableCollection<KeyData> newdata)
+        {
+            if (newdata != null)
+            {
+                for (int i = 0; i < newdata.Count; i++)
+                {
+                    var lists = olddata.ToList().Find(t => t.Key == newdata[i].Key);
+                    if (lists == null)
+                    {
+                        olddata.Add(new KeyData() { Key = newdata[i].Key, Color = solidColorBrushes[i], UniqueId = olddata.Count + 1 });
+                    }
+                }
+                for (int i = 0; i < olddata.Count; i++)
+                {
+                    var lists = newdata.ToList().Find(t => t.Key == olddata[i].Key);
+                    if (lists == null)
+                    {
+                        olddata.Remove(olddata[i]);
+                    }
+                }
 
+            }
+        }
+        public static T DeepCopyJson<T>(T obj)
+        {
+            // 序列化
+            string json = JsonConvert.SerializeObject(obj);
+            // 反序列化
+            return JsonConvert.DeserializeObject<T>(json);
+        }
         private void OnStartRealTime(object obj)
         {
             
@@ -197,9 +233,22 @@ namespace Venus_MainPages.ViewModels
             this.DataHistoryView.MyDrawGraphicsControl.PointCollections = cls;
             this.DataHistoryView.MyDrawGraphicsControl.FitControl();
         }
+        private void CloseAll(ObservableCollection<ParameterNode> parameterNodes)
+        {
+            foreach (var item in parameterNodes)
+            {
+                item.Selected = false;
+                if (item.ChildNodes.Count > 0)
+                {
+                    CloseAll(item.ChildNodes);
+                }
+            }
+        }
         private void OnClear()
         {
             this.DataHistoryView.MyDrawGraphicsControl.ClearPlotPoints();
+            KeyDataObservableCollection.Clear();
+            CloseAll(ParameterNodes);
         }
         #endregion
 
@@ -403,9 +452,15 @@ namespace Venus_MainPages.ViewModels
         public List<string> DataList { get; set; }
         public string Module { get; set; }
     }
-    public class KeyData
+    public class KeyData:BindableBase
     {
         public string Key { get; set; }
-        public SolidColorBrush Color { get; set; }
+        public SolidColorBrush _Color;
+        public SolidColorBrush Color
+        {
+            get { return _Color; }
+            set { SetProperty(ref _Color, value); }
+        }
+        public int UniqueId { get; set; }
     }
 }

+ 107 - 40
Venus/Venus_MainPages/ViewModels/ProcessHistoryViewModel.cs

@@ -25,6 +25,10 @@ using System.Windows.Forms;
 using ExcelLibrary.BinaryFileFormat;
 using Aitex.Core.UI.View.Common;
 using Aitex.Core.RT.DataCenter;
+using System.Xml;
+using System.Security.Cryptography.X509Certificates;
+using System.Reflection;
+using Newtonsoft.Json;
 
 namespace Venus_MainPages.ViewModels
 {
@@ -36,8 +40,8 @@ namespace Venus_MainPages.ViewModels
         RealtimeProvider _provider = new RealtimeProvider();
         private ObservableCollection<ParameterNode> _ParameterNodes;
         DispatcherTimer timer = new DispatcherTimer();
-        ObservableCollection<PdKeyData>_PdKeyDataObservation= new ObservableCollection<PdKeyData>();
-        public List<string> RecipesAdd=new List<string>();
+        ObservableCollection<PdKeyData> _PdKeyDataObservation = new ObservableCollection<PdKeyData>();
+        public List<string> RecipesAdd = new List<string>();
         public List<SolidColorBrush> solidColorBrushes = new List<SolidColorBrush>();
         DateTime currentTime;
         private RecipeItem selectedRecipeItem;
@@ -47,13 +51,15 @@ namespace Venus_MainPages.ViewModels
         #region 属性
         public List<HistoryDataItem> ProcessData { get; set; }
         public List<Recipeslist> CheboxRecipes { get; set; }
-        public ProcessDataChartDataItem ProcessChartData{  get; set;  }
+        public ProcessDataChartDataItem ProcessChartData { get; set; }
         public DateTime StartDateTime { get; set; }
         public DateTime EndDateTime { get; set; }
         public string SelectedValuePM { get; set; }
         public string RecipeName { get; set; }
+
+        public ObservableCollection<PdKeyData> OldPdKeyDataCollection { get; set; }
         public ObservableCollection<RecipeItem> Recipes { get; set; }
-   
+
         public class Recipeslist
         {
             public string BoxName { get; set; }
@@ -71,7 +77,7 @@ namespace Venus_MainPages.ViewModels
         public ObservableCollection<PdKeyData> PdKeyDataCollection
         {
             get { return _PdKeyDataObservation; }
-            set { SetProperty(ref _PdKeyDataObservation,value); }
+            set { SetProperty(ref _PdKeyDataObservation, value); }
         }
         #endregion
 
@@ -83,8 +89,8 @@ namespace Venus_MainPages.ViewModels
         public DelegateCommand SearchRecipeCommand =>
         _SearchRecipeCommand ?? (_SearchRecipeCommand = new DelegateCommand(SearchRecipes));
         private DelegateCommand<object> _PdParameterCheckCommand;
-        public DelegateCommand<object> PdParameterCheckCommand=>
-           _PdParameterCheckCommand??(_PdParameterCheckCommand=new DelegateCommand<object>(OnParameterCheck));
+        public DelegateCommand<object> PdParameterCheckCommand =>
+           _PdParameterCheckCommand ?? (_PdParameterCheckCommand = new DelegateCommand<object>(OnParameterCheck));
 
 
         private DelegateCommand<object> _DataGridSelectionChangedCommand;
@@ -100,6 +106,8 @@ namespace Venus_MainPages.ViewModels
         private DelegateCommand _ClearDataCommand;
         public DelegateCommand ClearDataCommand =>
         _ClearDataCommand ?? (_ClearDataCommand = new DelegateCommand(OnClearData));
+
+
         #endregion
 
         #region 构造函数
@@ -108,6 +116,7 @@ namespace Venus_MainPages.ViewModels
             ProcessChartData = new ProcessDataChartDataItem(60000);
             Recipes = new ObservableCollection<RecipeItem>();
             timer.Interval = TimeSpan.FromSeconds(0.5);
+            OldPdKeyDataCollection = new ObservableCollection<PdKeyData>();
             CheboxRecipes = new List<Recipeslist>();
             solidColorBrushes.Add(new SolidColorBrush(Colors.Green));
             solidColorBrushes.Add(new SolidColorBrush(Colors.Red));
@@ -132,7 +141,7 @@ namespace Venus_MainPages.ViewModels
         }
         private void LoadRecipeCheckBox()
         {
-            List<string> chamber = new List<string>() { "PMA","PMB","PMC","PMD"};
+            List<string> chamber = new List<string>() { "PMA", "PMB", "PMC", "PMD" };
             CheboxRecipes.Clear();
             foreach (string item in chamber)
             {
@@ -156,7 +165,7 @@ namespace Venus_MainPages.ViewModels
             Recipes.Clear();
             try
             {
-                string sql1 = string.Format($"SELECT * FROM \"lot_wafer_data\" where  guid ='{id}'; ") ;
+                string sql1 = string.Format($"SELECT * FROM \"lot_wafer_data\" where  guid ='{id}'; ");
                 DataTable dbData1 = QueryDataClient.Instance.Service.QueryData(sql1);
                 string lot_data_guid = dbData1.Rows[0]["wafer_data_guid"].ToString();
                 string sql = string.Format($"SELECT * FROM \"process_data\" where  guid ='{lot_data_guid}'");
@@ -211,7 +220,7 @@ namespace Venus_MainPages.ViewModels
                 LOG.WriteExeption(e);
             }
         }
-        public void SearchRecipe(DateTime start,DateTime end )
+        public void SearchRecipe(DateTime start, DateTime end)
         {
             this.StartDateTime = start;
             this.EndDateTime = end;
@@ -240,7 +249,7 @@ namespace Venus_MainPages.ViewModels
                     sql += string.Format(" and lower(\"recipe_name\") like '%{0}%'", RecipeName.ToLower());
                 }
                 sql += " order by \"process_begin_time\" ASC;";
-                
+
                 DataTable dbData = QueryDataClient.Instance.Service.QueryData(sql);
 
 
@@ -263,7 +272,7 @@ namespace Venus_MainPages.ViewModels
                             item.StartTime = ((DateTime)dbData.Rows[i]["process_begin_time"]).ToString("yyyy-MM-dd HH:mm:ss");
                         if (!dbData.Rows[i]["process_end_time"].Equals(DBNull.Value))
                             item.EndTime = ((DateTime)dbData.Rows[i]["process_end_time"]).ToString("yyyy-MM-dd HH:mm:ss");
-                        Recipes.Add(item);                  
+                        Recipes.Add(item);
                     }
                 }));
             }
@@ -421,6 +430,13 @@ namespace Venus_MainPages.ViewModels
 
             }
         }
+        public static T DeepCopyJson<T>(T obj)
+        {
+            // 序列化
+            string json = JsonConvert.SerializeObject(obj);
+            // 反序列化
+            return JsonConvert.DeserializeObject<T>(json);
+        }
         private void OnParameterCheck(object obj)
         {
             ParameterNode node = obj as ParameterNode;
@@ -432,7 +448,6 @@ namespace Venus_MainPages.ViewModels
             {
                 RefreshTreeStatusToParent(node);
             }
-
             keys.Clear();
             for (int i = 0; i < ParameterNodes.Count; i++)
             {
@@ -443,6 +458,8 @@ namespace Venus_MainPages.ViewModels
                 WPFMessageBox.ShowWarning("最多显示10个数据");
                 return;
             }
+            OldPdKeyDataCollection.Clear();
+            OldPdKeyDataCollection = DeepCopyJson(PdKeyDataCollection);
             PdKeyDataCollection.Clear();
             for (int i = 0; i < keys.Count; i++)
             {
@@ -450,9 +467,34 @@ namespace Venus_MainPages.ViewModels
                 {
                     break;
                 }
-                PdKeyDataCollection.Add(new PdKeyData() { Key = keys[i], Color = solidColorBrushes[i] });
+                PdKeyDataCollection.Add(new PdKeyData() { Key = keys[i], Color = solidColorBrushes[i], UniqueId = i });
             }
+            Compare(OldPdKeyDataCollection, PdKeyDataCollection);
+            PdKeyDataCollection = DeepCopyJson(OldPdKeyDataCollection);
+        }
 
+        public void Compare(ObservableCollection<PdKeyData> olddata, ObservableCollection<PdKeyData> newdata)
+        {
+            if (newdata != null)
+            {
+                for (int i = 0; i < newdata.Count; i++)
+                {
+                    var lists = olddata.ToList().Find(t => t.Key == newdata[i].Key);
+                    if (lists == null)
+                    {
+                        olddata.Add(new PdKeyData() { Key = newdata[i].Key, Color = solidColorBrushes[i], UniqueId = olddata.Count + 1 });
+                    }
+                }
+                for (int i = 0; i < olddata.Count; i++)
+                {
+                    var lists = newdata.ToList().Find(t => t.Key == olddata[i].Key);
+                    if (lists == null)
+                    {
+                        olddata.Remove(olddata[i]);
+                    }
+                }
+
+            }
         }
         public void UpdateData(RecipeItem dataLog)
         {
@@ -517,14 +559,14 @@ namespace Venus_MainPages.ViewModels
 
         public void OnDataGridSelectionChanged(object obj)
         {
-            selectedRecipeItem =  obj as RecipeItem;
+            selectedRecipeItem = obj as RecipeItem;
             ParameterNodes = new ObservableCollection<ParameterNode>(_provider.GetParameters().Where(x => x.Name == selectedRecipeItem?.Chamber));
         }
-        private void OnSearchData()
+        public void OnSearchData()
         {
             this.view.MyDrawGraphicsControl.ClearPlotPoints();
             var Keys = new List<string>();
-            PdKeyDataCollection.ToList().ForEach(key => 
+            PdKeyDataCollection.ToList().ForEach(key =>
             {
                 Keys.Add(key.Key);
             });
@@ -532,7 +574,7 @@ namespace Venus_MainPages.ViewModels
             {
                 return;
             }
-            var result = GetData(Keys.Distinct().ToList(), Convert.ToDateTime(selectedRecipeItem?.StartTime) , Convert.ToDateTime(selectedRecipeItem?.EndTime) );
+            var result = GetData(Keys.Distinct().ToList(), Convert.ToDateTime(selectedRecipeItem?.StartTime), Convert.ToDateTime(selectedRecipeItem?.EndTime));
             if (result == null)
             {
                 return;
@@ -550,33 +592,58 @@ namespace Venus_MainPages.ViewModels
                 cls.Add(points);
             }
             this.view.MyDrawGraphicsControl.PointCollections = cls;
+
             this.view.MyDrawGraphicsControl.FitControl();
         }
+        private void CloseAll(ObservableCollection<ParameterNode> parameterNodes)
+        {
+            foreach (var item in parameterNodes)
+            {
+                item.Selected = false;
+                if (item.ChildNodes.Count > 0)
+                {
+                    CloseAll(item.ChildNodes);
+                }
+            }
+        }
         private void OnClearData()
-        { 
-        
+        {
+            PdKeyDataCollection.Clear();
+            this.view.MyDrawGraphicsControl.ClearPlotPoints();
+            CloseAll(ParameterNodes);
         }
     }
-    #endregion
+        #endregion
 
         #region 数据类
-    public class RecipeItem
-    {
-        public bool Selected { get; set; }
-        public string Recipe { get; set; }
-        public string Guid { get; set; }
-        public string RecipeRunGuid { get; set; }
-        public string Chamber { get; set; }
-        public string Status { get; set; }
-        public string StartTime { get; set; }
-        public string EndTime { get; set; }
-        public string LotID { get; set; }
-        public string SlotID { get; set; }
-    }
-    public class PdKeyData
-    {
-        public string Key { get; set; }
-        public SolidColorBrush Color { get; set; }
-    }
-    #endregion
+        public class RecipeItem : BindableBase
+        {
+            public bool Selected { get; set; }
+            public string Recipe { get; set; }
+            public string Guid { get; set; }
+            public string RecipeRunGuid { get; set; }
+            public string Chamber { get; set; }
+            public string Status { get; set; }
+            public string StartTime { get; set; }
+            public string EndTime { get; set; }
+            public string LotID { get; set; }
+            public string SlotID { get; set; }
+        }
+        public class PdKeyData : BindableBase, ICloneable
+        {
+            public string Key { get; set; }
+            public SolidColorBrush _Color;
+            public SolidColorBrush Color
+            {
+                get { return _Color; }
+                set { SetProperty(ref _Color, value); }
+            }
+            public int UniqueId { get; set; }
+            public object Clone()
+            {
+                return MemberwiseClone();
+            }
+        }
+        #endregion
+    
 }

+ 7 - 5
Venus/Venus_MainPages/ViewModels/WaferHistoryDBViewModel.cs

@@ -113,13 +113,15 @@ namespace Venus_MainPages.ViewModels
             WaferHistoryItem item = o as WaferHistoryItem;
             WaferHistoryWafer item1 = o as WaferHistoryWafer;
 
-            if (o  is DateTime startTime)
+            if (o  is WaferHistoryRecipe WaferRecipe)
             {
-                var query = _recipes.FirstOrDefault(t => t.StartTime.CompareTo(startTime) == 0);
-                if (query is null) return;
                 WaferHistoryWafer wafer1 = new WaferHistoryWafer();
-                wafer1.StartTime = query.StartTime;
-                wafer1.EndTime = query.EndTime;
+                wafer1.StartTime = WaferRecipe.StartTime;
+                wafer1.EndTime = WaferRecipe.EndTime;
+                string sql = string.Format($"SELECT * FROM \"lot_wafer_data\" where  wafer_data_guid ='{WaferRecipe.ID}'; ");
+                DataTable dbData = QueryDataClient.Instance.Service.QueryData(sql);
+                string lot_data_guid = dbData.Rows[0]["guid"].ToString();
+                wafer1.WaferGuid = lot_data_guid;
                 SwitchPage( "ProcessHistory", wafer1);
             }
             else if (o is WaferHistoryLot waferLot)

File diff suppressed because it is too large
+ 36 - 7
Venus/Venus_MainPages/Views/DataHistoryView.xaml


+ 26 - 0
Venus/Venus_MainPages/Views/DataHistoryView.xaml.cs

@@ -12,6 +12,7 @@ using System.Windows.Media;
 using System.Windows.Media.Imaging;
 using System.Windows.Navigation;
 using System.Windows.Shapes;
+using Venus_MainPages.ViewModels;
 
 namespace Venus_MainPages.Views
 {
@@ -23,6 +24,31 @@ namespace Venus_MainPages.Views
         public DataHistoryView()
         {
             InitializeComponent();
+            this.DataContext = new DataHistoryViewModel();
+        }
+        private DataHistoryViewModel _viewModel;
+        private void OnChangeLineColor(object sender, RoutedEventArgs e)
+        {
+            var btn = (Button)sender;
+            if (btn != null)
+            {
+                int dataId = (int)btn.Tag;
+                var dlg = new System.Windows.Forms.ColorDialog();
+                if (dlg.ShowDialog() == System.Windows.Forms.DialogResult.OK)
+                {
+                    var newColor = new System.Windows.Media.Color() { A = dlg.Color.A, B = dlg.Color.B, G = dlg.Color.G, R = dlg.Color.R };
+                    System.Drawing.Color _newColor = System.Drawing.Color.FromArgb(newColor.A, newColor.R, newColor.G, newColor.B);
+                    _viewModel = (DataHistoryViewModel)DataContext;
+                    var item = _viewModel.KeyDataObservableCollection.ToList().Find(t => t.UniqueId == dataId);
+                    item.Color = new SolidColorBrush(newColor);
+                    for (int i = 0; i < _viewModel.KeyDataObservableCollection.Count(); i++)
+                    {
+                        var _color = _viewModel.KeyDataObservableCollection[i].Color.Color;
+                        MyDrawGraphicsControl.m_PenCollencteions[i] = new System.Drawing.Pen(System.Drawing.Color.FromArgb(_color.A, _color.R, _color.G, _color.B), 3);
+                    }
+                    //_viewModel.OnSearchData();
+                }
+            }
         }
     }
 }

File diff suppressed because it is too large
+ 85 - 52
Venus/Venus_MainPages/Views/ProcessHistoryView.xaml


+ 28 - 1
Venus/Venus_MainPages/Views/ProcessHistoryView.xaml.cs

@@ -19,6 +19,9 @@ using Venus_MainPages.ViewModels;
 using System.IO;
 using static Venus_MainPages.ViewModels.ProcessHistoryViewModel;
 using System.Collections.ObjectModel;
+using Aitex.Core.UI.View.Smart;
+using System.Drawing;
+using LiveCharts.Wpf;
 
 namespace Venus_MainPages.Views
 {
@@ -49,6 +52,7 @@ namespace Venus_MainPages.Views
         {
             try
             {
+                _viewModel = (ProcessHistoryViewModel)DataContext;
                 ObservableCollection<RecipeItem> DataRecipeList = _viewModel.Recipes;
 
                 if (DataRecipeList == null || DataRecipeList.Count == 0) return;
@@ -100,6 +104,29 @@ namespace Venus_MainPages.Views
             }
 
         }
+        private void OnChangeLineColor(object sender, RoutedEventArgs e)
+        {
+            var btn = (Button)sender;
+            if (btn != null)
+            {
+                int dataId = (int)btn.Tag;
+                var dlg = new System.Windows.Forms.ColorDialog();
+                if (dlg.ShowDialog() == System.Windows.Forms.DialogResult.OK)
+                {
+                    var newColor = new System.Windows.Media.Color() { A = dlg.Color.A, B = dlg.Color.B, G = dlg.Color.G, R = dlg.Color.R };
+                    System.Drawing.Color _newColor = System.Drawing.Color.FromArgb(newColor.A, newColor.R, newColor.G, newColor.B);
+                    _viewModel = (ProcessHistoryViewModel)DataContext;
+                    var item = _viewModel.PdKeyDataCollection.ToList().Find(t => t.UniqueId == dataId);
+                    item.Color = new SolidColorBrush(newColor); 
+                    for (int i = 0;i< _viewModel.PdKeyDataCollection.Count(); i++)
+                    {
+                        var _color= _viewModel.PdKeyDataCollection[i].Color.Color;
+                        MyDrawGraphicsControl.m_PenCollencteions[i] = new System.Drawing.Pen(System.Drawing.Color.FromArgb(_color.A, _color.R, _color.G,_color.B),3);    
+                    }
+                    _viewModel.OnSearchData();
+                }
+            }
+        }
         private void buttonLotDetailsExport_Click(object sender, System.Windows.RoutedEventArgs e)
         {
             try
@@ -110,7 +137,7 @@ namespace Venus_MainPages.Views
                     MessageBox.Show("没有数据,先从列表中选择一个批次");
                     return;
                 }
-
+                _viewModel = (ProcessHistoryViewModel)DataContext;
                 Microsoft.Win32.SaveFileDialog dlg = new Microsoft.Win32.SaveFileDialog();
                 dlg.DefaultExt = ".xls"; // Default file extension 
                 dlg.Filter = "数据表格文件|*.xls"; // Filter files by extension 

+ 1 - 1
Venus/Venus_MainPages/Views/WaferHistoryDBView.xaml

@@ -99,7 +99,7 @@
                                     <Button Content="To Chart" Margin="0" Height="22" VerticalContentAlignment="Center" FontSize="12">
                                         <i:Interaction.Triggers>
                                             <i:EventTrigger EventName="Click">
-                                                <i:InvokeCommandAction Command="{Binding DataContext.ToChartCommand,ElementName=root}" CommandParameter="{Binding StartTime}" />
+                                                <i:InvokeCommandAction Command="{Binding DataContext.ToChartCommand,ElementName=root}" CommandParameter="{Binding}" />
                                             </i:EventTrigger>
                                         </i:Interaction.Triggers>
                                     </Button>

+ 8 - 8
Venus/Venus_Themes/UserControls/DrawGraphicsControl.xaml.cs

@@ -41,7 +41,7 @@ namespace Venus_Themes.UserControls
         private System.Drawing.Pen m_PenSData;
         private System.Drawing.Pen m_PenASData;
         public System.Drawing.Pen[] m_PenCollencteions;
-
+        public System.Drawing.Pen[] m_PenCollencteionsnew;
         private bool m_StartMouseMove = false;
         private bool m_MouseMove = false;
         private bool m_MouseEnter = false;
@@ -49,7 +49,7 @@ namespace Venus_Themes.UserControls
         private System.Windows.Point m_EndPoint;
         private System.Windows.Point m_CurrentPoint;
 
-        private float LineThickness = 2.0f;
+        private float LineThickness = 3.0f;
 
         #region Property
         public PointCollection PlotDataPoints
@@ -187,12 +187,12 @@ namespace Venus_Themes.UserControls
                 new System.Drawing.Pen(System.Drawing.Brushes.Chocolate,LineThickness),
                 new System.Drawing.Pen(System.Drawing.Brushes.Cyan,LineThickness),
                 new System.Drawing.Pen(System.Drawing.Brushes.DarkGreen,LineThickness),
-                new System.Drawing.Pen(System.Drawing.Brushes.LightBlue,LineThickness),
-                new System.Drawing.Pen(System.Drawing.Brushes.DarkBlue,LineThickness),
-                new System.Drawing.Pen(System.Drawing.Brushes.Pink,LineThickness),
-                new System.Drawing.Pen(System.Drawing.Brushes.DarkViolet,LineThickness),
-                new System.Drawing.Pen(System.Drawing.Brushes.Cyan,LineThickness),
-                new System.Drawing.Pen(System.Drawing.Brushes.HotPink,LineThickness),
+                //new System.Drawing.Pen(System.Drawing.Brushes.LightBlue,LineThickness),
+                //new System.Drawing.Pen(System.Drawing.Brushes.DarkBlue,LineThickness),
+                //new System.Drawing.Pen(System.Drawing.Brushes.Pink,LineThickness),
+                //new System.Drawing.Pen(System.Drawing.Brushes.DarkViolet,LineThickness),
+                //new System.Drawing.Pen(System.Drawing.Brushes.Cyan,LineThickness),
+                //new System.Drawing.Pen(System.Drawing.Brushes.HotPink,LineThickness),
             };
 
             IsHorizontalNavigationEnabled = false;