Skip to content

Commit

Permalink
RevitOpeningPlacement: Обновлено заполнение параметров отметок задани…
Browse files Browse the repository at this point in the history 
…й от ВИС (#108)
  • Loading branch information
@vlastroG
vlastroG authored Oct 31, 2024
1 parent 30f299f commit 6dd8cea
Show file tree
Hide file tree
Showing 17 changed files with 205 additions and 107 deletions.
19 changes: 8 additions & 11 deletions src/RevitOpeningPlacement/Models/OpeningPlacement/Checkers/FamiliesParametersChecker.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -118,26 +118,23 @@ private ICollection<string> GetRequiredParameters(OpeningType openingType) {
RevitRepository.OpeningMepSystem,
RevitRepository.OpeningAuthor,
RevitRepository.OpeningThickness,
RevitRepository.OpeningOffsetBottom,
RevitRepository.OpeningIsManuallyPlaced,
RevitRepository.OpeningOffsetBottomAdsk,
RevitRepository.OpeningOffsetBottom,
RevitRepository.OpeningOffsetCenter,
RevitRepository.OpeningOffsetAdsk,
RevitRepository.OpeningOffsetFromLevelAdsk,
RevitRepository.OpeningLevelOffsetAdsk
RevitRepository.OpeningLevelOffsetAdsk,
RevitRepository.OpeningOffsetAdskOld,
RevitRepository.OpeningOffsetFromLevelAdskOld,
RevitRepository.OpeningLevelOffsetAdskOld
};
// добавление специфических параметров семейств
switch(openingType) {
case OpeningType.FloorRound:
case OpeningType.WallRound:
paramNames.Add(RevitRepository.OpeningDiameter);
paramNames.Add(RevitRepository.OpeningOffsetCenter);
break;
case OpeningType.WallRectangle:
paramNames.Add(RevitRepository.OpeningHeight);
paramNames.Add(RevitRepository.OpeningWidth);
paramNames.Add(RevitRepository.OpeningOffsetCenter);
break;
case OpeningType.FloorRound:
paramNames.Add(RevitRepository.OpeningDiameter);
break;
case OpeningType.FloorRectangle:
paramNames.Add(RevitRepository.OpeningHeight);
paramNames.Add(RevitRepository.OpeningWidth);
Expand Down
21 changes: 15 additions & 6 deletions ...t/Models/OpeningPlacement/ParameterGetters/ParametersGetters/FloorSolidParameterGetter.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -73,18 +73,27 @@ public IEnumerable<ParameterValuePair> GetParamValues() {
yield return new DoubleParameterGetter(RevitRepository.OpeningHeight, sizeInit.GetHeight()).GetParamValue();
yield return new DoubleParameterGetter(RevitRepository.OpeningWidth, sizeInit.GetWidth()).GetParamValue();
}
IValueGetter<DoubleParamValue> thicknessValueGetter;
if((_structureElement != null) && (_structureElement is Floor ceilingAndFloor)) {
yield return new DoubleParameterGetter(RevitRepository.OpeningThickness, new FloorThicknessValueGetter(ceilingAndFloor)).GetParamValue();
thicknessValueGetter = new FloorThicknessValueGetter(ceilingAndFloor);
} else {
yield return new DoubleParameterGetter(RevitRepository.OpeningThickness, sizeInit.GetThickness()).GetParamValue();
thicknessValueGetter = sizeInit.GetThickness();
}
yield return new DoubleParameterGetter(RevitRepository.OpeningThickness, thicknessValueGetter).GetParamValue();

//отметки отверстия
var bottomOffsetValueGetter = new BottomOffsetOfOpeningInFloorValueGetter(_pointFinder, sizeInit.GetThickness());
var bottomOffsetValueGetter = new BottomOffsetOfOpeningInFloorValueGetter(_pointFinder, thicknessValueGetter);
var centerOffsetMmValueGetter = new CenterOffsetValueGetter(_pointFinder);
yield return new DoubleParameterGetter(RevitRepository.OpeningOffsetBottom, bottomOffsetValueGetter).GetParamValue();
yield return new DoubleParameterGetter(RevitRepository.OpeningOffsetBottomAdsk, new BottomOffsetInFeetValueGetter(bottomOffsetValueGetter)).GetParamValue();
yield return new DoubleParameterGetter(RevitRepository.OpeningOffsetFromLevelAdsk, new BottomOffsetFromLevelValueGetter(bottomOffsetValueGetter, _levelFinder)).GetParamValue();
yield return new DoubleParameterGetter(RevitRepository.OpeningLevelOffsetAdsk, new LevelOffsetValueGetter(_levelFinder)).GetParamValue();
yield return new DoubleParameterGetter(RevitRepository.OpeningOffsetCenter, centerOffsetMmValueGetter).GetParamValue();
var offsetFeetFromLevelValueGetter = new OffsetFromLevelValueGetter(centerOffsetMmValueGetter, _levelFinder);
var levelFeetOffsetValueGetter = new LevelOffsetValueGetter(_levelFinder);
yield return new DoubleParameterGetter(RevitRepository.OpeningOffsetAdsk, new OffsetInFeetValueGetter(centerOffsetMmValueGetter)).GetParamValue();
yield return new DoubleParameterGetter(RevitRepository.OpeningOffsetFromLevelAdsk, offsetFeetFromLevelValueGetter).GetParamValue();
yield return new DoubleParameterGetter(RevitRepository.OpeningLevelOffsetAdsk, levelFeetOffsetValueGetter).GetParamValue();
yield return new DoubleParameterGetter(RevitRepository.OpeningOffsetAdskOld, centerOffsetMmValueGetter).GetParamValue();
yield return new DoubleParameterGetter(RevitRepository.OpeningOffsetFromLevelAdskOld, new OffsetInMmValueGetter(offsetFeetFromLevelValueGetter)).GetParamValue();
yield return new DoubleParameterGetter(RevitRepository.OpeningLevelOffsetAdskOld, new OffsetInMmValueGetter(levelFeetOffsetValueGetter)).GetParamValue();

//текстовые данные отверстия
yield return new StringParameterGetter(RevitRepository.OpeningDate, new DateValueGetter()).GetParamValue();
Expand Down
13 changes: 9 additions & 4 deletions ...Placement/ParameterGetters/ParametersGetters/InclinedRectangleCurveWallParameterGetter.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,12 +29,17 @@ public IEnumerable<ParameterValuePair> GetParamValues() {
yield return new DoubleParameterGetter(RevitRepository.OpeningThickness, new WallThicknessValueGetter(_clash.Element2)).GetParamValue();

//отметки отверстия
yield return new DoubleParameterGetter(RevitRepository.OpeningOffsetCenter, new CenterOffsetOfRectangleOpeningInWallValueGetter(_pointFinder, heightValueGetter)).GetParamValue();
var bottomOffsetValueGetter = new BottomOffsetOfRectangleOpeningInWallValueGetter(_pointFinder);
yield return new DoubleParameterGetter(RevitRepository.OpeningOffsetCenter, new CenterOffsetOfRectangleOpeningInWallValueGetter(_pointFinder, heightValueGetter)).GetParamValue();
yield return new DoubleParameterGetter(RevitRepository.OpeningOffsetBottom, bottomOffsetValueGetter).GetParamValue();
yield return new DoubleParameterGetter(RevitRepository.OpeningOffsetBottomAdsk, new BottomOffsetInFeetValueGetter(bottomOffsetValueGetter)).GetParamValue();
yield return new DoubleParameterGetter(RevitRepository.OpeningOffsetFromLevelAdsk, new BottomOffsetFromLevelValueGetter(bottomOffsetValueGetter, _levelFinder)).GetParamValue();
yield return new DoubleParameterGetter(RevitRepository.OpeningLevelOffsetAdsk, new LevelOffsetValueGetter(_levelFinder)).GetParamValue();
var offsetFeetFromLevelValueGetter = new OffsetFromLevelValueGetter(bottomOffsetValueGetter, _levelFinder);
var levelFeetOffsetValueGetter = new LevelOffsetValueGetter(_levelFinder);
yield return new DoubleParameterGetter(RevitRepository.OpeningOffsetAdsk, new OffsetInFeetValueGetter(bottomOffsetValueGetter)).GetParamValue();
yield return new DoubleParameterGetter(RevitRepository.OpeningOffsetFromLevelAdsk, offsetFeetFromLevelValueGetter).GetParamValue();
yield return new DoubleParameterGetter(RevitRepository.OpeningLevelOffsetAdsk, levelFeetOffsetValueGetter).GetParamValue();
yield return new DoubleParameterGetter(RevitRepository.OpeningOffsetAdskOld, bottomOffsetValueGetter).GetParamValue();
yield return new DoubleParameterGetter(RevitRepository.OpeningOffsetFromLevelAdskOld, new OffsetInMmValueGetter(offsetFeetFromLevelValueGetter)).GetParamValue();
yield return new DoubleParameterGetter(RevitRepository.OpeningLevelOffsetAdskOld, new OffsetInMmValueGetter(levelFeetOffsetValueGetter)).GetParamValue();


//текстовые данные отверстия
Expand Down
13 changes: 9 additions & 4 deletions .../OpeningPlacement/ParameterGetters/ParametersGetters/InclinedRoundCurveWallParamGetter.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -35,12 +35,17 @@ public IEnumerable<ParameterValuePair> GetParamValues() {
yield return new DoubleParameterGetter(RevitRepository.OpeningThickness, new WallThicknessValueGetter(_clash.Element2)).GetParamValue();

//отметки отверстия
yield return new DoubleParameterGetter(RevitRepository.OpeningOffsetCenter, new CenterOffsetOfRectangleOpeningInWallValueGetter(_pointFinder, heightValueGetter)).GetParamValue();
var bottomOffsetValueGetter = new BottomOffsetOfRectangleOpeningInWallValueGetter(_pointFinder);
yield return new DoubleParameterGetter(RevitRepository.OpeningOffsetCenter, new CenterOffsetOfRectangleOpeningInWallValueGetter(_pointFinder, heightValueGetter)).GetParamValue();
yield return new DoubleParameterGetter(RevitRepository.OpeningOffsetBottom, bottomOffsetValueGetter).GetParamValue();
yield return new DoubleParameterGetter(RevitRepository.OpeningOffsetBottomAdsk, new BottomOffsetInFeetValueGetter(bottomOffsetValueGetter)).GetParamValue();
yield return new DoubleParameterGetter(RevitRepository.OpeningOffsetFromLevelAdsk, new BottomOffsetFromLevelValueGetter(bottomOffsetValueGetter, _levelFinder)).GetParamValue();
yield return new DoubleParameterGetter(RevitRepository.OpeningLevelOffsetAdsk, new LevelOffsetValueGetter(_levelFinder)).GetParamValue();
var offsetFeetFromLevelValueGetter = new OffsetFromLevelValueGetter(bottomOffsetValueGetter, _levelFinder);
var levelFeetOffsetValueGetter = new LevelOffsetValueGetter(_levelFinder);
yield return new DoubleParameterGetter(RevitRepository.OpeningOffsetAdsk, new OffsetInFeetValueGetter(bottomOffsetValueGetter)).GetParamValue();
yield return new DoubleParameterGetter(RevitRepository.OpeningOffsetFromLevelAdsk, offsetFeetFromLevelValueGetter).GetParamValue();
yield return new DoubleParameterGetter(RevitRepository.OpeningLevelOffsetAdsk, levelFeetOffsetValueGetter).GetParamValue();
yield return new DoubleParameterGetter(RevitRepository.OpeningOffsetAdskOld, bottomOffsetValueGetter).GetParamValue();
yield return new DoubleParameterGetter(RevitRepository.OpeningOffsetFromLevelAdskOld, new OffsetInMmValueGetter(offsetFeetFromLevelValueGetter)).GetParamValue();
yield return new DoubleParameterGetter(RevitRepository.OpeningLevelOffsetAdskOld, new OffsetInMmValueGetter(levelFeetOffsetValueGetter)).GetParamValue();

//текстовые данные отверстия
yield return new StringParameterGetter(RevitRepository.OpeningDate, new DateValueGetter()).GetParamValue();
Expand Down
13 changes: 10 additions & 3 deletions ...acement/ParameterGetters/ParametersGetters/PerpendicularRectangleCurveFloorParamGetter.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,10 +30,17 @@ public IEnumerable<ParameterValuePair> GetParamValues() {

//отметки отверстия
var bottomOffsetValueGetter = new BottomOffsetOfOpeningInFloorValueGetter(_pointFinder, floorThicknessValueGetter);
var centerOffsetMmValueGetter = new CenterOffsetValueGetter(_pointFinder);
yield return new DoubleParameterGetter(RevitRepository.OpeningOffsetBottom, bottomOffsetValueGetter).GetParamValue();
yield return new DoubleParameterGetter(RevitRepository.OpeningOffsetBottomAdsk, new BottomOffsetInFeetValueGetter(bottomOffsetValueGetter)).GetParamValue();
yield return new DoubleParameterGetter(RevitRepository.OpeningOffsetFromLevelAdsk, new BottomOffsetFromLevelValueGetter(bottomOffsetValueGetter, _levelFinder)).GetParamValue();
yield return new DoubleParameterGetter(RevitRepository.OpeningLevelOffsetAdsk, new LevelOffsetValueGetter(_levelFinder)).GetParamValue();
yield return new DoubleParameterGetter(RevitRepository.OpeningOffsetCenter, centerOffsetMmValueGetter).GetParamValue();
var offsetFeetFromLevelValueGetter = new OffsetFromLevelValueGetter(centerOffsetMmValueGetter, _levelFinder);
var levelFeetOffsetValueGetter = new LevelOffsetValueGetter(_levelFinder);
yield return new DoubleParameterGetter(RevitRepository.OpeningOffsetAdsk, new OffsetInFeetValueGetter(centerOffsetMmValueGetter)).GetParamValue();
yield return new DoubleParameterGetter(RevitRepository.OpeningOffsetFromLevelAdsk, offsetFeetFromLevelValueGetter).GetParamValue();
yield return new DoubleParameterGetter(RevitRepository.OpeningLevelOffsetAdsk, levelFeetOffsetValueGetter).GetParamValue();
yield return new DoubleParameterGetter(RevitRepository.OpeningOffsetAdskOld, centerOffsetMmValueGetter).GetParamValue();
yield return new DoubleParameterGetter(RevitRepository.OpeningOffsetFromLevelAdskOld, new OffsetInMmValueGetter(offsetFeetFromLevelValueGetter)).GetParamValue();
yield return new DoubleParameterGetter(RevitRepository.OpeningLevelOffsetAdskOld, new OffsetInMmValueGetter(levelFeetOffsetValueGetter)).GetParamValue();


//текстовые данные отверстия
Expand Down
13 changes: 9 additions & 4 deletions ...lacement/ParameterGetters/ParametersGetters/PerpendicularRectangleCurveWallParamGetter.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,12 +29,17 @@ public IEnumerable<ParameterValuePair> GetParamValues() {
yield return new DoubleParameterGetter(RevitRepository.OpeningThickness, new WallThicknessValueGetter(_clash.Element2)).GetParamValue();

//отметки отверстия
yield return new DoubleParameterGetter(RevitRepository.OpeningOffsetCenter, new CenterOffsetOfRectangleOpeningInWallValueGetter(_pointFinder, heightValueGetter)).GetParamValue();
var bottomOffsetValueGetter = new BottomOffsetOfRectangleOpeningInWallValueGetter(_pointFinder);
yield return new DoubleParameterGetter(RevitRepository.OpeningOffsetCenter, new CenterOffsetOfRectangleOpeningInWallValueGetter(_pointFinder, heightValueGetter)).GetParamValue();
yield return new DoubleParameterGetter(RevitRepository.OpeningOffsetBottom, bottomOffsetValueGetter).GetParamValue();
yield return new DoubleParameterGetter(RevitRepository.OpeningOffsetBottomAdsk, new BottomOffsetInFeetValueGetter(bottomOffsetValueGetter)).GetParamValue();
yield return new DoubleParameterGetter(RevitRepository.OpeningOffsetFromLevelAdsk, new BottomOffsetFromLevelValueGetter(bottomOffsetValueGetter, _levelFinder)).GetParamValue();
yield return new DoubleParameterGetter(RevitRepository.OpeningLevelOffsetAdsk, new LevelOffsetValueGetter(_levelFinder)).GetParamValue();
var offsetFeetFromLevelValueGetter = new OffsetFromLevelValueGetter(bottomOffsetValueGetter, _levelFinder);
var levelFeetOffsetValueGeeter = new LevelOffsetValueGetter(_levelFinder);
yield return new DoubleParameterGetter(RevitRepository.OpeningOffsetAdsk, new OffsetInFeetValueGetter(bottomOffsetValueGetter)).GetParamValue();
yield return new DoubleParameterGetter(RevitRepository.OpeningOffsetFromLevelAdsk, offsetFeetFromLevelValueGetter).GetParamValue();
yield return new DoubleParameterGetter(RevitRepository.OpeningLevelOffsetAdsk, levelFeetOffsetValueGeeter).GetParamValue();
yield return new DoubleParameterGetter(RevitRepository.OpeningOffsetAdskOld, bottomOffsetValueGetter).GetParamValue();
yield return new DoubleParameterGetter(RevitRepository.OpeningOffsetFromLevelAdskOld, new OffsetInMmValueGetter(offsetFeetFromLevelValueGetter)).GetParamValue();
yield return new DoubleParameterGetter(RevitRepository.OpeningLevelOffsetAdskOld, new OffsetInMmValueGetter(levelFeetOffsetValueGeeter)).GetParamValue();

//текстовые данные отверстия
yield return new StringParameterGetter(RevitRepository.OpeningDate, new DateValueGetter()).GetParamValue();
Expand Down
22 changes: 16 additions & 6 deletions ...ngPlacement/ParameterGetters/ParametersGetters/PerpendicularRoundCurveFloorParamGetter.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,8 @@

using Autodesk.Revit.DB;

using RevitClashDetective.Models.Value;

using RevitOpeningPlacement.Models.Configs;
using RevitOpeningPlacement.Models.Interfaces;
using RevitOpeningPlacement.Models.OpeningPlacement.ValueGetters;
Expand All @@ -27,7 +29,8 @@ public IEnumerable<ParameterValuePair> GetParamValues() {
var diameterValueGetter = new DiameterValueGetter(_clash.Element1, _mepCategory);

//габариты отверстия
if(OpeningTaskIsRound()) {
bool isRound = OpeningTaskIsRound();
if(isRound) {
// круглое задание на отверстие
yield return new DoubleParameterGetter(RevitRepository.OpeningDiameter, diameterValueGetter).GetParamValue();

Expand All @@ -39,11 +42,18 @@ public IEnumerable<ParameterValuePair> GetParamValues() {
yield return new DoubleParameterGetter(RevitRepository.OpeningThickness, floorThicknessValueGetter).GetParamValue();

//отметки отверстия
var bottomOffsetValueGetter = new BottomOffsetOfOpeningInFloorValueGetter(_pointFinder, floorThicknessValueGetter);
yield return new DoubleParameterGetter(RevitRepository.OpeningOffsetBottom, bottomOffsetValueGetter).GetParamValue();
yield return new DoubleParameterGetter(RevitRepository.OpeningOffsetBottomAdsk, new BottomOffsetInFeetValueGetter(bottomOffsetValueGetter)).GetParamValue();
yield return new DoubleParameterGetter(RevitRepository.OpeningOffsetFromLevelAdsk, new BottomOffsetFromLevelValueGetter(bottomOffsetValueGetter, _levelFinder)).GetParamValue();
yield return new DoubleParameterGetter(RevitRepository.OpeningLevelOffsetAdsk, new LevelOffsetValueGetter(_levelFinder)).GetParamValue();
var bottomOffsetMmValueGetter = new BottomOffsetOfOpeningInFloorValueGetter(_pointFinder, floorThicknessValueGetter);
IValueGetter<DoubleParamValue> centerOffsetMmValueGetter = new CenterOffsetValueGetter(_pointFinder);
yield return new DoubleParameterGetter(RevitRepository.OpeningOffsetCenter, centerOffsetMmValueGetter).GetParamValue();
yield return new DoubleParameterGetter(RevitRepository.OpeningOffsetBottom, bottomOffsetMmValueGetter).GetParamValue();
var offsetFeetFromLevelValueGetter = new OffsetFromLevelValueGetter(centerOffsetMmValueGetter, _levelFinder);
var levelFeetOffsetValueGetter = new LevelOffsetValueGetter(_levelFinder);
yield return new DoubleParameterGetter(RevitRepository.OpeningOffsetAdsk, new OffsetInFeetValueGetter(centerOffsetMmValueGetter)).GetParamValue();
yield return new DoubleParameterGetter(RevitRepository.OpeningOffsetFromLevelAdsk, offsetFeetFromLevelValueGetter).GetParamValue();
yield return new DoubleParameterGetter(RevitRepository.OpeningLevelOffsetAdsk, levelFeetOffsetValueGetter).GetParamValue();
yield return new DoubleParameterGetter(RevitRepository.OpeningOffsetAdskOld, centerOffsetMmValueGetter).GetParamValue();
yield return new DoubleParameterGetter(RevitRepository.OpeningOffsetFromLevelAdskOld, new OffsetInMmValueGetter(offsetFeetFromLevelValueGetter)).GetParamValue();
yield return new DoubleParameterGetter(RevitRepository.OpeningLevelOffsetAdskOld, new OffsetInMmValueGetter(levelFeetOffsetValueGetter)).GetParamValue();

//текстовые данные отверстия
yield return new StringParameterGetter(RevitRepository.OpeningDate, new DateValueGetter()).GetParamValue();
Expand Down
Loading

0 comments on commit 6dd8cea

Please sign in to comment.