hongshaorou/openrocket
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Moved PhotoSettings back to Swing

Browse Source
This commit is contained in:
Sibo Van Gool 2021-07-01 02:01:42 +02:00 committed by Billy Olsen
parent 1a575c2a12
commit 074b7a842a
5 changed files with 2 additions and 57 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

52
.idea/misc.xml generated
View File

@ -1,52 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="ProjectInspectionProfilesVisibleTreeState">
<entry key="Project Default">
<profile-state>
<expanded-state>
<State>
<id />
</State>
<State>
<id>Class structure</id>
</State>
<State>
<id>Code maturity issues</id>
</State>
<State>
<id>Java language level migration aids</id>
</State>
<State>
<id>Javadoc issues</id>
</State>
<State>
<id>Performance issues</id>
</State>
<State>
<id>Portability issues</id>
</State>
<State>
<id>Probable bugs</id>
</State>
<State>
<id>Resource management issues</id>
</State>
<State>
<id>TestNG</id>
</State>
<State>
<id>Threading issues</id>
</State>
</expanded-state>
<selected-state>
<State>
<id>Abstraction issues</id>
</State>
</selected-state>
</profile-state>
</entry>
</component>
<component name="ProjectRootManager" version="2" languageLevel="JDK_10" project-jdk-name="11" project-jdk-type="JavaSDK">
<output url="file://$PROJECT_DIR$/out" />
</component>
</project>

3
core/src/net/sf/openrocket/file/openrocket/savers/PhotoStudioSaver.java
View File

@ -1,6 +1,5 @@
package net.sf.openrocket.file.openrocket.savers; package net.sf.openrocket.file.openrocket.savers;
import
import net.sf.openrocket.document.PhotoSettings;
import net.sf.openrocket.util.Color; import net.sf.openrocket.util.Color;
import java.util.ArrayList; import java.util.ArrayList;

1
swing/src/net/sf/openrocket/gui/figure3d/photo/PhotoPanel.java
View File

@ -31,7 +31,6 @@ import javax.swing.JPanel;
import javax.swing.JPopupMenu; import javax.swing.JPopupMenu;
import javax.swing.event.MouseInputAdapter; import javax.swing.event.MouseInputAdapter;
import net.sf.openrocket.document.PhotoSettings;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;

2
core/src/net/sf/openrocket/document/PhotoSettings.java → swing/src/net/sf/openrocket/gui/figure3d/photo/PhotoSettings.java
View File

@ -1,4 +1,4 @@
package net.sf.openrocket.document; package net.sf.openrocket.gui.figure3d.photo;
import net.sf.openrocket.gui.figure3d.photo.exhaust.FlameRenderer.FlameSettings; import net.sf.openrocket.gui.figure3d.photo.exhaust.FlameRenderer.FlameSettings;
import net.sf.openrocket.gui.figure3d.photo.sky.Sky; import net.sf.openrocket.gui.figure3d.photo.sky.Sky;

1
swing/src/net/sf/openrocket/gui/figure3d/photo/PhotoSettingsConfig.java
View File

@ -25,7 +25,6 @@ import javax.swing.event.ChangeListener;
import com.jogamp.opengl.GL2; import com.jogamp.opengl.GL2;
import net.miginfocom.swing.MigLayout; import net.miginfocom.swing.MigLayout;
import net.sf.openrocket.document.PhotoSettings;
import net.sf.openrocket.gui.adaptors.BooleanModel; import net.sf.openrocket.gui.adaptors.BooleanModel;
import net.sf.openrocket.gui.adaptors.DoubleModel; import net.sf.openrocket.gui.adaptors.DoubleModel;
import net.sf.openrocket.gui.components.ColorIcon; import net.sf.openrocket.gui.components.ColorIcon;