Skip to content

Commit fbf7d7f

Browse files
Merged PR 392: V3.1.13 Release 3
* Set Transport Layer Security TLS 1.2 protocol to prevent https errors (missed earlier) in PubChem Search * Fix incorrect position of implicit Hydrogen for a lone atom (as seen in Microsoft Word) Related work items: #760, #761
1 parent 29aba12 commit fbf7d7f

File tree

44 files changed

+639
-685
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

44 files changed

+639
-685
lines changed

src/Chem4Word.V3/Data/Chem4Word-Versions.xml

Lines changed: 143 additions & 133 deletions
Large diffs are not rendered by default.
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<Version>
3-
<Number>3.1.12 Release 2</Number>
3+
<Number>3.1.13 Release 3</Number>
44
<IsBeta>false</IsBeta>
5-
<Released>06-Sep-2020</Released>
5+
<Released>17-Sep-2020</Released>
66
</Version>

src/Chem4Word.V3/Data/index.html

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,13 @@ <h1>Chemistry for Word Add-In 2020</h1>
1515
<td>Setup Bootstrapper</td>
1616
<td><a href="/files3-1/Chem4Word-Setup.exe">Chem4Word-Setup</a></td>
1717
</tr>
18+
<tr>
19+
<td>Version 3.1.13 - Release 3</td>
20+
<td><a href="/files3-1/Chem4Word-Setup.3.1.13.Release.3.msi">Chem4Word-Setup 3.1.13 Release 3</a></td>
21+
</tr>
1822
<tr>
1923
<td>Version 3.1.12 - Release 2</td>
20-
<td><a href="/files3-1/Chem4Word-Setup.3.1.12.Release.2.msi">Chem4Word-Setup 3.1.12 Release 2</a></td>
24+
<td>Chem4Word-Setup 3.1.12 Release 2</td>
2125
</tr>
2226
<tr>
2327
<td>Version 3.1.11 - Release 1</td>

src/Chem4Word.V3/Properties/AssemblyInfo.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,5 +35,5 @@
3535
// Build Number
3636
// Revision
3737
//
38-
[assembly: AssemblyVersion("3.1.12.7554")]
39-
[assembly: AssemblyFileVersion("3.1.12.7554")]
38+
[assembly: AssemblyVersion("3.1.13.7565")]
39+
[assembly: AssemblyFileVersion("3.1.13.7565")]

src/Chem4Word.V3/Ribbon/Chem4WordRibbon.cs

Lines changed: 13 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -721,6 +721,15 @@ public static void PerformEdit()
721721
}
722722
}
723723

724+
if (isNewDrawing)
725+
{
726+
Globals.Chem4WordV3.Telemetry.Write(module, "Information", $"Starting create new structure {fullTag}");
727+
}
728+
else
729+
{
730+
Globals.Chem4WordV3.Telemetry.Write(module, "Information", $"Starting edit existing structure {fullTag}");
731+
}
732+
724733
var used1D = ChemistryHelper.GetUsed1D(doc, guidString);
725734

726735
editor.Cml = beforeCml;
@@ -765,11 +774,11 @@ public static void PerformEdit()
765774

766775
if (isNewDrawing)
767776
{
768-
Globals.Chem4WordV3.Telemetry.Write(module, "Information", $"Creating new structure {fullTag}");
777+
Globals.Chem4WordV3.Telemetry.Write(module, "Information", $"Finished creating new structure {fullTag}");
769778
}
770779
else
771780
{
772-
Globals.Chem4WordV3.Telemetry.Write(module, "Information", $"Editing existing structure {fullTag}");
781+
Globals.Chem4WordV3.Telemetry.Write(module, "Information", $"Finished editing existing structure {fullTag}");
773782
}
774783

775784
// Copy back CustomXmlPartGuid which will get lost if edited via ChemDoodle Web
@@ -871,9 +880,9 @@ public static void PerformEdit()
871880
// Delete the temporary file now we are finished with it
872881
try
873882
{
874-
// Only delete file in release mode
875883
#if !DEBUG
876-
File.Delete(tempfileName);
884+
// Only delete file in release mode
885+
File.Delete(tempfileName);
877886
#endif
878887
}
879888
catch

src/Chem4WordTests/Properties/AssemblyInfo.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,5 +35,5 @@
3535
// Build Number
3636
// Revision
3737
//
38-
[assembly: AssemblyVersion("3.1.12.7554")]
39-
[assembly: AssemblyFileVersion("3.1.12.7554")]
38+
[assembly: AssemblyVersion("3.1.13.7565")]
39+
[assembly: AssemblyFileVersion("3.1.13.7565")]

src/Chemistry/Chem4Word.ACME/Drawing/BondVisual.cs

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -305,18 +305,18 @@ public override void Render()
305305
Atom endAtom = ParentBond.EndAtom;
306306

307307
// Only continue if we have both a start and end atom
308-
if (startAtom != null && endAtom != null)
309-
{
308+
//if (startAtom != null && endAtom != null)
309+
//{
310310
//set up the shared variables first
311311
Point startPoint = startAtom.Position;
312312
Point endPoint = endAtom.Position;
313313

314314
double bondLength = ParentBond.Model.XamlBondLength;
315-
bool firstVisualExists = ChemicalVisuals.ContainsKey(startAtom);
316-
bool secondVisualExists = ChemicalVisuals.ContainsKey(endAtom);
315+
//bool firstVisualExists = ChemicalVisuals.ContainsKey(startAtom);
316+
//bool secondVisualExists = ChemicalVisuals.ContainsKey(endAtom);
317317

318318
// Only continue if bond length is not zero and we have both a startVisual and endVisual
319-
if (startPoint != endPoint && firstVisualExists && secondVisualExists)
319+
if (startPoint != endPoint ) // && firstVisualExists && secondVisualExists)
320320
{
321321
//now get the geometry of start and end atoms
322322
AtomVisual startVisual = (AtomVisual)ChemicalVisuals[startAtom];
@@ -489,7 +489,7 @@ public override void Render()
489489
break;
490490
}
491491
}
492-
}
492+
//}
493493

494494
//local function
495495
void DrawHitTestOverlay(DrawingContext dc)

0 commit comments

Comments
 (0)