Skip to content

Commit

Permalink
Merged PR 62: Release 3
Browse files Browse the repository at this point in the history 
* Emergency fix for Lazy Loading bug.

Related work items: #304
  • Loading branch information
@MikeWilliams-UK
MikeWilliams-UK committed Feb 15, 2018
2 parents 6701203 + 07e3cfb commit 295d482
Show file tree
Hide file tree
Showing 33 changed files with 170 additions and 70 deletions.
70 changes: 57 additions & 13 deletions src/Chem4Word.V3/Chem4WordV3.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -314,6 +314,7 @@ public void LoadOptions()
}
else
{
SystemOptions = new Options();
SystemOptions.RestoreDefaults();
string temp = JsonConvert.SerializeObject(SystemOptions, Formatting.Indented);
// Check again before writing just in case two versions of word started at the same time
Expand Down Expand Up @@ -956,9 +957,13 @@ private void OnCommandBarButtonClick(CommandBarButton ctrl, ref bool cancelDefau
}
catch (Exception ex)
{
if (SystemOptions == null)
{
LoadOptions();
}
new ReportError(Telemetry, WordTopLeft, module, ex).ShowDialog();
UpdateHelper.ClearSettings();
UpdateHelper.CheckForUpdates(Globals.Chem4WordV3.SystemOptions.AutoUpdateFrequency);
UpdateHelper.CheckForUpdates(SystemOptions.AutoUpdateFrequency);
}
}

Expand Down Expand Up @@ -1170,6 +1175,10 @@ public static void Insert1DChemistry(string xml, string text, bool is2D, bool is

if (is2D)
{
if (Globals.Chem4WordV3.SystemOptions == null)
{
Globals.Chem4WordV3.LoadOptions();
}
Globals.Chem4WordV3.SystemOptions.WordTopLeft = Globals.Chem4WordV3.WordTopLeft;

IChem4WordRenderer renderer =
Expand Down Expand Up @@ -1268,7 +1277,7 @@ private void OnNewDocument(Word.Document doc)
}
new ReportError(Telemetry, WordTopLeft, module, ex).ShowDialog();
UpdateHelper.ClearSettings();
UpdateHelper.CheckForUpdates(Globals.Chem4WordV3.SystemOptions.AutoUpdateFrequency);
UpdateHelper.CheckForUpdates(SystemOptions.AutoUpdateFrequency);
}
}

Expand Down Expand Up @@ -1440,7 +1449,7 @@ private void OnDocumentChange()

new ReportError(Telemetry, WordTopLeft, module, ex).ShowDialog();
UpdateHelper.ClearSettings();
UpdateHelper.CheckForUpdates(Globals.Chem4WordV3.SystemOptions.AutoUpdateFrequency);
UpdateHelper.CheckForUpdates(SystemOptions.AutoUpdateFrequency);
}
}

Expand All @@ -1460,7 +1469,12 @@ private void OnDocumentOpen(Word.Document doc)
{
new ReportError(Telemetry, WordTopLeft, module, ex).ShowDialog();
UpdateHelper.ClearSettings();
UpdateHelper.CheckForUpdates(Globals.Chem4WordV3.SystemOptions.AutoUpdateFrequency);
if (SystemOptions == null)
{
LoadOptions();
}

UpdateHelper.CheckForUpdates(SystemOptions.AutoUpdateFrequency);
}
}

Expand Down Expand Up @@ -1507,7 +1521,12 @@ private void OnDocumentBeforeSave(Word.Document doc, ref bool saveAsUi, ref bool
{
new ReportError(Telemetry, WordTopLeft, module, ex).ShowDialog();
UpdateHelper.ClearSettings();
UpdateHelper.CheckForUpdates(Globals.Chem4WordV3.SystemOptions.AutoUpdateFrequency);
if (SystemOptions == null)
{
LoadOptions();
}

UpdateHelper.CheckForUpdates(SystemOptions.AutoUpdateFrequency);
}
}

Expand Down Expand Up @@ -1554,7 +1573,12 @@ private void OnDocumentBeforeClose(Word.Document doc, ref bool cancel)
{
new ReportError(Telemetry, WordTopLeft, module, ex).ShowDialog();
UpdateHelper.ClearSettings();
UpdateHelper.CheckForUpdates(Globals.Chem4WordV3.SystemOptions.AutoUpdateFrequency);
if (SystemOptions == null)
{
LoadOptions();
}

UpdateHelper.CheckForUpdates(SystemOptions.AutoUpdateFrequency);
}
}

Expand Down Expand Up @@ -1615,7 +1639,7 @@ private void OnWindowSelectionChange(Word.Selection sel)

new ReportError(Telemetry, WordTopLeft, module, ex).ShowDialog();
UpdateHelper.ClearSettings();
UpdateHelper.CheckForUpdates(Globals.Chem4WordV3.SystemOptions.AutoUpdateFrequency);
UpdateHelper.CheckForUpdates(SystemOptions.AutoUpdateFrequency);
}
}

Expand Down Expand Up @@ -1983,7 +2007,7 @@ private void OnWindowBeforeDoubleClick(Word.Selection sel, ref bool cancel)

new ReportError(Telemetry, WordTopLeft, module, ex).ShowDialog();
UpdateHelper.ClearSettings();
UpdateHelper.CheckForUpdates(Globals.Chem4WordV3.SystemOptions.AutoUpdateFrequency);
UpdateHelper.CheckForUpdates(SystemOptions.AutoUpdateFrequency);
}
}

Expand Down Expand Up @@ -2014,7 +2038,7 @@ private void OnWindowActivate(Word.Document doc, Word.Window win)

new ReportError(Telemetry, WordTopLeft, module, ex).ShowDialog();
UpdateHelper.ClearSettings();
UpdateHelper.CheckForUpdates(Globals.Chem4WordV3.SystemOptions.AutoUpdateFrequency);
UpdateHelper.CheckForUpdates(SystemOptions.AutoUpdateFrequency);
}
}

Expand Down Expand Up @@ -2079,7 +2103,12 @@ private void OnContentControlAfterAdd(Word.ContentControl NewContentControl, boo
{
new ReportError(Telemetry, WordTopLeft, module, ex).ShowDialog();
UpdateHelper.ClearSettings();
UpdateHelper.CheckForUpdates(Globals.Chem4WordV3.SystemOptions.AutoUpdateFrequency);
if (SystemOptions == null)
{
LoadOptions();
}

UpdateHelper.CheckForUpdates(SystemOptions.AutoUpdateFrequency);
}
}

Expand All @@ -2105,7 +2134,12 @@ private void OnContentControlBeforeDelete(Word.ContentControl contentControl, bo
{
new ReportError(Telemetry, WordTopLeft, module, ex).ShowDialog();
UpdateHelper.ClearSettings();
UpdateHelper.CheckForUpdates(Globals.Chem4WordV3.SystemOptions.AutoUpdateFrequency);
if (SystemOptions == null)
{
LoadOptions();
}

UpdateHelper.CheckForUpdates(SystemOptions.AutoUpdateFrequency);
}
}

Expand Down Expand Up @@ -2139,7 +2173,12 @@ private void OnContentControlOnExit(Word.ContentControl contentControl, ref bool
{
new ReportError(Telemetry, WordTopLeft, module, ex).ShowDialog();
UpdateHelper.ClearSettings();
UpdateHelper.CheckForUpdates(Globals.Chem4WordV3.SystemOptions.AutoUpdateFrequency);
if (SystemOptions == null)
{
LoadOptions();
}

UpdateHelper.CheckForUpdates(SystemOptions.AutoUpdateFrequency);
}
}

Expand Down Expand Up @@ -2175,7 +2214,12 @@ private void OnContentControlOnEnter(Word.ContentControl contentControl)
{
new ReportError(Telemetry, WordTopLeft, module, ex).ShowDialog();
UpdateHelper.ClearSettings();
UpdateHelper.CheckForUpdates(Globals.Chem4WordV3.SystemOptions.AutoUpdateFrequency);
if (SystemOptions == null)
{
LoadOptions();
}

UpdateHelper.CheckForUpdates(SystemOptions.AutoUpdateFrequency);
}
}

Expand Down
11 changes: 10 additions & 1 deletion src/Chem4Word.V3/Data/Chem4Word-Versions.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,16 @@
<!-- This file must be uploaded to https://www.chem4word.co.uk/files3/ folder as Chem4Word-Versions.xml -->
<ChangeLog>
<Id>f3c4f4db-2fff-46db-b14a-feb8e09f7742</Id>
<Version>
<Number>3.0.16 Release 3</Number>
<IsBeta>false</IsBeta>
<Released>15-Feb-2018</Released>
<Changes>
<Change>Emergency Fix for Lazy Loading bug.</Change>
<Change>Please download Chem4Word-Setup.exe from https://github.com/Chem4Word/Version3/releases/latest if you encounter any difficulties updating.</Change>
</Changes>
<Url>https://www.chem4word.co.uk/files3/Chem4Word-Setup.3.0.16.Release.3.msi</Url>
</Version>
<Version>
<Number>3.0.15 Release 2</Number>
<IsBeta>false</IsBeta>
Expand All @@ -15,7 +25,6 @@
<Change>Added field for email address on Error Report form.</Change>
<Change>Now handles MDL MOLfile bond types of 4 to 8.</Change>
<Change>Return DialogResult.Cancel (to abort edit), after failed fetch of structure from ChemDoodle Web editor.</Change>
<Change>Please download Chem4Word-Setup.exe from https://github.com/Chem4Word/Version3/releases/latest if you encounter any difficulties updating.</Change>
</Changes>
<Url>https://www.chem4word.co.uk/files3/Chem4Word-Setup.3.0.15.Release.2.msi</Url>
</Version>
Expand Down
4 changes: 2 additions & 2 deletions src/Chem4Word.V3/Data/This-Version.xml
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<Version>
<Number>3.0.15 Release 2</Number>
<Number>3.0.16 Release 3</Number>
<IsBeta>false</IsBeta>
<Released>14-Feb-2018</Released>
<Released>15-Feb-2018</Released>
</Version>
4 changes: 4 additions & 0 deletions src/Chem4Word.V3/Data/index.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,10 @@ <h1>Chemistry for Word Add-In V3</h1>
<td>Setup Bootstrapper</td>
<td><a href="/files3/Chem4Word-Setup.exe">Chem4Word-Setup</a></td>
</tr>
<tr>
<td>Version 3.0.16 - Release 3</td>
<td><a href="/files3/Chem4Word-Setup.3.0.16.Release.3.msi">Chem4Word-Setup 3.0.16 Release 3</a></td>
</tr>
<tr>
<td>Version 3.0.15 - Release 2</td>
<td><a href="/files3/Chem4Word-Setup.3.0.15.Release.2.msi">Chem4Word-Setup 3.0.15 Release 2</a></td>
Expand Down
5 changes: 4 additions & 1 deletion src/Chem4Word.V3/Navigator/NavigatorSupport.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -85,8 +85,11 @@ public static void InsertChemistry(bool isCopy, Application app, FlexDisplay fle
string guidString = chem.CustomXmlPartGuid;
string bookmarkName = "C4W_" + guidString;

if (Globals.Chem4WordV3.SystemOptions == null)
{
Globals.Chem4WordV3.LoadOptions();
}
Globals.Chem4WordV3.SystemOptions.WordTopLeft = Globals.Chem4WordV3.WordTopLeft;

IChem4WordRenderer renderer =
Globals.Chem4WordV3.GetRendererPlugIn(
Globals.Chem4WordV3.SystemOptions.SelectedRendererPlugIn);
Expand Down
4 changes: 2 additions & 2 deletions src/Chem4Word.V3/Properties/AssemblyInfo.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -35,5 +35,5 @@
// Build Number
// Revision
//
[assembly: AssemblyVersion("3.0.15.6619")]
[assembly: AssemblyFileVersion("3.0.15.6619")]
[assembly: AssemblyVersion("3.0.16.6620")]
[assembly: AssemblyFileVersion("3.0.16.6620")]
36 changes: 32 additions & 4 deletions src/Chem4Word.V3/Ribbon/Chem4WordRibbon.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -130,8 +130,11 @@ private void OnRenderAsButtonClick(object sender, RibbonControlEventArgs e)
if (chosenState.Equals("2D"))
{
string bookmarkName = "C4W_" + guid;
if (Globals.Chem4WordV3.SystemOptions == null)
{
Globals.Chem4WordV3.LoadOptions();
}
Globals.Chem4WordV3.SystemOptions.WordTopLeft = Globals.Chem4WordV3.WordTopLeft;

IChem4WordRenderer renderer =
Globals.Chem4WordV3.GetRendererPlugIn(
Globals.Chem4WordV3.SystemOptions.SelectedRendererPlugIn);
Expand Down Expand Up @@ -339,6 +342,10 @@ private void OnOptionsClick(object sender, RibbonControlEventArgs e)
{
Settings optionsForm = new Settings();

if (Globals.Chem4WordV3.SystemOptions == null)
{
Globals.Chem4WordV3.LoadOptions();
}
Options tempOptions = Globals.Chem4WordV3.SystemOptions.Clone();

optionsForm.SystemOptions = tempOptions;
Expand Down Expand Up @@ -459,8 +466,11 @@ public static void InsertFile()
string guidString = model.CustomXmlPartGuid;
string bookmarkName = "C4W_" + guidString;

if (Globals.Chem4WordV3.SystemOptions == null)
{
Globals.Chem4WordV3.LoadOptions();
}
Globals.Chem4WordV3.SystemOptions.WordTopLeft = Globals.Chem4WordV3.WordTopLeft;

IChem4WordRenderer renderer =
Globals.Chem4WordV3.GetRendererPlugIn(
Globals.Chem4WordV3.SystemOptions.SelectedRendererPlugIn);
Expand Down Expand Up @@ -891,6 +901,10 @@ public static void PerformEdit()
}
}

if (Globals.Chem4WordV3.SystemOptions == null)
{
Globals.Chem4WordV3.LoadOptions();
}
IChem4WordEditor editor =
Globals.Chem4WordV3.GetEditorPlugIn(Globals.Chem4WordV3.SystemOptions.SelectedEditorPlugIn);

Expand Down Expand Up @@ -1105,8 +1119,11 @@ public static void PerformEdit()

string afterCml = cmlConverter.Export(afterModel);

if (Globals.Chem4WordV3.SystemOptions == null)
{
Globals.Chem4WordV3.LoadOptions();
}
Globals.Chem4WordV3.SystemOptions.WordTopLeft = Globals.Chem4WordV3.WordTopLeft;

IChem4WordRenderer renderer =
Globals.Chem4WordV3.GetRendererPlugIn(
Globals.Chem4WordV3.SystemOptions.SelectedRendererPlugIn);
Expand Down Expand Up @@ -1512,8 +1529,11 @@ private void OnSearcherClick(object sender, RibbonControlEventArgs ribbonControl
string guidString = model.CustomXmlPartGuid;
string bookmarkName = "C4W_" + guidString;

if (Globals.Chem4WordV3.SystemOptions == null)
{
Globals.Chem4WordV3.LoadOptions();
}
Globals.Chem4WordV3.SystemOptions.WordTopLeft = Globals.Chem4WordV3.WordTopLeft;

IChem4WordRenderer renderer =
Globals.Chem4WordV3.GetRendererPlugIn(
Globals.Chem4WordV3.SystemOptions.SelectedRendererPlugIn);
Expand Down Expand Up @@ -1907,6 +1927,10 @@ private void OnSeparateClick(object sender, RibbonControlEventArgs e)

string afterCml = cmlConverter.Export(model);

if (Globals.Chem4WordV3.SystemOptions == null)
{
Globals.Chem4WordV3.LoadOptions();
}
IChem4WordRenderer renderer =
Globals.Chem4WordV3.GetRendererPlugIn(
Globals.Chem4WordV3.SystemOptions.SelectedRendererPlugIn);
Expand Down Expand Up @@ -2063,6 +2087,10 @@ private void OnCheckForUpdatesClick(object sender, RibbonControlEventArgs e)

UpdateHelper.ClearSettings();

if (Globals.Chem4WordV3.SystemOptions == null)
{
Globals.Chem4WordV3.LoadOptions();
}
int behind = UpdateHelper.CheckForUpdates(Globals.Chem4WordV3.SystemOptions.AutoUpdateFrequency);
if (behind == 0)
{
Expand Down
12 changes: 12 additions & 0 deletions src/Chem4Word.V3/WebServices/Chemspider.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,10 @@ public string GetInchiKey(string molfile)
//Log.Debug("Calling ChemSpider WebService");
Telemetry.Write(module, "Verbose", "Calling WebService");
InChI i = new InChI();
if (Globals.Chem4WordV3.SystemOptions == null)
{
Globals.Chem4WordV3.LoadOptions();
}
i.Url = Globals.Chem4WordV3.SystemOptions.ChemSpiderWebServiceUri + "InChI.asmx";
i.UserAgent = "Chem4Word";
i.Timeout = 5000;
Expand Down Expand Up @@ -80,6 +84,10 @@ public Dictionary<string, string> GetSynonyms(string inchiKey)
{
//Log.Debug("Getting Chemspider RDF Page");
Telemetry.Write(module, "Verbose", "Calling WebService");
if (Globals.Chem4WordV3.SystemOptions == null)
{
Globals.Chem4WordV3.LoadOptions();
}
string url = Globals.Chem4WordV3.SystemOptions.ChemSpiderRdfServiceUri + inchiKey;
HttpWebRequest request = WebRequest.Create(url) as HttpWebRequest;
request.Timeout = 5000;
Expand Down Expand Up @@ -179,6 +187,10 @@ public string GetSynonym(string inchiKey)
{
//Log.Debug("Getting Chemspider RDF Page");
Telemetry.Write(module, "Verbose", "Calling WebService");
if (Globals.Chem4WordV3.SystemOptions == null)
{
Globals.Chem4WordV3.LoadOptions();
}
string url = Globals.Chem4WordV3.SystemOptions.ChemSpiderRdfServiceUri + inchiKey;
HttpWebRequest request = WebRequest.Create(url) as HttpWebRequest;
request.Timeout = 5000;
Expand Down
4 changes: 2 additions & 2 deletions src/Chem4WordTests/Properties/AssemblyInfo.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -35,5 +35,5 @@
// Build Number
// Revision
//
[assembly: AssemblyVersion("3.0.15.6619")]
[assembly: AssemblyFileVersion("3.0.15.6619")]
[assembly: AssemblyVersion("3.0.16.6620")]
[assembly: AssemblyFileVersion("3.0.16.6620")]
4 changes: 2 additions & 2 deletions src/ChemDoodlePoc/Properties/AssemblyInfo.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -35,5 +35,5 @@
// Build Number
// Revision
//
[assembly: AssemblyVersion("3.0.15.6619")]
[assembly: AssemblyFileVersion("3.0.15.6619")]
[assembly: AssemblyVersion("3.0.16.6620")]
[assembly: AssemblyFileVersion("3.0.16.6620")]
4 changes: 2 additions & 2 deletions src/Chemistry/Chem4Word.Model/Properties/AssemblyInfo.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -35,5 +35,5 @@
// Build Number
// Revision
//
[assembly: AssemblyVersion("3.0.15.6619")]
[assembly: AssemblyFileVersion("3.0.15.6619")]
[assembly: AssemblyVersion("3.0.16.6620")]
[assembly: AssemblyFileVersion("3.0.16.6620")]
Loading

0 comments on commit 295d482

Please sign in to comment.