Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
183 commits
Select commit Hold shift + click to select a range
14a9838
Installing base prism package
vertigra Mar 9, 2024
b1bd8c4
Implement viewmodel locator
vertigra Mar 9, 2024
a6c8c17
Fix naming
vertigra Mar 9, 2024
6a21acc
Implemen test service
vertigra Mar 9, 2024
ac15455
Fix naming library project
vertigra Mar 9, 2024
c9f32db
implement region view in core
vertigra Mar 9, 2024
da5ddf7
Remove oldes files
vertigra Mar 9, 2024
2308778
Added ContentRegion view
vertigra Mar 9, 2024
176e331
Added: module view
vertigra Mar 9, 2024
48105b0
Movin menu xaml to region module
vertigra Mar 9, 2024
a56ade6
Moving menu view model code to module
vertigra Mar 9, 2024
af089b0
Moving xaml mainwindow to content region
vertigra Mar 9, 2024
ace8fb7
Change namesapce for adam comunicate
vertigra Mar 9, 2024
29e37d1
Change all namespace for .core project
vertigra Mar 9, 2024
41f901c
Moving properties to .core
vertigra Mar 9, 2024
311a2f8
Moving to core more files
vertigra Mar 9, 2024
f5fe4dc
Refafact to prism structure project
vertigra Mar 9, 2024
9e5a58f
Update projecc structure
vertigra Mar 10, 2024
52b6f1e
Update and change command
vertigra Mar 10, 2024
9aba513
First succes compile after change project struture
vertigra Mar 10, 2024
4d78451
Moving services in extended project
vertigra Mar 10, 2024
bb99ffd
Moved tcp/udp/websocket clients to services
vertigra Mar 10, 2024
c9ede38
Added: status bar module initailization
vertigra Mar 10, 2024
8e15fd5
Rewoke adam tcp client to service
vertigra Mar 11, 2024
9ac0fb4
Implement region in main view
vertigra Mar 11, 2024
c82eb5d
Moving code from main view to content region
vertigra Mar 11, 2024
1f71f00
Moving notifications fields and command to statusbar region
vertigra Mar 11, 2024
04899d9
Fix menu position
vertigra Mar 11, 2024
462da93
Fix initaialization StatusBarViewModel
vertigra Mar 11, 2024
2ba5965
Added subbregion names class
vertigra Mar 11, 2024
10e93e8
Moved flayouts to extended xaml files
vertigra Mar 12, 2024
408a6ed
Moved flayouts to exteneded region
vertigra Mar 12, 2024
6923597
Moved flayuts notification and settings model code to flayouts region…
vertigra Mar 12, 2024
67748ef
Fix naming in content region
vertigra Mar 12, 2024
3d472de
Added: navigation
vertigra Mar 13, 2024
e0be051
Added commands and navigation to menu region
vertigra Mar 13, 2024
b3b94b9
First worked region runs
vertigra Mar 13, 2024
241c78b
Update: computer vision region
vertigra Mar 14, 2024
8aeaee3
Update: all regions of the main views are collected and connected
vertigra Mar 14, 2024
12626fb
Moved hamburger menu to extended region
vertigra Mar 14, 2024
49eeac0
Fix naming StatusBarRegion
vertigra Mar 14, 2024
42ee34e
Fix naming HamburgerMenuRegion
vertigra Mar 14, 2024
4bcc9ca
Remove old tests
vertigra Mar 14, 2024
b66fe43
Fix core project folder naming
vertigra Mar 14, 2024
39cad63
Fix legacy project folder
vertigra Mar 14, 2024
3018282
Conect SettingsView
vertigra Mar 16, 2024
296e8b2
Fix and enable NetworkView
vertigra Mar 16, 2024
8155352
Remove obsolete code
vertigra Mar 16, 2024
10c035d
Implemen hamburger menu view to main window
vertigra Mar 16, 2024
a68d5d8
Second version hamburger menu
vertigra Mar 17, 2024
4e467ff
Third variam hamburger menu
vertigra Mar 17, 2024
0782d94
Fix: hamburger menu are worked
vertigra Mar 20, 2024
9f13c0b
Fix issue #5 task 1.
vertigra Mar 21, 2024
e07d5c1
Remove Hamburger menu region
vertigra Mar 23, 2024
ca706fc
Fix: wrong namespace in visual setting vew model
vertigra Mar 23, 2024
0c13513
Fix issue #6
vertigra Mar 24, 2024
fd2c120
Remove unused code.
vertigra Mar 24, 2024
d5abd79
Move AdamPython.xshd to Core resources
vertigra Mar 24, 2024
0a8bd69
Move main icon to core resources
vertigra Mar 24, 2024
3cbebf3
Clean
vertigra Mar 24, 2024
4de8d18
Fix path to main app icon
vertigra Mar 25, 2024
03d3cf3
Experimental fix #11
vertigra Mar 28, 2024
7f60892
Moved all nuget package to interface project. Change platform for int…
vertigra Mar 30, 2024
47918f4
Fix: build problems
vertigra Mar 31, 2024
28d2002
Added: flayouts services
vertigra Mar 31, 2024
dd5238a
Worked flyout custom control
vertigra Apr 3, 2024
73135c3
Close issue #12
vertigra Apr 3, 2024
376242d
Close issue #13
vertigra Apr 3, 2024
17bac6c
Close #14
vertigra Apr 8, 2024
be07749
StatusBarViewModel fixed according to Code of Conduct #10
vertigra Apr 9, 2024
b1ec7b9
Close #19
vertigra Apr 10, 2024
e804717
Preparatory work for #18
vertigra Apr 10, 2024
466b1f3
Close #18 p1
vertigra Apr 11, 2024
4fac320
Close #18 p2
vertigra Apr 11, 2024
b7a3258
Fix #18 p3
vertigra Apr 11, 2024
4b41a07
Fix #18 p 4/5
vertigra Apr 11, 2024
3435e7b
Added: python execute parser service
vertigra Apr 11, 2024
a3c9fe6
Fix service naming
vertigra Apr 11, 2024
e0f2565
Close issue #21
vertigra Apr 12, 2024
9927e87
Preliminary work on #15
vertigra Apr 12, 2024
55ec6ac
Preparatory work for #22
vertigra Apr 13, 2024
80d88dd
Close issue #22
vertigra Apr 13, 2024
f61f480
Fix issue #9 p1
vertigra Apr 13, 2024
5b03b78
Clean App.xaml
vertigra Apr 13, 2024
3e84cb5
Close issue #9
vertigra Apr 13, 2024
abf2d47
Close issue #23
vertigra Apr 13, 2024
1cf87aa
Prepare works #16
vertigra Apr 13, 2024
11edcad
Prepare works #16
vertigra Apr 14, 2024
67ff7ae
Close #16
vertigra Apr 15, 2024
8fd3ac6
Prepare works #25
vertigra Apr 15, 2024
bac8114
Close issue #27
vertigra Apr 15, 2024
cb5dbf8
Fix #26 p1
vertigra Apr 17, 2024
90bb4b2
Fix #26 p2
vertigra Apr 17, 2024
898b67b
Fix #26 p3 p4 p5
vertigra Apr 17, 2024
3d89ea5
Fix #26 p 6
vertigra Apr 17, 2024
b4c06cc
Prepare works #26 p9
vertigra Apr 17, 2024
a979105
Refact remote runner
vertigra Apr 18, 2024
aa27635
Prepare work #26 p 9
vertigra Apr 18, 2024
36451aa
Close issue #26 p9
vertigra Apr 18, 2024
a48ad27
Changed Newtonsoft to System.Text.Json.Serialization
vertigra Apr 19, 2024
39f4142
Fix blockly load error
vertigra Apr 19, 2024
a0c98ba
Close #31 p 2
vertigra Apr 19, 2024
aaa20b7
Merge pull request #33 from Adam-Software/SystemTextJsonExperiment
vertigra Apr 19, 2024
c95cbb8
Close #35
vertigra Apr 19, 2024
cabc5c6
Prepare works #35
vertigra Apr 19, 2024
6928fcd
Close #35
vertigra Apr 20, 2024
c5f9025
Close #36
vertigra Apr 20, 2024
19504e3
Close issue #37
vertigra Apr 20, 2024
b49d5f5
Duplicates of data models for the results of the client's web API hav…
vertigra Apr 20, 2024
9e78190
Close #38
vertigra Apr 20, 2024
d1282af
Clean WebAPI legacy project. Close #39
vertigra Apr 21, 2024
e1fa04e
Remove unused code
vertigra Apr 21, 2024
c68facb
Prepare works #41
vertigra Apr 21, 2024
09fde80
Prepare works #41
vertigra Apr 21, 2024
c62f91e
Prepare works #41
vertigra Apr 21, 2024
179b58b
Close #41 #30
vertigra Apr 21, 2024
d22c3b3
Clean using
vertigra Apr 21, 2024
2665f9b
Close #24 p1
vertigra Apr 22, 2024
87f7673
Close issue #43
vertigra Apr 22, 2024
ca55769
Prepare work #44
vertigra Apr 22, 2024
143baf1
Prepare work #44
vertigra Apr 22, 2024
d246670
Close #44
vertigra Apr 24, 2024
8de00b3
Fix conflict
vertigra Apr 24, 2024
3f9248c
Prepare work #45
vertigra Apr 24, 2024
5f1cb75
Close #45 p. 1
vertigra Apr 25, 2024
d844f9c
Close #45 p2
vertigra Apr 25, 2024
04be718
Close #45 p3
vertigra Apr 25, 2024
9aa8a20
Prepare works #45 p4
vertigra Apr 25, 2024
c299574
Close #45 p4
vertigra Apr 25, 2024
ce565f6
Remove NotificationOpacity
vertigra Apr 25, 2024
68cca54
Clean visual settings
vertigra Apr 25, 2024
760ea83
Close #45 p5
vertigra Apr 26, 2024
7b7adf5
Prepare works #45 p6
vertigra Apr 26, 2024
fe68bf9
Close #45 p6
vertigra Apr 27, 2024
e9a3acd
Close #45
vertigra Apr 27, 2024
f3e35b2
Close #46
vertigra Apr 27, 2024
6a6f8d8
Close #40 p1
vertigra Apr 28, 2024
c498987
Close #48
vertigra Apr 29, 2024
238cf1b
Close #49
vertigra Apr 29, 2024
d09abe6
Close #50 p 2.1
vertigra Apr 29, 2024
c35339a
Close #51 p1 p3
vertigra Apr 29, 2024
3dcc9f9
Fix bell size
vertigra Apr 29, 2024
1fd50ff
Prepare work #61 p2
vertigra Apr 30, 2024
7492948
Close #51 p2
vertigra Apr 30, 2024
105e93c
Close #51 p4
vertigra Apr 30, 2024
41df969
Small fix view settings
vertigra Apr 30, 2024
a509f68
Prepare works #51
vertigra May 1, 2024
bce9a0f
Prepare works #51 p. 5
vertigra May 2, 2024
dd4cfb4
Prepare works #51
vertigra May 2, 2024
9057454
Close #59 p5
vertigra May 2, 2024
41dd1e5
Prepare work #51 p 6
vertigra May 2, 2024
04b3acb
Close #51 p. 7
vertigra May 3, 2024
9d9b643
Close #51 p 9
vertigra May 3, 2024
559f31a
Close #52
vertigra May 3, 2024
883ca53
Prepare works #51 p. 6
vertigra May 5, 2024
74f6c03
prepare works #51 p. 6-7
vertigra May 5, 2024
3c8f17a
Close #51 p6/7
vertigra May 5, 2024
73fd0d4
Close #28
vertigra May 6, 2024
75c4250
Close #50 p 3.1
vertigra May 6, 2024
0395353
Close #50 p.4
vertigra May 6, 2024
6900958
Close #50 p.5
vertigra May 6, 2024
2e83d2d
Close #54 p1
vertigra May 6, 2024
bf454e4
Close #54 p2
vertigra May 6, 2024
258daa0
Close #50 p.6
vertigra May 6, 2024
4129f52
Close #50 p 1.4
vertigra May 7, 2024
cc38a14
Close #50 p 1.3
vertigra May 7, 2024
16fae3b
Close #50 p. 2
vertigra May 7, 2024
b78d778
Close #50 p 1.1
vertigra May 7, 2024
61fd245
Close p 7
vertigra May 7, 2024
14ad0fc
Close #50 p 8
vertigra May 7, 2024
82de7b9
Small fix
vertigra May 7, 2024
8db76e0
Prepare work #53
vertigra May 8, 2024
506627d
Close issue #53
vertigra May 8, 2024
7d009fc
Close #55 p 1
vertigra May 8, 2024
6c3b715
Prepare work #10 p21/22/25
vertigra May 9, 2024
6e42301
Close #10 p. 21/22/26
vertigra May 11, 2024
e2c2897
Close #10 p. 23
vertigra May 11, 2024
e16e906
Close #56
vertigra May 11, 2024
d7ae683
Close #58
vertigra May 11, 2024
a4839c6
Close #57
vertigra May 11, 2024
a1127cc
Small fixx
vertigra May 11, 2024
5e28590
Small fixes
vertigra May 11, 2024
1341296
Close #59
vertigra May 12, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
38 changes: 0 additions & 38 deletions AdamBlocklyLibrary/Properties/AssemblyInfo.cs

This file was deleted.

14 changes: 14 additions & 0 deletions AdamController.Controls/AdamController.Controls.csproj
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>net7.0-windows</TargetFramework>
<Nullable>enable</Nullable>
<UseWPF>true</UseWPF>
<ImplicitUsings>enable</ImplicitUsings>
</PropertyGroup>

<ItemGroup>
<ProjectReference Include="..\AdamController.Services\AdamController.Services.csproj" />
</ItemGroup>

</Project>
Original file line number Diff line number Diff line change
@@ -0,0 +1,51 @@
namespace AdamController.Controls.CustomControls.Mvvm.FlyoutContainer
{
/// <summary>
/// Represents the ongoing direction of change of a Flyout
/// </summary>
public class FlyoutAction
{
private const string mOpening = "Opening";
private const string mClosing = "Closing";

private readonly string mThisAction;

protected FlyoutAction(string action)
{
mThisAction = action;
}

public static FlyoutAction Opening
{
get { return new FlyoutAction(mOpening); }
}

public static FlyoutAction Closing
{
get { return new FlyoutAction(mClosing); }
}

public string Action
{
get { return mThisAction; }
}

public override bool Equals(object obj)
{
if (obj is not FlyoutAction other)
return false;

return this.Action == other.Action;
}

public override int GetHashCode()
{
return mThisAction.GetHashCode();
}

public override string ToString()
{
return mThisAction;
}
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,250 @@
using MahApps.Metro.Controls;
using Prism.Mvvm;
using System.Drawing;
using System.Windows;
using System.Windows.Input;

namespace AdamController.Controls.CustomControls.Mvvm.FlyoutContainer
{
/// <summary>
/// Base class that provides and implementation of IFlyout.
/// Inherits from BindableBase to allow property binding.
/// Recommended to perform the majority of ViewModel initialization within an override of OnOpening to prevent memory leaks,
/// and clean up as many resources as possible within OnClosing as the instance of the ViewModel will remain in memory from the
/// moment of registration with the FlyoutManager until the moment of unregistration, or program exit.
/// </summary>
public abstract class FlyoutBase : BindableBase, IFlyout
{
public event EventHandler<FlyoutEventArgs> OnClosed;
public event EventHandler<FlyoutEventArgs> OnOpened;
public event EventHandler<FlyoutEventArgs> OnOpenChanged;

private bool mIsOpen;
private bool mIsModal = true;
private bool mAreAnimationsEnabled = true;
private bool mAnimateOpacity = true;
private bool mCloseButtonIsCancel;
private bool mIsPinned;

private string mPosition = FlyoutPosition.Right;
private string mHeader = string.Empty;
private string mTheme = FlyoutTheme.Adapt;

private double mBorderThickness = 1.0;
private string mBorderBrush = "White";

private ICommand mCloseCommand;
private MouseButton mExternalCloseButton;


public double BorderThickness
{
get => mBorderThickness;
set => SetProperty(ref mBorderThickness, value);
}

public string BorderBrush
{
get => mBorderBrush;
set => SetProperty(ref mBorderBrush, value);
}


/// <summary>
/// Bindable property to determine open/closed staus of flyout, based on private field isOpen.
/// Generally set by FlyoutManager calling Open or Close method.
/// Initial value can be set by concrete child class.
/// </summary>
public bool IsOpen
{
get { return mIsOpen; }
set
{
OnChanging(value);
SetProperty(ref mIsOpen, value);
}
}


/// <summary>
/// Bindable property to determine position of flyout in window.
/// Possible values are stored in FlyoutPosition class and can be used to set property in the concrete class.
/// </summary>
public string Position
{
get { return mPosition; }
set { SetProperty(ref mPosition, value); }
}

/// <summary>
/// Bindable property to determine theme of flyout.
/// Possible values are stored in FlyoutTheme class and can be used to set property in concrete class.
/// </summary>
public string Theme
{
get { return mTheme; }
set { SetProperty(ref mTheme, value); }
}

/// <summary>
/// Bindable property to determine whether the Flyout is modal or not
/// </summary>
public bool IsModal
{
get { return mIsModal; }
set { SetProperty(ref mIsModal, value); }
}

/// <summary>
/// Bindable property to determine whether flyout animations are enabled
/// </summary>
public bool AreAnimationsEnabled
{
get { return mAreAnimationsEnabled; }
set { SetProperty(ref mAreAnimationsEnabled, value); }
}

/// <summary>
/// Command to execute when the close button is pressed
/// </summary>
public ICommand CloseCommand
{
get { return mCloseCommand; }
set { SetProperty(ref mCloseCommand, value); }
}

/// <summary>
/// Designate a mousebutton that will close the flyout when pressed outside of its bounds.
/// </summary>
public MouseButton ExternalCloseButton
{
get { return mExternalCloseButton; }
set { SetProperty(ref mExternalCloseButton, value); }
}

/// <summary>
/// Does the close button act as a cancel button.
/// </summary>
public bool CloseButtonIsCancel
{
get { return mCloseButtonIsCancel; }
set { SetProperty(ref mCloseButtonIsCancel, value); }
}

/// <summary>
/// Is the flyout pinned.
/// </summary>
public bool IsPinned
{
get { return mIsPinned; }
set { SetProperty(ref mIsPinned, value); }
}

/// <summary>
/// Whether the flyout is currently able to open.
/// Default: returns true
/// Override in concrete child class to implement custom logic.
/// </summary>
/// <param name="flyoutParameters">Instance of <typeparamref name="FlyoutParameters"/> containing information on current Open request.</param>
/// <returns>True if flyout can open, false if not.</returns>
public virtual bool CanOpen(FlyoutParameters flyoutParameters)
{
return true;
}


/// <summary>
/// Is opacity animated.
/// </summary>
public bool AnimateOpacity
{
get { return mAnimateOpacity; }
set { SetProperty(ref mAnimateOpacity, value); }
}

/// <summary>
/// Whether the flyout is currently able to close.
/// Default: returns true.
/// Override in concrete child class to implement custom logic.
/// </summary>
/// <param name="flyoutParameters">Instance of <typeparamref name="FlyoutParameters"/> containing information on current Close request.</param>
/// <returns>True if flyout can close, false if not.</returns>
public virtual bool CanClose(FlyoutParameters flyoutParameters)
{
return true;
}

/// <summary>
/// Event delegate called on flyout closing with FlyoutEventArgs.
/// </summary>
/// <param name="flyoutParameters">Instance of <typeparamref name="FlyoutParameters"/> containing information on current Close request.</param>
protected virtual void OnClosing(FlyoutParameters flyoutParameters) { }

/// <summary>
/// Event delegate called on flyout closing, with FlyoutEventArgs.
/// </summary>
/// <param name="flyoutParameters">Instance of <typeparamref name="FlyoutParameters"/> containing information on current Close request.</param>
protected virtual void OnOpening(FlyoutParameters flyoutParameters) { }

/// <summary>
/// Bindable property to determine header of flyout.
/// Value set by concrete child class.
/// </summary>
public string Header
{
get { return mHeader; }
set { SetProperty(ref mHeader, value); }
}

/// <summary>
/// Event delegate called on flyout open status changed, with FlyoutEventArgs containing open/close direction.
/// </summary>
/// <param name="isOpening"></param>
protected virtual void OnChanging(bool isOpening)
{
var flyoutAction = isOpening ? FlyoutAction.Opening : FlyoutAction.Closing;

var flyoutEventArgs = new FlyoutEventArgs(flyoutAction);

OnOpenChanged?.Invoke(this, flyoutEventArgs);

if (flyoutAction == FlyoutAction.Opening)
OnOpened?.Invoke(this, flyoutEventArgs);

if (flyoutAction == FlyoutAction.Closing)
OnClosed?.Invoke(this, flyoutEventArgs);
}

/// <summary>
/// Close the flyout.
/// </summary>
/// <param name="flyoutParameters"></param>
public void Close(FlyoutParameters flyoutParameters)
{
OnClosing(flyoutParameters);
IsOpen = false;
}

public void Close()
{
Close(new FlyoutParameters());
}


/// <summary>
/// Open the flyout.
/// </summary>
/// <param name="flyoutParameters"></param>
public void Open(FlyoutParameters flyoutParameters)
{
OnOpening(flyoutParameters);
IsOpen = true;
}

public void Open()
{
Open(new FlyoutParameters());
}
}
}

Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
namespace AdamController.Controls.CustomControls.Mvvm.FlyoutContainer
{
/// <summary>
/// Event arguments passed with the OnOpened, OnClosed and OnOpenChanged event delegates.
/// Flyout action is a required parameter to the constructor.
/// Additional FlyoutParameters can also be attached.
/// </summary>
public class FlyoutEventArgs : EventArgs
{
public FlyoutAction FlyoutAction { get; set; }

public FlyoutEventArgs(FlyoutAction flyoutAction)
{
FlyoutAction = flyoutAction;
}
}
}
Loading