diff --git a/uppsrc/ScatterDraw/ScatterDraw.cpp b/uppsrc/ScatterDraw/ScatterDraw.cpp index e1e3d4273..3b7c25e6c 100644 --- a/uppsrc/ScatterDraw/ScatterDraw.cpp +++ b/uppsrc/ScatterDraw/ScatterDraw.cpp @@ -1197,15 +1197,16 @@ int ScatterDraw::GetId(int index) { return series[index].id; } -void ScatterDraw::RemoveSeries(int index) { +bool ScatterDraw::RemoveSeries(int index) { ASSERT(IsValid(index)); ASSERT(!series[index].IsDeleted()); if (WhenRemoveSeries) if (!WhenRemoveSeries(index)) - return; + return false; series.Remove(index); Refresh(); + return true; } void ScatterDraw::RemoveAllSeries() { @@ -1213,7 +1214,7 @@ void ScatterDraw::RemoveAllSeries() { Refresh(); } -void ScatterDraw::SwapSeries(int i1, int i2) { +bool ScatterDraw::SwapSeries(int i1, int i2) { ASSERT(IsValid(i1)); ASSERT(!series[i1].IsDeleted()); ASSERT(IsValid(i2)); @@ -1221,9 +1222,10 @@ void ScatterDraw::SwapSeries(int i1, int i2) { if (WhenSwapSeries) if (!WhenSwapSeries(i1, i2)) - return; + return false; series.Swap(i1, i2); Refresh(); + return true; } Drawing ScatterDraw::GetDrawing() { diff --git a/uppsrc/ScatterDraw/ScatterDraw.h b/uppsrc/ScatterDraw/ScatterDraw.h index 7e30b6cba..09ed56e34 100644 --- a/uppsrc/ScatterDraw/ScatterDraw.h +++ b/uppsrc/ScatterDraw/ScatterDraw.h @@ -726,10 +726,10 @@ public: bool IsVisible(int index); ScatterDraw &ShowAll(bool show = true); - void RemoveSeries(int index); + bool RemoveSeries(int index); void RemoveAllSeries(); - void SwapSeries(int i1, int i2); + bool SwapSeries(int i1, int i2); ScatterDraw& Id(int id); ScatterDraw& Id(int index, int id); diff --git a/uppsrc/ScatterDraw/src.tpp/ScatterDraw_en-us.tpp b/uppsrc/ScatterDraw/src.tpp/ScatterDraw_en-us.tpp index d2da06f76..f6a30e943 100644 --- a/uppsrc/ScatterDraw/src.tpp/ScatterDraw_en-us.tpp +++ b/uppsrc/ScatterDraw/src.tpp/ScatterDraw_en-us.tpp @@ -1098,7 +1098,7 @@ ool]_[*@3 show]_`=_[@(0.0.255) true])&] If false, the opacity will be set to 0.&] [s1; &] [s6;%- &] -[s5;:ScatterDraw`:`:RemoveSeries`(int`):%- [@(0.0.255) void]_[* RemoveSeries]([@(0.0.255) i +[s5;:ScatterDraw`:`:RemoveSeries`(int`):%- [@(0.0.255) bool]_[* RemoveSeries]([@(0.0.255) i nt]_[*@3 index])&] [s3; Remove [%-*@3 index] data series from control. It does not delete the series data.&] @@ -1109,7 +1109,7 @@ the series data.&] series data.&] [s1;%- &] [s6;%- &] -[s5;:Upp`:`:ScatterDraw`:`:SwapSeries`(int`,int`):%- [@(0.0.255) void]_[* SwapSeries]([@(0.0.255) i +[s5;:Upp`:`:ScatterDraw`:`:SwapSeries`(int`,int`):%- [@(0.0.255) bool]_[* SwapSeries]([@(0.0.255) i nt]_[*@3 i1], [@(0.0.255) int]_[*@3 i2])&] [s3; Swaps the series [%-*@3 i1] with [%-*@3 i2].&] [s1; &] diff --git a/uppsrc/ScatterDraw/src.tpp/ScatterDraw_en-us.tppi b/uppsrc/ScatterDraw/src.tpp/ScatterDraw_en-us.tppi index dd545490f..b53ac5f66 100644 --- a/uppsrc/ScatterDraw/src.tpp/ScatterDraw_en-us.tppi +++ b/uppsrc/ScatterDraw/src.tpp/ScatterDraw_en-us.tppi @@ -582,9 +582,9 @@ COMPRESSED 89,254,250,131,224,239,1,242,123,31,48,255,62,21,190,243,69,243,191,137,204,227,97,209,91,44,253,49,62,63,136,237,27,103,70,127,193,187,254,225,64,239,67,252,238,31,206,40,111,139,253,207,255,245,231,255,250,150,196,63,30,16,189,28,66,60,159,50,63,204,249,112,236,106,189,241,206,250,253,189,75,253,145,142,223,92,31,63,153,152,127,107,153,252,51,72,253,150,8,254,167,16,126,89,65,79,231,218,31,91,141,143,203,239,233,156,251,163,203,239,17,234,23,20,255,158,70,121,58,252,254,113,28,236,143,227,96,255,68,28,216,246,158,161,246,136,193,155,123,151,207,89,206,143,109,255,2,224,119,108,106,62,166,65,127,14,246,130,209,211,6,25,112,23,176,133,66,120,213,151,221,47,191,254,249,175,155,127,123,127,234,200,237,79,107,153,43,245,243,191,149,191,254,249,72,223,78,94,15,187,119,231,174,47,77,95,62,117,127,211,116,197,237,67,247,15,7,228,247,157,195,112,186,125,167,61,108,211,32,188,125,118,123,113,100,173,87,71,108,139,63,243,161,68,246,71, 20,236,159,70,12,251,63,159,24,143,25,140,247,196,128,42,122,36,138,253,19,136,2,254,60,170,128,255,101,100,105,210,56,249,73,116,161,191,92,57,223,191,239,240,249,218,248,214,77,135,27,140,63,65,208,223,117,2,243,185,168,255,53,244,246,223,132,254,195,146,249,126,44,192,143,160,1,254,28,60,62,32,74,239,187,179,240,0,21,85,45,134,229,115,71,245,254,232,221,187,26,159,15,245,23,23,19,110,77,254,248,116,111,248,20,17,71,203,223,111,221,58,185,61,191,221,76,104,30,6,95,12,105,217,189,215,202,208,95,160,247,229,22,192,151,96,124,162,191,64,226,9,32,250,6,208,103,16,124,156,194,248,237,18,194,23,36,126,120,246,3,52,190,119,252,11,34,223,219,252,241,233,161,233,19,153,253,234,237,75,131,183,231,175,201,124,191,50,241,97,50,63,226,248,37,157,191,134,228,19,253,37,42,111,146,250,14,197,7,72,125,219,195,61,54,105,225,54,243,163,183,247,219,43,171,241,214,189,226,47,58,125,36,14,120,101,56,234,135,238,239,53,30,79,205,159, 12,200,111,111,59,248,183,27,2,11,83,23,221,251,120,71,192,11,111,187,109,15,157,159,183,138,170,91,54,93,223,134,237,139,154,123,206,113,189,231,55,222,38,142,220,188,13,63,107,248,160,71,190,108,89,46,239,110,211,186,237,87,45,238,122,102,121,119,203,197,27,220,238,221,249,100,95,177,229,125,118,252,89,226,191,205,158,55,24,240,30,90,231,238,178,0,221,32,8,131,159,77,232,151,201,223,71,239,15,17,80,123,202,47,248,152,100,191,116,251,65,217,126,206,107,120,38,174,92,215,85,251,64,168,47,248,243,203,175,175,2,134,151,142,63,36,231,47,249,20,111,51,224,39,9,240,183,248,245,6,127,127,152,93,63,32,241,223,98,219,63,139,49,239,93,20,255,83,185,194,182,95,219,134,111,251,108,159,183,254,96,232,255,102,216,252,66,212,71,181,242,133,15,243,109,97,210,194,75,31,150,93,234,230,214,187,23,254,171,62,63,188,234,159,70,120,127,68,244,220,227,7,214,251,75,239,155,68,221,252,223,219,145,199,227,193,211,221,179,173,154,135,246,81,149,231, -213,120,59,93,122,217,40,250,64,97,140,215,212,252,224,186,252,38,85,127,54,221,30,68,253,93,43,242,191,128,110,104,158,255,29,210,45,221,255,201,212,187,81,225,145,100,55,2,252,215,208,140,126,99,229,126,191,50,193,123,215,236,251,20,206,29,165,255,106,193,249,146,8,31,160,192,183,176,252,207,94,27,239,136,59,150,144,251,157,154,249,86,20,227,7,245,241,15,215,222,72,187,231,114,36,79,231,177,183,237,131,111,75,203,66,188,205,75,208,240,219,103,29,159,235,116,132,221,253,8,247,253,219,215,15,103,187,127,109,120,31,27,254,236,37,240,132,192,253,46,68,184,248,25,205,237,230,81,249,110,12,110,172,251,184,226,123,232,244,79,40,168,242,13,166,190,210,124,255,4,46,170,97,81,13,225,83,230,197,155,140,124,22,245,215,109,223,203,203,91,143,239,176,240,158,66,240,120,201,126,193,172,251,20,84,225,195,189,178,32,204,195,46,124,125,40,121,235,247,33,172,22,54,61,33,246,151,88,61,183,125,173,165,238,192,63,235,152,191,7,242,27,58,231,237,68, -24,109,116,235,215,252,248,237,251,76,121,105,254,77,150,108,190,153,161,155,130,47,27,71,203,56,111,101,61,44,189,63,203,185,93,186,188,223,80,176,133,27,191,81,23,228,254,248,143,79,247,127,158,12,197,195,143,55,47,127,182,15,227,62,92,223,119,111,251,167,15,93,223,173,205,217,207,18,15,62,118,208,192,126,251,208,237,219,121,19,203,171,167,154,3,175,204,218,43,41,122,175,142,13,62,114,255,250,99,208,191,97,155,222,141,219,247,212,242,7,164,227,91,249,32,143,112,220,197,226,7,242,60,150,224,243,123,198,240,99,135,50,183,172,131,23,1,126,124,242,199,167,199,63,94,159,6,220,126,190,41,191,79,69,68,30,27,189,243,2,201,237,38,15,54,63,148,142,250,60,235,235,219,55,127,30,219,127,239,2,222,247,142,230,31,110,85,44,180,187,215,194,120,206,171,253,253,150,180,246,72,192,238,225,236,251,253,52,180,63,136,131,253,215,56,204,111,225,96,127,15,133,249,239,161,0,126,20,7,240,7,145,248,250,194,209,63,3,31,235,14,27,54,27,183,177, -223,45,91,175,59,253,168,128,61,32,241,140,211,207,17,176,31,193,198,126,39,54,111,115,201,254,30,54,127,131,55,154,187,56,34,173,24,118,110,148,230,207,117,198,252,196,109,254,252,223,223,200,16,121,241,3,62,235,251,246,49,210,235,71,247,65,31,177,188,247,248,86,246,8,112,131,119,105,246,11,120,184,189,4,128,95,55,159,204,69,171,86,99,251,148,93,114,155,251,115,85,119,179,210,139,219,112,111,245,169,120,4,234,85,238,235,125,198,15,148,36,73,203,91,125,165,159,88,162,225,54,220,119,165,248,59,119,223,30,206,132,254,252,215,55,210,101,95,36,250,245,53,132,175,106,166,62,21,39,122,40,87,243,42,34,120,216,190,253,243,95,55,191,125,170,202,124,126,53,222,245,169,190,212,115,68,252,180,169,74,94,250,37,26,126,216,31,94,48,187,23,208,249,229,189,201,96,247,242,11,211,79,37,238,195,112,255,5,196,125,170,195,249,79,35,174,59,125,156,184,143,12,249,137,162,251,87,165,188,254,199,200,238,123,165,243,231,18,240,113,188,255,27,228,243,93, -4,164,150,0,196,72,195,241,221,123,227,111,211,237,121,152,159,157,105,245,136,108,85,134,15,187,120,183,171,39,75,200,215,220,178,17,31,44,236,211,214,70,176,64,87,254,219,39,253,110,129,159,205,238,253,20,234,161,231,83,195,27,181,23,147,212,44,49,226,211,14,202,235,93,194,167,92,199,110,172,30,171,190,61,159,79,149,15,231,89,75,39,47,141,239,157,238,91,50,55,126,62,240,160,124,8,134,239,111,23,179,150,230,191,61,0,80,213,247,59,50,254,18,155,186,190,31,230,203,228,183,178,148,139,49,44,227,5,187,215,182,177,9,163,38,108,147,247,123,56,175,56,248,253,205,214,87,60,250,214,110,218,115,147,251,189,31,239,70,134,5,195,143,100,73,221,19,67,223,130,228,85,212,118,111,243,118,48,244,82,149,235,113,159,33,175,220,224,3,133,146,217,150,44,234,219,69,152,239,238,56,222,219,124,55,43,171,121,200,173,42,171,143,22,155,151,170,99,94,117,239,169,73,253,176,97,248,208,254,5,22,237,97,131,238,225,202,212,109,7,240,105,139,250,17,142, -79,76,53,222,242,192,30,117,70,115,151,169,15,150,81,214,58,215,191,87,223,255,208,206,230,67,167,111,175,239,199,247,239,93,227,143,205,95,239,111,126,177,163,127,43,19,245,197,193,206,99,175,119,226,41,85,162,219,100,31,225,197,173,253,95,240,98,161,121,246,82,37,242,115,126,60,66,250,6,75,222,113,166,176,172,254,236,113,183,252,185,8,196,103,73,99,239,102,212,109,160,143,108,236,124,102,193,22,125,229,103,101,216,182,15,183,125,223,204,231,122,202,43,91,254,126,203,196,125,126,246,251,248,240,101,220,215,246,239,97,144,119,203,237,3,137,126,54,117,254,14,254,55,113,151,250,60,255,214,93,153,123,154,230,207,35,193,237,204,236,13,65,249,151,47,136,241,47,223,217,18,126,30,226,71,68,228,49,167,240,61,68,122,73,63,124,37,38,244,207,18,147,251,146,250,253,247,255,3,143,83,107,197, +213,120,59,93,122,217,40,250,64,97,140,215,212,252,224,186,252,38,85,127,54,221,30,68,253,93,43,242,191,128,110,104,158,255,29,210,45,221,255,201,212,187,81,225,145,100,55,2,252,215,208,140,126,99,229,126,191,50,193,123,215,236,251,20,206,29,165,255,106,193,249,146,8,31,160,192,183,176,252,207,94,27,239,136,59,150,144,251,157,154,249,86,20,227,7,245,241,15,215,222,72,187,231,114,36,79,231,177,183,237,131,111,75,203,66,188,205,75,208,240,219,103,29,159,235,116,132,221,253,8,247,253,219,215,15,103,187,127,109,120,31,27,254,236,37,240,132,192,253,46,68,184,248,25,205,237,230,81,249,110,12,110,172,251,184,226,123,232,244,79,40,168,242,13,166,190,210,124,255,4,46,170,97,81,13,225,83,230,197,247,25,249,186,237,123,121,121,235,241,29,22,222,83,8,30,47,217,47,152,117,159,130,42,124,184,87,22,132,121,216,133,175,15,37,111,253,62,132,213,194,166,39,196,190,179,128,191,104,251,90,75,221,129,127,214,49,127,15,228,55,116,206,219,137,48,218, +232,214,175,249,241,219,247,153,242,210,252,155,44,217,124,51,67,55,5,95,54,142,150,113,222,202,122,88,122,127,150,115,187,116,121,191,161,96,11,55,126,163,46,200,253,241,31,159,238,255,60,25,138,135,31,111,94,254,108,31,198,125,184,190,239,222,246,79,31,186,190,91,155,179,159,37,30,124,236,160,129,253,246,161,219,183,243,38,150,87,79,53,7,94,153,181,87,82,244,94,29,27,124,228,254,245,199,160,127,195,54,189,27,183,239,169,229,15,72,199,183,242,65,30,225,184,139,197,15,228,121,44,193,231,247,140,225,199,14,101,110,89,7,47,2,252,248,228,143,79,143,127,188,62,13,184,253,124,83,126,159,138,136,60,54,122,231,5,146,219,77,30,108,126,40,29,245,121,214,215,183,111,254,60,182,255,222,5,188,239,29,205,63,220,170,88,104,119,175,133,241,156,87,251,251,45,105,237,145,128,221,195,217,247,251,105,104,127,16,7,251,175,113,152,223,194,193,254,30,10,243,223,67,1,252,40,14,224,15,34,241,245,133,163,127,6,62,214,29,54,108,54,110,99,191,91, +182,94,119,250,81,1,123,64,226,25,167,159,35,96,63,130,141,253,78,108,222,230,146,253,61,108,254,6,111,52,119,113,68,90,49,236,220,40,205,159,235,140,249,137,219,252,249,191,191,145,33,242,18,135,124,214,247,237,99,164,215,143,238,131,62,98,121,239,241,173,236,17,224,6,239,210,236,23,240,112,123,9,0,191,110,62,153,139,86,173,198,246,41,187,228,54,247,231,170,238,102,165,23,183,225,222,234,83,241,8,212,171,220,215,251,140,31,40,73,146,150,183,250,74,63,177,68,195,109,184,239,74,241,119,238,190,61,156,9,253,249,175,111,164,203,190,72,244,235,107,8,95,213,76,125,42,78,244,80,174,230,85,68,240,176,125,251,231,191,110,126,251,84,149,249,252,106,188,235,83,125,169,231,136,248,105,83,149,188,244,75,52,252,176,63,188,96,118,47,160,243,203,123,147,193,238,229,23,166,159,74,220,135,225,254,11,136,251,84,135,243,159,70,92,119,250,56,113,31,25,242,19,69,247,175,74,121,253,143,145,221,247,74,231,207,37,224,227,120,255,55,200,231,187,8,72, +45,1,136,145,134,227,187,247,198,223,166,219,243,48,63,59,211,234,17,217,170,12,31,118,241,110,87,79,150,144,175,185,101,35,62,88,216,167,173,141,96,129,174,252,183,79,250,221,2,63,155,221,251,41,212,67,207,167,134,55,106,47,38,169,89,98,196,167,29,148,215,187,132,79,185,142,221,88,61,86,125,123,62,159,42,31,206,179,150,78,94,26,223,59,221,183,100,110,252,124,224,65,249,16,12,223,223,46,102,45,205,127,123,0,160,170,239,119,100,252,37,54,117,125,63,204,151,201,111,101,41,23,99,88,198,11,118,175,109,99,19,70,77,216,38,239,247,112,94,113,240,251,155,173,175,120,244,173,221,180,231,38,247,123,63,222,141,12,11,134,31,201,146,186,39,134,190,5,201,171,168,237,222,230,237,96,232,165,42,215,227,62,67,94,185,193,7,10,37,179,45,89,212,183,139,48,223,221,113,188,183,249,110,86,86,243,144,91,85,86,31,45,54,47,85,199,188,234,222,83,147,250,97,195,240,161,253,11,44,218,195,6,221,195,149,169,219,14,224,211,22,245,35,28,159,152, +106,188,229,129,61,234,140,230,46,83,31,44,163,172,117,174,127,175,190,255,161,157,205,135,78,223,94,223,143,239,223,187,198,31,155,191,222,223,252,98,71,255,86,38,234,139,131,157,199,94,239,196,83,170,68,183,201,62,194,139,91,251,191,224,197,66,243,236,165,74,228,231,252,120,132,244,13,150,188,227,76,97,89,253,217,227,110,249,115,17,136,207,146,198,222,205,168,219,64,31,217,216,249,204,130,45,250,202,207,202,176,109,31,110,251,190,153,207,245,148,87,182,252,253,150,137,251,252,236,247,241,225,203,184,175,237,223,195,32,239,150,219,7,18,253,108,234,252,29,252,111,226,46,245,121,254,173,187,50,247,52,205,159,71,130,219,153,217,27,130,242,47,95,16,227,95,190,179,163,253,60,196,143,136,200,99,78,225,123,136,244,146,126,248,74,76,232,159,37,38,247,37,245,251,239,255,7,114,146,107,185,