Skip to content

Commit

Permalink
1.8.4-0.0.2
Browse files Browse the repository at this point in the history
   * added "Microbial Furnaces", "Advanced Catalysers" and "Resonating Separators" as commodity
   * added missing Dataset "dsCommodities" and class "enumBindTo" to repositiory (relevant for compiling source)
  • Loading branch information
Duke-Jones committed Feb 5, 2015
1 parent d6ba7b6 commit be45f5d
Show file tree
Hide file tree
Showing 11 changed files with 1,339 additions and 4 deletions.
15 changes: 15 additions & 0 deletions RegulatedNoise/Data/Commodities.xml
Original file line number Diff line number Diff line change
Expand Up @@ -385,6 +385,21 @@
<ger>Indium</ger>
<fra>Indium</fra>
</Names>
<Names>
<eng>Microbial Furnaces</eng>
<ger>Mikrobielle Öfen</ger>
<fra>Hauts Fourneaux Microbiens</fra>
</Names>
<Names>
<eng>Advanced Catalysers</eng>
<ger>Fortschr. Katalysatoren</ger>
<fra>Catalyseurs Complexes</fra>
</Names>
<Names>
<eng>Resonating Separators</eng>
<ger>Resonanzbegrenzer</ger>
<fra>Séparateurs à Résonance</fra>
</Names>
<Levels>
<ID>0</ID>
<eng>low</eng>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ public class RegulatedNoiseSettings
public bool AutoImport = false;
public bool TestMode = false;
public bool AutoUppercase = true;
public string TraineddataFile = "eng";
public string TraineddataFile = "big";
public enLanguage Language = enLanguage.eng;


Expand Down
1,164 changes: 1,164 additions & 0 deletions RegulatedNoise/Enums and Utility Classes/dsCommodities.Designer.cs

Large diffs are not rendered by default.

12 changes: 12 additions & 0 deletions RegulatedNoise/Enums and Utility Classes/dsCommodities.cs
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
namespace RegulatedNoise.Enums_and_Utility_Classes {


public partial class dsCommodities {
}
}
namespace RegulatedNoise.Enums_and_Utility_Classes {


public partial class dsCommodities {
}
}
9 changes: 9 additions & 0 deletions RegulatedNoise/Enums and Utility Classes/dsCommodities.xsc
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
<?xml version="1.0" encoding="utf-8"?>
<!--<autogenerated>
This code was generated by a tool.
Changes to this file may cause incorrect behavior and will be lost if
the code is regenerated.
</autogenerated>-->
<DataSetUISetting Version="1.00" xmlns="urn:schemas-microsoft-com:xml-msdatasource">
<TableUISettings />
</DataSetUISetting>
41 changes: 41 additions & 0 deletions RegulatedNoise/Enums and Utility Classes/dsCommodities.xsd
Original file line number Diff line number Diff line change
@@ -0,0 +1,41 @@
<?xml version="1.0" encoding="utf-8"?>
<xs:schema id="dsCommodities" targetNamespace="http://tempuri.org/dsCommodities.xsd" xmlns:mstns="http://tempuri.org/dsCommodities.xsd" xmlns="http://tempuri.org/dsCommodities.xsd" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata" xmlns:msprop="urn:schemas-microsoft-com:xml-msprop" attributeFormDefault="qualified" elementFormDefault="qualified">
<xs:annotation>
<xs:appinfo source="urn:schemas-microsoft-com:xml-msdatasource">
<DataSource DefaultConnectionIndex="0" FunctionsComponentName="QueriesTableAdapter" Modifier="AutoLayout, AnsiClass, Class, Public" SchemaSerializationMode="IncludeSchema" xmlns="urn:schemas-microsoft-com:xml-msdatasource">
<Connections />
<Tables />
<Sources />
</DataSource>
</xs:appinfo>
</xs:annotation>
<xs:element name="dsCommodities" msdata:IsDataSet="true" msdata:UseCurrentLocale="true" msprop:EnableTableAdapterManager="true" msprop:Generator_DataSetName="dsCommodities" msprop:Generator_UserDSName="dsCommodities">
<xs:complexType>
<xs:choice minOccurs="0" maxOccurs="unbounded">
<xs:element name="Names" msprop:Generator_TableClassName="NamesDataTable" msprop:Generator_TableVarName="tableNames" msprop:Generator_RowChangedName="NamesRowChanged" msprop:Generator_TablePropName="Names" msprop:Generator_RowDeletingName="NamesRowDeleting" msprop:Generator_RowChangingName="NamesRowChanging" msprop:Generator_RowEvHandlerName="NamesRowChangeEventHandler" msprop:Generator_RowDeletedName="NamesRowDeleted" msprop:Generator_RowClassName="NamesRow" msprop:Generator_UserTableName="Names" msprop:Generator_RowEvArgName="NamesRowChangeEvent">
<xs:complexType>
<xs:sequence>
<xs:element name="eng" msprop:nullValue="_empty" msprop:Generator_ColumnPropNameInRow="eng" msprop:Generator_ColumnVarNameInTable="columneng" msprop:Generator_ColumnPropNameInTable="engColumn" msprop:Generator_UserColumnName="eng" type="xs:string" minOccurs="0" />
<xs:element name="ger" msprop:nullValue="_empty" msprop:Generator_ColumnPropNameInRow="ger" msprop:Generator_ColumnVarNameInTable="columnger" msprop:Generator_ColumnPropNameInTable="gerColumn" msprop:Generator_UserColumnName="ger" type="xs:string" minOccurs="0" />
<xs:element name="fra" msprop:nullValue="_empty" msprop:Generator_ColumnPropNameInRow="fra" msprop:Generator_ColumnVarNameInTable="columnfra" msprop:Generator_ColumnPropNameInTable="fraColumn" msprop:Generator_UserColumnName="fra" type="xs:string" minOccurs="0" />
</xs:sequence>
</xs:complexType>
</xs:element>
<xs:element name="Levels" msprop:Generator_TableClassName="LevelsDataTable" msprop:Generator_TableVarName="tableLevels" msprop:Generator_RowChangedName="LevelsRowChanged" msprop:Generator_TablePropName="Levels" msprop:Generator_RowDeletingName="LevelsRowDeleting" msprop:Generator_RowChangingName="LevelsRowChanging" msprop:Generator_RowEvHandlerName="LevelsRowChangeEventHandler" msprop:Generator_RowDeletedName="LevelsRowDeleted" msprop:Generator_RowClassName="LevelsRow" msprop:Generator_UserTableName="Levels" msprop:Generator_RowEvArgName="LevelsRowChangeEvent">
<xs:complexType>
<xs:sequence>
<xs:element name="ID" msprop:Generator_ColumnVarNameInTable="columnID" msprop:Generator_ColumnPropNameInRow="ID" msprop:Generator_ColumnPropNameInTable="IDColumn" msprop:Generator_UserColumnName="ID" type="xs:unsignedByte" />
<xs:element name="eng" msprop:Generator_ColumnVarNameInTable="columneng" msprop:Generator_ColumnPropNameInRow="eng" msprop:Generator_ColumnPropNameInTable="engColumn" msprop:Generator_UserColumnName="eng" type="xs:string" minOccurs="0" />
<xs:element name="ger" msprop:Generator_ColumnVarNameInTable="columnger" msprop:Generator_ColumnPropNameInRow="ger" msprop:Generator_ColumnPropNameInTable="gerColumn" msprop:Generator_UserColumnName="ger" type="xs:string" minOccurs="0" />
<xs:element name="fra" msprop:Generator_ColumnVarNameInTable="columnfra" msprop:Generator_ColumnPropNameInRow="fra" msprop:Generator_ColumnPropNameInTable="fraColumn" msprop:Generator_UserColumnName="fra" type="xs:string" minOccurs="0" />
</xs:sequence>
</xs:complexType>
</xs:element>
</xs:choice>
</xs:complexType>
<xs:unique name="LevelsKey1" msdata:PrimaryKey="true">
<xs:selector xpath=".//mstns:Levels" />
<xs:field xpath="mstns:ID" />
</xs:unique>
</xs:element>
</xs:schema>
13 changes: 13 additions & 0 deletions RegulatedNoise/Enums and Utility Classes/dsCommodities.xss
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
<?xml version="1.0" encoding="utf-8"?>
<!--<autogenerated>
This code was generated by a tool to store the dataset designer's layout information.
Changes to this file may cause incorrect behavior and will be lost if
the code is regenerated.
</autogenerated>-->
<DiagramLayout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema" ex:showrelationlabel="False" ViewPortX="0" ViewPortY="0" xmlns:ex="urn:schemas-microsoft-com:xml-msdatasource-layout-extended" xmlns="urn:schemas-microsoft-com:xml-msdatasource-layout">
<Shapes>
<Shape ID="DesignTable:Names" ZOrder="2" X="151" Y="149" Height="86" Width="150" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="82" />
<Shape ID="DesignTable:Levels" ZOrder="1" X="328" Y="151" Height="105" Width="150" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="101" />
</Shapes>
<Connectors />
</DiagramLayout>
31 changes: 31 additions & 0 deletions RegulatedNoise/Enums and Utility Classes/enumBindTo.cs
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
using System;

// <summary>
// helperclass for binding comboboxes to enumerations
// </summary>
// <remarks></remarks>
public class enumBindTo{

private Int32 m_EnumValue; // enum value
private string m_EnumString; // text showing in combobox

public Int32 EnumValue{
get{
return m_EnumValue;
}
set{
m_EnumValue = value;
}
}

public string EnumString
{
get{
return m_EnumString;
}
set{
m_EnumString = value;
}
}

}
2 changes: 1 addition & 1 deletion RegulatedNoise/Form1.cs
Original file line number Diff line number Diff line change
Expand Up @@ -623,7 +623,7 @@ private void ApplySettings()
cbAutoUppercase.Checked = RegulatedNoiseSettings.AutoUppercase;
if (RegulatedNoiseSettings.TraineddataFile == String.Empty)
{
RegulatedNoiseSettings.TraineddataFile = "eng";
RegulatedNoiseSettings.TraineddataFile = "big";
}
txtTraineddataFile.Text = RegulatedNoiseSettings.TraineddataFile;

Expand Down
3 changes: 1 addition & 2 deletions RegulatedNoise/RegulatedNoise.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -616,8 +616,7 @@
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</None>
<EmbeddedResource Include="Resources\m.png" />
<Compile Include="Enums and Utility Classes\EnumBinder.cs" />
<Content Include="newOfDuke\ToDo.txt" />
<Compile Include="Enums and Utility Classes\enumBindTo.cs" />
<Content Include="x64\liblept168.dll">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</Content>
Expand Down
51 changes: 51 additions & 0 deletions ToDo.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,51 @@
todo:
* suppress "working..." as unknown commodity


***********************************************************************************


-------------------------------------------------------------------------------------
1.8.4-0.0.2
* added "Microbial Furnaces", "Advanced Catalysers" and "Resonating Separators" as commodity
* added missing Dataset "dsCommodities" and class "enumBindTo" to repositiory (relevant for compiling source)
-------------------------------------------------------------------------------------
1.8.4-0.0.1
* language selection (english-german-french)
* immediately autosave if data changed (prices, commodities, some settings)
* invoking crash bug fixed while OCR
* used traineddata-file vom OCR is selectable
* EDDN reactivated if language is english
* fixed commodity base for better OCR (language dependent), possibility to add new commodities if confirmed
* bug fixed while ocr notification
* recognition of levels "high/medium/low" corrected (language dependent)
* behavior of "AutoUppercase"-Checkbox corrected
-------------------------------------------------------------------------------------
1.8.4-0.0.0
* changes merged based on 1.8.4
* update-hint of original added again
-------------------------------------------------------------------------------------
1.8.2-1.0.4
* update-hint of original removed
* EDDN deactivated (please use english original due to different language dependent names)
* behavior of "clear Results" button after ocr corrected
* stateful enabling of ocr buttons
* recognition of stations: level for Levenshtein algorithm depends on the length of the name
-------------------------------------------------------------------------------------
1.8.2-1.0.3
* optimized filter-processing for screenshots before ocr (tested on commandline tesseractOCR)
* bug while procesing the results from EliteBrainerous removed
* "really" empty strings will be ignored
* level for Levenshtein algorithm depends on the length of the word
* base dictionary adapted ffor german
-------------------------------------------------------------------------------------
1.8.2-1.0.2
* optional "auto-uppercasing" saved in global settings
* added personal changelog/todo
-------------------------------------------------------------------------------------
1.8.2-1.0.1
* optional "auto-uppercasing" checkbox during ocr-correction added
* button "Ignore As Trash" during ocr-correction added
-------------------------------------------------------------------------------------
1.8.2-1.0.0
* initial version from Git-Hub

0 comments on commit be45f5d

Please sign in to comment.