[mapguide-commits] r6366 - in trunk/Tools/Maestro/Maestro.Editors:
. Common FeatureSource/Extensions FeatureSource/Preview
LayerDefinition LayerDefinition/Vector LayerDefinition/Vector/Scales
LayerDefinition/Vector/StyleEditors Properties
SymbolDefinition WebLayout/Commands
svn_mapguide at osgeo.org
svn_mapguide at osgeo.org
Sun Dec 25 11:14:39 EST 2011
Author: jng
Date: 2011-12-25 08:14:39 -0800 (Sun, 25 Dec 2011)
New Revision: 6366
Modified:
trunk/Tools/Maestro/Maestro.Editors/Common/ExpressionEditor.cs
trunk/Tools/Maestro/Maestro.Editors/FeatureSource/Extensions/CalculationSettings.cs
trunk/Tools/Maestro/Maestro.Editors/FeatureSource/Preview/StandardQueryCtrl.cs
trunk/Tools/Maestro/Maestro.Editors/IEditorService.cs
trunk/Tools/Maestro/Maestro.Editors/LayerDefinition/Vector/Scales/Condition.cs
trunk/Tools/Maestro/Maestro.Editors/LayerDefinition/Vector/Scales/SymbolInstanceSettingsCtrl.cs
trunk/Tools/Maestro/Maestro.Editors/LayerDefinition/Vector/StyleEditors/AreaFeatureStyleEditor.cs
trunk/Tools/Maestro/Maestro.Editors/LayerDefinition/Vector/StyleEditors/ElevationDialog.cs
trunk/Tools/Maestro/Maestro.Editors/LayerDefinition/Vector/StyleEditors/FontStyleEditor.cs
trunk/Tools/Maestro/Maestro.Editors/LayerDefinition/Vector/StyleEditors/LineFeatureStyleEditor.cs
trunk/Tools/Maestro/Maestro.Editors/LayerDefinition/Vector/StyleEditors/PointFeatureStyleEditor.cs
trunk/Tools/Maestro/Maestro.Editors/LayerDefinition/Vector/VectorLayerSettingsSectionCtrl.cs
trunk/Tools/Maestro/Maestro.Editors/LayerDefinition/VectorLayerEditorCtrl.cs
trunk/Tools/Maestro/Maestro.Editors/Properties/Resources.Designer.cs
trunk/Tools/Maestro/Maestro.Editors/Properties/Resources.resx
trunk/Tools/Maestro/Maestro.Editors/ResourceEditorServiceBase.cs
trunk/Tools/Maestro/Maestro.Editors/SymbolDefinition/SymbolEditorService.cs
trunk/Tools/Maestro/Maestro.Editors/WebLayout/Commands/SearchCmdCtrl.cs
Log:
#1902: Add a flag that determines whether stylization functions are attached to the function list in the Expression Editor. Layer Definition editor components that invoke the Expression Editor will set this flag to true
Modified: trunk/Tools/Maestro/Maestro.Editors/Common/ExpressionEditor.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Editors/Common/ExpressionEditor.cs 2011-12-25 15:30:51 UTC (rev 6365)
+++ trunk/Tools/Maestro/Maestro.Editors/Common/ExpressionEditor.cs 2011-12-25 16:14:39 UTC (rev 6366)
@@ -107,7 +107,8 @@
/// <param name="caps">The provider capabilities.</param>
/// <param name="cls">The class definition.</param>
/// <param name="featuresSourceId">The features source id.</param>
- public void Initialize(IFeatureService featSvc, FdoProviderCapabilities caps, ClassDefinition cls, string featuresSourceId)
+ /// <param name="attachStylizationFunctions">if set to <c>true</c> stylization functions are also attached</param>
+ public void Initialize(IFeatureService featSvc, FdoProviderCapabilities caps, ClassDefinition cls, string featuresSourceId, bool attachStylizationFunctions)
{
try
{
@@ -154,6 +155,14 @@
sortedFuncs.Add(func.Name, func);
}
+ if (attachStylizationFunctions)
+ {
+ foreach (var func in GetStylizationFunctions())
+ {
+ sortedFuncs.Add(func.Name, func);
+ }
+ }
+
foreach (FdoProviderCapabilitiesExpressionFunctionDefinition func in sortedFuncs.Values)
{
string name = func.Name;
@@ -175,6 +184,8 @@
btnFunctions.DropDown.Items.Add(btn);
}
LoadCompletableFunctions(caps.Expression.FunctionDefinitionList);
+ if (attachStylizationFunctions)
+ LoadCompletableFunctions(GetStylizationFunctions());
//Spatial Operators
foreach (FdoProviderCapabilitiesFilterOperation op in caps.Filter.Spatial)
@@ -234,6 +245,218 @@
}
+ private IEnumerable<FdoProviderCapabilitiesExpressionFunctionDefinition> GetStylizationFunctions()
+ {
+ //ARGB
+ yield return new FdoProviderCapabilitiesExpressionFunctionDefinition()
+ {
+ ArgumentDefinitionList = new BindingList<FdoProviderCapabilitiesExpressionFunctionDefinitionArgumentDefinition>()
+ {
+ new FdoProviderCapabilitiesExpressionFunctionDefinitionArgumentDefinition()
+ {
+ Name = "aValue",
+ Description = Properties.Resources.Func_ARGB_AValueDescription,
+ DataType = FdoProviderCapabilitiesExpressionFunctionDefinitionArgumentDefinitionDataType.Int32
+ },
+ new FdoProviderCapabilitiesExpressionFunctionDefinitionArgumentDefinition()
+ {
+ Name = "rValue",
+ Description = Properties.Resources.Func_ARGB_RValueDescription,
+ DataType = FdoProviderCapabilitiesExpressionFunctionDefinitionArgumentDefinitionDataType.Int32
+ },
+ new FdoProviderCapabilitiesExpressionFunctionDefinitionArgumentDefinition()
+ {
+ Name = "gValue",
+ Description = Properties.Resources.Func_ARGB_GValueDescription,
+ DataType = FdoProviderCapabilitiesExpressionFunctionDefinitionArgumentDefinitionDataType.Int32
+ },
+ new FdoProviderCapabilitiesExpressionFunctionDefinitionArgumentDefinition()
+ {
+ Name = "bValue",
+ Description = Properties.Resources.Func_ARGB_BValueDescription,
+ DataType = FdoProviderCapabilitiesExpressionFunctionDefinitionArgumentDefinitionDataType.Int32
+ },
+ },
+ Description = Properties.Resources.Func_ARGB_Description,
+ Name = "ARGB",
+ ReturnType = "Int32"
+ };
+ //DECAP
+ yield return new FdoProviderCapabilitiesExpressionFunctionDefinition()
+ {
+ ArgumentDefinitionList = new BindingList<FdoProviderCapabilitiesExpressionFunctionDefinitionArgumentDefinition>()
+ {
+ new FdoProviderCapabilitiesExpressionFunctionDefinitionArgumentDefinition()
+ {
+ Name = "strValue",
+ Description = Properties.Resources.Func_DECAP_StringValueDescription,
+ DataType = FdoProviderCapabilitiesExpressionFunctionDefinitionArgumentDefinitionDataType.String
+ }
+ },
+ Description = Properties.Resources.Func_DECAP_Description,
+ Name = "DECAP",
+ ReturnType = "String"
+ };
+ //FEATURECLASS
+ yield return new FdoProviderCapabilitiesExpressionFunctionDefinition()
+ {
+ ArgumentDefinitionList = new BindingList<FdoProviderCapabilitiesExpressionFunctionDefinitionArgumentDefinition>(),
+ Description = Properties.Resources.Func_FEATURECLASS_Description,
+ Name = "FEATURECLASS",
+ ReturnType = "String"
+ };
+ //FEATUREID
+ yield return new FdoProviderCapabilitiesExpressionFunctionDefinition()
+ {
+ ArgumentDefinitionList = new BindingList<FdoProviderCapabilitiesExpressionFunctionDefinitionArgumentDefinition>(),
+ Description = Properties.Resources.Func_FEATUREID_Description,
+ Name = "FEATUREID",
+ ReturnType = "String"
+ };
+ //IF
+ yield return new FdoProviderCapabilitiesExpressionFunctionDefinition()
+ {
+ ArgumentDefinitionList = new BindingList<FdoProviderCapabilitiesExpressionFunctionDefinitionArgumentDefinition>()
+ {
+ new FdoProviderCapabilitiesExpressionFunctionDefinitionArgumentDefinition()
+ {
+ Name = "condition",
+ Description = Properties.Resources.Func_IF_ConditionDescription,
+ DataType = FdoProviderCapabilitiesExpressionFunctionDefinitionArgumentDefinitionDataType.String
+ },
+ new FdoProviderCapabilitiesExpressionFunctionDefinitionArgumentDefinition()
+ {
+ Name = "trueValue",
+ Description = Properties.Resources.Func_IF_TrueValueDescription,
+ DataType = FdoProviderCapabilitiesExpressionFunctionDefinitionArgumentDefinitionDataType.String
+ },
+ new FdoProviderCapabilitiesExpressionFunctionDefinitionArgumentDefinition()
+ {
+ Name = "falseValue",
+ Description = Properties.Resources.Func_IF_FalseValueDescription,
+ DataType = FdoProviderCapabilitiesExpressionFunctionDefinitionArgumentDefinitionDataType.String
+ }
+ },
+ Description = Properties.Resources.Func_IF_Description,
+ Name = "IF",
+ ReturnType = "String"
+ };
+ //LAYERID
+ yield return new FdoProviderCapabilitiesExpressionFunctionDefinition()
+ {
+ ArgumentDefinitionList = new BindingList<FdoProviderCapabilitiesExpressionFunctionDefinitionArgumentDefinition>(),
+ Description = Properties.Resources.Func_LAYERID_Description,
+ Name = "LAYERID",
+ ReturnType = "String"
+ };
+ //LOOKUP
+ yield return new FdoProviderCapabilitiesExpressionFunctionDefinition()
+ {
+ ArgumentDefinitionList = new BindingList<FdoProviderCapabilitiesExpressionFunctionDefinitionArgumentDefinition>()
+ {
+ new FdoProviderCapabilitiesExpressionFunctionDefinitionArgumentDefinition()
+ {
+ Name = "expression",
+ Description = Properties.Resources.Func_LOOKUP_ExpressionDescription,
+ DataType = FdoProviderCapabilitiesExpressionFunctionDefinitionArgumentDefinitionDataType.String
+ },
+ new FdoProviderCapabilitiesExpressionFunctionDefinitionArgumentDefinition()
+ {
+ Name = "defaultValue",
+ Description = Properties.Resources.Func_LOOKUP_DefaultValueDescription,
+ DataType = FdoProviderCapabilitiesExpressionFunctionDefinitionArgumentDefinitionDataType.String
+ },
+ new FdoProviderCapabilitiesExpressionFunctionDefinitionArgumentDefinition()
+ {
+ Name = "index",
+ Description = Properties.Resources.Func_LOOKUP_IndexDescription,
+ DataType = FdoProviderCapabilitiesExpressionFunctionDefinitionArgumentDefinitionDataType.String
+ },
+ new FdoProviderCapabilitiesExpressionFunctionDefinitionArgumentDefinition()
+ {
+ Name = "value",
+ Description = Properties.Resources.Func_LOOKUP_ValueDescription,
+ DataType = FdoProviderCapabilitiesExpressionFunctionDefinitionArgumentDefinitionDataType.String
+ }
+ },
+ Description = Properties.Resources.Func_LOOKUP_Description,
+ Name = "LOOKUP",
+ ReturnType = "String"
+ };
+ //MAPNAME
+ yield return new FdoProviderCapabilitiesExpressionFunctionDefinition()
+ {
+ ArgumentDefinitionList = new BindingList<FdoProviderCapabilitiesExpressionFunctionDefinitionArgumentDefinition>(),
+ Description = Properties.Resources.Func_MAPNAME_Description,
+ Name = "MAPNAME",
+ ReturnType = "String"
+ };
+ //RANGE
+ yield return new FdoProviderCapabilitiesExpressionFunctionDefinition()
+ {
+ ArgumentDefinitionList = new BindingList<FdoProviderCapabilitiesExpressionFunctionDefinitionArgumentDefinition>()
+ {
+ new FdoProviderCapabilitiesExpressionFunctionDefinitionArgumentDefinition()
+ {
+ Name = "expression",
+ Description = Properties.Resources.Func_RANGE_ExpressionDescription,
+ DataType = FdoProviderCapabilitiesExpressionFunctionDefinitionArgumentDefinitionDataType.String
+ },
+ new FdoProviderCapabilitiesExpressionFunctionDefinitionArgumentDefinition()
+ {
+ Name = "rangeMin",
+ Description = Properties.Resources.Func_RANGE_MinDescription,
+ DataType = FdoProviderCapabilitiesExpressionFunctionDefinitionArgumentDefinitionDataType.String
+ },
+ new FdoProviderCapabilitiesExpressionFunctionDefinitionArgumentDefinition()
+ {
+ Name = "rangeMax",
+ Description = Properties.Resources.Func_RANGE_MaxDescription,
+ DataType = FdoProviderCapabilitiesExpressionFunctionDefinitionArgumentDefinitionDataType.String
+ },
+ new FdoProviderCapabilitiesExpressionFunctionDefinitionArgumentDefinition()
+ {
+ Name = "defaultValue",
+ Description = Properties.Resources.Func_RANGE_DefaultValueDescription,
+ DataType = FdoProviderCapabilitiesExpressionFunctionDefinitionArgumentDefinitionDataType.String
+ },
+ new FdoProviderCapabilitiesExpressionFunctionDefinitionArgumentDefinition()
+ {
+ Name = "value",
+ Description = Properties.Resources.Func_RANGE_ValueDescription,
+ DataType = FdoProviderCapabilitiesExpressionFunctionDefinitionArgumentDefinitionDataType.String
+ }
+ },
+ Description = Properties.Resources.Func_RANGE_Description,
+ Name = "RANGE",
+ ReturnType = "String"
+ };
+ //SESSION
+ yield return new FdoProviderCapabilitiesExpressionFunctionDefinition()
+ {
+ ArgumentDefinitionList = new BindingList<FdoProviderCapabilitiesExpressionFunctionDefinitionArgumentDefinition>(),
+ Description = Properties.Resources.Func_SESSION_Description,
+ Name = "SESSION",
+ ReturnType = "String"
+ };
+ //URLENCODE
+ yield return new FdoProviderCapabilitiesExpressionFunctionDefinition()
+ {
+ ArgumentDefinitionList = new BindingList<FdoProviderCapabilitiesExpressionFunctionDefinitionArgumentDefinition>()
+ {
+ new FdoProviderCapabilitiesExpressionFunctionDefinitionArgumentDefinition()
+ {
+ Name = "strValue",
+ Description = Properties.Resources.Func_URLENCODE_StringValueDescription,
+ DataType = FdoProviderCapabilitiesExpressionFunctionDefinitionArgumentDefinitionDataType.String
+ }
+ },
+ Description = Properties.Resources.Func_URLENCODE_Description,
+ Name = "URLENCODE",
+ ReturnType = "String"
+ };
+ }
+
private void InsertText(string exprText)
{
int index = ExpressionText.SelectionStart;
Modified: trunk/Tools/Maestro/Maestro.Editors/FeatureSource/Extensions/CalculationSettings.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Editors/FeatureSource/Extensions/CalculationSettings.cs 2011-12-25 15:30:51 UTC (rev 6365)
+++ trunk/Tools/Maestro/Maestro.Editors/FeatureSource/Extensions/CalculationSettings.cs 2011-12-25 16:14:39 UTC (rev 6366)
@@ -55,7 +55,7 @@
private void lnkEdit_LinkClicked(object sender, LinkLabelLinkClickedEventArgs e)
{
- string expr = _edSvc.EditExpression(txtExpression.Text, _cls, _parent.Provider, _parent.ResourceID);
+ string expr = _edSvc.EditExpression(txtExpression.Text, _cls, _parent.Provider, _parent.ResourceID, false);
if (expr != null)
{
txtExpression.Text = expr;
Modified: trunk/Tools/Maestro/Maestro.Editors/FeatureSource/Preview/StandardQueryCtrl.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Editors/FeatureSource/Preview/StandardQueryCtrl.cs 2011-12-25 15:30:51 UTC (rev 6365)
+++ trunk/Tools/Maestro/Maestro.Editors/FeatureSource/Preview/StandardQueryCtrl.cs 2011-12-25 16:14:39 UTC (rev 6366)
@@ -109,7 +109,7 @@
private void txtFilter_Click(object sender, EventArgs e)
{
var ed = new ExpressionEditor();
- ed.Initialize(_featSvc, _caps, _cls, _fsId);
+ ed.Initialize(_featSvc, _caps, _cls, _fsId, false);
ed.Expression = txtFilter.Text;
if (ed.ShowDialog() == DialogResult.OK)
{
@@ -136,7 +136,7 @@
private void btnAdd_Click(object sender, EventArgs e)
{
var ed = new ExpressionEditor();
- ed.Initialize(_featSvc, _caps, _cls, _fsId);
+ ed.Initialize(_featSvc, _caps, _cls, _fsId, false);
if (ed.ShowDialog() == DialogResult.OK)
{
grdExpressions.Rows.Add(GenerateAlias(), ed.Expression);
Modified: trunk/Tools/Maestro/Maestro.Editors/IEditorService.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Editors/IEditorService.cs 2011-12-25 15:30:51 UTC (rev 6365)
+++ trunk/Tools/Maestro/Maestro.Editors/IEditorService.cs 2011-12-25 16:14:39 UTC (rev 6366)
@@ -117,8 +117,9 @@
/// <param name="schema"></param>
/// <param name="providerName"></param>
/// <param name="featureSourceId"></param>
+ /// <param name="attachStylizationFunctions"></param>
/// <returns></returns>
- string EditExpression(string currentExpr, ClassDefinition schema, string providerName, string featureSourceId);
+ string EditExpression(string currentExpr, ClassDefinition schema, string providerName, string featureSourceId, bool attachStylizationFunctions);
/// <summary>
/// Gets the resource ID of the resource, whose session-copy is being edited
Modified: trunk/Tools/Maestro/Maestro.Editors/LayerDefinition/Vector/Scales/Condition.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Editors/LayerDefinition/Vector/Scales/Condition.cs 2011-12-25 15:30:51 UTC (rev 6365)
+++ trunk/Tools/Maestro/Maestro.Editors/LayerDefinition/Vector/Scales/Condition.cs 2011-12-25 16:14:39 UTC (rev 6366)
@@ -192,7 +192,7 @@
private void EditFilter_Click(object sender, EventArgs e)
{
- string tmp = m_owner.EditExpression(RuleCondition.Text);
+ string tmp = m_owner.EditExpression(RuleCondition.Text, false);
if (tmp != null)
RuleCondition.Text = tmp;
}
Modified: trunk/Tools/Maestro/Maestro.Editors/LayerDefinition/Vector/Scales/SymbolInstanceSettingsCtrl.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Editors/LayerDefinition/Vector/Scales/SymbolInstanceSettingsCtrl.cs 2011-12-25 15:30:51 UTC (rev 6365)
+++ trunk/Tools/Maestro/Maestro.Editors/LayerDefinition/Vector/Scales/SymbolInstanceSettingsCtrl.cs 2011-12-25 16:14:39 UTC (rev 6366)
@@ -168,7 +168,7 @@
if (grdOverrides.SelectedRows.Count == 1)
{
var ov = (IParameterOverride)grdOverrides.SelectedRows[0].DataBoundItem;
- string expr = _edSvc.EditExpression(ov.ParameterValue, _cls, _provider, _featureSourceId);
+ string expr = _edSvc.EditExpression(ov.ParameterValue, _cls, _provider, _featureSourceId, true);
if (expr != null)
{
ov.ParameterValue = expr;
Modified: trunk/Tools/Maestro/Maestro.Editors/LayerDefinition/Vector/StyleEditors/AreaFeatureStyleEditor.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Editors/LayerDefinition/Vector/StyleEditors/AreaFeatureStyleEditor.cs 2011-12-25 15:30:51 UTC (rev 6365)
+++ trunk/Tools/Maestro/Maestro.Editors/LayerDefinition/Vector/StyleEditors/AreaFeatureStyleEditor.cs 2011-12-25 16:14:39 UTC (rev 6366)
@@ -483,7 +483,7 @@
string expr = null;
if (current != null)
{
- expr = m_editor.EditExpression(current, m_schema, m_providername, m_featureSource);
+ expr = m_editor.EditExpression(current, m_schema, m_providername, m_featureSource, true);
if (!string.IsNullOrEmpty(expr))
current = expr;
}
@@ -543,14 +543,14 @@
private void fillStyleEditor_BackgroundRequiresExpression(object sender, EventArgs e)
{
- string expr = m_editor.EditExpression(fillStyleEditor.backgroundColor.ColorExpression, m_schema, m_providername, m_featureSource);
+ string expr = m_editor.EditExpression(fillStyleEditor.backgroundColor.ColorExpression, m_schema, m_providername, m_featureSource, true);
if (expr != null)
fillStyleEditor.backgroundColor.ColorExpression = expr;
}
private void fillStyleEditor_ForegroundRequiresExpression(object sender, EventArgs e)
{
- string expr = m_editor.EditExpression(fillStyleEditor.foregroundColor.ColorExpression, m_schema, m_providername, m_featureSource);
+ string expr = m_editor.EditExpression(fillStyleEditor.foregroundColor.ColorExpression, m_schema, m_providername, m_featureSource, true);
if (expr != null)
fillStyleEditor.foregroundColor.ColorExpression = expr;
}
Modified: trunk/Tools/Maestro/Maestro.Editors/LayerDefinition/Vector/StyleEditors/ElevationDialog.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Editors/LayerDefinition/Vector/StyleEditors/ElevationDialog.cs 2011-12-25 15:30:51 UTC (rev 6365)
+++ trunk/Tools/Maestro/Maestro.Editors/LayerDefinition/Vector/StyleEditors/ElevationDialog.cs 2011-12-25 16:14:39 UTC (rev 6366)
@@ -112,14 +112,14 @@
private void btnZOffset_Click(object sender, EventArgs e)
{
- string expr = _edSvc.EditExpression(txtZOffset.Text, _clsDef, _provider, _featureSourceId);
+ string expr = _edSvc.EditExpression(txtZOffset.Text, _clsDef, _provider, _featureSourceId, true);
if (expr != null)
txtZOffset.Text = expr;
}
private void btnZExtrusion_Click(object sender, EventArgs e)
{
- string expr = _edSvc.EditExpression(txtZExtrusion.Text, _clsDef, _provider, _featureSourceId);
+ string expr = _edSvc.EditExpression(txtZExtrusion.Text, _clsDef, _provider, _featureSourceId, true);
if (expr != null)
txtZExtrusion.Text = expr;
}
Modified: trunk/Tools/Maestro/Maestro.Editors/LayerDefinition/Vector/StyleEditors/FontStyleEditor.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Editors/LayerDefinition/Vector/StyleEditors/FontStyleEditor.cs 2011-12-25 15:30:51 UTC (rev 6365)
+++ trunk/Tools/Maestro/Maestro.Editors/LayerDefinition/Vector/StyleEditors/FontStyleEditor.cs 2011-12-25 16:14:39 UTC (rev 6366)
@@ -717,7 +717,7 @@
if (propertyCombo.SelectedIndex == propertyCombo.Items.Count - 1)
{
string current = m_item.Text;
- string expr = m_editor.EditExpression(current, m_schema, m_providername, m_featureSource);
+ string expr = m_editor.EditExpression(current, m_schema, m_providername, m_featureSource, true);
if (!string.IsNullOrEmpty(expr))
current = expr;
@@ -764,7 +764,7 @@
if (sizeCombo.SelectedIndex == sizeCombo.Items.Count - 1)
{
string current = m_item.SizeX;
- string expr = m_editor.EditExpression(current, m_schema, m_providername, m_featureSource);
+ string expr = m_editor.EditExpression(current, m_schema, m_providername, m_featureSource, true);
if (!string.IsNullOrEmpty(expr))
current = expr;
@@ -847,7 +847,7 @@
if (horizontalCombo.SelectedIndex == horizontalCombo.Items.Count - 1)
{
string current = m_item.HorizontalAlignment;
- string expr = m_editor.EditExpression(current, m_schema, m_providername, m_featureSource);
+ string expr = m_editor.EditExpression(current, m_schema, m_providername, m_featureSource, true);
if (!string.IsNullOrEmpty(expr))
current = expr;
@@ -865,7 +865,7 @@
if (verticalCombo.SelectedIndex == verticalCombo.Items.Count - 1)
{
string current = m_item.VerticalAlignment;
- string expr = m_editor.EditExpression(current, m_schema, m_providername, m_featureSource);
+ string expr = m_editor.EditExpression(current, m_schema, m_providername, m_featureSource, true);
if (!string.IsNullOrEmpty(expr))
current = expr;
@@ -883,7 +883,7 @@
if (rotationCombo.SelectedIndex == rotationCombo.Items.Count - 1)
{
string current = m_item.Rotation;
- string expr = m_editor.EditExpression(current, m_schema, m_providername, m_featureSource);
+ string expr = m_editor.EditExpression(current, m_schema, m_providername, m_featureSource, true);
if (!string.IsNullOrEmpty(expr))
current = expr;
Modified: trunk/Tools/Maestro/Maestro.Editors/LayerDefinition/Vector/StyleEditors/LineFeatureStyleEditor.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Editors/LayerDefinition/Vector/StyleEditors/LineFeatureStyleEditor.cs 2011-12-25 15:30:51 UTC (rev 6365)
+++ trunk/Tools/Maestro/Maestro.Editors/LayerDefinition/Vector/StyleEditors/LineFeatureStyleEditor.cs 2011-12-25 16:14:39 UTC (rev 6366)
@@ -543,7 +543,7 @@
return;
string current = this.CurrentStrokeType.Thickness;
- string expr = m_editor.EditExpression(current, m_schema, m_providername, m_featureSource);
+ string expr = m_editor.EditExpression(current, m_schema, m_providername, m_featureSource, true);
if (!string.IsNullOrEmpty(expr))
current = expr;
@@ -692,7 +692,7 @@
private void lineStyleEditor_RequiresExpressionEditor(object sender, EventArgs e)
{
- string expr = m_editor.EditExpression(lineStyleEditor.ColorExpression, m_schema, m_providername, m_featureSource);
+ string expr = m_editor.EditExpression(lineStyleEditor.ColorExpression, m_schema, m_providername, m_featureSource, true);
if (expr != null)
lineStyleEditor.ColorExpression = expr;
}
Modified: trunk/Tools/Maestro/Maestro.Editors/LayerDefinition/Vector/StyleEditors/PointFeatureStyleEditor.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Editors/LayerDefinition/Vector/StyleEditors/PointFeatureStyleEditor.cs 2011-12-25 15:30:51 UTC (rev 6365)
+++ trunk/Tools/Maestro/Maestro.Editors/LayerDefinition/Vector/StyleEditors/PointFeatureStyleEditor.cs 2011-12-25 16:14:39 UTC (rev 6366)
@@ -1075,7 +1075,7 @@
string expr = null;
if (current != null)
{
- expr = m_editor.EditExpression(current, m_schema, m_providername, m_featureSource);
+ expr = m_editor.EditExpression(current, m_schema, m_providername, m_featureSource, true);
if (!string.IsNullOrEmpty(expr))
current = expr;
}
@@ -1099,7 +1099,7 @@
string expr = null;
if (current != null)
{
- expr = m_editor.EditExpression(current, m_schema, m_providername, m_featureSource);
+ expr = m_editor.EditExpression(current, m_schema, m_providername, m_featureSource, true);
if (!string.IsNullOrEmpty(expr))
current = expr;
}
@@ -1161,7 +1161,7 @@
string expr = null;
if (current != null)
{
- expr = m_editor.EditExpression(current, m_schema, m_providername, m_featureSource);
+ expr = m_editor.EditExpression(current, m_schema, m_providername, m_featureSource, true);
if (!string.IsNullOrEmpty(expr))
current = expr;
}
@@ -1279,7 +1279,7 @@
string expr = null;
if (current != null)
{
- expr = m_editor.EditExpression(current, m_schema, m_providername, m_featureSource);
+ expr = m_editor.EditExpression(current, m_schema, m_providername, m_featureSource, true);
if (!string.IsNullOrEmpty(expr))
current = expr;
}
Modified: trunk/Tools/Maestro/Maestro.Editors/LayerDefinition/Vector/VectorLayerSettingsSectionCtrl.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Editors/LayerDefinition/Vector/VectorLayerSettingsSectionCtrl.cs 2011-12-25 15:30:51 UTC (rev 6365)
+++ trunk/Tools/Maestro/Maestro.Editors/LayerDefinition/Vector/VectorLayerSettingsSectionCtrl.cs 2011-12-25 16:14:39 UTC (rev 6366)
@@ -203,7 +203,7 @@
if (cls != null)
{
var fs = GetFeatureSource();
- var expr = _edsvc.EditExpression(txtFilter.Text, cls, fs.Provider, fs.ResourceID);
+ var expr = _edsvc.EditExpression(txtFilter.Text, cls, fs.Provider, fs.ResourceID, false);
if (expr != null)
{
txtFilter.Text = expr;
@@ -217,7 +217,7 @@
if (cls != null)
{
var fs = GetFeatureSource();
- var expr = _edsvc.EditExpression(txtHyperlink.Text, cls, fs.Provider, fs.ResourceID);
+ var expr = _edsvc.EditExpression(txtHyperlink.Text, cls, fs.Provider, fs.ResourceID, true);
if (expr != null)
{
txtHyperlink.Text = expr;
@@ -231,7 +231,7 @@
if (cls != null)
{
var fs = GetFeatureSource();
- var expr = _edsvc.EditExpression(txtTooltip.Text, cls, fs.Provider, fs.ResourceID);
+ var expr = _edsvc.EditExpression(txtTooltip.Text, cls, fs.Provider, fs.ResourceID, true);
if (expr != null)
{
txtTooltip.Text = expr;
Modified: trunk/Tools/Maestro/Maestro.Editors/LayerDefinition/VectorLayerEditorCtrl.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Editors/LayerDefinition/VectorLayerEditorCtrl.cs 2011-12-25 15:30:51 UTC (rev 6365)
+++ trunk/Tools/Maestro/Maestro.Editors/LayerDefinition/VectorLayerEditorCtrl.cs 2011-12-25 16:14:39 UTC (rev 6366)
@@ -89,11 +89,11 @@
get { return _edsvc; }
}
- internal string EditExpression(string expr)
+ internal string EditExpression(string expr, bool attachStylizationFunctions)
{
var fs = (IFeatureSource)_edsvc.ResourceService.GetResource(_vl.ResourceId);
- return _edsvc.EditExpression(expr, fs.GetClass(_vl.FeatureName), fs.Provider, _vl.ResourceId);
+ return _edsvc.EditExpression(expr, fs.GetClass(_vl.FeatureName), fs.Provider, _vl.ResourceId, attachStylizationFunctions);
}
internal void UpdateDisplay()
Modified: trunk/Tools/Maestro/Maestro.Editors/Properties/Resources.Designer.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Editors/Properties/Resources.Designer.cs 2011-12-25 15:30:51 UTC (rev 6365)
+++ trunk/Tools/Maestro/Maestro.Editors/Properties/Resources.Designer.cs 2011-12-25 16:14:39 UTC (rev 6366)
@@ -991,6 +991,267 @@
}
}
+ /// <summary>
+ /// Looks up a localized string similar to Alpha value.
+ /// </summary>
+ internal static string Func_ARGB_AValueDescription {
+ get {
+ return ResourceManager.GetString("Func_ARGB_AValueDescription", resourceCulture);
+ }
+ }
+
+ /// <summary>
+ /// Looks up a localized string similar to Blue value.
+ /// </summary>
+ internal static string Func_ARGB_BValueDescription {
+ get {
+ return ResourceManager.GetString("Func_ARGB_BValueDescription", resourceCulture);
+ }
+ }
+
+ /// <summary>
+ /// Looks up a localized string similar to Color generation function.
+ /// </summary>
+ internal static string Func_ARGB_Description {
+ get {
+ return ResourceManager.GetString("Func_ARGB_Description", resourceCulture);
+ }
+ }
+
+ /// <summary>
+ /// Looks up a localized string similar to Green value.
+ /// </summary>
+ internal static string Func_ARGB_GValueDescription {
+ get {
+ return ResourceManager.GetString("Func_ARGB_GValueDescription", resourceCulture);
+ }
+ }
+
+ /// <summary>
+ /// Looks up a localized string similar to Red value.
+ /// </summary>
+ internal static string Func_ARGB_RValueDescription {
+ get {
+ return ResourceManager.GetString("Func_ARGB_RValueDescription", resourceCulture);
+ }
+ }
+
+ /// <summary>
+ /// Looks up a localized string similar to String formatting function.
+ /// </summary>
+ internal static string Func_DECAP_Description {
+ get {
+ return ResourceManager.GetString("Func_DECAP_Description", resourceCulture);
+ }
+ }
+
+ /// <summary>
+ /// Looks up a localized string similar to String to format.
+ /// </summary>
+ internal static string Func_DECAP_StringValueDescription {
+ get {
+ return ResourceManager.GetString("Func_DECAP_StringValueDescription", resourceCulture);
+ }
+ }
+
+ /// <summary>
+ /// Looks up a localized string similar to Returns the active feature class name.
+ /// </summary>
+ internal static string Func_FEATURECLASS_Description {
+ get {
+ return ResourceManager.GetString("Func_FEATURECLASS_Description", resourceCulture);
+ }
+ }
+
+ /// <summary>
+ /// Looks up a localized string similar to Returns the active feature Id.
+ /// </summary>
+ internal static string Func_FEATUREID_Description {
+ get {
+ return ResourceManager.GetString("Func_FEATUREID_Description", resourceCulture);
+ }
+ }
+
+ /// <summary>
+ /// Looks up a localized string similar to Boolean expression (filter) encapsulated in a string.
+ /// </summary>
+ internal static string Func_IF_ConditionDescription {
+ get {
+ return ResourceManager.GetString("Func_IF_ConditionDescription", resourceCulture);
+ }
+ }
+
+ /// <summary>
+ /// Looks up a localized string similar to If evaluator for style theming.
+ /// </summary>
+ internal static string Func_IF_Description {
+ get {
+ return ResourceManager.GetString("Func_IF_Description", resourceCulture);
+ }
+ }
+
+ /// <summary>
+ /// Looks up a localized string similar to Returned if condition is false.
+ /// </summary>
+ internal static string Func_IF_FalseValueDescription {
+ get {
+ return ResourceManager.GetString("Func_IF_FalseValueDescription", resourceCulture);
+ }
+ }
+
+ /// <summary>
+ /// Looks up a localized string similar to Returned if condition is true.
+ /// </summary>
+ internal static string Func_IF_TrueValueDescription {
+ get {
+ return ResourceManager.GetString("Func_IF_TrueValueDescription", resourceCulture);
+ }
+ }
+
+ /// <summary>
+ /// Looks up a localized string similar to Returns the active layer Id.
+ /// </summary>
+ internal static string Func_LAYERID_Description {
+ get {
+ return ResourceManager.GetString("Func_LAYERID_Description", resourceCulture);
+ }
+ }
+
+ /// <summary>
+ /// Looks up a localized string similar to Default value returned if expression does not evaluate to any of the keys.
+ /// </summary>
+ internal static string Func_LOOKUP_DefaultValueDescription {
+ get {
+ return ResourceManager.GetString("Func_LOOKUP_DefaultValueDescription", resourceCulture);
+ }
+ }
+
+ /// <summary>
+ /// Looks up a localized string similar to Lookup table for style theming.
+ /// </summary>
+ internal static string Func_LOOKUP_Description {
+ get {
+ return ResourceManager.GetString("Func_LOOKUP_Description", resourceCulture);
+ }
+ }
+
+ /// <summary>
+ /// Looks up a localized string similar to Key expression.
+ /// </summary>
+ internal static string Func_LOOKUP_ExpressionDescription {
+ get {
+ return ResourceManager.GetString("Func_LOOKUP_ExpressionDescription", resourceCulture);
+ }
+ }
+
+ /// <summary>
+ /// Looks up a localized string similar to Lookup index that can be matched by the key expression.
+ /// </summary>
+ internal static string Func_LOOKUP_IndexDescription {
+ get {
+ return ResourceManager.GetString("Func_LOOKUP_IndexDescription", resourceCulture);
+ }
+ }
+
+ /// <summary>
+ /// Looks up a localized string similar to Value that is returned when the key expression matches the associated index.
+ /// </summary>
+ internal static string Func_LOOKUP_ValueDescription {
+ get {
+ return ResourceManager.GetString("Func_LOOKUP_ValueDescription", resourceCulture);
+ }
+ }
+
+ /// <summary>
+ /// Looks up a localized string similar to Returns the active map name.
+ /// </summary>
+ internal static string Func_MAPNAME_Description {
+ get {
+ return ResourceManager.GetString("Func_MAPNAME_Description", resourceCulture);
+ }
+ }
+
+ /// <summary>
+ /// Looks up a localized string similar to Default value returned if expression does not fall into any of the ranges.
+ /// </summary>
+ internal static string Func_RANGE_DefaultValueDescription {
+ get {
+ return ResourceManager.GetString("Func_RANGE_DefaultValueDescription", resourceCulture);
+ }
+ }
+
+ /// <summary>
+ /// Looks up a localized string similar to Range table for style theming.
+ /// </summary>
+ internal static string Func_RANGE_Description {
+ get {
+ return ResourceManager.GetString("Func_RANGE_Description", resourceCulture);
+ }
+ }
+
+ /// <summary>
+ /// Looks up a localized string similar to Key expression.
+ /// </summary>
+ internal static string Func_RANGE_ExpressionDescription {
+ get {
+ return ResourceManager.GetString("Func_RANGE_ExpressionDescription", resourceCulture);
+ }
+ }
+
+ /// <summary>
+ /// Looks up a localized string similar to Exclusive maximum of range that can be matched by the key expression.
+ /// </summary>
+ internal static string Func_RANGE_MaxDescription {
+ get {
+ return ResourceManager.GetString("Func_RANGE_MaxDescription", resourceCulture);
+ }
+ }
+
+ /// <summary>
+ /// Looks up a localized string similar to Inclusive minimum of range that can be matched by the key expression.
+ /// </summary>
+ internal static string Func_RANGE_MinDescription {
+ get {
+ return ResourceManager.GetString("Func_RANGE_MinDescription", resourceCulture);
+ }
+ }
+
+ /// <summary>
+ /// Looks up a localized string similar to Value that is returned when the key expression matches the associated range.
+ /// </summary>
+ internal static string Func_RANGE_ValueDescription {
+ get {
+ return ResourceManager.GetString("Func_RANGE_ValueDescription", resourceCulture);
+ }
+ }
+
+ /// <summary>
+ /// Looks up a localized string similar to Returns the active session.
+ /// </summary>
+ internal static string Func_SESSION_Description {
+ get {
+ return ResourceManager.GetString("Func_SESSION_Description", resourceCulture);
+ }
+ }
+
+ /// <summary>
+ /// Looks up a localized string similar to String encoding function.
+ /// </summary>
+ internal static string Func_URLENCODE_Description {
+ get {
+ return ResourceManager.GetString("Func_URLENCODE_Description", resourceCulture);
+ }
+ }
+
+ /// <summary>
+ /// Looks up a localized string similar to String to URL encode.
+ /// </summary>
+ internal static string Func_URLENCODE_StringValueDescription {
+ get {
+ return ResourceManager.GetString("Func_URLENCODE_StringValueDescription", resourceCulture);
+ }
+ }
+
internal static System.Drawing.Bitmap function {
get {
object obj = ResourceManager.GetObject("function", resourceCulture);
Modified: trunk/Tools/Maestro/Maestro.Editors/Properties/Resources.resx
===================================================================
--- trunk/Tools/Maestro/Maestro.Editors/Properties/Resources.resx 2011-12-25 15:30:51 UTC (rev 6365)
+++ trunk/Tools/Maestro/Maestro.Editors/Properties/Resources.resx 2011-12-25 16:14:39 UTC (rev 6366)
@@ -1319,4 +1319,91 @@
<data name="PromptResetOdbcConfigDocument" xml:space="preserve">
<value>Changing the DSN will reset the current configuration document. Proceed?</value>
</data>
+ <data name="Func_ARGB_AValueDescription" xml:space="preserve">
+ <value>Alpha value</value>
+ </data>
+ <data name="Func_ARGB_BValueDescription" xml:space="preserve">
+ <value>Blue value</value>
+ </data>
+ <data name="Func_ARGB_Description" xml:space="preserve">
+ <value>Color generation function</value>
+ </data>
+ <data name="Func_ARGB_GValueDescription" xml:space="preserve">
+ <value>Green value</value>
+ </data>
+ <data name="Func_ARGB_RValueDescription" xml:space="preserve">
+ <value>Red value</value>
+ </data>
+ <data name="Func_DECAP_Description" xml:space="preserve">
+ <value>String formatting function</value>
+ </data>
+ <data name="Func_DECAP_StringValueDescription" xml:space="preserve">
+ <value>String to format</value>
+ </data>
+ <data name="Func_FEATURECLASS_Description" xml:space="preserve">
+ <value>Returns the active feature class name</value>
+ </data>
+ <data name="Func_FEATUREID_Description" xml:space="preserve">
+ <value>Returns the active feature Id</value>
+ </data>
+ <data name="Func_IF_ConditionDescription" xml:space="preserve">
+ <value>Boolean expression (filter) encapsulated in a string</value>
+ </data>
+ <data name="Func_IF_Description" xml:space="preserve">
+ <value>If evaluator for style theming</value>
+ </data>
+ <data name="Func_IF_FalseValueDescription" xml:space="preserve">
+ <value>Returned if condition is false</value>
+ </data>
+ <data name="Func_IF_TrueValueDescription" xml:space="preserve">
+ <value>Returned if condition is true</value>
+ </data>
+ <data name="Func_LAYERID_Description" xml:space="preserve">
+ <value>Returns the active layer Id</value>
+ </data>
+ <data name="Func_LOOKUP_DefaultValueDescription" xml:space="preserve">
+ <value>Default value returned if expression does not evaluate to any of the keys</value>
+ </data>
+ <data name="Func_LOOKUP_Description" xml:space="preserve">
+ <value>Lookup table for style theming</value>
+ </data>
+ <data name="Func_LOOKUP_ExpressionDescription" xml:space="preserve">
+ <value>Key expression</value>
+ </data>
+ <data name="Func_LOOKUP_IndexDescription" xml:space="preserve">
+ <value>Lookup index that can be matched by the key expression</value>
+ </data>
+ <data name="Func_LOOKUP_ValueDescription" xml:space="preserve">
+ <value>Value that is returned when the key expression matches the associated index</value>
+ </data>
+ <data name="Func_MAPNAME_Description" xml:space="preserve">
+ <value>Returns the active map name</value>
+ </data>
+ <data name="Func_RANGE_DefaultValueDescription" xml:space="preserve">
+ <value>Default value returned if expression does not fall into any of the ranges</value>
+ </data>
+ <data name="Func_RANGE_Description" xml:space="preserve">
+ <value>Range table for style theming</value>
+ </data>
+ <data name="Func_RANGE_ExpressionDescription" xml:space="preserve">
+ <value>Key expression</value>
+ </data>
+ <data name="Func_RANGE_MaxDescription" xml:space="preserve">
+ <value>Exclusive maximum of range that can be matched by the key expression</value>
+ </data>
+ <data name="Func_RANGE_MinDescription" xml:space="preserve">
+ <value>Inclusive minimum of range that can be matched by the key expression</value>
+ </data>
+ <data name="Func_RANGE_ValueDescription" xml:space="preserve">
+ <value>Value that is returned when the key expression matches the associated range</value>
+ </data>
+ <data name="Func_SESSION_Description" xml:space="preserve">
+ <value>Returns the active session</value>
+ </data>
+ <data name="Func_URLENCODE_Description" xml:space="preserve">
+ <value>String encoding function</value>
+ </data>
+ <data name="Func_URLENCODE_StringValueDescription" xml:space="preserve">
+ <value>String to URL encode</value>
+ </data>
</root>
\ No newline at end of file
Modified: trunk/Tools/Maestro/Maestro.Editors/ResourceEditorServiceBase.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Editors/ResourceEditorServiceBase.cs 2011-12-25 15:30:51 UTC (rev 6365)
+++ trunk/Tools/Maestro/Maestro.Editors/ResourceEditorServiceBase.cs 2011-12-25 16:14:39 UTC (rev 6366)
@@ -69,12 +69,13 @@
/// <param name="classDef">The class def.</param>
/// <param name="providerName">Name of the provider.</param>
/// <param name="featureSourceId">The feature source id.</param>
+ /// <param name="attachStylizationFunctions">If true, FDO stylization functions are also included in the function list</param>
/// <returns></returns>
- public string EditExpression(string currentExpr, ClassDefinition classDef, string providerName, string featureSourceId)
+ public string EditExpression(string currentExpr, ClassDefinition classDef, string providerName, string featureSourceId, bool attachStylizationFunctions)
{
var ed = new ExpressionEditor();
var caps = this.FeatureService.GetProviderCapabilities(providerName);
- ed.Initialize(this.FeatureService, caps, classDef, featureSourceId);
+ ed.Initialize(this.FeatureService, caps, classDef, featureSourceId, attachStylizationFunctions);
ed.Expression = currentExpr;
if (ed.ShowDialog() == System.Windows.Forms.DialogResult.OK)
{
Modified: trunk/Tools/Maestro/Maestro.Editors/SymbolDefinition/SymbolEditorService.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Editors/SymbolDefinition/SymbolEditorService.cs 2011-12-25 15:30:51 UTC (rev 6365)
+++ trunk/Tools/Maestro/Maestro.Editors/SymbolDefinition/SymbolEditorService.cs 2011-12-25 16:14:39 UTC (rev 6366)
@@ -115,9 +115,9 @@
return _inner.SelectUnmanagedData(startPath, fileTypes);
}
- public string EditExpression(string currentExpr, OSGeo.MapGuide.MaestroAPI.Schema.ClassDefinition schema, string providerName, string featureSourceId)
+ public string EditExpression(string currentExpr, OSGeo.MapGuide.MaestroAPI.Schema.ClassDefinition schema, string providerName, string featureSourceId, bool attachStylizationFunctions)
{
- return _inner.EditExpression(currentExpr, schema, providerName, featureSourceId);
+ return _inner.EditExpression(currentExpr, schema, providerName, featureSourceId, attachStylizationFunctions);
}
public string ResourceID
Modified: trunk/Tools/Maestro/Maestro.Editors/WebLayout/Commands/SearchCmdCtrl.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Editors/WebLayout/Commands/SearchCmdCtrl.cs 2011-12-25 15:30:51 UTC (rev 6365)
+++ trunk/Tools/Maestro/Maestro.Editors/WebLayout/Commands/SearchCmdCtrl.cs 2011-12-25 16:14:39 UTC (rev 6366)
@@ -174,7 +174,7 @@
var fs = (IFeatureSource)_edsvc.ResourceService.GetResource(vl.ResourceId);
- string expr = _edsvc.EditExpression(txtFilter.Text, _cls, fs.Provider, vl.ResourceId);
+ string expr = _edsvc.EditExpression(txtFilter.Text, _cls, fs.Provider, vl.ResourceId, false);
if (expr != null)
{
txtFilter.Text = expr;
More information about the mapguide-commits
mailing list