添加 称重单组分 添加 竖直排列的 主界面

Project.FLY.Weight2/FLY.Weight2.UI.Client/FLY.Weight2.UI.Client.csproj

@@ -81,6 +81,9 @@
     <Compile Include="UiModule\FlowGraph.xaml.cs">
       <DependentUpon>FlowGraph.xaml</DependentUpon>
     </Compile>
+    <Compile Include="UiModule\MainGraph2.xaml.cs">
+      <DependentUpon>MainGraph2.xaml</DependentUpon>
+    </Compile>
     <Compile Include="UiModule\MainGraph.xaml.cs">
       <DependentUpon>MainGraph.xaml</DependentUpon>
     </Compile>
@@ -105,6 +108,9 @@
     <Compile Include="UiModule\UcTotalFlow.xaml.cs">
       <DependentUpon>UcTotalFlow.xaml</DependentUpon>
     </Compile>
+    <Compile Include="UiModule\UcWeighterItem2.xaml.cs">
+      <DependentUpon>UcWeighterItem2.xaml</DependentUpon>
+    </Compile>
     <Compile Include="UiModule\UcWeighterItem.xaml.cs">
       <DependentUpon>UcWeighterItem.xaml</DependentUpon>
     </Compile>
@@ -148,6 +154,10 @@
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
     </Page>
+    <Page Include="UiModule\MainGraph2.xaml">
+      <Generator>MSBuild:Compile</Generator>
+      <SubType>Designer</SubType>
+    </Page>
     <Page Include="UiModule\MainGraph.xaml">
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
@@ -180,6 +190,10 @@
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
     </Page>
+    <Page Include="UiModule\UcWeighterItem2.xaml">
+      <Generator>MSBuild:Compile</Generator>
+      <SubType>Designer</SubType>
+    </Page>
     <Page Include="UiModule\UcWeighterItem.xaml">
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>

Project.FLY.Weight2/FLY.Weight2.UI.Client/UiModule/MainGraph2.xaml

+<UserControl x:Class="FLY.Weight2.UI.Client.UiModule.MainGraph2"
+      xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+      xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+      xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
+      xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
+      xmlns:local="clr-namespace:FLY.Weight2.UI.Client.UiModule"
+      xmlns:sys="clr-namespace:System;assembly=mscorlib"
+      mc:Ignorable="d"  >
+    <UserControl.Resources>
+        <ResourceDictionary>
+            <ResourceDictionary.MergedDictionaries>
+                <ResourceDictionary Source="pack://application:,,,/FLY.Weight2.UI.Client;component/Themes/UcWeighterItemStyle.xaml"/>
+            </ResourceDictionary.MergedDictionaries>
+        </ResourceDictionary>
+    </UserControl.Resources>
+    <Viewbox Stretch="Uniform" VerticalAlignment="Top" HorizontalAlignment="Left">
+        <Grid Name="root_grid" d:DataContext="{StaticResource unittests_weighters}">
+            <Grid.RowDefinitions>
+                <RowDefinition Height="auto"/>
+                <RowDefinition />
+            </Grid.RowDefinitions>
+            <local:UcTotalFlow x:Name="ucTotalFlow" Margin="5" />
+            <Grid Grid.Row="1">
+                <Grid.ColumnDefinitions>
+                    <ColumnDefinition Width="auto"/>
+                    <ColumnDefinition/>
+                </Grid.ColumnDefinitions>
+                <local:UcThickness x:Name="ucThickness" Margin="5"/>
+                <ItemsControl x:Name="itemsControl" Grid.Column="1" ItemsSource="{Binding Items}">
+                    <ItemsControl.ItemsPanel>
+                        <ItemsPanelTemplate>
+                            <StackPanel Orientation="Horizontal" />
+                        </ItemsPanelTemplate>
+                    </ItemsControl.ItemsPanel>
+                    <ItemsControl.ItemTemplate>
+                        <DataTemplate>
+                            <local:UcWeighterItem2 Margin="5" WeightSystemService="{Binding DataContext,ElementName=root_grid}"/>
+                        </DataTemplate>
+                    </ItemsControl.ItemTemplate>
+
+                </ItemsControl>
+            </Grid>
+        </Grid>
+    </Viewbox>
+</UserControl>

Project.FLY.Weight2/FLY.Weight2.UI.Client/UiModule/MainGraph2.xaml.cs

+using FLY.OBJComponents.Client;
+using FLY.Weight2.Client;
+using FLY.Weight2.Common;
+using FLY.Weight2.IService;
+using MultiLayout;
+using MultiLayout.UiModule;
+using System;
+using System.Collections.Generic;
+using System.Globalization;
+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 Unity;
+
+namespace FLY.Weight2.UI.Client.UiModule
+{
+    /// <summary>
+    /// Page_Main.xaml 的交互逻辑
+    /// </summary>
+    public partial class MainGraph2 : UserControl
+    {
+
+        IWeightSystemService weightSystemService;
+
+ 
+        List<SetPLCUpdatePlan> setPlan_items = new List<SetPLCUpdatePlan>();
+        public MainGraph2()
+        {
+            InitializeComponent();
+        }
+
+        [InjectionMethod]
+        public void Init(
+            IUnityContainer container,
+            IWeightSystemService weightSystemService)
+        {
+            ucTotalFlow.Init(weightSystemService);
+            ucThickness.Init(weightSystemService);
+
+            this.weightSystemService = weightSystemService;
+            root_grid.DataContext = this.weightSystemService;
+
+            for (int i = 0; i < this.weightSystemService.Items.Count(); i++)
+            {
+                SetPLCUpdatePlan plan = new SetPLCUpdatePlan(
+                    this.weightSystemService.PLCos,
+                    this.weightSystemService.Items[i],
+                    UcWeighterItem.item_update_propertynames);
+                setPlan_items.Add(plan);
+            }
+            if (weightSystemService is WeightSystemServiceClient) { 
+
+                (weightSystemService as WeightSystemServiceClient).ResetItemsEvent += MWeighterCsService_ResetItemsEvent;
+            }
+        }
+
+        private void MWeighterCsService_ResetItemsEvent()
+        {
+            //把多出来的删除
+            int remove_cnt = setPlan_items.Count() - weightSystemService.Items.Count();
+            if (remove_cnt > 0)
+            {
+                for (int i = 0; i < remove_cnt; i++)
+                {
+                    SetPLCUpdatePlan plan = setPlan_items[setPlan_items.Count() - 1 - i];
+                    plan.Dispose();
+                }
+                setPlan_items.RemoveRange(setPlan_items.Count() - remove_cnt, remove_cnt);
+            }
+            else
+            {
+                int start_idx = setPlan_items.Count();
+                int add_cnt = -remove_cnt;
+                for (int i = 0; i < add_cnt; i++)
+                {
+                    SetPLCUpdatePlan plan = new SetPLCUpdatePlan(
+                    weightSystemService.PLCos,
+                    weightSystemService.Items[start_idx+i],
+                    UcWeighterItem.item_update_propertynames);
+                    setPlan_items.Add(plan);
+                }
+            }
+        }
+    }
+
+
+
+
+    public class UiModule2_MainGraph2 : IUiModule2
+    {
+        /// <summary>
+        /// 控件标题
+        /// 它的值取决于culture
+        /// </summary>
+        public string Title => "称重单主界(5)";
+
+        public ComponentType Type => ComponentType.Graph;
+
+        public bool IsUnique => true;
+
+        /// <summary>
+        /// 控件
+        /// 创建时，需要给它唯一ID，让加载自己的数据
+        /// </summary>
+        /// <param name="id"></param>
+        /// <returns></returns>
+        public FrameworkElement GetComponent(int id, IUnityContainer container)
+        {
+            MainGraph2 graph = new MainGraph2();
+            container.BuildUp(graph);
+            return graph;
+        }
+
+        /// <summary>
+        /// 控件缩略图，用于编辑界面时，大致看看
+        /// 创建时，需要给它唯一ID，让加载自己的数据
+        /// </summary>
+        /// <param name="id"></param>
+        /// <returns></returns>
+        public FrameworkElement GetThumbnail()
+        {
+            return new System.Windows.Controls.Grid();
+        }
+
+
+        /// <summary>
+        /// 给出全部控件ID, 控件自行删除没有的参数
+        /// </summary>
+        /// <param name="IDs"></param>
+        public void MatchParam(int[] IDs)
+        {
+        }
+    }
+}

Project.FLY.Weight2/FLY.Weight2.UI.Client/UiModule/UcWeighterItem2.xaml.cs

+using FLY.OBJComponents.Client;
+using FLY.Weight2.Client;
+using FLY.Weight2.IService;
+using MultiLayout.UiModule;
+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 Unity;
+
+namespace FLY.Weight2.UI.Client.UiModule
+{
+    /// <summary>
+    /// UcWeighterItem.xaml 的交互逻辑
+    /// </summary>
+    public partial class UcWeighterItem2 : UserControl
+    {
+        public IWeightSystemService WeightSystemService
+        {
+            get { return (IWeightSystemService)GetValue(WeightSystemServiceProperty); }
+            set { SetValue(WeightSystemServiceProperty, value); }
+        }
+
+        // Using a DependencyProperty as the backing store for WeightSystemService.  This enables animation, styling, binding, etc...
+        public static readonly DependencyProperty WeightSystemServiceProperty =
+            DependencyProperty.Register("WeightSystemService", typeof(IWeightSystemService), typeof(UcWeighterItem2), new PropertyMetadata(null));
+
+
+        List<SetPLCUpdatePlan> setPlan_items = new List<SetPLCUpdatePlan>();
+
+        int Index = 0;
+
+        public UcWeighterItem2()
+        {
+            InitializeComponent();
+        }
+
+        [InjectionMethod]
+        public void Init(
+            int id, 
+            IWeightSystemService weightSystemService)
+        {
+            this.WeightSystemService = weightSystemService;
+
+            //查找参数
+            if (WeighterItemParams.Current.Indexs.ContainsKey(id))
+            {
+                Index = WeighterItemParams.Current.Indexs[id];
+            }
+            else 
+            {
+                for (int i = 0; i < this.WeightSystemService.Items.Count(); i++) 
+                {
+                    if (!WeighterItemParams.Current.Indexs.ContainsValue(i)) 
+                    {
+                        WeighterItemParams.Current.Indexs.Add(id, i);
+                        Index = i;
+                        break;
+                    }
+                }
+            }
+
+            int idx = Index;
+            if (idx >= this.WeightSystemService.Items.Count())
+                idx = this.WeightSystemService.Items.Count() - 1;
+            else if (idx < 0)
+                idx = 0;
+
+            this.DataContext = this.WeightSystemService.Items[idx];
+
+            
+            SetPLCUpdatePlan plan = new SetPLCUpdatePlan(
+                this.WeightSystemService.PLCos,
+                this.WeightSystemService.Items[idx],
+                item_update_propertynames);
+            setPlan_items.Add(plan);
+            
+        }
+
+
+        public static string[] item_update_propertynames = new string[] {
+            nameof(Common.WeighterC.CurrentFlow),
+            nameof(Common.WeighterC.ScrewPDisp),
+            nameof(Common.WeighterC.CurrentFlowAuto),
+            nameof(Common.WeighterC.ScrewPDispAuto),
+            nameof(Common.WeighterC.BinWeight),
+            nameof(Common.WeighterC.ScrewMotorFreq),
+            nameof(Common.WeighterC.ScrewManualFreq),
+            nameof(Common.WeighterC.ScrewManualFreqIsSet),
+            nameof(Common.WeighterC.ScrewIsAutoMode),
+            nameof(Common.WeighterC.ScrewMotorIsOn),
+            nameof(Common.WeighterC.ScrewMotorOnSet)
+        };
+
+        private async void button_frequency_Click(object sender, RoutedEventArgs e)
+        {
+            WdFrequency w = new WdFrequency();
+            var weight = ((Button)sender).Tag as FLY.Weight2.Common.WeighterC;
+            w.FrequencySet = weight.ScrewManualFreq;
+            w.Owner = FLY.ControlLibrary.COMMON.GetWindow(this);
+            if (w.ShowDialog() == true)
+            {
+                //TODO
+                weight.ScrewManualFreq = (float)w.FrequencySet;
+                weight.ScrewManualFreqIsSet = true;
+                //不用写下降沿！！！！！
+            }
+        }
+
+        private void button_ratio_Click(object sender, RoutedEventArgs e)
+        {
+            WdRatioSet w = new WdRatioSet();
+            w.Owner = FLY.ControlLibrary.COMMON.GetWindow(this);
+            w.Init(WeightSystemService);
+            w.ShowDialog();
+        }
+
+    }
+
+
+    public class UiModule2_UcWeighterItem2 : MultiLayout.UiModule.IUiModule2
+    {
+        /// <summary>
+        /// 控件标题
+        /// 它的值取决于culture
+        /// </summary>
+        public string Title => "单组份称重层控制(5)";
+
+        public ComponentType Type => ComponentType.Graph;
+
+        public bool IsUnique => false;
+
+        /// <summary>
+        /// 控件
+        /// 创建时，需要给它唯一ID，让加载自己的数据
+        /// </summary>
+        /// <param name="id"></param>
+        /// <returns></returns>
+        public FrameworkElement GetComponent(int id, IUnityContainer container)
+        {
+            UcWeighterItem2 graph = new UcWeighterItem2();
+            container.BuildUp(graph);
+            return graph;
+        }
+
+        /// <summary>
+        /// 控件缩略图，用于编辑界面时，大致看看
+        /// 创建时，需要给它唯一ID，让加载自己的数据
+        /// </summary>
+        /// <param name="id"></param>
+        /// <returns></returns>
+        public FrameworkElement GetThumbnail()
+        {
+            return new System.Windows.Controls.Grid();
+        }
+
+        /// <summary>
+        /// 给出全部控件ID, 控件自行删除没有的参数
+        /// </summary>
+        /// <param name="IDs"></param>
+        public void MatchParam(int[] IDs)
+        {
+        }
+    }
+}

Resource/称重单组分/设备连接变量表_3/Generated/plcgroup.json

@@ -413,7 +413,7 @@
     {
       "DeviceIndex": 0,
       "Mode": "4",
-      "Addr": 1204,
+      "Addr": 1206,
       "Type": "uint16",
       "Scale": 0.1,
       "OwnerName": "Items[0]",

Resource/称重单组分/设备连接变量表_5/Generated/plcgroup.json

@@ -683,7 +683,7 @@
     {
       "DeviceIndex": 0,
       "Mode": "4",
-      "Addr": 1204,
+      "Addr": 1206,
       "Type": "uint16",
       "Scale": 0.1,
       "OwnerName": "Items[0]",

脚本/和美追边客户端容器描述.unity/unity/weighter2.component.config

@@ -12,6 +12,7 @@
       <register type="IUiModule2" mapTo="UiModule2_DynAreaWeight" name="weighter2_da" />
       <register type="IUiModule2" mapTo="UiModule2_FlowGraph" name="weighter2_fg" />
       <register type="IUiModule2" mapTo="UiModule2_MainGraph" name="weighter2_mg" />
+      <register type="IUiModule2" mapTo="UiModule2_MainGraph2" name="weighter2_mg2" />
     </container>
   </unity>
 </configuration>
\ No newline at end of file