Merge pull request #4 from kemo14331/main

1.0.3
kemo14331 · Feb 2, 2021 · a4564ac · a4564ac
2 parents faf38e0 + 6df08f6
commit a4564ac
Show file tree

Hide file tree

Showing 13 changed files with 296 additions and 108 deletions.
diff --git a/ParticleConverter.sln b/ParticleConverter.sln
@@ -14,11 +14,13 @@ EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
+		Publish|Any CPU = Publish|Any CPU
 		Release|Any CPU = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
 		{B5006587-6179-4CBD-80E0-DD423E9690AE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{B5006587-6179-4CBD-80E0-DD423E9690AE}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{B5006587-6179-4CBD-80E0-DD423E9690AE}.Publish|Any CPU.ActiveCfg = Release|Any CPU
 		{B5006587-6179-4CBD-80E0-DD423E9690AE}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{B5006587-6179-4CBD-80E0-DD423E9690AE}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection

diff --git a/ParticleConverter/App.xaml b/ParticleConverter/App.xaml
@@ -5,6 +5,7 @@
     xmlns:local="clr-namespace:ParticleConverter"
     xmlns:local1="clr-namespace:ParticleConverter.util"
     xmlns:materialDesign="http://materialdesigninxaml.net/winfx/xaml/themes"
+    DispatcherUnhandledException="App_DispatcherUnhandledException"
     StartupUri="MainWindow.xaml">
     <Application.Resources>
         <ResourceDictionary>

diff --git a/ParticleConverter/App.xaml.cs b/ParticleConverter/App.xaml.cs
@@ -1,4 +1,8 @@
-using System.Windows;
+using ParticleConverter.util;
+using System;
+using System.IO;
+using System.Windows;
+using System.Windows.Threading;
 
 namespace ParticleConverter
 {
@@ -7,5 +11,15 @@ namespace ParticleConverter
     /// </summary>
     public partial class App : Application
     {
+
+        public App()
+        {
+        }
+
+        void App_DispatcherUnhandledException(object sender, DispatcherUnhandledExceptionEventArgs e)
+        {
+            MessageBox.Show(e.Exception.ToString());
+            Logger.WriteExceptionLog(e.Exception);
+        }
     }
 }
diff --git a/ParticleConverter/MainWindow.xaml b/ParticleConverter/MainWindow.xaml
@@ -597,14 +597,32 @@
                     Margin="5,0"
                     Checked="UsePreviewBox_Checked"
                     Content="{DynamicResource UsePreview}" />
-                <TextBlock
-                    Name="ParticleCounter"
+                <StackPanel
                     Grid.Row="1"
                     Grid.Column="1"
                     Margin="0,0,10,0"
                     HorizontalAlignment="Right"
                     VerticalAlignment="Center"
-                    Text="Particles: 0" />
+                    Orientation="Horizontal">
+                    <Label
+                        Name="CounterAlert"
+                        Foreground="Red"
+                        Visibility="Hidden">
+                        <Label.ToolTip>
+                            <TextBlock
+                                Width="250"
+                                Text="{DynamicResource ParticleCounterAlert}"
+                                TextWrapping="Wrap" />
+                        </Label.ToolTip>
+                        <materialDesign:PackIcon Kind="AlertOutline" />
+                    </Label>
+                    <TextBlock
+                        Name="ParticleCounter"
+                        Margin="0,0,5,0"
+                        HorizontalAlignment="Right"
+                        VerticalAlignment="Center"
+                        Text="Particles: 0" />
+                </StackPanel>
                 <Grid
                     Grid.Row="2"
                     Grid.RowSpan="2"

diff --git a/ParticleConverter/MainWindow.xaml.cs b/ParticleConverter/MainWindow.xaml.cs
diff --git a/ParticleConverter/ParticleConverter.csproj b/ParticleConverter/ParticleConverter.csproj
@@ -6,31 +6,36 @@
     <UseWPF>true</UseWPF>
     <StartupObject>ParticleConverter.App</StartupObject>
     <SignAssembly>true</SignAssembly>
-    <AssemblyOriginatorKeyFile>Kemo431.pfx</AssemblyOriginatorKeyFile>
+    <AssemblyOriginatorKeyFile>kemo14331.pfx</AssemblyOriginatorKeyFile>
     <DelaySign>false</DelaySign>
     <Copyright>Kemo431</Copyright>
     <PackageRequireLicenseAcceptance>false</PackageRequireLicenseAcceptance>
     <Authors>Kemo431</Authors>
     <PackageLicenseFile>LICENSE</PackageLicenseFile>
+    <Deterministic>false</Deterministic>
     <RepositoryUrl>https://github.com/kemo14331/Particle-Converter</RepositoryUrl>
     <PackageIcon>icon.png</PackageIcon>
     <ApplicationIcon>icon.ico</ApplicationIcon>
+    <AssemblyVersion>1.0.3.*</AssemblyVersion>
+    <Version>1.0.3</Version>
+    <FileVersion>1.0.2</FileVersion>
+    <Configurations>Debug;Release</Configurations>
   </PropertyGroup>
 
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
+    <DebugType>none</DebugType>
+    <DebugSymbols>false</DebugSymbols>
   </PropertyGroup>
 
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="HelixToolkit.SharpDX.Core.Wpf" Version="2.12.0" />
-    <PackageReference Include="MahApps.Metro" Version="2.2.0" />
+    <PackageReference Include="HelixToolkit.SharpDX.Core.Wpf" Version="2.13.0" />
     <PackageReference Include="MaterialDesignThemes" Version="3.2.0" />
-    <PackageReference Include="OpenCV" Version="2.4.11" />
-    <PackageReference Include="OpenCvSharp4.Windows" Version="4.4.0.20200915" />
+    <PackageReference Include="OpenCvSharp4" Version="4.4.0.20200915" />
     <PackageReference Include="WindowsAPICodePack-Shell" Version="1.1.1" />
   </ItemGroup>
 
@@ -71,4 +76,8 @@
     </Page>
   </ItemGroup>
 
+  <Target Name="PostBuild" AfterTargets="PostBuildEvent">
+    <Exec Command="xcopy &quot;$(ProjectDir)\lang&quot; $(TargetDir) /Y" />
+  </Target>
+
 </Project>
diff --git a/ParticleConverter/dialogs/About.xaml.cs b/ParticleConverter/dialogs/About.xaml.cs
@@ -1,4 +1,6 @@
 using System.Diagnostics;
+using System.Reflection;
+using System.Windows;
 using System.Windows.Controls;
 using System.Windows.Input;
 
@@ -12,9 +14,11 @@ public partial class About : UserControl
         public About()
         {
             InitializeComponent();
+            Assembly assembly = Assembly.GetExecutingAssembly();
+
             var fullname = typeof(App).Assembly.Location;
             var info = System.Diagnostics.FileVersionInfo.GetVersionInfo(fullname);
-            var ver = info.FileVersion;
+            var ver = assembly.GetName().Version.ToString();
             Version.Text = ver;
         }
 

diff --git a/ParticleConverter/lang/en-US.xaml b/ParticleConverter/lang/en-US.xaml
@@ -8,7 +8,7 @@
     <system:String x:Key="BugReport">Bug Report</system:String>
     <system:String x:Key="About">About</system:String>
 
-    <system:String x:Key="SettingTitle">Converting Settings</system:String>
+    <system:String x:Key="SettingTitle">Convertion Settings</system:String>
     <system:String x:Key="ImageFileName">ImageFile</system:String>
     <system:String x:Key="Brows">Brows</system:String>
 
@@ -61,4 +61,13 @@
     <system:String x:Key="ExportSettings">Export Settings</system:String>
     <system:String x:Key="ExportFolder">ExportFolder</system:String>
     <system:String x:Key="Export">Export!!</system:String>
+
+    <system:String x:Key="ParticleCounterAlert">
+        There are too many particles.
+        It may not be displayed normally depending on the performance of the computer.
+        Consider changing the resolution.
+    </system:String>
+
+    <system:String x:Key="UpdateNotification">Update Notification</system:String>
+    <system:String x:Key="UpdateNotificationMsg">A new version is available. \ n Do you want to download it?</system:String>
 </ResourceDictionary>
diff --git a/ParticleConverter/lang/ja-JP.xaml b/ParticleConverter/lang/ja-JP.xaml
@@ -61,4 +61,13 @@
     <system:String x:Key="ExportSettings">出力設定</system:String>
     <system:String x:Key="ExportFolder">出力先フォルダ</system:String>
     <system:String x:Key="Export">出力!</system:String>
+
+    <system:String x:Key="ParticleCounterAlert">
+        パーティクルの量が多すぎます。
+        コンピュータの性能によっては正常に表示できない可能性があります。
+        解像度の変更を検討してください。
+    </system:String>
+
+    <system:String x:Key="UpdateNotification">アップデート通知</system:String>
+    <system:String x:Key="UpdateNotificationMsg">新しいバージョンが公開されています。\nダウンロードしますか？</system:String>
 </ResourceDictionary>
diff --git a/ParticleConverter/util/Logger.cs b/ParticleConverter/util/Logger.cs
@@ -0,0 +1,29 @@
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Text;
+
+namespace ParticleConverter.util
+{
+    public static class Logger
+    {
+        public static void WriteExceptionLog(Exception e)
+        {
+            DateTime dt = DateTime.Now;
+            string result = dt.ToString("yyyy-MM-dd_HH.mm.ss");
+            StreamWriter streamWriter = null;
+            try
+            {
+                Directory.CreateDirectory(@".\exceptionLog");
+                string path = $@".\exceptionLog\{result}.txt";
+                streamWriter = new StreamWriter(path);
+                streamWriter.WriteLine(e.Data);
+                streamWriter.WriteLine(e.ToString());
+            }
+            finally
+            {
+                if (streamWriter != null) streamWriter.Close();
+            }
+        }
+    }
+}
diff --git a/ParticleConverter/util/UpdateUtil.cs b/ParticleConverter/util/UpdateUtil.cs
@@ -0,0 +1,14 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace ParticleConverter.util
+{
+    public static class UpdateUtil
+    {
+        static void CheckUpdate(string url)
+        {
+
+        }
+    }
+}
diff --git a/README.md b/README.md
@@ -1,4 +1,6 @@
+**日本語** / [English](https://github.com/kemo14331/Particle-Converter/blob/main/README_EN.md)
 # Particle Converter 
+![GitHub release (latest SemVer)](https://img.shields.io/github/v/release/kemo14331/Particle-Converter)  [![GitHub license](https://img.shields.io/github/license/kemo14331/Particle-Converter)](https://github.com/kemo14331/Particle-Converter/blob/main/LICENSE)  
 画像ファイルをmcfunctionに変換するツール
 
 ## ScreenShot

diff --git a/README_EN.md b/README_EN.md
@@ -0,0 +1,43 @@
+# Particle Converter 
+![GitHub release (latest SemVer)](https://img.shields.io/github/v/release/kemo14331/Particle-Converter)  [![GitHub license](https://img.shields.io/github/license/kemo14331/Particle-Converter)](https://github.com/kemo14331/Particle-Converter/blob/main/LICENSE)  
+Particle Converter is an application to convert image files into particle commands.
+
+## ScreenShot
+ ![screenshot0](https://imgur.com/HvnhBgF.jpg,"screenshot")
+ <details>
+ <summary>and more</summary><div>  
+ <img src="https://imgur.com/Ld544Cx.jpg", "screenshot1">
+ <img src="https://imgur.com/hdSbSkc.jpg" alt="screenshot2" />
+ </div></details>  
+
+## Feature
+* Convert the image file (.jpg|.png) into a particle command that can be displayed in Minecraft and output as a mcfunction format
+* Correspond to world relative coordinates(~) and local relative coordinates(^).
+* Real-time preview of parameter changes.
+* Display size can be specified by block.
+* Support for changing resolution.
+* Supports the color specification of dust.
+* Compatible with particles other than dust.
+* Multi-language support for the app.
+
+Translated with www.DeepL.com/Translator (free version)
+
+## Downloads
+ [Particle-Converter/Release](https://github.com/kemo14331/Particle-Converter/releases/latest)
+
+## Requirement
+
+ * .NETCore 3.1
+
+## Library
+ * [Material Design In Xaml](http://materialdesigninxaml.net/)
+ * [OpenCVSharp4](https://github.com/shimat/opencvsharp)
+ * [HelixToolkit.SharpDX.Core.Wpf](https://github.com/helix-toolkit/helix-toolkit) 
+
+## Author
+
+* Kemo431  
+* Twitter: [@newkemo431](https://twitter.com/newkemo431)
+
+## License
+This app is under the [MIT license](https://en.wikipedia.org/wiki/MIT_License).