Andreas/solxpect
1
0
Fork 0
mirror of https://github.com/woheller69/solxpect.git synced 2026-02-07 00:31:48 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

add shading to database for future use

Browse source 
rename to pvCaster
This commit is contained in:
woheller69 2023-04-04 18:20:02 +02:00
parent 443a9144e3
commit e989b873f6
12 changed files with 73 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

36
app/src/main/java/org/woheller69/weather/database/CityToWatch.java
View file

@ -1,5 +1,7 @@
package org.woheller69.weather.database;
import java.util.Arrays;
/**
* This class is the database model for the cities to watch. 'Cities to watch' means the locations
* for which a user would like to see the weather for. This includes those locations that will be
@ -21,6 +23,8 @@ public class CityToWatch {
private float azimuthAngle;
private float tiltAngle;
private int rank;
private int[] shadingElevation = {0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0};
private int[] shadingOpacity = {0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0};
public CityToWatch() {
}
@ -146,4 +150,36 @@ public class CityToWatch {
public void setTiltAngle(float tiltAngle) {
this.tiltAngle = tiltAngle;
}
public void setShadingElevation(String string) {
shadingElevation = Arrays.stream(string.split(",")).mapToInt(Integer::parseInt).toArray();
}
public void setShadingElevation(int[] shadingElevation){
this.shadingElevation = shadingElevation;
}
public void setShadingOpacity(String string) {
shadingOpacity = Arrays.stream(string.split(",")).mapToInt(Integer::parseInt).toArray();
}
public void setShadingOpacity(int[] shadingOpacity){
this.shadingOpacity = shadingOpacity;
}
public int[] getShadingElevation(){
return shadingElevation;
}
public int[] getShadingOpacity(){
return shadingOpacity;
}
public String getShadingElevationString() {
return Arrays.toString(shadingElevation).replaceAll("\\[|\\]|\\s", "");
}
public String getShadingOpacityString() {
return Arrays.toString(shadingOpacity).replaceAll("\\[|\\]|\\s", "");
}
}

22
app/src/main/java/org/woheller69/weather/database/SQLiteHelper.java
View file

@ -51,6 +51,8 @@ public class SQLiteHelper extends SQLiteOpenHelper {
private static final String CITIES_TO_WATCH_INVERTER_EFFICIENCY = "inverter_efficiency";
private static final String CITIES_TO_WATCH_AZIMUTH_ANGLE = "azimuth_angle";
private static final String CITIES_TO_WATCH_TILT_ANGLE = "tilt_angle";
private static final String CITIES_TO_WATCH_SHADING_ELEVATION = "shading_elevation";
private static final String CITIES_TO_WATCH_SHADING_OPACITY = "shading_opacity";
//Names of columns in TABLE_FORECAST
private static final String FORECAST_ID = "forecast_id";
@ -131,7 +133,9 @@ public class SQLiteHelper extends SQLiteOpenHelper {
CITIES_TO_WATCH_INVERTER_POWER_LIMIT + " REAL NOT NULL," +
CITIES_TO_WATCH_INVERTER_EFFICIENCY + " REAL NOT NULL," +
CITIES_TO_WATCH_AZIMUTH_ANGLE + " REAL NOT NULL," +
CITIES_TO_WATCH_TILT_ANGLE + " REAL NOT NULL)";
CITIES_TO_WATCH_TILT_ANGLE + " REAL NOT NULL," +
CITIES_TO_WATCH_SHADING_ELEVATION + " VARCHAR(255) NOT NULL," +
CITIES_TO_WATCH_SHADING_OPACITY + " VARCHAR(255) NOT NULL)";
public static SQLiteHelper getInstance(Context context) {
if (instance == null && context != null) {
@ -179,6 +183,8 @@ public class SQLiteHelper extends SQLiteOpenHelper {
values.put(CITIES_TO_WATCH_INVERTER_EFFICIENCY,city.getInverterEfficiency());
values.put(CITIES_TO_WATCH_AZIMUTH_ANGLE,city.getAzimuthAngle());
values.put(CITIES_TO_WATCH_TILT_ANGLE,city.getTiltAngle());
values.put(CITIES_TO_WATCH_SHADING_ELEVATION,city.getShadingElevationString());
values.put(CITIES_TO_WATCH_SHADING_OPACITY,city.getShadingOpacityString());
long id=database.insert(TABLE_CITIES_TO_WATCH, null, values);
@ -210,6 +216,8 @@ public class SQLiteHelper extends SQLiteOpenHelper {
", " + CITIES_TO_WATCH_INVERTER_EFFICIENCY +
", " + CITIES_TO_WATCH_AZIMUTH_ANGLE +
", " + CITIES_TO_WATCH_TILT_ANGLE +
", " + CITIES_TO_WATCH_SHADING_ELEVATION +
", " + CITIES_TO_WATCH_SHADING_OPACITY +
", " + CITIES_TO_WATCH_COLUMN_RANK +
" FROM " + TABLE_CITIES_TO_WATCH +
" WHERE " + CITIES_TO_WATCH_CITY_ID + " = ?", arguments);
@ -230,7 +238,9 @@ public class SQLiteHelper extends SQLiteOpenHelper {
cityToWatch.setInverterEfficiency(Float.parseFloat(cursor.getString(10)));
cityToWatch.setAzimuthAngle(Float.parseFloat(cursor.getString(11)));
cityToWatch.setTiltAngle(Float.parseFloat(cursor.getString(12)));
cityToWatch.setRank(Integer.parseInt(cursor.getString(13)));
cityToWatch.setShadingElevation(cursor.getString(13));
cityToWatch.setShadingOpacity(cursor.getString(14));
cityToWatch.setRank(Integer.parseInt(cursor.getString(15)));
cursor.close();
}
@ -259,6 +269,8 @@ public class SQLiteHelper extends SQLiteOpenHelper {
", " + CITIES_TO_WATCH_INVERTER_EFFICIENCY +
", " + CITIES_TO_WATCH_AZIMUTH_ANGLE +
", " + CITIES_TO_WATCH_TILT_ANGLE +
", " + CITIES_TO_WATCH_SHADING_ELEVATION +
", " + CITIES_TO_WATCH_SHADING_OPACITY +
", " + CITIES_TO_WATCH_COLUMN_RANK +
" FROM " + TABLE_CITIES_TO_WATCH
, new String[]{});
@ -281,7 +293,9 @@ public class SQLiteHelper extends SQLiteOpenHelper {
cityToWatch.setInverterEfficiency(Float.parseFloat(cursor.getString(10)));
cityToWatch.setAzimuthAngle(Float.parseFloat(cursor.getString(11)));
cityToWatch.setTiltAngle(Float.parseFloat(cursor.getString(12)));
cityToWatch.setRank(Integer.parseInt(cursor.getString(13)));
cityToWatch.setShadingElevation(cursor.getString(13));
cityToWatch.setShadingOpacity(cursor.getString(14));
cityToWatch.setRank(Integer.parseInt(cursor.getString(15)));
cityToWatchList.add(cityToWatch);
} while (cursor.moveToNext());
@ -309,6 +323,8 @@ public class SQLiteHelper extends SQLiteOpenHelper {
values.put(CITIES_TO_WATCH_INVERTER_EFFICIENCY,cityToWatch.getInverterEfficiency());
values.put(CITIES_TO_WATCH_AZIMUTH_ANGLE,cityToWatch.getAzimuthAngle());
values.put(CITIES_TO_WATCH_TILT_ANGLE,cityToWatch.getTiltAngle());
values.put(CITIES_TO_WATCH_SHADING_ELEVATION,cityToWatch.getShadingElevationString());
values.put(CITIES_TO_WATCH_SHADING_OPACITY,cityToWatch.getShadingOpacityString());
database.update(TABLE_CITIES_TO_WATCH, values, CITIES_TO_WATCH_ID + " = ?",
new String[]{String.valueOf(cityToWatch.getId())});