Skip to content

Commit daf6226

Browse files
committed
fix console exit (from commandline), #BUILD
1 parent 868e1b6 commit daf6226

File tree

5 files changed

+29
-5
lines changed

5 files changed

+29
-5
lines changed

MainWindow.xaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
<ComboBox x:Name="cmbImportFormat" HorizontalAlignment="Left" Margin="719,48,0,0" VerticalAlignment="Top" Width="163" IsReadOnly="True"/>
2020
<Label x:Name="label_Copy2" Content="Import format:&#xA;" HorizontalAlignment="Left" Margin="719,22,0,0" VerticalAlignment="Top" Foreground="{DynamicResource MainText}" Height="26"/>
2121

22-
<StackPanel HorizontalAlignment="Left" Height="250" Margin="20,174,0,0" VerticalAlignment="Top" Width="277">
22+
<StackPanel HorizontalAlignment="Left" Height="270" Margin="20,174,0,0" VerticalAlignment="Top" Width="277">
2323
<StackPanel Orientation="Horizontal">
2424
<CheckBox x:Name="chkImportRGB" Content="Read RGB" HorizontalAlignment="Left" VerticalAlignment="Top" Foreground="{DynamicResource MainText}" IsChecked="True" ToolTip="Reads RGB color values" Checked="chkImportRGB_Checked" Unchecked="chkImportRGB_Unchecked"/>
2525
<CheckBox x:Name="chkImportIntensity" Content="Read Intensity" HorizontalAlignment="Left" VerticalAlignment="Top" Foreground="{DynamicResource MainText}" IsChecked="False" ToolTip="Reads Intensity as Color value" Checked="chkImportIntensity_Checked" Unchecked="chkImportIntensity_Unchecked"/>

MainWindow.xaml.cs

Lines changed: 12 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,15 +10,24 @@
1010
using System.Threading;
1111
using System.Windows;
1212
using System.Windows.Controls;
13+
using System.Windows.Forms;
1314
using System.Windows.Media;
1415
using System.Windows.Threading;
16+
using Application = System.Windows.Application;
1517
using Color = PointCloudConverter.Structs.Color;
18+
using DataFormats = System.Windows.DataFormats;
19+
using DragDropEffects = System.Windows.DragDropEffects;
20+
using DragEventArgs = System.Windows.DragEventArgs;
21+
using OpenFileDialog = Microsoft.Win32.OpenFileDialog;
22+
using SaveFileDialog = Microsoft.Win32.SaveFileDialog;
23+
24+
1625

1726
namespace PointCloudConverter
1827
{
1928
public partial class MainWindow : Window
2029
{
21-
static string appname = "PointCloud Converter - 23.11.2023";
30+
static string appname = "PointCloud Converter - 14.01.2024";
2231
static readonly string rootFolder = AppDomain.CurrentDomain.BaseDirectory;
2332

2433
// allow console output from WPF application https://stackoverflow.com/a/7559336/5452781
@@ -35,7 +44,6 @@ public partial class MainWindow : Window
3544
public static MainWindow mainWindowStatic;
3645
bool isInitialiazing = true;
3746

38-
3947
public MainWindow()
4048
{
4149
InitializeComponent();
@@ -71,7 +79,8 @@ private void Main()
7179

7280
// end output
7381
Console.WriteLine("Exit");
74-
82+
// hack for console exit https://stackoverflow.com/a/67940480/5452781
83+
SendKeys.SendWait("{ENTER}");
7584
FreeConsole();
7685
Environment.Exit(0);
7786
}

PointCloudConverter.csproj

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,7 @@
4545
</Reference>
4646
<Reference Include="System" />
4747
<Reference Include="System.Data" />
48+
<Reference Include="System.Windows.Forms" />
4849
<Reference Include="System.Xml" />
4950
<Reference Include="Microsoft.CSharp" />
5051
<Reference Include="System.Core" />

Structs/ImportSettings.cs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -56,6 +56,7 @@ public class ImportSettings
5656
public float manualOffsetY = 0;
5757
public float manualOffsetZ = 0;
5858
public bool useCustomIntensityRange = false; // if false, 0-255 range is used, if ture: 0-65535
59+
//public bool importMetaData = false;
5960

6061
public override string ToString()
6162
{
@@ -69,6 +70,7 @@ public override string ToString()
6970
t += "\n invertZ=" + invertZ;
7071
t += "\n readRGB=" + importRGB;
7172
t += "\n readIntensity=" + importIntensity;
73+
//t += "\n metaData=" + importIntensity;
7274
t += "\n useAutoOffset=" + useAutoOffset;
7375
t += "\n offsetX=" + offsetX;
7476
t += "\n offsetY=" + offsetY;

Tools/ArgParser.cs

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -435,7 +435,19 @@ public static ImportSettings Parse(string[] args, string rootFolder)
435435
{
436436
// ok
437437
}
438-
break;
438+
break;
439+
440+
//case "-metadata":
441+
// Console.WriteLine("metadata = " + param);
442+
// if (param != "true" && param != "false")
443+
// {
444+
// errors.Add("Invalid metadata parameter: " + param);
445+
// }
446+
// else
447+
// {
448+
// importSettings.importMetaData = param == "true";
449+
// }
450+
// break;
439451

440452
case "-offset":
441453
Console.WriteLine("offset = " + param);

0 commit comments

Comments
 (0)