[med-svn] [SCM] aghermann branch, master, updated. 06bda7dfaa687aaf0708a024d192024e2cd58421
Andrei Zavada
johnhommer at gmail.com
Thu Jan 24 00:43:47 UTC 2013
The following commit has been merged in the master branch:
commit 810a7219ddc8a67af18088b0f55f478061a170a2
Author: Andrei Zavada <johnhommer at gmail.com>
Date: Thu Jan 17 09:21:05 2013 +0200
rename SFFD widgets for the great good
diff --git a/data/sf.glade b/data/sf.glade
index b52a7fa..49be96c 100644
--- a/data/sf.glade
+++ b/data/sf.glade
@@ -1509,7 +1509,7 @@
<action-widget response="-5">bFilterOK</action-widget>
</action-widgets>
</object>
- <object class="GtkDialog" id="wPattern">
+ <object class="GtkDialog" id="wSFFD">
<property name="can_focus">False</property>
<property name="border_width">10</property>
<property name="title" translatable="yes">Find/manage patterns</property>
@@ -1533,14 +1533,14 @@
<property name="can_focus">False</property>
<property name="layout_style">end</property>
<child>
- <object class="GtkButton" id="bPatternDismiss">
+ <object class="GtkButton" id="bSFFDDismiss">
<property name="label" translatable="yes">_Dismiss</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
<property name="relief">half</property>
<property name="use_underline">True</property>
- <signal name="clicked" handler="gtk_widget_hide" object="wPattern" swapped="yes"/>
+ <signal name="clicked" handler="gtk_widget_hide" object="wSFPD" swapped="yes"/>
</object>
<packing>
<property name="expand">False</property>
@@ -1550,7 +1550,7 @@
</packing>
</child>
<child>
- <object class="GtkButton" id="bPatternGotoPrevious">
+ <object class="GtkButton" id="bSFFDGotoPrevious">
<property name="label" translatable="yes">_Previous</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
@@ -1566,7 +1566,7 @@
</packing>
</child>
<child>
- <object class="GtkButton" id="bPatternGotoNext">
+ <object class="GtkButton" id="bSFFDGotoNext">
<property name="label" translatable="yes">_Next</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
@@ -1619,11 +1619,11 @@
</packing>
</child>
<child>
- <object class="GtkHBox" id="cPatternLabelBox">
+ <object class="GtkHBox" id="cSFFDLabelBox">
<property name="visible">True</property>
<property name="can_focus">False</property>
<child>
- <object class="GtkButton" id="bPatternDiscard">
+ <object class="GtkButton" id="bSFFDDiscard">
<property name="label" translatable="yes">Dis_card</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
@@ -1639,7 +1639,7 @@
</packing>
</child>
<child>
- <object class="GtkButton" id="bPatternSave">
+ <object class="GtkButton" id="bSFFDSave">
<property name="label" translatable="yes">_Save</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
@@ -1655,7 +1655,7 @@
</packing>
</child>
<child>
- <object class="GtkComboBox" id="ePatternList">
+ <object class="GtkComboBox" id="eSFFDPatternList">
<property name="visible">True</property>
<property name="can_focus">False</property>
</object>
@@ -1698,12 +1698,12 @@
<property name="margin_top">5</property>
<property name="spacing">8</property>
<child>
- <object class="GtkTable" id="cPatternControls">
+ <object class="GtkTable" id="cSFFDControls">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="n_rows">2</property>
<child>
- <object class="GtkTable" id="cPatternPatternParameters">
+ <object class="GtkTable" id="cSFFDParameters">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="n_rows">12</property>
@@ -1713,7 +1713,7 @@
<placeholder/>
</child>
<child>
- <object class="GtkSpinButton" id="ePatternDZCDFSigma">
+ <object class="GtkSpinButton" id="eSFFDDZCDFSigma">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="has_frame">False</property>
@@ -1737,7 +1737,7 @@
</packing>
</child>
<child>
- <object class="GtkSpinButton" id="ePatternBandPassFrom">
+ <object class="GtkSpinButton" id="eSFFDBandPassFrom">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="has_frame">False</property>
@@ -1820,7 +1820,7 @@
</packing>
</child>
<child>
- <object class="GtkSpinButton" id="ePatternBandPassOrder">
+ <object class="GtkSpinButton" id="eSFFDBandPassOrder">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="has_frame">False</property>
@@ -1907,7 +1907,7 @@
</packing>
</child>
<child>
- <object class="GtkSpinButton" id="ePatternDZCDFStep">
+ <object class="GtkSpinButton" id="eSFFDDZCDFStep">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="has_frame">False</property>
@@ -1978,7 +1978,7 @@
</packing>
</child>
<child>
- <object class="GtkSpinButton" id="ePatternEnvTightness">
+ <object class="GtkSpinButton" id="eSFFDEnvTightness">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="has_frame">False</property>
@@ -2062,7 +2062,7 @@
</packing>
</child>
<child>
- <object class="GtkSpinButton" id="ePatternDZCDFSmooth">
+ <object class="GtkSpinButton" id="eSFFDDZCDFSmooth">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="has_frame">False</property>
@@ -2118,7 +2118,7 @@
</packing>
</child>
<child>
- <object class="GtkSpinButton" id="ePatternBandPassUpto">
+ <object class="GtkSpinButton" id="eSFFDBandPassUpto">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="has_frame">False</property>
@@ -2159,9 +2159,12 @@
</packing>
</child>
</object>
+ <packing>
+ <property name="x_options">GTK_FILL</property>
+ </packing>
</child>
<child>
- <object class="GtkTable" id="cPatternCriteria">
+ <object class="GtkTable" id="cSFFDCriteria">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="n_rows">6</property>
@@ -2189,7 +2192,7 @@
</packing>
</child>
<child>
- <object class="GtkSpinButton" id="ePatternParameterA">
+ <object class="GtkSpinButton" id="eSFFDParameterA">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="has_frame">False</property>
@@ -2234,7 +2237,7 @@
</packing>
</child>
<child>
- <object class="GtkSpinButton" id="ePatternParameterB">
+ <object class="GtkSpinButton" id="eSFFDParameterB">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="has_frame">False</property>
@@ -2279,7 +2282,7 @@
</packing>
</child>
<child>
- <object class="GtkSpinButton" id="ePatternParameterC">
+ <object class="GtkSpinButton" id="eSFFDParameterC">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="has_frame">False</property>
@@ -2357,7 +2360,7 @@ on individual parameters</property>
</packing>
</child>
<child>
- <object class="GtkSpinButton" id="ePatternParameterD">
+ <object class="GtkSpinButton" id="eSFFDParameterD">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="has_frame">False</property>
@@ -2384,6 +2387,7 @@ on individual parameters</property>
<packing>
<property name="top_attach">1</property>
<property name="bottom_attach">2</property>
+ <property name="x_options">GTK_FILL</property>
</packing>
</child>
</object>
@@ -2399,17 +2403,17 @@ on individual parameters</property>
<property name="visible">True</property>
<property name="can_focus">False</property>
<child>
- <object class="GtkScrolledWindow" id="swPatternSelection">
+ <object class="GtkScrolledWindow" id="swSFFDThing">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="shadow_type">in</property>
<child>
- <object class="GtkViewport" id="vpPatternSelection">
+ <object class="GtkViewport" id="vpSFFDThing">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="resize_mode">queue</property>
<child>
- <object class="GtkDrawingArea" id="daPatternSelection">
+ <object class="GtkDrawingArea" id="daSFFDThing">
<property name="visible">True</property>
<property name="app_paintable">True</property>
<property name="can_focus">False</property>
@@ -2427,7 +2431,7 @@ on individual parameters</property>
</packing>
</child>
<child>
- <object class="GtkLabel" id="lPatternParametersBrief">
+ <object class="GtkLabel" id="lSFFDParametersBrief">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="xalign">0</property>
@@ -2442,16 +2446,16 @@ on individual parameters</property>
</packing>
</child>
<child>
- <object class="GtkScrolledWindow" id="swPatternField">
+ <object class="GtkScrolledWindow" id="swSFFDField">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="shadow_type">in</property>
<child>
- <object class="GtkViewport" id="vpPatternField">
+ <object class="GtkViewport" id="vpSFFDField">
<property name="visible">True</property>
<property name="can_focus">False</property>
<child>
- <object class="GtkDrawingArea" id="daPatternField">
+ <object class="GtkDrawingArea" id="daSFFDField">
<property name="visible">True</property>
<property name="can_focus">False</property>
</object>
@@ -2469,16 +2473,17 @@ on individual parameters</property>
<object class="GtkBox" id="box12">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="halign">center</property>
+ <property name="halign">start</property>
<property name="valign">end</property>
<property name="orientation">vertical</property>
<child>
- <object class="GtkTable" id="cPatternSearchButton">
+ <object class="GtkTable" id="cSFFDSearchButton">
<property name="visible">True</property>
<property name="can_focus">False</property>
+ <property name="halign">start</property>
<property name="n_columns">3</property>
<child>
- <object class="GtkButton" id="bPatternSearch">
+ <object class="GtkButton" id="bSFFDSearch">
<property name="label" translatable="yes">Search</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
@@ -2506,7 +2511,7 @@ on individual parameters</property>
</packing>
</child>
<child>
- <object class="GtkComboBox" id="ePatternChannel">
+ <object class="GtkComboBox" id="eSFFDChannel">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="halign">end</property>
@@ -2526,11 +2531,12 @@ on individual parameters</property>
</packing>
</child>
<child>
- <object class="GtkTable" id="cPatternAgainButton">
+ <object class="GtkTable" id="cSFFDAgainButton">
<property name="visible">True</property>
<property name="can_focus">False</property>
+ <property name="halign">start</property>
<child>
- <object class="GtkButton" id="bPatternAgain">
+ <object class="GtkButton" id="bSFFDAgain">
<property name="label" translatable="yes">Modify pattern</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
@@ -2546,13 +2552,13 @@ on individual parameters</property>
</child>
</object>
<packing>
- <property name="expand">True</property>
+ <property name="expand">False</property>
<property name="fill">True</property>
<property name="position">3</property>
</packing>
</child>
<child>
- <object class="GtkLabel" id="lPatternSimilarity">
+ <object class="GtkLabel" id="lSFFDSimilarity">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="xalign">1</property>
@@ -2602,131 +2608,9 @@ on individual parameters</property>
</object>
</child>
<action-widgets>
- <action-widget response="-1">bPatternDismiss</action-widget>
- <action-widget response="-1">bPatternGotoPrevious</action-widget>
- <action-widget response="-1">bPatternGotoNext</action-widget>
- </action-widgets>
- </object>
- <object class="GtkDialog" id="wPatternName">
- <property name="width_request">200</property>
- <property name="can_focus">False</property>
- <property name="border_width">5</property>
- <property name="title" translatable="yes">Pattern name</property>
- <property name="modal">True</property>
- <property name="window_position">center-on-parent</property>
- <property name="destroy_with_parent">True</property>
- <property name="type_hint">dialog</property>
- <property name="skip_taskbar_hint">True</property>
- <property name="transient_for">wPattern</property>
- <signal name="close" handler="gtk_widget_hide_on_delete" swapped="no"/>
- <signal name="response" handler="gtk_widget_hide_on_delete" swapped="no"/>
- <child internal-child="vbox">
- <object class="GtkBox" id="dialog-vbox14">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="orientation">vertical</property>
- <property name="spacing">2</property>
- <child>
- <object class="GtkLabel" id="label42">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="xalign">0</property>
- <property name="label" translatable="yes">Pattern _name:</property>
- <property name="use_underline">True</property>
- <property name="mnemonic_widget">ePatternNameName</property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <object class="GtkEntry" id="ePatternNameName">
- <property name="width_request">130</property>
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="has_focus">True</property>
- <property name="can_default">True</property>
- <property name="invisible_char">•</property>
- <property name="activates_default">True</property>
- <property name="invisible_char_set">True</property>
- <property name="primary_icon_activatable">False</property>
- <property name="secondary_icon_activatable">False</property>
- </object>
- <packing>
- <property name="expand">True</property>
- <property name="fill">True</property>
- <property name="position">1</property>
- </packing>
- </child>
- <child>
- <object class="GtkCheckButton" id="ePatternNameSaveGlobally">
- <property name="label" translatable="yes">_Globally</property>
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="receives_default">False</property>
- <property name="use_underline">True</property>
- <property name="xalign">0</property>
- <property name="draw_indicator">True</property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">2</property>
- </packing>
- </child>
- <child internal-child="action_area">
- <object class="GtkButtonBox" id="dialog-action_area14">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="layout_style">end</property>
- <child>
- <object class="GtkButton" id="button1">
- <property name="label">gtk-cancel</property>
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="receives_default">False</property>
- <property name="use_stock">True</property>
- <property name="focus_on_click">False</property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <object class="GtkButton" id="button3">
- <property name="label">gtk-ok</property>
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="can_default">True</property>
- <property name="has_default">True</property>
- <property name="receives_default">True</property>
- <property name="use_stock">True</property>
- <property name="focus_on_click">False</property>
- <accelerator key="Return" signal="activate"/>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">1</property>
- </packing>
- </child>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="pack_type">end</property>
- <property name="position">3</property>
- </packing>
- </child>
- </object>
- </child>
- <action-widgets>
- <action-widget response="-6">button1</action-widget>
- <action-widget response="-5">button3</action-widget>
+ <action-widget response="-1">bSFFDDismiss</action-widget>
+ <action-widget response="-1">bSFFDGotoPrevious</action-widget>
+ <action-widget response="-1">bSFFDGotoNext</action-widget>
</action-widgets>
</object>
<object class="GtkDialog" id="wSFADSaveProfileName">
@@ -2739,7 +2623,7 @@ on individual parameters</property>
<property name="destroy_with_parent">True</property>
<property name="type_hint">dialog</property>
<property name="skip_taskbar_hint">True</property>
- <property name="transient_for">wPattern</property>
+ <property name="transient_for">wSFFD</property>
<signal name="close" handler="gtk_widget_hide_on_delete" swapped="no"/>
<signal name="response" handler="gtk_widget_hide_on_delete" swapped="no"/>
<child internal-child="vbox">
@@ -3807,6 +3691,128 @@ on individual parameters</property>
<action-widget response="-5">bSFADApply</action-widget>
</action-widgets>
</object>
+ <object class="GtkDialog" id="wSFFDPatternName">
+ <property name="width_request">200</property>
+ <property name="can_focus">False</property>
+ <property name="border_width">5</property>
+ <property name="title" translatable="yes">Pattern name</property>
+ <property name="modal">True</property>
+ <property name="window_position">center-on-parent</property>
+ <property name="destroy_with_parent">True</property>
+ <property name="type_hint">dialog</property>
+ <property name="skip_taskbar_hint">True</property>
+ <property name="transient_for">wSFFD</property>
+ <signal name="close" handler="gtk_widget_hide_on_delete" swapped="no"/>
+ <signal name="response" handler="gtk_widget_hide_on_delete" swapped="no"/>
+ <child internal-child="vbox">
+ <object class="GtkBox" id="dialog-vbox14">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="orientation">vertical</property>
+ <property name="spacing">2</property>
+ <child>
+ <object class="GtkLabel" id="label42">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="xalign">0</property>
+ <property name="label" translatable="yes">Pattern _name:</property>
+ <property name="use_underline">True</property>
+ <property name="mnemonic_widget">eSFFDPatternNameName</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkEntry" id="eSFFDPatternNameName">
+ <property name="width_request">130</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="has_focus">True</property>
+ <property name="can_default">True</property>
+ <property name="invisible_char">•</property>
+ <property name="activates_default">True</property>
+ <property name="invisible_char_set">True</property>
+ <property name="primary_icon_activatable">False</property>
+ <property name="secondary_icon_activatable">False</property>
+ </object>
+ <packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkCheckButton" id="eSFFDPatternNameSaveGlobally">
+ <property name="label" translatable="yes">_Globally</property>
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="receives_default">False</property>
+ <property name="use_underline">True</property>
+ <property name="xalign">0</property>
+ <property name="draw_indicator">True</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">2</property>
+ </packing>
+ </child>
+ <child internal-child="action_area">
+ <object class="GtkButtonBox" id="dialog-action_area14">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="layout_style">end</property>
+ <child>
+ <object class="GtkButton" id="button1">
+ <property name="label">gtk-cancel</property>
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="receives_default">False</property>
+ <property name="use_stock">True</property>
+ <property name="focus_on_click">False</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkButton" id="button3">
+ <property name="label">gtk-ok</property>
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="can_default">True</property>
+ <property name="has_default">True</property>
+ <property name="receives_default">True</property>
+ <property name="use_stock">True</property>
+ <property name="focus_on_click">False</property>
+ <accelerator key="Return" signal="activate"/>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="pack_type">end</property>
+ <property name="position">3</property>
+ </packing>
+ </child>
+ </object>
+ </child>
+ <action-widgets>
+ <action-widget response="-6">button1</action-widget>
+ <action-widget response="-5">button3</action-widget>
+ </action-widgets>
+ </object>
<object class="GtkDialog" id="wSFICAMatrix">
<property name="can_focus">False</property>
<property name="border_width">5</property>
@@ -4825,15 +4831,15 @@ on individual parameters</property>
</packing>
</child>
<child>
- <object class="GtkButton" id="bScoreClear">
- <property name="label" translatable="yes">⌫</property>
+ <object class="GtkButton" id="bScoreWake">
+ <property name="label" translatable="yes">☺</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
- <property name="tooltip_markup" translatable="yes">Clear (<b>q</b>)</property>
+ <property name="tooltip_markup" translatable="yes">Wake (<b>w</b>)</property>
<property name="valign">center</property>
<property name="focus_on_click">False</property>
- <accelerator key="q" signal="activate"/>
+ <accelerator key="w" signal="activate"/>
</object>
<packing>
<property name="expand">False</property>
@@ -4842,15 +4848,15 @@ on individual parameters</property>
</packing>
</child>
<child>
- <object class="GtkButton" id="bScoreWake">
- <property name="label" translatable="yes">☺</property>
+ <object class="GtkButton" id="bScoreClear">
+ <property name="label" translatable="yes">⌫</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
- <property name="tooltip_markup" translatable="yes">Wake (<b>w</b>)</property>
+ <property name="tooltip_markup" translatable="yes">Clear (<b>q</b>)</property>
<property name="valign">center</property>
<property name="focus_on_click">False</property>
- <accelerator key="w" signal="activate"/>
+ <accelerator key="q" signal="activate"/>
</object>
<packing>
<property name="expand">False</property>
@@ -5085,18 +5091,17 @@ on individual parameters</property>
</packing>
</child>
<child>
- <object class="GtkToggleButton" id="bSFShowFindDialog">
- <property name="label" translatable="yes">_Find</property>
+ <object class="GtkToggleButton" id="bSFShowPhaseDiffDialog">
+ <property name="label" translatable="yes">Δφ</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
<property name="has_tooltip">True</property>
- <property name="tooltip_markup" translatable="yes">Find/manage patterns (<b>F3</b>)</property>
- <property name="tooltip_text" translatable="yes">Find/manage patterns (F3)</property>
+ <property name="tooltip_markup" translatable="yes">Interchannel signal shift (<b>F4</b>)</property>
+ <property name="tooltip_text" translatable="yes">Interchannel signal shift (F4)</property>
<property name="valign">center</property>
- <property name="use_underline">True</property>
<property name="focus_on_click">False</property>
- <accelerator key="F3" signal="activate"/>
+ <accelerator key="F4" signal="activate"/>
</object>
<packing>
<property name="expand">False</property>
@@ -5106,17 +5111,18 @@ on individual parameters</property>
</packing>
</child>
<child>
- <object class="GtkToggleButton" id="bSFShowPhaseDiffDialog">
- <property name="label" translatable="yes">Δφ</property>
+ <object class="GtkToggleButton" id="bSFShowFindDialog">
+ <property name="label" translatable="yes">_Find</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
<property name="has_tooltip">True</property>
- <property name="tooltip_markup" translatable="yes">Interchannel signal shift (<b>F4</b>)</property>
- <property name="tooltip_text" translatable="yes">Interchannel signal shift (F4)</property>
+ <property name="tooltip_markup" translatable="yes">Find/manage patterns (<b>F3</b>)</property>
+ <property name="tooltip_text" translatable="yes">Find/manage patterns (F3)</property>
<property name="valign">center</property>
+ <property name="use_underline">True</property>
<property name="focus_on_click">False</property>
- <accelerator key="F4" signal="activate"/>
+ <accelerator key="F3" signal="activate"/>
</object>
<packing>
<property name="expand">False</property>
@@ -5937,8 +5943,16 @@ skew: 𝑔(𝑢) = 𝑢2</property>
<widgets>
<widget name="bSFADProfileSave"/>
<widget name="bSFADProfileDelete"/>
- <widget name="bPatternSave"/>
- <widget name="bPatternDiscard"/>
+ <widget name="bSFFDSave"/>
+ <widget name="bSFFDDiscard"/>
+ <widget name="bSFFDAgain"/>
+ <widget name="bSFFDSearch"/>
+ </widgets>
+ </object>
+ <object class="GtkSizeGroup" id="zSFFDControls">
+ <widgets>
+ <widget name="cSFFDParameters"/>
+ <widget name="cSFFDCriteria"/>
</widgets>
</object>
</interface>
diff --git a/src/ui/sf/sf-channel.cc b/src/ui/sf/sf-channel.cc
index 120ed40..9320893 100644
--- a/src/ui/sf/sf-channel.cc
+++ b/src/ui/sf/sf-channel.cc
@@ -449,7 +449,7 @@ aghui::SScoringFacility::SChannel::
mark_region_as_pattern()
{
_p.find_dialog.load_pattern( *this);
- gtk_widget_show_all( (GtkWidget*)_p.wPattern);
+ gtk_widget_show_all( (GtkWidget*)_p.wSFFD);
}
diff --git a/src/ui/sf/sf-construct.cc b/src/ui/sf/sf-construct.cc
index 72afc77..8d4b9d5 100644
--- a/src/ui/sf/sf-construct.cc
+++ b/src/ui/sf/sf-construct.cc
@@ -377,79 +377,80 @@ SScoringFacilityWidgets (SExpDesignUI& _p)
// find/manage patterns
- mPatterns =
+ mSFFDPatterns =
gtk_list_store_new( 1, G_TYPE_STRING);
- if ( !AGH_GBGETOBJ (GtkDialog, wPattern) ||
- !AGH_GBGETOBJ (GtkDrawingArea, daPatternSelection) ||
- !AGH_GBGETOBJ (GtkScrolledWindow, swPatternSelection) ||
- !AGH_GBGETOBJ (GtkDrawingArea, daPatternField) ||
- !AGH_GBGETOBJ (GtkScrolledWindow, swPatternField) ||
- !AGH_GBGETOBJ (GtkTable, cPatternSearchButton) ||
- !AGH_GBGETOBJ (GtkTable, cPatternAgainButton) ||
- !AGH_GBGETOBJ (GtkTable, cPatternPatternParameters) ||
- !AGH_GBGETOBJ (GtkTable, cPatternCriteria) ||
- !AGH_GBGETOBJ (GtkButton, bPatternSearch) ||
- !AGH_GBGETOBJ (GtkButton, bPatternAgain) ||
- !AGH_GBGETOBJ (GtkButton, bPatternGotoPrevious) ||
- !AGH_GBGETOBJ (GtkButton, bPatternGotoNext) ||
- !AGH_GBGETOBJ (GtkButton, bPatternSave) ||
- !AGH_GBGETOBJ (GtkButton, bPatternDiscard) ||
- !AGH_GBGETOBJ (GtkSpinButton, ePatternEnvTightness) ||
- !AGH_GBGETOBJ (GtkSpinButton, ePatternBandPassOrder) ||
- !AGH_GBGETOBJ (GtkSpinButton, ePatternBandPassFrom) ||
- !AGH_GBGETOBJ (GtkSpinButton, ePatternBandPassUpto) ||
- !AGH_GBGETOBJ (GtkSpinButton, ePatternDZCDFStep) ||
- !AGH_GBGETOBJ (GtkSpinButton, ePatternDZCDFSigma) ||
- !AGH_GBGETOBJ (GtkSpinButton, ePatternDZCDFSmooth) ||
- !AGH_GBGETOBJ (GtkSpinButton, ePatternParameterA) ||
- !AGH_GBGETOBJ (GtkSpinButton, ePatternParameterB) ||
- !AGH_GBGETOBJ (GtkSpinButton, ePatternParameterC) ||
- !AGH_GBGETOBJ (GtkSpinButton, ePatternParameterD) ||
- !AGH_GBGETOBJ (GtkHBox, cPatternLabelBox) ||
- !AGH_GBGETOBJ (GtkLabel, lPatternParametersBrief) ||
- !AGH_GBGETOBJ (GtkLabel, lPatternSimilarity) ||
- !AGH_GBGETOBJ (GtkComboBox, ePatternList) ||
- !AGH_GBGETOBJ (GtkComboBox, ePatternChannel) ||
- !AGH_GBGETOBJ (GtkDialog, wPatternName) ||
- !AGH_GBGETOBJ (GtkEntry, ePatternNameName) ||
- !AGH_GBGETOBJ (GtkCheckButton, ePatternNameSaveGlobally) )
+ if ( !AGH_GBGETOBJ (GtkDialog, wSFFD) ||
+ !AGH_GBGETOBJ (GtkDrawingArea, daSFFDThing) ||
+ !AGH_GBGETOBJ (GtkScrolledWindow, swSFFDThing) ||
+ !AGH_GBGETOBJ (GtkDrawingArea, daSFFDField) ||
+ !AGH_GBGETOBJ (GtkScrolledWindow, swSFFDField) ||
+ !AGH_GBGETOBJ (GtkTable, cSFFDSearchButton) ||
+ !AGH_GBGETOBJ (GtkTable, cSFFDAgainButton) ||
+ !AGH_GBGETOBJ (GtkTable, cSFFDParameters) ||
+ !AGH_GBGETOBJ (GtkTable, cSFFDCriteria) ||
+ !AGH_GBGETOBJ (GtkButton, bSFFDSearch) ||
+ !AGH_GBGETOBJ (GtkButton, bSFFDAgain) ||
+ !AGH_GBGETOBJ (GtkButton, bSFFDGotoPrevious) ||
+ !AGH_GBGETOBJ (GtkButton, bSFFDGotoNext) ||
+ !AGH_GBGETOBJ (GtkButton, bSFFDSave) ||
+ !AGH_GBGETOBJ (GtkButton, bSFFDDiscard) ||
+ !AGH_GBGETOBJ (GtkSpinButton, eSFFDEnvTightness) ||
+ !AGH_GBGETOBJ (GtkSpinButton, eSFFDBandPassOrder) ||
+ !AGH_GBGETOBJ (GtkSpinButton, eSFFDBandPassFrom) ||
+ !AGH_GBGETOBJ (GtkSpinButton, eSFFDBandPassUpto) ||
+ !AGH_GBGETOBJ (GtkSpinButton, eSFFDDZCDFStep) ||
+ !AGH_GBGETOBJ (GtkSpinButton, eSFFDDZCDFSigma) ||
+ !AGH_GBGETOBJ (GtkSpinButton, eSFFDDZCDFSmooth) ||
+ !AGH_GBGETOBJ (GtkSpinButton, eSFFDParameterA) ||
+ !AGH_GBGETOBJ (GtkSpinButton, eSFFDParameterB) ||
+ !AGH_GBGETOBJ (GtkSpinButton, eSFFDParameterC) ||
+ !AGH_GBGETOBJ (GtkSpinButton, eSFFDParameterD) ||
+ !AGH_GBGETOBJ (GtkHBox, cSFFDLabelBox) ||
+ !AGH_GBGETOBJ (GtkLabel, lSFFDParametersBrief) ||
+ !AGH_GBGETOBJ (GtkLabel, lSFFDSimilarity) ||
+ !AGH_GBGETOBJ (GtkComboBox, eSFFDPatternList) ||
+ !AGH_GBGETOBJ (GtkComboBox, eSFFDChannel) ||
+ !AGH_GBGETOBJ (GtkDialog, wSFFDPatternName) ||
+ !AGH_GBGETOBJ (GtkEntry, eSFFDPatternNameName) ||
+ !AGH_GBGETOBJ (GtkCheckButton, eSFFDPatternNameSaveGlobally) )
throw runtime_error ("Failed to construct SF widgets");
- gtk_combo_box_set_model_properly( ePatternList, mPatterns);
- ePatternList_changed_cb_handler_id =
- G_CONNECT_1 (ePatternList, changed);
-
- gtk_combo_box_set_model_properly( ePatternChannel, _p.mAllChannels);
- ePatternChannel_changed_cb_handler_id =
- G_CONNECT_1 (ePatternChannel, changed);
-
- G_CONNECT_1 (daPatternSelection, draw);
- G_CONNECT_2 (daPatternSelection, scroll, event);
- G_CONNECT_1 (daPatternField, draw);
- G_CONNECT_2 (daPatternField, scroll, event);
- G_CONNECT_1 (bPatternSave, clicked);
- G_CONNECT_1 (bPatternDiscard, clicked);
- G_CONNECT_1 (bPatternSearch, clicked);
- G_CONNECT_1 (bPatternAgain, clicked);
-
- for ( auto& W : {bPatternGotoNext, bPatternGotoPrevious} )
+ gtk_combo_box_set_model_properly( eSFFDPatternList, mSFFDPatterns);
+ eSFFDPatternList_changed_cb_handler_id =
+ G_CONNECT_1 (eSFFDPatternList, changed);
+
+ gtk_combo_box_set_model_properly( eSFFDChannel, _p.mAllChannels);
+ eSFFDChannel_changed_cb_handler_id =
+ G_CONNECT_1 (eSFFDChannel, changed);
+
+ G_CONNECT_2 (wSFFD, configure, event);
+ G_CONNECT_1 (daSFFDThing, draw);
+ G_CONNECT_2 (daSFFDThing, scroll, event);
+ G_CONNECT_1 (daSFFDField, draw);
+ G_CONNECT_2 (daSFFDField, scroll, event);
+ G_CONNECT_1 (bSFFDSave, clicked);
+ G_CONNECT_1 (bSFFDDiscard, clicked);
+ G_CONNECT_1 (bSFFDSearch, clicked);
+ G_CONNECT_1 (bSFFDAgain, clicked);
+
+ for ( auto& W : {bSFFDGotoNext, bSFFDGotoPrevious} )
g_signal_connect( W, "clicked",
- (GCallback)bPatternGoto_clicked_cb,
+ (GCallback)bSFFDGoto_clicked_cb,
this);
- for ( auto& W : {ePatternEnvTightness,
- ePatternBandPassFrom, ePatternBandPassUpto, ePatternBandPassOrder,
- ePatternDZCDFStep, ePatternDZCDFSigma, ePatternDZCDFSmooth} )
+ for ( auto& W : {eSFFDEnvTightness,
+ eSFFDBandPassFrom, eSFFDBandPassUpto, eSFFDBandPassOrder,
+ eSFFDDZCDFStep, eSFFDDZCDFSigma, eSFFDDZCDFSmooth} )
g_signal_connect( W, "value-changed",
- (GCallback)ePattern_any_pattern_value_changed_cb,
+ (GCallback)eSFFD_any_pattern_value_changed_cb,
this);
- for ( auto& W : {ePatternParameterA, ePatternParameterB, ePatternParameterC, ePatternParameterD} )
+ for ( auto& W : {eSFFDParameterA, eSFFDParameterB, eSFFDParameterC, eSFFDParameterD} )
g_signal_connect( W, "value-changed",
- (GCallback)ePattern_any_criteria_value_changed_cb,
+ (GCallback)eSFFD_any_criteria_value_changed_cb,
this);
- G_CONNECT_1 (wPattern, show);
- G_CONNECT_1 (wPattern, hide);
+ G_CONNECT_1 (wSFFD, show);
+ G_CONNECT_1 (wSFFD, hide);
// aghui::SScoringFacility::SFiltersDialog::
diff --git a/src/ui/sf/sf-patterns-draw.cc b/src/ui/sf/sf-patterns-draw.cc
index f3e283c..c307080 100644
--- a/src/ui/sf/sf-patterns-draw.cc
+++ b/src/ui/sf/sf-patterns-draw.cc
@@ -18,13 +18,13 @@ using namespace std;
void
aghui::SScoringFacility::SFindDialog::
-set_pattern_da_width( int width)
+set_thing_da_width( int width)
{
- g_object_set( (GObject*)_p.daPatternSelection,
+ g_object_set( (GObject*)_p.daSFFDThing,
"width-request", da_thing_wd = width,
"height-request", da_thing_ht,
NULL);
- g_object_set( (GObject*)_p.swPatternSelection,
+ g_object_set( (GObject*)_p.swSFFDThing,
"width-request", min( width+5, 600),
"height-request", da_thing_ht + 30,
NULL);
@@ -34,11 +34,11 @@ void
aghui::SScoringFacility::SFindDialog::
set_field_da_width( int width)
{
- g_object_set( (GObject*)_p.daPatternField,
+ g_object_set( (GObject*)_p.daSFFDField,
"width-request", da_field_wd = width,
"height-request", da_field_ht,
NULL);
- g_object_set( (GObject*)_p.swPatternField,
+ g_object_set( (GObject*)_p.swSFFDField,
"width-request", min( width+5, 600),
"height-request", da_thing_ht + 30,
NULL);
@@ -51,7 +51,7 @@ aghui::SScoringFacility::SFindDialog::
draw_thing( cairo_t *cr)
{
if ( thing.size() == 0 ) {
- set_pattern_da_width( 200);
+ set_thing_da_width( 200);
aghui::cairo_put_banner( cr, da_thing_wd, da_thing_ht, "(no selection)");
return;
} else {
@@ -168,11 +168,19 @@ void
aghui::SScoringFacility::SFindDialog::
draw_field( cairo_t *cr)
{
+ _p._p.CwB[SExpDesignUI::TColour::sf_profile_psd].set_source_rgba( cr, .5);
+ cairo_set_line_width( cr, 1.);
+ cairo_move_to( cr, 0, da_field_ht/2);
+ printf( "draw %d %d %g\n", da_field_wd, da_field_ht, field_display_scale);
aghui::cairo_draw_signal(
cr,
field_channel->psd.course, 0, field_channel->psd.course.size(),
- da_field_wd, 0., da_field_ht/2, field_display_scale);
+ da_field_wd, 0., da_field_ht/2, field_display_scale,
+ 1, TDrawSignalDirection::forward, true);
+ cairo_line_to( cr, da_field_wd, da_field_ht/2);
+ cairo_fill( cr);
+ cairo_stroke( cr);
}
// eof
diff --git a/src/ui/sf/sf-patterns-enumerate.cc b/src/ui/sf/sf-patterns-enumerate.cc
index 4ff74f4..a67c330 100644
--- a/src/ui/sf/sf-patterns-enumerate.cc
+++ b/src/ui/sf/sf-patterns-enumerate.cc
@@ -45,13 +45,13 @@ load_pattern( SScoringFacility::SChannel& field)
samplerate = field.samplerate();
thing_display_scale = field.signal_display_scale;
- set_pattern_da_width( full_sample / field.spp());
+ set_thing_da_width( full_sample / field.spp());
preselect_channel( field.name);
preselect_entry( NULL, 0);
- gtk_label_set_markup( _p.lPatternSimilarity, "");
+ gtk_label_set_markup( _p.lSFFDSimilarity, "");
- gtk_widget_queue_draw( (GtkWidget*)_p.daPatternSelection);
+ gtk_widget_queue_draw( (GtkWidget*)_p.daSFFDThing);
}
@@ -119,7 +119,7 @@ load_pattern( const char *label, bool do_globally)
thing_display_scale = field_channel->signal_display_scale;
W_V.up();
- set_pattern_da_width( full_sample / field_channel->spp());
+ set_thing_da_width( full_sample / field_channel->spp());
} else {
thing.resize( 0);
@@ -208,8 +208,8 @@ void
aghui::SScoringFacility::SFindDialog::
enumerate_patterns_to_combo()
{
- g_signal_handler_block( _p.ePatternList, _p.ePatternList_changed_cb_handler_id);
- gtk_list_store_clear( _p.mPatterns);
+ g_signal_handler_block( _p.eSFFDPatternList, _p.eSFFDPatternList_changed_cb_handler_id);
+ gtk_list_store_clear( _p.mSFFDPatterns);
GtkTreeIter iter;
@@ -221,8 +221,8 @@ enumerate_patterns_to_combo()
if ( n >= 0 ) {
for ( int cnt = 0; cnt < n; ++cnt ) {
snprintf_buf( "%s%s", globally_marker, eps[cnt]->d_name);
- gtk_list_store_append( _p.mPatterns, &iter);
- gtk_list_store_set( _p.mPatterns, &iter,
+ gtk_list_store_append( _p.mSFFDPatterns, &iter);
+ gtk_list_store_set( _p.mSFFDPatterns, &iter,
0, __buf__,
-1);
free( eps[cnt]);
@@ -235,16 +235,16 @@ enumerate_patterns_to_combo()
// printf( "n = %d in %s\n", n, __buf__);
if ( n >= 0 ) {
for ( int cnt = 0; cnt < n; ++cnt ) {
- gtk_list_store_append( _p.mPatterns, &iter);
- gtk_list_store_set( _p.mPatterns, &iter,
+ gtk_list_store_append( _p.mSFFDPatterns, &iter);
+ gtk_list_store_set( _p.mSFFDPatterns, &iter,
0, eps[cnt]->d_name,
-1);
free( eps[cnt]);
}
free( (void*)eps);
}
- gtk_combo_box_set_active_iter( _p.ePatternList, NULL);
- g_signal_handler_unblock( _p.ePatternList, _p.ePatternList_changed_cb_handler_id);
+ gtk_combo_box_set_active_iter( _p.eSFFDPatternList, NULL);
+ g_signal_handler_unblock( _p.eSFFDPatternList, _p.eSFFDPatternList_changed_cb_handler_id);
}
@@ -256,26 +256,26 @@ aghui::SScoringFacility::SFindDialog::
preselect_entry( const char *label, bool do_globally)
{
if ( label == NULL ) {
- gtk_combo_box_set_active_iter( _p.ePatternList, NULL);
+ gtk_combo_box_set_active_iter( _p.eSFFDPatternList, NULL);
return;
}
GtkTreeIter iter;
gboolean valid;
- valid = gtk_tree_model_get_iter_first( (GtkTreeModel*)_p.mPatterns, &iter);
+ valid = gtk_tree_model_get_iter_first( (GtkTreeModel*)_p.mSFFDPatterns, &iter);
while ( valid ) {
char *entry;
- gtk_tree_model_get( (GtkTreeModel*)_p.mPatterns, &iter,
+ gtk_tree_model_get( (GtkTreeModel*)_p.mSFFDPatterns, &iter,
0, &entry,
-1);
if ( (!do_globally && strcmp( entry, label) == 0) ||
(do_globally && (strlen( entry) > strlen( globally_marker) && strcmp( entry+strlen(globally_marker), label) == 0)) ) {
- gtk_combo_box_set_active_iter( _p.ePatternList, &iter);
+ gtk_combo_box_set_active_iter( _p.eSFFDPatternList, &iter);
free( entry);
return;
}
free( entry);
- valid = gtk_tree_model_iter_next( (GtkTreeModel*)_p.mPatterns, &iter);
+ valid = gtk_tree_model_iter_next( (GtkTreeModel*)_p.mSFFDPatterns, &iter);
}
}
diff --git a/src/ui/sf/sf-patterns.cc b/src/ui/sf/sf-patterns.cc
index 57c6b96..b373a90 100644
--- a/src/ui/sf/sf-patterns.cc
+++ b/src/ui/sf/sf-patterns.cc
@@ -25,18 +25,18 @@ SFindDialog (SScoringFacility& parent)
draw_details (true),
_p (parent)
{
- W_V.reg( _p.ePatternEnvTightness, &Pp.env_tightness);
- W_V.reg( _p.ePatternBandPassOrder, &Pp.bwf_order);
- W_V.reg( _p.ePatternBandPassFrom, &Pp.bwf_ffrom);
- W_V.reg( _p.ePatternBandPassUpto, &Pp.bwf_fupto);
- W_V.reg( _p.ePatternDZCDFStep, &Pp.dzcdf_step);
- W_V.reg( _p.ePatternDZCDFSigma, &Pp.dzcdf_sigma);
- W_V.reg( _p.ePatternDZCDFSmooth, &Pp.dzcdf_smooth);
-
- W_V.reg( _p.ePatternParameterA, &get<0>(criteria));
- W_V.reg( _p.ePatternParameterB, &get<1>(criteria));
- W_V.reg( _p.ePatternParameterC, &get<2>(criteria));
- W_V.reg( _p.ePatternParameterD, &get<3>(criteria));
+ W_V.reg( _p.eSFFDEnvTightness, &Pp.env_tightness);
+ W_V.reg( _p.eSFFDBandPassOrder, &Pp.bwf_order);
+ W_V.reg( _p.eSFFDBandPassFrom, &Pp.bwf_ffrom);
+ W_V.reg( _p.eSFFDBandPassUpto, &Pp.bwf_fupto);
+ W_V.reg( _p.eSFFDDZCDFStep, &Pp.dzcdf_step);
+ W_V.reg( _p.eSFFDDZCDFSigma, &Pp.dzcdf_sigma);
+ W_V.reg( _p.eSFFDDZCDFSmooth, &Pp.dzcdf_smooth);
+
+ W_V.reg( _p.eSFFDParameterA, &get<0>(criteria));
+ W_V.reg( _p.eSFFDParameterB, &get<1>(criteria));
+ W_V.reg( _p.eSFFDParameterC, &get<2>(criteria));
+ W_V.reg( _p.eSFFDParameterD, &get<3>(criteria));
}
aghui::SScoringFacility::SFindDialog::
@@ -45,7 +45,8 @@ aghui::SScoringFacility::SFindDialog::
if ( cpattern )
delete cpattern;
// g_object_unref( mPatterns);
- gtk_widget_destroy( (GtkWidget*)_p.wPattern);
+ gtk_widget_destroy( (GtkWidget*)_p.wSFFDPatternName);
+ gtk_widget_destroy( (GtkWidget*)_p.wSFFD);
}
@@ -57,6 +58,12 @@ void
aghui::SScoringFacility::SFindDialog::
search()
{
+ set_field_da_width( _p.total_pages() * 3);
+ field_display_scale =
+ agh::alg::calibrate_display_scale(
+ field_channel->psd.course, _p.total_pages(),
+ da_field_ht);
+
if ( unlikely (not field_channel or thing.size() == 0) )
return;
@@ -79,12 +86,6 @@ search()
delete cpattern;
cpattern = nullptr;
-
- set_field_da_width( _p.total_pages() * 3);
- field_display_scale =
- agh::alg::calibrate_display_scale(
- field_channel->psd.course, _p.total_pages(),
- da_field_ht);
}
@@ -110,24 +111,24 @@ void
aghui::SScoringFacility::SFindDialog::
setup_controls_for_find()
{
- gtk_widget_set_visible( (GtkWidget*)_p.cPatternSearchButton, TRUE);
- gtk_widget_set_visible( (GtkWidget*)_p.cPatternPatternParameters, TRUE);
+ gtk_widget_set_visible( (GtkWidget*)_p.cSFFDSearchButton, TRUE);
+ gtk_widget_set_visible( (GtkWidget*)_p.cSFFDParameters, TRUE);
- gtk_widget_set_visible( (GtkWidget*)_p.swPatternField, FALSE);
- gtk_widget_set_visible( (GtkWidget*)_p.cPatternCriteria, FALSE);
- gtk_widget_set_visible( (GtkWidget*)_p.cPatternAgainButton, FALSE);
+ gtk_widget_set_visible( (GtkWidget*)_p.swSFFDField, FALSE);
+ gtk_widget_set_visible( (GtkWidget*)_p.cSFFDCriteria, FALSE);
+ gtk_widget_set_visible( (GtkWidget*)_p.cSFFDAgainButton, FALSE);
}
void
aghui::SScoringFacility::SFindDialog::
setup_controls_for_tune()
{
- gtk_widget_set_visible( (GtkWidget*)_p.cPatternSearchButton, FALSE);
- gtk_widget_set_visible( (GtkWidget*)_p.cPatternPatternParameters, FALSE);
+ gtk_widget_set_visible( (GtkWidget*)_p.cSFFDSearchButton, FALSE);
+ gtk_widget_set_visible( (GtkWidget*)_p.cSFFDParameters, FALSE);
- gtk_widget_set_visible( (GtkWidget*)_p.swPatternField, TRUE);
- gtk_widget_set_visible( (GtkWidget*)_p.cPatternCriteria, TRUE);
- gtk_widget_set_visible( (GtkWidget*)_p.cPatternAgainButton, TRUE);
+ gtk_widget_set_visible( (GtkWidget*)_p.swSFFDField, TRUE);
+ gtk_widget_set_visible( (GtkWidget*)_p.cSFFDCriteria, TRUE);
+ gtk_widget_set_visible( (GtkWidget*)_p.cSFFDAgainButton, TRUE);
}
@@ -138,11 +139,11 @@ aghui::SScoringFacility::SFindDialog::
preselect_channel( const char *ch)
{
if ( ch == NULL ) {
- gtk_combo_box_set_active_iter( _p.ePatternChannel, NULL);
+ gtk_combo_box_set_active_iter( _p.eSFFDChannel, NULL);
return;
}
- GtkTreeModel *model = gtk_combo_box_get_model( _p.ePatternChannel);
+ GtkTreeModel *model = gtk_combo_box_get_model( _p.eSFFDChannel);
GtkTreeIter iter;
gboolean valid;
valid = gtk_tree_model_get_iter_first( model, &iter);
@@ -152,7 +153,7 @@ preselect_channel( const char *ch)
0, &entry,
-1);
if ( strcmp( entry, ch) == 0 ) {
- gtk_combo_box_set_active_iter( _p.ePatternChannel, &iter);
+ gtk_combo_box_set_active_iter( _p.eSFFDChannel, &iter);
return;
}
valid = gtk_tree_model_iter_next( model, &iter);
diff --git a/src/ui/sf/sf-patterns_cb.cc b/src/ui/sf/sf-patterns_cb.cc
index 10d4465..e198e3e 100644
--- a/src/ui/sf/sf-patterns_cb.cc
+++ b/src/ui/sf/sf-patterns_cb.cc
@@ -23,22 +23,24 @@ using namespace aghui;
extern "C" {
gboolean
-daPatternSelection_draw_cb( GtkWidget *wid, cairo_t *cr, gpointer userdata)
+daSFFDThing_draw_cb( GtkWidget *wid, cairo_t *cr, gpointer userdata)
{
auto& SF = *(SScoringFacility*)userdata;
auto& FD = SF.find_dialog;
+ FAFA;
FD.draw_thing( cr);
return TRUE;
}
gboolean
-daPatternField_draw_cb( GtkWidget *wid, cairo_t *cr, gpointer userdata)
+daSFFDField_draw_cb( GtkWidget *wid, cairo_t *cr, gpointer userdata)
{
auto& SF = *(SScoringFacility*)userdata;
auto& FD = SF.find_dialog;
+ FAFA;
FD.draw_field( cr);
return TRUE;
@@ -48,7 +50,7 @@ daPatternField_draw_cb( GtkWidget *wid, cairo_t *cr, gpointer userdata)
gboolean
-daPatternSelection_scroll_event_cb( GtkWidget *wid, GdkEventScroll *event, gpointer userdata)
+daSFFDThing_scroll_event_cb( GtkWidget *wid, GdkEventScroll *event, gpointer userdata)
{
auto& SF = *(SScoringFacility*)userdata;
auto& FD = SF.find_dialog;
@@ -56,14 +58,14 @@ daPatternSelection_scroll_event_cb( GtkWidget *wid, GdkEventScroll *event, gpoin
switch ( event->direction ) {
case GDK_SCROLL_UP:
if ( event->state & GDK_SHIFT_MASK )
- FD.set_pattern_da_width( FD.da_thing_wd + 10);
+ FD.set_thing_da_width( FD.da_thing_wd + 10);
else
FD.thing_display_scale *= 1.05;
break;
case GDK_SCROLL_DOWN:
if ( event->state & GDK_SHIFT_MASK ) {
if ( FD.da_thing_wd > 20 )
- FD.set_pattern_da_width( FD.da_thing_wd - 10);
+ FD.set_thing_da_width( FD.da_thing_wd - 10);
} else
FD.thing_display_scale /= 1.05;
break;
@@ -77,7 +79,7 @@ daPatternSelection_scroll_event_cb( GtkWidget *wid, GdkEventScroll *event, gpoin
}
gboolean
-daPatternField_scroll_event_cb( GtkWidget *wid, GdkEventScroll *event, gpointer userdata)
+daSFFDField_scroll_event_cb( GtkWidget *wid, GdkEventScroll *event, gpointer userdata)
{
auto& SF = *(SScoringFacility*)userdata;
auto& FD = SF.find_dialog;
@@ -108,7 +110,7 @@ daPatternField_scroll_event_cb( GtkWidget *wid, GdkEventScroll *event, gpointer
void
-bPatternSearch_clicked_cb( GtkButton *button, gpointer userdata)
+bSFFDSearch_clicked_cb( GtkButton *button, gpointer userdata)
{
auto& SF = *(SScoringFacility*)userdata;
auto& FD = SF.find_dialog;
@@ -117,7 +119,7 @@ bPatternSearch_clicked_cb( GtkButton *button, gpointer userdata)
}
void
-bPatternAgain_clicked_cb( GtkButton *button, gpointer userdata)
+bSFFDAgain_clicked_cb( GtkButton *button, gpointer userdata)
{
auto& SF = *(SScoringFacility*)userdata;
auto& FD = SF.find_dialog;
@@ -127,11 +129,11 @@ bPatternAgain_clicked_cb( GtkButton *button, gpointer userdata)
}
void
-bPatternGoto_clicked_cb( GtkButton *button, gpointer userdata)
+bSFFDGoto_clicked_cb( GtkButton *button, gpointer userdata)
{
auto& SF = *(SScoringFacility*)userdata;
auto& FD = SF.find_dialog;
- bool go_forward = button == FD._p.bPatternGotoNext;
+ bool go_forward = button == FD._p.bSFFDGotoNext;
SF.using_channel = FD.field_channel;
@@ -147,7 +149,7 @@ bPatternGoto_clicked_cb( GtkButton *button, gpointer userdata)
snprintf_buf( "%zu match%s\n",
FD.occurrences.size(), (FD.occurrences.size() == 1) ? "" : "es");
- gtk_label_set_markup( FD._p.lPatternSimilarity, __buf__);
+ gtk_label_set_markup( FD._p.lSFFDSimilarity, __buf__);
}
@@ -155,42 +157,42 @@ bPatternGoto_clicked_cb( GtkButton *button, gpointer userdata)
void
-bPatternSave_clicked_cb( GtkButton *button, gpointer userdata)
+bSFFDSave_clicked_cb( GtkButton *button, gpointer userdata)
{
auto& SF = *(SScoringFacility*)userdata;
auto& FD = SF.find_dialog;
- const char *label = gtk_combo_box_get_active_id( FD._p.ePatternList);
+ const char *label = gtk_combo_box_get_active_id( FD._p.eSFFDPatternList);
if ( label ) {
if ( strncmp( label, globally_marker, strlen( globally_marker)) == 0 )
label += strlen( globally_marker);
- gtk_entry_set_text( FD._p.ePatternNameName, label);
+ gtk_entry_set_text( FD._p.eSFFDPatternNameName, label);
}
- if ( gtk_dialog_run( FD._p.wPatternName) == GTK_RESPONSE_OK ) {
- const char *label = gtk_entry_get_text( FD._p.ePatternNameName);
- gboolean do_globally = gtk_toggle_button_get_active( (GtkToggleButton*)FD._p.ePatternNameSaveGlobally);
+ if ( gtk_dialog_run( FD._p.wSFFDPatternName) == GTK_RESPONSE_OK ) {
+ const char *label = gtk_entry_get_text( FD._p.eSFFDPatternNameName);
+ gboolean do_globally = gtk_toggle_button_get_active( (GtkToggleButton*)FD._p.eSFFDPatternNameSaveGlobally);
FD.save_pattern( label, do_globally);
// add to dropdown list & select the newly added entry
FD.enumerate_patterns_to_combo();
- g_signal_handler_block( FD._p.ePatternList, FD._p.ePatternList_changed_cb_handler_id);
+ g_signal_handler_block( FD._p.eSFFDPatternList, FD._p.eSFFDPatternList_changed_cb_handler_id);
FD.preselect_entry( label, do_globally);
- g_signal_handler_unblock( FD._p.ePatternList, FD._p.ePatternList_changed_cb_handler_id);
+ g_signal_handler_unblock( FD._p.eSFFDPatternList, FD._p.eSFFDPatternList_changed_cb_handler_id);
}
}
void
-bPatternDiscard_clicked_cb( GtkButton *button, gpointer userdata)
+bSFFDDiscard_clicked_cb( GtkButton *button, gpointer userdata)
{
auto& SF = *(SScoringFacility*)userdata;
auto& FD = SF.find_dialog;
GtkTreeIter iter;
- if ( gtk_combo_box_get_active_iter( FD._p.ePatternList, &iter) == FALSE )
+ if ( gtk_combo_box_get_active_iter( FD._p.eSFFDPatternList, &iter) == FALSE )
return;
char *label;
- gtk_tree_model_get( (GtkTreeModel*)FD._p.mPatterns, &iter,
+ gtk_tree_model_get( (GtkTreeModel*)FD._p.mSFFDPatterns, &iter,
0, &label,
-1);
gboolean do_globally = strncmp( label, globally_marker,
@@ -200,14 +202,14 @@ bPatternDiscard_clicked_cb( GtkButton *button, gpointer userdata)
: label;
FD.discard_pattern( fname, do_globally);
free( label);
- g_signal_handler_block( FD._p.ePatternList, FD._p.ePatternList_changed_cb_handler_id);
- FD.preselect_entry( NULL, do_globally);
- g_signal_handler_unblock( FD._p.ePatternList, FD._p.ePatternList_changed_cb_handler_id);
+ g_signal_handler_block( FD._p.eSFFDPatternList, FD._p.eSFFDPatternList_changed_cb_handler_id);
+ FD.preselect_entry( nullptr, do_globally);
+ g_signal_handler_unblock( FD._p.eSFFDPatternList, FD._p.eSFFDPatternList_changed_cb_handler_id);
}
void
-ePatternList_changed_cb( GtkComboBox *combo, gpointer userdata)
+eSFFDPatternList_changed_cb( GtkComboBox *combo, gpointer userdata)
{
auto& SF = *(SScoringFacility*)userdata;
auto& FD = SF.find_dialog;
@@ -216,7 +218,7 @@ ePatternList_changed_cb( GtkComboBox *combo, gpointer userdata)
if ( gtk_combo_box_get_active_iter( combo, &iter) == FALSE )
return;
char *label;
- gtk_tree_model_get( (GtkTreeModel*)FD._p.mPatterns, &iter,
+ gtk_tree_model_get( (GtkTreeModel*)FD._p.mSFFDPatterns, &iter,
0, &label,
-1);
gboolean do_globally = strncmp( label, globally_marker, strlen( globally_marker)) == 0;
@@ -226,14 +228,14 @@ ePatternList_changed_cb( GtkComboBox *combo, gpointer userdata)
FD.load_pattern( fname, do_globally);
free( label);
- gtk_label_set_markup( FD._p.lPatternSimilarity, "");
+ gtk_label_set_markup( FD._p.lSFFDSimilarity, "");
- gtk_widget_queue_draw( (GtkWidget*)FD._p.daPatternSelection);
+ gtk_widget_queue_draw( (GtkWidget*)FD._p.daSFFDThing);
}
void
-ePatternChannel_changed_cb( GtkComboBox *combo, gpointer userdata)
+eSFFDChannel_changed_cb( GtkComboBox *combo, gpointer userdata)
{
auto& SF = *(SScoringFacility*)userdata;
auto& FD = SF.find_dialog;
@@ -256,20 +258,19 @@ ePatternChannel_changed_cb( GtkComboBox *combo, gpointer userdata)
}
void
-ePattern_any_pattern_value_changed_cb( GtkSpinButton *spinbutton, gpointer userdata)
+eSFFD_any_pattern_value_changed_cb( GtkSpinButton *spinbutton, gpointer userdata)
{
auto& SF = *(SScoringFacility*)userdata;
auto& FD = SF.find_dialog;
FD.W_V.down();
- FD.search();
- FD.find_occurrences();
+ FD.setup_controls_for_find();
- gtk_widget_queue_draw( (GtkWidget*)FD._p.daPatternSelection);
+ gtk_widget_queue_draw( (GtkWidget*)FD._p.daSFFDThing);
}
void
-ePattern_any_criteria_value_changed_cb( GtkSpinButton *spinbutton, gpointer userdata)
+eSFFD_any_criteria_value_changed_cb( GtkSpinButton *spinbutton, gpointer userdata)
{
auto& SF = *(SScoringFacility*)userdata;
auto& FD = SF.find_dialog;
@@ -277,12 +278,12 @@ ePattern_any_criteria_value_changed_cb( GtkSpinButton *spinbutton, gpointer user
FD.W_V.down();
FD.find_occurrences();
- gtk_widget_queue_draw( (GtkWidget*)FD._p.daPatternSelection);
+ gtk_widget_queue_draw( (GtkWidget*)FD._p.daSFFDField);
}
void
-wPattern_show_cb( GtkWidget *widget, gpointer userdata)
+wSFFD_show_cb( GtkWidget *widget, gpointer userdata)
{
auto& SF = *(SScoringFacility*)userdata;
auto& FD = SF.find_dialog;
@@ -299,7 +300,7 @@ wPattern_show_cb( GtkWidget *widget, gpointer userdata)
}
void
-wPattern_hide_cb( GtkWidget *widget, gpointer userdata)
+wSFFD_hide_cb( GtkWidget *widget, gpointer userdata)
{
auto& SF = *(SScoringFacility*)userdata;
auto& FD = SF.find_dialog;
@@ -308,6 +309,21 @@ wPattern_hide_cb( GtkWidget *widget, gpointer userdata)
}
+
+gboolean
+wSFFD_configure_event_cb( GtkWidget *widget,
+ GdkEventConfigure *event,
+ gpointer userdata)
+{
+ if ( event->type == GDK_CONFIGURE ) {
+ auto& SF = *(SScoringFacility*)userdata;
+ int marijke = gtk_widget_get_allocated_width( (GtkWidget*)SF.swSFFDThing);
+ SF.find_dialog.set_thing_da_width( marijke);
+ SF.find_dialog.set_field_da_width( marijke);
+ }
+ return FALSE;
+}
+
} // extern "C"
// eof
diff --git a/src/ui/sf/sf-widgets.hh b/src/ui/sf/sf-widgets.hh
index d5aa6ba..4a82c87 100644
--- a/src/ui/sf/sf-widgets.hh
+++ b/src/ui/sf/sf-widgets.hh
@@ -177,46 +177,46 @@ struct SScoringFacilityWidgets {
// more important dialogs
// find/patterns dialog
GtkListStore
- *mPatterns;
+ *mSFFDPatterns;
GtkDialog
- *wPattern;
+ *wSFFD;
GtkComboBox
- *ePatternChannel,
- *ePatternList;
+ *eSFFDChannel,
+ *eSFFDPatternList;
GtkScrolledWindow
- *swPatternSelection,
- *swPatternField;
+ *swSFFDThing,
+ *swSFFDField;
GtkTable
- *cPatternPatternParameters,
- *cPatternCriteria,
- *cPatternSearchButton,
- *cPatternAgainButton;
+ *cSFFDParameters,
+ *cSFFDCriteria,
+ *cSFFDSearchButton,
+ *cSFFDAgainButton;
GtkDrawingArea
- *daPatternSelection,
- *daPatternField;
+ *daSFFDThing,
+ *daSFFDField;
GtkButton
- *bPatternSearch, *bPatternAgain,
- *bPatternGotoNext, *bPatternGotoPrevious,
- *bPatternSave, *bPatternDiscard;
+ *bSFFDSearch, *bSFFDAgain,
+ *bSFFDGotoNext, *bSFFDGotoPrevious,
+ *bSFFDSave, *bSFFDDiscard;
GtkSpinButton
- *ePatternEnvTightness,
- *ePatternBandPassFrom, *ePatternBandPassUpto, *ePatternBandPassOrder,
- *ePatternDZCDFStep, *ePatternDZCDFSigma, *ePatternDZCDFSmooth,
- *ePatternParameterA, *ePatternParameterB,
- *ePatternParameterC, *ePatternParameterD;
+ *eSFFDEnvTightness,
+ *eSFFDBandPassFrom, *eSFFDBandPassUpto, *eSFFDBandPassOrder,
+ *eSFFDDZCDFStep, *eSFFDDZCDFSigma, *eSFFDDZCDFSmooth,
+ *eSFFDParameterA, *eSFFDParameterB,
+ *eSFFDParameterC, *eSFFDParameterD;
GtkHBox
- *cPatternLabelBox;
+ *cSFFDLabelBox;
GtkLabel
- *lPatternParametersBrief,
- *lPatternSimilarity;
+ *lSFFDParametersBrief,
+ *lSFFDSimilarity;
GtkDialog
- *wPatternName;
+ *wSFFDPatternName;
GtkEntry
- *ePatternNameName;
+ *eSFFDPatternNameName;
GtkCheckButton
- *ePatternNameSaveGlobally;
- gulong ePatternChannel_changed_cb_handler_id,
- ePatternList_changed_cb_handler_id;
+ *eSFFDPatternNameSaveGlobally;
+ gulong eSFFDChannel_changed_cb_handler_id,
+ eSFFDPatternList_changed_cb_handler_id;
// filters dialog
GtkDialog
diff --git a/src/ui/sf/sf.hh b/src/ui/sf/sf.hh
index 6606414..177c8f4 100644
--- a/src/ui/sf/sf.hh
+++ b/src/ui/sf/sf.hh
@@ -566,7 +566,7 @@ class SScoringFacility
da_field_ht = 230;
int da_thing_wd,
da_field_wd;
- void set_pattern_da_width( int);
+ void set_thing_da_width( int);
void set_field_da_width( int);
SScoringFacility&
diff --git a/src/ui/sf/sf_cb.cc b/src/ui/sf/sf_cb.cc
index 8a96d51..8ca4552 100644
--- a/src/ui/sf/sf_cb.cc
+++ b/src/ui/sf/sf_cb.cc
@@ -194,9 +194,9 @@ bSFShowFindDialog_toggled_cb( GtkToggleButton *togglebutton, gpointer userdata)
auto& SF = *(SScoringFacility*)userdata;
if ( gtk_toggle_button_get_active( togglebutton) ) {
SF.find_dialog.setup_controls_for_find();
- gtk_widget_show( (GtkWidget*)SF.wPattern);
+ gtk_widget_show( (GtkWidget*)SF.wSFFD);
} else
- gtk_widget_hide( (GtkWidget*)SF.wPattern);
+ gtk_widget_hide( (GtkWidget*)SF.wSFFD);
}
diff --git a/src/ui/sf/sf_cb.hh b/src/ui/sf/sf_cb.hh
index 29fd518..42d1e7d 100644
--- a/src/ui/sf/sf_cb.hh
+++ b/src/ui/sf/sf_cb.hh
@@ -149,21 +149,22 @@ void iSFScoreImport_activate_cb( GtkMenuItem*, gpointer);
void iSFScoreExport_activate_cb( GtkMenuItem*, gpointer);
void iSFScoreClear_activate_cb( GtkMenuItem*, gpointer);
-void ePatternList_changed_cb( GtkComboBox*, gpointer);
-void ePatternChannel_changed_cb( GtkComboBox*, gpointer);
-gboolean daPatternField_draw_cb( GtkWidget*, cairo_t*, gpointer);
-gboolean daPatternField_scroll_event_cb( GtkWidget*, GdkEventScroll*, gpointer);
-gboolean daPatternSelection_draw_cb( GtkWidget*, cairo_t*, gpointer);
-gboolean daPatternSelection_scroll_event_cb( GtkWidget*, GdkEventScroll*, gpointer);
-void bPatternSearch_clicked_cb( GtkButton*, gpointer);
-void bPatternAgain_clicked_cb( GtkButton*, gpointer);
-void bPatternGoto_clicked_cb( GtkButton*, gpointer);
-void bPatternSave_clicked_cb( GtkButton*, gpointer);
-void bPatternDiscard_clicked_cb( GtkButton*, gpointer);
-void ePattern_any_pattern_value_changed_cb( GtkSpinButton*, gpointer);
-void ePattern_any_criteria_value_changed_cb( GtkSpinButton*, gpointer);
-void wPattern_show_cb( GtkWidget*, gpointer);
-void wPattern_hide_cb( GtkWidget*, gpointer);
+void eSFFDPatternList_changed_cb( GtkComboBox*, gpointer);
+void eSFFDChannel_changed_cb( GtkComboBox*, gpointer);
+gboolean daSFFDField_draw_cb( GtkWidget*, cairo_t*, gpointer);
+gboolean daSFFDField_scroll_event_cb( GtkWidget*, GdkEventScroll*, gpointer);
+gboolean daSFFDThing_draw_cb( GtkWidget*, cairo_t*, gpointer);
+gboolean daSFFDThing_scroll_event_cb( GtkWidget*, GdkEventScroll*, gpointer);
+void bSFFDSearch_clicked_cb( GtkButton*, gpointer);
+void bSFFDAgain_clicked_cb( GtkButton*, gpointer);
+void bSFFDGoto_clicked_cb( GtkButton*, gpointer);
+void bSFFDSave_clicked_cb( GtkButton*, gpointer);
+void bSFFDDiscard_clicked_cb( GtkButton*, gpointer);
+void eSFFD_any_pattern_value_changed_cb( GtkSpinButton*, gpointer);
+void eSFFD_any_criteria_value_changed_cb( GtkSpinButton*, gpointer);
+void wSFFD_show_cb( GtkWidget*, gpointer);
+void wSFFD_hide_cb( GtkWidget*, gpointer);
+gboolean wSFFD_configure_event_cb( GtkWidget*, GdkEventConfigure*, gpointer);
void eFilterHighPassCutoff_value_changed_cb( GtkSpinButton*, gpointer);
void eFilterLowPassCutoff_value_changed_cb( GtkSpinButton*, gpointer);
--
Sleep experiment manager
More information about the debian-med-commit
mailing list