From 67ac67c5090ec12ddd67cfa8f0adedc401e98ae4 Mon Sep 17 00:00:00 2001 From: luzpaz Date: Mon, 25 Mar 2024 19:46:26 -0400 Subject: [PATCH] Fix various typos (#4383) Found via `codespell -q 3 -S "*.pdf,*.slf,*.smf,*.ts,./deprecated,./contrib" -L ans,ded,nam,nd,parm,parms,serie ` --- CONTRIBUTING.md | 2 +- INSTALL-LINUX | 2 +- INSTALL-MAC | 2 +- INSTALL-WIN32 | 6 +++--- appveyor.yml | 2 +- test/charts/WattOverDuration-PythonCompare.gchart | 2 +- travis/osx/after_success.sh | 2 +- travis/osx/before_script.sh | 2 +- 8 files changed, 10 insertions(+), 10 deletions(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 41a31268d..00fb624ac 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -6,7 +6,7 @@ #### **Do you have questions about the source code?** -* Ask any question about how to build GoldenCheetah or anything related to the source code in the [golden-cheetah-developers mailing list](https://groups.google.com/forum/#!forum/golden-cheetah-developers), please see the [GoldenCheetah Developers Guide](https://github.com/GoldenCheetah/GoldenCheetah/wiki/Developers-guide) for addtional information. +* Ask any question about how to build GoldenCheetah or anything related to the source code in the [golden-cheetah-developers mailing list](https://groups.google.com/forum/#!forum/golden-cheetah-developers), please see the [GoldenCheetah Developers Guide](https://github.com/GoldenCheetah/GoldenCheetah/wiki/Developers-guide) for additional information. ## How to contribute to GoldenCheetah diff --git a/INSTALL-LINUX b/INSTALL-LINUX index 128d69573..dcf6ecdbf 100644 --- a/INSTALL-LINUX +++ b/INSTALL-LINUX @@ -111,7 +111,7 @@ and add the library path to LIBZ_INCLUDE =, you will need to have the compress l #LIBZ_INCLUDE = #LIBZ_LIBS = -lz -compiling with gcc -O3 (tree vectorization can have a significat impact) +compiling with gcc -O3 (tree vectorization can have a significant impact) [or -Ofast] If so you might like to uncomment: diff --git a/INSTALL-MAC b/INSTALL-MAC index 288b51e42..fad1c7eaa 100644 --- a/INSTALL-MAC +++ b/INSTALL-MAC @@ -48,7 +48,7 @@ This walkthrough was performed on a MacBook Air running 14.4 (Sonoma) To install Xcode on macOS you need to download it via the App Store. You can launch the App Store from launchpad, or it may be already in your dock. -Under the search box type in Xcode and it will return a few optios, generally +Under the search box type in Xcode and it will return a few options, generally Xcode is the first item and shows a blueprint with a hammer icon. Click on this to install it. It should be free. The usual app store process will apply as the application is downloaded and installed. The download is about 4GB diff --git a/INSTALL-WIN32 b/INSTALL-WIN32 index 6796990f2..4e8e114c9 100644 --- a/INSTALL-WIN32 +++ b/INSTALL-WIN32 @@ -1,6 +1,6 @@ Update Note: to build GoldenCheetah v3.6 we are using Microsoft Visual C++ 2019, included in Microsoft Visual Studio 2019 AppVeyor image, with Qt5.15.2 and GSL 2.7 -insalled with vcpkg, on AppVeyor continuous integration platform. +installed with vcpkg, on AppVeyor continuous integration platform. You can check the appveyor.yml for the complete and updated build script, the minimum Qt version known to work is 5.13 with Qt WebEngine and Qt Charts. GSL - GNU Scientific Library is a mandatory dependency starting with v3.6 @@ -50,7 +50,7 @@ You need: - Flex and Bison (below the version working for me) -- Download from here: https://sourceforge.net/projects/winflexbison/ -- Use the "win_flex_bison-latest.zip" version - -- Unzip whereever you like and make sure that the location "win_bison.exe" and "win_flex.exe + -- Unzip wherever you like and make sure that the location "win_bison.exe" and "win_flex.exe are added to your "Path" environment variable - Qt C++ Framework @@ -186,7 +186,7 @@ Building with integration to external services (via APIs) As of today a number of integrations with external services like Strava, Cyclinganalytics, Google Calendar, Dropbox, Today's Plan, Google Drive, CloudDB) exist in the official GoldenCheetah builds. The permission to use API's of such services requires a dedicated registration (in this case -for "GoldenCheetah" as the consumer of the services) where in return the GoldenCheetah team get's +for "GoldenCheetah" as the consumer of the services) where in return the GoldenCheetah team gets specific credentials to access the services. All of the services request that the access credentials are kept private and are under responsibility diff --git a/appveyor.yml b/appveyor.yml index a497b2fb6..b23e95a62 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -113,7 +113,7 @@ install: - nmake install - cd .. -# Add Python (avoiding colision between GC Context.h and Python context.h) +# Add Python (avoiding collision between GC Context.h and Python context.h) - echo DEFINES+=GC_WANT_PYTHON >> src\gcconfig.pri - echo PYTHONINCLUDES=-ICore -I\"c:\python37-x64\include\" >> src\gcconfig.pri - echo PYTHONLIBS=-L\"c:\python37-x64\libs\" -lpython37 >> src\gcconfig.pri diff --git a/test/charts/WattOverDuration-PythonCompare.gchart b/test/charts/WattOverDuration-PythonCompare.gchart index 86d3586bd..b304ea1b3 100644 --- a/test/charts/WattOverDuration-PythonCompare.gchart +++ b/test/charts/WattOverDuration-PythonCompare.gchart @@ -10,7 +10,7 @@ "heightFactor":"2", "style":"0", "resizable":"0", - "script":"##\n## Python program will run on selection.\n##\n## \nimport plotly.graph_objects as go\nimport pandas as pd\nimport tempfile\nimport pathlib\nimport plotly\nimport time\nimport datetime\n\n# Define tempory file\ntemp_file = tempfile.NamedTemporaryFile(mode=\"w+t\", prefix=\"GC_\", suffix=\".html\", delete=False)\n\n## Create dataframe\ndf = pd.DataFrame()\n\n## Get GC Data for activity and metrics\nmetricsAll = GC.activityMetrics(compare=True)\n\ntime = []\nfor i in range(0, len(metricsAll)):\n time.append(str(datetime.timedelta(seconds=int(metricsAll[i][0]['Duration']))))\n df.at[i, 'dateLocal'] = metricsAll[i][0]['date'].strftime('%a %x')\n df.at[i, 'colors'] = metricsAll[i][1]\n\ndf['time'] = time\n\nduration = []\npower = []\nisPower = []\nfor i in range(0, len(metricsAll)):\n activityAll = GC.activity(compareindex =i)\n sec = list(activityAll['seconds'])\n\n durationTemp = []\n for seconds in sec:\n minutes, seconds = divmod(seconds, 60)\n hours, minutes = divmod(minutes, 60)\n durationTemp.append(\"%02i:%02i:%02i\" % (hours, minutes, seconds))\n\n if 'power' in activityAll:\n power.append(list(activityAll['power']))\n isPower.append(1)\n\n else:\n power.append(list([0]))\n isPower.append(0)\n\n duration.append(durationTemp)\n\n## Add Data to the dataframe\ndf['duration'] = duration\ndf['power'] = power\ndf['isPower'] = isPower\n\n## Filter out data without power\ndfFilter = df.loc[df['isPower'] > 0]\n\n## Plot Data\nfig = go.Figure()\n\nfor i in dfFilter.index:\n fig.add_trace(go.Scatter(\n x = dfFilter['duration'][i],\n y = dfFilter['power'][i],\n mode = 'lines',\n name = str(dfFilter['dateLocal'][i]) +\n \"
\" 'Duration: ' +\n str(dfFilter['time'][i]),\n\n marker_color = dfFilter['colors'][i],\n hovertemplate =\n 'Power<\/b>: %{y} watts' +\n '
Duration<\/b>: %{x}',\n ))\n\nfig.update_xaxes(\n tickmode = 'auto',\n nticks = 10,\n ticks = \"outside\",\n tickwidth = 2,\n ticklen = 10,\n tickcolor = 'white',\n linewidth = 2,\n linecolor = 'white',\n)\n\n## Update layout properties\nfig.update_layout(\n xaxis_title=\"Duration\",\n yaxis_title=\"Watts\",\n template='plotly_dark',\n xaxis_showgrid=False,\n yaxis_showgrid=True,\n #hovermode=\"x unified\",\n)\n\n## Prepare Plot\nplotly.offline.plot(fig, auto_open=False, filename=temp_file.name)\n\n## Load the webpage\nGC.webpage(pathlib.Path(temp_file.name).as_uri())\n ", + "script":"##\n## Python program will run on selection.\n##\n## \nimport plotly.graph_objects as go\nimport pandas as pd\nimport tempfile\nimport pathlib\nimport plotly\nimport time\nimport datetime\n\n# Define temporary file\ntemp_file = tempfile.NamedTemporaryFile(mode=\"w+t\", prefix=\"GC_\", suffix=\".html\", delete=False)\n\n## Create dataframe\ndf = pd.DataFrame()\n\n## Get GC Data for activity and metrics\nmetricsAll = GC.activityMetrics(compare=True)\n\ntime = []\nfor i in range(0, len(metricsAll)):\n time.append(str(datetime.timedelta(seconds=int(metricsAll[i][0]['Duration']))))\n df.at[i, 'dateLocal'] = metricsAll[i][0]['date'].strftime('%a %x')\n df.at[i, 'colors'] = metricsAll[i][1]\n\ndf['time'] = time\n\nduration = []\npower = []\nisPower = []\nfor i in range(0, len(metricsAll)):\n activityAll = GC.activity(compareindex =i)\n sec = list(activityAll['seconds'])\n\n durationTemp = []\n for seconds in sec:\n minutes, seconds = divmod(seconds, 60)\n hours, minutes = divmod(minutes, 60)\n durationTemp.append(\"%02i:%02i:%02i\" % (hours, minutes, seconds))\n\n if 'power' in activityAll:\n power.append(list(activityAll['power']))\n isPower.append(1)\n\n else:\n power.append(list([0]))\n isPower.append(0)\n\n duration.append(durationTemp)\n\n## Add Data to the dataframe\ndf['duration'] = duration\ndf['power'] = power\ndf['isPower'] = isPower\n\n## Filter out data without power\ndfFilter = df.loc[df['isPower'] > 0]\n\n## Plot Data\nfig = go.Figure()\n\nfor i in dfFilter.index:\n fig.add_trace(go.Scatter(\n x = dfFilter['duration'][i],\n y = dfFilter['power'][i],\n mode = 'lines',\n name = str(dfFilter['dateLocal'][i]) +\n \"
\" 'Duration: ' +\n str(dfFilter['time'][i]),\n\n marker_color = dfFilter['colors'][i],\n hovertemplate =\n 'Power<\/b>: %{y} watts' +\n '
Duration<\/b>: %{x}',\n ))\n\nfig.update_xaxes(\n tickmode = 'auto',\n nticks = 10,\n ticks = \"outside\",\n tickwidth = 2,\n ticklen = 10,\n tickcolor = 'white',\n linewidth = 2,\n linecolor = 'white',\n)\n\n## Update layout properties\nfig.update_layout(\n xaxis_title=\"Duration\",\n yaxis_title=\"Watts\",\n template='plotly_dark',\n xaxis_showgrid=False,\n yaxis_showgrid=True,\n #hovermode=\"x unified\",\n)\n\n## Prepare Plot\nplotly.offline.plot(fig, auto_open=False, filename=temp_file.name)\n\n## Load the webpage\nGC.webpage(pathlib.Path(temp_file.name).as_uri())\n ", "state":" ", "showConsole":"0", "asWeb":"1", diff --git a/travis/osx/after_success.sh b/travis/osx/after_success.sh index da7a6a2c5..9a479f6a2 100755 --- a/travis/osx/after_success.sh +++ b/travis/osx/after_success.sh @@ -49,7 +49,7 @@ do done popd -# Final deployment to generate dmg (may take longer than 10' wihout output) +# Final deployment to generate dmg (may take longer than 10' without output) python3.7 -m pip install travis-wait-improved /Library/Frameworks/Python.framework/Versions/3.7/bin/travis-wait-improved --timeout 20m /usr/local/opt/qt5/bin/macdeployqt GoldenCheetah.app -verbose=2 -fs=hfs+ -dmg diff --git a/travis/osx/before_script.sh b/travis/osx/before_script.sh index a349a547e..a97c42686 100755 --- a/travis/osx/before_script.sh +++ b/travis/osx/before_script.sh @@ -54,7 +54,7 @@ sed -i "" "s|\(DEFINES += GC_VIDEO_NONE.*\)|#\1 |" src/gcconfig.pri sed -i "" "s|#\(DEFINES += GC_VIDEO_VLC.*\)|\1 |" src/gcconfig.pri # Enable R embedding sed -i "" "s|#\(DEFINES += GC_WANT_R.*\)|\1 |" src/gcconfig.pri -# Python (avoiding colision between GC Context.h and Python context.h) +# Python (avoiding collision between GC Context.h and Python context.h) echo DEFINES += GC_WANT_PYTHON >> src/gcconfig.pri echo PYTHONINCLUDES = -ICore `python3.7-config --includes` >> src/gcconfig.pri echo PYTHONLIBS = `python3.7-config --ldflags` >> src/gcconfig.pri