Skip to content

Commit

Permalink
Merge pull request #1680 from pybride/PoolingRolling2
Browse files Browse the repository at this point in the history
Pooling for rolling files
  • Loading branch information
LiorBanai committed Mar 31, 2023
2 parents ee3592a + 5487e00 commit 14c212c
Show file tree
Hide file tree
Showing 9 changed files with 426 additions and 145 deletions.
96 changes: 96 additions & 0 deletions Analogy/Forms/EditFilePooling.Designer.cs

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

26 changes: 26 additions & 0 deletions Analogy/Forms/EditFilePooling.cs
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
using System.IO;
using System.Windows.Forms;

namespace Analogy.Forms
{
public partial class EditFilePooling : DevExpress.XtraEditors.XtraForm
{
public EditFilePooling(string fileName)
{
InitializeComponent();
Icon = UserSettingsManager.UserSettings.GetIcon();
Dir = Path.GetDirectoryName(fileName) ?? string.Empty;
txtFilename.Text = Path.GetFileName(fileName);
}


public string Dir { get; set; }

public string Filter => Path.Combine(Dir, txtFilename.Text);

private void BtnOk_Click(object sender, System.EventArgs e)
{
Close();
}
}
}
120 changes: 120 additions & 0 deletions Analogy/Forms/EditFilePooling.resx
Original file line number Diff line number Diff line change
@@ -0,0 +1,120 @@
<?xml version="1.0" encoding="utf-8"?>
<root>
<!--
Microsoft ResX Schema
Version 2.0
The primary goals of this format is to allow a simple XML format
that is mostly human readable. The generation and parsing of the
various data types are done through the TypeConverter classes
associated with the data types.
Example:
... ado.net/XML headers & schema ...
<resheader name="resmimetype">text/microsoft-resx</resheader>
<resheader name="version">2.0</resheader>
<resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
<resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
<data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
<data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
<data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
<value>[base64 mime encoded serialized .NET Framework object]</value>
</data>
<data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
<comment>This is a comment</comment>
</data>
There are any number of "resheader" rows that contain simple
name/value pairs.
Each data row contains a name, and value. The row also contains a
type or mimetype. Type corresponds to a .NET class that support
text/value conversion through the TypeConverter architecture.
Classes that don't support this are serialized and stored with the
mimetype set.
The mimetype is used for serialized objects, and tells the
ResXResourceReader how to depersist the object. This is currently not
extensible. For a given mimetype the value must be set accordingly:
Note - application/x-microsoft.net.object.binary.base64 is the format
that the ResXResourceWriter will generate, however the reader can
read any of the formats listed below.
mimetype: application/x-microsoft.net.object.binary.base64
value : The object must be serialized with
: System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
: and then encoded with base64 encoding.
mimetype: application/x-microsoft.net.object.soap.base64
value : The object must be serialized with
: System.Runtime.Serialization.Formatters.Soap.SoapFormatter
: and then encoded with base64 encoding.
mimetype: application/x-microsoft.net.object.bytearray.base64
value : The object must be serialized into a byte array
: using a System.ComponentModel.TypeConverter
: and then encoded with base64 encoding.
-->
<xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
<xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
<xsd:element name="root" msdata:IsDataSet="true">
<xsd:complexType>
<xsd:choice maxOccurs="unbounded">
<xsd:element name="metadata">
<xsd:complexType>
<xsd:sequence>
<xsd:element name="value" type="xsd:string" minOccurs="0" />
</xsd:sequence>
<xsd:attribute name="name" use="required" type="xsd:string" />
<xsd:attribute name="type" type="xsd:string" />
<xsd:attribute name="mimetype" type="xsd:string" />
<xsd:attribute ref="xml:space" />
</xsd:complexType>
</xsd:element>
<xsd:element name="assembly">
<xsd:complexType>
<xsd:attribute name="alias" type="xsd:string" />
<xsd:attribute name="name" type="xsd:string" />
</xsd:complexType>
</xsd:element>
<xsd:element name="data">
<xsd:complexType>
<xsd:sequence>
<xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
<xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
</xsd:sequence>
<xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
<xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
<xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
<xsd:attribute ref="xml:space" />
</xsd:complexType>
</xsd:element>
<xsd:element name="resheader">
<xsd:complexType>
<xsd:sequence>
<xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
</xsd:sequence>
<xsd:attribute name="name" type="xsd:string" use="required" />
</xsd:complexType>
</xsd:element>
</xsd:choice>
</xsd:complexType>
</xsd:element>
</xsd:schema>
<resheader name="resmimetype">
<value>text/microsoft-resx</value>
</resheader>
<resheader name="version">
<value>2.0</value>
</resheader>
<resheader name="reader">
<value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
<resheader name="writer">
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
</root>
8 changes: 5 additions & 3 deletions Analogy/Forms/FluentDesignMainForm.cs
Original file line number Diff line number Diff line change
Expand Up @@ -848,11 +848,11 @@ void OpenExternalDataSource(string titleOfDataSource, IAnalogyOfflineDataProvide
dockManager1.ActivePanel = page;
}

async Task OpenFilePooling(string titleOfDataSource, string initialFolder, string file)
async Task OpenFilePooling(string titleOfDataSource, string initialFolder, string file, string initialFile)
{
openedWindows++;
await FactoriesManager.Instance.InitializeIfNeeded(offlineAnalogy);
UserControl filepoolingUC = new FilePoolingUCLogs(offlineAnalogy, file, initialFolder);
UserControl filepoolingUC = new FilePoolingUCLogs(offlineAnalogy, file, initialFile, initialFolder);
var page = dockManager1.AddPanel(DockingStyle.Float);
page.DockedAsTabbedDocument = true;

Expand Down Expand Up @@ -1006,7 +1006,9 @@ void OnXtcLogsOnControlRemoved(object sender, DockPanelEventArgs arg)
};
if (openFileDialog1.ShowDialog() == DialogResult.OK)
{
await OpenFilePooling(title, offlineAnalogy.InitialFolderFullPath, openFileDialog1.FileName);
EditFilePooling efp = new EditFilePooling(openFileDialog1.FileName);
efp.ShowDialog(this);
await OpenFilePooling(title, offlineAnalogy.InitialFolderFullPath, efp.Filter, openFileDialog1.FileName);
AddRecentFiles(recentfiles, offlineAnalogy, title,
new List<string> { openFileDialog1.FileName });
}
Expand Down
16 changes: 10 additions & 6 deletions Analogy/Forms/MainForm.cs
Original file line number Diff line number Diff line change
Expand Up @@ -1488,12 +1488,12 @@ async Task OpenExternalDataSource(string titleOfDataSource, IAnalogyOfflineDataP
}

async Task OpenFilePooling(string titleOfDataSource, IAnalogyOfflineDataProvider dataProvider,
string initialFolder, string file)
string initialFolder, string file, string initialFile)
{

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

Expand Down Expand Up @@ -1706,8 +1706,10 @@ void OnXtcLogsOnControlRemoved(object sender, DockPanelEventArgs arg)
};
if (openFileDialog1.ShowDialog() == DialogResult.OK)
{
EditFilePooling efp = new EditFilePooling(openFileDialog1.FileName);
efp.ShowDialog(this);
await OpenFilePooling(dataProvider.OptionalTitle, dataProvider,
dataProvider.InitialFolderFullPath, openFileDialog1.FileName);
dataProvider.InitialFolderFullPath, efp.Filter, openFileDialog1.FileName);
AddRecentFiles(ribbonPage, recentBar, dataProvider, dataProvider.OptionalTitle,
new List<string> { openFileDialog1.FileName });
}
Expand Down Expand Up @@ -1850,11 +1852,11 @@ async Task OpenExternalDataSource(string titleOfDataSource, IAnalogyOfflineDataP

}

void OpenFilePooling(string titleOfDataSource, string initialFolder, string file)
void OpenFilePooling(string titleOfDataSource, string initialFolder, string file, string initialFile)
{

OpenedWindows++;
UserControl filepoolingUC = new FilePoolingUCLogs(offlineAnalogy, file, initialFolder);
UserControl filepoolingUC = new FilePoolingUCLogs(offlineAnalogy, file, initialFile, initialFolder);
var page = dockManager1.AddPanel(DockingStyle.Float);
page.DockedAsTabbedDocument = true;

Expand Down Expand Up @@ -2002,7 +2004,9 @@ void OnXtcLogsOnControlRemoved(object sender, DockPanelEventArgs arg)
};
if (openFileDialog1.ShowDialog() == DialogResult.OK)
{
OpenFilePooling(title, offlineAnalogy.InitialFolderFullPath, openFileDialog1.FileName);
EditFilePooling efp = new EditFilePooling(openFileDialog1.FileName);
efp.ShowDialog(this);
OpenFilePooling(title, offlineAnalogy.InitialFolderFullPath, efp.Filter, openFileDialog1.FileName);
AddRecentFiles(ribbonPage, recentBar, offlineAnalogy, title,
new List<string> { openFileDialog1.FileName });
}
Expand Down
Loading

0 comments on commit 14c212c

Please sign in to comment.