refactor: Decentralize data fetching and add axis initialization

Refactor data fetching architecture from centralized App state to
component-local data management for improved maintainability and
data freshness guarantees.

Changes:
- SettingsModal: Fetch config data on modal open
- RecipePanel: Fetch recipe list on panel open
- IOMonitorPage: Fetch IO list on page mount with real-time updates
- Remove unnecessary props drilling through component hierarchy
- Simplify App.tsx by removing centralized config/recipes state

New feature:
- Add InitializeModal for sequential axis initialization (X, Y, Z)
- Each axis initializes with 3-second staggered start
- Progress bar animation for each axis
- Auto-close on completion

🤖 Generated with [Claude Code](https://claude.com/claude-code)

Co-Authored-By: Claude <noreply@anthropic.com>
This commit is contained in:
2025-11-25 01:35:32 +09:00
parent 27cc2507cf
commit 362263ab05
10 changed files with 631 additions and 201 deletions

View File

@@ -2,6 +2,9 @@
using System.Runtime.InteropServices; using System.Runtime.InteropServices;
using System.Windows.Forms; using System.Windows.Forms;
using Newtonsoft.Json; using Newtonsoft.Json;
using System.IO;
using System.Linq;
using System.Collections.Generic;
namespace HMIWeb namespace HMIWeb
{ {
@@ -13,9 +16,83 @@ namespace HMIWeb
// Reference to the main form to update logic // Reference to the main form to update logic
private MainForm _host; private MainForm _host;
// Data folder paths
private readonly string _dataFolder;
private readonly string _settingsPath;
private readonly string _recipeFolder;
public MachineBridge(MainForm host) public MachineBridge(MainForm host)
{ {
_host = host; _host = host;
// Initialize data folder paths
_dataFolder = Path.Combine(AppDomain.CurrentDomain.BaseDirectory, "data");
_settingsPath = Path.Combine(_dataFolder, "settings.json");
_recipeFolder = Path.Combine(_dataFolder, "recipe");
// Ensure folders exist
EnsureDataFoldersExist();
}
private void EnsureDataFoldersExist()
{
try
{
if (!Directory.Exists(_dataFolder))
Directory.CreateDirectory(_dataFolder);
if (!Directory.Exists(_recipeFolder))
Directory.CreateDirectory(_recipeFolder);
// Initialize default settings if not exists
if (!File.Exists(_settingsPath))
InitializeDefaultSettings();
}
catch (Exception ex)
{
Console.WriteLine($"[ERROR] Failed to create data folders: {ex.Message}");
}
}
private void InitializeDefaultSettings()
{
var defaultSettings = new List<object>
{
new { Key = "Site Name", Value = "Smart Factory A-1", Group = "System Information", Type = "String", Description = "The display name of the factory site." },
new { Key = "Line ID", Value = "L-2024-001", Group = "System Information", Type = "String", Description = "Unique identifier for this production line." },
new { Key = "API Endpoint", Value = "https://api.factory.local/v1", Group = "Network Configuration", Type = "String", Description = "Base URL for the backend API." },
new { Key = "Support Contact", Value = "010-1234-5678", Group = "System Information", Type = "String", Description = "Emergency contact number for maintenance." },
new { Key = "Debug Mode", Value = "false", Group = "System Information", Type = "Boolean", Description = "Enable detailed logging for debugging." },
new { Key = "Max Speed", Value = "1500", Group = "Motion Control", Type = "Number", Description = "Maximum velocity in mm/s." },
new { Key = "Acceleration", Value = "500", Group = "Motion Control", Type = "Number", Description = "Acceleration ramp in mm/s²." }
};
for (int i = 1; i <= 5; i++)
{
defaultSettings.Add(new
{
Key = $"Sensor_{i}_Threshold",
Value = (i * 10).ToString(),
Group = "Sensor Calibration",
Type = "Number",
Description = $"Trigger threshold for Sensor {i}."
});
}
for (int i = 1; i <= 3; i++)
{
defaultSettings.Add(new
{
Key = $"Safety_Zone_{i}",
Value = "true",
Group = "Safety Settings",
Type = "Boolean",
Description = $"Enable monitoring for Safety Zone {i}."
});
}
File.WriteAllText(_settingsPath, JsonConvert.SerializeObject(defaultSettings, Formatting.Indented));
Console.WriteLine("[INFO] Default settings.json created");
} }
// --- Methods called from React (App.tsx) --- // --- Methods called from React (App.tsx) ---
@@ -45,18 +122,31 @@ namespace HMIWeb
{ {
Console.WriteLine($"[C#] Selecting Recipe: {recipeId}"); Console.WriteLine($"[C#] Selecting Recipe: {recipeId}");
// In real app, load recipe settings here
// For now, just return success
try try
{ {
// Simulate recipe loading logic string recipePath = Path.Combine(_recipeFolder, $"{recipeId}.json");
if (!File.Exists(recipePath))
{
var response = new { success = false, message = "Recipe not found" };
return JsonConvert.SerializeObject(response);
}
// Load recipe data from file
string json = File.ReadAllText(recipePath);
var recipeData = JsonConvert.DeserializeObject<dynamic>(json);
// Set as current recipe
_host.SetCurrentRecipe(recipeId); _host.SetCurrentRecipe(recipeId);
var response = new { success = true, message = "Recipe selected successfully", recipeId = recipeId }; Console.WriteLine($"[INFO] Recipe {recipeId} selected successfully");
return JsonConvert.SerializeObject(response);
var response2 = new { success = true, message = "Recipe selected successfully", recipeId = recipeId, recipe = recipeData };
return JsonConvert.SerializeObject(response2);
} }
catch (Exception ex) catch (Exception ex)
{ {
Console.WriteLine($"[ERROR] Failed to select recipe: {ex.Message}");
var response = new { success = false, message = ex.Message }; var response = new { success = false, message = ex.Message };
return JsonConvert.SerializeObject(response); return JsonConvert.SerializeObject(response);
} }
@@ -64,55 +154,48 @@ namespace HMIWeb
public string GetConfig() public string GetConfig()
{ {
// Generate 20 Mock Settings try
var settings = new System.Collections.Generic.List<object>();
// Core Settings
settings.Add(new { Key = "Site Name", Value = "Smart Factory A-1", Group = "System Information", Type = "String", Description = "The display name of the factory site." });
settings.Add(new { Key = "Line ID", Value = "L-2024-001", Group = "System Information", Type = "String", Description = "Unique identifier for this production line." });
settings.Add(new { Key = "API Endpoint", Value = "https://api.factory.local/v1", Group = "Network Configuration", Type = "String", Description = "Base URL for the backend API." });
settings.Add(new { Key = "Support Contact", Value = "010-1234-5678", Group = "System Information", Type = "String", Description = "Emergency contact number for maintenance." });
settings.Add(new { Key = "Debug Mode", Value = "false", Group = "System Information", Type = "Boolean", Description = "Enable detailed logging for debugging." });
settings.Add(new { Key = "Max Speed", Value = "1500", Group = "Motion Control", Type = "Number", Description = "Maximum velocity in mm/s." });
settings.Add(new { Key = "Acceleration", Value = "500", Group = "Motion Control", Type = "Number", Description = "Acceleration ramp in mm/s²." });
// Generated Settings
for (int i = 1; i <= 5; i++)
{ {
settings.Add(new { if (!File.Exists(_settingsPath))
Key = $"Sensor_{i}_Threshold", {
Value = (i * 10).ToString(), InitializeDefaultSettings();
Group = "Sensor Calibration",
Type = "Number",
Description = $"Trigger threshold for Sensor {i}."
});
} }
for (int i = 1; i <= 3; i++) string json = File.ReadAllText(_settingsPath);
{ Console.WriteLine($"[INFO] Loaded settings from {_settingsPath}");
settings.Add(new { return json;
Key = $"Safety_Zone_{i}", }
Value = "true", catch (Exception ex)
Group = "Safety Settings", {
Type = "Boolean", Console.WriteLine($"[ERROR] Failed to load settings: {ex.Message}");
Description = $"Enable monitoring for Safety Zone {i}." return "[]";
});
} }
Console.WriteLine("get config (20 items)");
return Newtonsoft.Json.JsonConvert.SerializeObject(settings);
} }
public void SaveConfig(string configJson) public void SaveConfig(string configJson)
{
try
{ {
Console.WriteLine($"[Backend] SAVE CONFIG REQUEST RECEIVED"); Console.WriteLine($"[Backend] SAVE CONFIG REQUEST RECEIVED");
Console.WriteLine($"[Backend] Data: {configJson}");
// In a real app, we would save this to a file or database // Validate JSON format
var settings = JsonConvert.DeserializeObject(configJson);
// Save to file with formatting
File.WriteAllText(_settingsPath, JsonConvert.SerializeObject(settings, Formatting.Indented));
Console.WriteLine($"[INFO] Settings saved successfully to {_settingsPath}");
}
catch (Exception ex)
{
Console.WriteLine($"[ERROR] Failed to save settings: {ex.Message}");
}
} }
public string GetIOList() public string GetIOList()
{ {
var ioList = new System.Collections.Generic.List<object>(); var ioList = new System.Collections.Generic.List<object>();
Console.WriteLine("GetIOList");
// Outputs (0-31) // Outputs (0-31)
for (int i = 0; i < 32; i++) for (int i = 0; i < 32; i++)
{ {
@@ -144,14 +227,98 @@ namespace HMIWeb
} }
public string GetRecipeList() public string GetRecipeList()
{ {
var recipes = new System.Collections.Generic.List<object>(); try
recipes.Add(new { id = "1", name = "Wafer_Proc_300_Au", lastModified = "2023-10-25" }); {
recipes.Add(new { id = "2", name = "Wafer_Insp_200_Adv", lastModified = "2023-10-26" }); var recipes = new List<object>();
recipes.Add(new { id = "3", name = "Glass_Gen5_Bonding", lastModified = "2023-10-27" });
recipes.Add(new { id = "4", name = "Solar_Cell_Cut_A", lastModified = "2023-11-01" });
recipes.Add(new { id = "5", name = "LED_Mount_HighSpeed", lastModified = "2023-11-15" });
return Newtonsoft.Json.JsonConvert.SerializeObject(recipes); if (!Directory.Exists(_recipeFolder))
{
Directory.CreateDirectory(_recipeFolder);
return JsonConvert.SerializeObject(recipes);
}
var jsonFiles = Directory.GetFiles(_recipeFolder, "*.json");
foreach (var filePath in jsonFiles)
{
try
{
string fileName = Path.GetFileNameWithoutExtension(filePath);
string json = File.ReadAllText(filePath);
var recipeData = JsonConvert.DeserializeObject<dynamic>(json);
var lastModified = File.GetLastWriteTime(filePath).ToString("yyyy-MM-dd");
recipes.Add(new
{
id = fileName,
name = recipeData?.name ?? fileName,
lastModified = lastModified
});
}
catch (Exception ex)
{
Console.WriteLine($"[ERROR] Failed to read recipe {filePath}: {ex.Message}");
}
}
Console.WriteLine($"[INFO] Loaded {recipes.Count} recipes from {_recipeFolder}");
return JsonConvert.SerializeObject(recipes);
}
catch (Exception ex)
{
Console.WriteLine($"[ERROR] Failed to get recipe list: {ex.Message}");
return "[]";
}
}
public string GetRecipe(string recipeId)
{
try
{
string recipePath = Path.Combine(_recipeFolder, $"{recipeId}.json");
if (!File.Exists(recipePath))
{
var response = new { success = false, message = "Recipe not found" };
return JsonConvert.SerializeObject(response);
}
string json = File.ReadAllText(recipePath);
Console.WriteLine($"[INFO] Loaded recipe {recipeId}");
return json;
}
catch (Exception ex)
{
Console.WriteLine($"[ERROR] Failed to get recipe {recipeId}: {ex.Message}");
var response = new { success = false, message = ex.Message };
return JsonConvert.SerializeObject(response);
}
}
public string SaveRecipe(string recipeId, string recipeData)
{
try
{
string recipePath = Path.Combine(_recipeFolder, $"{recipeId}.json");
// Validate JSON format
var recipe = JsonConvert.DeserializeObject(recipeData);
// Save to file with formatting
File.WriteAllText(recipePath, JsonConvert.SerializeObject(recipe, Formatting.Indented));
Console.WriteLine($"[INFO] Recipe {recipeId} saved successfully to {recipePath}");
var response = new { success = true, message = "Recipe saved successfully", recipeId = recipeId };
return JsonConvert.SerializeObject(response);
}
catch (Exception ex)
{
Console.WriteLine($"[ERROR] Failed to save recipe {recipeId}: {ex.Message}");
var response = new { success = false, message = ex.Message };
return JsonConvert.SerializeObject(response);
}
} }
public string CopyRecipe(string recipeId, string newName) public string CopyRecipe(string recipeId, string newName)
@@ -160,12 +327,33 @@ namespace HMIWeb
try try
{ {
// In real app, copy recipe data from database/file string sourcePath = Path.Combine(_recipeFolder, $"{recipeId}.json");
// Generate new ID
string newId = System.Guid.NewGuid().ToString().Substring(0, 8);
string timestamp = System.DateTime.Now.ToString("yyyy-MM-dd");
var response = new { if (!File.Exists(sourcePath))
{
var response = new { success = false, message = "Source recipe not found" };
return JsonConvert.SerializeObject(response);
}
// Generate new ID
string newId = Guid.NewGuid().ToString().Substring(0, 8);
string destPath = Path.Combine(_recipeFolder, $"{newId}.json");
// Read source recipe
string json = File.ReadAllText(sourcePath);
var recipeData = JsonConvert.DeserializeObject<dynamic>(json);
// Update name in recipe data
recipeData.name = newName;
// Save to new file
File.WriteAllText(destPath, JsonConvert.SerializeObject(recipeData, Formatting.Indented));
string timestamp = DateTime.Now.ToString("yyyy-MM-dd");
Console.WriteLine($"[INFO] Recipe copied from {recipeId} to {newId}");
var response2 = new {
success = true, success = true,
message = "Recipe copied successfully", message = "Recipe copied successfully",
newRecipe = new { newRecipe = new {
@@ -174,10 +362,11 @@ namespace HMIWeb
lastModified = timestamp lastModified = timestamp
} }
}; };
return JsonConvert.SerializeObject(response); return JsonConvert.SerializeObject(response2);
} }
catch (Exception ex) catch (Exception ex)
{ {
Console.WriteLine($"[ERROR] Failed to copy recipe: {ex.Message}");
var response = new { success = false, message = ex.Message }; var response = new { success = false, message = ex.Message };
return JsonConvert.SerializeObject(response); return JsonConvert.SerializeObject(response);
} }
@@ -189,19 +378,32 @@ namespace HMIWeb
try try
{ {
// In real app, delete recipe from database/file
// Check if recipe is in use // Check if recipe is in use
if (recipeId == _host.GetCurrentRecipe()) if (recipeId == _host.GetCurrentRecipe())
{ {
var response = new { success = false, message = "Cannot delete currently selected recipe" }; var response1 = new { success = false, message = "Cannot delete currently selected recipe" };
return JsonConvert.SerializeObject(response1);
}
string recipePath = Path.Combine(_recipeFolder, $"{recipeId}.json");
if (!File.Exists(recipePath))
{
var response = new { success = false, message = "Recipe not found" };
return JsonConvert.SerializeObject(response); return JsonConvert.SerializeObject(response);
} }
var response = new { success = true, message = "Recipe deleted successfully", recipeId = recipeId }; // Delete the file
return JsonConvert.SerializeObject(response); File.Delete(recipePath);
Console.WriteLine($"[INFO] Recipe {recipeId} deleted successfully");
var response2 = new { success = true, message = "Recipe deleted successfully", recipeId = recipeId };
return JsonConvert.SerializeObject(response2);
} }
catch (Exception ex) catch (Exception ex)
{ {
Console.WriteLine($"[ERROR] Failed to delete recipe: {ex.Message}");
var response = new { success = false, message = ex.Message }; var response = new { success = false, message = ex.Message };
return JsonConvert.SerializeObject(response); return JsonConvert.SerializeObject(response);
} }

View File

@@ -32,10 +32,12 @@
// //
// MainForm // MainForm
// //
this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 15F); this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 12F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
this.ClientSize = new System.Drawing.Size(800, 450); this.ClientSize = new System.Drawing.Size(1284, 961);
this.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
this.Name = "MainForm"; this.Name = "MainForm";
this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen;
this.Text = "Form1"; this.Text = "Form1";
this.Load += new System.EventHandler(this.MainForm_Load); this.Load += new System.EventHandler(this.MainForm_Load);
this.ResumeLayout(false); this.ResumeLayout(false);

View File

@@ -35,17 +35,13 @@ const INITIAL_IO: IOPoint[] = [
// --- MAIN APP --- // --- MAIN APP ---
export default function App() { export default function App() {
const [activeTab, setActiveTab] = useState<'recipe' | 'motion' | 'camera' | 'setting' | null>(null); const [activeTab, setActiveTab] = useState<'recipe' | 'motion' | 'camera' | 'setting' | 'initialize' | null>(null);
const [activeIOTab, setActiveIOTab] = useState<'in' | 'out'>('in');
const [systemState, setSystemState] = useState<SystemState>(SystemState.IDLE); const [systemState, setSystemState] = useState<SystemState>(SystemState.IDLE);
const [recipes, setRecipes] = useState<Recipe[]>([]); const [currentRecipe, setCurrentRecipe] = useState<Recipe>({ id: '0', name: 'No Recipe', lastModified: '-' });
const [currentRecipe, setCurrentRecipe] = useState<Recipe | null>(null);
const [robotTarget, setRobotTarget] = useState<RobotTarget>({ x: 0, y: 0, z: 0 }); const [robotTarget, setRobotTarget] = useState<RobotTarget>({ x: 0, y: 0, z: 0 });
const [logs, setLogs] = useState<LogEntry[]>([]); const [logs, setLogs] = useState<LogEntry[]>([]);
const [ioPoints, setIoPoints] = useState<IOPoint[]>([]); const [ioPoints, setIoPoints] = useState<IOPoint[]>([]);
const [currentTime, setCurrentTime] = useState(new Date()); const [currentTime, setCurrentTime] = useState(new Date());
const [config, setConfig] = useState<ConfigItem[] | null>(null);
const [isConfigRefreshing, setIsConfigRefreshing] = useState(false);
const [isLoading, setIsLoading] = useState(true); const [isLoading, setIsLoading] = useState(true);
const [isHostConnected, setIsHostConnected] = useState(false); const [isHostConnected, setIsHostConnected] = useState(false);
const videoRef = useRef<HTMLVideoElement>(null); const videoRef = useRef<HTMLVideoElement>(null);
@@ -94,39 +90,20 @@ export default function App() {
useEffect(() => { useEffect(() => {
const initSystem = async () => { const initSystem = async () => {
addLog("SYSTEM STARTED", "info"); addLog("SYSTEM STARTED", "info");
// Initial IO data will be loaded by HomePage when it mounts
try { try {
const ioStr = await comms.getIOList(); const ioStr = await comms.getIOList();
const ioData = JSON.parse(ioStr); const ioData = JSON.parse(ioStr);
setIoPoints(ioData); setIoPoints(ioData);
addLog("IO LIST LOADED", "info"); addLog("IO LIST LOADED", "info");
const recipeStr = await comms.getRecipeList();
const recipeData = JSON.parse(recipeStr);
setRecipes(recipeData);
if (recipeData.length > 0) setCurrentRecipe(recipeData[0]);
addLog("RECIPE LIST LOADED", "info");
} catch (e) { } catch (e) {
addLog("FAILED TO LOAD SYSTEM DATA", "error"); addLog("FAILED TO LOAD IO DATA", "error");
// Fallback to empty or keep initial if needed
} }
setIsLoading(false); setIsLoading(false);
}; };
initSystem(); initSystem();
}, []); }, []);
// -- CONFIG FETCHING (for settings modal) --
const fetchConfig = React.useCallback(async () => {
setIsConfigRefreshing(true);
try {
const configStr = await comms.getConfig();
setConfig(JSON.parse(configStr));
addLog("CONFIG REFRESHED", "info");
} catch (e) {
addLog("CONFIG REFRESH FAILED", "error");
}
setIsConfigRefreshing(false);
}, []);
const addLog = (msg: string, type: 'info' | 'warning' | 'error' = 'info') => { const addLog = (msg: string, type: 'info' | 'warning' | 'error' = 'info') => {
setLogs(prev => [{ id: Date.now() + Math.random(), timestamp: new Date().toLocaleTimeString(), message: msg, type }, ...prev].slice(0, 50)); setLogs(prev => [{ id: Date.now() + Math.random(), timestamp: new Date().toLocaleTimeString(), message: msg, type }, ...prev].slice(0, 50));
}; };
@@ -171,7 +148,6 @@ export default function App() {
const handleSaveConfig = async (newConfig: ConfigItem[]) => { const handleSaveConfig = async (newConfig: ConfigItem[]) => {
try { try {
await comms.saveConfig(JSON.stringify(newConfig)); await comms.saveConfig(JSON.stringify(newConfig));
setConfig(newConfig);
addLog("CONFIGURATION SAVED", "info"); addLog("CONFIGURATION SAVED", "info");
} catch (e) { } catch (e) {
console.error(e); console.error(e);
@@ -202,10 +178,7 @@ export default function App() {
currentTime={currentTime} currentTime={currentTime}
isHostConnected={isHostConnected} isHostConnected={isHostConnected}
robotTarget={robotTarget} robotTarget={robotTarget}
onTabChange={(tab) => { onTabChange={setActiveTab}
setActiveTab(tab);
if (tab === null) setActiveIOTab('in'); // Reset IO tab when closing
}}
activeTab={activeTab} activeTab={activeTab}
isLoading={isLoading} isLoading={isLoading}
> >
@@ -215,13 +188,10 @@ export default function App() {
element={ element={
<HomePage <HomePage
systemState={systemState} systemState={systemState}
currentRecipe={currentRecipe || { id: '0', name: 'No Recipe', lastModified: '-' }} currentRecipe={currentRecipe}
recipes={recipes}
robotTarget={robotTarget} robotTarget={robotTarget}
logs={logs} logs={logs}
ioPoints={ioPoints} ioPoints={ioPoints}
config={config}
isConfigRefreshing={isConfigRefreshing}
doorStates={doorStates} doorStates={doorStates}
isLowPressure={isLowPressure} isLowPressure={isLowPressure}
isEmergencyStop={isEmergencyStop} isEmergencyStop={isEmergencyStop}
@@ -230,7 +200,6 @@ export default function App() {
onMove={moveAxis} onMove={moveAxis}
onControl={handleControl} onControl={handleControl}
onSaveConfig={handleSaveConfig} onSaveConfig={handleSaveConfig}
onFetchConfig={fetchConfig}
onCloseTab={() => setActiveTab(null)} onCloseTab={() => setActiveTab(null)}
videoRef={videoRef} videoRef={videoRef}
/> />
@@ -240,10 +209,7 @@ export default function App() {
path="/io-monitor" path="/io-monitor"
element={ element={
<IOMonitorPage <IOMonitorPage
ioPoints={ioPoints}
onToggle={toggleIO} onToggle={toggleIO}
activeIOTab={activeIOTab}
onIOTabChange={setActiveIOTab}
/> />
} }
/> />

View File

@@ -0,0 +1,181 @@
import React, { useState, useEffect } from 'react';
import { Target, CheckCircle2, Loader2 } from 'lucide-react';
import { TechButton } from './common/TechButton';
interface InitializeModalProps {
isOpen: boolean;
onClose: () => void;
}
type AxisStatus = 'pending' | 'initializing' | 'completed';
interface AxisState {
name: string;
status: AxisStatus;
progress: number;
}
export const InitializeModal: React.FC<InitializeModalProps> = ({ isOpen, onClose }) => {
const [axes, setAxes] = useState<AxisState[]>([
{ name: 'X-Axis', status: 'pending', progress: 0 },
{ name: 'Y-Axis', status: 'pending', progress: 0 },
{ name: 'Z-Axis', status: 'pending', progress: 0 },
]);
const [isInitializing, setIsInitializing] = useState(false);
// Reset state when modal closes
useEffect(() => {
if (!isOpen) {
setAxes([
{ name: 'X-Axis', status: 'pending', progress: 0 },
{ name: 'Y-Axis', status: 'pending', progress: 0 },
{ name: 'Z-Axis', status: 'pending', progress: 0 },
]);
setIsInitializing(false);
}
}, [isOpen]);
const startInitialization = () => {
setIsInitializing(true);
// Initialize each axis with 3 second delay between them
axes.forEach((axis, index) => {
const delay = index * 3000; // 0s, 3s, 6s
// Start initialization after delay
setTimeout(() => {
setAxes(prev => {
const next = [...prev];
next[index] = { ...next[index], status: 'initializing', progress: 0 };
return next;
});
// Progress animation (3 seconds)
const startTime = Date.now();
const duration = 3000;
const interval = setInterval(() => {
const elapsed = Date.now() - startTime;
const progress = Math.min((elapsed / duration) * 100, 100);
setAxes(prev => {
const next = [...prev];
next[index] = { ...next[index], progress };
return next;
});
if (progress >= 100) {
clearInterval(interval);
setAxes(prev => {
const next = [...prev];
next[index] = { ...next[index], status: 'completed', progress: 100 };
return next;
});
// Check if all axes are completed
setAxes(prev => {
if (prev.every(a => a.status === 'completed')) {
// Auto close after 500ms
setTimeout(() => {
onClose();
}, 500);
}
return prev;
});
}
}, 50);
}, delay);
});
};
if (!isOpen) return null;
const allCompleted = axes.every(a => a.status === 'completed');
return (
<div className="absolute inset-0 z-50 flex items-center justify-center bg-black/60 backdrop-blur-sm">
<div className="w-[600px] glass-holo p-8 border border-neon-blue shadow-glow-blue relative flex flex-col">
<button
onClick={onClose}
disabled={isInitializing}
className="absolute top-4 right-4 text-slate-400 hover:text-white disabled:opacity-30 disabled:cursor-not-allowed"
>
</button>
<h2 className="text-2xl font-tech font-bold text-neon-blue mb-8 border-b border-white/10 pb-4 flex items-center gap-3">
<Target className="animate-pulse" /> AXIS INITIALIZATION
</h2>
<div className="space-y-6 mb-8">
{axes.map((axis, index) => (
<div key={axis.name} className="space-y-2">
<div className="flex items-center justify-between">
<div className="flex items-center gap-3">
{axis.status === 'completed' ? (
<CheckCircle2 className="w-5 h-5 text-neon-green" />
) : axis.status === 'initializing' ? (
<Loader2 className="w-5 h-5 text-neon-blue animate-spin" />
) : (
<div className="w-5 h-5 border-2 border-slate-600 rounded-full" />
)}
<span className="font-tech font-bold text-lg text-white tracking-wider">
{axis.name}
</span>
</div>
<span
className={`font-mono text-sm font-bold ${
axis.status === 'completed'
? 'text-neon-green'
: axis.status === 'initializing'
? 'text-neon-blue'
: 'text-slate-500'
}`}
>
{axis.status === 'completed'
? 'COMPLETED'
: axis.status === 'initializing'
? `${Math.round(axis.progress)}%`
: 'WAITING'}
</span>
</div>
{/* Progress Bar */}
<div className="h-3 bg-black/50 border border-slate-700 overflow-hidden">
<div
className={`h-full transition-all duration-100 ${
axis.status === 'completed'
? 'bg-neon-green shadow-[0_0_10px_rgba(10,255,0,0.5)]'
: 'bg-neon-blue shadow-[0_0_10px_rgba(0,243,255,0.5)]'
}`}
style={{ width: `${axis.progress}%` }}
/>
</div>
</div>
))}
</div>
{allCompleted && (
<div className="mb-6 p-4 bg-neon-green/10 border border-neon-green rounded text-center">
<span className="font-tech font-bold text-neon-green tracking-wider">
ALL AXES INITIALIZED SUCCESSFULLY
</span>
</div>
)}
<div className="flex justify-end gap-4">
<TechButton onClick={onClose} disabled={isInitializing}>
CANCEL
</TechButton>
<TechButton
variant="blue"
active
onClick={startInitialization}
disabled={isInitializing || allCompleted}
>
{isInitializing ? 'INITIALIZING...' : 'START INITIALIZATION'}
</TechButton>
</div>
</div>
</div>
);
};

View File

@@ -1,20 +1,46 @@
import React, { useState } from 'react'; import React, { useState, useEffect } from 'react';
import { Layers, Check, Settings, X } from 'lucide-react'; import { Layers, Check, Settings, X, RotateCw } from 'lucide-react';
import { useNavigate } from 'react-router-dom'; import { useNavigate } from 'react-router-dom';
import { Recipe } from '../types'; import { Recipe } from '../types';
import { TechButton } from './common/TechButton'; import { TechButton } from './common/TechButton';
import { comms } from '../communication';
interface RecipePanelProps { interface RecipePanelProps {
recipes: Recipe[]; isOpen: boolean;
currentRecipe: Recipe; currentRecipe: Recipe;
onSelectRecipe: (r: Recipe) => void; onSelectRecipe: (r: Recipe) => void;
onClose: () => void; onClose: () => void;
} }
export const RecipePanel: React.FC<RecipePanelProps> = ({ recipes, currentRecipe, onSelectRecipe, onClose }) => { export const RecipePanel: React.FC<RecipePanelProps> = ({ isOpen, currentRecipe, onSelectRecipe, onClose }) => {
const navigate = useNavigate(); const navigate = useNavigate();
const [recipes, setRecipes] = useState<Recipe[]>([]);
const [isLoading, setIsLoading] = useState(false);
const [selectedId, setSelectedId] = useState<string>(currentRecipe.id); const [selectedId, setSelectedId] = useState<string>(currentRecipe.id);
// Fetch recipes when panel opens
useEffect(() => {
if (isOpen) {
const fetchRecipes = async () => {
setIsLoading(true);
try {
const recipeStr = await comms.getRecipeList();
const recipeData: Recipe[] = JSON.parse(recipeStr);
setRecipes(recipeData);
} catch (e) {
console.error('Failed to fetch recipes:', e);
}
setIsLoading(false);
};
fetchRecipes();
}
}, [isOpen]);
// Update selected ID when currentRecipe changes
useEffect(() => {
setSelectedId(currentRecipe.id);
}, [currentRecipe.id]);
const handleConfirm = () => { const handleConfirm = () => {
const selected = recipes.find(r => r.id === selectedId); const selected = recipes.find(r => r.id === selectedId);
if (selected) { if (selected) {
@@ -23,6 +49,8 @@ export const RecipePanel: React.FC<RecipePanelProps> = ({ recipes, currentRecipe
} }
}; };
if (!isOpen) return null;
return ( return (
<div className="fixed inset-0 z-50 flex items-center justify-center bg-black/60 backdrop-blur-sm animate-in fade-in duration-200"> <div className="fixed inset-0 z-50 flex items-center justify-center bg-black/60 backdrop-blur-sm animate-in fade-in duration-200">
<div className="w-[500px] bg-slate-950/90 border border-neon-blue/30 rounded-lg shadow-2xl flex flex-col overflow-hidden"> <div className="w-[500px] bg-slate-950/90 border border-neon-blue/30 rounded-lg shadow-2xl flex flex-col overflow-hidden">
@@ -38,6 +66,12 @@ export const RecipePanel: React.FC<RecipePanelProps> = ({ recipes, currentRecipe
{/* List (Max height for ~5 items) */} {/* List (Max height for ~5 items) */}
<div className="p-4 max-h-[320px] overflow-y-auto custom-scrollbar"> <div className="p-4 max-h-[320px] overflow-y-auto custom-scrollbar">
{isLoading ? (
<div className="h-64 flex flex-col items-center justify-center gap-4 animate-pulse">
<RotateCw className="w-12 h-12 text-neon-blue animate-spin" />
<div className="text-lg font-tech text-neon-blue tracking-widest">LOADING RECIPES...</div>
</div>
) : (
<div className="space-y-2"> <div className="space-y-2">
{recipes.map(recipe => ( {recipes.map(recipe => (
<div <div
@@ -58,6 +92,7 @@ export const RecipePanel: React.FC<RecipePanelProps> = ({ recipes, currentRecipe
</div> </div>
))} ))}
</div> </div>
)}
</div> </div>
{/* Footer Actions */} {/* Footer Actions */}

View File

@@ -1,12 +1,11 @@
import React from 'react'; import React from 'react';
import { Settings, RotateCw, ChevronDown, ChevronRight } from 'lucide-react'; import { Settings, RotateCw, ChevronDown, ChevronRight } from 'lucide-react';
import { ConfigItem } from '../types'; import { ConfigItem } from '../types';
import { comms } from '../communication';
interface SettingsModalProps { interface SettingsModalProps {
isOpen: boolean; isOpen: boolean;
onClose: () => void; onClose: () => void;
config: ConfigItem[] | null;
isRefreshing: boolean;
onSave: (config: ConfigItem[]) => void; onSave: (config: ConfigItem[]) => void;
} }
@@ -34,18 +33,31 @@ const TechButton = ({ children, onClick, active = false, variant = 'blue', class
); );
}; };
export const SettingsModal: React.FC<SettingsModalProps> = ({ isOpen, onClose, config, isRefreshing, onSave }) => { export const SettingsModal: React.FC<SettingsModalProps> = ({ isOpen, onClose, onSave }) => {
const [localConfig, setLocalConfig] = React.useState<ConfigItem[]>([]); const [localConfig, setLocalConfig] = React.useState<ConfigItem[]>([]);
const [expandedGroups, setExpandedGroups] = React.useState<Set<string>>(new Set()); const [expandedGroups, setExpandedGroups] = React.useState<Set<string>>(new Set());
const [isRefreshing, setIsRefreshing] = React.useState(false);
// Fetch config data when modal opens
React.useEffect(() => { React.useEffect(() => {
if (config) { if (isOpen) {
const fetchConfig = async () => {
setIsRefreshing(true);
try {
const configStr = await comms.getConfig();
const config: ConfigItem[] = JSON.parse(configStr);
setLocalConfig(config); setLocalConfig(config);
// Auto-expand all groups initially // Auto-expand all groups initially
const groups = new Set(config.map(c => c.Group)); const groups = new Set<string>(config.map(c => c.Group));
setExpandedGroups(groups); setExpandedGroups(groups);
} catch (e) {
console.error('Failed to fetch config:', e);
} }
}, [config]); setIsRefreshing(false);
};
fetchConfig();
}
}, [isOpen]);
const handleChange = (idx: number, newValue: string) => { const handleChange = (idx: number, newValue: string) => {
setLocalConfig(prev => { setLocalConfig(prev => {

View File

@@ -1,11 +1,11 @@
import React from 'react'; import React from 'react';
import { useNavigate, useLocation } from 'react-router-dom'; import { useNavigate, useLocation } from 'react-router-dom';
import { Activity, Settings, Move, Camera, Layers, Cpu } from 'lucide-react'; import { Activity, Settings, Move, Camera, Layers, Cpu, Target } from 'lucide-react';
interface HeaderProps { interface HeaderProps {
currentTime: Date; currentTime: Date;
onTabChange: (tab: 'recipe' | 'motion' | 'camera' | 'setting' | null) => void; onTabChange: (tab: 'recipe' | 'motion' | 'camera' | 'setting' | 'initialize' | null) => void;
activeTab: 'recipe' | 'motion' | 'camera' | 'setting' | null; activeTab: 'recipe' | 'motion' | 'camera' | 'setting' | 'initialize' | null;
} }
@@ -53,7 +53,8 @@ export const Header: React.FC<HeaderProps> = ({ currentTime, onTabChange, active
{ id: 'io', icon: Activity, label: 'I/O MONITOR', path: '/io-monitor' }, { id: 'io', icon: Activity, label: 'I/O MONITOR', path: '/io-monitor' },
{ id: 'motion', icon: Move, label: 'MOTION', path: '/' }, { id: 'motion', icon: Move, label: 'MOTION', path: '/' },
{ id: 'camera', icon: Camera, label: 'VISION', path: '/' }, { id: 'camera', icon: Camera, label: 'VISION', path: '/' },
{ id: 'setting', icon: Settings, label: 'CONFIG', path: '/' } { id: 'setting', icon: Settings, label: 'CONFIG', path: '/' },
{ id: 'initialize', icon: Target, label: 'INITIALIZE', path: '/' }
].map(item => { ].map(item => {
const isActive = item.id === 'io' const isActive = item.id === 'io'
? location.pathname === '/io-monitor' ? location.pathname === '/io-monitor'

View File

@@ -8,8 +8,8 @@ interface LayoutProps {
currentTime: Date; currentTime: Date;
isHostConnected: boolean; isHostConnected: boolean;
robotTarget: RobotTarget; robotTarget: RobotTarget;
onTabChange: (tab: 'recipe' | 'motion' | 'camera' | 'setting' | null) => void; onTabChange: (tab: 'recipe' | 'motion' | 'camera' | 'setting' | 'initialize' | null) => void;
activeTab: 'recipe' | 'motion' | 'camera' | 'setting' | null; activeTab: 'recipe' | 'motion' | 'camera' | 'setting' | 'initialize' | null;
isLoading: boolean; isLoading: boolean;
} }

View File

@@ -2,6 +2,7 @@ import React, { useState, useEffect } from 'react';
import { Play, Square, RotateCw, AlertTriangle, Siren, Terminal } from 'lucide-react'; import { Play, Square, RotateCw, AlertTriangle, Siren, Terminal } from 'lucide-react';
import { Machine3D } from '../components/Machine3D'; import { Machine3D } from '../components/Machine3D';
import { SettingsModal } from '../components/SettingsModal'; import { SettingsModal } from '../components/SettingsModal';
import { InitializeModal } from '../components/InitializeModal';
import { RecipePanel } from '../components/RecipePanel'; import { RecipePanel } from '../components/RecipePanel';
import { MotionPanel } from '../components/MotionPanel'; import { MotionPanel } from '../components/MotionPanel';
import { CameraPanel } from '../components/CameraPanel'; import { CameraPanel } from '../components/CameraPanel';
@@ -13,21 +14,17 @@ import { SystemState, Recipe, IOPoint, LogEntry, RobotTarget, ConfigItem } from
interface HomePageProps { interface HomePageProps {
systemState: SystemState; systemState: SystemState;
currentRecipe: Recipe; currentRecipe: Recipe;
recipes: Recipe[];
robotTarget: RobotTarget; robotTarget: RobotTarget;
logs: LogEntry[]; logs: LogEntry[];
ioPoints: IOPoint[]; ioPoints: IOPoint[];
config: ConfigItem[] | null;
isConfigRefreshing: boolean;
doorStates: { front: boolean; right: boolean; left: boolean; back: boolean }; doorStates: { front: boolean; right: boolean; left: boolean; back: boolean };
isLowPressure: boolean; isLowPressure: boolean;
isEmergencyStop: boolean; isEmergencyStop: boolean;
activeTab: 'recipe' | 'motion' | 'camera' | 'setting' | null; activeTab: 'recipe' | 'motion' | 'camera' | 'setting' | 'initialize' | null;
onSelectRecipe: (r: Recipe) => void; onSelectRecipe: (r: Recipe) => void;
onMove: (axis: 'X' | 'Y' | 'Z', val: number) => void; onMove: (axis: 'X' | 'Y' | 'Z', val: number) => void;
onControl: (action: 'start' | 'stop' | 'reset') => void; onControl: (action: 'start' | 'stop' | 'reset') => void;
onSaveConfig: (config: ConfigItem[]) => void; onSaveConfig: (config: ConfigItem[]) => void;
onFetchConfig: () => void;
onCloseTab: () => void; onCloseTab: () => void;
videoRef: React.RefObject<HTMLVideoElement>; videoRef: React.RefObject<HTMLVideoElement>;
} }
@@ -35,12 +32,9 @@ interface HomePageProps {
export const HomePage: React.FC<HomePageProps> = ({ export const HomePage: React.FC<HomePageProps> = ({
systemState, systemState,
currentRecipe, currentRecipe,
recipes,
robotTarget, robotTarget,
logs, logs,
ioPoints, ioPoints,
config,
isConfigRefreshing,
doorStates, doorStates,
isLowPressure, isLowPressure,
isEmergencyStop, isEmergencyStop,
@@ -49,7 +43,6 @@ export const HomePage: React.FC<HomePageProps> = ({
onMove, onMove,
onControl, onControl,
onSaveConfig, onSaveConfig,
onFetchConfig,
onCloseTab, onCloseTab,
videoRef videoRef
}) => { }) => {
@@ -59,12 +52,6 @@ export const HomePage: React.FC<HomePageProps> = ({
} }
}, [activeTab, videoRef]); }, [activeTab, videoRef]);
useEffect(() => {
if (activeTab === 'setting') {
onFetchConfig();
}
}, [activeTab, onFetchConfig]);
return ( return (
<main className="relative w-full h-full flex gap-6 px-6"> <main className="relative w-full h-full flex gap-6 px-6">
{/* 3D Canvas (Background Layer) */} {/* 3D Canvas (Background Layer) */}
@@ -101,24 +88,26 @@ export const HomePage: React.FC<HomePageProps> = ({
)} )}
{/* Recipe Selection Modal */} {/* Recipe Selection Modal */}
{activeTab === 'recipe' && (
<RecipePanel <RecipePanel
recipes={recipes} isOpen={activeTab === 'recipe'}
currentRecipe={currentRecipe} currentRecipe={currentRecipe}
onSelectRecipe={onSelectRecipe} onSelectRecipe={onSelectRecipe}
onClose={onCloseTab} onClose={onCloseTab}
/> />
)}
{/* Settings Modal */} {/* Settings Modal */}
<SettingsModal <SettingsModal
isOpen={activeTab === 'setting'} isOpen={activeTab === 'setting'}
onClose={onCloseTab} onClose={onCloseTab}
config={config}
isRefreshing={isConfigRefreshing}
onSave={onSaveConfig} onSave={onSaveConfig}
/> />
{/* Initialize Modal */}
<InitializeModal
isOpen={activeTab === 'initialize'}
onClose={onCloseTab}
/>
{/* Right Sidebar (Dashboard) */} {/* Right Sidebar (Dashboard) */}
<div className="w-80 ml-auto z-20 flex flex-col gap-4"> <div className="w-80 ml-auto z-20 flex flex-col gap-4">
<ModelInfoPanel currentRecipe={currentRecipe} /> <ModelInfoPanel currentRecipe={currentRecipe} />

View File

@@ -1,14 +1,51 @@
import React, { useState } from 'react'; import React, { useState, useEffect } from 'react';
import { RotateCw } from 'lucide-react';
import { IOPoint } from '../types'; import { IOPoint } from '../types';
import { comms } from '../communication';
interface IOMonitorPageProps { interface IOMonitorPageProps {
ioPoints: IOPoint[];
onToggle: (id: number, type: 'input' | 'output') => void; onToggle: (id: number, type: 'input' | 'output') => void;
activeIOTab: 'in' | 'out';
onIOTabChange: (tab: 'in' | 'out') => void;
} }
export const IOMonitorPage: React.FC<IOMonitorPageProps> = ({ ioPoints, onToggle, activeIOTab, onIOTabChange }) => { export const IOMonitorPage: React.FC<IOMonitorPageProps> = ({ onToggle }) => {
const [ioPoints, setIoPoints] = useState<IOPoint[]>([]);
const [isLoading, setIsLoading] = useState(true);
const [activeIOTab, setActiveIOTab] = useState<'in' | 'out'>('in');
// Fetch initial IO list when page mounts
useEffect(() => {
const fetchIOList = async () => {
setIsLoading(true);
try {
const ioStr = await comms.getIOList();
const ioData: IOPoint[] = JSON.parse(ioStr);
setIoPoints(ioData);
} catch (e) {
console.error('Failed to fetch IO list:', e);
}
setIsLoading(false);
};
fetchIOList();
// Subscribe to real-time IO updates
const unsubscribe = comms.subscribe((msg: any) => {
if (msg?.type === 'STATUS_UPDATE' && msg.ioState) {
setIoPoints(prev => {
const newIO = [...prev];
msg.ioState.forEach((update: { id: number, type: string, state: boolean }) => {
const idx = newIO.findIndex(p => p.id === update.id && p.type === update.type);
if (idx >= 0) newIO[idx] = { ...newIO[idx], state: update.state };
});
return newIO;
});
}
});
return () => {
unsubscribe();
};
}, []);
const points = ioPoints.filter(p => p.type === (activeIOTab === 'in' ? 'input' : 'output')); const points = ioPoints.filter(p => p.type === (activeIOTab === 'in' ? 'input' : 'output'));
return ( return (
@@ -29,13 +66,13 @@ export const IOMonitorPage: React.FC<IOMonitorPageProps> = ({ ioPoints, onToggle
<div className="bg-black/40 backdrop-blur-md p-1 rounded-full border border-white/10 flex gap-1"> <div className="bg-black/40 backdrop-blur-md p-1 rounded-full border border-white/10 flex gap-1">
<button <button
onClick={() => onIOTabChange('in')} onClick={() => setActiveIOTab('in')}
className={`px-6 py-2 rounded-full font-tech font-bold text-sm transition-all ${activeIOTab === 'in' ? 'bg-neon-yellow/20 text-neon-yellow border border-neon-yellow shadow-[0_0_15px_rgba(255,230,0,0.3)]' : 'text-slate-400 hover:text-white hover:bg-white/5'}`} className={`px-6 py-2 rounded-full font-tech font-bold text-sm transition-all ${activeIOTab === 'in' ? 'bg-neon-yellow/20 text-neon-yellow border border-neon-yellow shadow-[0_0_15px_rgba(255,230,0,0.3)]' : 'text-slate-400 hover:text-white hover:bg-white/5'}`}
> >
INPUTS ({ioPoints.filter(p => p.type === 'input').length}) INPUTS ({ioPoints.filter(p => p.type === 'input').length})
</button> </button>
<button <button
onClick={() => onIOTabChange('out')} onClick={() => setActiveIOTab('out')}
className={`px-6 py-2 rounded-full font-tech font-bold text-sm transition-all ${activeIOTab === 'out' ? 'bg-neon-green/20 text-neon-green border border-neon-green shadow-[0_0_15px_rgba(10,255,0,0.3)]' : 'text-slate-400 hover:text-white hover:bg-white/5'}`} className={`px-6 py-2 rounded-full font-tech font-bold text-sm transition-all ${activeIOTab === 'out' ? 'bg-neon-green/20 text-neon-green border border-neon-green shadow-[0_0_15px_rgba(10,255,0,0.3)]' : 'text-slate-400 hover:text-white hover:bg-white/5'}`}
> >
OUTPUTS ({ioPoints.filter(p => p.type === 'output').length}) OUTPUTS ({ioPoints.filter(p => p.type === 'output').length})
@@ -44,8 +81,12 @@ export const IOMonitorPage: React.FC<IOMonitorPageProps> = ({ ioPoints, onToggle
</div> </div>
<div className="bg-slate-950/40 backdrop-blur-md flex-1 overflow-y-auto custom-scrollbar rounded-lg border border-white/5"> <div className="bg-slate-950/40 backdrop-blur-md flex-1 overflow-y-auto custom-scrollbar rounded-lg border border-white/5">
{/* Grid Layout - More columns for full screen */} {isLoading ? (
{/* Grid Layout - 2 Columns for list view */} <div className="h-full flex flex-col items-center justify-center gap-4 animate-pulse">
<RotateCw className="w-16 h-16 text-neon-blue animate-spin" />
<div className="text-xl font-tech text-neon-blue tracking-widest">LOADING IO POINTS...</div>
</div>
) : (
<div className="grid grid-cols-2 gap-x-8 gap-y-2 p-4"> <div className="grid grid-cols-2 gap-x-8 gap-y-2 p-4">
{points.map(p => ( {points.map(p => (
<div <div
@@ -76,6 +117,7 @@ export const IOMonitorPage: React.FC<IOMonitorPageProps> = ({ ioPoints, onToggle
</div> </div>
))} ))}
</div> </div>
)}
</div> </div>
</div> </div>
</main> </main>