tweaked load messages (no newline after)

xplan001 · Jul 20, 2016 · eb341b9 · eb341b9
1 parent aa1055a
commit eb341b9
Show file tree

Hide file tree

Showing 9 changed files with 60 additions and 23 deletions.
diff --git a/APP.LSP b/APP.LSP
@@ -101,7 +101,7 @@
     (strcat
         "\n:: APP.lsp loaded. | \\U+00A9 J.D. Sandifer "
         (menucmd "m=$(edtime,0,yyyy)")
-        " ::\n"
+        " ::"
     )
 )
 (princ)

diff --git a/COUNT_RAIL.lsp b/COUNT_RAIL.lsp
@@ -79,20 +79,20 @@
 
 ;;; Counts toprail (mlines) and infill/bottom rail (plines).
 (defun C:cr ( / stockLength roundingFactorToprail
-								roundingFactorInfill layerToCountToprail fudgeFactorToAddToprail fudgeFactorToAddInfill layerToCountInfill selSet subset isConfirmed)
-	(setq stockLength 240)
+					 roundingFactorInfill layerToCountToprail 
+					 fudgeFactorToAddToprail fudgeFactorToAddInfill 
+					 layerToCountInfill selSet subset isConfirmed)
+
+	(setq stockLength 242)
 	(setq roundingFactorToprail 3
 			fudgeFactorToAddToprail 9
 			layerToCountToprail "1")
 	(setq roundingFactorInfill 2
 			fudgeFactorToAddInfill 1
 			layerToCountInfill "Center")
-
+				
 	(setq selSet (ssget (list '(0 . "mline,*polyline")
-										(cons 8 
-											(strcat layerToCountToprail
-													  ","
-													  layerToCountInfill)))))
+										(cons 8 (strcat layerToCountToprail "," layerToCountInfill)))))
 
 	;(JD:HighlightSelectionSet nil selSet)
 	;(JD:HighlightSelectionSet T
@@ -130,7 +130,7 @@
    ;; Save system variables
 	(JD:SaveVar "osmode" 'systemVariables)
 	(JD:SaveVar "dimzin" 'systemVariables)
-	(princ "system variable saves")
+	(princ "System variables saved.")
 
    ;; Set defaults (only do global variables if they aren't set yet)
    (MakeVarNotNil '*stockLength* 242)
@@ -428,9 +428,10 @@
       ;;end of cut list
       (cond
 			((or (>= currentCutIndex (length cutList))
-				  (<= stockLengthLeft 0)(<= (length cutList) 0))
+				  (<= stockLengthLeft 0)
+				  (<= (length cutList) 0))
 				(setq currentCutIndex 0)
-
+										
 				;;add scrap to the full cut list and prep for the next loop
 				(if (= stockLengthLeft -0.125)
 					(JD:PutHash "scrap" 0 'finalCutList)
@@ -440,6 +441,7 @@
 				(JD:ClearHash 'finalCutList)
 
 				(setq stockLengthLeft 0)))) ;end of while loop	
+
    stockLengthsNeeded)
 
 
@@ -492,7 +494,7 @@
     (strcat
         "\n:: COUNT_RAIL.lsp loaded. | \\U+00A9 J.D. Sandifer "
         (menucmd "m=$(edtime,0,yyyy)")
-        " ::\n"))
+        " ::"))
 (princ)
 
 ;;----------------------------------------------------------------------;;

diff --git a/DRAW.lsp b/DRAW.lsp
@@ -20,7 +20,7 @@
 	(setq FUZZ_FACTOR 0.001)
 	(if (not (equal startPt endPt FUZZ_FACTOR))		; Check pts are valid.
    	(command "._arc" "c" centerPt startPt endPt))
-	nil)	
+	nil)
 
 
 
@@ -30,7 +30,7 @@
     (strcat
         "\n:: DRAW.lsp loaded. | \\U+00A9 J.D. Sandifer "
         (menucmd "m=$(edtime,0,yyyy)")
-        " ::\n"))
+        " ::"))
 (princ)
 
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;

diff --git a/DRAW_PLAN.LSP b/DRAW_PLAN.LSP
@@ -362,7 +362,7 @@
    (strcat
       "\n:: DRAW_PLAN.lsp loaded. | \\U+00A9 J.D. Sandifer "
       (menucmd "m=$(edtime,0,yyyy)")
-      " ::\n"))
+      " ::"))
 (princ)
 
 ;-------------------------------------------------------------------------;

diff --git a/FUNCTIONS.LSP b/FUNCTIONS.LSP
@@ -9,6 +9,10 @@
 ;;                                              ;;
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ;;                                              ;;
+;;  06/15/2016                                  ;;
+;;  - Added CarCdr: Return first list item AND  ;;
+;;    remove it from the list.                  ;;
+;;                                              ;;
 ;;  04/13/2016                                  ;;
 ;;  - Added FilterSelectionSet.                 ;;
 ;;                                              ;;
@@ -133,6 +137,16 @@
 
 
 
+;;; JD:CarCdr - same function as car followed by cdr (shortens the list)
+;;; listName [symbol] - name of list to work on
+
+(defun JD:CarCdr (listName / firstItem)
+	(setq firstItem (car (eval listName)))
+	(set listName (cdr (eval listName)))
+	firstItem)
+
+
+
 ;;; MakeVarNotNil - simple function for verifying variables are set and
 ;;;                 giving them a default value if not
 ;;; variableName [symbol] - name of variable to check
@@ -211,9 +225,7 @@
     (strcat
         "\n:: FUNCTIONS.lsp loaded. | \\U+00A9 J.D. Sandifer "
         (menucmd "m=$(edtime,0,yyyy)")
-        " ::\n"
-    )
-)
+        " ::"))
 (princ)
 
 ;;----------------------------------------------------------------------;;

diff --git a/HASH.lsp b/HASH.lsp
@@ -174,4 +174,16 @@
 
 
 
-(princ)		; Clean load
+;;----------------------------------------------------------------------;;
+
+(vl-load-com)
+(princ
+   (strcat
+      "\n:: HASH.lsp loaded. | \\U+00A9 J.D. Sandifer "
+      (menucmd "m=$(edtime,0,yyyy)")
+      " ::"))
+(princ)
+
+;;----------------------------------------------------------------------;;
+;;                             End of File                              ;;
+;;----------------------------------------------------------------------;;
diff --git a/MEASURE.LSP b/MEASURE.LSP
@@ -177,7 +177,7 @@
     (strcat
         "\n:: MEASURE.lsp loaded. | \\U+00A9 J.D. Sandifer "
         (menucmd "m=$(edtime,0,yyyy)")
-        " ::\n"
+        " ::"
     )
 )
 (princ)

diff --git a/SELECTION_SET.lsp b/SELECTION_SET.lsp
@@ -119,7 +119,7 @@
     (strcat
         "\n:: SELECTION_SET.lsp loaded. | \\U+00A9 J.D. Sandifer "
         (menucmd "m=$(edtime,0,yyyy)")
-        " ::\n"))
+        " ::"))
 (princ)
 
 ;;----------------------------------------------------------------------;;

diff --git a/TEST.lsp b/TEST.lsp
@@ -175,6 +175,17 @@
 	;reload code)
 
 
+
+;;----------------------------------------------------------------------;;
+
+(vl-load-com)
+(princ
+   (strcat
+      "\n:: TEST.lsp loaded. | \\U+00A9 J.D. Sandifer "
+      (menucmd "m=$(edtime,0,yyyy)")
+      " ::"))
+(princ)
 
-; Silent load
-(princ)
+;;----------------------------------------------------------------------;;
+;;                             End of File                              ;;
+;;----------------------------------------------------------------------;;
-Original file line number
+Diff line change
@@ Expand Up / @@ -101,7 +101,7 @@ @@
         (strcat
             "\n:: APP.lsp loaded. | \\U+00A9 J.D. Sandifer "
             (menucmd "m=$(edtime,0,yyyy)")
-            " ::\n"
+            " ::"
         )
     )
     (princ)
@@ Expand Down @@