From 68de64c0cb3722aee858ac36f7635c8f2dfe5c55 Mon Sep 17 00:00:00 2001 From: ana Date: Wed, 28 Dec 2011 13:27:56 +0000 Subject: [PATCH] Implementation of the "0021387: [CEA 511] Plot2d Normalize Plot2d view" issue. --- src/Plot2d/resources/Plot2d_images.ts | 16 ++++ src/Plot2d/resources/Plot2d_msg_en.ts | 72 ++++++++++++++++++ .../resources/plot2d_lmax_normalization.png | Bin 0 -> 288 bytes .../resources/plot2d_lmin_normalization.png | Bin 0 -> 285 bytes .../resources/plot2d_rmax_normalization.png | Bin 0 -> 264 bytes .../resources/plot2d_rmin_normalization.png | Bin 0 -> 254 bytes 6 files changed, 88 insertions(+) create mode 100755 src/Plot2d/resources/plot2d_lmax_normalization.png create mode 100755 src/Plot2d/resources/plot2d_lmin_normalization.png create mode 100755 src/Plot2d/resources/plot2d_rmax_normalization.png create mode 100755 src/Plot2d/resources/plot2d_rmin_normalization.png diff --git a/src/Plot2d/resources/Plot2d_images.ts b/src/Plot2d/resources/Plot2d_images.ts index 3c39ca19d..5841ec8a0 100644 --- a/src/Plot2d/resources/Plot2d_images.ts +++ b/src/Plot2d/resources/Plot2d_images.ts @@ -51,6 +51,22 @@ ICON_PLOT2D_MODE_LOGARITHMIC_VER plot2d_log_y.png + + ICON_PLOT2D_NORMALIZE_MODE_LMIN + plot2d_lmin_normalization.png + + + ICON_PLOT2D_NORMALIZE_MODE_LMAX + plot2d_lmax_normalization.png + + + ICON_PLOT2D_NORMALIZE_MODE_RMIN + plot2d_rmin_normalization.png + + + ICON_PLOT2D_NORMALIZE_MODE_RMAX + plot2d_rmax_normalization.png + ICON_PLOT2D_SETTINGS plot2d_settings.png diff --git a/src/Plot2d/resources/Plot2d_msg_en.ts b/src/Plot2d/resources/Plot2d_msg_en.ts index 6b16abd6f..d312ff17d 100644 --- a/src/Plot2d/resources/Plot2d_msg_en.ts +++ b/src/Plot2d/resources/Plot2d_msg_en.ts @@ -27,6 +27,26 @@ PLOT2D_SCALE_MODE_HOR Horizontal axis: + + PLOT2D_NORMALIZE_TLT + Normalization + + + PLOT2D_NORMALIZE_MODE_MIN + Normalize to minimum + + + PLOT2D_NORMALIZE_MODE_MAX + Normalize to maximum + + + PLOT2D_NORMALIZE_LEFT_AXIS + Left Y Axis: + + + PLOT2D_NORMALIZE_RIGHT_AXIS + Right Y Axis: + PLOT2D_SCALE_MODE_VER Vertical axis: @@ -71,6 +91,10 @@ CURVE_TYPE_POPUP Curve type + + NORMALIZATION_TYPE_POPUP + Normalization + TOT_PLOT2D_MODE_LINEAR_VER Vertical axis: linear @@ -207,6 +231,22 @@ TOT_PLOT2D_ANALITIC_CURVES Analytic curves + + TOT_PLOT2D_NORMALIZE_MODE_LMAX + Left Y Axis: Normalize to maximum + + + TOT_PLOT2D_NORMALIZE_MODE_LMIN + Left Y Axis: Normalize to global minimum + + + TOT_PLOT2D_NORMALIZE_MODE_RMAX + Right Y Axis: Normalize to maximum + + + TOT_PLOT2D_NORMALIZE_MODE_RMIN + Right Y Axis: Normalize to global minimum + PLOT2D_CURVE_TYPE_LINES Lines @@ -357,6 +397,22 @@ Logarithmic scale for ordinate axis is not allowed. PRP_PLOT2D_ANALITIC_CURVES Setups analytic curves properties + + PRP_PLOT2D_NORMALIZE_MODE_LMAX + Switches view to maximum normalization mode by left Y axis + + + PRP_PLOT2D_NORMALIZE_MODE_LMIN + Switches view to minimum normalization mode by left Y axis + + + PRP_PLOT2D_NORMALIZE_MODE_RMAX + Switches view to maximum normalization mode by right Y axis + + + PRP_PLOT2D_NORMALIZE_MODE_RMIN + Switches view to minimum normalization mode by right Y axis + PRP_PLOT2D_SETTINGS Setups view properties @@ -397,6 +453,22 @@ Logarithmic scale for ordinate axis is not allowed. MEN_PLOT2D_MODE_LOGARITHMIC_VER Vertical Axis: Logarithmic + + MEN_PLOT2D_NORMALIZE_MODE_LMIN + Left Y Axis: Minimum + + + MEN_PLOT2D_NORMALIZE_MODE_LMAX + Left Y Axis: Maximum + + + MEN_PLOT2D_NORMALIZE_MODE_RMIN + Right Y Axis: Minimum + + + MEN_PLOT2D_NORMALIZE_MODE_RMAX + Right Y Axis: Maximum + PRP_PLOT2D_FITDATA Fits view to the given data range diff --git a/src/Plot2d/resources/plot2d_lmax_normalization.png b/src/Plot2d/resources/plot2d_lmax_normalization.png new file mode 100755 index 0000000000000000000000000000000000000000..0dfe5ee135a2eaf18d010dc10e5c26b52c7b988a GIT binary patch literal 288 zcmV+*0pI?KP)JLb4a4va+(W@R z=UZc{2mn-71>ic8orhvKCvFG*&;{sy0yxF?j=ezlLp;?5sG*^g-_^Xp)F!@KGSF7r zv<7DH695XSq~bNl_#JcD7nOGgM%XDAhe!kJyF5*k8HW*e0r+ZOpzki{C_1t@ME=Mz m=o1+rulb`FL(2LOWBLKqo@i)%g4Rp`0000YbXvvfRk{M^{pW0nzp)CJa2jaTs9QYTG}0bgvHo z5C?!|S&Gbpi9=5X0P{Sfy|-@i`F<7yNZ>S04&qB&4Z#Go)x`-o0F2|9G;FYNoCOZU zaA+(Q2Y|Y+0mLP3=PH6QRb~ASxZOEpjLRswi~!Ue38dcg6=h3StGZrt4thoo j*xZ^^8&mq}VpIA6)OKq`k~~M400000NkvXXu0mjfGVF0? literal 0 HcmV?d00001 diff --git a/src/Plot2d/resources/plot2d_rmax_normalization.png b/src/Plot2d/resources/plot2d_rmax_normalization.png new file mode 100755 index 0000000000000000000000000000000000000000..7cdbdcc7bfc5fe9bb21a1c6f154970dba39b93be GIT binary patch literal 264 zcmV+j0r&oiP)fluYAlCLzyxfC{7X1Idm;x zM_mGg3G7_bOY>?8rA+(Wdw(Ce0c!hkiU1TYOE5`0u#C_Ap7;H2aQDh}#~lU}u&(RL z!lR|N