Skip to content

Commit a358a4a

Browse files
author
yaroslav
committed
Fixed wrong cast bug
1 parent a902169 commit a358a4a

File tree

3 files changed

+18
-15
lines changed

3 files changed

+18
-15
lines changed

Tutorials.iOS/Tutorial09_MultipleSurfaces/AddingMultipleSurfaces/AddingMultipleSurfaces/AddingMultipleSurfaces.csproj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -100,8 +100,8 @@
100100
<InterfaceDefinition Include="Resources\LaunchScreen.xib" />
101101
</ItemGroup>
102102
<ItemGroup>
103-
<Reference Include="SciChart.iOS.Charting, Version=2.0.0.478, Culture=neutral, PublicKeyToken=b55dd9efe817e823, processorArchitecture=MSIL">
104-
<HintPath>..\packages\SciChart.iOS.2.0.0.478\lib\xamarin-ios\SciChart.iOS.Charting.dll</HintPath>
103+
<Reference Include="SciChart.iOS.Charting, Version=2.0.0.486, Culture=neutral, PublicKeyToken=b55dd9efe817e823, processorArchitecture=MSIL">
104+
<HintPath>..\packages\SciChart.iOS.2.0.0.486\lib\xamarin-ios\SciChart.iOS.Charting.dll</HintPath>
105105
<Private>True</Private>
106106
</Reference>
107107
<Reference Include="System" />

Tutorials.iOS/Tutorial09_MultipleSurfaces/AddingMultipleSurfaces/AddingMultipleSurfaces/ViewController.cs

Lines changed: 15 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -125,11 +125,14 @@ public override void ViewWillAppear(bool animated)
125125
// removing annotations that are out of visible range
126126
var customAn = _annotationCollection[0] as SCICustomAnnotation;
127127

128-
if (customAn != null && (double)customAn.X1Value < (_i - 500))
128+
if (customAn != null)
129129
{
130-
// since the contentView is UIView element - we have to call removeFromSuperView method to remove it from screen
131-
customAn.CustomView.RemoveFromSuperview();
132-
_annotationCollection.Remove(customAn);
130+
if (customAn.X1Value.CompareTo(_i - 500) == 0)
131+
{
132+
// since the contentView is UIView element - we have to call removeFromSuperView method to remove it from screen
133+
customAn.CustomView.RemoveFromSuperview();
134+
_annotationCollection.Remove(customAn);
135+
}
133136
}
134137
}
135138
if (_i % 200 == 0)
@@ -139,7 +142,7 @@ public override void ViewWillAppear(bool animated)
139142

140143
_surfaceTop.ZoomExtentsX();
141144
// Extents bottom chart
142-
_surfaceBottom.ZoomExtents();
145+
_surfaceBottom.ZoomExtentsX();
143146
});
144147
}
145148
}
@@ -205,24 +208,24 @@ void AddModifiers()
205208
var pinchZoomModifierSync = new SCIMultiSurfaceModifier(GetClassForType(typeof(SCIPinchZoomModifier)));
206209
var panZoomModifierSync = new SCIMultiSurfaceModifier(GetClassForType(typeof(SCIZoomPanModifier)));
207210

208-
var xAxisDragmodifier = xDragModifierSync.ModifierForSurface(_surfaceTop) as SCIXAxisDragModifier;
211+
// retreiving XAxisDragModifier for customization
212+
var xAxisDragmodifier = ObjCRuntime.Runtime.GetNSObject<SCIXAxisDragModifier>(xDragModifierSync.ModifierForSurface(_surfaceTop).Handle);
209213
if (xAxisDragmodifier != null)
210214
{
211215
xAxisDragmodifier.DragMode = SCIAxisDragMode.Pan;
212216
xAxisDragmodifier.ClipModeX = SCIClipMode.None;
213217
}
214218

215-
var pinchZoomModifier = pinchZoomModifierSync.ModifierForSurface(_surfaceTop);
216219
var legendCollectionModifier = new SCILegendModifier();
217220

218221
var groupModifier = new SCIChartModifierCollection();
219-
if (xAxisDragmodifier != null) groupModifier.Add(xAxisDragmodifier);
220-
if (pinchZoomModifier != null) groupModifier.Add(pinchZoomModifier);
222+
groupModifier.Add(xDragModifierSync);
223+
groupModifier.Add(pinchZoomModifierSync);
221224
groupModifier.Add(legendCollectionModifier);
222225

223226
_surfaceTop.ChartModifiers = groupModifier;
224227

225-
var xAxisDragmodifierBottom = xDragModifierSync.ModifierForSurface(_surfaceBottom) as SCIXAxisDragModifier;
228+
var xAxisDragmodifierBottom = ObjCRuntime.Runtime.GetNSObject<SCIXAxisDragModifier>(xDragModifierSync.ModifierForSurface(_surfaceBottom).Handle);
226229
if (xAxisDragmodifierBottom != null)
227230
{
228231
xAxisDragmodifierBottom.DragMode = SCIAxisDragMode.Pan;
@@ -232,8 +235,8 @@ void AddModifiers()
232235
var pinchZoomModifierBottom = pinchZoomModifierSync.ModifierForSurface(_surfaceBottom);
233236

234237
var groupModifierBottom = new SCIChartModifierCollection();
235-
if (xAxisDragmodifierBottom != null) groupModifierBottom.Add(xAxisDragmodifierBottom);
236-
if (pinchZoomModifierBottom != null) groupModifierBottom.Add(pinchZoomModifierBottom);
238+
if (xAxisDragmodifierBottom != null) groupModifierBottom.Add(xDragModifierSync);
239+
if (pinchZoomModifierBottom != null) groupModifierBottom.Add(pinchZoomModifierSync);
237240

238241
_surfaceBottom.ChartModifiers = groupModifierBottom;
239242
}
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
3-
<package id="SciChart.iOS" version="2.0.0.478" targetFramework="xamarinios10" />
3+
<package id="SciChart.iOS" version="2.0.0.486" targetFramework="xamarinios10" />
44
</packages>

0 commit comments

Comments
 (0)