[med-svn] [aghermann] 14/60: rename some, give an icon to Simple Artifact Detection dialog
andrei zavada
hmmr-guest at alioth.debian.org
Mon Nov 4 23:49:53 UTC 2013
This is an automated email from the git hooks/post-receive script.
hmmr-guest pushed a commit to branch WIP
in repository aghermann.
commit 0df6e2f55cda8412ab4a8f9c96638e2d6f881aad
Author: Andrei Zavada <johnhommer at gmail.com>
Date: Thu Oct 10 00:36:54 2013 +0300
rename some, give an icon to Simple Artifact Detection dialog
---
upstream/data/sf-artifacts-simple.glade | 32 +++++++++++++-------
upstream/data/sf-artifacts.glade | 3 +-
.../ui/sf/d/artifacts-simple-construct.cc | 8 ++---
upstream/src/aghermann/ui/sf/d/artifacts-simple.cc | 4 +--
upstream/src/aghermann/ui/sf/d/artifacts-simple.hh | 6 ++--
upstream/src/aghermann/ui/sf/montage-menus_cb.cc | 2 +-
6 files changed, 33 insertions(+), 22 deletions(-)
diff --git a/upstream/data/sf-artifacts-simple.glade b/upstream/data/sf-artifacts-simple.glade
index 97a16cd..2756600 100644
--- a/upstream/data/sf-artifacts-simple.glade
+++ b/upstream/data/sf-artifacts-simple.glade
@@ -1,26 +1,27 @@
<?xml version="1.0" encoding="UTF-8"?>
<interface>
<!-- interface-requires gtk+ 3.0 -->
- <object class="GtkAdjustment" id="jSFADSMinFlatRegionSize">
+ <object class="GtkAdjustment" id="jSFASMinFlatRegionSize">
<property name="lower">0.01</property>
<property name="upper">10</property>
<property name="value">0.5</property>
<property name="step_increment">0.01</property>
<property name="page_increment">0.10000000000000001</property>
</object>
- <object class="GtkAdjustment" id="jSFADSPad">
+ <object class="GtkAdjustment" id="jSFASPad">
<property name="upper">10</property>
<property name="value">0.20000000000000001</property>
<property name="step_increment">0.01</property>
<property name="page_increment">0.10000000000000001</property>
</object>
- <object class="GtkDialog" id="wSFADS">
+ <object class="GtkDialog" id="wSFAS">
<property name="can_focus">False</property>
<property name="border_width">10</property>
- <property name="title" translatable="yes">Global filters</property>
+ <property name="title" translatable="yes">Simple artifact detection</property>
<property name="modal">True</property>
<property name="window_position">mouse</property>
<property name="destroy_with_parent">True</property>
+ <property name="icon">aghermann.png</property>
<property name="type_hint">dialog</property>
<signal name="close" handler="gtk_widget_hide_on_delete" swapped="no"/>
<signal name="response" handler="gtk_widget_hide_on_delete" swapped="no"/>
@@ -78,7 +79,7 @@
<object class="GtkTable" id="table4">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="n_rows">5</property>
+ <property name="n_rows">6</property>
<property name="n_columns">3</property>
<property name="row_spacing">10</property>
<child>
@@ -116,11 +117,11 @@
</packing>
</child>
<child>
- <object class="GtkLabel" id="lFilterCaption1">
+ <object class="GtkLabel" id="lSFASLabel">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="xalign">0</property>
- <property name="label" translatable="yes"><b><big>Flat signal detection</big></b></property>
+ <property name="label" translatable="yes"><b><big>Simple artifact detection</big></b></property>
<property name="use_markup">True</property>
</object>
<packing>
@@ -154,13 +155,13 @@
</packing>
</child>
<child>
- <object class="GtkSpinButton" id="eSFADSMinFlatRegionSize">
+ <object class="GtkSpinButton" id="eSFASMinFlatRegionSize">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="invisible_char">•</property>
<property name="xalign">1</property>
<property name="invisible_char_set">True</property>
- <property name="adjustment">jSFADSMinFlatRegionSize</property>
+ <property name="adjustment">jSFASMinFlatRegionSize</property>
<property name="digits">2</property>
</object>
<packing>
@@ -199,13 +200,13 @@
</packing>
</child>
<child>
- <object class="GtkSpinButton" id="eSFADSPad">
+ <object class="GtkSpinButton" id="eSFASPad">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="invisible_char">•</property>
<property name="xalign">1</property>
<property name="invisible_char_set">True</property>
- <property name="adjustment">jSFADSPad</property>
+ <property name="adjustment">jSFASPad</property>
<property name="digits">2</property>
</object>
<packing>
@@ -215,6 +216,15 @@
<property name="bottom_attach">4</property>
</packing>
</child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
</object>
<packing>
<property name="expand">False</property>
diff --git a/upstream/data/sf-artifacts.glade b/upstream/data/sf-artifacts.glade
index ed350fd..4eecbc1 100644
--- a/upstream/data/sf-artifacts.glade
+++ b/upstream/data/sf-artifacts.glade
@@ -90,7 +90,8 @@
<object class="GtkDialog" id="wSFAD">
<property name="can_focus">False</property>
<property name="border_width">5</property>
- <property name="title" translatable="yes">Artifact Detection</property>
+ <property name="title" translatable="yes">Microcontinuity-based artifact detection</property>
+ <property name="icon">aghermann.png</property>
<property name="type_hint">dialog</property>
<signal name="close" handler="gtk_widget_hide_on_delete" swapped="no"/>
<child internal-child="vbox">
diff --git a/upstream/src/aghermann/ui/sf/d/artifacts-simple-construct.cc b/upstream/src/aghermann/ui/sf/d/artifacts-simple-construct.cc
index cd93d7b..b8a151a 100644
--- a/upstream/src/aghermann/ui/sf/d/artifacts-simple-construct.cc
+++ b/upstream/src/aghermann/ui/sf/d/artifacts-simple-construct.cc
@@ -26,16 +26,16 @@ SArtifactsSimpleDialogWidgets ()
throw runtime_error( "Failed to load SF::artifacts-simple glade resource");
gtk_builder_connect_signals( builder, NULL);
- AGH_GBGETOBJ (wSFADS);
- AGH_GBGETOBJ (eSFADSMinFlatRegionSize);
- AGH_GBGETOBJ (eSFADSPad);
+ AGH_GBGETOBJ (wSFAS);
+ AGH_GBGETOBJ (eSFASMinFlatRegionSize);
+ AGH_GBGETOBJ (eSFASPad);
}
SArtifactsSimpleDialogWidgets::
~SArtifactsSimpleDialogWidgets ()
{
- gtk_widget_destroy( (GtkWidget*)wSFADS);
+ gtk_widget_destroy( (GtkWidget*)wSFAS);
g_object_unref( (GObject*)builder);
}
diff --git a/upstream/src/aghermann/ui/sf/d/artifacts-simple.cc b/upstream/src/aghermann/ui/sf/d/artifacts-simple.cc
index 8c86525..85229ad 100644
--- a/upstream/src/aghermann/ui/sf/d/artifacts-simple.cc
+++ b/upstream/src/aghermann/ui/sf/d/artifacts-simple.cc
@@ -30,8 +30,8 @@ SArtifactsSimpleDialog (SScoringFacility& p_)
pad (),
_p (p_)
{
- W_V.reg( eSFADSMinFlatRegionSize, &min_size);
- W_V.reg( eSFADSPad, &pad);
+ W_V.reg( eSFASMinFlatRegionSize, &min_size);
+ W_V.reg( eSFASPad, &pad);
}
diff --git a/upstream/src/aghermann/ui/sf/d/artifacts-simple.hh b/upstream/src/aghermann/ui/sf/d/artifacts-simple.hh
index 9347851..7642ae6 100644
--- a/upstream/src/aghermann/ui/sf/d/artifacts-simple.hh
+++ b/upstream/src/aghermann/ui/sf/d/artifacts-simple.hh
@@ -34,10 +34,10 @@ struct SArtifactsSimpleDialogWidgets {
GtkBuilder *builder;
GtkDialog
- *wSFADS;
+ *wSFAS;
GtkSpinButton
- *eSFADSMinFlatRegionSize,
- *eSFADSPad;
+ *eSFASMinFlatRegionSize,
+ *eSFASPad;
};
struct SScoringFacility::SArtifactsSimpleDialog
diff --git a/upstream/src/aghermann/ui/sf/montage-menus_cb.cc b/upstream/src/aghermann/ui/sf/montage-menus_cb.cc
index 8c910c5..887d2e3 100644
--- a/upstream/src/aghermann/ui/sf/montage-menus_cb.cc
+++ b/upstream/src/aghermann/ui/sf/montage-menus_cb.cc
@@ -328,7 +328,7 @@ iSFPageArtifactsMarkFlat_activate_cb(
auto& SF = *(SScoringFacility*)userdata;
auto& AS = SF.artifacts_simple_d();
if ( GTK_RESPONSE_OK ==
- gtk_dialog_run( (GtkDialog*)AS.wSFADS) ) {
+ gtk_dialog_run( (GtkDialog*)AS.wSFAS) ) {
AS.W_V.down();
auto marked = SF.using_channel->mark_flat_regions_as_artifacts( AS.min_size, AS.pad);
--
Alioth's /git/debian-med/git-commit-notice on /srv/git.debian.org/git/debian-med/aghermann.git
More information about the debian-med-commit
mailing list