Merge pull request #191 from ChrisClems/fix-warnings

Compiler warning cleanup

CADability/BSpline.cs

@@ -75,7 +75,6 @@ public class BSpline : IGeoObjectImpl, IColorDef, ILineWidth, ILinePattern, ISer
         private GeoPoint[] interpol; // Interpolation mit einer gewissen Genauigkeit
         private GeoVector[] interdir; // Interpolation mit einer gewissen Genauigkeit
         private double[] interparam; // die Parameter zur Interpolation
-        private double maxInterpolError; // der größte Fehler bei der Interpolation
         private BoundingCube extent;
         private TetraederHull tetraederHull;
         private GeoPoint[] approximation; // Interpolation mit der Genauigkeit der Auflösung
@@ -517,7 +516,6 @@ private void InvalidateSecondaryData()
                 interdir = null;
                 interparam = null;
                 approximation = null;
-                maxInterpolError = 0.0;
                 extent = BoundingCube.EmptyBoundingCube;
                 tetraederHull = null;
                 extrema = null;
@@ -551,7 +549,6 @@ public Changing(BSpline bSpline, bool keepNurbs)
                     bSpline.interpol = null;
                     bSpline.interdir = null;
                     bSpline.interparam = null;
-                    bSpline.maxInterpolError = 0.0;
                     if (!keepNurbs)
                     {
                         bSpline.nubs3d = null;

CADability/BSpline2D.cs

@@ -606,7 +606,7 @@ public BSpline2D(GeoPoint2D[] poles, double[] weights, double[] knots, int[] mul
             {
                 Init();
             }
-            catch (NurbsException ne)
+            catch (NurbsException)
             {
             }
             // sollte durch Start/Endparameter nur ein Teilbereich des Splines gelten, dann

CADability/Block.cs

@@ -751,7 +751,7 @@ protected Block(SerializationInfo info, StreamingContext context)
                 name = (string)info.GetValue("Name", typeof(string));
                 // FinishDeserialization.AddToContext(context,this);
             }
-            catch (SerializationException ex)
+            catch (SerializationException)
             {
                 SerializationInfoEnumerator e = info.GetEnumerator();
                 while (e.MoveNext())

CADability/BorderOperation.cs

@@ -317,7 +317,7 @@ private void GenerateClusterSet()
                     GeoVector2D dir2 = border2.DirectionAt(isp[j].par2).Normalized;
                     dirz = dir1.x * dir2.y - dir1.y * dir2.x;
                 }
-                catch (GeoVectorException e)
+                catch (GeoVectorException)
                 {
                     dirz = 0.0;
                 }

CADability/BorderQuadTree.cs

@@ -717,7 +717,7 @@ public BorderQuadTree(Border bdr1, Border bdr2, double precision)
                         position = BorderPosition.intersecting;
                         break;
                     }
-                    catch (CriticalPosition cp)
+                    catch (CriticalPosition)
                     {   // Korrekturwert für nächste Runde, wenn es einen Schnittpunkt genau auf einer Kante gab oder einen tangentialen Schnitt
                         center = center + korr;
                         width = width + korr.Length;

CADability/BoundingRect.cs

@@ -12,7 +12,7 @@ namespace CADability
     /// so assignements always make a copy.
     /// </summary>
     [Serializable()]
-    public struct BoundingRect : IQuadTreeInsertable, IComparable<BoundingRect>, ISerializable
+    public struct BoundingRect : IQuadTreeInsertable, IComparable<BoundingRect>, ISerializable, IEquatable<BoundingRect>
     {
         public double Left;
         public double Right;
@@ -824,6 +824,27 @@ internal GeoPoint2D[] GetLines(double v1, double v2)
         }
         #endregion
 
+        public bool Equals(BoundingRect other)
+        {
+            return Left.Equals(other.Left) && Right.Equals(other.Right) && Bottom.Equals(other.Bottom) && Top.Equals(other.Top);
+        }
+
+        public override bool Equals(object obj)
+        {
+            return obj is BoundingRect other && Equals(other);
+        }
+
+        public override int GetHashCode()
+        {
+            unchecked
+            {
+                var hashCode = Left.GetHashCode();
+                hashCode = (hashCode * 397) ^ Right.GetHashCode();
+                hashCode = (hashCode * 397) ^ Bottom.GetHashCode();
+                hashCode = (hashCode * 397) ^ Top.GetHashCode();
+                return hashCode;
+            }
+        }
     }
 
 }

CADability/ColorDef.cs

@@ -202,7 +202,7 @@ public ColorDef(SerializationInfo info, StreamingContext context)
             {
                 color = (Color)info.GetValue("Color", typeof(Color));
             }
-            catch (Exception e)
+            catch (Exception)
             {
                 color = Color.Black;
             }

CADability/ColorSetting.cs

@@ -73,7 +73,7 @@ protected ColorSetting(SerializationInfo info, StreamingContext context)
                 color = (Color)info.GetValue("Color", typeof(Color));
                 object dbg = info.GetValue("Color", typeof(object));
             }
-            catch (Exception e)
+            catch (Exception)
             {
                 color = Color.Black;
             }

CADability/ConstrHatchInside.cs

@@ -259,7 +259,7 @@ private void OnPoint(GeoPoint p)
                     {
                         findShapeThread.Abort();
                     }
-                    catch (System.Threading.ThreadStateException e)
+                    catch (System.Threading.ThreadStateException)
                     {
                         findShapeIsRunning = false;
                         return; // keinen weiteren thread starten
@@ -269,7 +269,7 @@ private void OnPoint(GeoPoint p)
                 {
                     findShapeThread.Join();
                 }
-                catch (System.Threading.ThreadStateException e)
+                catch (System.Threading.ThreadStateException)
                 {
                     findShapeIsRunning = false;
                     return; // keinen weiteren thread starten

CADability/CoordSys.cs

@@ -54,7 +54,7 @@ public CoordSys(GeoPoint Location, GeoVector DirectionX, GeoVector DirectionY)
                 directionY.Norm();
                 directionZ.Norm();
             }
-            catch (GeoVectorException e)
+            catch (GeoVectorException)
             {
                 throw new CoordSysException(CoordSysException.tExceptionType.ConstructorFailed);
             }

CADability/DualSurfaceCurve.cs

@@ -615,7 +615,6 @@ public class ProjectedCurve : GeneralCurve2D, ISerializable
         BoundingRect periodicDomain; // only for periodic domains: to which period the 3d points should be mapped
         GeoPoint2D startPoint2d, endPoint2d;
         bool startPointIsPole, endPointIsPole;
-        bool spu, epu; // starting or ending pole in u
 #if DEBUG
         static int debugCounter = 0;
         private int debugCount; // to identify instance when debugging
@@ -704,14 +703,12 @@ public ProjectedCurve(ICurve curve3D, ISurface surface, bool forward, BoundingRe
                     GeoPoint2D tmp = surface.PositionOf(curve3D.PointAt(0.1));
                     startPoint2d = new GeoPoint2D(us[i], tmp.y);
                     startPointIsPole = true;
-                    spu = true;
                 }
                 if ((pl | ep) < prec)
                 {
                     GeoPoint2D tmp = surface.PositionOf(curve3D.PointAt(0.9));
                     endPoint2d = new GeoPoint2D(us[i], tmp.y);
                     endPointIsPole = true;
-                    epu = true;
                 }
             }
             double[] vs = surface.GetVSingularities();
@@ -723,14 +720,12 @@ public ProjectedCurve(ICurve curve3D, ISurface surface, bool forward, BoundingRe
                     GeoPoint2D tmp = surface.PositionOf(curve3D.PointAt(0.1));
                     startPoint2d = new GeoPoint2D(tmp.x, vs[i]);
                     startPointIsPole = true;
-                    spu = false;
                 }
                 if ((pl | ep) < prec*10)
                 {
                     GeoPoint2D tmp = surface.PositionOf(curve3D.PointAt(0.9));
                     endPoint2d = new GeoPoint2D(tmp.x, vs[i]);
                     endPointIsPole = true;
-                    epu = false;
                 }
             }
             if (forward)

CADability/Edge.cs

@@ -2713,7 +2713,7 @@ private void Approximate(SortedDictionary<double, GeoPoint2D> parpoint, ICurve2D
                     Polyline pdbg = Polyline.Construct();
                     pdbg.SetPoints(pnts, false);
                 }
-                catch (PolylineException ex) { };
+                catch (PolylineException) { };
             }
 #endif
             if (curve3d != null) dist = Math.Max(dist, curve3d.DistanceTo(mp));

CADability/Ellipse2D.cs

@@ -756,7 +756,7 @@ public double NewtonPerpendicular(GeoPoint2D fromHere, double position)
                 MinimizationResult mres = nm.FindMinimum(iof, new DenseVector(new double[] { position }));
                 return mres.MinimizingPoint[0];
             }
-            catch (Exception ex)
+            catch (Exception)
             {
                 return iof.Point[0];
             }

CADability/ExportToWebGl.cs

@@ -1231,7 +1231,7 @@ public bool WriteToFile(string outPath)
                     outfile.Close();
                 }
             }
-            catch (IOException e)
+            catch (IOException)
             {
                 return false;
             }

CADability/Face.cs

@@ -6305,7 +6305,7 @@ private void Triangulate(double precision)
                     }
                 }
             }
-            catch (ApplicationException e)
+            catch (ApplicationException)
             {   // something went wrong with the triangulation. This should not happen and needs to be debugged and fixed
             }
             triangleExtent = BoundingCube.EmptyBoundingCube; // needs to be recalculated
@@ -6606,7 +6606,7 @@ public void GetSimpleTriangulation(double precision, bool noInnerPoints, out Geo
                 }
 #endif
             }
-            catch (ApplicationException e)
+            catch (ApplicationException)
             {   // Selbstüberschneidungen von Löchern und Rand oder in den Rändern selbst
                 List<GeoPoint2D> sumTriUv = new List<GeoPoint2D>();
                 List<GeoPoint> sumTriPoint = new List<GeoPoint>();

CADability/Filter.cs

@@ -468,7 +468,7 @@ private static Dictionary<Type, string> FindAllGeoObjects()
                 }
                 return res;
             }
-            catch (System.Reflection.ReflectionTypeLoadException e)
+            catch (System.Reflection.ReflectionTypeLoadException)
             {
                 // MessageBox.Show(e.Message);
                 return new Dictionary<Type, string>();
@@ -770,7 +770,7 @@ public override void EndEdit(bool aborted, bool modified, string newValue)
                 {
                     Name = newValue;
                 }
-                catch (NameAlreadyExistsException e) { }
+                catch (NameAlreadyExistsException) { }
             }
         }
         public override string LabelText { get => Name; set => Name = value; }

CADability/GeneralCurve2D.cs

@@ -1627,7 +1627,7 @@ protected void MakeTriangulation()
                 if (directions[0].IsNullVector()) linterdir.Add((points[1] - points[0]).Normalized);
                 else linterdir.Add(directions[0].Normalized);
             }
-            catch (GeoVectorException ex)
+            catch (GeoVectorException)
             {
                 linterdir.Add(GeoVector2D.XAxis);
             }

CADability/LayerList.cs

@@ -544,7 +544,7 @@ private void OnRemoveUnused()
                     }
                 } while (found);
             }
-            catch (InvalidOperationException e)
+            catch (InvalidOperationException)
             {   // soll mal bei der Iteration vorgekommen sein (Mail vom 21.10 13, Nürnberger) kann ich mir aber nicht erklären
             }
         }

CADability/LayoutView.cs

@@ -129,7 +129,7 @@ public void Print(PrintDocument pd)
                 {
                     pd.Print();
                 }
-                catch (Exception e)
+                catch (Exception)
                 {
                 }
                 pd.PrintPage -= new PrintPageEventHandler(pdg.OnPrintPage);
@@ -141,7 +141,7 @@ public void Print(PrintDocument pd)
                 {
                     pd.Print();
                 }
-                catch (Exception e)
+                catch (Exception)
                 {
                 }
                 pd.PrintPage -= new PrintPageEventHandler(OnPrintPage);

CADability/MultiGeoPointProperty.cs

@@ -376,7 +376,7 @@ private void OnFilterSinglePointCommand(GeoPointProperty sender, string menuId,
                             break;
                     }
                 }
-                catch (IndexOutOfRangeException e)
+                catch (IndexOutOfRangeException)
                 {
                 }
             }

CADability/NurbsSurface.cs

@@ -1976,7 +1976,7 @@ bool GetSimpleSurfaceX(double precision, out ISurface simpleSurface, out ModOp2D
                     {
                         reparametrisation = ModOp2D.Fit(srcf, dstf, true);
                     }
-                    catch (ModOpException mex)
+                    catch (ModOpException)
                     {
                         return false;
                     }
@@ -2825,7 +2825,7 @@ private bool isPlanarSurface(double precision, out ISurface simpleSurface, out M
                         if (!isPlane) break;
                     }
                 }
-                catch (ModOpException mex)
+                catch (ModOpException)
                 {
                     isPlane = false;
                 }

CADability/Plane.cs

@@ -123,7 +123,7 @@ public Plane(GeoPoint Location, GeoVector DirectionX, GeoVector DirectionY)
             {
                 coordSys = new CoordSys(Location, DirectionX, DirectionY);
             }
-            catch (CoordSysException e)
+            catch (CoordSysException)
             {
                 throw new PlaneException(PlaneException.tExceptionType.ConstructorFailed);
             }

CADability/PrintToGDI.cs

@@ -663,7 +663,7 @@ public override void Print(Graphics gr, bool doShading)
             {
                 ff = new FontFamily(fontName);
             }
-            catch (System.ArgumentException ae)
+            catch (System.ArgumentException)
             {
                 ff = new FontFamily(System.Drawing.Text.GenericFontFamilies.SansSerif);
             }
@@ -909,7 +909,7 @@ public override int CompareCommonPointZ(BoundingRect rect, IPrintItemImpl other)
                             GeoPoint2D ip = cs.SimpleShapes[0].Outline.SomeInnerPoint;
                             return ZPositionAt(ip).CompareTo((other as PrintTriangle).ZPositionAt(ip));
                         }
-                        catch (BorderException ex)
+                        catch (BorderException)
                         {
                             return 0;
                         }
@@ -1230,7 +1230,7 @@ public override void Print(Graphics gr, bool doShading)
                     br.Dispose();
                 }
             }
-            catch (Exception ex)
+            catch (Exception)
             {
             }
 
@@ -1535,7 +1535,7 @@ public static void PrintSinglePage(Project pr, string nameOfView, bool print2D,
                     pd.PrintPage -= new PrintPageEventHandler(ptg.OnPrintPage);
                     (found as IView).Projection.ShowFaces = sf;
                 }
-            } catch (Exception ex)
+            } catch (Exception)
             {
                 // MessageBox.Show(ex.StackTrace, "Exception in PrintSinglePage");
             }
@@ -1844,7 +1844,7 @@ public void OnPrintPage(object sender, PrintPageEventArgs e)
                     e.Graphics.DrawImage(bmp, dest, src, GraphicsUnit.Pixel);
                 }
             }
-            catch (Exception ex)
+            catch (Exception)
             {
                 // MessageBox.Show(ex.StackTrace, "Exception in OnPrintPage");
             }
@@ -2488,7 +2488,7 @@ void IPaintTo3D.Text(GeoVector lineDirection, GeoVector glyphDirection, GeoPoint
                 {
                     ff = new FontFamily(fontName);
                 }
-                catch (System.ArgumentException ae)
+                catch (System.ArgumentException)
                 {
                     ff = new FontFamily(System.Drawing.Text.GenericFontFamilies.SansSerif);
                 }

CADability/Project.cs

@@ -1472,7 +1472,7 @@ public static Project ReadFromStream(Stream stream)
                 }
                 return null;
             }
-            catch (Exception e)
+            catch (Exception)
             {
                 formatter = new BinaryFormatter(); // (null, new StreamingContext(StreamingContextStates.File, finishDeserialization));
                 formatter.Binder = new CondorSerializationBinder();
@@ -1603,7 +1603,7 @@ internal static Project ReadFromFile(string FileName, bool useProgress)
                     }
                     res.fileName = FileName;
                 }
-                catch (ProjectOldVersionException ex)
+                catch (ProjectOldVersionException)
                 {
                     stream.Close();
                     stream.Dispose();

CADability/Projection.cs

@@ -1548,7 +1548,7 @@ public GeoObjectList MakeArrow(GeoPoint p1, GeoPoint p2, Plane plane, ArrowMode
                     res.Add(Face.MakeFace(new PlaneSurface(arrowPlane), new SimpleShape(Border.MakeCircle(GeoPoint2D.Origin, arrowSize))));
                     res.Add(Face.MakeFace(new PlaneSurface(arrowPlane), new SimpleShape(Border.MakePolygon(new GeoPoint2D[] { new GeoPoint2D(headx, 0), new GeoPoint2D(headx - arrowSize, arrowSize), new GeoPoint2D(headx - arrowSize, -arrowSize) }))));
                 }
-                catch (PlaneException _) { }
+                catch (PlaneException) { }
             }
             return res;
         }