v0.1.5

- set feature properties such as abstract, mandatory, hidden and groups - feature diagram colors are now fully customizable
ekuiter · Aug 26, 2018 · 5f5231b · 5f5231b
1 parent 538a282
commit 5f5231b
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 3 deletions.
diff --git a/client/src/components/featureDiagram/treeLayout/styles.js b/client/src/components/featureDiagram/treeLayout/styles.js
@@ -23,7 +23,7 @@ const styles = {
         hidden: settings => ({ // style applied to a node's text to distinguish hidden and visible features
             property: 'isHidden',
             yes: {fill: getSetting(settings, 'featureDiagram.treeLayout.node.hiddenFill')},
-            no: {fill: 'black'}
+            no: {fill: getSetting(settings, 'featureDiagram.treeLayout.node.visibleFill')}
         }),
         arcSegment: settings => ({ // style applied to a node's arc segment (for ALT groups)
             fill: 'none',

diff --git a/client/src/components/overlays/SettingsPanel.js b/client/src/components/overlays/SettingsPanel.js
@@ -218,11 +218,13 @@ class SettingsPanel extends React.Component {
                     <Setting.ColorPickerContextualMenu
                         {...props}
                         paths={[
+                            'featureDiagram.treeLayout.node.visibleFill',
+                            'featureDiagram.treeLayout.node.hiddenFill',
                             'featureDiagram.treeLayout.node.abstractFill',
                             'featureDiagram.treeLayout.node.abstractStroke',
                             'featureDiagram.treeLayout.node.concreteFill',
-                            'featureDiagram.treeLayout.node.concreteStroke',
-                            'featureDiagram.treeLayout.node.hiddenFill']}/>
+                            'featureDiagram.treeLayout.node.concreteStroke'
+                        ]}/>
 
                     <h4>{i18n.t('panels.settingsPanel.headings.edges')}</h4>
                     <Setting.SpinButton

diff --git a/client/src/i18n.js b/client/src/i18n.js
@@ -50,6 +50,7 @@ export const strings = {
                             abstractStroke: 'Abstract feature (border)',
                             concreteFill: 'Concrete feature (fill)',
                             concreteStroke: 'Concrete feature (border)',
+                            visibleFill: 'Visible feature (text)',
                             hiddenFill: 'Hidden feature (text)'
                         },
                         link: {

diff --git a/client/src/store/settings.js b/client/src/store/settings.js
@@ -24,6 +24,7 @@ export const defaultSettings = {
                 abstractStroke: '#b6b6bf',
                 concreteFill: '#ccccff',
                 concreteStroke: '#9999bf',
+                visibleFill: 'black',
                 hiddenFill: '#676767'
             },
             link: {