Adding IntOrExpression
This commit is contained in:
parent
eaac193ae8
commit
28bd0a1071
7 changed files with 132 additions and 10 deletions
|
|
@ -1,70 +0,0 @@
|
|||
/*
|
||||
Copyright (c) 2019, Lars Brubaker, John Lewin
|
||||
All rights reserved.
|
||||
|
||||
Redistribution and use in source and binary forms, with or without
|
||||
modification, are permitted provided that the following conditions are met:
|
||||
|
||||
1. Redistributions of source code must retain the above copyright notice, this
|
||||
list of conditions and the following disclaimer.
|
||||
2. Redistributions in binary form must reproduce the above copyright notice,
|
||||
this list of conditions and the following disclaimer in the documentation
|
||||
and/or other materials provided with the distribution.
|
||||
|
||||
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
|
||||
ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
|
||||
WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
|
||||
DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
|
||||
ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
|
||||
(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
|
||||
LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
|
||||
ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
|
||||
(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
|
||||
SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
||||
|
||||
The views and conclusions contained in the software and documentation are those
|
||||
of the authors and should not be interpreted as representing official policies,
|
||||
either expressed or implied, of the FreeBSD Project.
|
||||
*/
|
||||
|
||||
using System.ComponentModel;
|
||||
using MatterHackers.DataConverters3D;
|
||||
|
||||
namespace MatterHackers.MatterControl.DesignTools
|
||||
{
|
||||
[TypeConverter(typeof(DoubleOrExpression))]
|
||||
public class DoubleOrExpression
|
||||
{
|
||||
public string Expression { get; set; }
|
||||
|
||||
public double Value(IObject3D owner)
|
||||
{
|
||||
if (double.TryParse(Expression, out double result))
|
||||
{
|
||||
return result;
|
||||
}
|
||||
|
||||
return SheetObject3D.EvaluateExpression<double>(owner, Expression);
|
||||
}
|
||||
|
||||
public DoubleOrExpression(double value)
|
||||
{
|
||||
Expression = value.ToString();
|
||||
}
|
||||
|
||||
public DoubleOrExpression(string expression)
|
||||
{
|
||||
Expression = expression;
|
||||
}
|
||||
|
||||
public static implicit operator DoubleOrExpression(double value)
|
||||
{
|
||||
return new DoubleOrExpression(value);
|
||||
}
|
||||
|
||||
public static implicit operator DoubleOrExpression(string expression)
|
||||
{
|
||||
return new DoubleOrExpression(expression);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
@ -1,258 +0,0 @@
|
|||
/*
|
||||
Copyright (c) 2019, Lars Brubaker, John Lewin
|
||||
All rights reserved.
|
||||
|
||||
Redistribution and use in source and binary forms, with or without
|
||||
modification, are permitted provided that the following conditions are met:
|
||||
|
||||
1. Redistributions of source code must retain the above copyright notice, this
|
||||
list of conditions and the following disclaimer.
|
||||
2. Redistributions in binary form must reproduce the above copyright notice,
|
||||
this list of conditions and the following disclaimer in the documentation
|
||||
and/or other materials provided with the distribution.
|
||||
|
||||
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
|
||||
ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
|
||||
WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
|
||||
DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
|
||||
ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
|
||||
(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
|
||||
LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
|
||||
ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
|
||||
(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
|
||||
SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
||||
|
||||
The views and conclusions contained in the software and documentation are those
|
||||
of the authors and should not be interpreted as representing official policies,
|
||||
either expressed or implied, of the FreeBSD Project.
|
||||
*/
|
||||
|
||||
using System.Collections.Generic;
|
||||
using org.mariuszgromada.math.mxparser;
|
||||
using Newtonsoft.Json;
|
||||
using System.Linq;
|
||||
|
||||
namespace MatterHackers.MatterControl.DesignTools
|
||||
{
|
||||
public class SheetData
|
||||
{
|
||||
public SheetData()
|
||||
{
|
||||
}
|
||||
|
||||
public SheetData(int width, int height)
|
||||
{
|
||||
this.Rows = new List<RowData>(height);
|
||||
for (int i = 0; i < height; i++)
|
||||
{
|
||||
Rows.Add(new RowData(width));
|
||||
}
|
||||
}
|
||||
|
||||
public string EvaluateExpression(string expression)
|
||||
{
|
||||
if (!tabelCalculated)
|
||||
{
|
||||
Recalculate();
|
||||
}
|
||||
|
||||
var evaluator = new Expression(expression);
|
||||
AddConstants(evaluator);
|
||||
var value = evaluator.calculate();
|
||||
|
||||
return value.ToString();
|
||||
}
|
||||
|
||||
public string CellId(int x, int y)
|
||||
{
|
||||
return $"{(char)('A' + x)}{y + 1}";
|
||||
}
|
||||
|
||||
public TableCell this[int x, int y]
|
||||
{
|
||||
get
|
||||
{
|
||||
return this[CellId(x, y)];
|
||||
}
|
||||
|
||||
set
|
||||
{
|
||||
this[CellId(x, y)] = value;
|
||||
}
|
||||
}
|
||||
|
||||
public TableCell this[string cellId]
|
||||
{
|
||||
get
|
||||
{
|
||||
if (cellId.Length == 2)
|
||||
{
|
||||
var x = cellId.Substring(0, 1).ToUpper()[0] - 'A';
|
||||
var y = cellId.Substring(1, 1)[0] - '1';
|
||||
return Rows[y].Cells[x];
|
||||
}
|
||||
else
|
||||
{
|
||||
foreach (var row in Rows)
|
||||
{
|
||||
foreach(var cell in row.Cells)
|
||||
{
|
||||
if (cell.Name == cellId)
|
||||
{
|
||||
return cell;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
return null;
|
||||
}
|
||||
|
||||
set
|
||||
{
|
||||
if (cellId.Length == 2)
|
||||
{
|
||||
var x = cellId.Substring(0, 1).ToUpper()[0] - 'A';
|
||||
var y = cellId.Substring(1, 1)[0] - '1';
|
||||
Rows[y].Cells[x] = value;
|
||||
}
|
||||
else
|
||||
{
|
||||
foreach (var row in Rows)
|
||||
{
|
||||
for (int i = 0; i < row.Cells.Count; i++)
|
||||
{
|
||||
if (row.Cells[i].Name == cellId)
|
||||
{
|
||||
row.Cells[i] = value;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
[JsonIgnore]
|
||||
public int Width => Rows.Count;
|
||||
|
||||
[JsonIgnore]
|
||||
public int Height => Rows[0].Cells.Count;
|
||||
|
||||
public class CellFormat
|
||||
{
|
||||
public enum DataTypes
|
||||
{
|
||||
String,
|
||||
Number,
|
||||
Curency,
|
||||
DateTime,
|
||||
}
|
||||
|
||||
public int DecimalPlaces = 10;
|
||||
public DataTypes DataType;
|
||||
public Agg.Font.Justification Justification;
|
||||
public bool Bold;
|
||||
}
|
||||
|
||||
public class TableCell
|
||||
{
|
||||
/// <summary>
|
||||
/// The user override id for this cell
|
||||
/// </summary>
|
||||
public string Name;
|
||||
|
||||
/// <summary>
|
||||
/// The actual content typed into the cell
|
||||
/// </summary>
|
||||
public string Expression = "";
|
||||
|
||||
/// <summary>
|
||||
/// How to format this data in the display
|
||||
/// </summary>
|
||||
public CellFormat Format;
|
||||
|
||||
public override string ToString()
|
||||
{
|
||||
return Expression;
|
||||
}
|
||||
}
|
||||
|
||||
public class RowData
|
||||
{
|
||||
public List<TableCell> Cells = new List<TableCell>();
|
||||
|
||||
public RowData()
|
||||
{
|
||||
}
|
||||
|
||||
public RowData(int numItems)
|
||||
{
|
||||
Cells = new List<TableCell>(numItems);
|
||||
for (int i = 0; i < numItems; i++)
|
||||
{
|
||||
Cells.Add(new TableCell());
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
public List<RowData> Rows = new List<RowData>();
|
||||
|
||||
Dictionary<string, double> constants = new Dictionary<string, double>();
|
||||
private bool tabelCalculated;
|
||||
|
||||
private IEnumerable<(int x, int y, TableCell cell)> EnumerateCells()
|
||||
{
|
||||
for (int y = 0; y < Rows.Count; y++)
|
||||
{
|
||||
for (int x = 0; x < Rows[y].Cells.Count; x++)
|
||||
{
|
||||
yield return (x, y, this[x, y]);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
public void Recalculate()
|
||||
{
|
||||
constants.Clear();
|
||||
|
||||
// WIP: sort the cell by reference (needs to be DAG)
|
||||
var list = EnumerateCells().OrderByDescending(i => i.cell.Expression).ToList();
|
||||
foreach (var xyc in list)
|
||||
{
|
||||
var expression = xyc.cell.Expression;
|
||||
if (expression.StartsWith("="))
|
||||
{
|
||||
expression = expression.Substring(1);
|
||||
}
|
||||
if (expression.StartsWith("."))
|
||||
{
|
||||
expression = "0" + expression;
|
||||
}
|
||||
var evaluator = new Expression(expression);
|
||||
AddConstants(evaluator);
|
||||
var value = evaluator.calculate();
|
||||
if (double.IsNaN(value)
|
||||
|| double.IsInfinity(value))
|
||||
{
|
||||
value = 0;
|
||||
}
|
||||
|
||||
constants.Add(CellId(xyc.x, xyc.y), value);
|
||||
if (!string.IsNullOrEmpty(xyc.cell.Name))
|
||||
{
|
||||
constants.Add(xyc.cell.Name, value);
|
||||
}
|
||||
}
|
||||
|
||||
tabelCalculated = true;
|
||||
}
|
||||
|
||||
private void AddConstants(Expression evaluator)
|
||||
{
|
||||
foreach(var kvp in constants)
|
||||
{
|
||||
evaluator.defineConstant(kvp.Key, kvp.Value);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
@ -1,152 +0,0 @@
|
|||
/*
|
||||
Copyright (c) 2019, Lars Brubaker, John Lewin
|
||||
All rights reserved.
|
||||
|
||||
Redistribution and use in source and binary forms, with or without
|
||||
modification, are permitted provided that the following conditions are met:
|
||||
|
||||
1. Redistributions of source code must retain the above copyright notice, this
|
||||
list of conditions and the following disclaimer.
|
||||
2. Redistributions in binary form must reproduce the above copyright notice,
|
||||
this list of conditions and the following disclaimer in the documentation
|
||||
and/or other materials provided with the distribution.
|
||||
|
||||
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
|
||||
ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
|
||||
WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
|
||||
DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
|
||||
ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
|
||||
(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
|
||||
LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
|
||||
ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
|
||||
(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
|
||||
SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
||||
|
||||
The views and conclusions contained in the software and documentation are those
|
||||
of the authors and should not be interpreted as representing official policies,
|
||||
either expressed or implied, of the FreeBSD Project.
|
||||
*/
|
||||
|
||||
using System;
|
||||
using System.IO;
|
||||
using System.Linq;
|
||||
using System.Threading;
|
||||
using System.Threading.Tasks;
|
||||
using MatterHackers.Agg.Platform;
|
||||
using MatterHackers.DataConverters3D;
|
||||
using MatterHackers.MatterControl.PartPreviewWindow;
|
||||
using MatterHackers.PolygonMesh;
|
||||
|
||||
namespace MatterHackers.MatterControl.DesignTools
|
||||
{
|
||||
[HideChildrenFromTreeView]
|
||||
[HideMeterialAndColor]
|
||||
public class SheetObject3D : Object3D, IObject3DControlsProvider
|
||||
{
|
||||
public SheetData SheetData { get; set; }
|
||||
|
||||
public override Mesh Mesh
|
||||
{
|
||||
get
|
||||
{
|
||||
if (!this.Children.Where(i => i.VisibleMeshes().Count() > 0).Any())
|
||||
{
|
||||
// add the amf content
|
||||
using (Stream measureAmfStream = StaticData.Instance.OpenStream(Path.Combine("Stls", "description_tool.amf")))
|
||||
{
|
||||
Children.Modify((list) =>
|
||||
{
|
||||
list.Clear();
|
||||
list.Add(AmfDocument.Load(measureAmfStream, CancellationToken.None));
|
||||
});
|
||||
}
|
||||
}
|
||||
|
||||
return base.Mesh;
|
||||
}
|
||||
|
||||
set => base.Mesh = value;
|
||||
}
|
||||
|
||||
public static async Task<SheetObject3D> Create()
|
||||
{
|
||||
var item = new SheetObject3D
|
||||
{
|
||||
SheetData = new SheetData(5, 5)
|
||||
};
|
||||
await item.Rebuild();
|
||||
return item;
|
||||
}
|
||||
|
||||
public override void OnInvalidate(InvalidateArgs invalidateType)
|
||||
{
|
||||
if (invalidateType.InvalidateType.HasFlag(InvalidateType.SheetUpdated) && invalidateType.Source == this)
|
||||
{
|
||||
using (RebuildLock())
|
||||
{
|
||||
// send a message to all our siblings and their children
|
||||
SendInvalidateToAll();
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
base.OnInvalidate(invalidateType);
|
||||
}
|
||||
}
|
||||
|
||||
private void SendInvalidateToAll()
|
||||
{
|
||||
foreach (var sibling in this.Parent.Children)
|
||||
{
|
||||
SendInvalidateRecursive(sibling);
|
||||
}
|
||||
}
|
||||
|
||||
private void SendInvalidateRecursive(IObject3D item)
|
||||
{
|
||||
// process depth first
|
||||
foreach(var child in item.Children)
|
||||
{
|
||||
SendInvalidateRecursive(child);
|
||||
}
|
||||
|
||||
// and send the invalidate
|
||||
item.Invalidate(new InvalidateArgs(item, InvalidateType.SheetUpdated));
|
||||
}
|
||||
|
||||
public static T EvaluateExpression<T>(IObject3D owner, string inputExpression)
|
||||
{
|
||||
// look through all the parents
|
||||
foreach (var parent in owner.Parents())
|
||||
{
|
||||
// then each child of any give parent
|
||||
foreach (var sibling in parent.Children)
|
||||
{
|
||||
// if it is a sheet
|
||||
if (sibling != owner
|
||||
&& sibling is SheetObject3D sheet)
|
||||
{
|
||||
// try to manage the cell into the correct data type
|
||||
string value = sheet.SheetData.EvaluateExpression(inputExpression);
|
||||
|
||||
if (typeof(T) == typeof(double))
|
||||
{
|
||||
if (double.TryParse(value, out double doubleValue))
|
||||
{
|
||||
return (T)(object)doubleValue;
|
||||
}
|
||||
// else return an error
|
||||
return (T)(object)5.5;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
throw new NotImplementedException();
|
||||
}
|
||||
|
||||
public void AddObject3DControls(Object3DControlsLayer object3DControlsLayer)
|
||||
{
|
||||
}
|
||||
}
|
||||
}
|
||||
Loading…
Add table
Add a link
Reference in a new issue