From b038e666150660e88dfe2a92b1f9e79e470eeac2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jorge=20V=C3=A1squez=20P=C3=A9rez?=
 <yorch.vasquez@gmail.com>
Date: Thu, 13 Apr 2017 15:30:13 -0700
Subject: [PATCH] Reorganized some functions on corresponding scripts to make
 it clearer of what was supposed to go in each one

---
 ScriptUI Panels/yToolBox.jsx    |  4 ++
 yScripts/usefulFunctions.jsx    | 29 ++++-------
 yScripts/y_AFXExtensions.jsx    |  4 +-
 yScripts/y_GenericNewScript.jsx | 90 +--------------------------------
 yScripts/y_JSExtensions.jsx     | 12 ++---
 5 files changed, 20 insertions(+), 119 deletions(-)

diff --git a/ScriptUI Panels/yToolBox.jsx b/ScriptUI Panels/yToolBox.jsx
index 32afe68..971fe78 100644
--- a/ScriptUI Panels/yToolBox.jsx	
+++ b/ScriptUI Panels/yToolBox.jsx	
@@ -81,6 +81,7 @@ YTB =
         /**** TO DO ****/
         // Check that the tool object is unique.
         // Call for a window resize so it refreshes propperly.
+        //alert( aTool.info.name );
         
         this.tools.push( aTool );
 
@@ -92,6 +93,7 @@ YTB =
         //alert(btn.onClick);
 
         this.window.layout.layout(true);
+        this.window.layout.resize();
         
         return aTool;
         
@@ -117,8 +119,10 @@ YTB =
 YTB.init();
 
 #include "../yScripts/y_setStructure.jsx";
+#include "../yScripts/y_CompHerder.jsx";
 #include "../yScripts/y_colorProbe.jsx";
 #include "../yScripts/y_BindBetween2.jsx";
 #include "../yScripts/y_CPOffset.jsx";
 #include "../yScripts/y_puppetRig.jsx";
 #include "../yScripts/y_stopMotionLayer.jsx";
+
diff --git a/yScripts/usefulFunctions.jsx b/yScripts/usefulFunctions.jsx
index b6b35e0..cb679a5 100755
--- a/yScripts/usefulFunctions.jsx
+++ b/yScripts/usefulFunctions.jsx
@@ -1,20 +1,7 @@
 #include "y_JSExtensions.jsx";
-/*
-if (Array.prototype.getOne==null) Array.prototype.getOne=function(item){    //Extends the Array class with the getOne functions wich 
-    var val = -1;
-    for(i=0;i<=this.length;i++){
-        if(this[i]==item){
-            var val = i;
-            }
-        }
-   return val;
-}
-*/
-function sortNumber(a,b)
-{
+function sortNumber(a,b){
 return a - b;
 }
-
 function pad(n,i){ //pad n with ceroes up to i places.
     if (String(n).length>=i){
         return String(n)
@@ -27,8 +14,6 @@ function pad(n,i){ //pad n with ceroes up to i places.
         return padding+String(n)
 }
 }
-
-
 function yUniStr(str){
     if (app.project.activeItem != null) {
         myLayers = app.project.activeItem.layers;
@@ -67,7 +52,6 @@ function getBaseName(str){
            return str;
            };
     }
-
 function getFirstGap(array){
     length = array.length
     array.sort(function sortNumber(a,b){return a-b})
@@ -92,8 +76,6 @@ function yReplace(inputSTR,replaceSTR,replacementSTR){
         }
     return tmpSTR;
     }
-
-
 function genStamp(args){
     d = new Date();
     //alert(d.getMonth());
@@ -103,7 +85,6 @@ function genStamp(args){
     str = String(m)+String(d)+String(y); 
 return str
 }
-
 function mergeMultiLine(_str){
     var re = new RegExp('[\n\r]');
     _lines = _str.split(re);
@@ -128,3 +109,11 @@ function mergeMultiLine(_str){
     }
     return newStr;
 }
+function yFactor(n,f){
+    if((typeof(n)=='number'&&typeof(f)=='number')&&(n>f)){
+        value = n - (n%f);
+        return(value);
+    }else{
+        alert('error');
+    }
+}
diff --git a/yScripts/y_AFXExtensions.jsx b/yScripts/y_AFXExtensions.jsx
index 9a2b119..6d627b6 100755
--- a/yScripts/y_AFXExtensions.jsx
+++ b/yScripts/y_AFXExtensions.jsx
@@ -1,4 +1,6 @@
-if (AVLayer.prototype. getPins==null) AVLayer.prototype. getPins=function(){    //Extends the AVLayer class with the getPinsfunctions which returns the Layer's property groups which are pins.
+//Useful extensions to AFX Extendscript classes.
+
+if (AVLayer.prototype. getPins==null) AVLayer.prototype. getPins=function(){    //Extends the AVLayer class with the getPinsfunctions which returns the Layer's property groups which are pins.
     this.selectedPins = [];
   for(prop=0;prop<this.selectedProperties.length;prop++){
       p= this.selectedProperties[prop];
diff --git a/yScripts/y_GenericNewScript.jsx b/yScripts/y_GenericNewScript.jsx
index 75182c0..c9be872 100755
--- a/yScripts/y_GenericNewScript.jsx
+++ b/yScripts/y_GenericNewScript.jsx
@@ -1,89 +1 @@
-#include "../yScripts/y_JSExtensions.jsx";
-function YGenericTool()
-{
-    this.info =
-    {
-	name : "yGenericTool",
-	version : 0.1,
-	stage : "development",
-	description : "Generic script to use as a base for new tools.",
-	url : "yorchnet.com"
-    };
-    this.appearence =
-    {
-	buttonHeight : 30,
-	buttonWidth : 126
-    };
-    this.resources = 
-    {
-	icon : new File('yNet.png'),
-    };
-    this.init = function init()
-    {
-        
-	this.btnLauyout = 
-	"button\
-	 {\
-	    preferredSize: ['" + this.appearence.buttonWidth + "','" + this.appearence.buttonHeight + "'],\
-	    text:'" + this.info.name + "',\
-	    helpTip:'" + this.info.description + "'\
-	 }";
-	
-	this. res = 
-	 "window\
-	{\
-	    type:'palette',\
-	    text:'" + this.info.name + ' ' + this.info.ver + ' ' + this.info.stage + "',\
-	    info: Group \
-	    {\
-		alignment:['center','bottom'],\
-		icon: Image \
-		{\
-		    icon:'" + this.resources.icon.path + '/' + this.resources.icon.name + "',\
-		    preferredSize: [15, 18]\
-		},\
-		website: StaticText\
-		{\
-		    text:'" + this.info.url + "',\
-		    alignment:['fill','center']\
-		},\
-	    }\
-	}";
-    }
-    this.createUI = function createUI()
-    {
-	    res = 
-	    "window {\
-		resizeable : true\
-		closeButton : true\
-		text:'wtf'\
-	    }"		    
-		
-	this.window = new Window( res );
-	this.window.layout.layout(true);
-	this.window.center();
-	this.window.show();
-    }
-    this.yMainFunction = function yMainFunction()
-    {
-        this.createUI();
-    }
-    this.activate = function activate()
-    {
-	this.yTool.yMainFunction();
-    }
-    
-    this.init();
-    return this;
-}
-
-//CHECKS that the toolbox exists, and if it doesn´t it runs the script on its own.
-if (typeof(YTB)=='undefined')
-{
-    yGenericTool = new YGenericTool();
-    yGenericTool.activate();
-}
-else
-{
-    YTB.addTool(new YGenericTool());
-}
+#include "../yScripts/y_JSExtensions.jsx";

function GenericTool()
{
    this.info =
    {
	name : "GenericTool",
	version : 0.1,
	stage : "development",
	description : "Generic script to use as a base for new tools.",
	url : "yorchnet.com"
    };
    this.appearence =
    {
	buttonHeight : 30,
	buttonWidth : 126
    };
    this.resources = 
    {
	icon : new File('yNet.png'),
    };
    this.methods =
    {
	pad : function ( n , pad ) {
		zeros = "";
		for ( i = 0 ; i < pad ; i ++ )
		{
		    zeros+="0";
		}
		n = String(n);
		padded = zeros.substr( 0, pad - n.length ) + String(n) ;
		return padded
	    },
	replace: function( items , string , newString ){
	    for ( i = 0 ; i < items.length ; i ++ ){
		var item = items[i];
		item.name = item.name.replace( string , newString );
	    }
	    return true;
	},
	getSelectedProjectItems: function  (){
	    var items = [];
	    var p = app.project;
	    for ( var i = 1 ; i <= p.numItems ; i ++ ){
		var item = p.item(i);
		if ( item.selected ){
		    items.push(item);
		}
	    }
	    //items = items.concat( app.project.activeItem.selectedItems );
	    return items;
	},
	suffix: function ( items , suffix ){
	    for ( i = 0 ; i < items.length ; i ++ ){
		    var item = items[i];
		    if ( item.name.search( suffix ) != (item.name.length - suffix.length) ){
			item.name+= "_"+suffix;
		    }
		    
		}
		return true;
	    },
	prefix : function( items , prefix ){
		for ( i = 0 ; i < items.length ; i ++ )
		{
		    var item = items[i];
		    if ( item.name.search( prefix ) != 0 ){
			item.name = prefix + "_" + item.name;
		    }
		}
		return true;
	    },
	rename: function ( items , new_name ){
	    for ( i = 0 ; i < items.length ; i ++ ){
		var item = items[i];
		item.name = new_name + "_" + i;
	    }
	
	}
	
    }
    this.init = function init()
    {
        
	this.btnLauyout = 
	"button\
	 {\
	    preferredSize: ['" + this.appearence.buttonWidth + "','" + this.appearence.buttonHeight + "'],\
	    text:'" + this.info.name + "',\
	    helpTip:'" + this.info.description + "'\
	 }";
	
	this. res = 
	 "window\
	{\
	    type:'palette',\
	    text:'" + this.info.name + ' ' + this.info.ver + ' ' + this.info.stage + "',\
	    info: Group \
	    {\
		alignment:['center','bottom'],\
		icon: Image \
		{\
		    icon:'" + this.resources.icon.path + '/' + this.resources.icon.name + "',\
		    preferredSize: [15, 18]\
		},\
		website: StaticText\
		{\
		    text:'" + this.info.url + "',\
		    alignment:['fill','center']\
		},\
	    }\
	}";
    }
    this.createUI = function createUI( )
    {
	var myUI = this;
	var res =
	" window {\
	    text: 'GenericTool',\
		alignment: ['fill','fill'], \
		alignChildren: ['center','top'], \
		orientation: 'column', \
		resizeable: 'true'\
	}"
	var res = 
	"window { \
	    text: 'GenericTool',\
	    alignment: ['fill','fill'], \
	    alignChildren: ['center','top'], \
	    orientation: 'column', \
	    resizeable: 'true',\
	    tabs: Panel {\
		type: 'tabbedpanel',\
		alignment: ['fill','fill'], \
		alignChildren: ['center','top'], \
		search_tab: Panel {\
		    type: 'tab',\
		    text: 'Search & Replace',\
		    orientation: 'column', \
		    alignChildren: ['center','top'], \
		    searchGrp: Group {\
			alignment: ['fill','fill'], \
			alignChildren: ['center','top'], \
			orientation: 'column', \
			searchString: EditText {text:'SEARCH FOR TEXT',alignment: ['fill','center']}, \
		    },\
		    replaceGrp: Group {\
			alignment: ['fill','fill'], \
			alignChildren: ['center','center'], \
			orientation: 'column', \
			replaceString: EditText {text:'REPLACE WITH TEXT',alignment: ['fill','center']}, \
		    }\
		    doItBtn: Button {text: 'Replace in selected Comps', alignment: ['center','center']} , \
		}\
		suprefix: Panel {\
		    type: 'tab',\
		    text: 'Suffix / Prefix',\
		    orientation: 'column', \
		    suprefixGrp: Group {\
			alignment: ['fill','fill'], \
			alignChildren: ['left','center'], \
			orientation: 'column', \
			pre:Group {\
			    alignment: ['fill','fill'], \
			    alignChildren: ['left','center'], \
			    orientation: 'row', \
			    prefixString: EditText {text:'PREFIX',alignment: ['fill','center']}, \
			    prefixBtn: Button {text: 'Preffix'} , \
			},\
			su:Group{\
			    alignment: ['fill','fill'], \
			    alignChildren: ['left','center'], \
			    orientation: 'row', \
			    sufixString: EditText {text:'SUFIX',alignment: ['fill','center']}, \
			    sufixBtn: Button {text: 'Sufix'} , \
			}\
		    },\
		},\
		rename_tab: Panel {\
		    type: 'tab',\
		    text: 'Rename',\
		    renameGrp: Group {\
			alignment: ['fill','fill'], \
			alignChildren: ['left','center'], \
			orientation: 'row', \
			renameString: EditText {text:'NEW NAME',alignment: ['fill','center']}, \
			renameBtn: Button {text: 'Rename'} ,\
		    }\
		}\
	    },\
	}";
		
	myUI.window = new Window( res );
	myUI.window.layout.layout(true);

	myUI.window.show();
	
	myUI.window.layout.onResizing = myUI.window.layout.onResize = function () { myUI.layout.resize();}
	
	//EVENT HANDLERS
	
	/*
	myUI.window.tabs.search_tab.doItBtn.onClick = function(){
	    var search_str = myUI.window.tabs.search_tab.searchGrp.searchString.text;
	    var replace_str = myUI.window.tabs.search_tab.replaceGrp.replaceString.text;
	    myUI.methods.replace( myUI.methods.getSelectedProjectItems() , search_str , replace_str );
	};
	
	myUI.window.tabs.suprefix.suprefixGrp.pre.prefixBtn.onClick = function(){
	    var pre = myUI.window.tabs.suprefix.suprefixGrp.su.prefixString.text;
	    myUI.methods.prefix( myUI.methods.getSelectedProjectItems() , pre );
	};
	
	myUI.window.tabs.suprefix.suprefixGrp.su.sufixBtn.onClick = function(){
	    var su = myUI.window.tabs.suprefix.suprefixGrp.su.sufixString.text;
	    myUI.methods.suffix( myUI.methods.getSelectedProjectItems() , su );
	};
	
	myUI.window.tabs.rename_tab.renameGrp.renameBtn.onClick = function(){
	    var new_name = myUI.window.tabs.rename_tab.renameGrp.renameString.text;
	    myUI.methods.rename( myUI.methods.getSelectedProjectItems() , new_name );
	};
	*/
	
	//END EVENT HANDLERS
	
	return(this);
    }
    
    this.yMainFunction = function yMainFunction()
    {
        w = this.createUI();
    }
    this.activate = function activate()
    {
	this.yTool.yMainFunction();
    }
    
    this.init();
    return this;
}

//CHECKS that the toolbox exists, and if it doesn´t it runs the script on its own.
if (typeof(YTB)=='undefined')
{
    gt = new GenericTool();
    gt.activate();
}
else
{
    YTB.addTool(new GenericTool());
}
\ No newline at end of file
diff --git a/yScripts/y_JSExtensions.jsx b/yScripts/y_JSExtensions.jsx
index 669aac9..9671645 100755
--- a/yScripts/y_JSExtensions.jsx
+++ b/yScripts/y_JSExtensions.jsx
@@ -1,4 +1,6 @@
-if (Array.prototype.getOne==null) Array.prototype.getOne=function(item){    //Extends the Array class with the getOne functions wich 
+//Useful extensions to the JavaScript class versions that come with the default ExtendScript version.
+
+if (Array.prototype.getOne==null) Array.prototype.getOne=function(item){    //Extends the Array class with the getOne functions wich 
     var val = -1;
     for(i=0;i<=this.length;i++){
         if(this[i]==item){
@@ -7,11 +9,3 @@
         }
    return val;
 }
-function yFactor(n,f){
-    if((typeof(n)=='number'&&typeof(f)=='number')&&(n>f)){
-        value = n - (n%f);
-        return(value);
-    }else{
-        alert('error');
-    }
-}