Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Release 4.3.6 #167

Merged
merged 3 commits into from
Feb 17, 2024
Merged

Release 4.3.6 #167

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
2e2dfab
Update version.h
Feb 3, 2024
f7495b5
Restore index.html (#168)
Thistleman Feb 5, 2024
4834a04
Fixing the artifacts created by XLSX files (#170)
aivanova5 Feb 16, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 13 additions & 7 deletions cloud/websites/docs.gridlabd.us/index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,15 @@
<!DOCTYPE HTML />
<HTML>
<HEAD>
<META HTTP-EQUIV="refresh" CONTENT="0,url=http://docs.gridlabd.us/index.html?owner=arras-energy&project=gridlabd" />
</HEAD>
<BODY>
Redirecting to <A HREF="http://docs.gridlabd.us/index.html?owner=arras-energy&project=gridlabd">http://docs.arras-energy.org/index.html?owner=arras-energy&project=gridlabd</A>...
</BODY>
</HTML>
<SCRIPT LANGUAGE="Javascript" SRC="_defaults.js"></SCRIPT>
<SCRIPT LANGUAGE="JavaScript">
document.writeln('<FRAMESET ROWS="' + (top_panel_height+20) + ',*" BORDER=2>');
console.info(window.location.search)
document.writeln('<FRAME SRC="_topbar.html" NORESIZE="noresize"></FRAME>');
document.writeln('<FRAMESET COLS="320,*" BORDER=3>');
document.writeln('<FRAME NAME="contents" SRC="_contents.html' + window.location.search + '"></FRAME>');
document.writeln('<FRAME NAME="page" SRC="_page.html' + window.location.search + '"></FRAME>');
document.writeln('</FRAMESET>');
document.writeln('</FRAMESET>');
</SCRIPT>

</HTML>
11 changes: 7 additions & 4 deletions converters/xlsx-spida2csv-geodata.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -119,10 +119,13 @@ def convert(input_files, output_file, options={}):
# Read all the sheets in the .xlxs file
file_extension = input_pole_file.split(".")[-1]
if file_extension == 'xlsx':
df = pd.read_excel(input_pole_file, sheet_name=0, usecols=[
'Structure ID', 'AS-IS AGL', 'AS-IS Species', 'AS-IS GLC', 'AS-IS Length',
'AS-IS Class', 'AS-IS Allowable Stress Adjustment',
'AS-IS Effective Stress Adjustment', 'AS-IS GPS Point'], engine='openpyxl')
df = pd.read_excel(input_pole_file, sheet_name=0, engine='openpyxl')
df.columns = [col.replace("_x0020_", " ") for col in df.columns]
desired_columns = [
'Structure ID', 'AS-IS AGL', 'AS-IS Species', 'AS-IS GLC', 'AS-IS Length',
'AS-IS Class', 'AS-IS Allowable Stress Adjustment',
'AS-IS Effective Stress Adjustment', 'AS-IS GPS Point']
df = df[desired_columns]
elif file_extension == 'xls':
df = pd.read_excel(input_pole_file, sheet_name=0, usecols=[
'Structure ID', 'AS-IS AGL', 'AS-IS Species', 'AS-IS GLC', 'AS-IS Length',
Expand Down
2 changes: 1 addition & 1 deletion source/version.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@

#define REV_MAJOR 4
#define REV_MINOR 3
#define REV_PATCH 5
#define REV_PATCH 6

#ifdef HAVE_CONFIG_H
#include "config.h"
Expand Down
Loading