Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix(create): Do not create window parameters for degenerate apertures #197

Merged
merged 1 commit into from Oct 21, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified dragonfly_grasshopper/icon/DF Simple Window Ratio Parameters.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified dragonfly_grasshopper/icon/DF Single Window Parameters.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
@@ -1,5 +1,5 @@
{
"version": "1.3.0",
"version": "1.3.1",
"nickname": "RepeatingRatioPar",
"outputs": [
[
Expand Down Expand Up @@ -50,7 +50,7 @@
}
],
"subcategory": "0 :: Create",
"code": "\ntry: # import the core dragonfly dependencies\n from dragonfly.windowparameter import RepeatingWindowRatio\nexcept ImportError as e:\n raise ImportError('\\nFailed to import dragonfly:\\n\\t{}'.format(e))\n\ntry:\n from ladybug_{{cad}}.config import conversion_to_meters\n from ladybug_{{cad}}.{{plugin}} import all_required_inputs\nexcept ImportError as e:\n raise ImportError('\\nFailed to import ladybug_{{cad}}:\\n\\t{}'.format(e))\n\n\nif all_required_inputs(ghenv.Component):\n # set defaults for any blank inputs\n conversion = conversion_to_meters()\n _win_height_ = _win_height_ if _win_height_ is not None else 2.0 / conversion\n _sill_height_ = _sill_height_ if _sill_height_ is not None else 0.8 / conversion\n _horiz_separ_ = _horiz_separ_ if _horiz_separ_ is not None else 3.0 / conversion\n vert_separ_ = vert_separ_ if vert_separ_ is not None else 0.0\n \n win_par = RepeatingWindowRatio(_ratio, _win_height_, _sill_height_,\n _horiz_separ_, vert_separ_)",
"code": "\ntry: # import the core dragonfly dependencies\n from dragonfly.windowparameter import RepeatingWindowRatio\nexcept ImportError as e:\n raise ImportError('\\nFailed to import dragonfly:\\n\\t{}'.format(e))\n\ntry:\n from ladybug_{{cad}}.config import conversion_to_meters\n from ladybug_{{cad}}.{{plugin}} import all_required_inputs\nexcept ImportError as e:\n raise ImportError('\\nFailed to import ladybug_{{cad}}:\\n\\t{}'.format(e))\n\n\nif all_required_inputs(ghenv.Component):\n # set defaults for any blank inputs\n conversion = conversion_to_meters()\n _win_height_ = _win_height_ if _win_height_ is not None else 2.0 / conversion\n _sill_height_ = _sill_height_ if _sill_height_ is not None else 0.8 / conversion\n _horiz_separ_ = _horiz_separ_ if _horiz_separ_ is not None else 3.0 / conversion\n vert_separ_ = vert_separ_ if vert_separ_ is not None else 0.0\n\n # create the window parameters\n if _ratio != 0:\n win_par = RepeatingWindowRatio(_ratio, _win_height_, _sill_height_,\n _horiz_separ_, vert_separ_)",
"category": "Dragonfly",
"name": "DF Repeating Window Ratio Parameters",
"description": "Create Dragonfly window parameters with instructions for repeating windows\nderived from an area ratio with the base surface.\n-"
Expand Down
@@ -1,5 +1,5 @@
{
"version": "1.3.0",
"version": "1.3.1",
"nickname": "RepeatingWHPar",
"outputs": [
[
Expand Down Expand Up @@ -43,7 +43,7 @@
}
],
"subcategory": "0 :: Create",
"code": "\ntry: # import the core dragonfly dependencies\n from dragonfly.windowparameter import RepeatingWindowWidthHeight\nexcept ImportError as e:\n raise ImportError('\\nFailed to import dragonfly:\\n\\t{}'.format(e))\n\ntry:\n from ladybug_{{cad}}.config import conversion_to_meters\n from ladybug_{{cad}}.{{plugin}} import all_required_inputs\nexcept ImportError as e:\n raise ImportError('\\nFailed to import ladybug_{{cad}}:\\n\\t{}'.format(e))\n\n\nif all_required_inputs(ghenv.Component):\n # set defaults for any blank inputs\n conversion = conversion_to_meters()\n _win_height_ = _win_height_ if _win_height_ is not None else 2.0 / conversion\n _win_width_ = _win_width_ if _win_width_ is not None else 1.5 / conversion\n _sill_height_ = _sill_height_ if _sill_height_ is not None else 0.8 / conversion\n _horiz_separ_ = _horiz_separ_ if _horiz_separ_ is not None else 3.0 / conversion\n \n win_par = RepeatingWindowWidthHeight(\n _win_height_, _win_width_, _sill_height_, _horiz_separ_)",
"code": "\ntry: # import the core dragonfly dependencies\n from dragonfly.windowparameter import RepeatingWindowWidthHeight\nexcept ImportError as e:\n raise ImportError('\\nFailed to import dragonfly:\\n\\t{}'.format(e))\n\ntry:\n from ladybug_{{cad}}.config import conversion_to_meters\n from ladybug_{{cad}}.{{plugin}} import all_required_inputs\nexcept ImportError as e:\n raise ImportError('\\nFailed to import ladybug_{{cad}}:\\n\\t{}'.format(e))\n\n\nif all_required_inputs(ghenv.Component):\n # set defaults for any blank inputs\n conversion = conversion_to_meters()\n _win_height_ = _win_height_ if _win_height_ is not None else 2.0 / conversion\n _win_width_ = _win_width_ if _win_width_ is not None else 1.5 / conversion\n _sill_height_ = _sill_height_ if _sill_height_ is not None else 0.8 / conversion\n _horiz_separ_ = _horiz_separ_ if _horiz_separ_ is not None else 3.0 / conversion\n\n # create the window parameters\n if _win_height_ != 0 and _win_width_ != 0:\n win_par = RepeatingWindowWidthHeight(\n _win_height_, _win_width_, _sill_height_, _horiz_separ_)",
"category": "Dragonfly",
"name": "DF Repeating Window Width Height Parameters",
"description": "Create Dragonfly window parameters with instructions for repeating rectangular\nwindows of a fixed width and height.\n_\nThis effectively fills a wall with windows at the specified width, height\nand separation.\n-"
Expand Down
@@ -1,5 +1,5 @@
{
"version": "1.3.0",
"version": "1.3.1",
"nickname": "SimpleRatioPar",
"outputs": [
[
Expand All @@ -22,7 +22,7 @@
}
],
"subcategory": "0 :: Create",
"code": "\ntry: # import the core dragonfly dependencies\n from dragonfly.windowparameter import SimpleWindowRatio\nexcept ImportError as e:\n raise ImportError('\\nFailed to import dragonfly:\\n\\t{}'.format(e))\n\ntry:\n from ladybug_{{cad}}.{{plugin}} import all_required_inputs\nexcept ImportError as e:\n raise ImportError('\\nFailed to import ladybug_{{cad}}:\\n\\t{}'.format(e))\n\n\nif all_required_inputs(ghenv.Component):\n win_par = SimpleWindowRatio(_ratio)",
"code": "\ntry: # import the core dragonfly dependencies\n from dragonfly.windowparameter import SimpleWindowRatio\nexcept ImportError as e:\n raise ImportError('\\nFailed to import dragonfly:\\n\\t{}'.format(e))\n\ntry:\n from ladybug_{{cad}}.{{plugin}} import all_required_inputs\nexcept ImportError as e:\n raise ImportError('\\nFailed to import ladybug_{{cad}}:\\n\\t{}'.format(e))\n\n\nif all_required_inputs(ghenv.Component):\n if _ratio != 0:\n win_par = SimpleWindowRatio(_ratio)",
"category": "Dragonfly",
"name": "DF Simple Window Ratio Parameters",
"description": "Create Dragonfly window parameters with instructions for a single window using\nan area ratio with the base surface.\n-"
Expand Down
4 changes: 2 additions & 2 deletions dragonfly_grasshopper/json/DF_Single_Window_Parameters.json
@@ -1,5 +1,5 @@
{
"version": "1.3.0",
"version": "1.3.1",
"nickname": "SingleWindowPar",
"outputs": [
[
Expand Down Expand Up @@ -36,7 +36,7 @@
}
],
"subcategory": "0 :: Create",
"code": "\ntry: # import the core dragonfly dependencies\n from dragonfly.windowparameter import SingleWindow\nexcept ImportError as e:\n raise ImportError('\\nFailed to import dragonfly:\\n\\t{}'.format(e))\n\ntry:\n from ladybug_{{cad}}.config import conversion_to_meters\n from ladybug_{{cad}}.{{plugin}} import all_required_inputs\nexcept ImportError as e:\n raise ImportError('\\nFailed to import ladybug_{{cad}}:\\n\\t{}'.format(e))\n\n\nif all_required_inputs(ghenv.Component):\n # set defaults for any blank inputs\n conversion = conversion_to_meters()\n _sill_height_ = _sill_height_ if _sill_height_ is not None else 0.8 / conversion\n \n win_par = SingleWindow(_width, _height, _sill_height_)",
"code": "\ntry: # import the core dragonfly dependencies\n from dragonfly.windowparameter import SingleWindow\nexcept ImportError as e:\n raise ImportError('\\nFailed to import dragonfly:\\n\\t{}'.format(e))\n\ntry:\n from ladybug_{{cad}}.config import conversion_to_meters\n from ladybug_{{cad}}.{{plugin}} import all_required_inputs\nexcept ImportError as e:\n raise ImportError('\\nFailed to import ladybug_{{cad}}:\\n\\t{}'.format(e))\n\n\nif all_required_inputs(ghenv.Component):\n # set defaults for any blank inputs\n conversion = conversion_to_meters()\n _sill_height_ = _sill_height_ if _sill_height_ is not None else 0.8 / conversion\n\n # create the window parameters\n if _width != 0 and _height != 0:\n win_par = SingleWindow(_width, _height, _sill_height_)",
"category": "Dragonfly",
"name": "DF Single Window Parameters",
"description": "Create Dragonfly window parameters with instructions for a single window in the\nface center defined by a width and height.\n_\nNote that, if these parameters are applied to a base face that is too short\nor too narrow for the input width and/or height, the generated window will\nautomatically be shortened when it is applied to the face. In this way,\nsetting the width to be a very high number will create parameters that always\ngenerate a ribboin window of the input height.\n-"
Expand Down
Expand Up @@ -55,7 +55,7 @@

ghenv.Component.Name = "DF Repeating Window Ratio Parameters"
ghenv.Component.NickName = 'RepeatingRatioPar'
ghenv.Component.Message = '1.3.0'
ghenv.Component.Message = '1.3.1'
ghenv.Component.Category = "Dragonfly"
ghenv.Component.SubCategory = '0 :: Create'
ghenv.Component.AdditionalHelpFromDocStrings = "5"
Expand All @@ -79,6 +79,8 @@
_sill_height_ = _sill_height_ if _sill_height_ is not None else 0.8 / conversion
_horiz_separ_ = _horiz_separ_ if _horiz_separ_ is not None else 3.0 / conversion
vert_separ_ = vert_separ_ if vert_separ_ is not None else 0.0

win_par = RepeatingWindowRatio(_ratio, _win_height_, _sill_height_,
_horiz_separ_, vert_separ_)

# create the window parameters
if _ratio != 0:
win_par = RepeatingWindowRatio(_ratio, _win_height_, _sill_height_,
_horiz_separ_, vert_separ_)
Expand Up @@ -38,15 +38,15 @@
If an array of values are input here, different separation distances
will be assigned based on cardinal direction, starting with north
and moving clockwise. Default: 3 meters.

Returns:
win_par: Window Parameters that can be applied to a Dragonfly object
using the "DF Apply Facade Parameters" component.
"""

ghenv.Component.Name = "DF Repeating Window Width Height Parameters"
ghenv.Component.NickName = 'RepeatingWHPar'
ghenv.Component.Message = '1.3.0'
ghenv.Component.Message = '1.3.1'
ghenv.Component.Category = "Dragonfly"
ghenv.Component.SubCategory = '0 :: Create'
ghenv.Component.AdditionalHelpFromDocStrings = "5"
Expand All @@ -70,6 +70,8 @@
_win_width_ = _win_width_ if _win_width_ is not None else 1.5 / conversion
_sill_height_ = _sill_height_ if _sill_height_ is not None else 0.8 / conversion
_horiz_separ_ = _horiz_separ_ if _horiz_separ_ is not None else 3.0 / conversion

win_par = RepeatingWindowWidthHeight(
_win_height_, _win_width_, _sill_height_, _horiz_separ_)

# create the window parameters
if _win_height_ != 0 and _win_width_ != 0:
win_par = RepeatingWindowWidthHeight(
_win_height_, _win_width_, _sill_height_, _horiz_separ_)
Expand Up @@ -23,7 +23,7 @@

ghenv.Component.Name = "DF Simple Window Ratio Parameters"
ghenv.Component.NickName = 'SimpleRatioPar'
ghenv.Component.Message = '1.3.0'
ghenv.Component.Message = '1.3.1'
ghenv.Component.Category = "Dragonfly"
ghenv.Component.SubCategory = '0 :: Create'
ghenv.Component.AdditionalHelpFromDocStrings = "5"
Expand All @@ -40,4 +40,5 @@


if all_required_inputs(ghenv.Component):
win_par = SimpleWindowRatio(_ratio)
if _ratio != 0:
win_par = SimpleWindowRatio(_ratio)
8 changes: 5 additions & 3 deletions dragonfly_grasshopper/src/DF Single Window Parameters.py
Expand Up @@ -30,7 +30,7 @@

ghenv.Component.Name = "DF Single Window Parameters"
ghenv.Component.NickName = 'SingleWindowPar'
ghenv.Component.Message = '1.3.0'
ghenv.Component.Message = '1.3.1'
ghenv.Component.Category = "Dragonfly"
ghenv.Component.SubCategory = '0 :: Create'
ghenv.Component.AdditionalHelpFromDocStrings = "5"
Expand All @@ -51,5 +51,7 @@
# set defaults for any blank inputs
conversion = conversion_to_meters()
_sill_height_ = _sill_height_ if _sill_height_ is not None else 0.8 / conversion

win_par = SingleWindow(_width, _height, _sill_height_)

# create the window parameters
if _width != 0 and _height != 0:
win_par = SingleWindow(_width, _height, _sill_height_)
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file modified samples/rooms_to_stories_to_building.gh
Binary file not shown.