diff --git a/src/ag-chart.c b/src/ag-chart.c index 044a2c0..3745975 100644 --- a/src/ag-chart.c +++ b/src/ag-chart.c @@ -1549,7 +1549,7 @@ ag_chart_create_svg(AgChart *chart, gsize *length, GError **err) G_ENUM_CLASS(planets_class), gswe_planet_data_get_planet(planet_data) ); - xmlNewProp(node, BAD_CAST "name", BAD_CAST enum_value->value_name); + xmlNewProp(node, BAD_CAST "name", BAD_CAST enum_value->value_nick); value = g_malloc0(12); g_ascii_dtostr(value, 12, gswe_planet_data_get_position(planet_data)); @@ -1598,14 +1598,14 @@ ag_chart_create_svg(AgChart *chart, gsize *length, GError **err) G_ENUM_CLASS(planets_class), gswe_planet_data_get_planet(planet_data) ); - xmlNewProp(node, BAD_CAST "body1", BAD_CAST enum_value->value_name); + xmlNewProp(node, BAD_CAST "body1", BAD_CAST enum_value->value_nick); planet_data = gswe_aspect_data_get_planet2(aspect_data); enum_value = g_enum_get_value( G_ENUM_CLASS(planets_class), gswe_planet_data_get_planet(planet_data) ); - xmlNewProp(node, BAD_CAST "body2", BAD_CAST enum_value->value_name); + xmlNewProp(node, BAD_CAST "body2", BAD_CAST enum_value->value_nick); enum_value = g_enum_get_value( G_ENUM_CLASS(aspects_class), @@ -1643,20 +1643,20 @@ ag_chart_create_svg(AgChart *chart, gsize *length, GError **err) G_ENUM_CLASS(planets_class), gswe_planet_data_get_planet(planet_data) ); - xmlNewProp(node, BAD_CAST "body1", BAD_CAST enum_value->value_name); + xmlNewProp(node, BAD_CAST "body1", BAD_CAST enum_value->value_nick); planet_data = gswe_antiscion_data_get_planet2(antiscion_data); enum_value = g_enum_get_value( G_ENUM_CLASS(planets_class), gswe_planet_data_get_planet(planet_data) ); - xmlNewProp(node, BAD_CAST "body2", BAD_CAST enum_value->value_name); + xmlNewProp(node, BAD_CAST "body2", BAD_CAST enum_value->value_nick); enum_value = g_enum_get_value( G_ENUM_CLASS(antiscia_class), gswe_antiscion_data_get_axis(antiscion_data) ); - xmlNewProp(node, BAD_CAST "axis", BAD_CAST enum_value->value_name); + xmlNewProp(node, BAD_CAST "axis", BAD_CAST enum_value->value_nick); } g_type_class_unref(planets_class); diff --git a/src/ag-window.c b/src/ag-window.c index f6cca78..8ad777c 100644 --- a/src/ag-window.c +++ b/src/ag-window.c @@ -1400,8 +1400,8 @@ ag_window_connection_action(GSimpleAction *action, ); static gchar *js = "aspects = document.getElementById('aspects');\n" \ "antiscia = document.getElementById('antiscia');\n" \ - "aspects.setAttribute('visibility', '%s');\n" \ - "antiscia.setAttribute('visibility', '%s');\n"; + "aspects.setAttribute('display', '%s');\n" \ + "antiscia.setAttribute('display', '%s');\n"; current_state = g_action_get_state(G_ACTION(action)); @@ -1415,10 +1415,10 @@ ag_window_connection_action(GSimpleAction *action, if (strcmp("aspects", state) == 0) { g_debug("Switching to aspects"); - js_code = g_strdup_printf(js, "visible", "hidden"); + js_code = g_strdup_printf(js, "block", "none"); } else if (strcmp("antiscia", state) == 0) { g_debug("Switching to antiscia"); - js_code = g_strdup_printf(js, "hidden", "visible"); + js_code = g_strdup_printf(js, "none", "block"); } else { g_warning("Connection type '%s' is invalid", state); } diff --git a/src/resources/ui/chart-default.css b/src/resources/ui/chart-default.css index 89140d2..cb74e88 100644 --- a/src/resources/ui/chart-default.css +++ b/src/resources/ui/chart-default.css @@ -128,3 +128,9 @@ line.aspect-biquintile { line.aspect-quincunx { stroke: #cc0000; } + +line.antiscion { + stroke-width: 1; + stroke: #000000; + stroke-dasharray: 20,10; +} diff --git a/src/resources/ui/chart-default.xsl b/src/resources/ui/chart-default.xsl index e73f857..168d77c 100644 --- a/src/resources/ui/chart-default.xsl +++ b/src/resources/ui/chart-default.xsl @@ -2,6 +2,7 @@ + + + + + + + + + + planet- + planet planet- + rotate(, 0, 0) + + + + + + + + + + translate(, ) rotate(, , ) + + #_tmpl + + + rotate(180, , ) + + + + + + + + translate(, ) + R + + + + + + + rotate(-345,0,0) translate(,-) rotate(90,,) + + @@ -581,191 +627,151 @@ + - - - point_vertex - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - R - - - - + + + + vertex + + point_vertex + + 0 + False + + + + + + + planet_ + + + + + + + + -desc + + planet_moon_node + + + yes + + + + + + + + + + - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + - - + + + + - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - + + aspect-- + aspect aspect- aspect- aspect- + + + + + + + - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + antiscion-- + antiscion antiscion- antiscion- antiscion- + + + + + +