nettika/mattercontrol
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

more generic public property editor

Browse source
This commit is contained in:
MatterHackers 2023-03-27 08:41:34 -07:00
parent 5efa5c1f41
commit 393f3b9e9c
4 changed files with 27 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

3
MatterControlLib/DesignTools/Primitives/ComponentObject3D.cs
View file

@ -172,7 +172,8 @@ namespace MatterHackers.MatterControl.DesignTools
for (int i=0; i<SurfacedEditors.Count; i++)
{
var (cellId, cellData) = this.DecodeContent(i);
if (cellData.StartsWith("="))
if (cellData != null
&& cellData.StartsWith("="))
{
var expression = new DoubleOrExpression(cellData);
var controledSheet = ControledSheet;

9
MatterControlLib/DesignTools/PublicPropertyEditor.cs
View file

@ -1077,9 +1077,12 @@ namespace MatterHackers.MatterControl.DesignTools
}
}
propertyObject3D.Invalidated += RefreshField;
wrappedTextWidget.Closed += (s, e) => propertyObject3D.Invalidated -= RefreshField;
}
if (propertyObject3D != null)
{
propertyObject3D.Invalidated += RefreshField;
wrappedTextWidget.Closed += (s, e) => propertyObject3D.Invalidated -= RefreshField;
}
}
else // normal edit row
{
if (property.PropertyInfo.GetCustomAttributes(true).OfType<MultiLineEditAttribute>().FirstOrDefault() != null)

18
StaticData/Translations/Master.txt
View file

@ -925,6 +925,9 @@ Translated:Color 3
English:Color 4
Translated:Color 4
English:Color Name
Translated:Color Name
English:Color View
Translated:Color View
@ -1411,6 +1414,9 @@ Translated:Distance From Object
English:Distance or Loops
Translated:Distance or Loops
English:Do CSG
Translated:Do CSG
English:Documents
Translated:Documents
@ -3577,6 +3583,12 @@ Translated:PEI Bed Temperature
English:Percentage of
Translated:Percentage of
English:Performe a union before exporting. Might be slower but can clean up some models.
Translated:Performe a union before exporting. Might be slower but can clean up some models.
English:Performe Union
Translated:Performe Union
English:Perimeter Acceleration
Translated:Perimeter Acceleration
@ -4432,6 +4444,12 @@ Translated:Save changes ?
English:Save Changes?
Translated:Save Changes?
English:Save Each Separately
Translated:Save Each Separately
English:Save every object as a separate STL using its name. The save filename will be used if no name can be found.
Translated:Save every object as a separate STL using its name. The save filename will be used if no name can be found.
English:Save file:
Translated:Save file:

2
Submodules/agg-sharp

@ -1 +1 @@
Subproject commit 0152308cca0c9768f6cd4c2efddc0a1376026828
Subproject commit 370c3bd1ce6eb0f7c8e515249425ada033264b83