- spostamento + cambio nome

2024-10-03 16:30:55 +02:00
parent 6da345d8c5
commit 1aa26ca644
50 changed files with 34 additions and 189 deletions
@@ -3,9 +3,9 @@ Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio Version 17
 VisualStudioVersion = 17.8.34309.116
 MinimumVisualStudioVersion = 10.0.40219.1
-Project("{F184B08F-C81C-45F6-A57F-5ABD9991F28F}") = "Supervisor.Plugin.Interface", "..\Ngp\Supervisor.Plugin.Interface\Supervisor.Plugin.Interface.vbproj", "{7D14D864-2BDC-4785-80F4-320164C2D5E4}"
+Project("{F184B08F-C81C-45F6-A57F-5ABD9991F28F}") = "Effector.Plugin.Interface", "..\Effector\Effector.Plugin.Interface\Effector.Plugin.Interface.vbproj", "{7D14D864-2BDC-4785-80F4-320164C2D5E4}"
 EndProject
-Project("{F184B08F-C81C-45F6-A57F-5ABD9991F28F}") = "Supervisor.Plugin.FiveLakes", "Supervisor.Plugin.FiveLakes\Supervisor.Plugin.FiveLakes.vbproj", "{7C77F537-8235-40AB-B24A-4E71CFB96D2C}"
+Project("{F184B08F-C81C-45F6-A57F-5ABD9991F28F}") = "Effector.Plugin.FiveLakes", "Effector.Plugin.FiveLakes\Effector.Plugin.FiveLakes.vbproj", "{7C77F537-8235-40AB-B24A-4E71CFB96D2C}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -3,11 +3,11 @@ Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio Version 17
 VisualStudioVersion = 17.8.34309.116
 MinimumVisualStudioVersion = 10.0.40219.1
-Project("{F184B08F-C81C-45F6-A57F-5ABD9991F28F}") = "Supervisor", "..\Ngp\Supervisor\Supervisor.vbproj", "{38BEE4BF-9238-459F-AF89-4DD94C4FD0DA}"
+Project("{F184B08F-C81C-45F6-A57F-5ABD9991F28F}") = "Effector.Main", "..\Effector.Main\Effector.Main\Effector.Main.vbproj", "{38BEE4BF-9238-459F-AF89-4DD94C4FD0DA}"
 EndProject
-Project("{F184B08F-C81C-45F6-A57F-5ABD9991F28F}") = "Supervisor.Plugin.Interface", "..\Ngp\Supervisor.Plugin.Interface\Supervisor.Plugin.Interface.vbproj", "{7D14D864-2BDC-4785-80F4-320164C2D5E4}"
+Project("{F184B08F-C81C-45F6-A57F-5ABD9991F28F}") = "Effector.Plugin.Interface", "..\Effector.Main\Effector.Plugin.Interface\Effector.Plugin.Interface.vbproj", "{7D14D864-2BDC-4785-80F4-320164C2D5E4}"
 EndProject
-Project("{F184B08F-C81C-45F6-A57F-5ABD9991F28F}") = "Supervisor.Plugin.FiveLakes", "Supervisor.Plugin.FiveLakes\Supervisor.Plugin.FiveLakes.vbproj", "{7C77F537-8235-40AB-B24A-4E71CFB96D2C}"
+Project("{F184B08F-C81C-45F6-A57F-5ABD9991F28F}") = "Effector.Plugin.FiveLakes", "Effector.Plugin.FiveLakes\Effector.Plugin.FiveLakes.vbproj", "{7C77F537-8235-40AB-B24A-4E71CFB96D2C}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -12,7 +12,7 @@
 '----------------------------------------------------------------------------
 Module ConstIni

-   Public Const INI_FILE_NAME As String = "Supervisor.Plugin.FiveLakes.ini"
+   Public Const INI_FILE_NAME As String = "Effector.Plugin.FiveLakes.ini"

   Public Const S_GENERAL As String = "General"
   Public Const K_BACKUPDIR As String = "BackupDir"
@@ -4,8 +4,8 @@
    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
    <ProjectTypeGuids>{60dc8134-eba5-43b8-bcc9-bb4bc16c2548};{F184B08F-C81C-45F6-A57F-5ABD9991F28F}</ProjectTypeGuids>
-    <RootNamespace>Supervisor.Plugin.FiveLakes</RootNamespace>
-    <AssemblyName>Supervisor.Plugin.FiveLakes</AssemblyName>
+    <RootNamespace>Effector.Plugin.FiveLakes</RootNamespace>
+    <AssemblyName>Effector.Plugin.FiveLakes</AssemblyName>
    <OutputType>Library</OutputType>
    <TargetFrameworkVersion>v4.7.2</TargetFrameworkVersion>
    <MyType>Custom</MyType>
@@ -21,7 +21,7 @@
    <DefineTrace>true</DefineTrace>
    <IncrementalBuild>true</IncrementalBuild>
    <OutputPath>bin\Debug\</OutputPath>
-    <DocumentationFile>Supervisor.Plugin.FiveLakes.xml</DocumentationFile>
+    <DocumentationFile>Effector.Plugin.FiveLakes.xml</DocumentationFile>
    <NoWarn>41999,42016,42017,42018,42019,42020,42021,42022,42032,42036,42314</NoWarn>
  </PropertyGroup>
  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
@@ -32,7 +32,7 @@
    <IncrementalBuild>false</IncrementalBuild>
    <Optimize>true</Optimize>
    <OutputPath>bin\Release\</OutputPath>
-    <DocumentationFile>Supervisor.Plugin.FiveLakes.xml</DocumentationFile>
+    <DocumentationFile>Effector.Plugin.FiveLakes.xml</DocumentationFile>
    <NoWarn>41999,42016,42017,42018,42019,42020,42021,42022,42032,42036,42314</NoWarn>
  </PropertyGroup>
  <PropertyGroup>
@@ -48,6 +48,9 @@
    <OptionInfer>On</OptionInfer>
  </PropertyGroup>
  <ItemGroup>
+    <Reference Include="Effector.Plugin.Interface">
+      <HintPath>..\..\Effector.Main\Effector.Plugin.Interface\bin\Debug\Effector.Plugin.Interface.dll</HintPath>
+    </Reference>
    <Reference Include="EgtWPFLib48">
      <HintPath>..\..\..\EgtProg\DllD32\EgtWPFLib48.dll</HintPath>
    </Reference>
@@ -57,9 +60,6 @@
    <Reference Include="Newtonsoft.Json, Version=13.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
      <HintPath>..\packages\Newtonsoft.Json.13.0.3\lib\net45\Newtonsoft.Json.dll</HintPath>
    </Reference>
-    <Reference Include="Supervisor.Plugin.Interface">
-      <HintPath>..\..\Ngp\Supervisor.Plugin.Interface\bin\Debug\Supervisor.Plugin.Interface.dll</HintPath>
-    </Reference>
    <Reference Include="System.ComponentModel.Composition" />
    <Reference Include="System.Core" />
    <Reference Include="System.Xml.Linq" />
@@ -203,7 +203,7 @@
    <PreBuildEvent>powershell.exe -ExecutionPolicy Unrestricted -NoProfile -NonInteractive -File $(ProjectDir)\pre-build.ps1 -ProjectDir $(ProjectDir) -ProjectPath $(ProjectPath)</PreBuildEvent>
  </PropertyGroup>
  <PropertyGroup>
-    <PostBuildEvent>copy $(TargetPath) c:\EgtData\Supervisor\Plugin\Supervisor.Plugin.FiveLakes\Supervisor.Plugin.FiveLakes.dll
+    <PostBuildEvent>copy $(TargetPath) c:\EgtData\Effector\Plugin\Effector.Plugin.FiveLakes\Effector.Plugin.FiveLakes.dll
 </PostBuildEvent>
  </PropertyGroup>
  <Import Project="..\packages\KeraLua.1.4.1\build\net46\KeraLua.targets" Condition="Exists('..\packages\KeraLua.1.4.1\build\net46\KeraLua.targets')" />
@@ -1,7 +1,7 @@
 <Grid x:Class="FiveLakesUI"
      xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
      xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-      xmlns:local="clr-namespace:Supervisor.Plugin.FiveLakes"
+      xmlns:local="clr-namespace:Effector.Plugin.FiveLakes"
      DataContext="{StaticResource FiveLakesUIVM}">
   <TabControl SelectedIndex="{Binding SelPage}">
      <TabControl.ItemContainerStyle>
@@ -1,5 +1,5 @@
 Imports System.ComponentModel.Composition
-Imports Supervisor.Plugin.Interface
+Imports Effector.Plugin.Interface

 <Export(GetType(IPluginControl))>
 <ExportMetadata("Name", "Project")>
@@ -1,5 +1,5 @@
 Imports System.ComponentModel.Composition
-Imports Supervisor.Plugin.Interface
+Imports Effector.Plugin.Interface

 Public Class FiveLakesUIVM
   Inherits VMBase
@@ -48,7 +48,7 @@ Public Class FiveLakesUIVM
      If GetPrivateProfileString(S_DATA, K_DATAROOT, "", m_sDataRoot, m_sDataRoot & "\" & DAT_FILE_NAME) = 0 Then
         m_sDataRoot = System.AppDomain.CurrentDomain.BaseDirectory
      End If
-      m_sDataRoot &= "\" & "Plugin\Supervisor.Plugin.FiveLakes"
+      m_sDataRoot &= "\" & "Plugin\Effector.Plugin.FiveLakes"
      ' Impostazione direttorio di configurazione
      m_sConfigDir = m_sDataRoot & "\" & CONF_DIR
      ' Impostazione path Ini file
@@ -1,5 +1,5 @@
 Imports System.ComponentModel.Composition
-Imports Supervisor.Plugin.Interface
+Imports Effector.Plugin.Interface
 Imports KeraLua

 <Export(GetType(IPluginLuaManager))>
@@ -1,7 +1,7 @@
 <Grid x:Class="MachinePageV"
      xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
      xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-      xmlns:local="clr-namespace:Supervisor.Plugin.FiveLakes"
+      xmlns:local="clr-namespace:Effector.Plugin.FiveLakes"
      xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
      xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
      mc:Ignorable="d" 
@@ -4,8 +4,8 @@ Imports System.Globalization
 Imports System.Reflection
 Imports System.Windows.Threading
 Imports Newtonsoft.Json.Linq
-Imports Supervisor.Plugin.FiveLakes.Variable
-Imports Supervisor.Plugin.Interface
+Imports Effector.Plugin.FiveLakes.Variable
+Imports Effector.Plugin.Interface

 Public Class MachinePageVM
   Inherits VMBase
@@ -1,5 +1,5 @@
 Imports System.ComponentModel.Composition
-Imports Supervisor.Plugin.Interface
+Imports Effector.Plugin.Interface

 <Export(GetType(IPluginControl))>
 <ExportMetadata("Name", "MainMenu")>
@@ -11,10 +11,10 @@ Imports System.Windows

 ' Review the values of the assembly attributes

-<Assembly: AssemblyTitle("Supervisor.Plugin.FiveLakes")>
+<Assembly: AssemblyTitle("Effector.Plugin.FiveLakes")>
 <Assembly: AssemblyDescription("")>
 <Assembly: AssemblyCompany("Windows User")>
-<Assembly: AssemblyProduct("Supervisor.Plugin.FiveLakes")>
+<Assembly: AssemblyProduct("Effector.Plugin.FiveLakes")>
 <Assembly: AssemblyCopyright("Copyright @ Windows User 2024")>
 <Assembly: AssemblyTrademark("")> 
 <Assembly: ComVisible(false)>
@@ -64,9 +64,9 @@ Namespace My
    Friend Module MySettingsProperty

        <Global.System.ComponentModel.Design.HelpKeywordAttribute("My.Settings")>  _
-        Friend ReadOnly Property Settings() As Global.Supervisor.Plugin.FiveLakes.My.MySettings
+        Friend ReadOnly Property Settings() As Global.Effector.Plugin.FiveLakes.My.MySettings
            Get
-                Return Global.Supervisor.Plugin.FiveLakes.My.MySettings.Default
+                Return Global.Effector.Plugin.FiveLakes.My.MySettings.Default
            End Get
        End Property
    End Module
@@ -3,7 +3,7 @@
             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:Supervisor.Plugin.FiveLakes"
+             xmlns:local="clr-namespace:Effector.Plugin.FiveLakes"
             mc:Ignorable="d" 
             d:DesignHeight="450" d:DesignWidth="800">
   <Window.Resources>
@@ -3,7 +3,7 @@
             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:Supervisor.Plugin.FiveLakes"
+             xmlns:local="clr-namespace:Effector.Plugin.FiveLakes"
             mc:Ignorable="d" 
             d:DesignHeight="450" d:DesignWidth="800">
    <Grid>
@@ -1,7 +1,7 @@
 <ResourceDictionary x:Class="Dictionary"
                    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-                    xmlns:local="clr-namespace:Supervisor.Plugin.FiveLakes"
+                    xmlns:local="clr-namespace:Effector.Plugin.FiveLakes"
                    xmlns:sys="clr-namespace:System;assembly=mscorlib"
 >

@@ -1,6 +1,6 @@
 Imports System.ComponentModel.Composition
 Imports System.Globalization
-Imports Supervisor.Plugin.Interface
+Imports Effector.Plugin.Interface

 <Export(GetType(IPluginControl))>
 <ExportMetadata("Name", "Dictionary")>
@@ -1,7 +1,7 @@
 Imports System.IO
 Imports System.Threading
 Imports MS.Internal
-Imports Supervisor.Plugin.FiveLakes.ThreadData
+Imports Effector.Plugin.FiveLakes.ThreadData
 Imports System.Windows.Threading

 Public Class ExecProcessManager
@@ -1,7 +1,7 @@
 Imports System.Globalization
 Imports Newtonsoft.Json
 Imports Newtonsoft.Json.Converters
-Imports Supervisor.Plugin.FiveLakes.Door
+Imports Effector.Plugin.FiveLakes.Door

 Public Class JsonDoor

@@ -1,4 +1,4 @@
-Imports Supervisor.Plugin.Interface
+Imports Effector.Plugin.Interface

 Module Map

@@ -1,155 +0,0 @@
-<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
-  <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProjectTypeGuids>{60dc8134-eba5-43b8-bcc9-bb4bc16c2548};{F184B08F-C81C-45F6-A57F-5ABD9991F28F}</ProjectTypeGuids>
-    <RootNamespace>Supervisor.Plugin.FiveLakes</RootNamespace>
-    <AssemblyName>Supervisor.Plugin.FiveLakes</AssemblyName>
-    <OutputType>Library</OutputType>
-    <TargetFrameworkVersion>v4.7.2</TargetFrameworkVersion>
-    <MyType>Custom</MyType>
-    <Deterministic>true</Deterministic>
-    <ProjectGuid>{7C77F537-8235-40AB-B24A-4E71CFB96D2C}</ProjectGuid>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <DebugSymbols>true</DebugSymbols>
-    <DebugType>full</DebugType>
-    <DefineDebug>true</DefineDebug>
-    <DefineTrace>true</DefineTrace>
-    <IncrementalBuild>true</IncrementalBuild>
-    <OutputPath>bin\Debug\</OutputPath>
-    <DocumentationFile>Supervisor.Plugin.FiveLakes.xml</DocumentationFile>
-    <NoWarn>41999,42016,42017,42018,42019,42020,42021,42022,42032,42036,42314</NoWarn>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <DebugType>pdbonly</DebugType>
-    <DebugSymbols>false</DebugSymbols>
-    <DefineDebug>false</DefineDebug>
-    <DefineTrace>true</DefineTrace>
-    <IncrementalBuild>false</IncrementalBuild>
-    <Optimize>true</Optimize>
-    <OutputPath>bin\Release\</OutputPath>
-    <DocumentationFile>Supervisor.Plugin.FiveLakes.xml</DocumentationFile>
-    <NoWarn>41999,42016,42017,42018,42019,42020,42021,42022,42032,42036,42314</NoWarn>
-  </PropertyGroup>
-  <PropertyGroup>
-    <OptionExplicit>On</OptionExplicit>
-  </PropertyGroup>
-  <PropertyGroup>
-    <OptionCompare>Binary</OptionCompare>
-  </PropertyGroup>
-  <PropertyGroup>
-    <OptionStrict>Off</OptionStrict>
-  </PropertyGroup>
-  <PropertyGroup>
-    <OptionInfer>On</OptionInfer>
-  </PropertyGroup>
-  <ItemGroup>
-    <Reference Include="EgtWPFLib48">
-      <HintPath>..\..\..\EgtProg\DllD32\EgtWPFLib48.dll</HintPath>
-    </Reference>
-    <Reference Include="Supervisor.Plugin.Interface">
-      <HintPath>..\..\Supervisor\Supervisor.Plugin.Interface\bin\Debug\Supervisor.Plugin.Interface.dll</HintPath>
-    </Reference>
-    <Reference Include="System.ComponentModel.Composition" />
-    <Reference Include="System.Core" />
-    <Reference Include="System.Xml.Linq" />
-    <Reference Include="System.Data.DataSetExtensions" />
-    <Reference Include="System" />
-    <Reference Include="System.Data" />
-    <Reference Include="System.Xml" />
-    <Reference Include="System.Xaml">
-      <RequiredTargetFramework>4.0</RequiredTargetFramework>
-    </Reference>
-    <Reference Include="WindowsBase" />
-    <Reference Include="PresentationCore" />
-    <Reference Include="PresentationFramework" />
-    <Reference Include="System.Net.Http" />
-  </ItemGroup>
-  <ItemGroup>
-    <Import Include="System.Threading.Tasks" />
-    <Import Include="System.Linq" />
-    <Import Include="System.Xml.Linq" />
-    <Import Include="Microsoft.VisualBasic" />
-    <Import Include="System" />
-    <Import Include="System.Collections" />
-    <Import Include="System.Collections.Generic" />
-    <Import Include="System.Diagnostics" />
-    <Import Include="System.Windows" />
-    <Import Include="System.Windows.Controls" />
-    <Import Include="System.Windows.Data" />
-    <Import Include="System.Windows.Documents" />
-    <Import Include="System.Windows.Input" />
-    <Import Include="System.Windows.Shapes" />
-    <Import Include="System.Windows.Media" />
-    <Import Include="System.Windows.Media.Imaging" />
-    <Import Include="System.Windows.Navigation" />
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Include="DoorList\DoorListV.xaml.vb">
-      <DependentUpon>DoorListV.xaml</DependentUpon>
-    </Compile>
-    <Compile Include="DoorList\DoorListVM.vb" />
-    <Compile Include="FiveLakesUI.xaml.vb">
-      <DependentUpon>FiveLakesUI.xaml</DependentUpon>
-    </Compile>
-    <Compile Include="FiveLakesUIVM.vb" />
-    <Compile Include="MainMenu\MainMenuV.xaml.vb">
-      <DependentUpon>MainMenuV.xaml</DependentUpon>
-    </Compile>
-    <Compile Include="MainMenu\MainMenuVM.vb" />
-    <Compile Include="My Project\AssemblyInfo.vb">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="My Project\Resources.Designer.vb">
-      <AutoGen>True</AutoGen>
-      <DesignTime>True</DesignTime>
-      <DependentUpon>Resources.resx</DependentUpon>
-    </Compile>
-    <Compile Include="My Project\Settings.Designer.vb">
-      <AutoGen>True</AutoGen>
-      <DependentUpon>Settings.settings</DependentUpon>
-      <DesignTimeSharedInput>True</DesignTimeSharedInput>
-    </Compile>
-    <Compile Include="Utility\Command.vb" />
-    <Compile Include="Utility\Dictionary.xaml.vb" />
-    <Compile Include="Utility\VMBase.vb" />
-    <EmbeddedResource Include="My Project\Resources.resx">
-      <Generator>VbMyResourcesResXFileCodeGenerator</Generator>
-      <LastGenOutput>Resources.Designer.vb</LastGenOutput>
-      <CustomToolNamespace>My.Resources</CustomToolNamespace>
-    </EmbeddedResource>
-    <None Include="My Project\Settings.settings">
-      <Generator>SettingsSingleFileGenerator</Generator>
-      <LastGenOutput>Settings.Designer.vb</LastGenOutput>
-    </None>
-  </ItemGroup>
-  <ItemGroup>
-    <Page Include="DoorList\DoorListV.xaml">
-      <SubType>Designer</SubType>
-      <Generator>MSBuild:Compile</Generator>
-    </Page>
-    <Page Include="FiveLakesUI.xaml">
-      <SubType>Designer</SubType>
-      <Generator>MSBuild:Compile</Generator>
-    </Page>
-    <Page Include="MainMenu\MainMenuV.xaml">
-      <SubType>Designer</SubType>
-      <Generator>MSBuild:Compile</Generator>
-    </Page>
-    <Page Include="Utility\Dictionary.xaml">
-      <Generator>MSBuild:Compile</Generator>
-      <SubType>Designer</SubType>
-    </Page>
-  </ItemGroup>
-  <ItemGroup />
-  <Import Project="$(MSBuildToolsPath)\Microsoft.VisualBasic.targets" />
-  <PropertyGroup>
-    <PreBuildEvent>powershell.exe -ExecutionPolicy Unrestricted -NoProfile -NonInteractive -File $(ProjectDir)\pre-build.ps1 -ProjectDir $(ProjectDir) -ProjectPath $(ProjectPath)</PreBuildEvent>
-  </PropertyGroup>
-  <PropertyGroup>
-    <PostBuildEvent>copy $(TargetPath) c:\EgtData\Supervisor\Plugin\Supervisor.Plugin.FiveLakes\Supervisor.Plugin.FiveLakes.dll
-</PostBuildEvent>
-  </PropertyGroup>
-</Project>