创建脚本文件夹

def34297 · 潘栩锋 · 24f8f507 · def34297 · def34297 · def34297
Commit def34297 authored Dec 11, 2018 by 潘栩锋 🚴
15 changed files
--- a/Project.FLY.FeedbackRenZiJia/FLY.FeedbackRenZiJia.UI.Client/UIModule/Page_Graph.xaml
+++ b/Project.FLY.FeedbackRenZiJia/FLY.FeedbackRenZiJia.UI.Client/UIModule/Page_Graph.xaml
@@ -71,7 +71,7 @@
                </ResourceDictionary>
            </Grid.Resources>

-                <Button Click="button_info_click">
+            <Button Click="button_graphset_click">
                    <StackPanel>
                        <Image Source="/FLY.FeedbackRenZiJia.UI.Client;component/Images/info.png" />
                        <TextBlock Text="设置" />

--- a/Project.FLY.FeedbackRenZiJia/FLY.FeedbackRenZiJia.UI.Client/UIModule/Page_Graph.xaml.cs
+++ b/Project.FLY.FeedbackRenZiJia/FLY.FeedbackRenZiJia.UI.Client/UIModule/Page_Graph.xaml.cs
@@ -560,12 +560,7 @@ namespace FLY.FeedbackRenZiJia.UI.Client.UIModule

        private void button_info_click(object sender, RoutedEventArgs e)
        {
-            NavigationService ns = Application.Current.Properties["NavigationService"] as NavigationService;
-            if (ns != null)
-            {
-                Page_Menu p = new Page_Menu();
-                ns.Navigate(p);
-            }
+
        }

        private void button_add_click(object sender, RoutedEventArgs e)

--- a/Project.FLY.Thick.Base/FLY.Thick.Base.UI/UIModule/ScanGraphConfig.xaml
+++ b/Project.FLY.Thick.Base/FLY.Thick.Base.UI/UIModule/ScanGraphConfig.xaml
@@ -30,7 +30,12 @@
                        <TextBox Style="{StaticResource ResourceKey=TextBoxStyle_FieldContent}" Text="{Binding Title}" Tag="Full"/>
                    </StackPanel>
                </StackPanel>
-                <StackPanel Grid.Column="1" Orientation="Vertical" Margin="5">
+                <StackPanel Grid.Column="1" Orientation="Horizontal">
+                    <StackPanel Orientation="Vertical" Margin="5">
+                        <TextBlock Style="{StaticResource ResourceKey=TextBlockStyle_FieldHeaderEditable}" Text="高级" />
+                        <ToggleButton x:Name="togglebutton_adv" Style="{StaticResource ToggleButtonStyle1}" HorizontalAlignment="Left"  />
+                    </StackPanel>
+                    <StackPanel Orientation="Vertical" Margin="5" Visibility="{Binding ElementName=togglebutton_adv, Path=IsChecked,Converter={StaticResource visbilityconv},ConverterParameter=Collapsed}">
                        <TextBlock Style="{StaticResource ResourceKey=TextBlockStyle_FieldHeaderEditable}" Text="{DynamicResource strCurveType}"/>
                        <ComboBox HorizontalAlignment="Left" Width="120">
                            <ComboBoxItem IsSelected="{Binding ChartType, Converter={StaticResource e2bconv}, ConverterParameter=Line }">
@@ -43,7 +48,10 @@
                                <TextBlock Style="{StaticResource ResourceKey=TextBlockStyle_FieldContent}"  FontSize="32" Text="Area"/>
                            </ComboBoxItem>
                        </ComboBox>
+                        
+                    </StackPanel>
                </StackPanel>
+
            </Grid>

                    <StackPanel Orientation="Horizontal">
@@ -77,6 +85,7 @@
                            <TextBlock Style="{StaticResource ResourceKey=TextBlockStyle_FieldHeaderEditable}" Text="{DynamicResource strPercentShow}" />
                            <ToggleButton Style="{StaticResource ToggleButtonStyle1}" HorizontalAlignment="Left" IsChecked="{Binding IsPercent}" />
                        </StackPanel>
+                <StackPanel Orientation="Horizontal" Visibility="{Binding ElementName=togglebutton_adv, Path=IsChecked,Converter={StaticResource visbilityconv},ConverterParameter=Collapsed}">
                    <StackPanel Orientation="Vertical" Margin="5">
                        <TextBlock Style="{StaticResource ResourceKey=TextBlockStyle_FieldHeaderEditable}" Text="{DynamicResource strAxisYMultiple}" />
                        <StackPanel Orientation="Horizontal">
@@ -91,7 +100,9 @@
                        </StackPanel>
                    </StackPanel>
                </StackPanel>
-            <StackPanel Orientation="Horizontal" x:Name="stackpanel_params">
+
+            </StackPanel>
+            <StackPanel Orientation="Horizontal" x:Name="stackpanel_params" Visibility="{Binding ElementName=togglebutton_adv, Path=IsChecked,Converter={StaticResource visbilityconv},ConverterParameter=Collapsed}">
                <StackPanel Orientation="Vertical" Margin="5">
                    <TextBlock Style="{StaticResource ResourceKey=TextBlockStyle_FieldHeaderEditable}" Text="{DynamicResource strDirectionIsReversed}" />
                    <ToggleButton Style="{StaticResource ToggleButtonStyle1}" IsChecked="{Binding IsReversed}" HorizontalAlignment="Left"/>

--- a/脚本/1.clear_module.ps1
+++ b/脚本/1.clear_module.ps1
+#-----------------------------------------------------------------
+#清空全部模块
+
+$root_path = $PSScriptRoot
+
+$modules_AirRing = "FLY.FeedbackRenZiJia.dll","FLY.FeedbackRenZiJia.UI.Client.dll","main_module\AirRing"
+$modules_Weight = "FLY.Weight.dll","FLY.Weight.UI.Client.dll","main_module\Weight"
+$modules_IBC = "FLY.IBC.dll","FLY.IBC.UI.Client.dll","main_module\IBC"
+$modules_Winder = "FLY.Winder.dll","FLY.Winder.UI.Client.dll","main_module\Winder"
+$modules= $modules_AirRing + $modules_Weight + $modules_IBC + $modules_Winder
+
+$src_path = $root_path + "\..\Project.FLY.Thick.Blowing\FLY.Thick.Blowing.UI.Fix.Client\bin\Debug"
+
+foreach ($n in $modules)
+{
+    $path = $src_path +"\" +$n
+    #echo $path
+    if(Test-Path($path))
+    {
+        echo $path + "存在,把它删除" 
+	    rm -R $path
+    }
+}
--- a/脚本/2.just_AirRing.ps1
+++ b/脚本/2.just_AirRing.ps1
+#-----------------------------------------------------------------
+#AirRing
+$data_path = $PSScriptRoot + "\just_AirRing"
+$root_path = $PSScriptRoot + "\.."
+$src_path = $root_path + "\Project.FLY.FeedbackRenZiJia\FLY.FeedbackRenZiJia.UI.Client\bin\Debug"
+$dest_path = $root_path + "\Project.FLY.Thick.Blowing\FLY.Thick.Blowing.UI.Fix.Client\bin\Debug"
+
+$filename="FLY.FeedbackRenZiJia.dll","FLY.FeedbackRenZiJia.UI.Client.dll"
+foreach($n in $filename)
+{
+    cp ($src_path + "\"+ $n) $dest_path
+}
+
+cp ($data_path + "\graphcustom_justAirRing.xml") ($dest_path + "\layout\graphcustom.xml")
+
+if(-not (Test-Path($dest_path+"\main_module\AirRing")))
+{
+    mkdir ($dest_path+"\main_module\AirRing")
+}
+cp ($data_path + "\module.xml") ($dest_path+"\main_module\AirRing")
\ No newline at end of file
--- a/脚本/just_AirRing/graphcustom_justAirRing.xml
+++ b/脚本/just_AirRing/graphcustom_justAirRing.xml
+<?xml version="1.0" encoding="utf-8"?>
+<FLYLayout DynAreaWidth="250" IsDynAreaVisible="True" Left="0" Top="2" Width="1366" Height="768" WindowState="Maximized">
+  <Items>
+    <GraphTabItem Header="风 环" ColumnCount="1" RowCount="4">
+      <ColumnDefinitions>
+        <Boolean value="False" />
+      </ColumnDefinitions>
+      <RowDefinitions>
+        <Boolean value="False" />
+        <Boolean value="False" />
+        <Boolean value="False" />
+        <Boolean value="False" />
+      </RowDefinitions>
+      <Graphs>
+        <GraphComponent ID="14237802" Module="scangraph2" Row="0" Column="0" RowSpan="1" ColumnSpan="1" />
+        <GraphComponent ID="36721318" Module="scangraph2" Row="1" Column="0" RowSpan="1" ColumnSpan="1" />
+        <GraphComponent ID="51984031" Module="FLY.FeedbackRenZiJia.UI.Client.UIModule.UIModule_GraphFB" Row="2" Column="0" RowSpan="2" ColumnSpan="1" />
+      </Graphs>
+    </GraphTabItem>
+    <GraphTabItem Header="扫  描" ColumnCount="1" RowCount="4">
+      <ColumnDefinitions>
+        <Boolean value="False" />
+      </ColumnDefinitions>
+      <RowDefinitions>
+        <Boolean value="False" />
+        <Boolean value="False" />
+        <Boolean value="False" />
+        <Boolean value="False" />
+      </RowDefinitions>
+      <Graphs>
+        <GraphComponent ID="41846616" Module="scangraph" Row="0" Column="0" RowSpan="1" ColumnSpan="1" />
+        <GraphComponent ID="4049537" Module="scangraph" Row="1" Column="0" RowSpan="1" ColumnSpan="1" />
+        <GraphComponent ID="48011444" Module="scangraph" Row="2" Column="0" RowSpan="1" ColumnSpan="1" />
+        <GraphComponent ID="13031334" Module="scangraph" Row="3" Column="0" RowSpan="1" ColumnSpan="1" />
+      </Graphs>
+    </GraphTabItem>
+    <GraphTabItem Header="环 形" ColumnCount="1" RowCount="1">
+      <ColumnDefinitions>
+        <Boolean value="False" />
+      </ColumnDefinitions>
+      <RowDefinitions>
+        <Boolean value="False" />
+      </RowDefinitions>
+      <Graphs>
+        <GraphComponent ID="49539123" Module="trendgraphcircular" Row="0" Column="0" RowSpan="1" ColumnSpan="1" />
+      </Graphs>
+    </GraphTabItem>
+    <GraphTabItem Header="2σ趋势" ColumnCount="1" RowCount="2">
+      <ColumnDefinitions>
+        <Boolean value="False" />
+      </ColumnDefinitions>
+      <RowDefinitions>
+        <Boolean value="False" />
+        <Boolean value="False" />
+      </RowDefinitions>
+      <Graphs>
+        <GraphComponent ID="56082556" Module="trendgraph" Row="0" Column="0" RowSpan="1" ColumnSpan="1" />
+      </Graphs>
+    </GraphTabItem>
+    <GraphTabItem Header="定  点" ColumnCount="1" RowCount="2">
+      <ColumnDefinitions>
+        <Boolean value="False" />
+      </ColumnDefinitions>
+      <RowDefinitions>
+        <Boolean value="False" />
+        <Boolean value="False" />
+      </RowDefinitions>
+      <Graphs>
+        <GraphComponent ID="40687096" Module="fixgraph" Row="0" Column="0" RowSpan="1" ColumnSpan="1" />
+        <GraphComponent ID="18980006" Module="fixgraph" Row="1" Column="0" RowSpan="1" ColumnSpan="1" />
+      </Graphs>
+    </GraphTabItem>
+  </Items>
+  <ControllerStates>
+    <ControllerStateTabItem ControllerState="FIX" No="4" />
+    <ControllerStateTabItem ControllerState="SCAN" No="1" />
+  </ControllerStates>
+  <DynAreaItems>
+    <DynAreaComponent ID="43395070" Module="FLY.FeedbackRenZiJia.UI.Client.UIModule.UIModule_DynAreaFB" />
+  </DynAreaItems>
+</FLYLayout>
\ No newline at end of file
--- a/脚本/just_AirRing/module.xml
+++ b/脚本/just_AirRing/module.xml
+<?xml version="1.0"?>
+<ArrayOfUIModuleParam xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
+  <UIModuleParam>
+    <dll_filename>FLY.FeedbackRenZiJia.UI.Client.dll</dll_filename>
+    <assembly_name>FLY.FeedbackRenZiJia.UI.Client.UIModule</assembly_name>
+    <class_name>UIModule_GraphFB</class_name>
+    <IsDynAreaComponent>false</IsDynAreaComponent>
+    <IsGraphCompnonent>true</IsGraphCompnonent>
+    <IsMenuCompnonent>false</IsMenuCompnonent>
+    <IsUnique>true</IsUnique>
+  </UIModuleParam>
+  <UIModuleParam>
+    <dll_filename>FLY.FeedbackRenZiJia.UI.Client.dll</dll_filename>
+    <assembly_name>FLY.FeedbackRenZiJia.UI.Client.UIModule</assembly_name>
+    <class_name>UIModule_DynAreaFB</class_name>
+    <IsDynAreaComponent>true</IsDynAreaComponent>
+    <IsGraphCompnonent>false</IsGraphCompnonent>
+    <IsMenuCompnonent>false</IsMenuCompnonent>
+    <IsUnique>true</IsUnique>
+  </UIModuleParam>
+  <UIModuleParam>
+    <dll_filename>FLY.FeedbackRenZiJia.UI.Client.dll</dll_filename>
+    <assembly_name>FLY.FeedbackRenZiJia.UI.Client.UIModule</assembly_name>
+    <class_name>UIModule_Menu</class_name>
+    <IsDynAreaComponent>false</IsDynAreaComponent>
+    <IsGraphCompnonent>false</IsGraphCompnonent>
+    <IsMenuCompnonent>true</IsMenuCompnonent>
+    <IsUnique>true</IsUnique>
+  </UIModuleParam>
+
+
+</ArrayOfUIModuleParam>
\ No newline at end of file
--- a/脚本/main_module/AirRing/module.xml
+++ b/脚本/main_module/AirRing/module.xml
+<?xml version="1.0"?>
+<ArrayOfUIModuleParam xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
+  <UIModuleParam>
+    <dll_filename>FLY.FeedbackRenZiJia.UI.Client.dll</dll_filename>
+    <assembly_name>FLY.FeedbackRenZiJia.UI.Client.UIModule</assembly_name>
+    <class_name>UIModule_GraphFB</class_name>
+    <IsDynAreaComponent>false</IsDynAreaComponent>
+    <IsGraphCompnonent>true</IsGraphCompnonent>
+    <IsMenuCompnonent>false</IsMenuCompnonent>
+    <IsUnique>true</IsUnique>
+  </UIModuleParam>
+  <UIModuleParam>
+    <dll_filename>FLY.FeedbackRenZiJia.UI.Client.dll</dll_filename>
+    <assembly_name>FLY.FeedbackRenZiJia.UI.Client.UIModule</assembly_name>
+    <class_name>UIModule_DynAreaFB</class_name>
+    <IsDynAreaComponent>true</IsDynAreaComponent>
+    <IsGraphCompnonent>false</IsGraphCompnonent>
+    <IsMenuCompnonent>false</IsMenuCompnonent>
+    <IsUnique>true</IsUnique>
+  </UIModuleParam>
+  <UIModuleParam>
+    <dll_filename>FLY.FeedbackRenZiJia.UI.Client.dll</dll_filename>
+    <assembly_name>FLY.FeedbackRenZiJia.UI.Client.UIModule</assembly_name>
+    <class_name>UIModule_Menu</class_name>
+    <IsDynAreaComponent>false</IsDynAreaComponent>
+    <IsGraphCompnonent>false</IsGraphCompnonent>
+    <IsMenuCompnonent>true</IsMenuCompnonent>
+    <IsUnique>true</IsUnique>
+  </UIModuleParam>
+
+
+</ArrayOfUIModuleParam>
\ No newline at end of file
--- a/脚本/main_module/FFT/FLY.FFT.dll
+++ b/脚本/main_module/FFT/FLY.FFT.dll
--- a/脚本/main_module/FFT/MathNet.Numerics.dll
+++ b/脚本/main_module/FFT/MathNet.Numerics.dll
--- a/脚本/main_module/FFT/module.xml
+++ b/脚本/main_module/FFT/module.xml
+<?xml version="1.0"?>
+<ArrayOfModuleParam xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
+  <ModuleParam>
+    <dll_filename>FLY.FFT.dll</dll_filename>
+    <assembly_name>FLY.FFT</assembly_name>
+    <class_name>FFTC</class_name>
+  </ModuleParam>
+</ArrayOfModuleParam>
\ No newline at end of file
--- a/脚本/main_module/IBC/module.xml
+++ b/脚本/main_module/IBC/module.xml
+<?xml version="1.0"?>
+<ArrayOfUIModuleParam xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
+  <UIModuleParam>
+    <dll_filename>FLY.IBC.UI.Client.dll</dll_filename>
+    <assembly_name>FLY.IBC.UI.Client.UIModule</assembly_name>
+    <class_name>UIModule_Main</class_name>
+    <IsDynAreaComponent>false</IsDynAreaComponent>
+    <IsGraphCompnonent>true</IsGraphCompnonent>
+    <IsMenuCompnonent>false</IsMenuCompnonent>
+    <IsUnique>true</IsUnique>
+  </UIModuleParam>
+
+  <UIModuleParam>
+    <dll_filename>FLY.IBC.UI.Client.dll</dll_filename>
+    <assembly_name>FLY.IBC.UI.Client.UIModule</assembly_name>
+    <class_name>UIModule_DynArea</class_name>
+    <IsDynAreaComponent>true</IsDynAreaComponent>
+    <IsGraphCompnonent>false</IsGraphCompnonent>
+    <IsMenuCompnonent>false</IsMenuCompnonent>
+    <IsUnique>true</IsUnique>
+  </UIModuleParam>
+
+  <UIModuleParam>
+    <dll_filename>FLY.IBC.UI.Client.dll</dll_filename>
+    <assembly_name>FLY.IBC.UI.Client.UIModule</assembly_name>
+    <class_name>UIModule_Menu</class_name>
+    <IsDynAreaComponent>false</IsDynAreaComponent>
+    <IsGraphCompnonent>false</IsGraphCompnonent>
+    <IsMenuCompnonent>true</IsMenuCompnonent>
+    <IsUnique>true</IsUnique>
+  </UIModuleParam>
+
+
+</ArrayOfUIModuleParam>
\ No newline at end of file
--- a/脚本/main_module/Weight/module.xml
+++ b/脚本/main_module/Weight/module.xml
+<?xml version="1.0"?>
+<ArrayOfUIModuleParam xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
+  <UIModuleParam>
+    <dll_filename>FLY.Weight.UI.Client.dll</dll_filename>
+    <assembly_name>FLY.Weight.UI.Client.UIModule</assembly_name>
+    <class_name>UIModule_Main</class_name>
+    <IsDynAreaComponent>false</IsDynAreaComponent>
+    <IsGraphCompnonent>true</IsGraphCompnonent>
+    <IsMenuCompnonent>false</IsMenuCompnonent>
+    <IsUnique>true</IsUnique>
+  </UIModuleParam>
+
+  <UIModuleParam>
+    <dll_filename>FLY.Weight.UI.Client.dll</dll_filename>
+    <assembly_name>FLY.Weight.UI.Client.UIModule</assembly_name>
+    <class_name>UIModule_FlowGraph</class_name>
+    <IsDynAreaComponent>false</IsDynAreaComponent>
+    <IsGraphCompnonent>true</IsGraphCompnonent>
+    <IsMenuCompnonent>false</IsMenuCompnonent>
+    <IsUnique>true</IsUnique>
+  </UIModuleParam>
+
+  <UIModuleParam>
+    <dll_filename>FLY.Weight.UI.Client.dll</dll_filename>
+    <assembly_name>FLY.Weight.UI.Client.UIModule</assembly_name>
+    <class_name>UIModule_DynArea</class_name>
+    <IsDynAreaComponent>true</IsDynAreaComponent>
+    <IsGraphCompnonent>false</IsGraphCompnonent>
+    <IsMenuCompnonent>false</IsMenuCompnonent>
+    <IsUnique>true</IsUnique>
+  </UIModuleParam>
+
+  <UIModuleParam>
+    <dll_filename>FLY.Weight.UI.Client.dll</dll_filename>
+    <assembly_name>FLY.Weight.UI.Client.UIModule</assembly_name>
+    <class_name>UIModule_Menu</class_name>
+    <IsDynAreaComponent>false</IsDynAreaComponent>
+    <IsGraphCompnonent>false</IsGraphCompnonent>
+    <IsMenuCompnonent>true</IsMenuCompnonent>
+    <IsUnique>true</IsUnique>
+  </UIModuleParam>
+
+
+</ArrayOfUIModuleParam>
\ No newline at end of file
--- a/脚本/main_module/Winder/module.xml
+++ b/脚本/main_module/Winder/module.xml
+<?xml version="1.0"?>
+<ArrayOfUIModuleParam xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
+  <UIModuleParam>
+    <dll_filename>FLY.Winder.UI.Client.dll</dll_filename>
+    <assembly_name>FLY.Winder.UI.Client.UIModule</assembly_name>
+    <class_name>UIModule_Main</class_name>
+    <IsDynAreaComponent>false</IsDynAreaComponent>
+    <IsGraphCompnonent>true</IsGraphCompnonent>
+    <IsMenuCompnonent>false</IsMenuCompnonent>
+    <IsUnique>true</IsUnique>
+  </UIModuleParam>
+
+  <UIModuleParam>
+    <dll_filename>FLY.Winder.UI.Client.dll</dll_filename>
+    <assembly_name>FLY.Winder.UI.Client.UIModule</assembly_name>
+    <class_name>UIModule_DynArea</class_name>
+    <IsDynAreaComponent>true</IsDynAreaComponent>
+    <IsGraphCompnonent>false</IsGraphCompnonent>
+    <IsMenuCompnonent>false</IsMenuCompnonent>
+    <IsUnique>true</IsUnique>
+  </UIModuleParam>
+
+  <UIModuleParam>
+    <dll_filename>FLY.Winder.UI.Client.dll</dll_filename>
+    <assembly_name>FLY.Winder.UI.Client.UIModule</assembly_name>
+    <class_name>UIModule_Menu</class_name>
+    <IsDynAreaComponent>false</IsDynAreaComponent>
+    <IsGraphCompnonent>false</IsGraphCompnonent>
+    <IsMenuCompnonent>true</IsMenuCompnonent>
+    <IsUnique>true</IsUnique>
+  </UIModuleParam>
+
+
+</ArrayOfUIModuleParam>
\ No newline at end of file
--- a/update_main_module.ps1
+++ b/update_main_module.ps1