-
Notifications
You must be signed in to change notification settings - Fork 17
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.
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
Del key and add commands #492
Merged
Merged
Changes from 3 commits
Commits
Show all changes
5 commits
Select commit
Hold shift + click to select a range
d427390
Controls: delete key to delete nodes
moreApi db62f9c
AddCone,AddCylinder,MenuWeights: Add Cylinder and Cone menu entries
moreApi 211ff41
AddCone,AddCylinder,SciView: Add color to Cone and Cylinder functions…
moreApi 0d0b930
Controls, DeleteObject, SciView: ask user to confirm node deletion if…
moreApi 46754d2
Merge branch 'master' into delKeyAndAddCommands
kephale File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,80 @@ | ||
/*- | ||
* #%L | ||
* Scenery-backed 3D visualization package for ImageJ. | ||
* %% | ||
* Copyright (C) 2016 - 2021 SciView developers. | ||
* %% | ||
* Redistribution and use in source and binary forms, with or without | ||
* modification, are permitted provided that the following conditions are met: | ||
* | ||
* 1. Redistributions of source code must retain the above copyright notice, | ||
* this list of conditions and the following disclaimer. | ||
* 2. Redistributions in binary form must reproduce the above copyright notice, | ||
* this list of conditions and the following disclaimer in the documentation | ||
* and/or other materials provided with the distribution. | ||
* | ||
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" | ||
* AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE | ||
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE | ||
* ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDERS OR CONTRIBUTORS BE | ||
* LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR | ||
* CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF | ||
* SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS | ||
* INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN | ||
* CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) | ||
* ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE | ||
* POSSIBILITY OF SUCH DAMAGE. | ||
* #L% | ||
*/ | ||
package sc.iview.commands.edit.add | ||
|
||
import org.joml.Vector3f | ||
import org.scijava.command.Command | ||
import org.scijava.plugin.Menu | ||
import org.scijava.plugin.Parameter | ||
import org.scijava.plugin.Plugin | ||
import org.scijava.util.ColorRGB | ||
import sc.iview.SciView | ||
import sc.iview.commands.MenuWeights.EDIT | ||
import sc.iview.commands.MenuWeights.EDIT_ADD | ||
import sc.iview.commands.MenuWeights.EDIT_ADD_CONE | ||
import sc.iview.commands.MenuWeights.EDIT_ADD_CYLINDER | ||
|
||
/** | ||
* Command to add a box to the scene | ||
* | ||
* @author Jan Tiemann | ||
*/ | ||
@Plugin( | ||
type = Command::class, | ||
menuRoot = "SciView", | ||
menu = [Menu(label = "Edit", weight = EDIT), Menu(label = "Add", weight = EDIT_ADD), Menu( | ||
label = "Cone...", | ||
weight = EDIT_ADD_CONE | ||
)] | ||
) | ||
class AddCone : Command { | ||
|
||
@Parameter | ||
private lateinit var sciView: SciView | ||
|
||
// FIXME | ||
// @Parameter | ||
// private String position = "0; 0; 0"; | ||
|
||
@Parameter | ||
private var height = 1.0f | ||
|
||
@Parameter | ||
private var radius = 1.0f | ||
|
||
@Parameter | ||
private var color: ColorRGB = SciView.DEFAULT_COLOR; | ||
|
||
override fun run() { | ||
//final Vector3 pos = ClearGLVector3.parse( position ); | ||
val pos = Vector3f(0f, 0f, 0f) | ||
|
||
sciView.addCone(pos,radius,height,color,20) | ||
} | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,80 @@ | ||
/*- | ||
* #%L | ||
* Scenery-backed 3D visualization package for ImageJ. | ||
* %% | ||
* Copyright (C) 2016 - 2021 SciView developers. | ||
* %% | ||
* Redistribution and use in source and binary forms, with or without | ||
* modification, are permitted provided that the following conditions are met: | ||
* | ||
* 1. Redistributions of source code must retain the above copyright notice, | ||
* this list of conditions and the following disclaimer. | ||
* 2. Redistributions in binary form must reproduce the above copyright notice, | ||
* this list of conditions and the following disclaimer in the documentation | ||
* and/or other materials provided with the distribution. | ||
* | ||
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" | ||
* AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE | ||
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE | ||
* ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDERS OR CONTRIBUTORS BE | ||
* LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR | ||
* CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF | ||
* SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS | ||
* INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN | ||
* CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) | ||
* ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE | ||
* POSSIBILITY OF SUCH DAMAGE. | ||
* #L% | ||
*/ | ||
package sc.iview.commands.edit.add | ||
|
||
import org.joml.Vector3f | ||
import org.scijava.command.Command | ||
import org.scijava.plugin.Menu | ||
import org.scijava.plugin.Parameter | ||
import org.scijava.plugin.Plugin | ||
import org.scijava.util.ColorRGB | ||
import sc.iview.SciView | ||
import sc.iview.Utils | ||
import sc.iview.commands.MenuWeights.EDIT | ||
import sc.iview.commands.MenuWeights.EDIT_ADD | ||
import sc.iview.commands.MenuWeights.EDIT_ADD_CYLINDER | ||
|
||
/** | ||
* Command to add a box to the scene | ||
* | ||
* @author Jan Tiemann | ||
*/ | ||
@Plugin( | ||
type = Command::class, | ||
menuRoot = "SciView", | ||
menu = [Menu(label = "Edit", weight = EDIT), Menu(label = "Add", weight = EDIT_ADD), Menu( | ||
label = "Cylinder...", | ||
weight = EDIT_ADD_CYLINDER | ||
)] | ||
) | ||
class AddCylinder : Command { | ||
|
||
@Parameter | ||
private lateinit var sciView: SciView | ||
|
||
// FIXME | ||
// @Parameter | ||
// private String position = "0; 0; 0"; | ||
|
||
@Parameter | ||
private var height = 1.0f | ||
|
||
@Parameter | ||
private var radius = 1.0f | ||
|
||
@Parameter | ||
private var color: ColorRGB = SciView.DEFAULT_COLOR; | ||
|
||
override fun run() { | ||
//final Vector3 pos = ClearGLVector3.parse( position ); | ||
val pos = Vector3f(0f, 0f, 0f) | ||
|
||
sciView.addCylinder(pos,radius,height,color,20) | ||
} | ||
} |
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Do we want to warn the user? I think Blender throws up a dialog before deletion. This could be a call to the DeleteObject command and we could have that command contain the dialog warning?