Author: remi
Date: 2008-08-12 20:14:00 +0200 (Tue, 12 Aug 2008)
New Revision: 1466
Modified:
software_suite_v2/software/tools/attitunesStudio/trunk/src/MainFrame.java
software_suite_v2/software/tools/attitunesStudio/trunk/src/com/tuxisalive/attitunes/visual/ATTBlockViewer.java
Log:
* update
Modified:
software_suite_v2/software/tools/attitunesStudio/trunk/src/MainFrame.java
===================================================================
--- software_suite_v2/software/tools/attitunesStudio/trunk/src/MainFrame.java
2008-08-12 17:28:03 UTC (rev 1465)
+++ software_suite_v2/software/tools/attitunesStudio/trunk/src/MainFrame.java
2008-08-12 18:14:00 UTC (rev 1466)
@@ -376,7 +376,7 @@
return;
}
- attBlockViewer.checkHeader();
+ System.out.println(attBlockViewer.checkHeader());
if (selFile.getPath().endsWith(".att"))
{
Modified:
software_suite_v2/software/tools/attitunesStudio/trunk/src/com/tuxisalive/attitunes/visual/ATTBlockViewer.java
===================================================================
---
software_suite_v2/software/tools/attitunesStudio/trunk/src/com/tuxisalive/attitunes/visual/ATTBlockViewer.java
2008-08-12 17:28:03 UTC (rev 1465)
+++
software_suite_v2/software/tools/attitunesStudio/trunk/src/com/tuxisalive/attitunes/visual/ATTBlockViewer.java
2008-08-12 18:14:00 UTC (rev 1466)
@@ -1216,10 +1216,7 @@
{
for (int i = 0; i < blockContainers.length; i++)
{
- for (int j = 0; j < blockContainers[i].blocks.size();
j++)
- {
- blockContainers[i].deleteBlock(j);
- }
+ blockContainers[i].clearBlocks();
}
recalcFullTime();
this.repaint();
@@ -1327,7 +1324,7 @@
return true;
}
- /*
+ /**
*
*/
public Hashtable<String,Object> getBlocksStruct()
@@ -1350,6 +1347,28 @@
return result;
}
+ private Double getRealSceneLength()
+ {
+ Double result = 0.0;
+ Double blStart, blLength;
+
+ for (int i = 0; i < blockContainers.length; i++)
+ {
+ for (int j = 0; j < blockContainers[i].blocks.size();
j++)
+ {
+ ATTBlock block =
blockContainers[i].blocks.get(j);
+ blStart = block.getPosition();
+ blLength = block.getLength();
+
+ if ((blStart + blLength) > result)
+ {
+ result = blStart + blLength;
+ }
+ }
+ }
+ return result;
+ }
+
/*
*
*/
@@ -1540,11 +1559,19 @@
if (attituneFile.getHeaderName().equals("") ||
attituneFile.getHeaderName().equals("template"))
{
-
attituneFile.setHeaderName(attituneFile.getAttFileName());
+ if (attituneFile.getAttFileName().equals("template"))
+ {
+ attituneFile.setHeaderName("");
+ result.add("name");
+ }
+ else
+ {
+
attituneFile.setHeaderName(attituneFile.getAttFileName());
+ }
}
/* Set the length */
- attituneFile.setHeaderLength(getLength());
+ attituneFile.setHeaderLength(getRealSceneLength());
/* Check version */
if (attituneFile.getHeaderVersion().equals(""))
@@ -1571,9 +1598,16 @@
}
/* Check keywords */
+ String kw = attituneFile.getHeaderKeywords();
+ /* Remove bad chars */
+ kw = kw.replace("[", "");
+ kw = kw.replace("]", "");
+ kw = kw.replace("'", "");
+ attituneFile.setHeaderKeywords(kw);
if (attituneFile.getHeaderKeywords().equals(""))
{
attituneFile.setHeaderKeywords(attituneFile.getHeaderCategory() + ", " +
attituneFile.getHeaderSubCategory());
+
}
/*
@@ -1582,51 +1616,71 @@
/* Get the first tts block */
if (blockContainers[ATTConfig.BLOCK_TYPE_TTS].blocks.size() > 0)
{
- ATTBlock block =
blockContainers[ATTConfig.BLOCK_TYPE_TTS].blocks.get(0);
- Hashtable<String,Object> blockStruct =
block.getFunctionParams();
- if (blockStruct.containsKey("speaker"))
+ ATTBlock block = null;
+
+ for (int i = 0; i <
blockContainers[ATTConfig.BLOCK_TYPE_TTS].blocks.size(); i++)
{
- String speakerName =
ATTBlockParams.LOCUTOR_NAMES_LIST[(Integer)blockStruct.get("speaker")-1];
- if (speakerName.equals("Bruno8k"))
+ ATTBlock tBlock =
blockContainers[ATTConfig.BLOCK_TYPE_TTS].blocks.get(i);
+
+ if (tBlock.aLive)
{
-
attituneFile.setHeaderLanguage("French");
+ block = tBlock;
+ break;
}
- else if (speakerName.equals("Julie8k"))
+ }
+
+ if (block != null)
+ {
+ Hashtable<String,Object> blockStruct =
block.getFunctionParams();
+
+ if (blockStruct.containsKey("speaker"))
{
-
attituneFile.setHeaderLanguage("French");
+ String speakerName =
ATTBlockParams.LOCUTOR_NAMES_LIST[(Integer)blockStruct.get("speaker")-1];
+ if (speakerName.equals("Bruno8k"))
+ {
+
attituneFile.setHeaderLanguage("French");
+ }
+ else if (speakerName.equals("Julie8k"))
+ {
+
attituneFile.setHeaderLanguage("French");
+ }
+ else if (speakerName.equals("Ryan8k"))
+ {
+
attituneFile.setHeaderLanguage("US English");
+ }
+ else if
(speakerName.equals("Heather8k"))
+ {
+
attituneFile.setHeaderLanguage("US English");
+ }
+ else if (speakerName.equals("Sofie8k"))
+ {
+
attituneFile.setHeaderLanguage("Be Dutch");
+ }
+ else if (speakerName.equals("Klaus8k"))
+ {
+
attituneFile.setHeaderLanguage("German");
+ }
+ else if (speakerName.equals("Sarah8k"))
+ {
+
attituneFile.setHeaderLanguage("German");
+ }
+ else if (speakerName.equals("Graham8k"))
+ {
+
attituneFile.setHeaderLanguage("UK English");
+ }
+ else if (speakerName.equals("Lucy8k"))
+ {
+
attituneFile.setHeaderLanguage("UK English");
+ }
+ else if (speakerName.equals("Femke8k"))
+ {
+
attituneFile.setHeaderLanguage("Nl Dutch");
+ }
+ else
+ {
+
attituneFile.setHeaderLanguage("None");
+ }
}
- else if (speakerName.equals("Ryan8k"))
- {
- attituneFile.setHeaderLanguage("US
English");
- }
- else if (speakerName.equals("Heather8k"))
- {
- attituneFile.setHeaderLanguage("US
English");
- }
- else if (speakerName.equals("Sofie8k"))
- {
- attituneFile.setHeaderLanguage("Be
Dutch");
- }
- else if (speakerName.equals("Klaus8k"))
- {
-
attituneFile.setHeaderLanguage("German");
- }
- else if (speakerName.equals("Sarah8k"))
- {
-
attituneFile.setHeaderLanguage("German");
- }
- else if (speakerName.equals("Graham8k"))
- {
- attituneFile.setHeaderLanguage("UK
English");
- }
- else if (speakerName.equals("Lucy8k"))
- {
- attituneFile.setHeaderLanguage("UK
English");
- }
- else if (speakerName.equals("Femke8k"))
- {
- attituneFile.setHeaderLanguage("Nl
Dutch");
- }
else
{
attituneFile.setHeaderLanguage("None");
-------------------------------------------------------------------------
This SF.Net email is sponsored by the Moblin Your Move Developer's challenge
Build the coolest Linux based applications with Moblin SDK & win great prizes
Grand prize is a trip for two to an Open Source event anywhere in the world
http://moblin-contest.org/redirect.php?banner_id=100&url=/
_______________________________________________
Tux-droid-svn mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/tux-droid-svn
