mirror of
https://github.com/azaion/annotations.git
synced 2026-04-22 06:46:30 +00:00
fix textbox keyboard global handling
add CameraConfig to prod json add launch and tasks jsons to vscode folder
This commit is contained in:
Vendored
+33
@@ -0,0 +1,33 @@
|
||||
{
|
||||
"version": "0.2.0",
|
||||
"configurations": [
|
||||
{
|
||||
"name": "Launch Azaion.Suite (with credentials)",
|
||||
"type": "coreclr",
|
||||
"request": "launch",
|
||||
"preLaunchTask": "build",
|
||||
"program": "${workspaceFolder}/Azaion.Suite/bin/Debug/net8.0-windows/Azaion.Suite.dll",
|
||||
"args": ["credsManual", "-e", "test-admin@azaion.com", "-p", "Az@1on1000TestT-addminn11"],
|
||||
"cwd": "${workspaceFolder}/Azaion.Suite/bin/Debug/net8.0-windows",
|
||||
"console": "internalConsole",
|
||||
"stopAtEntry": false
|
||||
},
|
||||
{
|
||||
"name": "Launch Azaion.Suite",
|
||||
"type": "coreclr",
|
||||
"request": "launch",
|
||||
"preLaunchTask": "build",
|
||||
"program": "${workspaceFolder}/Azaion.Suite/bin/Debug/net8.0-windows/Azaion.Suite.dll",
|
||||
"args": [],
|
||||
"cwd": "${workspaceFolder}/Azaion.Suite/bin/Debug/net8.0-windows",
|
||||
"console": "internalConsole",
|
||||
"stopAtEntry": false
|
||||
},
|
||||
{
|
||||
"name": "Attach to Azaion.Suite",
|
||||
"type": "coreclr",
|
||||
"request": "attach",
|
||||
"processName": "Azaion.Suite"
|
||||
}
|
||||
]
|
||||
}
|
||||
Vendored
+41
@@ -0,0 +1,41 @@
|
||||
{
|
||||
"version": "2.0.0",
|
||||
"tasks": [
|
||||
{
|
||||
"label": "build",
|
||||
"command": "dotnet",
|
||||
"type": "process",
|
||||
"args": [
|
||||
"build",
|
||||
"${workspaceFolder}/Azaion.Suite.sln",
|
||||
"/property:GenerateFullPaths=true",
|
||||
"/consoleloggerparameters:NoSummary;ForceNoAlign"
|
||||
],
|
||||
"problemMatcher": "$msCompile"
|
||||
},
|
||||
{
|
||||
"label": "publish",
|
||||
"command": "dotnet",
|
||||
"type": "process",
|
||||
"args": [
|
||||
"publish",
|
||||
"${workspaceFolder}/Azaion.Suite.sln",
|
||||
"/property:GenerateFullPaths=true",
|
||||
"/consoleloggerparameters:NoSummary;ForceNoAlign"
|
||||
],
|
||||
"problemMatcher": "$msCompile"
|
||||
},
|
||||
{
|
||||
"label": "watch",
|
||||
"command": "dotnet",
|
||||
"type": "process",
|
||||
"args": [
|
||||
"watch",
|
||||
"run",
|
||||
"--project",
|
||||
"${workspaceFolder}/Azaion.Suite.sln"
|
||||
],
|
||||
"problemMatcher": "$msCompile"
|
||||
}
|
||||
]
|
||||
}
|
||||
@@ -49,11 +49,11 @@ public partial class NumericUpDown : UserControl
|
||||
|
||||
private static void OnValueChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
|
||||
{
|
||||
if (d is NumericUpDown control)
|
||||
{
|
||||
control.NudTextBox.Text = ((decimal)e.NewValue).ToString(CultureInfo.InvariantCulture);
|
||||
control.NudTextBox.SelectionStart = control.NudTextBox.Text.Length;
|
||||
}
|
||||
if (d is not NumericUpDown control)
|
||||
return;
|
||||
|
||||
control.NudTextBox.Text = ((decimal)e.NewValue).ToString(CultureInfo.InvariantCulture);
|
||||
control.NudTextBox.SelectionStart = control.NudTextBox.Text.Length;
|
||||
}
|
||||
|
||||
private void NudButtonUp_OnClick(object sender, RoutedEventArgs e)
|
||||
|
||||
@@ -48,10 +48,10 @@ exe = EXE(
|
||||
disable_windowed_traceback=False,
|
||||
argv_emulation=False,
|
||||
target_arch=None,
|
||||
codesign_identity=None, # Set this to your code signing certificate
|
||||
codesign_identity=None,
|
||||
entitlements_file=None,
|
||||
# version='version_info.txt', # Temporarily disabled - file doesn't exist
|
||||
icon=None, # Add icon if available
|
||||
version='version_info.txt',
|
||||
icon=None,
|
||||
)
|
||||
|
||||
coll = COLLECT(
|
||||
|
||||
@@ -0,0 +1,30 @@
|
||||
VSVersionInfo(
|
||||
ffi=FixedFileInfo(
|
||||
filevers=(1, 0, 0, 0),
|
||||
prodvers=(1, 0, 0, 0),
|
||||
mask=0x3f,
|
||||
flags=0x0,
|
||||
OS=0x40004,
|
||||
fileType=0x1,
|
||||
subtype=0x0,
|
||||
date=(0, 0)
|
||||
),
|
||||
kids=[
|
||||
StringFileInfo(
|
||||
[
|
||||
StringTable(
|
||||
u'040904B0',
|
||||
[StringStruct(u'CompanyName', u'Azaion'),
|
||||
StringStruct(u'FileDescription', u'Azaion Loader'),
|
||||
StringStruct(u'FileVersion', u'1.0.0.0'),
|
||||
StringStruct(u'InternalName', u'azaion-loader'),
|
||||
StringStruct(u'LegalCopyright', u'Copyright (c) 2025 Azaion'),
|
||||
StringStruct(u'OriginalFilename', u'azaion-loader.exe'),
|
||||
StringStruct(u'ProductName', u'Azaion Loader'),
|
||||
StringStruct(u'ProductVersion', u'1.0.0.0')])
|
||||
]),
|
||||
VarFileInfo([VarStruct(u'Translation', [1033, 1200])])
|
||||
]
|
||||
)
|
||||
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
using System.IO;
|
||||
using System.Net.Http;
|
||||
using System.Text;
|
||||
using System.Windows;
|
||||
using System.Windows.Controls;
|
||||
using System.Windows.Threading;
|
||||
using Azaion.Annotator;
|
||||
using Azaion.Common;
|
||||
@@ -20,7 +20,6 @@ using Microsoft.Extensions.Configuration;
|
||||
using Microsoft.Extensions.DependencyInjection;
|
||||
using Microsoft.Extensions.Hosting;
|
||||
using Microsoft.Extensions.Options;
|
||||
using Newtonsoft.Json;
|
||||
using Serilog;
|
||||
using KeyEventArgs = System.Windows.Input.KeyEventArgs;
|
||||
|
||||
@@ -200,6 +199,9 @@ public partial class App
|
||||
private void GlobalKeyHandler(object sender, RoutedEventArgs e)
|
||||
{
|
||||
var args = (KeyEventArgs)e;
|
||||
if (args.OriginalSource is TextBox)
|
||||
return;
|
||||
|
||||
var keyEvent = new KeyEvent(sender, args, _formState.ActiveWindow);
|
||||
ThrottleExt.Throttle(() => _mediator.Publish(keyEvent, _mainCTokenSource.Token), KeyPressTaskId, TimeSpan.FromMilliseconds(50));
|
||||
//e.Handled = true;
|
||||
|
||||
@@ -29,5 +29,10 @@
|
||||
"RightPanelWidth": 120.0,
|
||||
"GenerateAnnotatedImage": true,
|
||||
"SilentDetection": false
|
||||
},
|
||||
"CameraConfig": {
|
||||
"Altitude": 400,
|
||||
"CameraSensorWidth": 23.5,
|
||||
"CameraFocalLength": 24
|
||||
}
|
||||
}
|
||||
Reference in New Issue
Block a user