개정판 9628f54b
dev issue #000 : add text angle
Change-Id: I561848644b5b82213bfd9f2e5d22110b922f8317
DTI_PID/SPPIDConverter/AutoModeling.cs | ||
---|---|---|
117 | 117 |
if (DocumentCoordinateCorrection()) |
118 | 118 |
{ |
119 | 119 |
int AllCount = CalcProgressCount(); |
120 |
|
|
121 | 120 |
SplashScreenManager.ShowForm(typeof(SPPIDSplashScreen), true, true); |
121 |
SplashScreenManager.Default.SendCommand(SPPIDSplashScreen.SplashScreenCommand.SetParent, (IntPtr)radApp.HWnd); |
|
122 | 122 |
SplashScreenManager.Default.SendCommand(SPPIDSplashScreen.SplashScreenCommand.SetAllStep, AllCount); |
123 | 123 |
SplashScreenManager.Default.SendCommand(SPPIDSplashScreen.SplashScreenCommand.SetDocumentName, DocumentLabelText); |
124 |
|
|
124 |
|
|
125 | 125 |
SplashScreenManager.Default.SendCommand(SPPIDSplashScreen.SplashScreenCommand.SetStep, "Priority Symbol Modeling"); |
126 | 126 |
List<Symbol> prioritySymbols = GetPrioritySymbol(); |
127 | 127 |
foreach (var item in prioritySymbols) |
... | ... | |
227 | 227 |
} |
228 | 228 |
catch (Exception ex) |
229 | 229 |
{ |
230 |
SplashScreenManager.Default.SendCommand(SPPIDSplashScreen.SplashScreenCommand.ClearParent, null); |
|
231 |
SplashScreenManager.CloseForm(false); |
|
230 | 232 |
System.Windows.Forms.MessageBox.Show(ex.Message + "\r\n" + ex.StackTrace); |
231 | 233 |
} |
232 | 234 |
finally |
... | ... | |
246 | 248 |
ReleaseCOMObjects(_placement); |
247 | 249 |
|
248 | 250 |
Project_DB.InsertDrawingInfo(document.PATH, drawingNumber, drawingName, document); |
249 |
//SplashScreenManager.Default.SendCommand(SPPIDSplashScreen.SplashScreenCommand.ClearParent, null); |
|
250 |
SplashScreenManager.CloseForm(false); |
|
251 |
if (SplashScreenManager.Default.IsSplashFormVisible) |
|
252 |
{ |
|
253 |
SplashScreenManager.Default.SendCommand(SPPIDSplashScreen.SplashScreenCommand.ClearParent, null); |
|
254 |
SplashScreenManager.CloseForm(false); |
|
255 |
} |
|
251 | 256 |
} |
252 | 257 |
} |
253 | 258 |
|
... | ... | |
3073 | 3078 |
|
3074 | 3079 |
double x = 0; |
3075 | 3080 |
double y = 0; |
3076 |
|
|
3081 |
double angle = text.ANGLE; |
|
3077 | 3082 |
CalcLabelLocation(ref x, ref y, text.SPPID.ORIGINAL_X, text.SPPID.ORIGINAL_Y, text.SPPIDLabelLocation, _ETCSetting.TextLocation); |
3078 | 3083 |
|
3079 |
_LMSymbol = _placement.PIDPlaceSymbol(text.SPPID.MAPPINGNAME, x, y); |
|
3084 |
_LMSymbol = _placement.PIDPlaceSymbol(text.SPPID.MAPPINGNAME, x, y, Rotation: angle);
|
|
3080 | 3085 |
_LMSymbol.Commit(); |
3081 | 3086 |
_LMItemNote = _placement.PIDDataSource.GetItemNote(_LMSymbol.ModelItemID); |
3082 | 3087 |
_LMItemNote.Commit(); |
DTI_PID/SPPIDConverter/ConverterDocking.cs | ||
---|---|---|
21 | 21 |
using Llama; |
22 | 22 |
using DevExpress.XtraSplashScreen; |
23 | 23 |
using Newtonsoft.Json; |
24 |
using System.Runtime.InteropServices; |
|
24 | 25 |
|
25 | 26 |
namespace Converter.SPPID.Wrapper |
26 | 27 |
{ |
... | ... | |
198 | 199 |
MessageBox.Show(Msg.SelectLine, Msg.Warning, MessageBoxButtons.OK, MessageBoxIcon.Warning); |
199 | 200 |
} |
200 | 201 |
|
201 |
static Command command; |
|
202 |
int CmdID; |
|
203 |
string CmdCLSID; |
|
204 |
bool isActiveInPlace; |
|
205 |
CommandTypeConstants CommandTypeConstants; |
|
206 |
string argList; |
|
207 |
string DLLName; |
|
208 |
string HelpFile; |
|
209 |
|
|
210 | 202 |
private void simpleButton1_Click(object sender, EventArgs e) |
211 | 203 |
{ |
212 | 204 |
Placement _placement = new Placement(); |
213 | 205 |
LMADataSource dataSource = new LMADataSource();//placement.PIDDataSource; |
214 | 206 |
|
215 |
LMConnector connector = dataSource.GetConnector(""); |
|
216 |
|
|
217 |
LMSymbol symbol1 = connector.ConnectItem1SymbolObject; |
|
218 |
LMSymbol symbol2 = connector.ConnectItem2SymbolObject; |
|
207 |
|
|
219 | 208 |
|
220 | 209 |
} |
221 |
|
|
210 |
[DllImport("user32.dll")] |
|
211 |
public static extern int FindWindow(string lpClassName, string lpWindowName); |
|
222 | 212 |
|
223 | 213 |
} |
224 | 214 |
} |
내보내기 Unified diff