nettika/mattercontrol
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Add cut/copy/paste/save support to scene views

Browse source 
- Issue MatterHackers/MCCentral#2775
Make CTRL-C function as expected in View3DWidget
- Issue MatterHackers/MCCentral#2776
Make CTRL-S function as expected in View3DWidget
This commit is contained in:
John Lewin 2018-02-06 13:31:25 -08:00
parent 64939a7a0d
commit bf800dac36
8 changed files with 151 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

45
PartPreviewWindow/View3D/SceneActions.cs
View file

@ -125,20 +125,49 @@ namespace MatterHackers.MatterControl.PartPreviewWindow
});
}
public static async void DuplicateSelection(this InteractiveScene Scene)
public static async void Cut(this InteractiveScene scene, IObject3D sourceItem = null)
{
if (Scene.HasSelection)
Clipboard.SetText("!--IObjectSelection--!");
ApplicationController.ClipboardItem = scene.SelectedItem.Clone();
scene.DeleteSelection();
}
public static async void Copy(this InteractiveScene scene, IObject3D sourceItem = null)
{
Clipboard.SetText("!--IObjectSelection--!");
ApplicationController.ClipboardItem = scene.SelectedItem.Clone();
}
public static async void Paste(this InteractiveScene scene)
{
if (Clipboard.GetText() == "!--IObjectSelection--!")
{
scene.DuplicateItem(ApplicationController.ClipboardItem);
}
}
public static async void DuplicateItem(this InteractiveScene Scene, IObject3D sourceItem = null)
{
if (sourceItem == null)
{
if (Scene.HasSelection)
{
sourceItem = Scene.SelectedItem;
}
}
if (sourceItem != null)
{
// Copy selected item
IObject3D newItem = await Task.Run(() =>
{
var originalItem = Scene.SelectedItem;
if (originalItem != null)
if (sourceItem != null)
{
if (originalItem is SelectionGroup)
if (sourceItem is SelectionGroup)
{
// the selection is a group of objects that need to be copied
var copyList = originalItem.Children.ToList();
var copyList = sourceItem.Children.ToList();
Scene.SelectedItem = null;
foreach(var item in copyList)
{
@ -154,10 +183,10 @@ namespace MatterHackers.MatterControl.PartPreviewWindow
}
else // the selection can be cloned easily
{
var clonedItem = originalItem.Clone();
var clonedItem = sourceItem.Clone();
// make the name unique
var newName = agg_basics.GetNonCollidingName(originalItem.Name, Scene.Descendants().Select((d) => d.Name));
var newName = agg_basics.GetNonCollidingName(sourceItem.Name, Scene.Descendants().Select((d) => d.Name));
clonedItem.Name = newName;
// More useful if it creates the part in the exact position and then the user can move it.

46
PartPreviewWindow/View3D/View3DWidget.cs
View file

@ -337,10 +337,41 @@ namespace MatterHackers.MatterControl.PartPreviewWindow
}
break;
case Keys.Z:
case Keys.C:
if (keyEvent.Control)
{
scene.UndoBuffer.Undo();
scene.Copy();
keyEvent.Handled = true;
keyEvent.SuppressKeyPress = true;
}
break;
case Keys.S:
if (keyEvent.Control)
{
ApplicationController.Instance.Tasks.Execute(this.SaveChanges);
keyEvent.Handled = true;
keyEvent.SuppressKeyPress = true;
}
break;
case Keys.V:
if (keyEvent.Control)
{
scene.Paste();
keyEvent.Handled = true;
keyEvent.SuppressKeyPress = true;
}
break;
case Keys.X:
if (keyEvent.Control)
{
scene.Cut();
keyEvent.Handled = true;
keyEvent.SuppressKeyPress = true;
}
@ -355,6 +386,17 @@ namespace MatterHackers.MatterControl.PartPreviewWindow
}
break;
case Keys.Z:
if (keyEvent.Control)
{
scene.UndoBuffer.Undo();
keyEvent.Handled = true;
keyEvent.SuppressKeyPress = true;
}
break;
case Keys.Delete:
case Keys.Back:
scene.DeleteSelection();