Skip to content

Commit cb8471d

Browse files
pybridepybride
committed
✨ Adding pooling of rolling files
1 parent ee3592a commit cb8471d

7 files changed

+279
-24
lines changed

‎Analogy/Forms/EditFilePooling.Designer.cs

+88
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎Analogy/Forms/EditFilePooling.cs

+29
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,29 @@
1+
using System.IO;
2+
using System.Windows.Forms;
3+
4+
namespace Analogy.Forms
5+
{
6+
public partial class EditFilePooling : Form
7+
{
8+
public EditFilePooling(string fileName)
9+
{
10+
InitializeComponent();
11+
Dir = Path.GetDirectoryName(fileName) ?? string.Empty;
12+
13+
txtFilename.Text = Path.GetFileName(fileName);
14+
}
15+
16+
17+
public string Dir { get; set; }
18+
19+
public string Filter
20+
{
21+
get { return Path.Combine(Dir, txtFilename.Text); }
22+
}
23+
24+
private void BtnOk_Click(object sender, System.EventArgs e)
25+
{
26+
Close();
27+
}
28+
}
29+
}

‎Analogy/Forms/EditFilePooling.resx

+120
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,120 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<root>
3+
<!--
4+
Microsoft ResX Schema
5+
6+
Version 2.0
7+
8+
The primary goals of this format is to allow a simple XML format
9+
that is mostly human readable. The generation and parsing of the
10+
various data types are done through the TypeConverter classes
11+
associated with the data types.
12+
13+
Example:
14+
15+
... ado.net/XML headers & schema ...
16+
<resheader name="resmimetype">text/microsoft-resx</resheader>
17+
<resheader name="version">2.0</resheader>
18+
<resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
19+
<resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
20+
<data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
21+
<data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
22+
<data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
23+
<value>[base64 mime encoded serialized .NET Framework object]</value>
24+
</data>
25+
<data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
26+
<value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
27+
<comment>This is a comment</comment>
28+
</data>
29+
30+
There are any number of "resheader" rows that contain simple
31+
name/value pairs.
32+
33+
Each data row contains a name, and value. The row also contains a
34+
type or mimetype. Type corresponds to a .NET class that support
35+
text/value conversion through the TypeConverter architecture.
36+
Classes that don't support this are serialized and stored with the
37+
mimetype set.
38+
39+
The mimetype is used for serialized objects, and tells the
40+
ResXResourceReader how to depersist the object. This is currently not
41+
extensible. For a given mimetype the value must be set accordingly:
42+
43+
Note - application/x-microsoft.net.object.binary.base64 is the format
44+
that the ResXResourceWriter will generate, however the reader can
45+
read any of the formats listed below.
46+
47+
mimetype: application/x-microsoft.net.object.binary.base64
48+
value : The object must be serialized with
49+
: System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
50+
: and then encoded with base64 encoding.
51+
52+
mimetype: application/x-microsoft.net.object.soap.base64
53+
value : The object must be serialized with
54+
: System.Runtime.Serialization.Formatters.Soap.SoapFormatter
55+
: and then encoded with base64 encoding.
56+
57+
mimetype: application/x-microsoft.net.object.bytearray.base64
58+
value : The object must be serialized into a byte array
59+
: using a System.ComponentModel.TypeConverter
60+
: and then encoded with base64 encoding.
61+
-->
62+
<xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
63+
<xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
64+
<xsd:element name="root" msdata:IsDataSet="true">
65+
<xsd:complexType>
66+
<xsd:choice maxOccurs="unbounded">
67+
<xsd:element name="metadata">
68+
<xsd:complexType>
69+
<xsd:sequence>
70+
<xsd:element name="value" type="xsd:string" minOccurs="0" />
71+
</xsd:sequence>
72+
<xsd:attribute name="name" use="required" type="xsd:string" />
73+
<xsd:attribute name="type" type="xsd:string" />
74+
<xsd:attribute name="mimetype" type="xsd:string" />
75+
<xsd:attribute ref="xml:space" />
76+
</xsd:complexType>
77+
</xsd:element>
78+
<xsd:element name="assembly">
79+
<xsd:complexType>
80+
<xsd:attribute name="alias" type="xsd:string" />
81+
<xsd:attribute name="name" type="xsd:string" />
82+
</xsd:complexType>
83+
</xsd:element>
84+
<xsd:element name="data">
85+
<xsd:complexType>
86+
<xsd:sequence>
87+
<xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
88+
<xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
89+
</xsd:sequence>
90+
<xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
91+
<xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
92+
<xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
93+
<xsd:attribute ref="xml:space" />
94+
</xsd:complexType>
95+
</xsd:element>
96+
<xsd:element name="resheader">
97+
<xsd:complexType>
98+
<xsd:sequence>
99+
<xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
100+
</xsd:sequence>
101+
<xsd:attribute name="name" type="xsd:string" use="required" />
102+
</xsd:complexType>
103+
</xsd:element>
104+
</xsd:choice>
105+
</xsd:complexType>
106+
</xsd:element>
107+
</xsd:schema>
108+
<resheader name="resmimetype">
109+
<value>text/microsoft-resx</value>
110+
</resheader>
111+
<resheader name="version">
112+
<value>2.0</value>
113+
</resheader>
114+
<resheader name="reader">
115+
<value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
116+
</resheader>
117+
<resheader name="writer">
118+
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
119+
</resheader>
120+
</root>

‎Analogy/Forms/FluentDesignMainForm.cs

+5-3
Original file line numberDiff line numberDiff line change
@@ -848,11 +848,11 @@ void OpenExternalDataSource(string titleOfDataSource, IAnalogyOfflineDataProvide
848848
dockManager1.ActivePanel = page;
849849
}
850850

851-
async Task OpenFilePooling(string titleOfDataSource, string initialFolder, string file)
851+
async Task OpenFilePooling(string titleOfDataSource, string initialFolder, string file, string initialFile)
852852
{
853853
openedWindows++;
854854
await FactoriesManager.Instance.InitializeIfNeeded(offlineAnalogy);
855-
UserControl filepoolingUC = new FilePoolingUCLogs(offlineAnalogy, file, initialFolder);
855+
UserControl filepoolingUC = new FilePoolingUCLogs(offlineAnalogy, file, initialFile, initialFolder);
856856
var page = dockManager1.AddPanel(DockingStyle.Float);
857857
page.DockedAsTabbedDocument = true;
858858

@@ -1006,7 +1006,9 @@ void OnXtcLogsOnControlRemoved(object sender, DockPanelEventArgs arg)
10061006
};
10071007
if (openFileDialog1.ShowDialog() == DialogResult.OK)
10081008
{
1009-
await OpenFilePooling(title, offlineAnalogy.InitialFolderFullPath, openFileDialog1.FileName);
1009+
EditFilePooling efp = new EditFilePooling(openFileDialog1.FileName);
1010+
efp.ShowDialog();
1011+
await OpenFilePooling(title, offlineAnalogy.InitialFolderFullPath, efp.Filter, openFileDialog1.FileName);
10101012
AddRecentFiles(recentfiles, offlineAnalogy, title,
10111013
new List<string> { openFileDialog1.FileName });
10121014
}

‎Analogy/Forms/MainForm.cs

+10-6
Original file line numberDiff line numberDiff line change
@@ -1488,12 +1488,12 @@ async Task OpenExternalDataSource(string titleOfDataSource, IAnalogyOfflineDataP
14881488
}
14891489

14901490
async Task OpenFilePooling(string titleOfDataSource, IAnalogyOfflineDataProvider dataProvider,
1491-
string initialFolder, string file)
1491+
string initialFolder, string file, string initialFile)
14921492
{
14931493

14941494
OpenedWindows++;
14951495
await FactoriesManager.Instance.InitializeIfNeeded(dataProvider);
1496-
UserControl filepoolingUC = new FilePoolingUCLogs(dataProvider, file, initialFolder);
1496+
UserControl filepoolingUC = new FilePoolingUCLogs(dataProvider, file, initialFile, initialFolder);
14971497
var page = dockManager1.AddPanel(DockingStyle.Float);
14981498
page.DockedAsTabbedDocument = true;
14991499

@@ -1706,8 +1706,10 @@ await OpenOffline(dataProvider.OptionalTitle, dataProvider,
17061706
};
17071707
if (openFileDialog1.ShowDialog() == DialogResult.OK)
17081708
{
1709+
EditFilePooling efp = new EditFilePooling(openFileDialog1.FileName);
1710+
efp.ShowDialog();
17091711
await OpenFilePooling(dataProvider.OptionalTitle, dataProvider,
1710-
dataProvider.InitialFolderFullPath, openFileDialog1.FileName);
1712+
dataProvider.InitialFolderFullPath, efp.Filter, openFileDialog1.FileName);
17111713
AddRecentFiles(ribbonPage, recentBar, dataProvider, dataProvider.OptionalTitle,
17121714
new List<string> { openFileDialog1.FileName });
17131715
}
@@ -1850,11 +1852,11 @@ async Task OpenExternalDataSource(string titleOfDataSource, IAnalogyOfflineDataP
18501852

18511853
}
18521854

1853-
void OpenFilePooling(string titleOfDataSource, string initialFolder, string file)
1855+
void OpenFilePooling(string titleOfDataSource, string initialFolder, string file, string initialFile)
18541856
{
18551857

18561858
OpenedWindows++;
1857-
UserControl filepoolingUC = new FilePoolingUCLogs(offlineAnalogy, file, initialFolder);
1859+
UserControl filepoolingUC = new FilePoolingUCLogs(offlineAnalogy, file, initialFile, initialFolder);
18581860
var page = dockManager1.AddPanel(DockingStyle.Float);
18591861
page.DockedAsTabbedDocument = true;
18601862

@@ -2002,7 +2004,9 @@ void OnXtcLogsOnControlRemoved(object sender, DockPanelEventArgs arg)
20022004
};
20032005
if (openFileDialog1.ShowDialog() == DialogResult.OK)
20042006
{
2005-
OpenFilePooling(title, offlineAnalogy.InitialFolderFullPath, openFileDialog1.FileName);
2007+
EditFilePooling efp = new EditFilePooling(openFileDialog1.FileName);
2008+
efp.ShowDialog();
2009+
OpenFilePooling(title, offlineAnalogy.InitialFolderFullPath, efp.Filter, openFileDialog1.FileName);
20062010
AddRecentFiles(ribbonPage, recentBar, offlineAnalogy, title,
20072011
new List<string> { openFileDialog1.FileName });
20082012
}

0 commit comments

Comments
 (0)