clear code, readme

chuongmep · chuongmep · commit 63ed721b0121 · 2022-03-17T19:24:32.000+07:00
diff --git a/CADPythonShell/CADPythonShellApplication.cs b/CADPythonShell/CADPythonShellApplication.cs
@@ -1,6 +1,4 @@
 ﻿using System.IO;
-using System.Reflection;
-using System.Reflection.Emit;
 using System.Windows.Media;
 using System.Windows.Media.Imaging;
 using System.Xml.Linq;
@@ -73,44 +71,6 @@ public static ImageSource GetEmbeddedPng(System.Reflection.Assembly app, string
         }
 
 
-        /// <summary>
-        /// Creates a dynamic assembly that contains types for starting the canned commands.
-        /// </summary>
-        private static void CreateCommandLoaderAssembly(XDocument repository, string dllfolder, string dllname)
-        {
-            var assemblyName = new AssemblyName { Name = dllname + ".dll", Version = new Version(1, 0, 0, 0) };
-            var assemblyBuilder = AppDomain.CurrentDomain.DefineDynamicAssembly(assemblyName, AssemblyBuilderAccess.RunAndSave, dllfolder);
-            var moduleBuilder = assemblyBuilder.DefineDynamicModule("CommandLoaderModule", dllname + ".dll");
-
-            foreach (var command in GetCommands(repository))
-            {
-                var typebuilder = moduleBuilder.DefineType("Command" + command.Index,
-                                                        TypeAttributes.Class | TypeAttributes.Public,
-                                                        typeof(CommandLoaderBase));
-
-                // call base constructor with script path
-                var ci = typeof(CommandLoaderBase).GetConstructor(new[] { typeof(string) });
-
-                var constructorBuilder = typebuilder.DefineConstructor(MethodAttributes.Public, CallingConventions.Standard, new Type[0]);
-                var gen = constructorBuilder.GetILGenerator();
-                gen.Emit(OpCodes.Ldarg_0);                // Load "this" onto eval stack
-                gen.Emit(OpCodes.Ldstr, command.Source);  // Load the path to the command as a string onto stack
-                gen.Emit(OpCodes.Call, ci);               // call base constructor (consumes "this" and the string)
-                gen.Emit(OpCodes.Nop);                    // Fill some space - this is how it is generated for equivalent C# code
-                gen.Emit(OpCodes.Nop);
-                gen.Emit(OpCodes.Nop);
-                gen.Emit(OpCodes.Ret);                    // return from constructor
-                typebuilder.CreateType();
-            }
-            assemblyBuilder.Save(dllname + ".dll");
-        }
-
-        public static void OnUnloading()
-        {
-            // FIXME: deallocate the python shell...
-            return;
-        }
-
         public static IRpsConfig GetConfig()
         {
             return new NpsConfig(GetSettingsFile());
diff --git a/CADPythonShell/ConfigureCommand.cs b/CADPythonShell/ConfigureCommand.cs
@@ -1,5 +1,4 @@
-﻿using System.Windows.Interop;
-using Autodesk.AutoCAD.Runtime;
+﻿using Autodesk.AutoCAD.Runtime;
 using Application = Autodesk.AutoCAD.ApplicationServices.Core.Application;
 
 namespace CADPythonShell
diff --git a/CADPythonShell/ConfigureCommandsForm.cs b/CADPythonShell/ConfigureCommandsForm.cs
@@ -1,8 +1,4 @@
-﻿using System;
-using System.Collections.Generic;
-using System.IO;
-using System.Linq;
-using System.Windows.Forms;
+﻿using System.IO;
 
 namespace CADPythonShell
 {
diff --git a/CADPythonShell/IronPythonConsoleApp.cs b/CADPythonShell/IronPythonConsoleApp.cs
@@ -6,6 +6,8 @@ namespace CADPythonShell
 {
     public class IronPythonConsoleApp
     {
+        public const string RibbonTitle = "Python Shell";
+        public const string RibbonId = "PythonShell";
         [CommandMethod("InitPythonConsole")]
         public void Execute()
         {
@@ -16,32 +18,28 @@ void CreateRibbon()
             RibbonControl ribbon = ComponentManager.Ribbon;
             if (ribbon != null)
             {
-                RibbonTab rtab = ribbon.FindTab("PythonShell");
+                RibbonTab rtab = ribbon.FindTab(RibbonId);
                 if (rtab != null)
                 {
                     ribbon.Tabs.Remove(rtab);
                 }
                 rtab = new RibbonTab();
-                rtab.Title = "Python Shell";
-                rtab.Id = "PythonShell";
-                //Add the Tab
+                rtab.Title = RibbonTitle;
+                rtab.Id = RibbonId;
                 ribbon.Tabs.Add(rtab);
-                addContent(rtab);
+                AddContentToTab(rtab);
             }
         }
-        private void addContent(RibbonTab rtab)
+        private void AddContentToTab(RibbonTab rtab)
         {
             rtab.Panels.Add(AddOnePanel());
         }
         static RibbonPanel AddOnePanel()
         {
-            //https://forums.autodesk.com/t5/net/create-custom-ribbon-tab-and-buttons-for-autocad-mechanical-2011/td-p/2834343
             RibbonPanelSource rps = new RibbonPanelSource();
             rps.Title = "Cad Python Shell";
             RibbonPanel rp = new RibbonPanel();
             rp.Source = rps;
-            //Create a Command Item that the Dialog Launcher can use,
-            // for this test it is just a place holder.
             RibbonButton rci = new RibbonButton();
             rci.Name = "Python Shell Console";
             rps.DialogLauncher = rci;
@@ -53,6 +51,7 @@ static RibbonPanel AddOnePanel()
             rb.Name = "Run CPS";
             rb.ShowText = true;
             rb.Text = "Run CPS";
+            rb.Description = "Start Write Python Console\nCommand: PythonShellConsole";
             var addinAssembly = typeof(IronPythonConsoleApp).Assembly;
             rb.Image = CADPythonShellApplication.GetEmbeddedPng(addinAssembly, "CADPythonShell.Resources.Python-16.png");
             rb.LargeImage = CADPythonShellApplication.GetEmbeddedPng(addinAssembly, "CADPythonShell.Resources.Python-32.png");
@@ -66,6 +65,7 @@ static RibbonPanel AddOnePanel()
             rb2.Name = "Configure CPS";
             rb2.ShowText = true;
             rb2.Text = "Configure CPS";
+            rb2.Description = "Configure Cad Python Shell\nCommand: PythonShellSetting";
             rb2.Image = CADPythonShellApplication.GetEmbeddedPng(addinAssembly, "CADPythonShell.Resources.Settings-16.png");
             rb2.LargeImage = CADPythonShellApplication.GetEmbeddedPng(addinAssembly, "CADPythonShell.Resources.Settings-32.png");
             
diff --git a/CADPythonShell/RelayCommand.cs b/CADPythonShell/RelayCommand.cs
@@ -8,14 +8,10 @@ namespace CADPythonShell
     /// </summary>
     public class RelayCommand : ICommand
     {
-        #region Variables
         private readonly Predicate<object> m_canExecute;
         private readonly Action<object> m_execute;
         private readonly Action _act;
 
-        #endregion
-
-        #region Constructor
         public RelayCommand(Action act)
         {
             _act = act;
@@ -31,9 +27,6 @@ public RelayCommand(Action<object> execute, Predicate<object> canExecute = null)
             m_canExecute = canExecute;
         }
 
-        #endregion
-
-        #region Implementation 
         // Evaluate the command if it is valid to execute
         public bool CanExecute(object parameter = null)
         {
@@ -54,9 +47,7 @@ public event EventHandler CanExecuteChanged
             add => CommandManager.RequerySuggested += value;
             remove => CommandManager.RequerySuggested -= value;
         }
-        #endregion
 
-        #region Support
         public class CloseCommand : ICommand
         {
             public bool CanExecute(object parameter)
@@ -76,7 +67,6 @@ public void Execute(object parameter)
                 myWin.Close();
             }
         }
-        #endregion
     }
 }
 
diff --git a/Installer/Installer.cs b/Installer/Installer.cs
@@ -1,7 +1,6 @@
 ﻿using System;
 using System.Collections.Generic;
 using System.IO;
-using System.Linq;
 using System.Text;
 using System.Text.RegularExpressions;
 using WixSharp;
diff --git a/PythonConsoleControl/PythonConsoleControl.xaml b/PythonConsoleControl/PythonConsoleControl.xaml
@@ -1,13 +1,14 @@
-﻿<UserControl x:Class="PythonConsoleControl.IronPythonConsoleControl"
-             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-             xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
-             xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
-             mc:Ignorable="d" 
-             d:DesignHeight="300" d:DesignWidth="300">
-    <!-- 
-	Copyright (c) 2010 Joe Moorhouse
+﻿<UserControl
+    x:Class="PythonConsoleControl.IronPythonConsoleControl"
+    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+    d:DesignHeight="300"
+    d:DesignWidth="300"
+    mc:Ignorable="d">
+    <!--
+        Copyright (c) 2010 Joe Moorhouse
     -->
-    <Grid Name="grid">            
-    </Grid>
+    <Grid Name="grid" />
 </UserControl>
diff --git a/README.md b/README.md
@@ -39,12 +39,14 @@ The biggest limitation is that you can't deploy DLLs with custom scripts at this
 
 - Download last install stable(msi) from [Release](https://github.com/chuongmep/CADPythonShell/releases/latest)
 - Use command `PythonConsole` to open Console or use command `PythonShellSetting` to open form setting
+- See guide install detail at [How-to-Install-CadPythonShell](https://github.com/chuongmep/CadPythonShell/wiki/How-to-Install-CadPythonShell)
 
 Note : Support for 4 last version(2018-2022) Autocad or Civil 3D. Older versions can be used but will not guarantee the expected performance.
 
+
 ## How to use
 
-- Open Python Console from Command Line or button APS in Ribbon.
+- Open Python Console from Command Line or button CPS in Ribbon.
 
 ![](Images/pythoncmd.png)
 
diff --git a/Setup/icon.ico b/Setup/icon.ico

Original file line number	Diff line number	Diff line change
`@@ -1,8 +1,4 @@`
`1`		`-using System;`
`2`		`-using System.Collections.Generic;`
`3`		`-using System.IO;`
`4`		`-using System.Linq;`
`5`		`-using System.Windows.Forms;`
	`1`	`+using System.IO;`
`6`	`2`
`7`	`3`	`namespace CADPythonShell`
`8`	`4`	`{`
Original file line number	Diff line number	Diff line change
`@@ -6,6 +6,8 @@ namespace CADPythonShell`
`6`	`6`	`{`
`7`	`7`	`public class IronPythonConsoleApp`
`8`	`8`	`{`
	`9`	`+ public const string RibbonTitle = "Python Shell";`
	`10`	`+ public const string RibbonId = "PythonShell";`
`9`	`11`	`[CommandMethod("InitPythonConsole")]`
`10`	`12`	`public void Execute()`
`11`	`13`	`{`
`@@ -16,32 +18,28 @@ void CreateRibbon()`
`16`	`18`	`RibbonControl ribbon = ComponentManager.Ribbon;`
`17`	`19`	`if (ribbon != null)`
`18`	`20`	`{`
`19`		`- RibbonTab rtab = ribbon.FindTab("PythonShell");`
	`21`	`+ RibbonTab rtab = ribbon.FindTab(RibbonId);`
`20`	`22`	`if (rtab != null)`
`21`	`23`	`{`
`22`	`24`	`ribbon.Tabs.Remove(rtab);`
`23`	`25`	`}`
`24`	`26`	`rtab = new RibbonTab();`
`25`		`- rtab.Title = "Python Shell";`
`26`		`- rtab.Id = "PythonShell";`
`27`		`- //Add the Tab`
	`27`	`+ rtab.Title = RibbonTitle;`
	`28`	`+ rtab.Id = RibbonId;`
`28`	`29`	`ribbon.Tabs.Add(rtab);`
`29`		`- addContent(rtab);`
	`30`	`+ AddContentToTab(rtab);`
`30`	`31`	`}`
`31`	`32`	`}`
`32`		`- private void addContent(RibbonTab rtab)`
	`33`	`+ private void AddContentToTab(RibbonTab rtab)`
`33`	`34`	`{`
`34`	`35`	`rtab.Panels.Add(AddOnePanel());`
`35`	`36`	`}`
`36`	`37`	`static RibbonPanel AddOnePanel()`
`37`	`38`	`{`
`38`		`- //https://forums.autodesk.com/t5/net/create-custom-ribbon-tab-and-buttons-for-autocad-mechanical-2011/td-p/2834343`
`39`	`39`	`RibbonPanelSource rps = new RibbonPanelSource();`
`40`	`40`	`rps.Title = "Cad Python Shell";`
`41`	`41`	`RibbonPanel rp = new RibbonPanel();`
`42`	`42`	`rp.Source = rps;`
`43`		`- //Create a Command Item that the Dialog Launcher can use,`
`44`		`- // for this test it is just a place holder.`
`45`	`43`	`RibbonButton rci = new RibbonButton();`
`46`	`44`	`rci.Name = "Python Shell Console";`
`47`	`45`	`rps.DialogLauncher = rci;`
`@@ -53,6 +51,7 @@ static RibbonPanel AddOnePanel()`
`53`	`51`	`rb.Name = "Run CPS";`
`54`	`52`	`rb.ShowText = true;`
`55`	`53`	`rb.Text = "Run CPS";`
	`54`	`+ rb.Description = "Start Write Python Console\nCommand: PythonShellConsole";`
`56`	`55`	`var addinAssembly = typeof(IronPythonConsoleApp).Assembly;`
`57`	`56`	`rb.Image = CADPythonShellApplication.GetEmbeddedPng(addinAssembly, "CADPythonShell.Resources.Python-16.png");`
`58`	`57`	`rb.LargeImage = CADPythonShellApplication.GetEmbeddedPng(addinAssembly, "CADPythonShell.Resources.Python-32.png");`
`@@ -66,6 +65,7 @@ static RibbonPanel AddOnePanel()`
`66`	`65`	`rb2.Name = "Configure CPS";`
`67`	`66`	`rb2.ShowText = true;`
`68`	`67`	`rb2.Text = "Configure CPS";`
	`68`	`+ rb2.Description = "Configure Cad Python Shell\nCommand: PythonShellSetting";`
`69`	`69`	`rb2.Image = CADPythonShellApplication.GetEmbeddedPng(addinAssembly, "CADPythonShell.Resources.Settings-16.png");`
`70`	`70`	`rb2.LargeImage = CADPythonShellApplication.GetEmbeddedPng(addinAssembly, "CADPythonShell.Resources.Settings-32.png");`
`71`	`71`
Original file line number	Diff line number	Diff line change
`@@ -8,14 +8,10 @@ namespace CADPythonShell`
`8`	`8`	`/// </summary>`
`9`	`9`	`public class RelayCommand : ICommand`
`10`	`10`	`{`
`11`		`- #region Variables`
`12`	`11`	`private readonly Predicate<object> m_canExecute;`
`13`	`12`	`private readonly Action<object> m_execute;`
`14`	`13`	`private readonly Action _act;`
`15`	`14`
`16`		`- #endregion`
`17`		`-`
`18`		`- #region Constructor`
`19`	`15`	`public RelayCommand(Action act)`
`20`	`16`	`{`
`21`	`17`	`_act = act;`
`@@ -31,9 +27,6 @@ public RelayCommand(Action<object> execute, Predicate<object> canExecute = null)`
`31`	`27`	`m_canExecute = canExecute;`
`32`	`28`	`}`
`33`	`29`
`34`		`- #endregion`
`35`		`-`
`36`		`- #region Implementation`
`37`	`30`	`// Evaluate the command if it is valid to execute`
`38`	`31`	`public bool CanExecute(object parameter = null)`
`39`	`32`	`{`
`@@ -54,9 +47,7 @@ public event EventHandler CanExecuteChanged`
`54`	`47`	`add => CommandManager.RequerySuggested += value;`
`55`	`48`	`remove => CommandManager.RequerySuggested -= value;`
`56`	`49`	`}`
`57`		`- #endregion`
`58`	`50`
`59`		`- #region Support`
`60`	`51`	`public class CloseCommand : ICommand`
`61`	`52`	`{`
`62`	`53`	`public bool CanExecute(object parameter)`
`@@ -76,7 +67,6 @@ public void Execute(object parameter)`
`76`	`67`	`myWin.Close();`
`77`	`68`	`}`
`78`	`69`	`}`
`79`		`- #endregion`
`80`	`70`	`}`
`81`	`71`	`}`
`82`	`72`