[RD-FFK-NET8] Move UI Form in separate projects plugin fairmat/dev/fairmatserver#3488

DatesGenerator/DatesGenerator.csproj

@@ -32,10 +32,6 @@
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="DVPForms">
-      <HintPath>..\..\DVPLReferences\DVPForms.dll</HintPath>
-      <Private>False</Private>
-    </Reference>
     <Reference Include="DVPLDOM">
       <HintPath>..\..\DVPLReferences\DVPLDOM.dll</HintPath>
       <Private>False</Private>
@@ -75,32 +71,16 @@
       <HintPath>..\packages\System.Runtime.CompilerServices.Unsafe.6.0.0\lib\net461\System.Runtime.CompilerServices.Unsafe.dll</HintPath>
     </Reference>
     <Reference Include="System.Windows.Forms" />
-    <Reference Include="UIBase">
-      <HintPath>..\..\DVPLReferences\UIBase.dll</HintPath>
-      <Private>False</Private>
-    </Reference>
   </ItemGroup>
   <ItemGroup>
     <Compile Include="DateFrequencyExport.cs" />
     <Compile Include="DateFrequency.cs" />
     <Compile Include="DateFrequencyUtility.cs" />
-    <Compile Include="DateSequenceForm.cs">
-      <SubType>Form</SubType>
-    </Compile>
-    <Compile Include="DateSequenceForm.Designer.cs">
-      <DependentUpon>DateSequenceForm.cs</DependentUpon>
-    </Compile>
-    <Compile Include="DatesGeneratorContextItem.cs" />
     <Compile Include="DatesSequenceSymbolChoice.cs" />
     <Compile Include="Freq2Period.cs" />
     <Compile Include="ModelParameterDateSequence.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
   </ItemGroup>
-  <ItemGroup>
-    <EmbeddedResource Include="DateSequenceForm.resx">
-      <DependentUpon>DateSequenceForm.cs</DependentUpon>
-    </EmbeddedResource>
-  </ItemGroup>
   <ItemGroup>
     <None Include="app.config" />
     <None Include="packages.config" />

DatesGeneratorUI/AssemblyInfo.cs

@@ -0,0 +1,42 @@
+using Mono.Addins;
+using System.Reflection;
+using System.Runtime.InteropServices;
+
+// Nei progetti di tipo SDK come questo diversi attributi di assembly che sono stati
+// definiti cronologicamente in questo file vengono ora aggiunti automaticamente durante
+// la compilazione e popolati con i valori definiti nelle proprietà del progetto.
+// Per informazioni dettagliate sugli attributi inclusi e su come personalizzare questo
+// processo, vedere: https://aka.ms/assembly-info-properties
+
+
+// General Information about an assembly is controlled through the following
+// set of attributes. Change these attribute values to modify the information
+// associated with an assembly.
+[assembly: AssemblyTitle("Dates Generator UI")]
+[assembly: AssemblyDescription("Dates generator allows to generate sequences of (payment) dates " +
+                               "by specifying Starting Date, Ending Date and the frequency.")]
+[assembly: AssemblyConfiguration("")]
+[assembly: AssemblyCompany("Fairmat SRL")]
+[assembly: AssemblyProduct("Dates Generator UI")]
+[assembly: AssemblyCopyright("Copyright © Fairmat SRL 2012-2017")]
+[assembly: AssemblyTrademark("Fairmat")]
+[assembly: AssemblyCulture("")]
+
+
+
+// Se si imposta ComVisible su false, i tipi in questo assembly non saranno visibili
+// ai componenti COM. Se è necessario accedere a un tipo in questo assembly da COM,
+// impostare su true l'attributo ComVisible per tale tipo.
+
+[assembly: ComVisible(false)]
+
+// Se il progetto viene esposto a COM, il GUID seguente verrà usato come ID di typelib.
+
+[assembly: Guid("8223a8ab-fa22-4f7b-93dc-7b25a69432d4")]
+
+[assembly: AssemblyVersion("1.0.29")]
+[assembly: AssemblyFileVersion("1.0.29")]
+
+[assembly: Addin("Dates Generator UI", "1.0.29", Category = "Modeling Tools")]
+[assembly: AddinDependency("Fairmat", "1.0")]
+[assembly: AddinAuthor("Fairmat SRL")]

DatesGenerator/DateSequenceForm.cs → DatesGeneratorUI/DateSequenceForm.cs

@@ -623,6 +623,12 @@ private void RestoreValues(ModelParameterArray parameter, IDictionary<string, ob
             }
         }
 
+
         #endregion // Helper methods
+
+        private void publishingInfoControl_Load(object sender, EventArgs e)
+        {
+            MessageBox.Show("SONO DATEGENERATOR UI");
+        }
     }
 }

DatesGenerator/DatesGeneratorContextItem.cs → DatesGeneratorUI/DatesGeneratorContextItem.cs

@@ -17,11 +17,12 @@
 
 using System;
 using System.Collections.Generic;
+using DatesGenerator;
 using DVPLDOM;
 using DVPLI;
 using Mono.Addins;
 
-namespace DatesGenerator
+namespace DatesGeneratorUI
 {
     /// <summary>
     /// Represents the context menu item for the dates vector generator.

DatesGeneratorUI/DatesGeneratorUI.csproj

@@ -0,0 +1,45 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <TargetFramework>net48</TargetFramework>
+	<LangVersion>12</LangVersion>
+	  <GenerateAssemblyInfo>False</GenerateAssemblyInfo>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <PackageReference Include="Mono.Addins" Version="1.4.1" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\DatesGenerator\DatesGenerator.csproj" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <Reference Include="DVPForms">
+      <HintPath>..\..\DVPLReferences\DVPForms.dll</HintPath>
+    </Reference>
+    <Reference Include="DVPLDOM">
+      <HintPath>..\..\DVPLReferences\DVPLDOM.dll</HintPath>
+    </Reference>
+    <Reference Include="DVPLI">
+      <HintPath>..\..\DVPLReferences\DVPLI.dll</HintPath>
+    </Reference>
+    <Reference Include="DVPLInterfaces">
+      <HintPath>..\..\DVPLReferences\DVPLInterfaces.dll</HintPath>
+    </Reference>
+    <Reference Include="DVPLUtils">
+      <HintPath>..\..\DVPLReferences\DVPLUtils.dll</HintPath>
+    </Reference>
+    <Reference Include="System.Windows.Forms" />
+    <Reference Include="UIBase">
+      <HintPath>..\..\DVPLReferences\UIBase.dll</HintPath>
+    </Reference>
+  </ItemGroup>
+
+  <ItemGroup>
+    <Compile Update="DateSequenceForm.cs">
+      <SubType>Form</SubType>
+    </Compile>
+  </ItemGroup>
+
+</Project>

ModelingTools.sln

@@ -1,12 +1,18 @@
 
-Microsoft Visual Studio Solution File, Format Version 11.00
-# Visual Studio 2010
+Microsoft Visual Studio Solution File, Format Version 12.00
+# Visual Studio Version 17
+VisualStudioVersion = 17.9.34714.143
+MinimumVisualStudioVersion = 10.0.40219.1
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DatesGenerator", "DatesGenerator\DatesGenerator.csproj", "{86C0D51D-B82C-40E9-8784-3EB614396B3B}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PFunction2D", "PFunction2D\PFunction2D.csproj", "{61982E89-DAB3-4E01-BBE7-1BD5E3C71297}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ModelingTools.Tests", "ModelingTools.Tests\ModelingTools.Tests.csproj", "{E056296C-95D8-4A2B-A228-83B5FB28A1BD}"
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DatesGeneratorUI", "DatesGeneratorUI\DatesGeneratorUI.csproj", "{B6224600-E81C-43B3-8AFD-A87DB0A50402}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PFunction2DUI", "PFunction2DUI\PFunction2DUI.csproj", "{96498F51-FB8B-400C-AB1A-104779463580}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -25,8 +31,19 @@ Global
 		{E056296C-95D8-4A2B-A228-83B5FB28A1BD}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{E056296C-95D8-4A2B-A228-83B5FB28A1BD}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{E056296C-95D8-4A2B-A228-83B5FB28A1BD}.Release|Any CPU.Build.0 = Release|Any CPU
+		{B6224600-E81C-43B3-8AFD-A87DB0A50402}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{B6224600-E81C-43B3-8AFD-A87DB0A50402}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{B6224600-E81C-43B3-8AFD-A87DB0A50402}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{B6224600-E81C-43B3-8AFD-A87DB0A50402}.Release|Any CPU.Build.0 = Release|Any CPU
+		{96498F51-FB8B-400C-AB1A-104779463580}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{96498F51-FB8B-400C-AB1A-104779463580}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{96498F51-FB8B-400C-AB1A-104779463580}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{96498F51-FB8B-400C-AB1A-104779463580}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
 	EndGlobalSection
+	GlobalSection(ExtensibilityGlobals) = postSolution
+		SolutionGuid = {14D7DADA-6437-4428-9B7A-42F3AB07C172}
+	EndGlobalSection
 EndGlobal

PFunction2D/PFunction2D.cs

@@ -299,7 +299,7 @@ public override Array Expr
         /// <remarks>
         /// To be used only internally, use Evaluate to get the value at any coordinate.
         /// </remarks>
-        internal IRightValue[] Xcoordinates
+        public IRightValue[] Xcoordinates
         {
             get
             {
@@ -313,7 +313,7 @@ internal IRightValue[] Xcoordinates
         /// <remarks>
         /// To be used only internally, use Evaluate to get the value at any coordinate.
         /// </remarks>
-        internal IRightValue[] Ycoordinates
+        public IRightValue[] Ycoordinates
         {
             get
             {
@@ -385,7 +385,7 @@ public ExtrapolationType Extrapolation
         /// To be used only internally, in order to set the wanted
         /// leastSquaresCoefficients and get what the current one.
         /// </remarks>
-        internal int LeastSquaresCoefficients
+        public int LeastSquaresCoefficients
         {
             get
             {
@@ -414,7 +414,7 @@ internal int LeastSquaresCoefficients
         /// on the values.
         /// </param>
         /// <returns>The requested RightValue at the position.</returns>
-        internal IRightValue this[int x, int y]
+        public IRightValue this[int x, int y]
         {
             get
             {
@@ -484,7 +484,7 @@ private void FillWithDefaultData()
         /// <remarks>Anything stored is lost.</remarks>
         /// <param name="x">The size in the x dimension.</param>
         /// <param name="y">The size in the y dimension.</param>
-        internal void SetSizes(int x, int y)
+        public void SetSizes(int x, int y)
         {
             this.coordinatesX = new RightValue[x];
             this.coordinatesY = new RightValue[y];
@@ -498,7 +498,7 @@ internal void SetSizes(int x, int y)
         /// Anything stored in the other object is overwritten.
         /// </remarks>
         /// <param name="other">The object where to copy this object to.</param>
-        internal void CopyTo(PFunction2D other)
+        public void CopyTo(PFunction2D other)
         {
             other.SetSizes(this.coordinatesX.Length, this.coordinatesY.Length);
             other.coordinatesX = (IRightValue[])this.coordinatesX.Clone();

PFunction2D/PFunction2D.csproj

@@ -85,10 +85,6 @@
   </ItemGroup>
   <ItemGroup>
     <Compile Include="CPointFunction2D.cs" />
-    <Compile Include="EditPFunction2DForm.cs">
-      <SubType>Form</SubType>
-    </Compile>
-    <Compile Include="Function2DImportUtility.cs" />
     <Compile Include="PFunction2D.cs" />
     <Compile Include="PFunction2DSymbolChoice.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />

PFunction2DUI/AssemblyInfo.cs

@@ -0,0 +1,39 @@
+using Mono.Addins;
+using System.Reflection;
+using System.Runtime.InteropServices;
+
+// Nei progetti di tipo SDK come questo diversi attributi di assembly che sono stati
+// definiti cronologicamente in questo file vengono ora aggiunti automaticamente durante
+// la compilazione e popolati con i valori definiti nelle proprietà del progetto.
+// Per informazioni dettagliate sugli attributi inclusi e su come personalizzare questo
+// processo, vedere: https://aka.ms/assembly-info-properties
+
+
+// The following lines tell that the assembly is an addin.
+[assembly: Addin("Point Function 2D UI", "1.0.5", Category = "Modeling Tools")]
+[assembly: AddinDependency("Fairmat", "1.0")]
+[assembly: AddinAuthor("Fairmat SRL")]
+[assembly: AddinDescription("A 2D function defined by interpolating or fitting data.")]
+
+// General Information about an assembly is controlled through the following
+// set of attributes. Change these attribute values to modify the information
+// associated with an assembly.
+[assembly: AssemblyTitle("Point Function 2D UI")]
+[assembly: AssemblyDescription("A 2D function defined by interpolating or fitting data.")]
+[assembly: AssemblyConfiguration("")]
+[assembly: AssemblyCompany("Fairmat SRL")]
+[assembly: AssemblyProduct("Point Function 2D UI")]
+[assembly: AssemblyCopyright("Copyright © Fairmat SRL 2012")]
+[assembly: AssemblyTrademark("Fairmat")]
+[assembly: AssemblyCulture("")]
+
+
+// Se si imposta ComVisible su false, i tipi in questo assembly non saranno visibili
+// ai componenti COM. Se è necessario accedere a un tipo in questo assembly da COM,
+// impostare su true l'attributo ComVisible per tale tipo.
+
+[assembly: ComVisible(false)]
+
+// Se il progetto viene esposto a COM, il GUID seguente verrà usato come ID di typelib.
+
+[assembly: Guid("e5b49f7d-6855-430e-9762-01f327cc1b90")]