Browse Source

revise viewmodel

chenzk 3 weeks ago
parent
commit
0f0ac3e2a3
6 changed files with 20 additions and 13 deletions
  1. 1 1
      App.xaml
  2. 0 4
      FestoDebugger.csproj
  3. 1 1
      UserControls/FestoControl.xaml
  4. 12 6
      ViewModels/MainViewModel.cs
  5. 6 1
      MainWindow.xaml
  6. 0 0
      Views/MainWindow.xaml.cs

+ 1 - 1
App.xaml

@@ -2,7 +2,7 @@
              xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
              xmlns:local="clr-namespace:FestoDebugger"
-             StartupUri="MainWindow.xaml">
+             StartupUri="Views\MainWindow.xaml">
     <Application.Resources>
          
     </Application.Resources>

+ 0 - 4
FestoDebugger.csproj

@@ -8,8 +8,4 @@
     <UseWPF>true</UseWPF>
   </PropertyGroup>
 
-  <ItemGroup>
-    <Folder Include="Views\" />
-  </ItemGroup>
-
 </Project>

+ 1 - 1
UserControls/FestoControl.xaml

@@ -16,7 +16,7 @@
             <RowDefinition/>
         </Grid.RowDefinitions>
         <Grid.ColumnDefinitions>
-            <ColumnDefinition Width="20"/>
+            <ColumnDefinition Width="15"/>
             <ColumnDefinition Width="50"/>
             <ColumnDefinition Width="50"/>
 

+ 12 - 6
ViewModels/MainViewModel.cs

@@ -10,22 +10,28 @@ namespace FestoDebugger.ViewModels
 {
     public class MainViewModel : ViewModelBase
     {
-        private ObservableCollection<SignalModuleData> _signalModuleData;
+        private ObservableCollection<SignalModuleData> _signalModuleDatas;
 
-        public ObservableCollection<SignalModuleData> SignalModuleData
+        public ObservableCollection<SignalModuleData> SignalModuleDatas
         {
-            get => _signalModuleData;
-            set => SetProperty(ref _signalModuleData, value);
+            get => _signalModuleDatas;
+            set => SetProperty(ref _signalModuleDatas, value);
         }
 
         public MainViewModel()
         {
-            LoadSignalConfig();
+            SignalModuleDatas = new ObservableCollection<SignalModuleData>();
+            SignalModuleData  data = new SignalModuleData();
+            data.ModuleName = "V1";
+            data.SignalAOn = true;
+            data.SignalAOn = false;
+            SignalModuleDatas.Add(data);
+            //LoadSignalConfig();
         }
 
         private void LoadSignalConfig()
         {
-      
+            
         }
     }
 }

+ 6 - 1
MainWindow.xaml

@@ -5,10 +5,15 @@
         xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
         xmlns:local="clr-namespace:FestoDebugger"
         xmlns:UserControls="clr-namespace:FestoDebugger.UserControls"
+        xmlns:prism="http://prismlibrary.com/" 
+        xmlns:local1="clr-namespace:FestoDebugger.ViewModels"
         mc:Ignorable="d"
         Title="FestoDebuger" Height="450" Width="800">
+    <Window.DataContext>
+        <local1:MainViewModel />
+    </Window.DataContext>
     <ScrollViewer>
-        <ItemsControl ItemsSource="{Binding SignalControls}">
+        <ItemsControl ItemsSource="{Binding SignalModuleDatas}">
             <ItemsControl.ItemsPanel>
                 <ItemsPanelTemplate>
                     <WrapPanel Orientation="Horizontal"/>

MainWindow.xaml.cs → Views/MainWindow.xaml.cs