Added basics of Graphic Constraint System

Author: MrsSima

src/EditorPluginInterfaces/EditorPluginInterfaces.csproj

@@ -44,6 +44,7 @@
     </CodeAnalysisRuleSet>
   </PropertyGroup>
   <ItemGroup>
+    <Reference Include="PresentationFramework" />
     <Reference Include="System" />
     <Reference Include="System.Core" />
     <Reference Include="System.Xml.Linq" />
@@ -57,6 +58,7 @@
     <Compile Include="EdgeEventArgs.cs" />
     <Compile Include="ElementEventArgs.cs" />
     <Compile Include="IConsole.cs" />
+    <Compile Include="IElementProvider.cs" />
     <Compile Include="IModel.cs" />
     <Compile Include="IPlugin.cs" />
     <Compile Include="IPalette.cs" />

…lsLib/Controls/Scene/IElementProvider.cs …itorPluginInterfaces/IElementProvider.cssrc/WpfControlsLib/Controls/Scene/IElementProvider.cs renamed to src/EditorPluginInterfaces/IElementProvider.cs src/WpfControlsLib/Controls/Scene/IElementProvider.cs renamed to src/EditorPluginInterfaces/IElementProvider.cs

@@ -12,7 +12,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License. */
 
-namespace WpfControlsLib.Controls.Scene
+namespace EditorPluginInterfaces
 {
     /// <summary>
     /// Something that can say what element scene shall create when someone clicks on it. For example, selected

src/EditorPluginInterfaces/PluginConfig.cs

@@ -14,6 +14,7 @@
 
 namespace EditorPluginInterfaces
 {
+    using System.Windows.Controls;
     using Toolbar;
 
     /// <summary>
@@ -44,7 +45,22 @@ public class PluginConfig
         /// <summary>
         /// Palette's reference that should be given to plugin
         /// </summary>
-        public IPalette Palette { get; }
+        public IElementProvider ElementProvider { get; }
+
+        /// <summary>
+        /// DockPanel for Constraints plugin that should be given to plugin
+        /// </summary>
+        public Grid ConstraintsGrid { get; }
+
+        /// <summary>
+        /// RightPanel
+        /// </summary>
+        public Grid RightPanel { get; }
+
+        /// <summary>
+        /// RightPanel
+        /// </summary>
+        public Grid SceneGrid { get; }
 
         /// <summary>
         /// Initializes a new instance of <see cref="PluginConfig"/> 
@@ -54,14 +70,17 @@ public class PluginConfig
         /// <param name="scene">Scene</param>
         /// <param name="toolbar">Toolbar</param>
         /// <param name="console">Console</param>
-        /// <param name="palette">Palette</param>
-        public PluginConfig(IModel model, IScene scene, IToolbar toolbar, IConsole console, IPalette palette)
+        /// <param name="elementProvider">Element provider</param>
+        public PluginConfig(IModel model, IScene scene, IToolbar toolbar, IConsole console, IElementProvider elementProvider, Grid constraintsGrid, Grid rightPanel, Grid sceneGrid)
         {
             this.Model = model;
             this.Scene = scene;
             this.Toolbar = toolbar;
             this.Console = console;
-            this.Palette = palette;
+            this.ElementProvider = elementProvider;
+            this.ConstraintsGrid = constraintsGrid;
+            this.RightPanel = rightPanel;
+            this.SceneGrid = sceneGrid;
         }
     }
 }

src/WpfControlsLib/Controls/Palette/Palette.xaml.cs

@@ -12,6 +12,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License. */
 
+using EditorPluginInterfaces;
 using System.Windows;
 using System.Windows.Controls;
 using System.Windows.Controls.Primitives;
@@ -22,7 +23,7 @@ namespace WpfControlsLib.Controls.Palette
     /// <summary>
     /// Palette with elements of a visual language.
     /// </summary>
-    public partial class Palette : UserControl
+    public partial class Palette : UserControl, IPalette
     {
         private bool isInDrag;
         private readonly PaletteViewModel paletteViewModel;

src/WpfControlsLib/Controls/Scene/Scene.xaml.cs

@@ -31,11 +31,12 @@ namespace WpfControlsLib.Controls.Scene
     using WpfControlsLib.Controls.Scene.EventArguments;
     using WpfControlsLib.Model;
     using WpfControlsLib.ViewModel;
+    using EditorPluginInterfaces;
 
     /// <summary>
     /// Visualizes  model graph and makes it possible for a user to interact with it.
     /// </summary>
-    public partial class Scene : UserControl
+    public partial class Scene : UserControl, IScene
     {
         private readonly EditorObjectManager editorManager;
         private VertexControl previosVertex;

src/WpfControlsLib/Model/Graph.cs

@@ -72,8 +72,6 @@ public void InitModel(string modelName)
 
             foreach (var edge in model.Edges)
             {
-                /* var isViolation = Constraints.CheckEdge(edgeViewModel, this.repo, modelName); */
-
                 var sourceNode = edge.From as INode;
                 var targetNode = edge.To as INode;
                 if (sourceNode == null || targetNode == null)

src/WpfControlsLib/WpfControlsLib.csproj

@@ -129,7 +129,6 @@
     <Compile Include="Controls\Scene\EventArguments\ElementAddedEventArgs.cs" />
     <Compile Include="Controls\Scene\EventArguments\ElementRemovedEventArgs.cs" />
     <Compile Include="Controls\Scene\Geometry.cs" />
-    <Compile Include="Controls\Scene\IElementProvider.cs" />
     <Compile Include="Controls\Scene\EventArguments\NodeSelectedEventArgs.cs" />
     <Compile Include="Controls\Scene\Scene.xaml.cs">
       <DependentUpon>Scene.xaml</DependentUpon>

src/WpfEditor/View/MainWindow.xaml

@@ -53,8 +53,8 @@
         </Grid.RowDefinitions>
 
         <Grid.ColumnDefinitions>
-            <ColumnDefinition Width="*" MinWidth="100"/>
             <ColumnDefinition Width="Auto"/>
+            <ColumnDefinition Width="*"/>
             <ColumnDefinition Width="Auto"/>
         </Grid.ColumnDefinitions>
 
@@ -70,8 +70,16 @@
             </MenuItem>
         </Menu>
 
+        <!-- LeftPanel -->
+        <Grid
+            x:Name="constraintsGrid"
+            Grid.Row="1"
+            Grid.Column="0"
+            HorizontalAlignment="Left"/>
+
+
         <!-- Area and console -->
-        <Grid Grid.Row="1" Grid.Column="0">
+        <Grid Grid.Row="1" Grid.Column="1">
 
             <Grid.RowDefinitions>
                 <RowDefinition Height="Auto"/>
@@ -84,9 +92,11 @@
             <toolbar:ToolbarView x:Name="toolBar" Grid.Row="0" DataContext="{Binding Toolbar}"/>
 
             <!-- Scene area -->
-            <scene:Scene Grid.Row="1" x:Name="scene"/>
+            <Grid x:Name="sceneGrid"  Grid.Row="1">
+                <scene:Scene  x:Name="scene"/>
+                </Grid>
 
-            <!-- GridSplitter for console -->
+                    <!-- GridSplitter for console -->
             <GridSplitter Grid.Row ="2" HorizontalAlignment="Stretch" VerticalAlignment="Center" Height="5"/>
 
             <!-- Console with error messages -->
@@ -95,10 +105,10 @@
         </Grid>
 
         <!-- GridSplitter for RightPanel-->
-        <GridSplitter Grid.Row="1" Grid.Column="1" VerticalAlignment="Stretch" HorizontalAlignment="Center" Width="5"/>
+        <GridSplitter Grid.Row="1" Grid.Column="2" VerticalAlignment="Stretch" HorizontalAlignment="Center" Width="5"/>
 
         <!-- RightPanel -->
-        <DockPanel Grid.Row="1" Grid.Column="2">
+        <DockPanel Grid.Row="1" Grid.Column="3">
             <Grid x:Name="rightPanel">
                 <Grid.RowDefinitions>
                     <RowDefinition Height="Auto"/>
@@ -125,13 +135,6 @@
                         <DataGridTextColumn Header="Value" IsReadOnly="False" Binding="{Binding Value}"/>
                     </DataGrid.Columns>
                 </DataGrid>
-
-                <Button 
-                    Grid.Row="5"
-                    Content="Constraints"
-                    HorizontalAlignment="Stretch"
-                    VerticalAlignment="Bottom"
-                    Click="ConstraintsButtonClick" Height="26"/>
             </Grid>
 
         </DockPanel>

src/WpfEditor/View/MainWindow.xaml.cs

@@ -43,6 +43,8 @@ internal partial class MainWindow : INotifyPropertyChanged
 
         public ToolbarViewModel Toolbar { get; } = new ToolbarViewModel();
 
+        private IElementProvider temporaryElementProvider;
+
         public string WindowTitle
         {
             get
@@ -83,7 +85,8 @@ public MainWindow()
             this.scene.NodeSelected += (sender, args) => this.attributesView.DataContext = args.Node;
             this.scene.EdgeSelected += (sender, args) => this.attributesView.DataContext = args.Edge;
 
-            this.scene.Init(this.model, this.controller, new PaletteAdapter(this.palette));
+            this.temporaryElementProvider = new PaletteAdapter(this.palette);
+            this.scene.Init(this.model, this.controller, this.temporaryElementProvider);
 
             this.modelSelector.Init(this.model);
             this.modelSelector.ChangeModel(2);
@@ -130,7 +133,7 @@ private void InitAndLaunchPlugins()
             foreach (var plugindir in pluginDirs)
             {
                 var dirs = new List<string>(System.IO.Directory.GetDirectories(plugindir + "/bin"));
-                var config = new PluginConfig(this.model, null, null, this.Console, null);
+                var config = new PluginConfig(this.model, this.scene, null, this.Console, this.temporaryElementProvider, this.constraintsGrid, this.rightPanel, this.sceneGrid);
                 foreach (var dir in dirs)
                 {
                     libs.LaunchPlugins(dir, config);