Skip to content

Commit 37d2e9c

Browse files
AsposeOmrDeveloperAsposeOmrDeveloper
authored
18.12 release (#5)
* 18.12 Release changes * Update readme
1 parent 3add2ef commit 37d2e9c

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

57 files changed

+1171
-211
lines changed

‎Aspose.OMR.Client/Aspose.OMR.Client/Aspose.OMR.Client.csproj

Lines changed: 32 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -64,6 +64,9 @@
6464
<Reference Include="Aspose.Storage.Cloud.Sdk, Version=2.0.0.0, Culture=neutral, processorArchitecture=MSIL">
6565
<HintPath>..\packages\Aspose.Storage-Cloud.18.3.0\lib\net20\Aspose.Storage.Cloud.Sdk.dll</HintPath>
6666
</Reference>
67+
<Reference Include="Microsoft.Expression.Interactions, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
68+
<HintPath>..\packages\System.Windows.Interactivity.WPF.2.0.20525\lib\net40\Microsoft.Expression.Interactions.dll</HintPath>
69+
</Reference>
6770
<Reference Include="Microsoft.VisualBasic" />
6871
<Reference Include="Newtonsoft.Json, Version=10.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
6972
<HintPath>..\packages\Newtonsoft.Json.10.0.3\lib\net45\Newtonsoft.Json.dll</HintPath>
@@ -78,6 +81,9 @@
7881
<Reference Include="System.Runtime.Serialization" />
7982
<Reference Include="System.Security" />
8083
<Reference Include="System.Windows.Forms" />
84+
<Reference Include="System.Windows.Interactivity, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
85+
<HintPath>..\packages\System.Windows.Interactivity.WPF.2.0.20525\lib\net40\System.Windows.Interactivity.dll</HintPath>
86+
</Reference>
8187
<Reference Include="System.Xml" />
8288
<Reference Include="Microsoft.CSharp" />
8389
<Reference Include="System.Core" />
@@ -103,6 +109,7 @@
103109
<Compile Include="Converters\BoolToVisibilityInverseConverter.cs" />
104110
<Compile Include="Converters\BoolToWrappingConverter.cs" />
105111
<Compile Include="Converters\EnumDescriptionConverter.cs" />
112+
<Compile Include="Converters\EnumDisplayNameConverter.cs" />
106113
<Compile Include="Converters\GridLengthConverter.cs" />
107114
<Compile Include="UndoRedo\ApplyFormattingAction.cs" />
108115
<Compile Include="UndoRedo\ChangeBubblePositionAction.cs" />
@@ -145,6 +152,7 @@
145152
<Compile Include="Utility\ImageProcessor.cs" />
146153
<Compile Include="Utility\ImageRecognitionResult.cs" />
147154
<Compile Include="Utility\OmrFunctions.cs" />
155+
<Compile Include="Utility\PredefinedMarkups.cs" />
148156
<Compile Include="Utility\PreprocessingConfiguration.cs" />
149157
<Compile Include="Utility\PreprocessingConfigurationManager.cs" />
150158
<Compile Include="Utility\PreprocessingPreset.cs" />
@@ -188,6 +196,7 @@
188196
<Compile Include="ViewModels\MainViewModel.cs" />
189197
<Compile Include="ViewModels\PreprocessingPresetsViewModel.cs" />
190198
<Compile Include="ViewModels\ResultsViewModel.cs" />
199+
<Compile Include="ViewModels\SnapLineViewModel.cs" />
191200
<Compile Include="ViewModels\TabViewModel.cs" />
192201
<Compile Include="ViewModels\TemplateGeneratorViewModel.cs" />
193202
<Compile Include="ViewModels\TemplateViewModel.cs">
@@ -384,8 +393,29 @@
384393
<DependentUpon>Settings.settings</DependentUpon>
385394
<DesignTimeSharedInput>True</DesignTimeSharedInput>
386395
</Compile>
396+
<Content Include="Examples\BubbleSheet.txt">
397+
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
398+
</Content>
399+
<Content Include="Examples\Questionnaire.txt">
400+
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
401+
</Content>
402+
<Resource Include="Icons\Show24.png" />
403+
<Resource Include="Icons\LoadingBlack24.png" />
404+
<Resource Include="Icons\CircleStop24.png" />
405+
<Resource Include="Icons\LoadingBlack16.png" />
406+
<Resource Include="Icons\Circle Stop.png" />
407+
<Resource Include="Icons\Stop.png" />
408+
<Resource Include="Icons\CSV-Export.png" />
409+
<Resource Include="Icons\CancelAll.png" />
410+
<Resource Include="Icons\Gear.png" />
411+
<Resource Include="Icons\Printer-WF.png" />
412+
<Resource Include="Icons\Validate1.png" />
413+
<Resource Include="Icons\Show.png" />
414+
<Resource Include="Icons\Warning48.png" />
415+
<Resource Include="Icons\Check48.png" />
416+
<Resource Include="Icons\DocumentCreate.png" />
417+
<Resource Include="Icons\logoSpin.png" />
387418
<Resource Include="Icons\Scanner.png" />
388-
<Resource Include="Icons\Print.png" />
389419
<Resource Include="Icons\error.png" />
390420
<Resource Include="Icons\Trash32.png" />
391421
<Resource Include="Icons\Text.png" />
@@ -403,6 +433,7 @@
403433
<Content Include="Examples\AsposeTestExamples\Template.omr">
404434
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
405435
</Content>
436+
<None Include="Design\projectGuides.guides" />
406437
<None Include="packages.config">
407438
<SubType>Designer</SubType>
408439
</None>
@@ -481,15 +512,6 @@
481512
<ItemGroup>
482513
<Resource Include="Icons\CloudUpload.png" />
483514
</ItemGroup>
484-
<ItemGroup>
485-
<Resource Include="Icons\LoadingWhite32.png" />
486-
</ItemGroup>
487-
<ItemGroup>
488-
<Resource Include="Icons\LoadingWhite16.png" />
489-
</ItemGroup>
490-
<ItemGroup>
491-
<Resource Include="Icons\CancelWhite16.png" />
492-
</ItemGroup>
493515
<ItemGroup>
494516
<Resource Include="Icons\FitWidth.png" />
495517
<Resource Include="Icons\FullScreen.png" />

‎Aspose.OMR.Client/Aspose.OMR.Client/Controls/ControlHelper.cs

Lines changed: 26 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -167,9 +167,33 @@ public static List<ContentPresenter> GetSelectedChildPresenters(CustomCanvas can
167167
for (int i = 0; i < childsCount; i++)
168168
{
169169
ContentPresenter childPresenter = (ContentPresenter) VisualTreeHelper.GetChild(canvas, i);
170-
BaseOmrElement childOmrItem = (BaseOmrElement) VisualTreeHelper.GetChild(childPresenter, 0);
170+
BaseOmrElement childOmrItem = VisualTreeHelper.GetChild(childPresenter, 0) as BaseOmrElement;
171171

172-
if (childOmrItem.IsSelected)
172+
if (childOmrItem != null && childOmrItem.IsSelected)
173+
{
174+
presenters.Add(childPresenter);
175+
}
176+
}
177+
178+
return presenters;
179+
}
180+
181+
/// <summary>
182+
/// Finds all unselected child presenters on parent canvas
183+
/// </summary>
184+
/// <param name="canvas">Canvas containing searched items</param>
185+
/// <returns>List of content presenters with unselected items</returns>
186+
public static List<ContentPresenter> GetUnselectedChildPresenters(CustomCanvas canvas)
187+
{
188+
List<ContentPresenter> presenters = new List<ContentPresenter>();
189+
int childsCount = VisualTreeHelper.GetChildrenCount(canvas);
190+
191+
for (int i = 0; i < childsCount; i++)
192+
{
193+
ContentPresenter childPresenter = (ContentPresenter)VisualTreeHelper.GetChild(canvas, i);
194+
BaseOmrElement childOmrItem = VisualTreeHelper.GetChild(childPresenter, 0) as BaseOmrElement;
195+
196+
if (childOmrItem != null && !childOmrItem.IsSelected)
173197
{
174198
presenters.Add(childPresenter);
175199
}

‎Aspose.OMR.Client/Aspose.OMR.Client/Controls/CustomCanvas.cs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -139,14 +139,15 @@ protected override void OnMouseMove(MouseEventArgs e)
139139
private void AdornerMouseUp(object sender, MouseButtonEventArgs e)
140140
{
141141
RubberbandAdorner adorner = (RubberbandAdorner) sender;
142-
142+
143143
// remove adorner from adorner layer
144144
AdornerLayer adornerLayer = AdornerLayer.GetAdornerLayer(this);
145145
adornerLayer?.Remove(adorner);
146146

147147
if (this.mode != SelectionRectnagleModes.Selection)
148148
{
149149
TemplateViewModel context = (TemplateViewModel)this.DataContext;
150+
150151
context.AddQuestion(adorner.Rectangle);
151152
}
152153
}

0 commit comments

Comments
 (0)