commit d7569bab0af5780652f61d3d82e4080356fffd27
Author: Xavier de Blas <xaviblas gmail com>
Date: Tue Jun 5 19:10:21 2012 +0200
Encoder better Gui. Minor changes
encoder/graph.R | 10 +-
glade/chronojump.glade | 812 ++++++++++++++++++++++++------------------------
src/gui/encoder.cs | 22 +-
src/gui/jump.cs | 2 +-
src/gui/run.cs | 2 +-
src/sqlite/encoder.cs | 4 +-
6 files changed, 427 insertions(+), 425 deletions(-)
---
diff --git a/encoder/graph.R b/encoder/graph.R
index f0fc374..d2cee90 100644
--- a/encoder/graph.R
+++ b/encoder/graph.R
@@ -433,13 +433,13 @@ paintLoadVSPower <- function (paf, option) {
adjHor = 0.5
nums=as.character(1:length(x))
} else if (suboption == "side") {
- cexBalls = 1.5
- cexNums = .7
+ cexBalls = 1.8
+ cexNums = .8
adjHor = 0
nums=paste(" ",as.character(1:length(x)))
}
- plot(x,y, xlab="Displaced mass (Kg)", ylab=ylab,pch=21,col="blue",bg="lightblue",cex=cexBalls)
+ plot(x,y, xlab="Mass (Kg)", ylab=ylab,pch=21,col="blue",bg="lightblue",cex=cexBalls)
text(x,y,nums,adj=c(adjHor,0.5),cex=cexNums)
lines(smooth.spline(x,y),col="darkblue")
}
@@ -471,8 +471,8 @@ paintForceVSSpeed <- function (paf,option) {
adjHor = 0.5
nums=as.character(1:length(x))
} else if (suboption == "side") {
- cexBalls = 1.5
- cexNums = .7
+ cexBalls = 1.8
+ cexNums = .8
adjHor = 0
nums=paste(" ",as.character(1:length(x)))
}
diff --git a/glade/chronojump.glade b/glade/chronojump.glade
index 0202cd7..7defa5c 100644
--- a/glade/chronojump.glade
+++ b/glade/chronojump.glade
@@ -24107,39 +24107,90 @@ Evaluator can use real name or nickname.</property>
<child>
<widget class="GtkVBox" id="vbox3">
<property name="visible">True</property>
- <property name="spacing">8</property>
+ <property name="spacing">4</property>
<child>
- <widget class="GtkVBox" id="vbox5">
+ <widget class="GtkVBox" id="vbox48">
<property name="visible">True</property>
- <property name="spacing">12</property>
+ <property name="spacing">5</property>
<child>
- <widget class="GtkVBox" id="vbox48">
+ <widget class="GtkFrame" id="frame18">
<property name="visible">True</property>
- <property name="spacing">4</property>
+ <property name="label_xalign">0</property>
+ <property name="label_yalign">0.69999998807907104</property>
+ <property name="shadow_type">out</property>
<child>
- <widget class="GtkFrame" id="frame18">
+ <widget class="GtkAlignment" id="alignment22">
<property name="visible">True</property>
- <property name="label_xalign">0</property>
- <property name="label_yalign">0.69999998807907104</property>
- <property name="shadow_type">out</property>
+ <property name="left_padding">12</property>
<child>
- <widget class="GtkAlignment" id="alignment22">
+ <widget class="GtkHBox" id="hbox58">
<property name="visible">True</property>
- <property name="left_padding">12</property>
+ <property name="spacing">12</property>
<child>
- <widget class="GtkHBox" id="hbox81">
+ <widget class="GtkTable" id="table10">
<property name="visible">True</property>
- <property name="spacing">12</property>
+ <property name="n_rows">2</property>
+ <property name="n_columns">2</property>
+ <property name="column_spacing">7</property>
+ <property name="row_spacing">6</property>
<child>
- <widget class="GtkHBox" id="hbox82">
+ <widget class="GtkHBox" id="hbox_combo_encoder_exercise">
<property name="visible">True</property>
- <property name="spacing">2</property>
<child>
- <widget class="GtkHBox" id="hbox_combo_encoder_exercise">
+ <placeholder/>
+ </child>
+ </widget>
+ <packing>
+ <property name="x_options">GTK_FILL</property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkHBox" id="hbox95">
<property name="visible">True</property>
<child>
- <placeholder/>
+ <widget class="GtkLabel" id="label90">
+ <property name="visible">True</property>
+ <property name="label" translatable="yes">Options: </property>
+ </widget>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkLabel" id="label82">
+ <property name="visible">True</property>
+ <property name="xalign">0</property>
+ <property name="label" translatable="yes">Recording time</property>
+ </widget>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="pack_type">end</property>
+ <property name="position">1</property>
+ </packing>
</child>
+ </widget>
+ <packing>
+ <property name="top_attach">1</property>
+ <property name="bottom_attach">2</property>
+ <property name="x_options">GTK_FILL</property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkHBox" id="hbox96">
+ <property name="visible">True</property>
+ <property name="spacing">4</property>
+ <child>
+ <widget class="GtkSpinButton" id="spin_encoder_capture_time">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="invisible_char">â</property>
+ <property name="adjustment">10 5 99 1 10 0</property>
+ <property name="climb_rate">1</property>
+ <property name="snap_to_ticks">True</property>
+ <property name="numeric">True</property>
</widget>
<packing>
<property name="expand">False</property>
@@ -24148,6 +24199,30 @@ Evaluator can use real name or nickname.</property>
</packing>
</child>
<child>
+ <widget class="GtkLabel" id="label71">
+ <property name="visible">True</property>
+ <property name="xalign">0</property>
+ <property name="label" translatable="yes">s</property>
+ </widget>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ </widget>
+ <packing>
+ <property name="left_attach">1</property>
+ <property name="right_attach">2</property>
+ <property name="top_attach">1</property>
+ <property name="bottom_attach">2</property>
+ <property name="x_options">GTK_FILL</property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkHBox" id="hbox94">
+ <property name="visible">True</property>
+ <child>
<widget class="GtkButton" id="button_encoder_exercise_info">
<property name="visible">True</property>
<property name="can_focus">True</property>
@@ -24163,9 +24238,7 @@ Evaluator can use real name or nickname.</property>
</child>
</widget>
<packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">1</property>
+ <property name="position">0</property>
</packing>
</child>
<child>
@@ -24184,130 +24257,138 @@ Evaluator can use real name or nickname.</property>
</child>
</widget>
<packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">2</property>
+ <property name="position">1</property>
</packing>
</child>
</widget>
<packing>
- <property name="position">0</property>
+ <property name="left_attach">1</property>
+ <property name="right_attach">2</property>
+ <property name="x_options">GTK_FILL</property>
</packing>
</child>
+ </widget>
+ <packing>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkTable" id="table11">
+ <property name="visible">True</property>
+ <property name="n_rows">2</property>
+ <property name="n_columns">3</property>
+ <property name="column_spacing">4</property>
+ <property name="row_spacing">6</property>
<child>
- <widget class="GtkHBox" id="hbox83">
- <property name="visible">True</property>
- <property name="spacing">4</property>
- <child>
- <widget class="GtkLabel" id="label88">
+ <widget class="GtkLabel" id="label88">
<property name="visible">True</property>
+ <property name="xalign">0</property>
<property name="label" translatable="yes">Extra weight</property>
- </widget>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <widget class="GtkSpinButton" id="spin_encoder_extra_weight">
+ </widget>
+ <packing>
+ <property name="x_options">GTK_FILL</property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkLabel" id="label78">
+ <property name="visible">True</property>
+ <property name="xalign">0</property>
+ <property name="label" translatable="yes">Minimal height</property>
+ </widget>
+ <packing>
+ <property name="top_attach">1</property>
+ <property name="bottom_attach">2</property>
+ <property name="x_options">GTK_FILL</property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkSpinButton" id="spin_encoder_capture_min_height">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="invisible_char">â</property>
- <property name="adjustment">10 1 300 1 10 0</property>
+ <property name="adjustment">30 1 300 1 10 0</property>
<property name="climb_rate">1</property>
<property name="snap_to_ticks">True</property>
<property name="numeric">True</property>
- </widget>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">1</property>
- </packing>
- </child>
- <child>
- <widget class="GtkLabel" id="label89">
+ </widget>
+ <packing>
+ <property name="left_attach">1</property>
+ <property name="right_attach">2</property>
+ <property name="top_attach">1</property>
+ <property name="bottom_attach">2</property>
+ <property name="x_options"></property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkLabel" id="label81">
<property name="visible">True</property>
- <property name="label" translatable="yes">Kg</property>
- </widget>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">2</property>
- </packing>
- </child>
+ <property name="xalign">1</property>
+ <property name="label" translatable="yes">cm</property>
</widget>
<packing>
- <property name="position">1</property>
+ <property name="left_attach">2</property>
+ <property name="right_attach">3</property>
+ <property name="top_attach">1</property>
+ <property name="bottom_attach">2</property>
+ <property name="x_options"></property>
</packing>
</child>
<child>
- <widget class="GtkHBox" id="hbox_combo_encoder_eccon">
+ <widget class="GtkSpinButton" id="spin_encoder_extra_weight">
<property name="visible">True</property>
- <child>
- <placeholder/>
- </child>
+ <property name="can_focus">True</property>
+ <property name="invisible_char">â</property>
+ <property name="adjustment">10 1 300 1 10 0</property>
+ <property name="climb_rate">1</property>
+ <property name="snap_to_ticks">True</property>
+ <property name="numeric">True</property>
</widget>
<packing>
- <property name="position">2</property>
+ <property name="left_attach">1</property>
+ <property name="right_attach">2</property>
+ <property name="x_options"></property>
</packing>
</child>
<child>
- <widget class="GtkHBox" id="hbox_combo_encoder_laterality">
+ <widget class="GtkLabel" id="label89">
<property name="visible">True</property>
- <child>
- <placeholder/>
- </child>
+ <property name="label" translatable="yes">Kg</property>
</widget>
<packing>
- <property name="position">3</property>
+ <property name="left_attach">2</property>
+ <property name="right_attach">3</property>
+ <property name="x_options"></property>
</packing>
</child>
</widget>
+ <packing>
+ <property name="position">1</property>
+ </packing>
</child>
- </widget>
- </child>
- <child>
- <widget class="GtkLabel" id="label84">
- <property name="visible">True</property>
- <property name="label" translatable="yes"><b>Exercise</b></property>
- <property name="use_markup">True</property>
- </widget>
- <packing>
- <property name="type">label_item</property>
- </packing>
- </child>
- </widget>
- <packing>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <widget class="GtkFrame" id="frame16">
- <property name="visible">True</property>
- <property name="label_xalign">0</property>
- <property name="label_yalign">0.69999998807907104</property>
- <property name="shadow_type">out</property>
- <child>
- <widget class="GtkAlignment" id="alignment19">
- <property name="visible">True</property>
- <property name="top_padding">4</property>
- <property name="bottom_padding">4</property>
- <property name="left_padding">10</property>
- <property name="right_padding">10</property>
<child>
- <widget class="GtkHBox" id="hbox58">
+ <widget class="GtkVBox" id="vbox2">
<property name="visible">True</property>
- <property name="spacing">5</property>
+ <property name="spacing">6</property>
<child>
- <widget class="GtkHBox" id="hbox76">
+ <widget class="GtkHBox" id="hbox_combo_encoder_eccon">
+ <property name="visible">True</property>
+ <child>
+ <placeholder/>
+ </child>
+ </widget>
+ <packing>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkHBox" id="hbox86">
<property name="visible">True</property>
<property name="spacing">6</property>
<child>
- <widget class="GtkLabel" id="label82">
+ <widget class="GtkLabel" id="label85">
<property name="visible">True</property>
<property name="xalign">0</property>
- <property name="label" translatable="yes">Recording time</property>
+ <property name="label" translatable="yes">Smoothing</property>
</widget>
<packing>
<property name="expand">False</property>
@@ -24316,12 +24397,13 @@ Evaluator can use real name or nickname.</property>
</packing>
</child>
<child>
- <widget class="GtkSpinButton" id="spin_encoder_capture_time">
+ <widget class="GtkSpinButton" id="spin_encoder_smooth">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="invisible_char">â</property>
- <property name="adjustment">10 5 99 1 10 0</property>
+ <property name="adjustment">0.69999999999999996 0 1 0.01 0.10000000000000001 0</property>
<property name="climb_rate">1</property>
+ <property name="digits">2</property>
<property name="snap_to_ticks">True</property>
<property name="numeric">True</property>
</widget>
@@ -24331,17 +24413,25 @@ Evaluator can use real name or nickname.</property>
<property name="position">1</property>
</packing>
</child>
- <child>
- <widget class="GtkLabel" id="label71">
+ </widget>
+ <packing>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ </widget>
+ <packing>
+ <property name="position">2</property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkVBox" id="vbox5">
+ <property name="visible">True</property>
+ <property name="spacing">6</property>
+ <child>
+ <widget class="GtkHBox" id="hbox_combo_encoder_laterality">
<property name="visible">True</property>
- <property name="xalign">0</property>
- <property name="label" translatable="yes">s</property>
- </widget>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">2</property>
- </packing>
+ <child>
+ <placeholder/>
</child>
</widget>
<packing>
@@ -24349,30 +24439,35 @@ Evaluator can use real name or nickname.</property>
</packing>
</child>
<child>
- <widget class="GtkHBox" id="hbox85">
+ <widget class="GtkButton" id="button_encoder_bells">
<property name="visible">True</property>
- <property name="spacing">6</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">True</property>
+ <property name="has_tooltip">True</property>
+ <property name="tooltip" translatable="yes">Bells</property>
+ <signal name="clicked" handler="on_button_encoder_bells_clicked"/>
<child>
- <widget class="GtkLabel" id="label78">
+ <widget class="GtkAlignment" id="alignment21">
<property name="visible">True</property>
- <property name="xalign">0</property>
- <property name="label" translatable="yes">Minimal height</property>
+ <property name="xscale">0</property>
+ <property name="yscale">0</property>
+ <child>
+ <widget class="GtkHBox" id="hbox90">
+ <property name="visible">True</property>
+ <property name="spacing">2</property>
+ <child>
+ <widget class="GtkImage" id="image_encoder_bell">
+ <property name="visible">True</property>
+ <property name="icon-size">2</property>
</widget>
<packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
<property name="position">0</property>
</packing>
</child>
<child>
- <widget class="GtkSpinButton" id="spin_encoder_capture_min_height">
+ <widget class="GtkLabel" id="label86">
<property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="invisible_char">â</property>
- <property name="adjustment">30 1 300 1 10 0</property>
- <property name="climb_rate">1</property>
- <property name="snap_to_ticks">True</property>
- <property name="numeric">True</property>
+ <property name="use_underline">True</property>
</widget>
<packing>
<property name="expand">False</property>
@@ -24380,240 +24475,205 @@ Evaluator can use real name or nickname.</property>
<property name="position">1</property>
</packing>
</child>
- <child>
- <widget class="GtkLabel" id="label81">
- <property name="visible">True</property>
- <property name="xalign">1</property>
- <property name="label" translatable="yes">cm</property>
</widget>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">2</property>
- </packing>
+ </child>
+ </widget>
</child>
</widget>
<packing>
<property name="position">1</property>
</packing>
</child>
+ </widget>
+ <packing>
+ <property name="position">3</property>
+ </packing>
+ </child>
+ </widget>
+ </child>
+ </widget>
+ </child>
+ <child>
+ <widget class="GtkLabel" id="label84">
+ <property name="visible">True</property>
+ <property name="label" translatable="yes"><b>Exercise</b></property>
+ <property name="use_markup">True</property>
+ </widget>
+ <packing>
+ <property name="type">label_item</property>
+ </packing>
+ </child>
+ </widget>
+ <packing>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkFrame" id="frame16">
+ <property name="visible">True</property>
+ <property name="label_xalign">0</property>
+ <property name="label_yalign">0.69999998807907104</property>
+ <property name="shadow_type">out</property>
+ <child>
+ <widget class="GtkAlignment" id="alignment19">
+ <property name="visible">True</property>
+ <property name="left_padding">12</property>
+ <child>
+ <widget class="GtkHBox" id="hbox72">
+ <property name="visible">True</property>
+ <property name="spacing">20</property>
+ <child>
+ <widget class="GtkButton" id="button_encoder_capture">
+ <property name="label" translatable="yes">Capture from encoder</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="can_default">True</property>
+ <property name="receives_default">True</property>
+ <property name="use_underline">True</property>
+ <signal name="clicked" handler="on_button_encoder_capture_clicked"/>
+ </widget>
+ <packing>
+ <property name="fill">False</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkVBox" id="vbox4">
+ <property name="visible">True</property>
+ <property name="spacing">6</property>
<child>
- <widget class="GtkHBox" id="hbox86">
- <property name="visible">True</property>
- <property name="spacing">6</property>
- <child>
- <widget class="GtkLabel" id="label85">
+ <widget class="GtkProgressBar" id="encoder_pulsebar_capture">
<property name="visible">True</property>
- <property name="xalign">0</property>
- <property name="label" translatable="yes">Smoothing</property>
- </widget>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
+ <property name="activity_mode">True</property>
+ <property name="show_text">True</property>
+ <property name="pulse_step">0.10000000149</property>
+ </widget>
+ <packing>
<property name="position">0</property>
- </packing>
- </child>
- <child>
- <widget class="GtkSpinButton" id="spin_encoder_smooth">
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkButton" id="button_encoder_capture_cancel">
+ <property name="label" translatable="yes">Cancel</property>
<property name="visible">True</property>
+ <property name="sensitive">False</property>
<property name="can_focus">True</property>
- <property name="invisible_char">â</property>
- <property name="adjustment">0.69999999999999996 0 1 0.01 0.10000000000000001 0</property>
- <property name="climb_rate">1</property>
- <property name="digits">2</property>
- <property name="snap_to_ticks">True</property>
- <property name="numeric">True</property>
- </widget>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">1</property>
- </packing>
- </child>
+ <property name="can_default">True</property>
+ <property name="receives_default">True</property>
+ <property name="use_underline">True</property>
+ <signal name="clicked" handler="on_button_encoder_cancel_clicked"/>
</widget>
<packing>
- <property name="position">2</property>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">1</property>
</packing>
</child>
+ </widget>
+ <packing>
+ <property name="fill">False</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkTable" id="table7">
+ <property name="visible">True</property>
+ <property name="n_rows">2</property>
+ <property name="n_columns">2</property>
+ <property name="column_spacing">20</property>
+ <property name="row_spacing">6</property>
<child>
- <widget class="GtkHBox" id="hbox72">
- <property name="visible">True</property>
- <child>
- <widget class="GtkButton" id="button_encoder_bells">
+ <widget class="GtkButton" id="button_encoder_recalculate">
+ <property name="label" translatable="yes">Recalculate</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
+ <property name="can_default">True</property>
<property name="receives_default">True</property>
- <property name="has_tooltip">True</property>
- <property name="tooltip" translatable="yes">Bells</property>
- <signal name="clicked" handler="on_button_encoder_bells_clicked"/>
- <child>
- <widget class="GtkAlignment" id="alignment21">
- <property name="visible">True</property>
- <property name="xscale">0</property>
- <property name="yscale">0</property>
- <child>
- <widget class="GtkHBox" id="hbox90">
+ <property name="use_underline">True</property>
+ <signal name="clicked" handler="on_button_encoder_recalculate_clicked"/>
+ </widget>
+ </child>
+ <child>
+ <widget class="GtkHBox" id="hbox81">
<property name="visible">True</property>
- <property name="spacing">2</property>
+ <property name="spacing">6</property>
<child>
- <widget class="GtkImage" id="image_encoder_bell">
+ <widget class="GtkEntry" id="entry_encoder_signal_comment">
+ <property name="width_request">100</property>
<property name="visible">True</property>
- <property name="icon-size">2</property>
+ <property name="can_focus">True</property>
+ <property name="invisible_char">â</property>
</widget>
<packing>
<property name="position">0</property>
</packing>
</child>
<child>
- <widget class="GtkLabel" id="label86">
+ <widget class="GtkButton" id="button_encoder_update_signal">
+ <property name="label">Update</property>
<property name="visible">True</property>
- <property name="use_underline">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">True</property>
+ <signal name="clicked" handler="on_button_encoder_save_clicked"/>
</widget>
<packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
<property name="position">1</property>
</packing>
</child>
- </widget>
- </child>
- </widget>
- </child>
- </widget>
- <packing>
- <property name="pack_type">end</property>
- <property name="position">0</property>
- </packing>
- </child>
</widget>
<packing>
- <property name="position">3</property>
+ <property name="top_attach">1</property>
+ <property name="bottom_attach">2</property>
+ <property name="x_options"></property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkButton" id="button_encoder_load_signal">
+ <property name="label">Load</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">True</property>
+ <signal name="clicked" handler="on_button_encoder_load_signal_clicked"/>
+ </widget>
+ <packing>
+ <property name="left_attach">1</property>
+ <property name="right_attach">2</property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkButton" id="button_encoder_delete_signal">
+ <property name="label">Delete</property>
+ <property name="visible">True</property>
+ <property name="sensitive">False</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">True</property>
+ <signal name="clicked" handler="on_button_encoder_delete_signal_clicked"/>
+ </widget>
+ <packing>
+ <property name="left_attach">1</property>
+ <property name="right_attach">2</property>
+ <property name="top_attach">1</property>
+ <property name="bottom_attach">2</property>
</packing>
</child>
</widget>
+ <packing>
+ <property name="fill">False</property>
+ <property name="position">2</property>
+ </packing>
</child>
</widget>
</child>
- <child>
- <widget class="GtkLabel" id="label75">
- <property name="visible">True</property>
- <property name="label" translatable="yes"><b>Options</b></property>
- <property name="use_markup">True</property>
- </widget>
- <packing>
- <property name="type">label_item</property>
- </packing>
- </child>
- </widget>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">1</property>
- </packing>
- </child>
- </widget>
- <packing>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <widget class="GtkHBox" id="hbox87">
- <property name="visible">True</property>
- <property name="spacing">12</property>
- <child>
- <widget class="GtkHButtonBox" id="hbuttonbox9">
- <property name="visible">True</property>
- <property name="layout_style">spread</property>
- <child>
- <widget class="GtkButton" id="button_encoder_capture">
- <property name="label" translatable="yes">Capture from encoder</property>
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="can_default">True</property>
- <property name="receives_default">True</property>
- <property name="use_underline">True</property>
- <signal name="clicked" handler="on_button_encoder_capture_clicked"/>
- </widget>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <widget class="GtkButton" id="button_encoder_recalculate">
- <property name="label" translatable="yes">Recalculate</property>
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="can_default">True</property>
- <property name="receives_default">True</property>
- <property name="use_underline">True</property>
- <signal name="clicked" handler="on_button_encoder_recalculate_clicked"/>
- </widget>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">1</property>
- </packing>
- </child>
- <child>
- <widget class="GtkButton" id="button_encoder_load_signal">
- <property name="label">Load signal</property>
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">True</property>
- <signal name="clicked" handler="on_button_encoder_load_signal_clicked"/>
- </widget>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">2</property>
- </packing>
- </child>
</widget>
- <packing>
- <property name="position">0</property>
- </packing>
</child>
<child>
- <widget class="GtkHBox" id="hbox93">
+ <widget class="GtkLabel" id="label75">
<property name="visible">True</property>
- <property name="spacing">4</property>
- <child>
- <widget class="GtkProgressBar" id="encoder_pulsebar_capture">
- <property name="visible">True</property>
- <property name="activity_mode">True</property>
- <property name="show_text">True</property>
- <property name="pulse_step">0.10000000149</property>
- </widget>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <widget class="GtkButton" id="button_encoder_capture_cancel">
- <property name="label" translatable="yes">Cancel</property>
- <property name="visible">True</property>
- <property name="sensitive">False</property>
- <property name="can_focus">True</property>
- <property name="can_default">True</property>
- <property name="receives_default">True</property>
- <property name="use_underline">True</property>
- <signal name="clicked" handler="on_button_encoder_cancel_clicked"/>
- </widget>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">1</property>
- </packing>
- </child>
+ <property name="label" translatable="yes"><b>Signal</b></property>
+ <property name="use_markup">True</property>
</widget>
<packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">1</property>
+ <property name="type">label_item</property>
</packing>
</child>
</widget>
@@ -24624,7 +24684,7 @@ Evaluator can use real name or nickname.</property>
</widget>
<packing>
<property name="expand">False</property>
- <property name="padding">4</property>
+ <property name="fill">False</property>
<property name="position">0</property>
</packing>
</child>
@@ -24685,38 +24745,12 @@ Evaluator can use real name or nickname.</property>
<property name="visible">True</property>
<property name="spacing">10</property>
<child>
- <widget class="GtkVBox" id="vbox2">
+ <widget class="GtkButton" id="button_encoder_delete_curve">
+ <property name="label">Delete selected curve</property>
<property name="visible">True</property>
- <property name="spacing">6</property>
- <child>
- <widget class="GtkButton" id="button_encoder_delete_curve">
- <property name="label">Delete selected curve</property>
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">True</property>
- <signal name="clicked" handler="on_button_encoder_delete_curve_clicked"/>
- </widget>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <widget class="GtkButton" id="button_encoder_delete_signal">
- <property name="label">Delete signal</property>
- <property name="visible">True</property>
- <property name="sensitive">False</property>
- <property name="can_focus">True</property>
- <property name="receives_default">True</property>
- <signal name="clicked" handler="on_button_encoder_delete_signal_clicked"/>
- </widget>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">1</property>
- </packing>
- </child>
+ <property name="can_focus">True</property>
+ <property name="receives_default">True</property>
+ <signal name="clicked" handler="on_button_encoder_delete_curve_clicked"/>
</widget>
<packing>
<property name="expand">False</property>
@@ -24725,85 +24759,51 @@ Evaluator can use real name or nickname.</property>
</packing>
</child>
<child>
- <widget class="GtkTable" id="table7">
+ <placeholder/>
+ </child>
+ <child>
+ <widget class="GtkHBox" id="hbox80">
<property name="visible">True</property>
- <property name="n_rows">2</property>
- <property name="n_columns">2</property>
- <property name="column_spacing">20</property>
- <property name="row_spacing">6</property>
- <child>
- <widget class="GtkLabel" id="label_encoder_capture_comment">
- <property name="visible">True</property>
- <property name="label" translatable="yes">Add comment</property>
- </widget>
- <packing>
- <property name="x_options"></property>
- </packing>
- </child>
+ <property name="spacing">8</property>
<child>
- <widget class="GtkEntry" id="entry_encoder_capture_comment">
+ <widget class="GtkEntry" id="entry_encoder_curve_comment">
+ <property name="width_request">150</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="invisible_char">â</property>
</widget>
<packing>
- <property name="top_attach">1</property>
- <property name="bottom_attach">2</property>
- <property name="x_options"></property>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">0</property>
</packing>
</child>
<child>
- <widget class="GtkButton" id="button_encoder_update_signal">
- <property name="label">Update signal</property>
+ <widget class="GtkButton" id="button_encoder_save_curve">
+ <property name="label">Save curve</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
<signal name="clicked" handler="on_button_encoder_save_clicked"/>
</widget>
<packing>
- <property name="left_attach">1</property>
- <property name="right_attach">2</property>
- <property name="top_attach">1</property>
- <property name="bottom_attach">2</property>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">1</property>
</packing>
</child>
<child>
- <widget class="GtkHBox" id="hbox80">
+ <widget class="GtkButton" id="button_encoder_save_all_curves">
+ <property name="label">Save all curves</property>
<property name="visible">True</property>
- <property name="spacing">8</property>
- <child>
- <widget class="GtkButton" id="button_encoder_save_curve">
- <property name="label">Save curve</property>
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">True</property>
- <signal name="clicked" handler="on_button_encoder_save_clicked"/>
- </widget>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <widget class="GtkButton" id="button_encoder_save_all_curves">
- <property name="label">Save all curves</property>
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">True</property>
- <signal name="clicked" handler="on_button_encoder_save_clicked"/>
- </widget>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">1</property>
- </packing>
- </child>
+ <property name="can_focus">True</property>
+ <property name="receives_default">True</property>
+ <signal name="clicked" handler="on_button_encoder_save_clicked"/>
</widget>
<packing>
- <property name="left_attach">1</property>
- <property name="right_attach">2</property>
- <property name="x_options"></property>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">2</property>
</packing>
</child>
</widget>
@@ -24811,7 +24811,7 @@ Evaluator can use real name or nickname.</property>
<property name="expand">False</property>
<property name="fill">False</property>
<property name="pack_type">end</property>
- <property name="position">1</property>
+ <property name="position">2</property>
</packing>
</child>
</widget>
diff --git a/src/gui/encoder.cs b/src/gui/encoder.cs
index c022a72..ecd583a 100644
--- a/src/gui/encoder.cs
+++ b/src/gui/encoder.cs
@@ -44,8 +44,8 @@ public partial class ChronoJumpWindow
[Widget] Gtk.Image image_encoder_capture;
[Widget] Gtk.TreeView treeview_encoder_curves;
[Widget] Gtk.ProgressBar encoder_pulsebar_capture;
- [Widget] Gtk.Label label_encoder_capture_comment;
- [Widget] Gtk.Entry entry_encoder_capture_comment;
+ [Widget] Gtk.Entry entry_encoder_signal_comment;
+ [Widget] Gtk.Entry entry_encoder_curve_comment;
[Widget] Gtk.Button button_encoder_delete_curve;
[Widget] Gtk.Button button_encoder_save_curve;
[Widget] Gtk.Button button_encoder_save_all_curves;
@@ -482,9 +482,7 @@ public partial class ChronoJumpWindow
} else //mode == "signal"
signalOrCurve = "signal";
- string desc = Util.RemoveTildeAndColonAndDot(entry_encoder_capture_comment.Text.ToString());
- //Log.WriteLine(desc);
-
+ string desc = "";
if(mode == "curve" || mode == "allCurves") {
EncoderCurve curve = treeviewEncoderCurvesGetCurve(selectedID,true);
@@ -496,6 +494,8 @@ public partial class ChronoJumpWindow
EncoderCurve curveNext = treeviewEncoderCurvesGetCurve(selectedID+1,false);
duration += Convert.ToInt32(decimal.Truncate(Convert.ToDecimal(curveNext.Duration)));
}
+
+ desc = Util.RemoveTildeAndColonAndDot(entry_encoder_curve_comment.Text.ToString());
Log.WriteLine(curveStart + "->" + duration);
int curveIDMax = Sqlite.Max(Constants.EncoderTable, "uniqueID", false);
@@ -504,6 +504,8 @@ public partial class ChronoJumpWindow
currentPerson.Name, encoderTimeStamp, curveIDMax);
path = Util.GetEncoderSessionDataCurveDir(currentSession.UniqueID);
} else { //signal
+ desc = Util.RemoveTildeAndColonAndDot(entry_encoder_signal_comment.Text.ToString());
+
fileSaved = Util.CopyTempToEncoderData (currentSession.UniqueID, currentPerson.UniqueID,
currentPerson.Name, encoderTimeStamp);
path = Util.GetEncoderSessionDataSignalDir(currentSession.UniqueID);
@@ -1355,10 +1357,10 @@ public partial class ChronoJumpWindow
//c0 button_encoder_capture
//c1 button_encoder_recalculate
//c2 button_encoder_load_signal
- //c3 button_encoder_save_all_curves , button_encoder_update_signal, button_encoder_delete_signal,
- // label_encoder_capture_comment , entry_encoder_capture_comment,
+ //c3 button_encoder_save_all_curves , button_encoder_update_signal,
+ // button_encoder_delete_signal, entry_encoder_signal_comment,
// and images: image_encoder_capture , image_encoder_analyze.Sensitive
- //c4 button_encoder_delete_curve , button_encoder_save_curve
+ //c4 button_encoder_delete_curve , button_encoder_save_curve, entry_encoder_curve_comment
//c5 button_encoder_analyze
//c6 button_encoder_analyze_data_show_user_curves
//c7 button_cancel (on capture and analyze)
@@ -1410,13 +1412,13 @@ public partial class ChronoJumpWindow
button_encoder_save_all_curves.Sensitive = Util.IntToBool(table[3]);
button_encoder_update_signal.Sensitive = Util.IntToBool(table[3]);
button_encoder_delete_signal.Sensitive = Util.IntToBool(table[3]);
- label_encoder_capture_comment.Sensitive = Util.IntToBool(table[3]);
- entry_encoder_capture_comment.Sensitive = Util.IntToBool(table[3]);
+ entry_encoder_signal_comment.Sensitive = Util.IntToBool(table[3]);
image_encoder_capture.Sensitive = Util.IntToBool(table[3]);
image_encoder_analyze.Sensitive = Util.IntToBool(table[3]);
button_encoder_delete_curve.Sensitive = Util.IntToBool(table[4]);
button_encoder_save_curve.Sensitive = Util.IntToBool(table[4]);
+ entry_encoder_curve_comment.Sensitive = Util.IntToBool(table[3]);
bool signal = radiobutton_encoder_analyze_data_current_signal.Active;
button_encoder_analyze.Sensitive =
diff --git a/src/gui/jump.cs b/src/gui/jump.cs
index 30197d7..e5c06b4 100644
--- a/src/gui/jump.cs
+++ b/src/gui/jump.cs
@@ -752,7 +752,7 @@ public class RepairJumpRjWindow
}
//save it deleting the old first for having the same uniqueID
- SqliteJump.Delete("jumpRj", jumpRj.UniqueID);
+ Sqlite.Delete(Constants.JumpRjTable, jumpRj.UniqueID);
jumpRj.InsertAtDB(false, Constants.JumpRjTable);
/*
SqliteJump.InsertRj("jumpRj", jumpRj.UniqueID.ToString(), jumpRj.PersonID, jumpRj.SessionID,
diff --git a/src/gui/run.cs b/src/gui/run.cs
index 6428526..c4bb771 100644
--- a/src/gui/run.cs
+++ b/src/gui/run.cs
@@ -841,7 +841,7 @@ public class RepairRunIntervalWindow
}
//save it deleting the old first for having the same uniqueID
- SqliteRun.Delete(Constants.RunIntervalTable, runInterval.UniqueID);
+ Sqlite.Delete(Constants.RunIntervalTable, runInterval.UniqueID);
runInterval.InsertAtDB(false, Constants.RunIntervalTable);
/*
SqliteRun.InsertInterval(false, Constants.RunIntervalTable, runInterval.UniqueID.ToString(),
diff --git a/src/sqlite/encoder.cs b/src/sqlite/encoder.cs
index df5f357..b316e1c 100644
--- a/src/sqlite/encoder.cs
+++ b/src/sqlite/encoder.cs
@@ -131,9 +131,9 @@ class SqliteEncoder : Sqlite
}
//pass uniqueID value and then will return one record. do like this:
- //EncoderSQL = (EncoderSQL) SqliteEncoder.Select(false, myYniqueID, 0, 0, "")[0];
+ //EncoderSQL eSQL = (EncoderSQL) SqliteEncoder.Select(false, myUniqueID, 0, 0, "")[0];
//or
- //pass uniqueID==-1 and personID, sessioID, signalOrCurve values, and will return some records
+ //pass uniqueID==-1 and personID, sessionID, signalOrCurve values, and will return some records
public static ArrayList Select (bool dbconOpened,
int uniqueID, int personID, int sessionID, string signalOrCurve)
{