diff --git a/src/Python/SIP/Bindings.cpp b/src/Python/SIP/Bindings.cpp index de5366bf6..dc733252e 100644 --- a/src/Python/SIP/Bindings.cpp +++ b/src/Python/SIP/Bindings.cpp @@ -1569,6 +1569,61 @@ Bindings::createXDataSeries(QString name, QString series, QString seriesUnit, Py return true; } +bool +Bindings::deleteXDataSeries(QString name, QString series, PyObject *activity) const +{ + bool readOnly = python->contexts.value(threadid()).readOnly; + if (readOnly) return false; + + if (series == "secs" || series == "km") + return false; // invalid series name + + RideFile *f = selectRideFile(activity); + if (f == nullptr) return false; + + if (!f->xdata().contains(name)) + return false; // XData not present + + XDataSeries *xds = f->xdata()[name]; + if (!xds->valuename.contains(series)) + return false; // XData series not present + + QList *editedRideFiles = python->contexts.value(threadid()).editedRideFiles; + if (editedRideFiles && !editedRideFiles->contains(f)) { + f->command->startLUW(QString("Python_%1").arg(threadid())); + editedRideFiles->append(f); + } + + // remove series for existing xdata + f->command->removeXDataSeries(name, series); + + return true; +} + +bool +Bindings::deleteXData(QString name, PyObject *activity) const +{ + bool readOnly = python->contexts.value(threadid()).readOnly; + if (readOnly) return false; + + RideFile *f = selectRideFile(activity); + if (f == nullptr) return false; + + if (!f->xdata().contains(name)) + return false; // XData not present + + QList *editedRideFiles = python->contexts.value(threadid()).editedRideFiles; + if (editedRideFiles && !editedRideFiles->contains(f)) { + f->command->startLUW(QString("Python_%1").arg(threadid())); + editedRideFiles->append(f); + } + + // remove series for existing xdata + f->command->removeXData(name); + + return true; +} + bool Bindings::deleteActivitySample(int index, PyObject *activity) const { diff --git a/src/Python/SIP/Bindings.h b/src/Python/SIP/Bindings.h index ea06a7e6d..bcf6e3d80 100644 --- a/src/Python/SIP/Bindings.h +++ b/src/Python/SIP/Bindings.h @@ -113,6 +113,8 @@ class Bindings { // editing data bool createXDataSeries(QString name, QString series, QString seriesUnit, PyObject *activity=NULL) const; + bool deleteXDataSeries(QString name, QString series, PyObject *activity=NULL) const; + bool deleteXData(QString names, PyObject *activity=NULL) const; bool deleteActivitySample(int index = -1, PyObject *activity = NULL) const; bool deleteSeries(int type, PyObject *activity = NULL) const; bool postProcess(QString processor, PyObject *activity = NULL) const; diff --git a/src/Python/SIP/goldencheetah.sip b/src/Python/SIP/goldencheetah.sip index 202449036..21476ab69 100644 --- a/src/Python/SIP/goldencheetah.sip +++ b/src/Python/SIP/goldencheetah.sip @@ -384,6 +384,8 @@ public: // editing data bool createXDataSeries(QString name, QString series, QString seriesUnit, PyObject *activity = NULL) const; + bool deleteXDataSeries(QString name, QString series, PyObject *activity = NULL) const; + bool deleteXData(QString name, PyObject *activity = NULL) const; bool deleteActivitySample(int index = -1, PyObject *activity = NULL) const; bool deleteSeries(int type, PyObject *activity = NULL) const; bool postProcess(QString processor, PyObject *activity = NULL) const; diff --git a/src/Python/SIP/sipAPIgoldencheetah.h b/src/Python/SIP/sipAPIgoldencheetah.h index 9e5f241ab..f2ab7b251 100644 --- a/src/Python/SIP/sipAPIgoldencheetah.h +++ b/src/Python/SIP/sipAPIgoldencheetah.h @@ -15,204 +15,208 @@ */ #define sipNameNr_deleteActivitySample 0 #define sipName_deleteActivitySample &sipStrings_goldencheetah[0] -#define sipNameNr_createXDataSeries 21 -#define sipName_createXDataSeries &sipStrings_goldencheetah[21] -#define sipNameNr_activityIntervals 39 -#define sipName_activityIntervals &sipStrings_goldencheetah[39] -#define sipNameNr_PythonXDataSeries 57 -#define sipName_PythonXDataSeries &sipStrings_goldencheetah[57] -#define sipNameNr_PythonDataSeries 75 -#define sipName_PythonDataSeries &sipStrings_goldencheetah[75] -#define sipNameNr_seasonIntervals 92 -#define sipName_seasonIntervals &sipStrings_goldencheetah[92] -#define sipNameNr_activityMeanmax 108 -#define sipName_activityMeanmax &sipStrings_goldencheetah[108] -#define sipNameNr_activityMetrics 124 -#define sipName_activityMetrics &sipStrings_goldencheetah[124] -#define sipNameNr_seasonMeasures 140 -#define sipName_seasonMeasures &sipStrings_goldencheetah[140] -#define sipNameNr_addAnnotation 155 -#define sipName_addAnnotation &sipStrings_goldencheetah[155] -#define sipNameNr_seasonMeanmax 169 -#define sipName_seasonMeanmax &sipStrings_goldencheetah[169] -#define sipNameNr_seasonMetrics 183 -#define sipName_seasonMetrics &sipStrings_goldencheetah[183] -#define sipNameNr_seriesPresent 197 -#define sipName_seriesPresent &sipStrings_goldencheetah[197] -#define sipNameNr_goldencheetah 211 -#define sipName_goldencheetah &sipStrings_goldencheetah[211] -#define sipNameNr_deleteSeries 225 -#define sipName_deleteSeries &sipStrings_goldencheetah[225] -#define sipNameNr_intervalType 238 -#define sipName_intervalType &sipStrings_goldencheetah[238] -#define sipNameNr_activityWbal 251 -#define sipName_activityWbal &sipStrings_goldencheetah[251] -#define sipNameNr_compareindex 264 -#define sipName_compareindex &sipStrings_goldencheetah[264] -#define sipNameNr_athleteZones 277 -#define sipName_athleteZones &sipStrings_goldencheetah[277] -#define sipNameNr_configChart 290 -#define sipName_configChart &sipStrings_goldencheetah[290] -#define sipNameNr_orientation 302 -#define sipName_orientation &sipStrings_goldencheetah[302] -#define sipNameNr_postProcess 314 -#define sipName_postProcess &sipStrings_goldencheetah[314] -#define sipNameNr_seasonPeaks 326 -#define sipName_seasonPeaks &sipStrings_goldencheetah[326] -#define sipNameNr_xdataSeries 338 -#define sipName_xdataSeries &sipStrings_goldencheetah[338] -#define sipNameNr_QStringList 350 -#define sipName_QStringList &sipStrings_goldencheetah[350] -#define sipNameNr___setitem__ 362 -#define sipName___setitem__ &sipStrings_goldencheetah[362] -#define sipNameNr___getitem__ 374 -#define sipName___getitem__ &sipStrings_goldencheetah[374] -#define sipNameNr_configAxis 386 -#define sipName_configAxis &sipStrings_goldencheetah[386] -#define sipNameNr_categories 397 -#define sipName_categories &sipStrings_goldencheetah[397] -#define sipNameNr_labelcolor 408 -#define sipName_labelcolor &sipStrings_goldencheetah[408] -#define sipNameNr_datalabels 419 -#define sipName_datalabels &sipStrings_goldencheetah[419] -#define sipNameNr_symbolsize 430 -#define sipName_symbolsize &sipStrings_goldencheetah[430] -#define sipNameNr_seriesUnit 441 -#define sipName_seriesUnit &sipStrings_goldencheetah[441] -#define sipNameNr_xdataNames 452 -#define sipName_xdataNames &sipStrings_goldencheetah[452] -#define sipNameNr_seriesLast 463 -#define sipName_seriesLast &sipStrings_goldencheetah[463] -#define sipNameNr_seriesName 474 -#define sipName_seriesName &sipStrings_goldencheetah[474] -#define sipNameNr_activities 485 -#define sipName_activities &sipStrings_goldencheetah[485] -#define sipNameNr_processor 496 -#define sipName_processor &sipStrings_goldencheetah[496] -#define sipNameNr_seasonPmc 506 -#define sipName_seasonPmc &sipStrings_goldencheetah[506] -#define sipNameNr_setCurve 516 -#define sipName_setCurve &sipStrings_goldencheetah[516] -#define sipNameNr_duration 525 -#define sipName_duration &sipStrings_goldencheetah[525] -#define sipNameNr_activity 534 -#define sipName_activity &sipStrings_goldencheetah[534] -#define sipNameNr_threadid 543 -#define sipName_threadid &sipStrings_goldencheetah[543] -#define sipNameNr_Bindings 552 -#define sipName_Bindings &sipStrings_goldencheetah[552] -#define sipNameNr_visible 561 -#define sipName_visible &sipStrings_goldencheetah[561] -#define sipNameNr_opacity 569 -#define sipName_opacity &sipStrings_goldencheetah[569] -#define sipNameNr_fseries 577 -#define sipName_fseries &sipStrings_goldencheetah[577] -#define sipNameNr_yseries 585 -#define sipName_yseries &sipStrings_goldencheetah[585] -#define sipNameNr_xseries 593 -#define sipName_xseries &sipStrings_goldencheetah[593] -#define sipNameNr_animate 601 -#define sipName_animate &sipStrings_goldencheetah[601] -#define sipNameNr_metrics 609 -#define sipName_metrics &sipStrings_goldencheetah[609] -#define sipNameNr_compare 617 -#define sipName_compare &sipStrings_goldencheetah[617] -#define sipNameNr_athlete 625 -#define sipName_athlete &sipStrings_goldencheetah[625] -#define sipNameNr_webpage 633 -#define sipName_webpage &sipStrings_goldencheetah[633] -#define sipNameNr_version 641 -#define sipName_version &sipStrings_goldencheetah[641] -#define sipNameNr___len__ 649 -#define sipName___len__ &sipStrings_goldencheetah[649] -#define sipNameNr___str__ 657 -#define sipName___str__ &sipStrings_goldencheetah[657] -#define sipNameNr_QString 665 -#define sipName_QString &sipStrings_goldencheetah[665] -#define sipNameNr_legend 673 -#define sipName_legend &sipStrings_goldencheetah[673] -#define sipNameNr_opengl 680 -#define sipName_opengl &sipStrings_goldencheetah[680] -#define sipNameNr_symbol 687 -#define sipName_symbol &sipStrings_goldencheetah[687] -#define sipNameNr_colors 694 -#define sipName_colors &sipStrings_goldencheetah[694] -#define sipNameNr_labels 423 -#define sipName_labels &sipStrings_goldencheetah[423] -#define sipNameNr_legpos 701 -#define sipName_legpos &sipStrings_goldencheetah[701] -#define sipNameNr_getTag 708 -#define sipName_getTag &sipStrings_goldencheetah[708] -#define sipNameNr_hasTag 715 -#define sipName_hasTag &sipStrings_goldencheetah[715] -#define sipNameNr_delTag 722 -#define sipName_delTag &sipStrings_goldencheetah[722] -#define sipNameNr_setTag 729 -#define sipName_setTag &sipStrings_goldencheetah[729] -#define sipNameNr_metric 736 -#define sipName_metric &sipStrings_goldencheetah[736] -#define sipNameNr_series 578 -#define sipName_series &sipStrings_goldencheetah[578] -#define sipNameNr_season 743 -#define sipName_season &sipStrings_goldencheetah[743] -#define sipNameNr_filter 750 -#define sipName_filter &sipStrings_goldencheetah[750] -#define sipNameNr_result 757 -#define sipName_result &sipStrings_goldencheetah[757] -#define sipNameNr_remove 764 -#define sipName_remove &sipStrings_goldencheetah[764] -#define sipNameNr_append 771 -#define sipName_append &sipStrings_goldencheetah[771] -#define sipNameNr_align 778 -#define sipName_align &sipStrings_goldencheetah[778] -#define sipNameNr_color 413 -#define sipName_color &sipStrings_goldencheetah[413] -#define sipNameNr_yname 784 -#define sipName_yname &sipStrings_goldencheetah[784] -#define sipNameNr_xname 790 -#define sipName_xname &sipStrings_goldencheetah[790] -#define sipNameNr_stack 796 -#define sipName_stack &sipStrings_goldencheetah[796] -#define sipNameNr_title 802 -#define sipName_title &sipStrings_goldencheetah[802] -#define sipNameNr_index 271 -#define sipName_index &sipStrings_goldencheetah[271] -#define sipNameNr_group 808 -#define sipName_group &sipStrings_goldencheetah[808] -#define sipNameNr_xdata 814 -#define sipName_xdata &sipStrings_goldencheetah[814] -#define sipNameNr_sport 820 -#define sipName_sport &sipStrings_goldencheetah[820] -#define sipNameNr_value 826 -#define sipName_value &sipStrings_goldencheetah[826] -#define sipNameNr_build 832 -#define sipName_build &sipStrings_goldencheetah[832] -#define sipNameNr_fill 838 -#define sipName_fill &sipStrings_goldencheetah[838] -#define sipNameNr_line 843 -#define sipName_line &sipStrings_goldencheetah[843] -#define sipNameNr_join 848 -#define sipName_join &sipStrings_goldencheetah[848] -#define sipNameNr_name 785 -#define sipName_name &sipStrings_goldencheetah[785] -#define sipNameNr_type 853 -#define sipName_type &sipStrings_goldencheetah[853] -#define sipNameNr_date 858 -#define sipName_date &sipStrings_goldencheetah[858] -#define sipNameNr_log 863 -#define sipName_log &sipStrings_goldencheetah[863] -#define sipNameNr_max 120 -#define sipName_max &sipStrings_goldencheetah[120] -#define sipNameNr_min 867 -#define sipName_min &sipStrings_goldencheetah[867] -#define sipNameNr_all 871 -#define sipName_all &sipStrings_goldencheetah[871] -#define sipNameNr_url 875 -#define sipName_url &sipStrings_goldencheetah[875] -#define sipNameNr_s2 879 -#define sipName_s2 &sipStrings_goldencheetah[879] -#define sipNameNr_s1 882 -#define sipName_s1 &sipStrings_goldencheetah[882] +#define sipNameNr_deleteXDataSeries 21 +#define sipName_deleteXDataSeries &sipStrings_goldencheetah[21] +#define sipNameNr_createXDataSeries 39 +#define sipName_createXDataSeries &sipStrings_goldencheetah[39] +#define sipNameNr_activityIntervals 57 +#define sipName_activityIntervals &sipStrings_goldencheetah[57] +#define sipNameNr_PythonXDataSeries 75 +#define sipName_PythonXDataSeries &sipStrings_goldencheetah[75] +#define sipNameNr_PythonDataSeries 93 +#define sipName_PythonDataSeries &sipStrings_goldencheetah[93] +#define sipNameNr_seasonIntervals 110 +#define sipName_seasonIntervals &sipStrings_goldencheetah[110] +#define sipNameNr_activityMeanmax 126 +#define sipName_activityMeanmax &sipStrings_goldencheetah[126] +#define sipNameNr_activityMetrics 142 +#define sipName_activityMetrics &sipStrings_goldencheetah[142] +#define sipNameNr_seasonMeasures 158 +#define sipName_seasonMeasures &sipStrings_goldencheetah[158] +#define sipNameNr_addAnnotation 173 +#define sipName_addAnnotation &sipStrings_goldencheetah[173] +#define sipNameNr_seasonMeanmax 187 +#define sipName_seasonMeanmax &sipStrings_goldencheetah[187] +#define sipNameNr_seasonMetrics 201 +#define sipName_seasonMetrics &sipStrings_goldencheetah[201] +#define sipNameNr_seriesPresent 215 +#define sipName_seriesPresent &sipStrings_goldencheetah[215] +#define sipNameNr_goldencheetah 229 +#define sipName_goldencheetah &sipStrings_goldencheetah[229] +#define sipNameNr_deleteSeries 243 +#define sipName_deleteSeries &sipStrings_goldencheetah[243] +#define sipNameNr_intervalType 256 +#define sipName_intervalType &sipStrings_goldencheetah[256] +#define sipNameNr_activityWbal 269 +#define sipName_activityWbal &sipStrings_goldencheetah[269] +#define sipNameNr_compareindex 282 +#define sipName_compareindex &sipStrings_goldencheetah[282] +#define sipNameNr_athleteZones 295 +#define sipName_athleteZones &sipStrings_goldencheetah[295] +#define sipNameNr_configChart 308 +#define sipName_configChart &sipStrings_goldencheetah[308] +#define sipNameNr_orientation 320 +#define sipName_orientation &sipStrings_goldencheetah[320] +#define sipNameNr_postProcess 332 +#define sipName_postProcess &sipStrings_goldencheetah[332] +#define sipNameNr_deleteXData 344 +#define sipName_deleteXData &sipStrings_goldencheetah[344] +#define sipNameNr_seasonPeaks 356 +#define sipName_seasonPeaks &sipStrings_goldencheetah[356] +#define sipNameNr_xdataSeries 368 +#define sipName_xdataSeries &sipStrings_goldencheetah[368] +#define sipNameNr_QStringList 380 +#define sipName_QStringList &sipStrings_goldencheetah[380] +#define sipNameNr___setitem__ 392 +#define sipName___setitem__ &sipStrings_goldencheetah[392] +#define sipNameNr___getitem__ 404 +#define sipName___getitem__ &sipStrings_goldencheetah[404] +#define sipNameNr_configAxis 416 +#define sipName_configAxis &sipStrings_goldencheetah[416] +#define sipNameNr_categories 427 +#define sipName_categories &sipStrings_goldencheetah[427] +#define sipNameNr_labelcolor 438 +#define sipName_labelcolor &sipStrings_goldencheetah[438] +#define sipNameNr_datalabels 449 +#define sipName_datalabels &sipStrings_goldencheetah[449] +#define sipNameNr_symbolsize 460 +#define sipName_symbolsize &sipStrings_goldencheetah[460] +#define sipNameNr_seriesUnit 471 +#define sipName_seriesUnit &sipStrings_goldencheetah[471] +#define sipNameNr_xdataNames 482 +#define sipName_xdataNames &sipStrings_goldencheetah[482] +#define sipNameNr_seriesLast 493 +#define sipName_seriesLast &sipStrings_goldencheetah[493] +#define sipNameNr_seriesName 504 +#define sipName_seriesName &sipStrings_goldencheetah[504] +#define sipNameNr_activities 515 +#define sipName_activities &sipStrings_goldencheetah[515] +#define sipNameNr_processor 526 +#define sipName_processor &sipStrings_goldencheetah[526] +#define sipNameNr_seasonPmc 536 +#define sipName_seasonPmc &sipStrings_goldencheetah[536] +#define sipNameNr_setCurve 546 +#define sipName_setCurve &sipStrings_goldencheetah[546] +#define sipNameNr_duration 555 +#define sipName_duration &sipStrings_goldencheetah[555] +#define sipNameNr_activity 564 +#define sipName_activity &sipStrings_goldencheetah[564] +#define sipNameNr_threadid 573 +#define sipName_threadid &sipStrings_goldencheetah[573] +#define sipNameNr_Bindings 582 +#define sipName_Bindings &sipStrings_goldencheetah[582] +#define sipNameNr_visible 591 +#define sipName_visible &sipStrings_goldencheetah[591] +#define sipNameNr_opacity 599 +#define sipName_opacity &sipStrings_goldencheetah[599] +#define sipNameNr_fseries 607 +#define sipName_fseries &sipStrings_goldencheetah[607] +#define sipNameNr_yseries 615 +#define sipName_yseries &sipStrings_goldencheetah[615] +#define sipNameNr_xseries 623 +#define sipName_xseries &sipStrings_goldencheetah[623] +#define sipNameNr_animate 631 +#define sipName_animate &sipStrings_goldencheetah[631] +#define sipNameNr_metrics 639 +#define sipName_metrics &sipStrings_goldencheetah[639] +#define sipNameNr_compare 647 +#define sipName_compare &sipStrings_goldencheetah[647] +#define sipNameNr_athlete 655 +#define sipName_athlete &sipStrings_goldencheetah[655] +#define sipNameNr_webpage 663 +#define sipName_webpage &sipStrings_goldencheetah[663] +#define sipNameNr_version 671 +#define sipName_version &sipStrings_goldencheetah[671] +#define sipNameNr___len__ 679 +#define sipName___len__ &sipStrings_goldencheetah[679] +#define sipNameNr___str__ 687 +#define sipName___str__ &sipStrings_goldencheetah[687] +#define sipNameNr_QString 695 +#define sipName_QString &sipStrings_goldencheetah[695] +#define sipNameNr_legend 703 +#define sipName_legend &sipStrings_goldencheetah[703] +#define sipNameNr_opengl 710 +#define sipName_opengl &sipStrings_goldencheetah[710] +#define sipNameNr_symbol 717 +#define sipName_symbol &sipStrings_goldencheetah[717] +#define sipNameNr_colors 724 +#define sipName_colors &sipStrings_goldencheetah[724] +#define sipNameNr_labels 453 +#define sipName_labels &sipStrings_goldencheetah[453] +#define sipNameNr_legpos 731 +#define sipName_legpos &sipStrings_goldencheetah[731] +#define sipNameNr_getTag 738 +#define sipName_getTag &sipStrings_goldencheetah[738] +#define sipNameNr_hasTag 745 +#define sipName_hasTag &sipStrings_goldencheetah[745] +#define sipNameNr_delTag 752 +#define sipName_delTag &sipStrings_goldencheetah[752] +#define sipNameNr_setTag 759 +#define sipName_setTag &sipStrings_goldencheetah[759] +#define sipNameNr_metric 766 +#define sipName_metric &sipStrings_goldencheetah[766] +#define sipNameNr_series 608 +#define sipName_series &sipStrings_goldencheetah[608] +#define sipNameNr_season 773 +#define sipName_season &sipStrings_goldencheetah[773] +#define sipNameNr_filter 780 +#define sipName_filter &sipStrings_goldencheetah[780] +#define sipNameNr_result 787 +#define sipName_result &sipStrings_goldencheetah[787] +#define sipNameNr_remove 794 +#define sipName_remove &sipStrings_goldencheetah[794] +#define sipNameNr_append 801 +#define sipName_append &sipStrings_goldencheetah[801] +#define sipNameNr_align 808 +#define sipName_align &sipStrings_goldencheetah[808] +#define sipNameNr_color 443 +#define sipName_color &sipStrings_goldencheetah[443] +#define sipNameNr_yname 814 +#define sipName_yname &sipStrings_goldencheetah[814] +#define sipNameNr_xname 820 +#define sipName_xname &sipStrings_goldencheetah[820] +#define sipNameNr_stack 826 +#define sipName_stack &sipStrings_goldencheetah[826] +#define sipNameNr_title 832 +#define sipName_title &sipStrings_goldencheetah[832] +#define sipNameNr_index 289 +#define sipName_index &sipStrings_goldencheetah[289] +#define sipNameNr_group 838 +#define sipName_group &sipStrings_goldencheetah[838] +#define sipNameNr_xdata 844 +#define sipName_xdata &sipStrings_goldencheetah[844] +#define sipNameNr_sport 850 +#define sipName_sport &sipStrings_goldencheetah[850] +#define sipNameNr_value 856 +#define sipName_value &sipStrings_goldencheetah[856] +#define sipNameNr_build 862 +#define sipName_build &sipStrings_goldencheetah[862] +#define sipNameNr_fill 868 +#define sipName_fill &sipStrings_goldencheetah[868] +#define sipNameNr_line 873 +#define sipName_line &sipStrings_goldencheetah[873] +#define sipNameNr_join 878 +#define sipName_join &sipStrings_goldencheetah[878] +#define sipNameNr_name 815 +#define sipName_name &sipStrings_goldencheetah[815] +#define sipNameNr_type 883 +#define sipName_type &sipStrings_goldencheetah[883] +#define sipNameNr_date 888 +#define sipName_date &sipStrings_goldencheetah[888] +#define sipNameNr_log 893 +#define sipName_log &sipStrings_goldencheetah[893] +#define sipNameNr_max 138 +#define sipName_max &sipStrings_goldencheetah[138] +#define sipNameNr_min 897 +#define sipName_min &sipStrings_goldencheetah[897] +#define sipNameNr_all 901 +#define sipName_all &sipStrings_goldencheetah[901] +#define sipNameNr_url 905 +#define sipName_url &sipStrings_goldencheetah[905] +#define sipNameNr_s2 909 +#define sipName_s2 &sipStrings_goldencheetah[909] +#define sipNameNr_s1 912 +#define sipName_s1 &sipStrings_goldencheetah[912] #define sipMalloc sipAPI_goldencheetah->api_malloc #define sipFree sipAPI_goldencheetah->api_free diff --git a/src/Python/SIP/sipgoldencheetahBindings.cpp b/src/Python/SIP/sipgoldencheetahBindings.cpp index 88f4fae2b..ad619052c 100644 --- a/src/Python/SIP/sipgoldencheetahBindings.cpp +++ b/src/Python/SIP/sipgoldencheetahBindings.cpp @@ -990,6 +990,78 @@ static PyObject *meth_Bindings_createXDataSeries(PyObject *sipSelf, PyObject *si } +extern "C" {static PyObject *meth_Bindings_deleteXDataSeries(PyObject *, PyObject *, PyObject *);} +static PyObject *meth_Bindings_deleteXDataSeries(PyObject *sipSelf, PyObject *sipArgs, PyObject *sipKwds) +{ + PyObject *sipParseErr = NULL; + + { + ::QString* a0; + int a0State = 0; + ::QString* a1; + int a1State = 0; + PyObject * a2 = 0; + const ::Bindings *sipCpp; + + static const char *sipKwdList[] = { + sipName_name, + sipName_series, + sipName_activity, + }; + + if (sipParseKwdArgs(&sipParseErr, sipArgs, sipKwds, sipKwdList, NULL, "BJ1J1|P0", &sipSelf, sipType_Bindings, &sipCpp, sipType_QString,&a0, &a0State, sipType_QString,&a1, &a1State, &a2)) + { + bool sipRes; + + sipRes = sipCpp->deleteXDataSeries(*a0,*a1,a2); + sipReleaseType(a0,sipType_QString,a0State); + sipReleaseType(a1,sipType_QString,a1State); + + return PyBool_FromLong(sipRes); + } + } + + /* Raise an exception if the arguments couldn't be parsed. */ + sipNoMethod(sipParseErr, sipName_Bindings, sipName_deleteXDataSeries, NULL); + + return NULL; +} + + +extern "C" {static PyObject *meth_Bindings_deleteXData(PyObject *, PyObject *, PyObject *);} +static PyObject *meth_Bindings_deleteXData(PyObject *sipSelf, PyObject *sipArgs, PyObject *sipKwds) +{ + PyObject *sipParseErr = NULL; + + { + ::QString* a0; + int a0State = 0; + PyObject * a1 = 0; + const ::Bindings *sipCpp; + + static const char *sipKwdList[] = { + sipName_name, + sipName_activity, + }; + + if (sipParseKwdArgs(&sipParseErr, sipArgs, sipKwds, sipKwdList, NULL, "BJ1|P0", &sipSelf, sipType_Bindings, &sipCpp, sipType_QString,&a0, &a0State, &a1)) + { + bool sipRes; + + sipRes = sipCpp->deleteXData(*a0,a1); + sipReleaseType(a0,sipType_QString,a0State); + + return PyBool_FromLong(sipRes); + } + } + + /* Raise an exception if the arguments couldn't be parsed. */ + sipNoMethod(sipParseErr, sipName_Bindings, sipName_deleteXData, NULL); + + return NULL; +} + + extern "C" {static PyObject *meth_Bindings_deleteActivitySample(PyObject *, PyObject *, PyObject *);} static PyObject *meth_Bindings_deleteActivitySample(PyObject *sipSelf, PyObject *sipArgs, PyObject *sipKwds) { @@ -1528,6 +1600,8 @@ static PyMethodDef methods_Bindings[] = { {SIP_MLNAME_CAST(sipName_delTag), (PyCFunction)meth_Bindings_delTag, METH_VARARGS|METH_KEYWORDS, NULL}, {SIP_MLNAME_CAST(sipName_deleteActivitySample), (PyCFunction)meth_Bindings_deleteActivitySample, METH_VARARGS|METH_KEYWORDS, NULL}, {SIP_MLNAME_CAST(sipName_deleteSeries), (PyCFunction)meth_Bindings_deleteSeries, METH_VARARGS|METH_KEYWORDS, NULL}, + {SIP_MLNAME_CAST(sipName_deleteXData), (PyCFunction)meth_Bindings_deleteXData, METH_VARARGS|METH_KEYWORDS, NULL}, + {SIP_MLNAME_CAST(sipName_deleteXDataSeries), (PyCFunction)meth_Bindings_deleteXDataSeries, METH_VARARGS|METH_KEYWORDS, NULL}, {SIP_MLNAME_CAST(sipName_getTag), (PyCFunction)meth_Bindings_getTag, METH_VARARGS|METH_KEYWORDS, NULL}, {SIP_MLNAME_CAST(sipName_hasTag), (PyCFunction)meth_Bindings_hasTag, METH_VARARGS|METH_KEYWORDS, NULL}, {SIP_MLNAME_CAST(sipName_intervalType), (PyCFunction)meth_Bindings_intervalType, METH_VARARGS|METH_KEYWORDS, NULL}, @@ -1569,7 +1643,7 @@ sipClassTypeDef sipTypeDef_goldencheetah_Bindings = { { sipNameNr_Bindings, {0, 0, 1}, - 40, methods_Bindings, + 42, methods_Bindings, 0, 0, 0, 0, {0, 0, 0, 0, 0, 0, 0, 0, 0, 0}, diff --git a/src/Python/SIP/sipgoldencheetahcmodule.cpp b/src/Python/SIP/sipgoldencheetahcmodule.cpp index 012048048..3a8431c05 100644 --- a/src/Python/SIP/sipgoldencheetahcmodule.cpp +++ b/src/Python/SIP/sipgoldencheetahcmodule.cpp @@ -19,6 +19,7 @@ /* Define the strings used by this module. */ const char sipStrings_goldencheetah[] = { 'd', 'e', 'l', 'e', 't', 'e', 'A', 'c', 't', 'i', 'v', 'i', 't', 'y', 'S', 'a', 'm', 'p', 'l', 'e', 0, + 'd', 'e', 'l', 'e', 't', 'e', 'X', 'D', 'a', 't', 'a', 'S', 'e', 'r', 'i', 'e', 's', 0, 'c', 'r', 'e', 'a', 't', 'e', 'X', 'D', 'a', 't', 'a', 'S', 'e', 'r', 'i', 'e', 's', 0, 'a', 'c', 't', 'i', 'v', 'i', 't', 'y', 'I', 'n', 't', 'e', 'r', 'v', 'a', 'l', 's', 0, 'P', 'y', 't', 'h', 'o', 'n', 'X', 'D', 'a', 't', 'a', 'S', 'e', 'r', 'i', 'e', 's', 0, @@ -40,6 +41,7 @@ const char sipStrings_goldencheetah[] = { 'c', 'o', 'n', 'f', 'i', 'g', 'C', 'h', 'a', 'r', 't', 0, 'o', 'r', 'i', 'e', 'n', 't', 'a', 't', 'i', 'o', 'n', 0, 'p', 'o', 's', 't', 'P', 'r', 'o', 'c', 'e', 's', 's', 0, + 'd', 'e', 'l', 'e', 't', 'e', 'X', 'D', 'a', 't', 'a', 0, 's', 'e', 'a', 's', 'o', 'n', 'P', 'e', 'a', 'k', 's', 0, 'x', 'd', 'a', 't', 'a', 'S', 'e', 'r', 'i', 'e', 's', 0, 'Q', 'S', 't', 'r', 'i', 'n', 'g', 'L', 'i', 's', 't', 0,