修改命名空间
This commit is contained in:
@@ -1,6 +1,6 @@
|
||||
using Autodesk.Revit.Attributes;
|
||||
using Nice3point.Revit.Toolkit.External;
|
||||
using ShrlAlgoToolkit.RevitAddins.Assists;
|
||||
using ShrlAlgoToolkit.RevitAddins.Common.Assists;
|
||||
|
||||
namespace ShrlAlgoToolkit.RevitAddins.RvMEP;
|
||||
[Transaction(TransactionMode.Manual)]
|
||||
@@ -8,6 +8,6 @@ public class AddInsulationCmd : ExternalCommand
|
||||
{
|
||||
public override void Execute()
|
||||
{
|
||||
WinDialogAssist.ShowModeless<AddInsulationView>(new AddInsulationViewModel(Document));
|
||||
Common.Assists.WinDialogAssist.ShowOrActivate<AddInsulationView, AddInsulationViewModel>(Document);
|
||||
}
|
||||
}
|
||||
@@ -1,6 +1,6 @@
|
||||
using Autodesk.Revit.Attributes;
|
||||
using Nice3point.Revit.Toolkit.External;
|
||||
using ShrlAlgoToolkit.RevitAddins.Assists;
|
||||
using ShrlAlgoToolkit.RevitAddins.Common.Assists;
|
||||
|
||||
namespace ShrlAlgoToolkit.RevitAddins.RvMEP;
|
||||
|
||||
@@ -9,14 +9,13 @@ public class AnyConnectCmd : ExternalCommand
|
||||
{
|
||||
public override void Execute()
|
||||
{
|
||||
WinDialogAssist.ShowModeless<AnyConnectView>(new AnyConnectViewModel());
|
||||
#if REVIT2018
|
||||
//WinDialogAssist.ShowModeless<AnyConnectView>(new AnyConnectViewModel());
|
||||
Common.Assists.WinDialogAssist.ShowOrActivate<AnyConnectView, AnyConnectViewModel>();
|
||||
#elif REVIT2020
|
||||
//OptionsBarAssist.RegisterOptionsBar((AutoConnectOptionsView view, AnyConnectViewModel viewModel) =>
|
||||
//{
|
||||
// viewModel.ConnectCommand.Execute(null);
|
||||
//});
|
||||
OptionsBarAssist.RegisterOptionsBar((AutoConnectOptionsView view, AnyConnectViewModel viewModel) =>
|
||||
{
|
||||
viewModel.ConnectCommand.Execute(null);
|
||||
});
|
||||
#endif
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
using Autodesk.Revit.Attributes;
|
||||
using Nice3point.Revit.Toolkit.External;
|
||||
using ShrlAlgoToolkit.RevitAddins.Assists;
|
||||
using ShrlAlgoToolkit.RevitAddins.Common.Assists;
|
||||
|
||||
namespace ShrlAlgoToolkit.RevitAddins.RvMEP;
|
||||
|
||||
@@ -9,6 +9,6 @@ internal class ArrangeMEPCurveCmd : ExternalCommand
|
||||
{
|
||||
public override void Execute()
|
||||
{
|
||||
WinDialogAssist.ShowModeless<ArrangeMEPCurveView>(new ArrangeMEPCurveViewModel());
|
||||
Common.Assists.WinDialogAssist.ShowOrActivate<ArrangeMEPCurveView, ArrangeMEPCurveViewModel>();
|
||||
}
|
||||
}
|
||||
|
||||
@@ -2,7 +2,7 @@
|
||||
x:Class="ShrlAlgoToolkit.RevitAddins.RvMEP.AutoConnectOptionsView"
|
||||
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
|
||||
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
|
||||
xmlns:converters="clr-namespace:ShrlAlgoToolkit.RevitAddins.Converters"
|
||||
xmlns:converters="clr-namespace:ShrlAlgoToolkit.RevitAddins.Common.Converters"
|
||||
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
|
||||
xmlns:local="clr-namespace:ShrlAlgoToolkit.RevitAddins.RvMEP"
|
||||
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
using Autodesk.Revit.Attributes;
|
||||
using Nice3point.Revit.Toolkit.External;
|
||||
using ShrlAlgoToolkit.RevitAddins.Assists;
|
||||
using ShrlAlgoToolkit.RevitAddins.Common.Assists;
|
||||
|
||||
namespace ShrlAlgoToolkit.RevitAddins.RvMEP;
|
||||
|
||||
@@ -12,6 +12,6 @@ public class ClashReportCmd : ExternalCommand
|
||||
{
|
||||
public override void Execute()
|
||||
{
|
||||
WinDialogAssist.ShowModeless<ClashReportView>(new ClashReportViewModel(UiApplication));
|
||||
Common.Assists.WinDialogAssist.ShowOrActivate<ClashReportView, ClashReportViewModel>(UiApplication);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
using Autodesk.Revit.Attributes;
|
||||
using Nice3point.Revit.Toolkit.External;
|
||||
using ShrlAlgoToolkit.RevitAddins.Assists;
|
||||
using ShrlAlgoToolkit.RevitAddins.Common.Assists;
|
||||
|
||||
namespace ShrlAlgoToolkit.RevitAddins.RvMEP;
|
||||
|
||||
@@ -11,7 +11,7 @@ public class ClashResolveCmd : ExternalCommand
|
||||
{
|
||||
try
|
||||
{
|
||||
WinDialogAssist.ShowModeless<ClashResolveView>(new ClashResolveViewModel());
|
||||
Common.Assists.WinDialogAssist.ShowOrActivate<ClashResolveView, ClashResolveViewModel>();
|
||||
}
|
||||
catch (Exception)
|
||||
{
|
||||
|
||||
@@ -5,7 +5,7 @@ using Autodesk.Revit.UI.Selection;
|
||||
using CommunityToolkit.Mvvm.ComponentModel;
|
||||
using CommunityToolkit.Mvvm.Input;
|
||||
using Nice3point.Revit.Toolkit.External.Handlers;
|
||||
using ShrlAlgoToolkit.RevitAddins.Assists;
|
||||
using ShrlAlgoToolkit.RevitAddins.Common.Assists;
|
||||
|
||||
namespace ShrlAlgoToolkit.RevitAddins.RvMEP;
|
||||
|
||||
|
||||
@@ -5,7 +5,7 @@ using Autodesk.Revit.DB.Mechanical;
|
||||
using Autodesk.Revit.DB.Plumbing;
|
||||
using Nice3point.Revit.Toolkit.External;
|
||||
|
||||
using ShrlAlgoToolkit.RevitAddins.Assists;
|
||||
using ShrlAlgoToolkit.RevitAddins.Common.Assists;
|
||||
using ShrlAlgoToolkit.RevitAddins.Windows;
|
||||
|
||||
namespace ShrlAlgoToolkit.RevitAddins.RvMEP;
|
||||
@@ -114,12 +114,12 @@ public class HeadroomCheckCmd : ExternalCommand
|
||||
viewmodel.Footer = $"最低净高={Math.Round(minHeadroom * 304.8)}mm,元素:{element.Name},Id:{element.Id}";
|
||||
UiDocument.Selection.SetElementIds(new List<ElementId> { element.Id });
|
||||
}
|
||||
WinDialogAssist.ShowModeless<MessageWin>(viewmodel);
|
||||
Common.Assists.WinDialogAssist.ShowModeless<MessageWin>(viewmodel);
|
||||
}
|
||||
|
||||
public override void Execute()
|
||||
{
|
||||
WinDialogAssist.ShowModeless<HeadroomCheckView>(new HeadroomCheckViewModel(UiApplication));
|
||||
Common.Assists.WinDialogAssist.ShowOrActivate<HeadroomCheckView, HeadroomCheckViewModel>(UiApplication);
|
||||
//try
|
||||
//{
|
||||
// InputMessageBox inputMessage = new("净高限制", "请输出净高要求高度(mm)");
|
||||
|
||||
@@ -3,7 +3,7 @@
|
||||
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
|
||||
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
|
||||
xmlns:b="http://schemas.microsoft.com/xaml/behaviors"
|
||||
xmlns:conv="clr-namespace:ShrlAlgoToolkit.RevitAddins.Converters"
|
||||
xmlns:conv="clr-namespace:ShrlAlgoToolkit.RevitAddins.Common.Converters"
|
||||
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
|
||||
xmlns:local="clr-namespace:ShrlAlgoToolkit.RevitAddins.RvMEP"
|
||||
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
|
||||
|
||||
@@ -6,7 +6,7 @@ using CommunityToolkit.Mvvm.ComponentModel;
|
||||
namespace ShrlAlgoToolkit.RevitAddins.RvMEP;
|
||||
public partial class InsulationItem : ObservableValidator
|
||||
{
|
||||
[Attributes.GreaterThan(nameof(MinDiameter))]
|
||||
[Common.Attributes.GreaterThan(nameof(MinDiameter))]
|
||||
[Range(15, 1000)]
|
||||
public double MaxDiameter
|
||||
{
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
using Autodesk.Revit.Attributes;
|
||||
using Nice3point.Revit.Toolkit.External;
|
||||
using ShrlAlgoToolkit.RevitAddins.Assists;
|
||||
using ShrlAlgoToolkit.RevitAddins.Common.Assists;
|
||||
|
||||
namespace ShrlAlgoToolkit.RevitAddins.RvMEP;
|
||||
|
||||
@@ -12,6 +12,6 @@ public class MoveMEPCmd : ExternalCommand
|
||||
{
|
||||
public override void Execute()
|
||||
{
|
||||
WinDialogAssist.ShowModeless<MoveMEPCurveView>(new MoveMEPCurveViewModel());
|
||||
Common.Assists.WinDialogAssist.ShowOrActivate<MoveMEPCurveView, MoveMEPCurveViewModel>();
|
||||
}
|
||||
}
|
||||
|
||||
@@ -17,7 +17,7 @@ public partial class MoveMEPCurveViewModel : ObservableValidator
|
||||
|
||||
private readonly ActionEventHandler moveHandler = new();
|
||||
|
||||
[Attributes.IsNumeric]
|
||||
[Common.Attributes.IsNumeric]
|
||||
[ObservableProperty]
|
||||
[NotifyDataErrorInfo]
|
||||
public partial double Distance { get; set; }
|
||||
|
||||
@@ -1,7 +1,6 @@
|
||||
using Autodesk.Revit.DB;
|
||||
using Autodesk.Revit.DB.Architecture;
|
||||
using CommunityToolkit.Mvvm.ComponentModel;
|
||||
using ShrlAlgoToolkit.Core.Assists;
|
||||
|
||||
namespace ShrlAlgoToolkit.RevitAddins.RvMEP
|
||||
{
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
using Autodesk.Revit.Attributes;
|
||||
using Nice3point.Revit.Toolkit.External;
|
||||
using ShrlAlgoToolkit.RevitAddins.Assists;
|
||||
using ShrlAlgoToolkit.RevitAddins.Common.Assists;
|
||||
|
||||
namespace ShrlAlgoToolkit.RevitAddins.RvMEP
|
||||
{
|
||||
@@ -9,7 +9,7 @@ namespace ShrlAlgoToolkit.RevitAddins.RvMEP
|
||||
{
|
||||
public override void Execute()
|
||||
{
|
||||
WinDialogAssist.ShowModeless<RotateMEPView>(new RotateMEPViewModel());
|
||||
Common.Assists.WinDialogAssist.ShowOrActivate<RotateMEPView, RotateMEPViewModel>();
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
using Nice3point.Revit.Toolkit.External;
|
||||
using ShrlAlgoToolkit.RevitAddins.Assists;
|
||||
using ShrlAlgoToolkit.RevitAddins.Common.Assists;
|
||||
|
||||
namespace ShrlAlgoToolkit.RevitAddins.RvMEP;
|
||||
|
||||
@@ -9,6 +9,6 @@ public class StandMepCurveCmd : ExternalCommand
|
||||
{
|
||||
public override void Execute()
|
||||
{
|
||||
WinDialogAssist.ShowModeless<StandMepCurveView>(new StandMepCurveViewModel(Document));
|
||||
Common.Assists.WinDialogAssist.ShowOrActivate<StandMepCurveView, StandMepCurveViewModel>(Document);
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user