projects
/
lttv.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
ifdef for EXTRA_CHECK, and precalculate time_width_double
[lttv.git]
/
ltt
/
branches
/
poly
/
lttv
/
modules
/
gui
/
lttvwindow
/
lttvwindow
/
callbacks.c
diff --git
a/ltt/branches/poly/lttv/modules/gui/lttvwindow/lttvwindow/callbacks.c
b/ltt/branches/poly/lttv/modules/gui/lttvwindow/lttvwindow/callbacks.c
index e0e677fceb3db170f724b80d2902ac6c29d95416..be473deafd31b25bfae1465e6d6fa251d475f22a 100644
(file)
--- a/
ltt/branches/poly/lttv/modules/gui/lttvwindow/lttvwindow/callbacks.c
+++ b/
ltt/branches/poly/lttv/modules/gui/lttvwindow/lttvwindow/callbacks.c
@@
-471,8
+471,7
@@
int SetTraceset(Tab * tab, LttvTraceset *traceset)
/* Set the tab's time window and current time if
* out of bounds */
if(ltt_time_compare(tab->time_window.start_time, time_span.start_time) < 0
/* Set the tab's time window and current time if
* out of bounds */
if(ltt_time_compare(tab->time_window.start_time, time_span.start_time) < 0
- || ltt_time_compare( ltt_time_add(tab->time_window.start_time,
- tab->time_window.time_width),
+ || ltt_time_compare(tab->time_window.end_time,
time_span.end_time) > 0) {
new_time_window.start_time = time_span.start_time;
time_span.end_time) > 0) {
new_time_window.start_time = time_span.start_time;
@@
-486,6
+485,9
@@
int SetTraceset(Tab * tab, LttvTraceset *traceset)
tmp_time.tv_sec = time_span.end_time.tv_sec;
tmp_time.tv_nsec = 0;
new_time_window.time_width = tmp_time ;
tmp_time.tv_sec = time_span.end_time.tv_sec;
tmp_time.tv_nsec = 0;
new_time_window.time_width = tmp_time ;
+ new_time_window.time_width_double = ltt_time_to_double(tmp_time);
+ new_time_window.end_time = ltt_time_add(new_time_window.start_time,
+ new_time_window.time_width) ;
}
time_change_manager(tab, new_time_window);
current_time_change_manager(tab, new_current_time);
}
time_change_manager(tab, new_time_window);
current_time_change_manager(tab, new_current_time);
@@
-2283,31
+2285,46
@@
void zoom(GtkWidget * widget, double size)
if(size == 0){
new_time_window.start_time = time_span.start_time;
new_time_window.time_width = time_delta;
if(size == 0){
new_time_window.start_time = time_span.start_time;
new_time_window.time_width = time_delta;
+ new_time_window.time_width_double = ltt_time_to_double(time_delta);
+ new_time_window.end_time = ltt_time_add(new_time_window.start_time,
+ new_time_window.time_width) ;
}else{
new_time_window.time_width = ltt_time_div(new_time_window.time_width, size);
}else{
new_time_window.time_width = ltt_time_div(new_time_window.time_width, size);
+ new_time_window.time_width_double =
+ ltt_time_to_double(new_time_window.time_width);
if(ltt_time_compare(new_time_window.time_width,time_delta) > 0)
{ /* Case where zoom out is bigger than trace length */
new_time_window.start_time = time_span.start_time;
new_time_window.time_width = time_delta;
if(ltt_time_compare(new_time_window.time_width,time_delta) > 0)
{ /* Case where zoom out is bigger than trace length */
new_time_window.start_time = time_span.start_time;
new_time_window.time_width = time_delta;
+ new_time_window.time_width_double = ltt_time_to_double(time_delta);
+ new_time_window.end_time = ltt_time_add(new_time_window.start_time,
+ new_time_window.time_width) ;
}
else
{
/* Center the image on the current time */
new_time_window.start_time =
}
else
{
/* Center the image on the current time */
new_time_window.start_time =
- ltt_time_sub(current_time, ltt_time_div(new_time_window.time_width, 2.0));
+ ltt_time_sub(current_time,
+ ltt_time_from_double(new_time_window.time_width_double/2.0));
+ new_time_window.end_time = ltt_time_add(new_time_window.start_time,
+ new_time_window.time_width) ;
/* If on borders, don't fall off */
if(ltt_time_compare(new_time_window.start_time, time_span.start_time) <0)
{
new_time_window.start_time = time_span.start_time;
/* If on borders, don't fall off */
if(ltt_time_compare(new_time_window.start_time, time_span.start_time) <0)
{
new_time_window.start_time = time_span.start_time;
+ new_time_window.end_time = ltt_time_add(new_time_window.start_time,
+ new_time_window.time_width) ;
}
else
{
}
else
{
- if(ltt_time_compare(
- ltt_time_add(new_time_window.start_time, new_time_window.time_width),
- time_span.end_time) > 0)
+ if(ltt_time_compare(new_time_window.end_time,
+ time_span.end_time) > 0)
{
new_time_window.start_time =
ltt_time_sub(time_span.end_time, new_time_window.time_width);
{
new_time_window.start_time =
ltt_time_sub(time_span.end_time, new_time_window.time_width);
+
+ new_time_window.end_time = ltt_time_add(new_time_window.start_time,
+ new_time_window.time_width) ;
}
}
}
}
@@
-3432,8
+3449,7
@@
void time_change_manager (Tab *tab,
LttvTracesetContext *tsc = LTTV_TRACESET_CONTEXT(tab->traceset_info->traceset_context);
TimeInterval time_span = tsc->time_span;
LttTime start_time = new_time_window.start_time;
LttvTracesetContext *tsc = LTTV_TRACESET_CONTEXT(tab->traceset_info->traceset_context);
TimeInterval time_span = tsc->time_span;
LttTime start_time = new_time_window.start_time;
- LttTime end_time = ltt_time_add(new_time_window.start_time,
- new_time_window.time_width);
+ LttTime end_time = new_time_window.end_time;
/* Set scrollbar */
GtkAdjustment *adjustment = gtk_range_get_adjustment(GTK_RANGE(tab->scrollbar));
/* Set scrollbar */
GtkAdjustment *adjustment = gtk_range_get_adjustment(GTK_RANGE(tab->scrollbar));
@@
-3456,13
+3472,13
@@
void time_change_manager (Tab *tab,
"upper",
ltt_time_to_double(upper), /* upper */
"step_increment",
"upper",
ltt_time_to_double(upper), /* upper */
"step_increment",
- ltt_time_to_double(new_time_window.time_width)
+ new_time_window.time_width_double
/ SCROLL_STEP_PER_PAGE, /* step increment */
"page_increment",
/ SCROLL_STEP_PER_PAGE, /* step increment */
"page_increment",
-
ltt_time_to_double(new_time_window.time_width)
,
+
new_time_window.time_width_double
,
/* page increment */
"page_size",
/* page increment */
"page_size",
-
ltt_time_to_double(new_time_window.time_width)
, /* page size */
+
new_time_window.time_width_double
, /* page size */
NULL);
gtk_adjustment_changed(adjustment);
NULL);
gtk_adjustment_changed(adjustment);
@@
-3567,8
+3583,7
@@
on_MEntry1_value_changed (GtkSpinButton *spinbutton,
TimeWindow new_time_window = tab->time_window;
TimeWindow new_time_window = tab->time_window;
- LttTime end_time = ltt_time_add(new_time_window.start_time,
- new_time_window.time_width);
+ LttTime end_time = new_time_window.end_time;
new_time_window.start_time.tv_sec = value;
new_time_window.start_time.tv_sec = value;
@@
-3589,19
+3604,21
@@
on_MEntry1_value_changed (GtkSpinButton *spinbutton,
new_time_window.start_time.tv_nsec = time_span.end_time.tv_nsec-1;
}
new_time_window.start_time.tv_nsec = time_span.end_time.tv_nsec-1;
}
- /* check if end time selected is below or equal */
if(ltt_time_compare(new_time_window.start_time, end_time) >= 0) {
/* Then, we must push back end time : keep the same time width
* if possible, else end traceset time */
if(ltt_time_compare(new_time_window.start_time, end_time) >= 0) {
/* Then, we must push back end time : keep the same time width
* if possible, else end traceset time */
- end_time = LTT_TIME_MIN(time_span.end_time,
- ltt_time_add(new_time_window.start_time,
- new_time_window.time_width)
- );
+ end_time = LTT_TIME_MIN(ltt_time_add(new_time_window.start_time,
+ new_time_window.time_width),
+ time_span.end_time);
}
/* Fix the time width to fit start time and end time */
new_time_window.time_width = ltt_time_sub(end_time,
new_time_window.start_time);
}
/* Fix the time width to fit start time and end time */
new_time_window.time_width = ltt_time_sub(end_time,
new_time_window.start_time);
+ new_time_window.time_width_double =
+ ltt_time_to_double(new_time_window.time_width);
+
+ new_time_window.end_time = end_time;
time_change_manager(tab, new_time_window);
time_change_manager(tab, new_time_window);
@@
-3619,24
+3636,25
@@
on_MEntry2_value_changed (GtkSpinButton *spinbutton,
TimeWindow new_time_window = tab->time_window;
TimeWindow new_time_window = tab->time_window;
- LttTime end_time = ltt_time_add(new_time_window.start_time,
- new_time_window.time_width);
+ LttTime end_time = new_time_window.end_time;
new_time_window.start_time.tv_nsec = value;
new_time_window.start_time.tv_nsec = value;
- /* check if end time selected is below or equal */
if(ltt_time_compare(new_time_window.start_time, end_time) >= 0) {
/* Then, we must push back end time : keep the same time width
* if possible, else end traceset time */
if(ltt_time_compare(new_time_window.start_time, end_time) >= 0) {
/* Then, we must push back end time : keep the same time width
* if possible, else end traceset time */
- end_time = LTT_TIME_MIN(time_span.end_time,
- ltt_time_add(new_time_window.start_time,
- new_time_window.time_width)
- );
+ end_time = LTT_TIME_MIN(ltt_time_add(new_time_window.start_time,
+ new_time_window.time_width),
+ time_span.end_time);
}
/* Fix the time width to fit start time and end time */
new_time_window.time_width = ltt_time_sub(end_time,
new_time_window.start_time);
}
/* Fix the time width to fit start time and end time */
new_time_window.time_width = ltt_time_sub(end_time,
new_time_window.start_time);
+ new_time_window.time_width_double =
+ ltt_time_to_double(new_time_window.time_width);
+
+ new_time_window.end_time = end_time;
time_change_manager(tab, new_time_window);
time_change_manager(tab, new_time_window);
@@
-3654,8
+3672,8
@@
on_MEntry3_value_changed (GtkSpinButton *spinbutton,
TimeWindow new_time_window = tab->time_window;
TimeWindow new_time_window = tab->time_window;
- LttTime end_time =
ltt_time_add(new_time_window.start_time,
- new_time_window.time_width);
+ LttTime end_time =
new_time_window.end_time;
+
end_time.tv_sec = value;
/* end nanoseconds */
end_time.tv_sec = value;
/* end nanoseconds */
@@
-3675,20
+3693,23
@@
on_MEntry3_value_changed (GtkSpinButton *spinbutton,
end_time.tv_nsec = time_span.end_time.tv_nsec;
}
end_time.tv_nsec = time_span.end_time.tv_nsec;
}
- /* check if end time selected is below or equal */
if(ltt_time_compare(new_time_window.start_time, end_time) >= 0) {
/* Then, we must push front start time : keep the same time width
* if possible, else end traceset time */
if(ltt_time_compare(new_time_window.start_time, end_time) >= 0) {
/* Then, we must push front start time : keep the same time width
* if possible, else end traceset time */
- new_time_window.start_time = LTT_TIME_MAX(
time_span.start_time,
-
ltt_time_sub(end_time,
- new_time_window.time_width)
-
);
+ new_time_window.start_time = LTT_TIME_MAX(
+ ltt_time_sub(end_time,
+ new_time_window.time_width),
+
time_span.start_time
);
}
/* Fix the time width to fit start time and end time */
new_time_window.time_width = ltt_time_sub(end_time,
new_time_window.start_time);
}
/* Fix the time width to fit start time and end time */
new_time_window.time_width = ltt_time_sub(end_time,
new_time_window.start_time);
+ new_time_window.time_width_double =
+ ltt_time_to_double(new_time_window.time_width);
+ new_time_window.end_time = end_time;
+
time_change_manager(tab, new_time_window);
}
time_change_manager(tab, new_time_window);
}
@@
-3705,23
+3726,25
@@
on_MEntry4_value_changed (GtkSpinButton *spinbutton,
TimeWindow new_time_window = tab->time_window;
TimeWindow new_time_window = tab->time_window;
- LttTime end_time =
ltt_time_add(new_time_window.start_time,
- new_time_window.time_width);
+ LttTime end_time =
new_time_window.end_time;
+
end_time.tv_nsec = value;
end_time.tv_nsec = value;
- /* check if end time selected is below or equal */
if(ltt_time_compare(new_time_window.start_time, end_time) >= 0) {
/* Then, we must push front start time : keep the same time width
* if possible, else end traceset time */
if(ltt_time_compare(new_time_window.start_time, end_time) >= 0) {
/* Then, we must push front start time : keep the same time width
* if possible, else end traceset time */
- new_time_window.start_time = LTT_TIME_MAX(
time_span.start_time,
-
ltt_time_sub(end_time,
- new_time_window.time_width)
-
);
+ new_time_window.start_time = LTT_TIME_MAX(
+ ltt_time_sub(end_time,
+ new_time_window.time_width),
+
time_span.start_time
);
}
/* Fix the time width to fit start time and end time */
new_time_window.time_width = ltt_time_sub(end_time,
new_time_window.start_time);
}
/* Fix the time width to fit start time and end time */
new_time_window.time_width = ltt_time_sub(end_time,
new_time_window.start_time);
+ new_time_window.time_width_double =
+ ltt_time_to_double(new_time_window.time_width);
+ new_time_window.end_time = end_time;
time_change_manager(tab, new_time_window);
time_change_manager(tab, new_time_window);
@@
-3847,6
+3870,12
@@
void scroll_value_changed_cb(GtkWidget *scrollbar,
new_time_window.time_width =
ltt_time_from_double(page_size);
new_time_window.time_width =
ltt_time_from_double(page_size);
+ new_time_window.time_width_double =
+ page_size;
+
+ new_time_window.end_time = ltt_time_add(new_time_window.start_time,
+ new_time_window.time_width);
+
time_change_manager(tab, new_time_window);
#if 0
time_change_manager(tab, new_time_window);
#if 0
This page took
0.025716 seconds
and
4
git commands to generate.