From: kruland2607 Date: Tue, 15 May 2012 21:11:58 +0000 (+0000) Subject: Rename SimulationFragment to SimulationViewFragment. X-Git-Tag: upstream/12.09^2~266 X-Git-Url: https://git.gag.com/?a=commitdiff_plain;h=3357f4e01054de16ee469166bfb2cc83623a0edc;p=debian%2Fopenrocket Rename SimulationFragment to SimulationViewFragment. git-svn-id: https://openrocket.svn.sourceforge.net/svnroot/openrocket/trunk@682 180e2498-e6e9-4542-8430-84ac67f01cd8 --- diff --git a/android/src/net/sf/openrocket/android/rocket/OpenRocketViewer.java b/android/src/net/sf/openrocket/android/rocket/OpenRocketViewer.java index 57799332..a061305f 100644 --- a/android/src/net/sf/openrocket/android/rocket/OpenRocketViewer.java +++ b/android/src/net/sf/openrocket/android/rocket/OpenRocketViewer.java @@ -6,8 +6,8 @@ import net.sf.openrocket.android.ActivityHelpers; import net.sf.openrocket.android.Application; import net.sf.openrocket.android.actionbarcompat.ActionBarFragmentActivity; import net.sf.openrocket.android.simulation.SimulationChart; -import net.sf.openrocket.android.simulation.SimulationFragment; import net.sf.openrocket.android.simulation.SimulationViewActivity; +import net.sf.openrocket.android.simulation.SimulationViewFragment; import net.sf.openrocket.android.util.AndroidLogWrapper; import net.sf.openrocket.document.Simulation; import android.app.AlertDialog; @@ -88,7 +88,7 @@ implements Simulations.OnSimulationSelectedListener if ( /* if multi pane */ sidepane != null ) { SimulationChart chart = new SimulationChart(simulationId); - Fragment graph = SimulationFragment.newInstance(chart); + Fragment graph = SimulationViewFragment.newInstance(chart); FragmentTransaction ft = getSupportFragmentManager().beginTransaction(); ft.setTransition(FragmentTransaction.TRANSIT_FRAGMENT_FADE); diff --git a/android/src/net/sf/openrocket/android/simulation/SimulationFragment.java b/android/src/net/sf/openrocket/android/simulation/SimulationFragment.java deleted file mode 100644 index 60c86822..00000000 --- a/android/src/net/sf/openrocket/android/simulation/SimulationFragment.java +++ /dev/null @@ -1,96 +0,0 @@ - -package net.sf.openrocket.android.simulation; - -import net.sf.openrocket.R; -import net.sf.openrocket.android.Application; -import net.sf.openrocket.document.OpenRocketDocument; - -import org.achartengine.GraphicalView; -import org.achartengine.chart.XYChart; - -import android.os.Bundle; -import android.support.v4.app.Fragment; -import android.view.LayoutInflater; -import android.view.Menu; -import android.view.MenuInflater; -import android.view.MenuItem; -import android.view.View; -import android.view.ViewGroup; - -/** - * An activity that encapsulates a graphical view of the chart. - */ -public class SimulationFragment extends Fragment implements SimulationSeriesDialog.OnConfirmListener { - - SimulationChart chart; - - ViewGroup container; - - /** The encapsulated graphical view. */ - private GraphicalView mView; - /** The chart to be drawn. */ - private XYChart mChart; - - public static SimulationFragment newInstance( SimulationChart chart ) { - SimulationFragment frag = new SimulationFragment(); - frag.chart = chart; - return frag; - } - - @Override - public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) { - setRetainInstance(true); - setHasOptionsMenu(true); - OpenRocketDocument rocketDocument = ((Application)getActivity().getApplication()).getRocketDocument(); - - this.container = container; - if (savedInstanceState != null ) { - chart = (SimulationChart) savedInstanceState.getSerializable("chart"); - } - mChart = chart.buildChart(rocketDocument); - mView = new GraphicalView(container.getContext(), mChart); - return mView; - } - - @Override - public void onCreateOptionsMenu(Menu menu, MenuInflater inflater) { - inflater.inflate(R.menu.simulation_option_menu, menu); - } - - @Override - public boolean onOptionsItemSelected(MenuItem item) { - switch (item.getItemId()) - { - case R.id.simulation_select_series_menu_option: - SimulationSeriesDialog seriesDialog = SimulationSeriesDialog.newInstance(chart); - seriesDialog.show(getFragmentManager(), "AbraCadaver"); - seriesDialog.setOnConfirmListener(this); - return true; - case R.id.simulation_select_events_menu_option: - SimulationEventsDialog eventsDialog = SimulationEventsDialog.newInstance(chart); - eventsDialog.show(getFragmentManager(), "AbraCadaver"); - return true; - default: - return super.onOptionsItemSelected(item); - } - } - - @Override - public void onConfirm() { - OpenRocketDocument rocketDocument = ((Application)getActivity().getApplication()).getRocketDocument(); - - mChart = chart.buildChart(rocketDocument); - ViewGroup parent = (ViewGroup) mView.getParent(); - parent.removeView(mView); - mView = new GraphicalView(container.getContext(), mChart); - parent.addView(mView); - } - - @Override - public void onSaveInstanceState(Bundle outState) { - super.onSaveInstanceState(outState); - outState.putSerializable("chart", chart); - - } - -} \ No newline at end of file diff --git a/android/src/net/sf/openrocket/android/simulation/SimulationViewActivity.java b/android/src/net/sf/openrocket/android/simulation/SimulationViewActivity.java index 8a478ab4..60b0b7bf 100644 --- a/android/src/net/sf/openrocket/android/simulation/SimulationViewActivity.java +++ b/android/src/net/sf/openrocket/android/simulation/SimulationViewActivity.java @@ -1,18 +1,3 @@ -/** - * Copyright (C) 2009, 2010 SC 4ViewSoft SRL - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ package net.sf.openrocket.android.simulation; import net.sf.openrocket.R; @@ -46,7 +31,7 @@ public class SimulationViewActivity extends FragmentActivity { chart.setSeries1(sim.getSimulatedData().getBranch(0).getTypes()[1]); chart.setSeries2(sim.getSimulatedData().getBranch(0).getTypes()[2]); - Fragment graph = SimulationFragment.newInstance(chart); + Fragment graph = SimulationViewFragment.newInstance(chart); FragmentTransaction ft = getSupportFragmentManager().beginTransaction(); ft.replace(android.R.id.content, graph); diff --git a/android/src/net/sf/openrocket/android/simulation/SimulationViewFragment.java b/android/src/net/sf/openrocket/android/simulation/SimulationViewFragment.java new file mode 100644 index 00000000..212c0b44 --- /dev/null +++ b/android/src/net/sf/openrocket/android/simulation/SimulationViewFragment.java @@ -0,0 +1,96 @@ + +package net.sf.openrocket.android.simulation; + +import net.sf.openrocket.R; +import net.sf.openrocket.android.Application; +import net.sf.openrocket.document.OpenRocketDocument; + +import org.achartengine.GraphicalView; +import org.achartengine.chart.XYChart; + +import android.os.Bundle; +import android.support.v4.app.Fragment; +import android.view.LayoutInflater; +import android.view.Menu; +import android.view.MenuInflater; +import android.view.MenuItem; +import android.view.View; +import android.view.ViewGroup; + +/** + * An activity that encapsulates a graphical view of the chart. + */ +public class SimulationViewFragment extends Fragment implements SimulationSeriesDialog.OnConfirmListener { + + SimulationChart chart; + + ViewGroup container; + + /** The encapsulated graphical view. */ + private GraphicalView mView; + /** The chart to be drawn. */ + private XYChart mChart; + + public static SimulationViewFragment newInstance( SimulationChart chart ) { + SimulationViewFragment frag = new SimulationViewFragment(); + frag.chart = chart; + return frag; + } + + @Override + public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) { + setRetainInstance(true); + setHasOptionsMenu(true); + OpenRocketDocument rocketDocument = ((Application)getActivity().getApplication()).getRocketDocument(); + + this.container = container; + if (savedInstanceState != null ) { + chart = (SimulationChart) savedInstanceState.getSerializable("chart"); + } + mChart = chart.buildChart(rocketDocument); + mView = new GraphicalView(container.getContext(), mChart); + return mView; + } + + @Override + public void onCreateOptionsMenu(Menu menu, MenuInflater inflater) { + inflater.inflate(R.menu.simulation_option_menu, menu); + } + + @Override + public boolean onOptionsItemSelected(MenuItem item) { + switch (item.getItemId()) + { + case R.id.simulation_select_series_menu_option: + SimulationSeriesDialog seriesDialog = SimulationSeriesDialog.newInstance(chart); + seriesDialog.show(getFragmentManager(), "AbraCadaver"); + seriesDialog.setOnConfirmListener(this); + return true; + case R.id.simulation_select_events_menu_option: + SimulationEventsDialog eventsDialog = SimulationEventsDialog.newInstance(chart); + eventsDialog.show(getFragmentManager(), "AbraCadaver"); + return true; + default: + return super.onOptionsItemSelected(item); + } + } + + @Override + public void onConfirm() { + OpenRocketDocument rocketDocument = ((Application)getActivity().getApplication()).getRocketDocument(); + + mChart = chart.buildChart(rocketDocument); + ViewGroup parent = (ViewGroup) mView.getParent(); + parent.removeView(mView); + mView = new GraphicalView(container.getContext(), mChart); + parent.addView(mView); + } + + @Override + public void onSaveInstanceState(Bundle outState) { + super.onSaveInstanceState(outState); + outState.putSerializable("chart", chart); + + } + +} \ No newline at end of file