ShrlAlgo/RookieStation
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

整理文件

Browse Source
This commit is contained in:
GG Z
2021-06-24 18:20:52 +08:00
parent 955a132ea6
commit 5410998c15
41 changed files with 129 additions and 221 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
RookieStation/CmdBrowserFamily.cs → RookieStation/CommonTools/ExecuteCmd/CmdUseFamilyPane.cs
View File

@@ -7,7 +7,7 @@ namespace RookieStation.CommonTools.ExecuteCmd
{
[Autodesk.Revit.Attributes.Transaction(Autodesk.Revit.Attributes.TransactionMode.Manual)]
[Autodesk.Revit.Attributes.Regeneration(Autodesk.Revit.Attributes.RegenerationOption.Manual)]
internal class CmdBrowserFamily : IExternalCommand
internal class CmdUseFamilyPane : IExternalCommand
{
private Guid guid = new Guid("{028001AD-0588-4A9C-AA03-D7E472D85050}");

0
RookieStation/FamilyDockablePaneHandler.cs → RookieStation/CommonTools/ExtHandler/FamilyDockablePaneHandler.cs
View File

0
RookieStation/WpfFamilyDockablePane.xaml → RookieStation/CommonTools/View/WpfFamilyDockablePane.xaml
View File

0
RookieStation/WpfFamilyDockablePane.xaml.cs → RookieStation/CommonTools/View/WpfFamilyDockablePane.xaml.cs
View File

0
RookieStation/CmdFloorFinishes.cs → RookieStation/Finishes/ExecuteCmd/CmdFloorFinishes.cs
View File

0
RookieStation/CmdPlaceFloorFinishes.cs → RookieStation/Finishes/ExecuteCmd/CmdPlaceFloorFinishes.cs
View File

2
RookieStation/CmdPlaceWallFinishes.cs → RookieStation/Finishes/ExecuteCmd/CmdPlaceWallFinishes.cs
View File

@@ -4,7 +4,7 @@ using Autodesk.Revit.UI;
using Autodesk.Revit.UI.Selection;
using RookieStation.Extension;
using RookieStation.Finishes.View;
using RookieStation.UserClient;
using RookieStation.RibbonMenu;
using RookieStation.Utils;
using System;
using System.Collections.Generic;

0
RookieStation/WpfFloorFinishes.xaml → RookieStation/Finishes/View/WpfFloorFinishes.xaml
View File

0
RookieStation/WpfFloorFinishes.xaml.cs → RookieStation/Finishes/View/WpfFloorFinishes.xaml.cs
View File

0
RookieStation/WpfWallFinishes.xaml → RookieStation/Finishes/View/WpfWallFinishes.xaml
View File

0
RookieStation/WpfWallFinishes.xaml.cs → RookieStation/Finishes/View/WpfWallFinishes.xaml.cs
View File

2
RookieStation/CmdLogoExtrusion.cs → RookieStation/MailingAreaModule/ExecuteCmd/CmdLogoExtrusion.cs
View File

@@ -7,7 +7,7 @@ using System;
using System.Collections.Generic;
using System.Linq;
namespace RookieStation.ShippingAreaModule.ExecuteCmd
namespace RookieStation.MailingAreaModule.ExecuteCmd
{
[Autodesk.Revit.Attributes.Transaction(Autodesk.Revit.Attributes.TransactionMode.Manual)]
[Autodesk.Revit.Attributes.Regeneration(Autodesk.Revit.Attributes.RegenerationOption.Manual)]

4
RookieStation/CmdPlaceReceptionArea.cs → RookieStation/MailingAreaModule/ExecuteCmd/CmdPlaceReceptionArea.cs
View File

@@ -8,9 +8,9 @@ using RookieStation.Utils;
using System;
using System.Collections.Generic;
using System.Linq;
using RookieStation.ShippingAreaModule.View;
using RookieStation.MailingAreaModule.View;
namespace RookieStation.ShippingAreaModule.ExecuteCmd
namespace RookieStation.MailingAreaModule.ExecuteCmd
{
[Autodesk.Revit.Attributes.Transaction(Autodesk.Revit.Attributes.TransactionMode.Manual)]
[Autodesk.Revit.Attributes.Regeneration(Autodesk.Revit.Attributes.RegenerationOption.Manual)]

2
RookieStation/WpfReceptionArea.xaml → RookieStation/MailingAreaModule/View/WpfReceptionArea.xaml
View File

@@ -1,5 +1,5 @@
<Window
x:Class="RookieStation.ShippingAreaModule.View.WpfReceptionArea"
x:Class="RookieStation.MailingAreaModule.View.WpfReceptionArea"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"

2
RookieStation/WpfReceptionArea.xaml.cs → RookieStation/MailingAreaModule/View/WpfReceptionArea.xaml.cs
View File

@@ -15,7 +15,7 @@ using System.Windows.Media.Imaging;
using System.Windows.Navigation;
using System.Windows.Shapes;
namespace RookieStation.ShippingAreaModule.View
namespace RookieStation.MailingAreaModule.View
{
/// <summary>
/// WpfReceptionArea.xaml 的交互逻辑

6
RookieStation/CmdArrangeShelfCards.cs → RookieStation/ParcelAreaModule/ExecuteCmd/CmdArrangeShelfCards.cs
View File

@@ -1,8 +1,8 @@
using Autodesk.Revit.DB;
using Autodesk.Revit.UI;
using Autodesk.Revit.UI.Selection;
using RookieStation.PackAreaModule.View;
using RookieStation.UserClient;
using RookieStation.ParcelAreaModule.View;
using RookieStation.RibbonMenu;
using RookieStation.Utils;
using System;
using System.Collections.Generic;
@@ -11,7 +11,7 @@ using System.Linq;
using System.Windows;
using System.Windows.Controls;
namespace RookieStation.PackAreaModule.ExecuteCmd
namespace RookieStation.ParcelAreaModule.ExecuteCmd
{
[Autodesk.Revit.Attributes.Transaction(Autodesk.Revit.Attributes.TransactionMode.Manual)]
[Autodesk.Revit.Attributes.Regeneration(Autodesk.Revit.Attributes.RegenerationOption.Manual)]

4
RookieStation/CmdPlaceEntranceGate.cs → RookieStation/ParcelAreaModule/ExecuteCmd/CmdPlaceEntranceGate.cs
View File

@@ -6,9 +6,9 @@ using RookieStation.Utils;
using System;
using System.Collections.Generic;
using System.Linq;
using RookieStation.PackAreaModule.View;
using RookieStation.ParcelAreaModule.View;
namespace RookieStation.PackAreaModule.ExecuteCmd
namespace RookieStation.ParcelAreaModule.ExecuteCmd
{
[Autodesk.Revit.Attributes.Transaction(Autodesk.Revit.Attributes.TransactionMode.Manual)]
[Autodesk.Revit.Attributes.Regeneration(Autodesk.Revit.Attributes.RegenerationOption.Manual)]

4
RookieStation/CmdPlaceExitGate.cs → RookieStation/ParcelAreaModule/ExecuteCmd/CmdPlaceExitGate.cs
View File

@@ -7,9 +7,9 @@ using RookieStation.Utils;
using System;
using System.Collections.Generic;
using System.Linq;
using RookieStation.PackAreaModule.View;
using RookieStation.ParcelAreaModule.View;
namespace RookieStation.PackAreaModule.ExecuteCmd
namespace RookieStation.ParcelAreaModule.ExecuteCmd
{
[Autodesk.Revit.Attributes.Transaction(Autodesk.Revit.Attributes.TransactionMode.Manual)]
[Autodesk.Revit.Attributes.Regeneration(Autodesk.Revit.Attributes.RegenerationOption.Manual)]

4
RookieStation/CmdPlaceLamps.cs → RookieStation/ParcelAreaModule/ExecuteCmd/CmdPlaceLamps.cs
View File

@@ -8,9 +8,9 @@ using RookieStation.Utils;
using System;
using System.Collections.Generic;
using System.Linq;
using RookieStation.PackAreaModule.View;
using RookieStation.ParcelAreaModule.View;
namespace RookieStation.PackAreaModule.ExecuteCmd
namespace RookieStation.ParcelAreaModule.ExecuteCmd
{
[Autodesk.Revit.Attributes.Transaction(Autodesk.Revit.Attributes.TransactionMode.Manual)]
[Autodesk.Revit.Attributes.Regeneration(Autodesk.Revit.Attributes.RegenerationOption.Manual)]

6
RookieStation/CmdPlaceShelves.cs → RookieStation/ParcelAreaModule/ExecuteCmd/CmdPlaceShelves.cs
View File

@@ -7,10 +7,10 @@ using System;
using System.Collections.Generic;
using System.Collections.ObjectModel;
using System.Linq;
using RookieStation.PackAreaModule.Model;
using RookieStation.PackAreaModule.View;
using RookieStation.ParcelAreaModule.Model;
using RookieStation.ParcelAreaModule.View;
namespace RookieStation.PackAreaModule.ExecuteCmd
namespace RookieStation.ParcelAreaModule.ExecuteCmd
{
[Autodesk.Revit.Attributes.Transaction(Autodesk.Revit.Attributes.TransactionMode.Manual)]
[Autodesk.Revit.Attributes.Regeneration(Autodesk.Revit.Attributes.RegenerationOption.Manual)]

2
RookieStation/Model/Enum.cs → RookieStation/ParcelAreaModule/Model/Enum.cs
View File

@@ -5,7 +5,7 @@ using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace RookieStation.PackAreaModule.Model
namespace RookieStation.ParcelAreaModule.Model
{
public enum NumOfGroup
{

2
RookieStation/Model/Shelf.cs → RookieStation/ParcelAreaModule/Model/Shelf.cs
View File

@@ -5,7 +5,7 @@ using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace RookieStation.PackAreaModule.Model
namespace RookieStation.ParcelAreaModule.Model
{
public class Shelf
{

2
RookieStation/WpfEntranceGate.xaml → RookieStation/ParcelAreaModule/View/WpfEntranceGate.xaml
View File

@@ -1,5 +1,5 @@
<Window
x:Class="RookieStation.PackAreaModule.View.WpfEntranceGate"
x:Class="RookieStation.ParcelAreaModule.View.WpfEntranceGate"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"

2
RookieStation/WpfEntranceGate.xaml.cs → RookieStation/ParcelAreaModule/View/WpfEntranceGate.xaml.cs
View File

@@ -13,7 +13,7 @@ using System.Windows.Media.Imaging;
using System.Windows.Navigation;
using System.Windows.Shapes;
namespace RookieStation.PackAreaModule.View
namespace RookieStation.ParcelAreaModule.View
{
/// <summary>
/// WpfEntranceGate.xaml 的交互逻辑

2
RookieStation/WpfExitGate.xaml → RookieStation/ParcelAreaModule/View/WpfExitGate.xaml
View File

@@ -1,5 +1,5 @@
<Window
x:Class="RookieStation.PackAreaModule.View.WpfExitGate"
x:Class="RookieStation.ParcelAreaModule.View.WpfExitGate"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"

2
RookieStation/WpfExitGate.xaml.cs → RookieStation/ParcelAreaModule/View/WpfExitGate.xaml.cs
View File

@@ -13,7 +13,7 @@ using System.Windows.Media.Imaging;
using System.Windows.Navigation;
using System.Windows.Shapes;
namespace RookieStation.PackAreaModule.View
namespace RookieStation.ParcelAreaModule.View
{
/// <summary>
/// WpfExitGate.xaml 的交互逻辑

2
RookieStation/WpfLampsLayout.xaml → RookieStation/ParcelAreaModule/View/WpfLampsLayout.xaml
View File

@@ -1,5 +1,5 @@
<Window
x:Class="RookieStation.PackAreaModule.View.WpfLampsLayout"
x:Class="RookieStation.ParcelAreaModule.View.WpfLampsLayout"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"

2
RookieStation/WpfLampsLayout.xaml.cs → RookieStation/ParcelAreaModule/View/WpfLampsLayout.xaml.cs
View File

@@ -13,7 +13,7 @@ using System.Windows.Media.Imaging;
using System.Windows.Navigation;
using System.Windows.Shapes;
namespace RookieStation.PackAreaModule.View
namespace RookieStation.ParcelAreaModule.View
{
/// <summary>
/// WpfLampsLayout.xaml 的交互逻辑

2
RookieStation/WpfShelfCards.xaml → RookieStation/ParcelAreaModule/View/WpfShelfCards.xaml
View File

@@ -1,5 +1,5 @@
<Window
x:Class="RookieStation.PackAreaModule.View.WpfShelfCards"
x:Class="RookieStation.ParcelAreaModule.View.WpfShelfCards"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"

2
RookieStation/WpfShelfCards.xaml.cs → RookieStation/ParcelAreaModule/View/WpfShelfCards.xaml.cs
View File

@@ -10,7 +10,7 @@ using System.Linq;
using System.Windows;
using System.Windows.Controls;
namespace RookieStation.PackAreaModule.View
namespace RookieStation.ParcelAreaModule.View
{
/// <summary>
/// WpfShelfCards.xaml 的交互逻辑

4
RookieStation/WpfShelvesLayout.xaml → RookieStation/ParcelAreaModule/View/WpfShelvesLayout.xaml
View File

@@ -1,10 +1,10 @@
<Window
x:Class="RookieStation.PackAreaModule.View.WpfShelvesLayout"
x:Class="RookieStation.ParcelAreaModule.View.WpfShelvesLayout"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:hc="https://handyorg.github.io/handycontrol"
xmlns:local="clr-namespace:RookieStation.PackAreaModule.Model"
xmlns:local="clr-namespace:RookieStation.ParcelAreaModule.Model"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:utils="clr-namespace:RookieStation.Utils"
Width="81"

6
RookieStation/WpfShelvesLayout.xaml.cs → RookieStation/ParcelAreaModule/View/WpfShelvesLayout.xaml.cs
View File

@@ -1,12 +1,12 @@
using Autodesk.Revit.UI;
using RookieStation.PackAreaModule;
using RookieStation.PackAreaModule.Model;
using RookieStation.ParcelAreaModule;
using RookieStation.ParcelAreaModule.Model;
using RookieStation.Utils;
using System.Collections.Specialized;
using System.Windows;
using System.Windows.Input;
namespace RookieStation.PackAreaModule.View
namespace RookieStation.ParcelAreaModule.View
{
/// <summary>
/// WpfShelvesLayout.xaml 的交互逻辑

4
RookieStation/ShelvesPlacementViewModel.cs → RookieStation/ParcelAreaModule/ViewModel/ShelvesPlacementViewModel.cs
View File

@@ -1,4 +1,4 @@
using RookieStation.PackAreaModule.Model;
using RookieStation.ParcelAreaModule.Model;
using RookieStation.Utils;
using System;
using System.Collections.Generic;
@@ -7,7 +7,7 @@ using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace RookieStation.PackAreaModule
namespace RookieStation.ParcelAreaModule
{
public class ShelvesPlacementViewModel
{

0
RookieStation/CmdProjectSettings.cs → RookieStation/ProjectConfig/ExcuteCmd/CmdProjectSettings.cs
View File

2
RookieStation/UserConstant.cs → RookieStation/ProjectConfig/UserConstant.cs
View File

@@ -1,5 +1,5 @@
using Autodesk.Revit.UI.Selection;
using RookieStation.UserClient;
using RookieStation.RibbonMenu;
using RookieStation.Utils;
using System;
using System.Collections.Generic;

0
RookieStation/WpfProjectSettings.xaml → RookieStation/ProjectConfig/View/WpfProjectSettings.xaml
View File

0
RookieStation/WpfProjectSettings.xaml.cs → RookieStation/ProjectConfig/View/WpfProjectSettings.xaml.cs
View File

76
RookieStation/RookieStation.csproj
View File

@@ -92,11 +92,11 @@
<Reference Include="WindowsBase" />
</ItemGroup>
<ItemGroup>
<Compile Include="CmdExportWorkSchedule.cs" />
<Compile Include="CmdPlaceFloorFinishes.cs" />
<Compile Include="CmdLogoExtrusion.cs" />
<Compile Include="CmdPlaceWallFinishes.cs" />
<Compile Include="FamilyDockablePaneHandler.cs" />
<Compile Include="Statistics\ExecuteCmd\CmdExportWorkSchedule.cs" />
<Compile Include="Finishes\ExecuteCmd\CmdPlaceFloorFinishes.cs" />
<Compile Include="MailingAreaModule\ExecuteCmd\CmdLogoExtrusion.cs" />
<Compile Include="Finishes\ExecuteCmd\CmdPlaceWallFinishes.cs" />
<Compile Include="CommonTools\ExtHandler\FamilyDockablePaneHandler.cs" />
<Compile Include="Model\FamilyInfo.cs" />
<Compile Include="Properties\Settings.Designer.cs">
<AutoGen>True</AutoGen>
@@ -109,62 +109,62 @@
<Compile Include="Utils\EnumItemsSource.cs" />
<Compile Include="Utils\ExcelUtils.cs" />
<Compile Include="Utils\KeyPress.cs" />
<Compile Include="CmdBrowserFamily.cs" />
<Compile Include="CmdPlaceShelves.cs" />
<Compile Include="CommonTools\ExecuteCmd\CmdUseFamilyPane.cs" />
<Compile Include="ParcelAreaModule\ExecuteCmd\CmdPlaceShelves.cs" />
<Compile Include="Utils\CommonUtils.cs" />
<Compile Include="Utils\Log.cs" />
<Compile Include="Utils\EnableCmdInViewPlan.cs" />
<Compile Include="CmdPlaceEntranceGate.cs" />
<Compile Include="CmdPlaceExitGate.cs" />
<Compile Include="ParcelAreaModule\ExecuteCmd\CmdPlaceEntranceGate.cs" />
<Compile Include="ParcelAreaModule\ExecuteCmd\CmdPlaceExitGate.cs" />
<Compile Include="Utils\RsRevitUtils.cs" />
<Compile Include="CmdFloorFinishes.cs" />
<Compile Include="CmdPlaceLamps.cs" />
<Compile Include="Model\Enum.cs" />
<Compile Include="Finishes\ExecuteCmd\CmdFloorFinishes.cs" />
<Compile Include="ParcelAreaModule\ExecuteCmd\CmdPlaceLamps.cs" />
<Compile Include="ParcelAreaModule\Model\Enum.cs" />
<Compile Include="Utils\ProjectConfigUtil.cs" />
<Compile Include="CmdProjectSettings.cs" />
<Compile Include="ProjectConfig\ExcuteCmd\CmdProjectSettings.cs" />
<Compile Include="Properties\AssemblyInfo.cs" />
<Compile Include="Properties\Resources.Designer.cs">
<AutoGen>True</AutoGen>
<DesignTime>True</DesignTime>
<DependentUpon>Resources.resx</DependentUpon>
</Compile>
<Compile Include="CmdArrangeShelfCards.cs" />
<Compile Include="ParcelAreaModule\ExecuteCmd\CmdArrangeShelfCards.cs" />
<Compile Include="RsApp.cs" />
<Compile Include="ShelvesPlacementViewModel.cs" />
<Compile Include="ParcelAreaModule\ViewModel\ShelvesPlacementViewModel.cs" />
<Compile Include="Utils\SelectFilter.cs" />
<Compile Include="CmdPlaceReceptionArea.cs" />
<Compile Include="Model\Shelf.cs" />
<Compile Include="UserConstant.cs" />
<Compile Include="MailingAreaModule\ExecuteCmd\CmdPlaceReceptionArea.cs" />
<Compile Include="ParcelAreaModule\Model\Shelf.cs" />
<Compile Include="ProjectConfig\UserConstant.cs" />
<Compile Include="Utils\WindowsThumbnailProvider.cs" />
<Compile Include="Utils\WinIntPtr.cs" />
<Compile Include="WpfEntranceGate.xaml.cs">
<Compile Include="ParcelAreaModule\View\WpfEntranceGate.xaml.cs">
<DependentUpon>WpfEntranceGate.xaml</DependentUpon>
</Compile>
<Compile Include="WpfExitGate.xaml.cs">
<Compile Include="ParcelAreaModule\View\WpfExitGate.xaml.cs">
<DependentUpon>WpfExitGate.xaml</DependentUpon>
</Compile>
<Compile Include="WpfFamilyDockablePane.xaml.cs">
<Compile Include="CommonTools\View\WpfFamilyDockablePane.xaml.cs">
<DependentUpon>WpfFamilyDockablePane.xaml</DependentUpon>
</Compile>
<Compile Include="WpfFloorFinishes.xaml.cs">
<Compile Include="Finishes\View\WpfFloorFinishes.xaml.cs">
<DependentUpon>WpfFloorFinishes.xaml</DependentUpon>
</Compile>
<Compile Include="WpfLampsLayout.xaml.cs">
<Compile Include="ParcelAreaModule\View\WpfLampsLayout.xaml.cs">
<DependentUpon>WpfLampsLayout.xaml</DependentUpon>
</Compile>
<Compile Include="WpfProjectSettings.xaml.cs">
<Compile Include="ProjectConfig\View\WpfProjectSettings.xaml.cs">
<DependentUpon>WpfProjectSettings.xaml</DependentUpon>
</Compile>
<Compile Include="WpfShelfCards.xaml.cs">
<Compile Include="ParcelAreaModule\View\WpfShelfCards.xaml.cs">
<DependentUpon>WpfShelfCards.xaml</DependentUpon>
</Compile>
<Compile Include="WpfReceptionArea.xaml.cs">
<Compile Include="MailingAreaModule\View\WpfReceptionArea.xaml.cs">
<DependentUpon>WpfReceptionArea.xaml</DependentUpon>
</Compile>
<Compile Include="WpfShelvesLayout.xaml.cs">
<Compile Include="ParcelAreaModule\View\WpfShelvesLayout.xaml.cs">
<DependentUpon>WpfShelvesLayout.xaml</DependentUpon>
</Compile>
<Compile Include="WpfWallFinishes.xaml.cs">
<Compile Include="Finishes\View\WpfWallFinishes.xaml.cs">
<DependentUpon>WpfWallFinishes.xaml</DependentUpon>
</Compile>
</ItemGroup>
@@ -284,43 +284,43 @@
</ItemGroup>
<ItemGroup />
<ItemGroup>
<Page Include="WpfEntranceGate.xaml">
<Page Include="ParcelAreaModule\View\WpfEntranceGate.xaml">
<SubType>Designer</SubType>
<Generator>MSBuild:Compile</Generator>
</Page>
<Page Include="WpfExitGate.xaml">
<Page Include="ParcelAreaModule\View\WpfExitGate.xaml">
<SubType>Designer</SubType>
<Generator>MSBuild:Compile</Generator>
</Page>
<Page Include="WpfFamilyDockablePane.xaml">
<Page Include="CommonTools\View\WpfFamilyDockablePane.xaml">
<SubType>Designer</SubType>
<Generator>MSBuild:Compile</Generator>
</Page>
<Page Include="WpfFloorFinishes.xaml">
<Page Include="Finishes\View\WpfFloorFinishes.xaml">
<SubType>Designer</SubType>
<Generator>MSBuild:Compile</Generator>
</Page>
<Page Include="WpfLampsLayout.xaml">
<Page Include="ParcelAreaModule\View\WpfLampsLayout.xaml">
<SubType>Designer</SubType>
<Generator>MSBuild:Compile</Generator>
</Page>
<Page Include="WpfProjectSettings.xaml">
<Page Include="ProjectConfig\View\WpfProjectSettings.xaml">
<SubType>Designer</SubType>
<Generator>MSBuild:Compile</Generator>
</Page>
<Page Include="WpfShelfCards.xaml">
<Page Include="ParcelAreaModule\View\WpfShelfCards.xaml">
<SubType>Designer</SubType>
<Generator>MSBuild:Compile</Generator>
</Page>
<Page Include="WpfReceptionArea.xaml">
<Page Include="MailingAreaModule\View\WpfReceptionArea.xaml">
<SubType>Designer</SubType>
<Generator>MSBuild:Compile</Generator>
</Page>
<Page Include="WpfShelvesLayout.xaml">
<Page Include="ParcelAreaModule\View\WpfShelvesLayout.xaml">
<SubType>Designer</SubType>
<Generator>MSBuild:Compile</Generator>
</Page>
<Page Include="WpfWallFinishes.xaml">
<Page Include="Finishes\View\WpfWallFinishes.xaml">
<SubType>Designer</SubType>
<Generator>MSBuild:Compile</Generator>
</Page>

196
RookieStation/RsApp.cs
View File

@@ -2,18 +2,19 @@
using RookieStation.CommonTools.ExecuteCmd;
using RookieStation.CommonTools.View;
using RookieStation.Finishes.ExecuteCmd;
using RookieStation.PackAreaModule.ExecuteCmd;
using RookieStation.ParcelAreaModule.ExecuteCmd;
using RookieStation.ProjectConfig.ExecuteCmd;
using RookieStation.ShippingAreaModule.ExecuteCmd;
using RookieStation.MailingAreaModule.ExecuteCmd;
using RookieStation.Statistics.ExecuteCmd;
using RookieStation.Utils;
using System;
using System.Drawing;
using System.IO;
using System.Windows;
using System.Windows.Interop;
using System.Windows.Media.Imaging;
namespace RookieStation.UserClient
namespace RookieStation.RibbonMenu
{
internal class RsApp : IExternalApplication
{
@@ -56,172 +57,79 @@ namespace RookieStation.UserClient
//项目设置
RibbonPanel projectPanel = application.CreateRibbonPanel(TabName, ProjectSettingsPanelName);
PushButtonData projectPBD = new PushButtonData("项目设置", "项目设置", AddInPath, typeof(CmdProjectSettings).FullName)
{
LargeImage = ConvertFromBitmap(Properties.Resources.cainiao),
Image = ConvertFromBitmap(Properties.Resources.cainiao)
};
var projectBtn = (PushButton)projectPanel.AddItem(projectPBD);
CreatePushButton<CmdProjectSettings>(projectPanel, "项目设置", Properties.Resources.cainiao, null);
//前台布置
RibbonPanel receptionAreaPanel = application.CreateRibbonPanel(TabName, ReceptionPanelName);
PushButtonData receptionLayoutPBD = new PushButtonData("寄件区布置", "前台布置", AddInPath, typeof(CmdPlaceReceptionArea).FullName)
{
LargeImage = ConvertFromBitmap(Properties.Resources.Reception),
Image = ConvertFromBitmap(Properties.Resources.Reception)
};
var receptionBtn = (PushButton)receptionAreaPanel.AddItem(receptionLayoutPBD);
receptionBtn.AvailabilityClassName = ViewPlanCmdEnabled;
PushButtonData logoExtrusionPBD = new PushButtonData("标识挤出", "标识挤出", AddInPath, typeof(CmdLogoExtrusion).FullName)
{
LargeImage = ConvertFromBitmap(Properties.Resources.LogoExtrusion),
Image = ConvertFromBitmap(Properties.Resources.LogoExtrusion)
};
receptionAreaPanel.AddItem(logoExtrusionPBD);
CreatePushButton<CmdPlaceReceptionArea>(receptionAreaPanel, "前台布置", Properties.Resources.Reception, ViewPlanCmdEnabled);
CreatePushButton<CmdPlaceReceptionArea>(receptionAreaPanel, "标识挤出", Properties.Resources.LogoExtrusion, ViewPlanCmdEnabled);
//出入口布置
RibbonPanel packAreaPanel = application.CreateRibbonPanel(TabName, EntranceAndExitGatePanelName);
PushButtonData entrancegateLayoutPBD = new PushButtonData("入口布置", "入口闸机", AddInPath, typeof(CmdPlaceEntranceGate).FullName)
{
LargeImage = ConvertFromBitmap(Properties.Resources.EntranceGate),
Image = ConvertFromBitmap(Properties.Resources.EntranceGate)
};
PushButtonData exitGateLayoutPBD = new PushButtonData("出口布置", "出口收检台", AddInPath, typeof(CmdPlaceExitGate).FullName)
{
LargeImage = ConvertFromBitmap(Properties.Resources.ExitGate),
Image = ConvertFromBitmap(Properties.Resources.ExitGate)
};
//var gateBtn = (PushButton)gatePanel.AddItem(exportGateLayoutPBD);
CreatePushButton<CmdPlaceEntranceGate>(packAreaPanel, "入口布置", Properties.Resources.EntranceGate, ViewPlanCmdEnabled);
CreatePushButton<CmdPlaceExitGate>(packAreaPanel, "出口布置", Properties.Resources.ExitGate, ViewPlanCmdEnabled);
//IList<RibbonItem> gateItemsStacked = packAreaPanel.AddStackedItems(entrancegateLayoutPBD, exitGateLayoutPBD);
//var entranceBtn = (PushButton)gateItemsStacked[0];
//var exitBtn = (PushButton)gateItemsStacked[1];
var entranceBtn = (PushButton)packAreaPanel.AddItem(entrancegateLayoutPBD);
var exitBtn = (PushButton)packAreaPanel.AddItem(exitGateLayoutPBD);
entranceBtn.AvailabilityClassName = ViewPlanCmdEnabled;
exitBtn.AvailabilityClassName = ViewPlanCmdEnabled;
//PushButtonData exitGateLayoutPBD = new PushButtonData("出口布置", "出口收检台", AddInPath, typeof(CmdPlaceExitGate).FullName)
//{
// LargeImage = ConvertFromBitmap(Properties.Resources.ExitGate),
// Image = ConvertFromBitmap(Properties.Resources.ExitGate)
//};
////var gateBtn = (PushButton)gatePanel.AddItem(exportGateLayoutPBD);
PushButtonData placeShelvesPBD = new PushButtonData("货架布置", "货架布置", AddInPath, typeof(CmdPlaceShelves).FullName)
{
LargeImage = ConvertFromBitmap(Properties.Resources.Shelf),
Image = ConvertFromBitmap(Properties.Resources.Shelf)
};
var placeShelvesBtn = (PushButton)packAreaPanel.AddItem(placeShelvesPBD);
placeShelvesBtn.AvailabilityClassName = ViewPlanCmdEnabled;
////IList<RibbonItem> gateItemsStacked = packAreaPanel.AddStackedItems(entrancegateLayoutPBD, exitGateLayoutPBD);
////var entranceBtn = (PushButton)gateItemsStacked[0];
////var exitBtn = (PushButton)gateItemsStacked[1];
//寄件区布置
CreatePushButton<CmdPlaceShelves>(packAreaPanel, "货架布置", Properties.Resources.Shelf, ViewPlanCmdEnabled);
PushButtonData placeShelveCardsPBD = new PushButtonData("货架端牌", "货架端牌", AddInPath, typeof(CmdArrangeShelfCards).FullName)
{
LargeImage = ConvertFromBitmap(Properties.Resources.ShelfCard),
Image = ConvertFromBitmap(Properties.Resources.ShelfCard)
};
var placeShelveCardsBtn = (PushButton)packAreaPanel.AddItem(placeShelveCardsPBD);
CreatePushButton<CmdArrangeShelfCards>(packAreaPanel, "货架端牌", Properties.Resources.ShelfCard, ViewPlanCmdEnabled);
CreatePushButton<CmdPlaceLamps>(packAreaPanel, "灯具布置", Properties.Resources.Lamp, ViewPlanCmdEnabled);
PushButtonData placeLampsPBD = new PushButtonData("灯具布置", "灯具布置", AddInPath, typeof(CmdPlaceLamps).FullName)
{
LargeImage = ConvertFromBitmap(Properties.Resources.Lamp),
Image = ConvertFromBitmap(Properties.Resources.Lamp)
};
var placeLampsBtn = (PushButton)packAreaPanel.AddItem(placeLampsPBD);
placeLampsBtn.AvailabilityClassName = ViewPlanCmdEnabled;
//饰面，完成面
RibbonPanel finishesPanel = application.CreateRibbonPanel(TabName, FinishesPanelName);
CreatePushButton<CmdPlaceFloorFinishes>(finishesPanel, "板饰面", Properties.Resources.FloorFinishes, ViewPlanCmdEnabled);
CreatePushButton<CmdPlaceWallFinishes>(finishesPanel, "墙饰面", Properties.Resources.WallFinishes, ViewPlanCmdEnabled);
PushButtonData floorfinishesPBD = new PushButtonData("地面铺装", "地面铺装", AddInPath, typeof(CmdPlaceFloorFinishes).FullName)
{
LargeImage = ConvertFromBitmap(Properties.Resources.FloorFinishes),
Image = ConvertFromBitmap(Properties.Resources.FloorFinishes)
};
var floorcoveringBtn = (PushButton)finishesPanel.AddItem(floorfinishesPBD);
floorcoveringBtn.AvailabilityClassName = ViewPlanCmdEnabled;
PushButtonData wallcoveringPBD = new PushButtonData("墙饰面", "墙饰面", AddInPath, typeof(CmdPlaceWallFinishes).FullName)
{
LargeImage = ConvertFromBitmap(Properties.Resources.WallFinishes),
Image = ConvertFromBitmap(Properties.Resources.WallFinishes)
};
var wallcoveringBtn = (PushButton)finishesPanel.AddItem(wallcoveringPBD);
wallcoveringBtn.AvailabilityClassName = ViewPlanCmdEnabled;
//统计面板
RibbonPanel statisticsPanel = application.CreateRibbonPanel(TabName, StatisticsPanelName);
CreatePushButton<CmdExportWorkSchedule>(statisticsPanel, "工程量导出", Properties.Resources.WorkSchedule, null);
PushButtonData statisticsfamilyPBD = new PushButtonData("输出统计表", "工程量统计", AddInPath, typeof(CmdExportWorkSchedule).FullName)
{
LargeImage = ConvertFromBitmap(Properties.Resources.WorkSchedule),
Image = ConvertFromBitmap(Properties.Resources.WorkSchedule)
};
statisticsPanel.AddItem(statisticsfamilyPBD);
//通用面板
RibbonPanel commonToolsPanel = application.CreateRibbonPanel(TabName, CommonTools);
PushButtonData browserfamilyPBD = new PushButtonData("浏览族", "浏览族文件", AddInPath, typeof(CmdBrowserFamily).FullName)
{
LargeImage = ConvertFromBitmap(Properties.Resources.FamilyLib),
Image = ConvertFromBitmap(Properties.Resources.FamilyLib)
};
commonToolsPanel.AddItem(browserfamilyPBD);
CreatePushButton<CmdUseFamilyPane>(commonToolsPanel, "族库浏览", Properties.Resources.FamilyLib, null);
RegisterDockPane(application);
return Result.Succeeded;
#region MyRegion
//RibbonPanel familyUtilPanel = application.CreateRibbonPanel(TabName, PanelName1);
//PushButtonData FamilyTransmitPBData = new PushButtonData("传递标准", "传递标准", AddInPath, "HandyUtils.Common.RExecute.CmdTransmitStandards");
//PushButtonData FamilyMassSavePBData = new PushButtonData("批量保存", "批量保存", AddInPath, "HandyUtils.Common.RExecute.CmdFamilyPreservation");
//IList<RibbonItem> FtItemsStacked = familyUtilPanel.AddStackedItems(FamilyTransmitPBData, FamilyMassSavePBData);
////((PushButton)(ribbonItemsStacked[0])).Image = new BitmapImage(new Uri(Path.Combine(ButtonIconsFolder, "Reset.png"), UriKind.Absolute));
//((PushButton)FtItemsStacked[0]).Image = ConvertFromBitmap(Properties.Resources.One_Way_Transition_16px);
//((PushButton)FtItemsStacked[1]).Image = ConvertFromBitmap(Properties.Resources.Save_16px);
//familyUtilPanel.AddSeparator();
//PushButtonData ImportFamParaPBD = new PushButtonData("导入族参数", "族参数", AddInPath, "HandyUtils.Common.RExecute.CmdImportParams")
//{
// ToolTip = "导入族参数到族文件"
//};
//PushButtonData ImportSharedParaPBD = new PushButtonData("导入共享参数", "共享参数", AddInPath, "HandyUtils.Common.RExecute.CmdShareParams")
//{
// ToolTip = "导入参数到共享参数文件"
//};
//PushButtonData UpdateFamilyFilePBD = new PushButtonData("更新族文件", "更新族", AddInPath, "HandyUtils.Common.RExecute.CmdUpdateFiles")
//{
// ToolTip = "更新族文件缩略图及升级至当前版本"
//};
//IList<RibbonItem> ParaItemsStacked = familyUtilPanel.AddStackedItems(ImportFamParaPBD, ImportSharedParaPBD, UpdateFamilyFilePBD);
//((PushButton)ParaItemsStacked[0]).Image = ConvertFromBitmap(Properties.Resources.Add_Property_16px);
//((PushButton)ParaItemsStacked[1]).Image = ConvertFromBitmap(Properties.Resources.Import_16px);
//((PushButton)ParaItemsStacked[2]).Image = ConvertFromBitmap(Properties.Resources.Available_Updates_32px);
#endregion MyRegion
#region MyRegion
//RibbonPanel exportPanel = application.CreateRibbonPanel(TabName, "导出族信息");
//PushButtonData pbdSettings = new PushButtonData("设置", "导出选项", AddInPath, "HandyUtils.Common.RExecute.CmdSettings")
//{
// ToolTip = "设置导出选项"
//};
//PushButtonData pbdFamilyInfoExport = new PushButtonData("导出", "信息导出", AddInPath, "HandyUtils.Common.RExecute.CmdFamilyInfo")
//{
// ToolTip = "将族图片、族参数进行导出"
//};
//IList<RibbonItem> ExportItemsStacked = exportPanel.AddStackedItems(pbdSettings, pbdFamilyInfoExport);
//((PushButton)ExportItemsStacked[0]).Image = ConvertFromBitmap(Properties.Resources.Settings_16px);
//((PushButton)ExportItemsStacked[1]).Image = ConvertFromBitmap(Properties.Resources.Export_16px);
#endregion MyRegion
}
catch (Exception ex)
{
Log.WriteLog(ex.Message);
return Result.Cancelled;
return Result.Failed;
}
}
/// <summary>
///创建按钮
/// </summary>
/// <typeparam name="T">命令类</typeparam>
/// <param name="panel">面板</param>
/// <param name="btnContent">按钮名</param>
/// <param name="bitmap">按钮图片</param>
/// <param name="className">控制可用性</param>
public void CreatePushButton<T>(RibbonPanel panel, string btnContent, Bitmap bitmap, string className)
{
string AddInPath = typeof(T).Assembly.Location;
PushButtonData btnData = new PushButtonData(btnContent, btnContent, AddInPath, typeof(T).FullName)
{
LargeImage = ConvertFromBitmap(bitmap),
Image = ConvertFromBitmap(bitmap)
};
var placeShelvesBtn = (PushButton)panel.AddItem(btnData);
if (className != null)
{
placeShelvesBtn.AvailabilityClassName = className;
}
}

0
RookieStation/cmdExportWorkSchedule.cs → RookieStation/Statistics/ExecuteCmd/CmdExportWorkSchedule.cs
View File

4
RookieStation/Utils/CommonUtils.cs
View File

@@ -1,6 +1,6 @@
using Autodesk.Revit.UI;
using RookieStation.PackAreaModule;
using RookieStation.UserClient;
using RookieStation.ParcelAreaModule;
using RookieStation.RibbonMenu;
using System;
using System.Collections.Generic;
using System.ComponentModel;