Index: DamClients/DamUI/trunk/src/Dam/Forms/DamPlugin.cs =================================================================== diff -u -r6823 -r6826 --- DamClients/DamUI/trunk/src/Dam/Forms/DamPlugin.cs (.../DamPlugin.cs) (revision 6823) +++ DamClients/DamUI/trunk/src/Dam/Forms/DamPlugin.cs (.../DamPlugin.cs) (revision 6826) @@ -275,25 +275,37 @@ // Read the Waterlevel Timeseries damProject.ImportWaterLevelTimeSeries(); - + // Find the view|Image menu option + BarItemLink imagesItem = mainForm.ViewMenu.ItemLinks.First(bi => bi.Item.Name.Equals("ImageMenu")); if (projectData.DamProjectType == DamProjectType.DamLiveConfiguration) { + // When view|Image menu option, make it invisible + imagesItem.Item.Visibility = BarItemVisibility.Never; + // Make sure that the tab for the Image view itself is not shown ((mainForm.DynamicImageControl.Parent.Parent) as DockPanel).Visibility= DockVisibility.Hidden; + // Make sure that the entire Calculation menu is not shown mainForm.CalculationMenu.Visibility = BarItemVisibility.Never; + // Force update of Run column in Navigator (Treeview) to make it invisible + projectData.RunColumVisible = false; if (projectData.SensorData != null) { projectData.SensorData.UpdatePickSensorsForGroups(); } } if (projectData.DamProjectType == DamProjectType.Design) { - mainForm.DynamicImageControl.TabIndex = 1; + // When view|Image menu option, make it visible + imagesItem.Item.Visibility = BarItemVisibility.Always; + // Make sure that the tab for the Image view itself is shown ((mainForm.DynamicImageControl.Parent.Parent) as DockPanel).Visibility= DockVisibility.Visible; - mainForm.UseImage(false); + // Make sure that the entire Calculation menu is not shown mainForm.CalculationMenu.Visibility = BarItemVisibility.Always; + // Force update of Run column in Navigator (Treeview) to make it visible + projectData.RunColumVisible = true; } } + public bool IsVisible(string property) { return true; @@ -805,6 +817,8 @@ mainForm.NavigatorControl.RegisterResource(typeof(WaterBoard), damNavigator, "Waterboard"); BindSupport.Bind(projectPanel, damNavigator, typeof(DamProjectData), "WaterBoardJob"); + BindSupport.Bind(projectPanel, damNavigator.TreeList.Columns[1], typeof(DamProjectData), + "RunColumVisible", BindingType.Visibility); } private void DataEventPublisher_OnAfterChange(object sender, PublishEventArgs e) Index: DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/DamProjectData.cs =================================================================== diff -u -r6823 -r6826 --- DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/DamProjectData.cs (.../DamProjectData.cs) (revision 6823) +++ DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/DamProjectData.cs (.../DamProjectData.cs) (revision 6826) @@ -157,6 +157,20 @@ } } + private bool runColumVisible = true; + + [Browsable(false)] + [XmlIgnore] + public bool RunColumVisible + { + get => runColumVisible; + set + { + runColumVisible = value; + DataEventPublisher.AfterChange(this, "RunColumVisible"); + } + } + [ReadOnly(true)] [Label("Calculation type")] [Description("Indicates the purpose of the calculations")] @@ -526,6 +540,7 @@ { case "SensorData": return damProjectType == DamProjectType.DamLiveConfiguration; case "DesignCalculations": return HasResults() && DamProjectType == DamProjectType.Design; + case "RunColumVisible": return DamProjectType == DamProjectType.Design; case "DamProjectCalculationSpecification": return DamProjectCalculationSpecification.DamCalculationSpecifications.Count > 0; default: return true;