修复 element.Elements(VML.shape).Attributes("style")为null

HTEXLib/DOCX/OpenXmlTool/WmlToHtmlConverter.cs

@@ -3892,10 +3892,15 @@ namespace OpenXmlPowerTools
                     Mathxml = mathxml
                 };
                 var style = (string)element.Elements(VML.shape).Attributes("style").FirstOrDefault();
+
+                float? widthInPoints = null;
+                float? heightInPoints = null;
+                if (style != null) {
+                    var tokens = style.Split(';');
+                    widthInPoints = WidthInPoints(tokens);
+                    heightInPoints = HeightInPoints(tokens);
+                }
                 img =imageHandler(imageInfo);
-                var tokens = style.Split(';');
-                var widthInPoints = WidthInPoints(tokens);
-                var heightInPoints = HeightInPoints(tokens);
                 //var imgElement2 = imageHandler(imageInfo);
                 if (widthInPoints != null && heightInPoints != null)
                 {

HTEXMark/MainWindow.xaml

@@ -6,7 +6,7 @@
         xmlns:local="clr-namespace:HTEXMark"
         mc:Ignorable="d"
         Title="MainWindow" Height="450" Width="800">
-    <Grid>
+    <Grid Margin="0,129,0,0">
 
     </Grid>
 </Window>

HTEXScan/HTEXScan.csproj

@@ -6,9 +6,8 @@
 
   <ItemGroup>
     <PackageReference Include="Newtonsoft.Json" Version="12.0.3" />
-    <PackageReference Include="OpenCvSharp4" Version="4.5.0.20201013" />
-    <PackageReference Include="OpenCvSharp4.runtime.ubuntu.16.04-x64" Version="4.5.0.20201013-beta1" />
-    <PackageReference Include="OpenCvSharp4.Windows" Version="4.5.0.20201013" />
+    <PackageReference Include="OpenCvSharp4" Version="4.5.1.20210210" />
+    <PackageReference Include="OpenCvSharp4.Windows" Version="4.5.1.20210210" />
   </ItemGroup>
 
 </Project>

TEAMModelHTEX.sln

@@ -15,42 +15,102 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "HTEXWeb", "HTEXWeb\HTEXWeb.
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "HTEXScan", "HTEXScan\HTEXScan.csproj", "{42ACD89C-DB3F-4B0B-BB8D-1245E3E0120B}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HTEXMark", "HTEXMark\HTEXMark.csproj", "{5F3B59A5-3515-473B-A513-2C51E2A4CCFB}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "HTEXMark", "HTEXMark\HTEXMark.csproj", "{5F3B59A5-3515-473B-A513-2C51E2A4CCFB}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
+		Debug|iPhone = Debug|iPhone
+		Debug|iPhoneSimulator = Debug|iPhoneSimulator
 		Release|Any CPU = Release|Any CPU
+		Release|iPhone = Release|iPhone
+		Release|iPhoneSimulator = Release|iPhoneSimulator
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
 		{6E177D38-155F-49D9-A5E8-046E3548BCCF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{6E177D38-155F-49D9-A5E8-046E3548BCCF}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{6E177D38-155F-49D9-A5E8-046E3548BCCF}.Debug|iPhone.ActiveCfg = Debug|Any CPU
+		{6E177D38-155F-49D9-A5E8-046E3548BCCF}.Debug|iPhone.Build.0 = Debug|Any CPU
+		{6E177D38-155F-49D9-A5E8-046E3548BCCF}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
+		{6E177D38-155F-49D9-A5E8-046E3548BCCF}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU
 		{6E177D38-155F-49D9-A5E8-046E3548BCCF}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{6E177D38-155F-49D9-A5E8-046E3548BCCF}.Release|Any CPU.Build.0 = Release|Any CPU
+		{6E177D38-155F-49D9-A5E8-046E3548BCCF}.Release|iPhone.ActiveCfg = Release|Any CPU
+		{6E177D38-155F-49D9-A5E8-046E3548BCCF}.Release|iPhone.Build.0 = Release|Any CPU
+		{6E177D38-155F-49D9-A5E8-046E3548BCCF}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
+		{6E177D38-155F-49D9-A5E8-046E3548BCCF}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
 		{08BE278A-34BC-4F8C-ABB7-972A0D0AAE03}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{08BE278A-34BC-4F8C-ABB7-972A0D0AAE03}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{08BE278A-34BC-4F8C-ABB7-972A0D0AAE03}.Debug|iPhone.ActiveCfg = Debug|Any CPU
+		{08BE278A-34BC-4F8C-ABB7-972A0D0AAE03}.Debug|iPhone.Build.0 = Debug|Any CPU
+		{08BE278A-34BC-4F8C-ABB7-972A0D0AAE03}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
+		{08BE278A-34BC-4F8C-ABB7-972A0D0AAE03}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU
 		{08BE278A-34BC-4F8C-ABB7-972A0D0AAE03}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{08BE278A-34BC-4F8C-ABB7-972A0D0AAE03}.Release|Any CPU.Build.0 = Release|Any CPU
+		{08BE278A-34BC-4F8C-ABB7-972A0D0AAE03}.Release|iPhone.ActiveCfg = Release|Any CPU
+		{08BE278A-34BC-4F8C-ABB7-972A0D0AAE03}.Release|iPhone.Build.0 = Release|Any CPU
+		{08BE278A-34BC-4F8C-ABB7-972A0D0AAE03}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
+		{08BE278A-34BC-4F8C-ABB7-972A0D0AAE03}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
 		{A4726FED-9930-4DBA-9839-1C2613A8C8B7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{A4726FED-9930-4DBA-9839-1C2613A8C8B7}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{A4726FED-9930-4DBA-9839-1C2613A8C8B7}.Debug|iPhone.ActiveCfg = Debug|Any CPU
+		{A4726FED-9930-4DBA-9839-1C2613A8C8B7}.Debug|iPhone.Build.0 = Debug|Any CPU
+		{A4726FED-9930-4DBA-9839-1C2613A8C8B7}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
+		{A4726FED-9930-4DBA-9839-1C2613A8C8B7}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU
 		{A4726FED-9930-4DBA-9839-1C2613A8C8B7}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{A4726FED-9930-4DBA-9839-1C2613A8C8B7}.Release|Any CPU.Build.0 = Release|Any CPU
+		{A4726FED-9930-4DBA-9839-1C2613A8C8B7}.Release|iPhone.ActiveCfg = Release|Any CPU
+		{A4726FED-9930-4DBA-9839-1C2613A8C8B7}.Release|iPhone.Build.0 = Release|Any CPU
+		{A4726FED-9930-4DBA-9839-1C2613A8C8B7}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
+		{A4726FED-9930-4DBA-9839-1C2613A8C8B7}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
 		{9643944F-CD0E-4BF1-920A-A483C251BC77}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{9643944F-CD0E-4BF1-920A-A483C251BC77}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{9643944F-CD0E-4BF1-920A-A483C251BC77}.Debug|iPhone.ActiveCfg = Debug|Any CPU
+		{9643944F-CD0E-4BF1-920A-A483C251BC77}.Debug|iPhone.Build.0 = Debug|Any CPU
+		{9643944F-CD0E-4BF1-920A-A483C251BC77}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
+		{9643944F-CD0E-4BF1-920A-A483C251BC77}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU
 		{9643944F-CD0E-4BF1-920A-A483C251BC77}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{9643944F-CD0E-4BF1-920A-A483C251BC77}.Release|Any CPU.Build.0 = Release|Any CPU
+		{9643944F-CD0E-4BF1-920A-A483C251BC77}.Release|iPhone.ActiveCfg = Release|Any CPU
+		{9643944F-CD0E-4BF1-920A-A483C251BC77}.Release|iPhone.Build.0 = Release|Any CPU
+		{9643944F-CD0E-4BF1-920A-A483C251BC77}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
+		{9643944F-CD0E-4BF1-920A-A483C251BC77}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
 		{6490E842-D915-47B7-B646-C9178470F572}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{6490E842-D915-47B7-B646-C9178470F572}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{6490E842-D915-47B7-B646-C9178470F572}.Debug|iPhone.ActiveCfg = Debug|Any CPU
+		{6490E842-D915-47B7-B646-C9178470F572}.Debug|iPhone.Build.0 = Debug|Any CPU
+		{6490E842-D915-47B7-B646-C9178470F572}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
+		{6490E842-D915-47B7-B646-C9178470F572}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU
 		{6490E842-D915-47B7-B646-C9178470F572}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{6490E842-D915-47B7-B646-C9178470F572}.Release|Any CPU.Build.0 = Release|Any CPU
+		{6490E842-D915-47B7-B646-C9178470F572}.Release|iPhone.ActiveCfg = Release|Any CPU
+		{6490E842-D915-47B7-B646-C9178470F572}.Release|iPhone.Build.0 = Release|Any CPU
+		{6490E842-D915-47B7-B646-C9178470F572}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
+		{6490E842-D915-47B7-B646-C9178470F572}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
 		{42ACD89C-DB3F-4B0B-BB8D-1245E3E0120B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{42ACD89C-DB3F-4B0B-BB8D-1245E3E0120B}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{42ACD89C-DB3F-4B0B-BB8D-1245E3E0120B}.Debug|iPhone.ActiveCfg = Debug|Any CPU
+		{42ACD89C-DB3F-4B0B-BB8D-1245E3E0120B}.Debug|iPhone.Build.0 = Debug|Any CPU
+		{42ACD89C-DB3F-4B0B-BB8D-1245E3E0120B}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
+		{42ACD89C-DB3F-4B0B-BB8D-1245E3E0120B}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU
 		{42ACD89C-DB3F-4B0B-BB8D-1245E3E0120B}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{42ACD89C-DB3F-4B0B-BB8D-1245E3E0120B}.Release|Any CPU.Build.0 = Release|Any CPU
+		{42ACD89C-DB3F-4B0B-BB8D-1245E3E0120B}.Release|iPhone.ActiveCfg = Release|Any CPU
+		{42ACD89C-DB3F-4B0B-BB8D-1245E3E0120B}.Release|iPhone.Build.0 = Release|Any CPU
+		{42ACD89C-DB3F-4B0B-BB8D-1245E3E0120B}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
+		{42ACD89C-DB3F-4B0B-BB8D-1245E3E0120B}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
 		{5F3B59A5-3515-473B-A513-2C51E2A4CCFB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{5F3B59A5-3515-473B-A513-2C51E2A4CCFB}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{5F3B59A5-3515-473B-A513-2C51E2A4CCFB}.Debug|iPhone.ActiveCfg = Debug|Any CPU
+		{5F3B59A5-3515-473B-A513-2C51E2A4CCFB}.Debug|iPhone.Build.0 = Debug|Any CPU
+		{5F3B59A5-3515-473B-A513-2C51E2A4CCFB}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
+		{5F3B59A5-3515-473B-A513-2C51E2A4CCFB}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU
 		{5F3B59A5-3515-473B-A513-2C51E2A4CCFB}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{5F3B59A5-3515-473B-A513-2C51E2A4CCFB}.Release|Any CPU.Build.0 = Release|Any CPU
+		{5F3B59A5-3515-473B-A513-2C51E2A4CCFB}.Release|iPhone.ActiveCfg = Release|Any CPU
+		{5F3B59A5-3515-473B-A513-2C51E2A4CCFB}.Release|iPhone.Build.0 = Release|Any CPU
+		{5F3B59A5-3515-473B-A513-2C51E2A4CCFB}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
+		{5F3B59A5-3515-473B-A513-2C51E2A4CCFB}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE