Skip to content

Feature/smart4sam/multiselect #421

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
KrisMuylaertAtILVO wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Feature/smart4sam/multiselect #421

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
65999b1
upgrade to devexpress 25.2 + fix selectedannotations for deletion
KrisMuylaertAtILVO Mar 16, 2026
c9aa453
added CanSetScale
KrisMuylaertAtILVO Mar 17, 2026
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
22 changes: 13 additions & 9 deletions SmartDots/App.config
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
<?xml version="1.0" encoding="utf-8"?>
<?xml version="1.0" encoding="utf-8"?>
<configuration>
<configSections>
<!-- For more information on Entity Framework configuration, visit http://go.microsoft.com/fwlink/?LinkID=237468 -->

<sectionGroup name="userSettings" type="System.Configuration.UserSettingsGroup, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<section name="SmartDots.Properties.Settings" type="System.Configuration.ClientSettingsSection, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" allowExeDefinition="MachineToLocalUser" requirePermission="false"/>
<section name="SmartDots.Properties.Settings" type="System.Configuration.ClientSettingsSection, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" allowExeDefinition="MachineToLocalUser" requirePermission="false" />
</sectionGroup>
</configSections>
<startup>
<supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.8"/>
<supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.8" />
</startup>
<userSettings>
<SmartDots.Properties.Settings>
Expand Down Expand Up @@ -138,31 +138,35 @@
<setting name="AgeReadingKeyAction0" serializeAs="String">
<value />
</setting>

<setting name="ApplicationThemeName" serializeAs="String">
<value>Office2016White</value>
</setting>
</SmartDots.Properties.Settings>
</userSettings>
<system.serviceModel>
<bindings>
<netTcpBinding>
<binding name="NetTcpBinding_IBroadCastService"/>
<binding name="NetTcpBinding_IBroadCastService" />
</netTcpBinding>
</bindings>
<client>
<endpoint address="net.tcp://srvsqldevd1.clo.be/Service.svc/BroadCast" binding="netTcpBinding" bindingConfiguration="NetTcpBinding_IBroadCastService" contract="ServiceReferenceBroadCast.IBroadCastService" name="NetTcpBinding_IBroadCastService">
<identity>
<dns value="localhost"/>
<dns value="localhost" />
</identity>
</endpoint>
</client>
</system.serviceModel>
<runtime>
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
<dependentAssembly>
<assemblyIdentity name="System" publicKeyToken="b77a5c561934e089" culture="neutral"/>
<bindingRedirect oldVersion="0.0.0.0-4.0.0.0" newVersion="4.0.0.0"/>
<assemblyIdentity name="System" publicKeyToken="b77a5c561934e089" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-4.0.0.0" newVersion="4.0.0.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.Drawing" publicKeyToken="b03f5f7f11d50a3a" culture="neutral"/>
<bindingRedirect oldVersion="0.0.0.0-4.0.0.0" newVersion="4.0.0.0"/>
<assemblyIdentity name="System.Drawing" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-4.0.0.0" newVersion="4.0.0.0" />
</dependentAssembly>
<!--<dependentAssembly>
<assemblyIdentity name="Tesseract" publicKeyToken="ebeb3d86bef60cbe" culture="neutral" />
Expand Down
173 changes: 173 additions & 0 deletions SmartDots/App.config.bak
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,173 @@
<?xml version="1.0" encoding="utf-8"?>
<configuration>
<configSections>
<!-- For more information on Entity Framework configuration, visit http://go.microsoft.com/fwlink/?LinkID=237468 -->

<sectionGroup name="userSettings" type="System.Configuration.UserSettingsGroup, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<section name="SmartDots.Properties.Settings" type="System.Configuration.ClientSettingsSection, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" allowExeDefinition="MachineToLocalUser" requirePermission="false"/>
</sectionGroup>
</configSections>
<startup>
<supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.8"/>
</startup>
<userSettings>
<SmartDots.Properties.Settings>
<setting name="DotWidth" serializeAs="String">
<value>10</value>
</setting>
<setting name="DotColor" serializeAs="String">
<value>#FF0000</value>
</setting>
<setting name="DotShape" serializeAs="String">
<value>Dot</value>
</setting>
<setting name="LineWidth" serializeAs="String">
<value>2</value>
</setting>
<setting name="LineColor" serializeAs="String">
<value>#00FFFF</value>
</setting>
<setting name="LastServer" serializeAs="String">
<value />
</setting>
<setting name="LastApi" serializeAs="String">
<value />
</setting>
<setting name="LastAuthType" serializeAs="String">
<value />
</setting>
<setting name="LastUser" serializeAs="String">
<value />
</setting>
<setting name="DotType" serializeAs="String">
<value>Seawater</value>
</setting>
<setting name="MeasureColor" serializeAs="String">
<value>#FFFF00</value>
</setting>
<setting name="MeasureLineWidth" serializeAs="String">
<value>1</value>
</setting>
<setting name="MeasureFontSize" serializeAs="String">
<value>12</value>
</setting>
<setting name="ShowFileNavButtons" serializeAs="String">
<value>False</value>
</setting>
<setting name="CircleWidth" serializeAs="String">
<value>4</value>
</setting>
<setting name="AgeReadingKeyAction1" serializeAs="String">
<value />
</setting>
<setting name="AgeReadingKeyAction2" serializeAs="String">
<value />
</setting>
<setting name="AgeReadingKeyAction3" serializeAs="String">
<value />
</setting>
<setting name="AgeReadingKeyAction4" serializeAs="String">
<value />
</setting>
<setting name="AgeReadingKeyAction5" serializeAs="String">
<value />
</setting>
<setting name="AgeReadingKeyAction6" serializeAs="String">
<value />
</setting>
<setting name="AgeReadingKeyAction7" serializeAs="String">
<value />
</setting>
<setting name="AgeReadingKeyAction8" serializeAs="String">
<value />
</setting>
<setting name="GrowthAllMode" serializeAs="String">
<value>Selected Annotations</value>
</setting>
<setting name="GrowthAllScale" serializeAs="String">
<value>pixels</value>
</setting>
<setting name="AgeReadingKeyAction9" serializeAs="String">
<value />
</setting>
<setting name="AgeReadingKeyAction10" serializeAs="String">
<value />
</setting>
<setting name="AgeReadingKeyAction11" serializeAs="String">
<value />
</setting>
<setting name="AgeReadingKeyAction12" serializeAs="String">
<value />
</setting>
<setting name="AgeReadingKeyAction13" serializeAs="String">
<value />
</setting>
<setting name="AgeReadingKeyAction14" serializeAs="String">
<value />
</setting>
<setting name="AgeReadingKeyAction15" serializeAs="String">
<value />
</setting>
<setting name="AgeReadingKeyAction16" serializeAs="String">
<value />
</setting>
<setting name="AgeReadingKeyAction17" serializeAs="String">
<value />
</setting>
<setting name="AgeReadingKeyAction18" serializeAs="String">
<value />
</setting>
<setting name="AgeReadingKeyAction19" serializeAs="String">
<value />
</setting>
<setting name="AgeReadingKeyAction20" serializeAs="String">
<value />
</setting>
<setting name="AgeReadingKeyAction21" serializeAs="String">
<value />
</setting>
<setting name="AgeReadingKeyAction22" serializeAs="String">
<value />
</setting>
<setting name="AgeReadingKeyAction23" serializeAs="String">
<value />
</setting>
<setting name="AgeReadingKeyAction24" serializeAs="String">
<value />
</setting>
<setting name="AgeReadingKeyAction0" serializeAs="String">
<value />
</setting>
</SmartDots.Properties.Settings>
</userSettings>
<system.serviceModel>
<bindings>
<netTcpBinding>
<binding name="NetTcpBinding_IBroadCastService"/>
</netTcpBinding>
</bindings>
<client>
<endpoint address="net.tcp://srvsqldevd1.clo.be/Service.svc/BroadCast" binding="netTcpBinding" bindingConfiguration="NetTcpBinding_IBroadCastService" contract="ServiceReferenceBroadCast.IBroadCastService" name="NetTcpBinding_IBroadCastService">
<identity>
<dns value="localhost"/>
</identity>
</endpoint>
</client>
</system.serviceModel>
<runtime>
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
<dependentAssembly>
<assemblyIdentity name="System" publicKeyToken="b77a5c561934e089" culture="neutral"/>
<bindingRedirect oldVersion="0.0.0.0-4.0.0.0" newVersion="4.0.0.0"/>
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.Drawing" publicKeyToken="b03f5f7f11d50a3a" culture="neutral"/>
<bindingRedirect oldVersion="0.0.0.0-4.0.0.0" newVersion="4.0.0.0"/>
</dependentAssembly>
<!--<dependentAssembly>
<assemblyIdentity name="Tesseract" publicKeyToken="ebeb3d86bef60cbe" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-3.0.2.0" newVersion="3.0.2.0" />
</dependentAssembly>-->
</assemblyBinding>
</runtime>
</configuration>
2 changes: 1 addition & 1 deletion SmartDots/App.xaml.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ public partial class App : Application
public App()
{
typeof(DXSplashScreen).GetProperty("MainThreadDelay", BindingFlags.Static | BindingFlags.NonPublic).SetValue(null, -1, null);
ApplicationThemeHelper.UseLegacyDefaultTheme = true;
ApplicationThemeHelper.UseLegacyDefaultTheme = false;
ApplicationThemeHelper.UpdateApplicationThemeName();
AppDomain.CurrentDomain.UnhandledException += CurrentDomain_UnhandledException;
}
Expand Down
73 changes: 73 additions & 0 deletions SmartDots/Controls/SmartDotsGrid.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,73 @@
using DevExpress.Data.Filtering;
using DevExpress.Xpf.Core;
using DevExpress.Xpf.Grid;
using System;
using System.Collections;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;

namespace SmartDots.Controls
{

public class SmartDotsGrid : DevExpress.Xpf.Grid.GridControl
{
ObservableCollectionCore<object> mySelectedItems;
public IList MySelectedItems { get { return mySelectedItems.ToList(); } }
public SmartDotsGrid()
{
SelectionChanged += MyGridControl_SelectionChanged;
mySelectedItems = new ObservableCollectionCore<object>();
}

Hashtable selection = new Hashtable();
IEnumerable OrderedSelection { get { return selection.Keys.Cast<int>().OrderBy(x => x); } }
protected override void OnItemsSourceChanged(object oldValue, object newValue)
{
base.OnItemsSourceChanged(oldValue, newValue);
selection.Clear();
IEnumerable itemsSource = newValue as IEnumerable;
if (itemsSource == null)
return;
int i = 0;
foreach (object item in itemsSource)
selection[i++] = false;
}


Locker updateLocker = new Locker();
void MyGridControl_SelectionChanged(object sender, GridSelectionChangedEventArgs e)
{
if (updateLocker.IsLocked)
return;
for (int i = 0; i < VisibleRowCount; i++)
{
int rowHandle = GetRowHandleByVisibleIndex(i);
selection[GetListIndexByRowHandle(rowHandle)] = View.IsRowSelected(rowHandle);
}
mySelectedItems.BeginUpdate();
mySelectedItems.Clear();
foreach (int index in OrderedSelection)
{
if ((bool)selection[index])
mySelectedItems.Add(GetRowByListIndex(index));
}
mySelectedItems.EndUpdate();
}
protected override void ApplyFilter(CriteriaOperator op, FilterGroupSortChangingEventArgs filterSortArgs, bool skipIfFilterEquals)
{
updateLocker.DoLockedAction(() =>
{
base.ApplyFilter(op, filterSortArgs, skipIfFilterEquals);
BeginSelection();
foreach (int index in OrderedSelection)
{
if ((bool)selection[index])
SelectItem(GetRowHandleByListIndex(index));
}
EndSelection();
});
}
}
}
1 change: 1 addition & 0 deletions SmartDots/Model/Extension/Analysis.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,5 +14,6 @@ public class Analysis
public bool ShowNucleusColumn { get; set; }
public bool ShowEdgeColumn { get; set; }
public bool UseGrowthGraphAllSamples { get; set; }
public bool AllowSetScale { get; set; }
}
}
1 change: 1 addition & 0 deletions SmartDots/Model/Extension/Annotation.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@ public Annotation()
public bool IsApproved { get; set; }
public bool IsReadOnly { get; set; }
public bool IsFixed { get; set; }
public string ExpertiseLevel { get; set; }
//public Image FixedIcon
//{
// get
Expand Down
1 change: 1 addition & 0 deletions SmartDots/Model/Extension/File.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,6 +75,7 @@ public void ConvertDbAnnotations(List<DtoAnnotation> dbAnnotations)
Dots = dots,
Comment = annotation.Comment,
IsFixed = annotation.IsFixed,
ExpertiseLevel=annotation.ExpertiseLevel
//DynamicProperties = annotation.DynamicProperties
};
if (annotation.Nucleus == "Opaque" || annotation.Nucleus == "Translucent") temp.Nucleus = annotation.Nucleus;
Expand Down
2 changes: 1 addition & 1 deletion SmartDots/Model/Extension/MaturityAnalysis.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,6 @@ public class MaturityAnalysis
public string HeaderInfo { get; set; }
public List<MaturitySample> MaturitySamples { get; set; }


public bool AllowSetScale { get; set; }
}
}
2 changes: 2 additions & 0 deletions SmartDots/Model/Extension/MaturityAnnotation.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,8 @@ public class MaturityAnnotation
public bool RequiresSaving { get; set; }
public string Comments { get; set; }

public string ExpertiseLevel { get; set; }

public string ApprovedPicture
{
get
Expand Down
3 changes: 2 additions & 1 deletion SmartDots/Model/Extension/MaturitySample.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,8 @@ public void ConvertDbAnnotations(List<DtoMaturityAnnotation> dbAnnotations)
SexID = annotation.SexID,
UserID = annotation.UserID,
User = annotation.User,
IsApproved = annotation.IsApproved
IsApproved = annotation.IsApproved,
ExpertiseLevel= annotation.ExpertiseLevel
};

result.Add(temp);
Expand Down
1 change: 1 addition & 0 deletions SmartDots/Model/Smartdots/AgeReading/DtoAnalysis.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,5 +15,6 @@ public class DtoAnalysis
public bool ShowEdgeColumn { get; set; }
public bool UseGrowthGraphAllSamples { get; set; } = true;

public bool AllowSetScale { get; set; } = true;
}
}
1 change: 1 addition & 0 deletions SmartDots/Model/Smartdots/AgeReading/DtoAnnotation.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,5 +24,6 @@ public class DtoAnnotation
public virtual ICollection<DtoDot> Dots { get; set; }
public virtual ICollection<DtoLine> Lines { get; set; }
public List<DtoAnnotationProperty> DynamicProperties { get; set; }
public string ExpertiseLevel { get; set; }
}
}
2 changes: 1 addition & 1 deletion SmartDots/Model/Smartdots/Maturity/DtoMaturityAnalysis.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,6 @@ public class DtoMaturityAnalysis
public string HeaderInfo { get; set; }
public List<DtoMaturitySample> MaturitySamples { get; set; }


public bool AllowSetScale { get; set; } = true;
}
}
1 change: 1 addition & 0 deletions SmartDots/Model/Smartdots/Maturity/DtoMaturityAnnotation.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ public partial class DtoMaturityAnnotation
public Guid? MaturityQualityID { get; set; }
public bool IsApproved { get; set; }
public string Comments { get; set; }
public string ExpertiseLevel { get; set; }

}
}
Loading